fix(system-client): fix dbm pages;

maslow · Sep 3, 2021 · e0f44da · e0f44da
1 parent cf9186d
commit e0f44da
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/packages/system-client/src/api/cloud.js b/packages/system-client/src/api/cloud.js
@@ -29,13 +29,3 @@ export const cloud = new Cloud({
 })
 
 export const db = cloud.database()
-
-/**
- * 用于数据库管理
- */
-export const dbm_cloud = new Cloud({
-  baseUrl: process.env.VUE_APP_BASE_API,
-  entryUrl: '/dbm/entry',
-  getAccessToken: getToken,
-  requestClass: CloudRequest
-})
diff --git a/packages/system-client/src/api/collec.js b/packages/system-client/src/api/collec.js
@@ -1,21 +1,29 @@
 import request from '@/utils/request'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+import { Cloud } from 'less-api-client'
 
 /**
- * 获取集合列表
+ * Get collection list
+ * @param {*} query
+ * @param {*} page
+ * @param {*} pageSize
  */
 export function getCollections() {
+  const appid = store.state.app.appid
   return request({
-    url: `/dbm/collections`,
+    url: `/apps/${appid}/dbm/collections`,
     method: 'get'
   })
 }
 
 /**
  * 获取集合的索引信息
  */
-export function getCollectionIndexes(collection = 'functions') {
+export function getCollectionIndexes(collection) {
+  const appid = store.state.app.appid
   return request({
-    url: `/dbm/collection/indexes?collection=${collection}`,
+    url: `/apps/${appid}/dbm/collection/indexes?collection=${collection}`,
     method: 'get'
   })
 }
@@ -26,8 +34,9 @@ export function getCollectionIndexes(collection = 'functions') {
  * @return
  */
 export function setCollectionIndexes(collection, data) {
+  const appid = store.state.app.appid
   return request({
-    url: `/dbm/collection/indexes?collection=${collection}`,
+    url: `/apps/${appid}/dbm/collection/indexes?collection=${collection}`,
     method: 'post',
     data
   })
@@ -39,9 +48,25 @@ export function setCollectionIndexes(collection, data) {
  * @param {String} index 索引名
  * @returns
  */
-export function deleCollectionIndexe(collection, index) {
+export function deleCollectionIndex(collection, index) {
+  const appid = store.state.app.appid
   return request({
-    url: `/dbm/collection/indexes?collection=${collection}&index=${index}`,
+    url: `/apps/${appid}/dbm/collection/indexes?collection=${collection}&index=${index}`,
     method: 'delete'
   })
 }
+
+/**
+ * Get a Db instance for dbm
+ * @returns
+ */
+export function getDb() {
+  const appid = store.state.app.appid
+  const dbm_cloud = new Cloud({
+    baseUrl: process.env.VUE_APP_BASE_API,
+    entryUrl: `/apps/${appid}/dbm/entry`,
+    getAccessToken: getToken
+  })
+
+  return dbm_cloud.database()
+}
diff --git a/packages/system-client/src/views/application/index.vue b/packages/system-client/src/views/application/index.vue
@@ -27,7 +27,7 @@
           {{ scope.row.status }}
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="服务启停" align="center" width="380" class-name="small-padding">
+      <el-table-column label="服务启停" align="center" width="200" class-name="small-padding">
         <template slot-scope="{row}">
           <el-button v-if="row.status !== 'running'" plain type="warning" size="mini" @click="startApp(row)">
             启动

diff --git a/packages/system-client/src/views/database/collections.vue b/packages/system-client/src/views/database/collections.vue
@@ -125,14 +125,12 @@
 </template>
 
 <script>
-import { dbm_cloud } from '@/api/cloud'
-import { getCollections, getCollectionIndexes, deleCollectionIndexe, setCollectionIndexes } from '@/api/collec'
-// import { TYPES } from '@/utils/types'
 
+import { getCollections, getCollectionIndexes, deleCollectionIndex, setCollectionIndexes, getDb } from '@/api/collec'
 import MiniPagination from '@/components/Pagination/mini'
 import JsonEditor from '@/components/JsonEditor/param'
 
-const db = dbm_cloud.database()
+const db = getDb()
 
 export default {
   name: 'CollectionManagement',
@@ -294,7 +292,7 @@ export default {
 
     async deleIndex(index) {
       await this.$confirm('确认要删除此数据？', '删除确认')
-      await deleCollectionIndexe(this.collectionName, index.name)
+      await deleCollectionIndex(this.collectionName, index.name)
 
       this.$message('删除成功')
       this.getIndexes()