vue2-client 1.8.10 → 1.8.12

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.12 -2023-11-20 @江超**
+- 完成查询配置通用导入和模板下载功能
+
+**1.8.11 -2023-11-08 @刘懿**
+- XStepView接入琉璃配置中心错误修改
+
 **1.8.10 -2023-11-07 @江超**
 - XStepView接入琉璃配置中心
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "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

@@ -68,7 +68,7 @@
               <a-button icon="import" @click="$message.warn('从创意库中选择并引用高质量的通用表单项配置，敬请期待')">从创意库引入</a-button>
             </a-space>
             <a-row :gutter="24">
-              <a-col :span="8">
+              <a-col :span="6">
                 <span style="font-weight: bold">
                   标签名
                 </span>
@@ -78,7 +78,7 @@
                   字段名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="9">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -102,7 +102,7 @@
                 <span class="dragTips">拖到此处放置</span>
               </a-row>
               <a-row :gutter="24" class="column_item">
-                <a-col :span="7">
+                <a-col :span="6">
                   <span style="font-weight: bold">
                     {{ columnItem.title }}
                   </span>
@@ -112,7 +112,7 @@
                     {{ columnItem.key }}
                   </span>
                 </a-col>
-                <a-col :span="8">
+                <a-col :span="9">
                   <a-tooltip>
                     <template slot="title">
                       查询表单项
