vue2-client 1.8.12 → 1.8.14

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.14 -2023-11-23 @江超**
+- 完善导入功能的返回值
+
+**1.8.13 -2023-11-21 @张振宇**
+- 配置中心增加动态表名功能
+
 **1.8.12 -2023-11-20 @江超**
 - 完成查询配置通用导入和模板下载功能
 

package/package.json

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

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

@@ -73,12 +73,12 @@
                   标签名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="6">
                 <span style="font-weight: bold">
                   字段名
                 </span>
               </a-col>
-              <a-col :span="9">
+              <a-col :span="10">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -107,12 +107,12 @@
                     {{ columnItem.title }}
                   </span>
                 </a-col>
-                <a-col :span="7">
+                <a-col :span="6">
                   <span style="font-weight: bold">
                     {{ columnItem.key }}
                   </span>
                 </a-col>
-                <a-col :span="9">
+                <a-col :span="10">
                   <a-tooltip>
                     <template slot="title">
                       查询表单项

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

@@ -483,7 +483,7 @@ export default {
     },
     // 字段名称是否禁用
     keyDisabled () {
-      return this.item.formType === 'file' || this.item.formType === 'image'
+      return this.item.formType === 'file' || this.item.formType === 'image' || this.dataMode.mixinTableName
     },
     // 数据模式是否禁用
     dataModeDisabled () {
@@ -497,7 +497,8 @@ export default {
         sqlQueryItem: false,
         sqlQueryCondition: false,
         excelImportItem: false,
-        group: false
+        group: false,
+        mixinTableName: false
       }
       for (const item of this.dataModeArrayData) {
         result[item] = true
@@ -516,11 +517,25 @@ export default {
           value: 'sqlQueryItem',
           noMatch: ['file', 'personSetting']
         }, {
-            label: '字段组存储',
-            value: 'group',
-            noMatch: []
+          label: '字段组存储',
+          value: 'group',
+          noMatch: []
         }]
       }
