From fa8867124ebf8c322731c95f51f9ae746f429cc7 Mon Sep 17 00:00:00 2001
From: maslow <wangfugen@126.com>
Date: Mon, 9 Aug 2021 16:23:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=92=88=E5=AF=B9=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=20devops=20db=20=E9=9B=86=E5=90=88=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=9B=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BD=93=E9=AA=8C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devops-admin/src/api/constants.js    | 24 ++++++++++++
 .../src/views/database/collections.vue        | 24 ++++++++----
 .../src/views/database/policies.vue           | 13 ++++---
 .../src/views/database/policy.vue             | 39 ++++++++++++++-----
 .../views/deploy/components/deploy-panel.vue  |  5 ++-
 .../src/views/deploy/requests.vue             |  8 ++--
 .../devops-admin/src/views/deploy/targets.vue | 11 +++---
 .../src/views/development/function.vue        |  9 ++---
 .../src/views/development/functions.vue       | 13 ++++---
 .../src/views/development/triggers.vue        | 14 +++----
 .../devops-admin/src/views/system/admin.vue   |  8 ++--
 .../devops-admin/src/views/system/role.vue    | 13 +++----
 12 files changed, 119 insertions(+), 62 deletions(-)
 create mode 100644 packages/devops-admin/src/api/constants.js

diff --git a/packages/devops-admin/src/api/constants.js b/packages/devops-admin/src/api/constants.js
new file mode 100644
index 0000000000..a44c7fcc7e
--- /dev/null
+++ b/packages/devops-admin/src/api/constants.js
@@ -0,0 +1,24 @@
+const coll_prefix = 'devops_'
+
+const Constants = {
+  function_collection: '__deployed__functions',
+  trigger_collection: '__deployed__triggers',
+  policy_collection: '__deployed__policies',
+  coll_prefix: coll_prefix,
+  cn: {
+    admins: coll_prefix + 'admins',
+    permissions: coll_prefix + 'permissions',
+    roles: coll_prefix + 'roles',
+    policies: coll_prefix + 'policies',
+    functions: coll_prefix + 'functions',
+    function_history: coll_prefix + 'function_history',
+    triggers: coll_prefix + 'triggers',
+    deploy_targets: coll_prefix + 'deploy_targets',
+    deploy_requests: coll_prefix + 'deploy_requests'
+  }
+}
+
+Object.freeze(Constants)
+Object.freeze(Object.cn)
+
+export { Constants }
diff --git a/packages/devops-admin/src/views/database/collections.vue b/packages/devops-admin/src/views/database/collections.vue
index d722ec1de8..523aa470d8 100644
--- a/packages/devops-admin/src/views/database/collections.vue
+++ b/packages/devops-admin/src/views/database/collections.vue
@@ -3,7 +3,7 @@
     <div class="collec-wrap">
       <div class="filter-container">
         集合名称：
-        <el-select v-model="collectionName" filterable placeholder="请选择集合">
+        <el-select v-model="collectionName" size="mini" filterable placeholder="请选择集合">
           <el-option
             v-for="item in collections"
             :key="item"
@@ -14,7 +14,7 @@
       </div>
 
       <div style="text-align: center;">
-        <el-radio-group v-model="tabType" style="margin-left: 30px;">
+        <el-radio-group v-model="tabType" size="mini" style="margin-left: 30px;">
           <el-radio-button label="record">记录列表</el-radio-button>
           <el-radio-button label="index">索引管理</el-radio-button>
         </el-radio-group>
@@ -22,11 +22,11 @@
 
       <!-- 记录 -->
       <div v-show="tabType === 'record'" style="margin: 10px 0;">
-        <el-input v-model.trim="listQuery._id" placeholder="请输入_id查找" style="width:200px" :disabled="!collectionName" @keyup.enter.native="handleFilter" />
-        <el-button type="primary" style="margin-left: 10px" icon="el-icon-search" :disabled="!collectionName" @click="handleFilter">搜索记录</el-button>
-        <el-button type="primary" style="margin-left: 10px" icon="el-icon-plus" :disabled="!collectionName" @click="handleCreateRecord">添加记录</el-button>
+        <el-input v-model.trim="listQuery._id" size="mini" placeholder="请输入_id查找" style="width:200px" :disabled="!collectionName" @keyup.enter.native="handleFilter" />
+        <el-button size="mini" type="primary" style="margin-left: 10px" icon="el-icon-search" :disabled="!collectionName" @click="handleFilter">搜索记录</el-button>
+        <el-button size="mini" type="primary" style="margin-left: 10px" icon="el-icon-plus" :disabled="!collectionName" @click="handleCreateRecord">添加记录</el-button>
       </div>
