vue2-client 1.7.2 → 1.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",

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

@@ -52,10 +52,10 @@
 </template>
 <script>
 
-import { post } from '@vue2-client/services/api'
 import { GetGDMap } from '@vue2-client/utils/map-utils'
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 import { mapState } from 'vuex'
+import { runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'AddressSearchCombobox',
@@ -196,7 +196,7 @@ export default {
       if (value !== '') {
         const logicName = this.attr.keyName
         const logic = logicName.substring(6)
-        post('/api/system/logic/' + logic, value).then(res => {
+        runLogic(logic, value, 'af-system').then(res => {
           callback(res)
         })
       }

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

@@ -556,10 +556,10 @@ export default {
       this.form.joinArray = joinArrayObject
     },
     exportJson () {
-      const data = JSON.stringify(this.form, null, 2)
+      const data = JSON.stringify(this.result, null, 2)
       const blob = new Blob([data], { type: 'application/json' })
       FileSaver.saveAs(blob, `Query.json`)
-      this.$message.success('导出成功!')
+      this.$message.success('导出到本地成功，请复制内容到琉璃配置中心中')
     },
     viewHandle (then) {
       if (this.form.column.length === 0) {
@@ -604,7 +604,7 @@ export default {
         if (valid) {
           this.viewHandle(() => {
             // saveQueryParams
-            this.$emit('saveQueryParams', this.result)
+            this.exportJson()
           })
         }
       })

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -348,8 +348,9 @@ import {
   addOrEditType,
   selectDataType
 } from '@vue2-client/config/CreateQueryConfig'
-import { commonApi, post } from '@vue2-client/services/api'
+import { post } from '@vue2-client/services/api'
 import JsonViewer from 'vue-json-viewer'
+import { getDictionaryParam } from '@vue2-client/services/api/common'
 
 const DemoJson = [{
   value: 'zhejiang',
@@ -522,7 +523,7 @@ export default {
     flashModal (show = 'None') {
       const bool = show === 'None' ? !this.visible : !!show
       if (bool && this.option.length === 0) {
-        post(commonApi.getDictionaryParam, {}).then(res => {
+        getDictionaryParam().then(res => {
           this.option = res
         })
       }
@@ -632,7 +633,7 @@ export default {
     // 获取所有仓库
     getStocks () {
       if (this.stockList.length === 0) {
-        post('/api/system/logic/getFilesStock', {}).then(res => {
+        post('/api/af-system/logic/getFilesStock', {}).then(res => {
           this.stockList = res.sort((a, b) => b.progress - a.progress)
         }).catch(e => {})
       }

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

@@ -130,7 +130,7 @@ import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api'
-import { getConfigUrl } from '@vue2-client/services/api/common'
+import { parseConfigUrl } from '@vue2-client/services/api/common'
 
 export default {
   name: 'CreateSimpleFormQuery',
@@ -352,10 +352,10 @@ export default {
     changeJoinArray () {
     },
     exportJson () {
-      const data = JSON.stringify(this.form, null, 2)
+      const data = JSON.stringify(this.result, null, 2)
       const blob = new Blob([data], { type: 'application/json' })
       FileSaver.saveAs(blob, `SimpleFormQuery.json`)
-      this.$message.success('导出成功!')
+      this.$message.success('导出到本地成功，请复制内容到琉璃配置中心中')
     },
     viewHandle (then) {
       if (this.form.column.length === 0) {
@@ -382,13 +382,16 @@ export default {
       this.$refs.businessCreateForm.validate(valid => {
         if (valid) {
           this.viewHandle(() => {
-            const url = getConfigUrl(this.serviceName)
-            post(url, { queryObject: this.result }).then(res => {
+            const url = parseConfigUrl(this.serviceName)
+            post(url, {
+              configType: 'SIMPLE_FORM',
+              configContent: this.result
+            }).then(res => {
               this.$refs.xAddForm.init({
                 businessType: '新增',
                 title: '效果预览',
                 formItems: res.formJson,
-                serviceName: res.serviceName,
+                serviceName: this.serviceName,
                 viewMode: true
               })
             })
@@ -401,7 +404,7 @@ export default {
         if (valid) {
           this.viewHandle(() => {
             // saveQueryParams
-            this.$emit('saveSimpleFormQueryParams', this.result)
+            this.exportJson()
           })
         }
       })

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

@@ -249,8 +249,9 @@ import {
   addOrEditType,
   selectDataType
 } from '@vue2-client/config/CreateQueryConfig'
-import { commonApi, post } from '@vue2-client/services/api'
+import { post } from '@vue2-client/services/api'
 import JsonViewer from 'vue-json-viewer'
+import { getDictionaryParam } from '@vue2-client/services/api/common'
 
 const DemoJson = [{
   value: 'zhejiang',
@@ -366,7 +367,7 @@ export default {
     flashModal (show = 'None') {
       const bool = show === 'None' ? !this.visible : !!show
       if (bool && this.option.length === 0) {
-        post(commonApi.getDictionaryParam, {}).then(res => {
+        getDictionaryParam().then(res => {
           this.option = res
         })
       }
@@ -449,7 +450,7 @@ export default {
     // 获取所有仓库
     getStocks () {
       if (this.stockList.length === 0) {
-        post('/api/system/logic/getFilesStock', {}).then(res => {
+        post('/api/af-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,8 +29,7 @@
 <script>
 import { mapState } from 'vuex'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { post } from '@vue2-client/services/api'
-import { getConfigUrl } from '@vue2-client/services/api/common'
+import { parseConfig } from '@vue2-client/services/api/common'
 
 export default {
   name: 'FormGroupEdit',
@@ -85,15 +84,14 @@ export default {
       })
     },
     toEdit (item) {
-      const url = getConfigUrl(this.serviceName)
-      post(url, { queryObject: item }).then(res => {
+      parseConfig(item, 'SIMPLE_FORM', this.serviceName).then(res => {
         this.formObj = res
         const modifyModelData = { data: this.modifyModelData[res.groupName] }
         this.$refs.xAddForm.init({
           businessType: '修改',
           title: '参数项',
           formItems: res.formJson,
-          serviceName: res.serviceName,
+          serviceName: this.serviceName,
           modifyModelData: modifyModelData
         })
       })

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

@@ -35,9 +35,8 @@
 
 <script>
 
-import { post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
-import { upload } from '@vue2-client/services/api/common'
+import { fileDelete, upload } from '@vue2-client/services/api/common'
 
 export default {
   name: 'uploads',
@@ -68,7 +67,7 @@ export default {
     },
     serviceName: {
       type: String,
-      default: 'system'
+      default: undefined
     }
   },
   computed: {
@@ -117,10 +116,6 @@ export default {
       formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
       formData.append('f_operator', this.currUser ? this.currUser.username : '')
 
-      // const url = '/api/system/resource'
-      // if (process.env.NODE_ENV === 'production') {
-      //   url = `/${this.model.stockAlias}/system/resource`
-      // }
       upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
         // 根据服务端返回的结果判断成功与否，设置文件条目的状态
         if (res.success) {
@@ -150,8 +145,8 @@ export default {
     // 删除文件
     deleteFileItem (file) {
       if (file.id) {
-        post('/api/' + this.serviceName + '/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
-        }).catch(e => { })
+        fileDelete({ id: file.id, f_state: '删除' })
+          .then(res => {}).catch(e => { })
       }
       // 找到当前文件所在列表的索引
       const index = this.uploadedFileList.indexOf(file)

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

@@ -41,7 +41,7 @@
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api'
+import { runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XAddNativeForm',
@@ -69,7 +69,7 @@ export default {
       // 表单项集合
       formItems: [],
       // 服务名称
-      serviceName: 'system',
+      serviceName: undefined,
       // 修改有文件的表单时使用
       files: [],
       images: [],
@@ -110,7 +110,7 @@ export default {
   methods: {
     init (params) {
       const {
-        formItems, viewMode, isHandleFormKey = true, serviceName = 'system', isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+        formItems, viewMode, isHandleFormKey = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
       } = params
       this.loaded = false
       if (typeof formItems === 'string') {
@@ -262,7 +262,8 @@ export default {
           }
           // 通过请求追加静默新增：自定义字段
           for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
-            requestForm[item.model] = await this.getSilenceSource(item.silenceSource, requestForm)
+            // 获取通过logic静默新增的字段
+            requestForm[item.model] = await runLogic(item.silenceSource, requestForm, this.serviceName)
           }
         }
         // 如果是临时表
@@ -301,15 +302,6 @@ export default {
         })
       })
     },
-    /**
-     * 获取通过logic静默新增的字段
-     * @param logicName logic名称
-     * @param requestParameters 请求参数
-     */
-    async getSilenceSource (logicName, requestParameters) {
-      const result = await post('/api/' + this.serviceName + '/logic/' + logicName, requestParameters)
-      return result
-    },
     // 获取表单字段实际值
     getRealKey (key) {
       if (this.isHandleFormKey) {

package/src/base-client/components/common/XAddNativeForm/index.md

@@ -70,7 +70,7 @@ export default {
           if (this.$refs.nativeForm) {
             this.$refs.nativeForm.init({
               formItems: res,
-              serviceName: 'system',
+              serviceName: 'af-iot',
               businessType: '新增',
               title: '新增告警记录'
             })

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

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

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

@@ -304,7 +304,6 @@
 </template>
 <script>
 
-import { post } from '@vue2-client/services/api'
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
 import XBadge from '@vue2-client/base-client/components/common/XBadge'
@@ -314,6 +313,7 @@ import AddressSearchCombobox from '@vue2-client/base-client/components/common/Ad
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
+import { runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XFormItem',
@@ -378,7 +378,7 @@ export default {
     },
     serviceName: {
       type: String,
-      default: 'system'
+      default: undefined
     },
     // 调用logic获取数据源的追加参数
     getDataParams: {
@@ -401,8 +401,8 @@ export default {
         const value = newVal[this.attr.model]
         const isEmpty = !value || !value.toString()
         // 查询表单点击重置按钮时清空树形选择框选中状态
-        if (this.attr.type === 'treeSelect' && isEmpty) {
-          this.$refs.xTreeSelect.setValue(undefined)
+        if (this.$refs.XTreeSelect && this.attr.type === 'treeSelect' && isEmpty) {
+            this.$refs.xTreeSelect.setValue(undefined)
         }
       },
       deep: true
@@ -498,7 +498,7 @@ export default {
         if (this.getDataParams && this.getDataParams[this.attr.model]) {
           Object.assign(value, this.getDataParams[this.attr.model])
         }
-        post('/api/' + this.serviceName + '/logic/' + logic, value).then(res => {
+        runLogic(logic, value, this.serviceName).then(res => {
           callback(res)
         })
       }

package/src/base-client/components/common/XForm/index.md

@@ -165,8 +165,8 @@ export default {
       }
     },
     methods: {
-      getColumnsJson () {
-        Vue.resetpost(commonApi.getColumnsJson, {str: this.queryParamsName}).then((res) => {
+      getConfig () {
+        Vue.resetpost(commonApi.getConfig, {str: this.queryParamsName}).then((res) => {
           this.formItemJson = res.formJson
           this.columnItemJson = res.columnJson
           this.loaded = true

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

@@ -50,10 +50,8 @@ 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, getConfigUrl } from '@vue2-client/services/api/common'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
+import { addOrModify, getConfig, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
 
 export default {
   name: 'XFormTable',
@@ -159,42 +157,39 @@ export default {
     },
     queryParamsJson: {
       handler () {
-        this.getColumnsJsonBySource()
+        this.getConfigBySource()
       },
       deep: true
     },
     queryParamsName: {
       handler () {
-        this.getColumnsJson()
+        this.getConfig()
       }
     }
   },
   created () {
     if (this.queryParamsName) {
-      this.getColumnsJson()
+      this.getConfig()
     } else if (this.queryParamsJson) {
-      this.getColumnsJsonBySource()
+      this.getConfigBySource()
     }
   },
   methods: {
-    getColumnsJson () {
+    getConfig () {
       this.loading = true
-      const url = getConfigUrl(this.serviceName)
-      indexedDB.getByWeb(this.queryParamsName, url, { configName: this.queryParamsName }, (res) => {
+      getConfig(this.queryParamsName, this.serviceName, (res) => {
         this.updateComponents(res)
       })
     },
-    getColumnsJsonBySource () {
+    getConfigBySource () {
       this.loading = true
-      const url = getConfigUrl(this.serviceName)
-      post(url, { queryObject: this.queryParamsJson }).then(res => {
+      parseConfig(this.queryParamsJson, 'CRUD_FORM', this.serviceName).then(res => {
         this.updateComponents(res, true)
       })
     },
     getColumnJsonByLogic () {
       this.loading = true
-      const url = getConfigUrl(this.serviceName)
-      indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, url, { logic: this.logicName, logicParam: this.logicParam }, (res) => {
+      getConfigByLogic(this.logicName, this.logicParam, this.serviceName, (res) => {
         this.updateComponents(res, true)
       })
     },
@@ -213,11 +208,11 @@ export default {
           title: this.title,
           viewMode: this.viewMode,
           isTableTemp: this.isTableTemp,
-          serviceName: res.serviceName
+          serviceName: this.serviceName
         })
         this.$refs.xForm.init({
           formItems: res.formJson,
-          serviceName: res.serviceName,
+          serviceName: this.serviceName,
           getDataParams: this.getDataParams
         })
       }
@@ -249,7 +244,7 @@ export default {
         businessType: res.businessType,
         operator: res.currUserName
       }
-      addOrModify(requestParameters, res.serviceName).then(data => {
+      addOrModify(requestParameters, this.serviceName).then(data => {
         this.$message.success(res.businessType + '成功！')
         this.refreshTable(res.businessType === '新增')
         // commit
@@ -289,7 +284,7 @@ export default {
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
-        serviceName: res.serviceName,
+        serviceName: this.serviceName,
         fixedAddForm: this.fixedAddForm,
         getDataParams: this.getDataParams
       })
@@ -307,7 +302,7 @@ export default {
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
-        serviceName: res.serviceName,
+        serviceName: this.serviceName,
         fixedAddForm: this.fixedAddForm,
         getDataParams: this.getDataParams,
         modifyModelData: modifyModelData

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

@@ -161,7 +161,7 @@ export default {
       // 是否允许删除
       isDelete: false,
       // 服务名称
-      serviceName: 'system',
+      serviceName: undefined,
       // 选中用于修改的id
       selectId: undefined,
       // 是否为临时表
@@ -225,7 +225,7 @@ export default {
         tableColumns,
         buttonState,
         title,
-        serviceName = 'system',
+        serviceName,
         viewMode
       } = params
       this.queryParams = queryParams

package/src/base-client/components/common/XTable/index.md

@@ -242,8 +242,8 @@ export default {
       }
     },
     methods: {
-      getColumnsJson () {
-        Vue.resetpost(commonApi.getColumnsJson, {str: this.queryParamsName}).then((res) => {
+      getConfig () {
+        Vue.resetpost(commonApi.getConfig, {str: this.queryParamsName}).then((res) => {
           this.formItemJson = res.formJson
           this.columnItemJson = res.columnJson
           this.loaded = true

package/src/base-client/components/system/QueryParamsDetailsView/QueryParamsDetailsView.vue

@@ -182,7 +182,7 @@ export default {
     },
     // 存储查询配置信息
     saveQueryParams (source) {
-      return post('/api/system/logic/updateQueryParamsData', {
+      return post('/api/af-system/logic/updateQueryParamsData', {
         id: this.id,
         source: source
       }).then(res => {

package/src/base-client/components/ticket/TicketDetailsView/TicketDetailsView.vue

@@ -36,7 +36,7 @@
               :before-upload="beforeUpload"
               :file-list="fileList"
               :remove="remove"
-              action="/api/system/file/upload"
+              action="/api/af-system/file/upload"
               list-type="picture-card"
               name="avatar"
               @change="handleChange"

package/src/base-client/components/ticket/TicketSubmitSuccessView/TicketSubmitSuccessView.vue

@@ -22,7 +22,7 @@
           :before-upload="beforeUpload"
           :file-list="fileList"
           :remove="remove"
-          action="/api/system/file/upload"
+          action="/api/af-system/file/upload"
           list-type="picture-card"
           name="avatar"
           @change="handleChange"

package/src/config/default/setting.config.js

@@ -35,6 +35,8 @@ module.exports = {
   },
   footerLinks: [ // 页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
   ],
+  // 配置的默认命名空间
+  defaultServiceName: 'af-system',
   // 旧系统路径
   iframeSrc: '../singlepage/page.html',
   // 兼容旧版本 V3(最新V3产品)  OA(公司OA)

package/src/layouts/header/HeaderNotice.vue

@@ -86,7 +86,7 @@ export default {
       this.institutionDetailVisible = false
       try {
         if (this.$login.f.name) {
-          post('/api/system/logic/getTodo', { name: this.$login.f.name }).then(res => {
+          post('/api/af-system/logic/getTodo', { name: this.$login.f.name }).then(res => {
             this.backlog = [...res]
             if (this.backlog.length > 0) {
               const key = `open${Date.now()}`

package/src/layouts/header/InstitutionDetail.vue

@@ -81,7 +81,7 @@ export default {
         return
       }
       const otherFiles = []
-      post('/api/system/logic/getInstitutionDetail', {
+      post('/api/af-system/logic/getInstitutionDetail', {
         id: this.institutionId
       }).then(res => {
         res.files.forEach(item => {
@@ -116,7 +116,7 @@ export default {
       a.click()
     },
     confirm_institution () {
-      post('/api/system/logic/affirmInstitution', {
+      post('/api/af-system/logic/affirmInstitution', {
         data: {
           tobe: [
             {

package/src/pages/CreateQueryPage.vue

@@ -2,24 +2,34 @@
   <div>
     <create-query
       :visible.sync="visible"
-      @saveQueryParams="saveQueryParams"
+      :to-edit-json="toEditJson"
     />
     <create-simple-form-query
       :visible.sync="createSimpleFormVisible"
-      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
+      :to-edit-json="toEditSimpleFormJson"
     />
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具
+    <a-modal
+      :visible="importJsonVisible"
+      title="导入JSON配置"
+      @cancel="importJsonVisible = false"
+      @ok="importJsonHandleOk"
+    >
+      <a-textarea v-model="importEditJson" placeholder="输入现有的JSON配置"/>
+    </a-modal>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">创建查询配置
     </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="openImportView(1)">导入已有查询配置
+    </a-button>
+    <br/>
     <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
-      打开基础表单配置生成工具
+      创建简易表单配置
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="openImportView(2)">导入已有简易表单配置
     </a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="searchReport">请求数据</a-button>
-    <!--    <webmeter-analysis-view/>-->
   </div>
 </template>
 
 <script>
-import { post } from '@vue2-client/services/api/restTools'
 import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
 import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
 
@@ -32,7 +42,12 @@ export default {
   data () {
     return {
       visible: false,
-      createSimpleFormVisible: false
+      createSimpleFormVisible: false,
+      toEditJson: undefined,
+      toEditSimpleFormJson: undefined,
+      importJsonVisible: false,
+      type: undefined,
+      importEditJson: ''
     }
   },
   methods: {
@@ -42,41 +57,24 @@ export default {
     showSimpleFormQueryParamsDrawer () {
       this.createSimpleFormVisible = true
     },
-    // 查询report
-    searchReport (source) {
-      return post('/rs/report/saleMonthReport', {
-        'data': {
-          'condition': ' 1=1 ',
-          'startDate': '2022-11-21 00:00:00',
-          'endDate': '2022-11-21 23:59:59',
-          'f_orgid': 'f_orgid in (21142)'
-        }
-      }).then(res => {
-        this.$message.success(res)
-      }, err => {
-        console.error(err)
-      })
+    openImportView (type) {
+      this.type = type
+      this.importJsonVisible = true
     },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      return post('/api/system/logic/addOrEditQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存查询配置成功')
-      }, err => {
-        console.error(err)
-      })
+    importJsonHandleOk () {
+      try {
+        if (this.type === 1) {
+          this.toEditJson = JSON.parse(this.importEditJson)
+          this.showDrawer()
+        } else {
+          this.toEditSimpleFormJson = JSON.parse(this.importEditJson)
+          this.showSimpleFormQueryParamsDrawer()
+        }
+      } catch (e) {
+        this.$message.warn('操作失败，输入配置不是JSON格式')
+      }
+      this.importJsonVisible = false
     },
-    // 存储基础表单配置信息
-    saveSimpleFormQueryParams (source) {
-      return post('/api/system/logic/addOrEditSimpleFormQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存基础表单配置成功')
-      }, err => {
-        console.error(err)
-      })
-    }
   }
 }
 </script>

package/src/pages/report/ReportTableHome.vue

@@ -20,7 +20,7 @@
     },
     methods: {
       async getData () {
-        this.tableData = await post('/api/system/logic/reportTest', {})
+        this.tableData = await post('/api/af-system/logic/reportTest', {})
         console.log('数据=>', JSON.stringify(this.tableData))
       }
     }

package/src/pages/resourceManage/orgListManage.vue

@@ -52,7 +52,7 @@
 
 <script>
   import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
-  import { getColumnsJson } from '@vue2-client/services/api'
+  import { getConfig } from '@vue2-client/services/api'
   export default {
     // 组织管理
     name: 'orgListManage',
@@ -83,7 +83,7 @@
     created () {
     },
     async mounted () {
-      getColumnsJson('orgListManage', (res) => {
+      getConfig('orgListManage', (res) => {
         this.columnsJson = res
       })
       const fun = await getOrganization()

package/src/pages/system/file/index.vue

@@ -195,10 +195,10 @@ export default {
     getStockList () {
       this.loading = true
       // 请求仓库列表
-      post('/api/system/logic/getFilesStock', {}).then(res => {
+      post('/api/af-system/logic/getFilesStock', {}).then(res => {
         this.data = res.sort((a, b) => a.progress - b.progress)
         // 请求仓库列表
-        post('/api/system/logic/getFilesColl', {}).then(res => {
+        post('/api/af-system/logic/getFilesColl', {}).then(res => {
           this.coll = res
           this.loading = false
         })
@@ -269,7 +269,7 @@ export default {
     },
     submitStock () {
       // 保存仓库信息
-      post('/api/system/entity/t_files_manager', this.form).then(res => {
+      post('/api/af-system/entity/t_files_manager', this.form).then(res => {
         this.$message.success('提交成功')
         this.visible = false
         this.getStockList()

package/src/router/async/router.map.js

@@ -31,6 +31,8 @@ routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog
 routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
+// 查询配置生成工具
+routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage')
 
 // 基础路由组件注册
 const routerMap = {

package/src/services/api/DictionaryDetailsViewApi.js

@@ -1,6 +1,6 @@
 const DictionaryDetailsViewApi = {
   // 查询：获取字典详情
-  getDictionaryDetails: '/api/system/logic/getDictionaryDetails'
+  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
 }
 
 export { DictionaryDetailsViewApi }

package/src/services/api/LogDetailsViewApi.js

@@ -1,10 +1,10 @@
 const LogDetailsViewApi = {
   // 查询：获取日志详情
-  getLogDetails: '/api/system/logic/foreignaidGetLogDetails',
+  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
   // 查询：获取日志维护记录
-  getLogRecordList: '/api/system/logic/foreignaidGetRecordList',
+  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
   // 操作：更新日志状态
-  updateLogStatusData: '/api/system/logic/foreignaidUpdateLogStatus'
+  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
 }
 
 export { LogDetailsViewApi }

package/src/services/api/QueryParamsDetailsViewApi.js

@@ -1,6 +1,6 @@
 const QueryParamsDetailsViewApi = {
   // 查询：获取查询配置详情
-  getQueryParamsDetails: '/api/system/logic/getQueryParamsDetails'
+  getQueryParamsDetails: '/api/af-system/logic/getQueryParamsDetails'
 }
 
 export { QueryParamsDetailsViewApi }

package/src/services/api/TicketDetailsViewApi.js

@@ -1,34 +1,34 @@
 const TicketDetailsViewApi = {
   // 查询：获取工单流转详情
-  getTicketWorkFlowDetails: '/api/system/logic/getTicketWorkFlowDetails',
+  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
   // 查询：获取工单详情
-  getTicketDetails: '/api/system/logic/getTicketDetails',
+  getTicketDetails: '/api/af-system/logic/getTicketDetails',
   // 手动关闭工单
-  manualCloseTicket: '/api/system/logic/manualCloseTicket',
+  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
   // 转交工单给其他人
-  transferTicketToOthers: '/api/system/logic/transferTicketToOthers',
+  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
   // 确认工单，开始处理
-  confirmTicket: '/api/system/logic/confirmTicket',
+  confirmTicket: '/api/af-system/logic/confirmTicket',
   // 查询：获取订单详情用于订单追踪
-  getTicketDetailsForUploader: '/api/system/logic/getTicketDetailsForUploader',
+  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
   // 更新：将工单优先级增加
-  rushTicket: '/api/system/logic/rushTicket',
+  rushTicket: '/api/af-system/logic/rushTicket',
   // 客户手动关闭工单
-  manualCloseTicketByCustomer: '/api/system/logic/manualCloseTicketByCustomer',
+  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
   // 在工单提交页面删除照片
-  revocationImage: '/api/system/logic/revocationImage',
+  revocationImage: '/api/af-system/logic/revocationImage',
   // 在工单提交页面删除照片
-  getTicketImages: '/api/system/logic/getTicketImages',
+  getTicketImages: '/api/af-system/logic/getTicketImages',
   // 用户填写附加信息时取消了操作，将已上传的照片清空
-  removeAllImages: '/api/system/logic/removeAllImages',
+  removeAllImages: '/api/af-system/logic/removeAllImages',
   // 提交用户填写附加信息
-  AddonDescriptionToTicket: '/api/system/logic/AddonDescriptionToTicket',
+  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
   // 获取用户填写附加信息
-  getAddonDescription: '/api/system/logic/getAddonDescription',
+  getAddonDescription: '/api/af-system/logic/getAddonDescription',
   // 发起售后工单流程
-  createTicket: '/api/system/logic/createTicket',
+  createTicket: '/api/af-system/logic/createTicket',
   // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/system/logic/getAllEmployeeName'
+  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName'
 }
 
 export { TicketDetailsViewApi }

package/src/services/api/common.js

@@ -5,10 +5,13 @@ import { blobValidate } from '@vue2-client/utils/common'
 import errorCode from '@vue2-client/utils/errorCode'
 import { saveAs } from 'file-saver'
 import { post } from '@vue2-client/services/api/restTools'
+import setting from '@vue2-client/store/modules/setting'
 
 const commonApi = {
   // 获取表格列配置
   getConfig: 'logic/getLiuliConfiguration',
+  // 配置解析
+  parseConfig: 'logic/parseConfig',
   // 通用查询
   query: 'logic/commonQuery',
   // 表单查询
@@ -17,10 +20,6 @@ const commonApi = {
   addOrModify: 'logic/commonAddOrModify',
   // 通用删除
   delete: 'logic/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/api/system/logic/getDictionaryParam',
-  // 获取所有员工及其部门的级联菜单数据
-  getEmpTree: '/api/system/logic/getEmpTree',
   // 导入数据
   importData: 'logic/importData',
   // 导出数据
@@ -28,74 +27,122 @@ const commonApi = {
   // 下载数据
   download: 'resource/download',
   // 通用上传
-  upload: '/resource/upload'
+  upload: 'resource/upload',
+  // 文件实体操作
+  fileEntity: 'entity/t_files',
+  // 获取所有员工及其部门的级联菜单数据
+  getEmpTree: '/api/af-system/logic/getEmpTree',
 }
 
-export function getConfigUrl (serviceName = 'system') {
+export function getConfigUrl (serviceName = setting.state.state.defaultServiceName) {
   return '/api/' + serviceName + '/' + commonApi.getConfig
 }
 
+export function parseConfigUrl (serviceName = setting.state.state.defaultServiceName) {
+  return '/api/' + serviceName + '/' + commonApi.parseConfig
+}
+
+/**
+ * 获取字典键参数
+ */
+export function getDictionaryParam () {
+  return post('/api/af-system/logic/getDictionaryParam', {})
+}
+
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param serviceName 命名空间名称
+ * @param callback 回调函数
+ */
+export function getConfig (configName, serviceName = setting.state.defaultServiceName, callback) {
+  indexedDB.getByWeb(configName, getConfigUrl(serviceName), { configName: configName }, callback)
+}
+
 /**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
+ * 调用Logic获取配置内容
+ * @param logicName Logic名称
+ * @param parameter Logic调用参数
  * @param serviceName 命名空间名称
  * @param callback 回调函数
  */
-export function getColumnsJson (queryParamsName, serviceName = 'system', callback) {
-  indexedDB.getByWeb(queryParamsName, getConfigUrl(serviceName), { configName: queryParamsName }, callback)
+export function getConfigByLogic (logicName, parameter, serviceName = setting.state.defaultServiceName, callback) {
+  indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, '/api/' + serviceName + '/logic/' + logicName,
+    parameter, callback)
+}
+
+/**
+ * 配置解析
+ * @param configContent 原配置内容
+ * @param configType 配置类型
+ * @param serviceName 命名空间名称
+ */
+export function parseConfig (configContent, configType, serviceName = setting.state.defaultServiceName) {
+  const url = parseConfigUrl(serviceName)
+  return post(url, {
+    configType: configType,
+    configContent: configContent
+  })
+}
+
+/**
+ * 通用执行业务逻辑
+ */
+export function runLogic (logicName, parameter, serviceName = setting.state.defaultServiceName) {
+  return post('/api/' + serviceName + '/logic/' + logicName, parameter)
 }
 
 /**
  * 通用查询
  */
-export function query (parameter, serviceName = 'system') {
+export function query (parameter, serviceName = setting.state.defaultServiceName) {
   return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
 }
 
 /**
  * 通用表单查询
  */
-export function queryWithResource (parameter, serviceName = 'system') {
+export function queryWithResource (parameter, serviceName = setting.state.defaultServiceName) {
   return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
 }
 
 /**
  * 通用新增/修改
  */
-export function addOrModify (parameter, serviceName = 'system') {
+export function addOrModify (parameter, serviceName = setting.state.defaultServiceName) {
   return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
 }
 
 /**
  * 通用删除
  */
-export function remove (parameter, serviceName = 'system') {
+export function remove (parameter, serviceName = setting.state.defaultServiceName) {
   return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
 }
 
 /**
  * 通用导入
  */
-export function importData (parameter, serviceName = 'system') {
+export function importData (parameter, serviceName = setting.state.defaultServiceName) {
   return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
 }
 
 /**
  * 通用导出
  */
-export function exportData (parameter, serviceName = 'system') {
+export function exportData (parameter, serviceName = setting.state.defaultServiceName) {
   return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
 }
 
 /**
  * 通用上传
  */
-export function upload (parameter, serviceName = 'system', config) {
+export function upload (parameter, serviceName = setting.state.defaultServiceName, config) {
   return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
 // 通用下载
-export function download (parameter, filename, serviceName = 'system') {
+export function download (parameter, filename, serviceName = setting.state.defaultServiceName) {
   const notificationKey = 'download'
   notification.open({
     key: notificationKey,
@@ -134,4 +181,9 @@ export function download (parameter, filename, serviceName = 'system') {
   })
 }
 
+// 文件删除
+export function fileDelete (parameter, serviceName = setting.state.defaultServiceName) {
+  return post('/api/' + serviceName + '/' + commonApi.fileEntity, parameter)
+}
+
 export { commonApi }

package/src/services/api/commonTempTable.js

@@ -1,10 +1,10 @@
 const CommonTempTable = {
   // 初始化子表
-  initApplySubTable: '/api/system/logic/initApplySubTable',
+  initApplySubTable: '/api/af-system/logic/initApplySubTable',
   // 创建临时表，根据配置文件动态生成
-  createTempTable: '/api/system/logic/createTempTable',
+  createTempTable: '/api/af-system/logic/createTempTable',
   // 向临时表中插入数据
-  insertDataToTempTable: '/api/system/logic/insertDataToTempTable'
+  insertDataToTempTable: '/api/af-system/logic/insertDataToTempTable'
 }
 
 export { CommonTempTable }

package/src/services/api/index.js

@@ -1,4 +1,4 @@
-import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { commonApi, getConfig, query, addOrModify, remove } from '@vue2-client/services/api/common'
 import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
 import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
 import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
@@ -7,7 +7,7 @@ import { get, post } from '@vue2-client/services/api/restTools'
 import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
 
 export {
-  commonApi, getColumnsJson, query, addOrModify, remove,
+  commonApi, getConfig, query, addOrModify, remove,
   DictionaryDetailsViewApi,
   LogDetailsViewApi,
   manageApi,

package/src/services/api/logininfor/index.js

@@ -1,6 +1,6 @@
 const loginforApi = {
   // 查询：获取系统访问记录
-  query: '/api/system/logic/getLogininfor'
+  query: '/api/af-system/logic/getLogininfor'
 }
 
 export { loginforApi }

package/src/services/api/manage.js

@@ -1,8 +1,8 @@
 const manageApi = {
   // 查询：获取字典键列表
-  getDictionaryValue: '/api/system/logic/getDictionaryValue',
+  getDictionaryValue: '/api/af-system/logic/getDictionaryValue',
   // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/api/system/logic/getDivisionsOhChina'
+  getDivisionsOhChina: '/api/af-system/logic/getDivisionsOhChina'
 }
 
 export { manageApi }

package/vue.config.js

@@ -30,7 +30,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api': {
-        pathRewrite: { '^/api/system/': '/rs/', '^/api/af-system/': '/rs/' },
+        pathRewrite: { '^/api/af-system/': '/rs/' },
         // pathRewrite: { '^/api': '/' },
         target: local,
         changeOrigin: true