@@ -145,7 +145,13 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段组存储
+                      Excel导入项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray.includes('excelImportItem') ? '#107C41' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-excel" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      数据组
                     </template>
                     <a-tag :color="columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -385,27 +391,8 @@ export default {
           }, this.toEditJson
         )
         for (const columnItem of this.form.column) {
-          // 数据模式兼容性处理
           if (!(columnItem.dataMode || columnItem.dataModeArray)) {
             columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
-          } else if (columnItem.dataMode) {
-            if (columnItem.dataMode === 'all') {
-              columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'form') {
-              columnItem.dataModeArray = ['queryForm', 'addOrEditForm', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'table') {
-              columnItem.dataModeArray = ['table', 'sqlQueryItem']
-            } else if (columnItem.dataMode === 'table_form') {
-              columnItem.dataModeArray = ['table', 'sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'only_form') {
-              columnItem.dataModeArray = ['queryForm']
-            } else if (columnItem.dataMode === 'only_table') {
-              columnItem.dataModeArray = ['table']
-            } else if (columnItem.dataMode === 'clear') {
-              columnItem.dataModeArray = ['sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'only_add_modify') {
-              columnItem.dataModeArray = ['addOrEditForm', 'sqlQueryItem']
-            }
           }
           delete columnItem.dataMode
           // 插槽兼容处理

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

@@ -311,7 +311,7 @@
           <a-card :bodyStyle="bodyStyle" title="数据字段">
             <a-button type="primary" slot="extra" @click="addColumnItem()">增加</a-button>
             <a-row :gutter="24">
-              <a-col :span="8">
+              <a-col :span="7">
                 <span style="font-weight: bold">
                   标签名
                 </span>
@@ -321,7 +321,7 @@
                   字段名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="8">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -388,7 +388,13 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段JSON存储
+                      Excel导入项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('excelImportItem') ? '#107C41' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-excel" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      数据组
                     </template>
                     <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -489,7 +495,9 @@ export default {
         table: false,
         addOrEditForm: false,
         sqlQueryItem: false,
-        sqlQueryCondition: false
+        sqlQueryCondition: false,
+        excelImportItem: false,
+        group: false
       }
       for (const item of this.dataModeArrayData) {
         result[item] = true

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

@@ -27,9 +27,6 @@
         </p>
       </a-upload-dragger>
       <a-divider/>
-      <a-checkbox @change="handleCheckedUpdateSupport" :checked="updateSupport !== 0">
-        是否更新已经存在的数据
-      </a-checkbox>
       <a v-if="queryParamsName !== 'none'" @click="importTemplate">下载导入模板</a>
     </a-spin>
   </a-modal>
@@ -37,14 +34,14 @@
 
 <script>
 
-import { importData, download } from '@vue2-client/services/api/common'
+import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XImportExcel',
   props: {
     serviceName: {
       type: String,
-      default: 'system'
+      default: undefined
     },
     queryParamsName: {
       type: String,
@@ -64,8 +61,7 @@ export default {
       uploadStatus: '',
       fileList: [],
       // 是否禁用上传
-      uploading: false,
-      updateSupport: 0
+      uploading: false
     }
   },
   filters: {
@@ -86,11 +82,15 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate () {
-      const params = {
-        queryParamsName: this.queryParamsName,
-        type: 'template'
-      }
-      download(params, this.title + `数据模板_${new Date().toLocaleString()}.xlsx`, this.serviceName)
+      downloadImportExcel({
+        queryParamsName: this.queryParamsName
+      }, this.serviceName).then(res => {
+        if (!res) {
+          this.$message.warn('导入模板不存在，请检查配置')
+          return
+        }
+        window.open('/res/excel/export/' + res)
+      })
     },
     /** 导入excel窗体开启 */
     importExcelHandleOpen (e) {
@@ -110,19 +110,18 @@ export default {
       }
       this.uploading = true
       formData.append('file', fileList[0])
-      formData.append('updateSupport', this.updateSupport)
+      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
       })
     },
-    handleCheckedUpdateSupport () {
-      this.updateSupport = this.updateSupport === 0 ? 1 : 0
-    },
     handleRemove () {
       this.fileList = []
       this.uploading = false

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

@@ -11,7 +11,7 @@
           :size="stepStyle.size"
           :initial="initial"
           :status="status"
-          @change="onChange"
+          @chaneg="onChange"
         >
           <a-step
             v-for="(item, index) in this.configContent.step.steps"
@@ -82,11 +82,11 @@ export default {
   props: {
     params: {
       type: Object,
-      required: true
+      required: true,
     },
     configContent: {
       type: Object,
-      required: true
+      required: true,
     }
   },
   data () {
@@ -94,49 +94,40 @@ export default {
       current: -1,
       initial: 0,
       status: 'wait',
-      iconType: 'loading'
+      iconType: 'loading',
+      timeOut: undefined
     }
   },
   watch: {
     async current (newValue) {
       this.changeIcon()
+      if (this.timeOut !== undefined) { window.clearTimeout(this.timeOut) }
+
       const setpes = this.configContent.step.steps[newValue]
       const type = setpes.content.card.type
       const formValue = setpes.content.card.value
-      let timeOut = null
+      console.warn('formValue = ', formValue)
       if (setpes.before) {
         const postName = setpes.before.name.split('@')
-        let times = 0
-        timeOut = window.setInterval(() => {
-          times++
+        this.timeOut = window.setTimeout(() => {
           post('/api/af-system/' + postName[0] + '/' + postName[1], setpes.before.params).then(res => {
             console.warn(setpes.before.name + '执行结果', res)
             if (res.code === 200) {
-              if (res.instructs.length > 0) {
-                window.clearTimeout(timeOut)
-                this.success()
-              }
+              window.clearInterval(this.timeOut)
+              this.success()
             } else {
               setpes.content.card.value = res.msg
             }
           }).catch(e => {
             console.warn(setpes.before.name + '执行结果', e)
-            window.clearTimeout(timeOut)
-
+            window.clearInterval(this.timeOut)
             this.error()
           })
-          if (times > 12) {
-            window.clearTimeout(timeOut)
-            setpes.content.card.value = '未查询到开户信息，请确认'
-            this.error()
-          }
         }, 10 * 1000)
       }
       if (type === 'form') {
-        console.warn('formValue = ', formValue)
         this.$nextTick(() => {
           const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
-          console.warn('stepsss', stepsss)
           stepsss.init({
             formItems: formValue
           })
@@ -145,7 +136,6 @@ export default {
         console.warn('formValue = ', formValue)
         this.$nextTick(() => {
           const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
-          console.warn('stepsss', stepsss)
           stepsss.init({
             tableColumns: formValue,
             buttonState: {
@@ -175,14 +165,21 @@ export default {
     }
   },
   mounted () {
-
+    let paramsStr = JSON.stringify(this.configContent.step)
+    for (const item in this.params) {
+      const regex = new RegExp('\\$\\{' + item + '\\}', 'g')
+      paramsStr = paramsStr.replace(regex, this.params[item])
+    }
+    const params = JSON.parse(paramsStr)
+    this.init({ step: params })
+    this.current++
   },
   methods: {
     init (params) {
       const {
         style,
         panel,
-        steps
+        step
       } = params
       if (style) {
         this.stepStyle = style
@@ -190,10 +187,9 @@ export default {
       if (panel) {
         this.panelStyle = panel
       }
-      if (steps) {
-        this.configContent.step.steps = steps
+      if (step) {
+        this.configContent.step = step
       }
-      this.current++
     },
     steps () {
       return this.steps
@@ -208,7 +204,7 @@ export default {
         post('/api/af-system/logic/' + setpes.run.name, res.realForm).then(t => {
           console.warn(setpes.run.name + '执行结果', t)
           if (t.code === 200) {
-              this.success()
+            this.success()
           }
         }).catch(e => {
           console.warn(setpes.run.name + '执行结果', e)
@@ -222,6 +218,7 @@ export default {
     },
     success () {
       this.changeIcon()
+
       this.current++
     },
     changeIcon () {

package/src/config/CreateQueryConfig.js

@@ -27,7 +27,12 @@ module.exports = {
       noMatch: ['file', 'image', 'textarea', 'personSetting']
     },
     {
-      label: '字段组存储',
+      label: 'Excel导入项',
+      value: 'excelImportItem',
+      noMatch: ['file', 'image', 'personSetting']
+    },
+    {
+      label: '数据组',
       value: 'group',
       noMatch: []
     }

package/src/services/api/common.js

@@ -22,9 +22,11 @@ const commonApi = {
   // 通用删除
   delete: 'logic/commonDelete',
   // 导入数据
-  importData: 'logic/importData',
+  importData: 'crud/importDataByExcel',
   // 导出数据
   exportData: 'logic/commonExport',
+  // 导入模板下载
+  downloadImportTemplate: 'logic/commonDownloadImportTemplate',
   // 下载数据
   download: 'resource/download',
   // 通用上传
@@ -158,6 +160,13 @@ export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME
   return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
+/**
+ * 通用导入模板下载
+ */
+export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
+  return post('/api/' + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
+}
+
 // 通用下载
 export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   const notificationKey = 'download'