-      <el-container v-show="tabType === 'record'" style="height: 800px; border: 1px solid #eee">
+      <el-container v-show="tabType === 'record'" style="height: calc(100vh - 240px); border: 1px solid #eee">
         <el-aside width="300px" style="background-color: #fff;border: 1px solid #eee;padding: 8px;">
           <div v-for="item in list" :key="item._id" class="record-item" :class="getClass(item)" @click="getRecord(item)">
             <span class="">_id: {{ item._id }}</span>
@@ -50,7 +50,7 @@
             <el-button size="mini" type="primary" :disabled="!collectionName" @click="updateRecord">更新</el-button>
           </el-header>
           <el-main>
-            <json-editor v-model="record" :dark="true" :height="660" />
+            <json-editor v-model="record" class="db-editor" :line-numbers="true" :dark="false" :height="600" />
           </el-main>
         </el-container>
       </el-container>
@@ -356,4 +356,14 @@ export default {
       color: blue;
     }
   }
+
+  .el-main {
+    padding: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    // .db-editor {
+      // border: 1px solid lightgray
+    // }
+  }
 </style>
diff --git a/packages/devops-admin/src/views/database/policies.vue b/packages/devops-admin/src/views/database/policies.vue
index 212247a8ac..77b5028cb2 100644
--- a/packages/devops-admin/src/views/database/policies.vue
+++ b/packages/devops-admin/src/views/database/policies.vue
@@ -139,6 +139,7 @@
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import { db } from '../../api/cloud'
 import DeployPanel from '../deploy/components/deploy-panel.vue'