+      if (this.dataModeArrayData.includes('mixinTableName')) {
+        return [
+          {
+            label: '渲染查询表单项',
+            value: 'queryForm',
+            noMatch: ['file', 'image', 'textarea', 'personSetting']
+          },
+          {
+            label: '动态表名参数',
+            value: 'mixinTableName',
+            noMatch: []
+          }
+        ]
+      }
       if (this.item.formType) {
         return dataModeType.filter(item => {
           return item.noMatch.findIndex(type => type === this.item.formType) === -1
@@ -603,7 +618,7 @@ export default {
               callback(new Error('请输入字段名称'))
             } else {
               // 判断必须全部小写 并且不能包含空格
-              if (value !== value.toLowerCase() || value.indexOf(' ') !== -1) {
+              if (value !== value.toLowerCase() || value.indexOf(' ') !== -1 && !value === '_mixinTableName_') {
                 callback(new Error('字段名称必须全部小写，且不能包含空格'))
               } else {
                 callback()
@@ -813,6 +828,12 @@ export default {
     },
     // 数据模式改变
     dataModeArrayDataChange (newVal) {
+      if (newVal.includes('mixinTableName')) {
+        this.item.key = '_mixinTableName_'
+        this.dataModeArrayData = ['queryForm', 'mixinTableName']
+      } else {
+        this.item.key = ''
+      }
       if (newVal.includes('group')) {
         this.dataModeArrayData = ['sqlQueryItem', 'group']
       }

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

@@ -1,131 +1,131 @@
-<template>
-  <a-modal
-    title="数据导入"
-    :visible="open"
-    :zIndex="1001"
-    :confirm-loading="uploading"
-    @cancel="importExcelHandleCancel"
-    @ok="importExcelHandleChange"
-  >
-    <a-spin tip="上传中..." :spinning="uploading">
-      <a-upload-dragger
-        name="file"
-        accept=".xlsx, .xls"
-        :file-list="fileList"
-        :multiple="false"
-        :remove="handleRemove"
-        :before-upload="beforeUpload"
-      >
-        <p class="ant-upload-drag-icon">
-          <a-icon type="inbox" />
-        </p>
-        <p class="ant-upload-text">
-          请将文件拖拽到此处上传
-        </p>
-        <p class="ant-upload-hint">
-          支持单个上传，也可以点击后选择文件上传
-        </p>
-      </a-upload-dragger>
-      <a-divider/>
-      <a v-if="queryParamsName !== 'none'" @click="importTemplate">下载导入模板</a>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XImportExcel',
-  props: {
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    queryParamsName: {
-      type: String,
-      default: 'none'
-    },
-    // 业务名称
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  components: {
-  },
-  data () {
-    return {
-      open: false,
-      uploadStatus: '',
-      fileList: [],
-      // 是否禁用上传
-      uploading: false
-    }
-  },
-  filters: {
-  },
-  created () {
-  },
-  computed: {
-  },
-  watch: {
-  },
-  methods: {
-    /** 导入excel窗体关闭 */
-    importExcelHandleCancel (e) {
-      this.open = false
-      this.fileList = []
-      // 关闭后刷新列表
-      this.$emit('ok')
-    },
-    /** 下载模板操作 */
-    importTemplate () {
-      downloadImportExcel({
-        queryParamsName: this.queryParamsName
-      }, this.serviceName).then(res => {
-        if (!res) {
-          this.$message.warn('导入模板不存在，请检查配置')
-          return
-        }
-        window.open('/res/excel/export/' + res)
-      })
-    },
-    /** 导入excel窗体开启 */
-    importExcelHandleOpen (e) {
-      this.open = true
-    },
-    beforeUpload (file) {
-      this.fileList = [file]
-      return false
-    },
-    /** 导入excel */
-    importExcelHandleChange () {
-      const { fileList } = this
-      const formData = new FormData()
-      if (!fileList[0]) {
-        this.$message.warn('请选择需要上传的文件')
-        return
-      }
-      this.uploading = true
-      formData.append('file', fileList[0])
-      formData.append('queryParamsName', this.queryParamsName)
-      importData(formData).then(response => {
-        this.fileList = []
-        this.$message.success(response.msg)
-        this.open = false
-        this.$emit('ok')
-      }).catch(e => {
-        this.$message.error(e)
-      }).finally(() => {
-        this.uploading = false
-      })
-    },
-    handleRemove () {
-      this.fileList = []
-      this.uploading = false
-    }
-  }
-}
-</script>
+<template>
+  <a-modal
+    title="数据导入"
+    :visible="open"
+    :zIndex="1001"
+    :confirm-loading="uploading"
+    @cancel="importExcelHandleCancel"
+    @ok="importExcelHandleChange"
+  >
+    <a-spin tip="上传中..." :spinning="uploading">
+      <a-upload-dragger
+        name="file"
+        accept=".xlsx, .xls"
+        :file-list="fileList"
+        :multiple="false"
+        :remove="handleRemove"
+        :before-upload="beforeUpload"
+      >
+        <p class="ant-upload-drag-icon">
+          <a-icon type="inbox" />
+        </p>
+        <p class="ant-upload-text">
+          请将文件拖拽到此处上传
+        </p>
+        <p class="ant-upload-hint">
+          支持单个上传，也可以点击后选择文件上传
+        </p>
+      </a-upload-dragger>
+      <a-divider/>
+      <a v-if="queryParamsName !== 'none'" @click="importTemplate">下载导入模板</a>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+
+import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XImportExcel',
+  props: {
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    queryParamsName: {
+      type: String,
+      default: 'none'
+    },
+    // 业务名称
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      uploadStatus: '',
+      fileList: [],
+      // 是否禁用上传
+      uploading: false
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+    /** 导入excel窗体关闭 */
+    importExcelHandleCancel (e) {
+      this.open = false
+      this.fileList = []
+      // 关闭后刷新列表
+      this.$emit('ok')
+    },
+    /** 下载模板操作 */
+    importTemplate () {
+      downloadImportExcel({
+        queryParamsName: this.queryParamsName
+      }, this.serviceName).then(res => {
+        if (!res || !res.value) {
+          this.$message.warn('导入模板不存在，请检查配置')
+          return
+        }
+        window.open('/res/excel/export/' + res.value)
+      })
+    },
+    /** 导入excel窗体开启 */
+    importExcelHandleOpen (e) {
+      this.open = true
+    },
+    beforeUpload (file) {
+      this.fileList = [file]
+      return false
+    },
+    /** 导入excel */
+    importExcelHandleChange () {
+      const { fileList } = this
+      const formData = new FormData()
+      if (!fileList[0]) {
+        this.$message.warn('请选择需要上传的文件')
+        return
+      }
+      this.uploading = true
+      formData.append('file', fileList[0])
+      formData.append('queryParamsName', this.queryParamsName)
+      importData(formData).then(res => {
+        this.fileList = []
+        this.$message.success(res.value)
+        this.open = false
+        this.$emit('ok')
+      }).catch(e => {
+        this.$message.error(e)
+      }).finally(() => {
+        this.uploading = false
+      })
+    },
+    handleRemove () {
+      this.fileList = []
+      this.uploading = false
+    }
+  }
+}
+</script>

package/src/config/CreateQueryConfig.js

@@ -35,6 +35,11 @@ module.exports = {
       label: '数据组',
       value: 'group',
       noMatch: []
+    },
+    {
+      label: '动态表名参数',
+      value: 'mixinTableName',
+      noMatch: []
     }
   ],
   // 表单类型