vue2-client 1.2.116 → 1.3.1

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

@@ -83,6 +83,8 @@ export default {
       isFormShow: true,
       // 当使用logic获取到表单表格配置时, 将配置对象直接传入到x-table用于查询
       queryParams: null,
+      // 服务名称
+      serviceName: 'af-system',
       // 表格列集合
       tableColumns: [],
       // 操作按钮集合
@@ -187,32 +189,13 @@ export default {
   watch: {
     logicParam: {
       handler () {
-        this.mainLoading = true
-        this.form = {}
-        indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, commonApi.getColumnsJson, { logic: this.logicName, logicParam: this.logicParam }, (ret) => {
-          this.queryParams = ret
-          this.tableColumns = ret.columnJson
-          this.formItems = ret.formJson
-          this.buttonState = ret.buttonState
-          this.customAoM = ret.customAoM
-          this.customQuery = ret.customQuery
-          this.mainLoading = false
-          this.loaded = true
-        })
+        this.getColumnJsonByLogic()
       },
       deep: true
     },
     fixedQueryForm: {
       handler () {
-        this.form = {}
-        indexedDB.getByWeb(this.queryParamsName, commonApi.getColumnsJson, { str: this.queryParamsName }, (ret) => {
-          this.tableColumns = ret.columnJson
-          this.formItems = ret.formJson
-          this.buttonState = ret.buttonState
-          this.customAoM = ret.customAoM
-          this.customQuery = ret.customQuery
-          this.loaded = true
-        })
+        this.getColumnsJson()
       },
       deep: true
     },
@@ -237,29 +220,35 @@ export default {
     clearRowKeys () {
       this.$refs.xTable.clearRowKeys()
     },
+    setParams (res) {
+      this.tableColumns = res.columnJson
+      this.formItems = res.formJson
+      this.buttonState = res.buttonState
+      this.serviceName = res.serviceName
+      this.customAoM = res.customAoM
+      this.customQuery = res.customQuery
+      this.mainLoading = false
+      this.loaded = true
+    },
+    getColumnsJson () {
+      this.mainLoading = true
+      indexedDB.getByWeb(this.queryParamsName, commonApi.getColumnsJson, { str: this.queryParamsName }, (ret) => {
+        this.setParams(ret)
+      })
+    },
     getColumnsJsonBySource () {
       this.mainLoading = true
       post(commonApi.getColumnsJson, { queryObject: this.queryParamsJson }).then(res => {
         this.queryParams = res
-        this.tableColumns = this.queryParams.columnJson
-        this.formItems = this.queryParams.formJson
-        this.buttonState = this.queryParams.buttonState
-        this.customAoM = this.queryParams.customAoM
-        this.customQuery = this.queryParams.customQuery
-        this.mainLoading = false
-        this.loaded = true
+        this.setParams(res)
       })
     },
-    getColumnsJson () {
+    getColumnJsonByLogic () {
+      this.form = {}
       this.mainLoading = true
-      indexedDB.getByWeb(this.queryParamsName, commonApi.getColumnsJson, { str: this.queryParamsName }, (ret) => {
-        this.tableColumns = ret.columnJson
-        this.formItems = ret.formJson
-        this.buttonState = ret.buttonState
-        this.customAoM = ret.customAoM
-        this.customQuery = ret.customQuery
-        this.mainLoading = false
-        this.loaded = true
+      indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, commonApi.getColumnsJson, { logic: this.logicName, logicParam: this.logicParam }, (ret) => {
+        this.queryParams = ret
+        this.setParams(ret)
       })
     },
     // 查询表单提交
@@ -273,7 +262,7 @@ export default {
         return false
       }
     },
-    // TODO 新增/修改数据表单提交
+    // 新增/修改数据表单提交
     onAddOrModify (res) {
       if (this.viewMode) {
         this.$message.info('预览模式禁止新增')
@@ -300,10 +289,10 @@ export default {
           const realKey = key.substring(key.indexOf('_') + 1)
           requestParameters.form[realKey] = res.form[key]
         }
-      if (!this.customAoM || this.customAoM?.length === 0) {
+        if (!this.customAoM || this.customAoM?.length === 0) {
           this.customAoM = undefined
         }
-        addOrModify(requestParameters, this.customAoM).then(res => {
+        addOrModify(requestParameters, this.customAoM, this.serviceName).then(res => {
           this.$message.success(this.businessType + '成功！')
           this.loading = false
           this.modelVisible = false
@@ -329,7 +318,7 @@ export default {
         }
       }
       if (!this.isTableTemp) {
-        result = query(requestParameters)
+        result = query(requestParameters, undefined, this.serviceName)
       }
       this.$emit('afterQuery', result)
       callback(result)
@@ -364,7 +353,7 @@ export default {
         if (!this.customQuery || this.customQuery?.length === 0) {
           this.customQuery = undefined
         }
-        queryWithResource(requestParameters, this.customQuery).then(res => {
+        queryWithResource(requestParameters, this.customQuery, this.serviceName).then(res => {
           this.modifyModelData = { data: res.data[0], images: res.images, files: res.files }
           this.modelVisible = true
           this.editDataLoading = false
@@ -391,7 +380,7 @@ export default {
             queryParamsName: this.queryParamsName,
             idList: this.selectedRowKeys
           }
-          remove(requestParameters).then(res => {
+          remove(requestParameters, undefined, this.serviceName).then(res => {
             this.loading = false
             this.$message.success('删除成功！')
             this.$refs.xTable.clearRowKeys()