+import { Constants } from '../../api/constants'
 
 // 默认化创建表单的值
 function getDefaultFormValue() {
@@ -204,7 +205,7 @@ export default {
   },
   methods: {
     async getFunctions() {
-      const r = await db.collection('__functions')
+      const r = await db.collection(Constants.cn.functions)
         .where({ status: 1 })
         .get()
 
@@ -228,7 +229,7 @@ export default {
       }
 
       // 执行数据查询
-      const res = await db.collection('__policies')
+      const res = await db.collection(Constants.cn.policies)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -238,7 +239,7 @@ export default {
       this.list = res.data
 
       // 获取数据总数
-      const { total } = await db.collection('__policies')
+      const { total } = await db.collection(Constants.cn.policies)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -268,7 +269,7 @@ export default {
         if (!valid) { return }
 
         // 执行创建请求
-        const r = await db.collection('__policies')
+        const r = await db.collection(Constants.cn.policies)
           .add(this.form)
 
         if (!r.id) {
@@ -315,7 +316,7 @@ export default {
         }
 
         // 执行更新请求
-        const r = await db.collection('__policies')
+        const r = await db.collection(Constants.cn.policies)
           .where({ _id: this.form._id })
           .update(data)
 
@@ -343,7 +344,7 @@ export default {
       await this.$confirm('确认要删除此数据？', '删除确认')
 
       // 执行删除请求
-      const r = await db.collection('__policies')
+      const r = await db.collection(Constants.cn.policies)
         .where({ _id: row._id })
         .remove()
 
diff --git a/packages/devops-admin/src/views/database/policy.vue b/packages/devops-admin/src/views/database/policy.vue
index b468b36a7f..b5b420d7cf 100644
--- a/packages/devops-admin/src/views/database/policy.vue
+++ b/packages/devops-admin/src/views/database/policy.vue
@@ -17,7 +17,7 @@
     <div class="main-row">
       <div class="collection-list">
         <div class="label">选择集合</div>
-        <el-radio-group v-model="collection_name" style="width: 100%;">
+        <el-radio-group v-model="collection_name" class="radio-group">
           <el-radio v-for="item in collections" :key="item" class="collection-radio" border size="medium" :label="item">
             {{ item }}
           </el-radio>
@@ -29,7 +29,7 @@
           <el-button class="btn" size="mini" type="success" :disabled="loading" @click="updateRule">保存</el-button>
           <el-button class="btn" type="danger" size="mini" :disabled="loading" @click="removeRule">删除</el-button>
         </div>
-        <json-editor v-model="value" :dark="true" :height="600" />
+        <json-editor v-model="value" class="editor" :line-numbers="true" :dark="false" :height="600" />
       </div>
     </div>
 
@@ -76,6 +76,7 @@ import JsonEditor from '@/components/JsonEditor/rule'
 import { db } from '../../api/cloud'
 import $ from 'lodash'
 import { publishPolicy } from '../../api/publish'
+import { Constants } from '../../api/constants'
 
 const defaultValue = '{}'
 const defaultForm = {
@@ -125,7 +126,7 @@ export default {
   methods: {
     async getPolicies() {
       this.loading = true
-      const r = await db.collection('__policies')
+      const r = await db.collection(Constants.cn.policies)
         .get()
 
       if (!r.ok) {
@@ -154,7 +155,7 @@ export default {
       this.loading = true
       const rule_data = this.value
       const key = `rules.${this.collection_name}`
-      const r = await db.collection('__policies')
+      const r = await db.collection(Constants.cn.policies)
         .where({
           _id: this.policy_id
         })
@@ -187,7 +188,7 @@ export default {
       this.loading = true
 
       const key = `rules.${this.form.collection}`
-      const { total } = await db.collection('__policies')
+      const { total } = await db.collection(Constants.cn.policies)
         .where({
           _id: this.form.policy_id,
           [key]: db.command.exists(true)
@@ -198,7 +199,7 @@ export default {
         this.$message('该集合规则已存在！')
         return
       }
-      const r = await db.collection('__policies')
+      const r = await db.collection(Constants.cn.policies)
         .where({
           _id: this.form.policy_id,
           [key]: db.command.exists(false)
@@ -244,7 +245,7 @@ export default {
       this.loading = true
 
       const key = `rules.${this.collection_name}`
-      const r = await db.collection('__policies')
+      const r = await db.collection(Constants.cn.policies)
         .where({
           _id: this.policy_id,
           [key]: db.command.exists(true)
@@ -314,7 +315,9 @@ export default {
   display: flex;
 
   .collection-list {
-    width: 200px;
+    width: 250px;
+
+    padding-bottom: 10px;
     border-radius: 5px;
     box-sizing: border-box;
 
@@ -323,8 +326,20 @@ export default {
       color: gray;
       margin-bottom: 10px;
     }
-    .collection-radio {
+
+    .radio-group {
       width: 100%;
+      height: 640px;
+      overflow-y: scroll;
+      overflow-x: hidden;
+    }
+
+    .radio-group::-webkit-scrollbar {
+        display: none;
+    }
+
+    .collection-radio {
+      width: 80%;
       margin-bottom: 10px;
       margin-left: 0px;
     }
@@ -340,12 +355,16 @@ export default {
       display: flex;
       width: 400px;
       justify-content: flex-start;
-      margin-bottom: 5px;
+      margin-bottom: 10px;
 
       .btn {
         margin-left: 15px;
       }
     }
+
+    .editor {
+      border: 1px solid lightgray
+    }
   }
 }
 
diff --git a/packages/devops-admin/src/views/deploy/components/deploy-panel.vue b/packages/devops-admin/src/views/deploy/components/deploy-panel.vue
index 174221f6b6..83ecae580b 100644
--- a/packages/devops-admin/src/views/deploy/components/deploy-panel.vue
+++ b/packages/devops-admin/src/views/deploy/components/deploy-panel.vue
@@ -59,6 +59,7 @@
 <script>
 import { db } from '@/api/cloud'
 import { deploy2remote } from '@/api/deploy'
+import { Constants } from '../../../api/constants'
 
 // 表单验证规则
 const formRules = {
@@ -120,7 +121,7 @@ export default {
   },
   methods: {
     async load() {
-      const r = await db.collection('deploy_targets').get()
+      const r = await db.collection(Constants.cn.deploy_targets).get()
       if (!r.ok) throw new Error('get targets failed')
 
       this.targets = r.data
@@ -131,7 +132,7 @@ export default {
         return
       }
       const func_ids = this.internal_functions.map(func => func._id)
-      const r = await db.collection('__triggers')
+      const r = await db.collection(Constants.cn.triggers)
         .where({
           func_id: db.command.in(func_ids)
         })
diff --git a/packages/devops-admin/src/views/deploy/requests.vue b/packages/devops-admin/src/views/deploy/requests.vue
index dc73283c5e..3248222b17 100644
--- a/packages/devops-admin/src/views/deploy/requests.vue
+++ b/packages/devops-admin/src/views/deploy/requests.vue
@@ -139,6 +139,8 @@
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import { db } from '@/api/cloud'
 import { applyDeployRequest, createDeployToken } from '../../api/deploy'
+import { Constants } from '../../api/constants'
+
 // 默认的创建部署令牌表单
 function getDefaultFormValue() {
   return {
@@ -214,7 +216,7 @@ export default {
       }
 
       // 执行数据查询
-      const res = await db.collection('deploy_requests')
+      const res = await db.collection(Constants.cn.deploy_requests)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -224,7 +226,7 @@ export default {
       this.list = res.data
 
       // 获取数据总数
-      const { total } = await db.collection('deploy_requests')
+      const { total } = await db.collection(Constants.cn.deploy_requests)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -296,7 +298,7 @@ export default {
       await this.$confirm('确认要删除此数据？', '删除确认')
 
       // 执行删除请求
-      const r = await db.collection('deploy_requests')
+      const r = await db.collection(Constants.cn.deploy_requests)
         .where({ _id: row._id })
         .remove()
 
diff --git a/packages/devops-admin/src/views/deploy/targets.vue b/packages/devops-admin/src/views/deploy/targets.vue
index a935409c0c..2f2f350e3a 100644
--- a/packages/devops-admin/src/views/deploy/targets.vue
+++ b/packages/devops-admin/src/views/deploy/targets.vue
@@ -114,6 +114,7 @@
 <script>
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import { db } from '@/api/cloud'
+import { Constants } from '../../api/constants'
 
 // 默认化创建表单的值
 function getDefaultFormValue() {
@@ -191,7 +192,7 @@ export default {
       }
 
       // 执行数据查询
-      const res = await db.collection('deploy_targets')
+      const res = await db.collection(Constants.cn.deploy_targets)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -201,7 +202,7 @@ export default {
       this.list = res.data
 
       // 获取数据总数
-      const { total } = await db.collection('deploy_targets')
+      const { total } = await db.collection(Constants.cn.deploy_targets)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -231,7 +232,7 @@ export default {
         if (!valid) { return }
 
         // 执行创建请求
-        const r = await db.collection('deploy_targets')
+        const r = await db.collection(Constants.cn.deploy_targets)
           .add(this.form)
 
         if (!r.id) {
@@ -277,7 +278,7 @@ export default {
         }
 
         // 执行更新请求
-        const r = await db.collection('deploy_targets')
+        const r = await db.collection(Constants.cn.deploy_targets)
           .where({ _id: this.form._id })
           .update(data)
 
@@ -305,7 +306,7 @@ export default {
       await this.$confirm('确认要删除此数据？', '删除确认')
 
       // 执行删除请求
-      const r = await db.collection('deploy_targets')
+      const r = await db.collection(Constants.cn.deploy_targets)
         .where({ _id: row._id })
         .remove()
 
diff --git a/packages/devops-admin/src/views/development/function.vue b/packages/devops-admin/src/views/development/function.vue
index e6192d4f36..d45903a2a7 100644
--- a/packages/devops-admin/src/views/development/function.vue
+++ b/packages/devops-admin/src/views/development/function.vue
@@ -72,7 +72,7 @@
           <json-editor
             v-model="invokeParams"
             :line-numbers="false"
-            :height="200"
+            :height="300"
             :dark="false"
           />
         </div>
@@ -113,6 +113,7 @@ import { db, dbm_cloud } from '../../api/cloud'
 import { launchFunction } from '../../api/func'
 import { publishFunctions } from '../../api/publish'
 import { getDebugToken } from '../../utils/auth'
+import { Constants } from '../../api/constants'
 
 const defaultParamValue = {
   code: 'laf'
@@ -193,8 +194,7 @@ export default {
     async getFunction() {
       const func_id = this.func_id
       this.loading = true
-      const r = await db
-        .collection('__functions')
+      const r = await db.collection(Constants.cn.functions)
         .where({ _id: func_id })
         .getOne()
 
@@ -229,8 +229,7 @@ export default {
       if (typeof param !== 'string') {
         param = JSON.stringify(this.invokeParams)
       }
-      const r = await db
-        .collection('__functions')
+      const r = await db.collection(Constants.cn.functions)
         .where({
           _id: this.func._id
         })
diff --git a/packages/devops-admin/src/views/development/functions.vue b/packages/devops-admin/src/views/development/functions.vue
index f6844b7cd9..fd85c1270f 100644
--- a/packages/devops-admin/src/views/development/functions.vue
+++ b/packages/devops-admin/src/views/development/functions.vue
@@ -173,6 +173,7 @@
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import { db } from '../../api/cloud'
 import DeployPanel from '../deploy/components/deploy-panel.vue'
+import { Constants } from '../../api/constants'
 
 const defaultCode = `
 import cloud from '@/cloud-sdk'
@@ -264,7 +265,7 @@ export default {
   methods: {
     /** 获取所有标签 */
     async getAllTags() {
-      const r = await db.collection('__functions')
+      const r = await db.collection(Constants.cn.functions)
         .field(['tags'])
         .where({
           tags: db.command.exists(true)
@@ -303,7 +304,7 @@ export default {
       }
 
       // 执行数据查询
-      const res = await db.collection('__functions')
+      const res = await db.collection(Constants.cn.functions)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -313,7 +314,7 @@ export default {
       this.list = res.data
 
       // 获取数据总数
-      const { total } = await db.collection('__functions')
+      const { total } = await db.collection(Constants.cn.functions)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -347,7 +348,7 @@ export default {
         delete data['_tag_input']
 
         // 执行创建请求
-        const r = await db.collection('__functions')
+        const r = await db.collection(Constants.cn.functions)
           .add(data)
 
         if (!r.id) {
@@ -384,7 +385,7 @@ export default {
         if (!valid) { return }
 
         // 执行创建请求
-        const r = await db.collection('__functions')
+        const r = await db.collection(Constants.cn.functions)
           .where({ _id: this.form._id })
           .update({
             name: this.form.name,
@@ -425,7 +426,7 @@ export default {
 
       const $ = db.command
       // 执行删除请求
-      const r = await db.collection('__functions')
+      const r = await db.collection(Constants.cn.functions)
         .where({
           _id: row._id,
           status: 0,
diff --git a/packages/devops-admin/src/views/development/triggers.vue b/packages/devops-admin/src/views/development/triggers.vue
index 17f5f0ae4a..0e0075cd2a 100644
--- a/packages/devops-admin/src/views/development/triggers.vue
+++ b/packages/devops-admin/src/views/development/triggers.vue
@@ -158,6 +158,7 @@
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import { db } from '@/api/cloud'
 import { publishTriggers } from '@/api/publish'
+import { Constants } from '../../api/constants'
 
 // 默认化创建表单的值
 function getDefaultFormValue() {
@@ -234,8 +235,7 @@ export default {
     async getFunction() {
       const func_id = this.funcId
       this.loading = true
-      const r = await db
-        .collection('__functions')
+      const r = await db.collection(Constants.cn.functions)
         .where({ _id: func_id })
         .getOne()
 
@@ -270,7 +270,7 @@ export default {
       }
 
       // 执行数据查询
-      const res = await db.collection('__triggers')
+      const res = await db.collection(Constants.cn.triggers)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -280,7 +280,7 @@ export default {
       this.list = res.data
 
       // 获取数据总数
-      const { total } = await db.collection('__triggers')
+      const { total } = await db.collection(Constants.cn.triggers)
         .where(query)
         .limit(limit)
         .skip((page - 1) * limit)
@@ -325,7 +325,7 @@ export default {
         }
 
         // 执行创建请求
-        const r = await db.collection('__triggers')
+        const r = await db.collection(Constants.cn.triggers)
           .add(params)
 
         if (!r.id) {
@@ -361,7 +361,7 @@ export default {
         if (!valid) { return }
 
         // 执行创建请求
-        const r = await db.collection('__triggers')
+        const r = await db.collection(Constants.cn.triggers)
           .where({ _id: this.form._id })
           .update({
             name: this.form.name,
@@ -406,7 +406,7 @@ export default {
       await this.$confirm('确认要删除此数据？', '删除确认')
 
       // 执行删除请求
-      const r = await db.collection('__triggers')
+      const r = await db.collection(Constants.cn.triggers)
         .where({ _id: row._id, status: 0 })
         .remove()
 
diff --git a/packages/devops-admin/src/views/system/admin.vue b/packages/devops-admin/src/views/system/admin.vue
index 7301ccc20a..02827bcbb0 100644
--- a/packages/devops-admin/src/views/system/admin.vue
+++ b/packages/devops-admin/src/views/system/admin.vue
@@ -93,6 +93,7 @@ import { deepClone } from '@/utils'
 import { db } from '@/api/cloud'
 import * as user from '@/api/user'
 import { array2map, mergeMap2ArrayByKeyArray } from '../../utils/array'
+import { Constants } from '../../api/constants'
 
 const defaultForm = {
   _id: undefined,
@@ -123,7 +124,7 @@ export default {
   methods: {
     /** 获取管理员列表 */
     async getAdmins() {
-      const res = await db.collection('__admins')
+      const res = await db.collection(Constants.cn.admins)
         .get()
 
       const rolesMap = array2map(this.roles, 'name')
@@ -131,7 +132,7 @@ export default {
     },
     /** 获取所有的角色列表 */
     async getRoles() {
-      const res = await db.collection('__roles').get()
+      const res = await db.collection(Constants.cn.roles).get()
       this.roles = res.data || []
     },
     /** 打开添加表单  */
@@ -154,8 +155,7 @@ export default {
         type: 'warning'
       })
         .then(async() => {
-          const { ok } = await db
-            .collection('__admins')
+          const { ok } = await db.collection(Constants.cn.admins)
             .where({ _id: row._id })
             .remove()
           if (!ok) return
diff --git a/packages/devops-admin/src/views/system/role.vue b/packages/devops-admin/src/views/system/role.vue
index d9d8af4fb8..9ec7abfa55 100644
--- a/packages/devops-admin/src/views/system/role.vue
+++ b/packages/devops-admin/src/views/system/role.vue
@@ -100,6 +100,7 @@
 import { deepClone } from '@/utils'
 import { db } from '@/api/cloud'
 import { mergeMap2ArrayByKeyArray, array2map } from '@/utils/array'
+import { Constants } from '../../api/constants'
 
 const defaultForm = {
   _id: undefined,
@@ -125,8 +126,8 @@ export default {
   },
   methods: {
     async getRoles() {
-      const res = await db.collection('__roles').get()
-      const { data: permissions } = await db.collection('__permissions').get()
+      const res = await db.collection(Constants.cn.roles).get()
+      const { data: permissions } = await db.collection(Constants.cn.permissions).get()
       this.permissions = permissions
       const permsMap = array2map(permissions, 'name')
       this.rolesList = mergeMap2ArrayByKeyArray(permsMap, res.data, 'permissions', 'full_permissions')
@@ -151,8 +152,7 @@ export default {
         type: 'warning'
       })
         .then(async() => {
-          const r = await db
-            .collection('__roles')
+          const r = await db.collection(Constants.cn.roles)
             .where({ name: row.name })
             .remove()
           if (!r.ok) return
@@ -170,8 +170,7 @@ export default {
       const isEdit = this.dialogType === 'edit'
 
       if (isEdit) {
-        const { ok } = await db
-          .collection('__roles')
+        const { ok } = await db.collection(Constants.cn.roles)
           .where({ _id: this.role._id })
           .update({
             name: this.role.name,
@@ -182,7 +181,7 @@ export default {
         if (!ok) return
         this.getRoles()
       } else {
-        const { ok } = await db.collection('__roles').add(this.role)
+        const { ok } = await db.collection(Constants.cn.roles).add(this.role)
         if (!ok) return
         this.getRoles()
       }