vue2-client 1.6.48 → 1.7.0

package/src/base-client/components/common/CreateSimpleFormQuery/CreateSimpleFormQueryItem.vue

@@ -447,7 +447,7 @@ export default {
     // 获取所有仓库
     getStocks () {
       if (this.stockList.length === 0) {
-        post('/api/af-system/logic/getFilesStock', {}).then(res => {
+        post('/api/system/logic/getFilesStock', {}).then(res => {
           this.stockList = res.sort((a, b) => b.progress - a.progress)
         }).catch(e => {})
       }

package/src/base-client/components/common/FormGroupEdit/FormGroupEdit.vue

@@ -29,7 +29,8 @@
 <script>
 import { mapState } from 'vuex'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi, post } from '@vue2-client/services/api'
+import { post } from '@vue2-client/services/api'
+import { getConfigUrl } from '@vue2-client/services/api/common'
 
 export default {
   name: 'FormGroupEdit',
@@ -58,6 +59,10 @@ export default {
       type: Boolean,
       default: false
     },
+    serviceName: {
+      type: String,
+      default: undefined
+    },
     modifyModelData: {
       type: Object,
       default: () => {
@@ -80,7 +85,8 @@ export default {
       })
     },
     toEdit (item) {
-      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
+      const url = getConfigUrl(this.serviceName)
+      post(url, { queryObject: item }).then(res => {
         this.formObj = res
         this.$refs.xAddForm.init({
           formItems: res.formJson,

package/src/base-client/components/common/Upload/Upload.vue

@@ -68,7 +68,7 @@ export default {
     },
     serviceName: {
       type: String,
-      default: 'af-system'
+      default: 'system'
     }
   },
   computed: {
@@ -117,9 +117,9 @@ export default {
       formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
       formData.append('f_operator', this.currUser ? this.currUser.username : '')
 
-      // const url = '/api/af-system/resource'
+      // const url = '/api/system/resource'
       // if (process.env.NODE_ENV === 'production') {
-      //   url = `/${this.model.stockAlias}/af-system/resource`
+      //   url = `/${this.model.stockAlias}/system/resource`
       // }
       upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
         // 根据服务端返回的结果判断成功与否，设置文件条目的状态

package/src/base-client/components/common/XAddForm/XAddForm.vue

@@ -75,7 +75,7 @@ export default {
         // 表单项集合
         formItems: [],
         // 服务名称
-        serviceName: 'af-system',
+        serviceName: 'system',
         // 修改有文件的表单时使用
         files: [],
         images: [],
@@ -109,7 +109,7 @@ export default {
     },
     methods: {
       init (params) {
-        const { isShow = true, formItems, viewMode, isTableTemp, serviceName = 'af-system' } = params
+        const { isShow = true, formItems, viewMode, isTableTemp, serviceName = 'system' } = params
         if (isShow) {
           this.isShow = true
           this.formItems = JSON.parse(JSON.stringify(formItems))

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -76,7 +76,7 @@ export default {
       },
       serviceName: {
         type: String,
-        default: 'af-system'
+        default: 'system'
       },
       // 业务类型
       businessType: {

package/src/base-client/components/common/XForm/XForm.vue

@@ -67,7 +67,7 @@ export default {
       // 内容加载是否完成
       loaded: false,
       // 服务名称
-      serviceName: 'af-system',
+      serviceName: 'system',
       // 是否展开条件
       advanced: false,
       // 表单Model
@@ -94,7 +94,7 @@ export default {
   methods: {
     init (params) {
       const {
-        formItems, serviceName = 'af-system'
+        formItems, serviceName = 'system'
       } = params
       this.loaded = false
       this.formItems = JSON.parse(JSON.stringify(formItems))

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -370,7 +370,7 @@ export default {
     },
     serviceName: {
       type: String,
-      default: 'af-system'
+      default: 'system'
     },
     // 调用logic获取数据源的追加参数
     getDataParams: {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -49,7 +49,7 @@ import XForm from '@vue2-client/base-client/components/common/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { addOrModify, commonApi } from '@vue2-client/services/api/common'
+import { addOrModify, getConfigUrl } from '@vue2-client/services/api/common'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api/restTools'
@@ -87,6 +87,11 @@ export default {
       type: String,
       default: null
     },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
     // 查询配置文件Json，用于查询配置生成器的预览
     queryParamsJson: {
       type: Object,
@@ -171,19 +176,22 @@ export default {
   methods: {
     getColumnsJson () {
       this.loading = true
-      indexedDB.getByWeb(this.queryParamsName, commonApi.getColumnsJson, { str: this.queryParamsName }, (res) => {
+      const url = getConfigUrl(this.serviceName)
+      indexedDB.getByWeb(this.queryParamsName, url, { configName: this.queryParamsName }, (res) => {
         this.updateComponents(res)
       })
     },
     getColumnsJsonBySource () {
       this.loading = true
-      post(commonApi.getColumnsJson, { queryObject: this.queryParamsJson }).then(res => {
+      const url = getConfigUrl(this.serviceName)
+      post(url, { queryObject: this.queryParamsJson }).then(res => {
         this.updateComponents(res, true)
       })
     },
     getColumnJsonByLogic () {
       this.loading = true
-      indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, commonApi.getColumnsJson, { logic: this.logicName, logicParam: this.logicParam }, (res) => {
+      const url = getConfigUrl(this.serviceName)
+      indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, url, { logic: this.logicName, logicParam: this.logicParam }, (res) => {
         this.updateComponents(res, true)
       })
     },

package/src/base-client/components/common/XImportExcel/XImportExcel.vue

@@ -44,7 +44,7 @@ export default {
   props: {
     serviceName: {
       type: String,
-      default: 'af-system'
+      default: 'system'
     },
     queryParamsName: {
       type: String,