vue2-client 1.9.174 → 1.9.176

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.174",
+  "version": "1.9.176",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -24,7 +24,7 @@
     "@hufe921/canvas-editor": "^0.9.49",
     "@vue/babel-preset-jsx": "^1.4.0",
     "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.58-fix",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.59",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",

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

@@ -950,7 +950,7 @@ export default {
           if (modifyModelData.data[item.model] instanceof Array) {
             this.form[item.model] = modifyModelData.data[item.model]
           } else {
-            this.form[item.model] = modifyModelData.data[item.model] + ''
+            this.form[item.model] = modifyModelData.data[item.model]
           }
         }
       }

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

@@ -6,14 +6,11 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    getConfigByNameAsync('routineButtonCRUD', 'af-his').then(res => {
-      console.log('===res', res)
+    getConfigByNameAsync('feeCategories', 'af-his').then(res => {
       this.$refs.xAddFrom.init(Object.assign(res, {
         modifyModelData: {
           data: {
-            selected_f_project_details: {
-              f_oxygen_method: '1'
-            }
+            f_f_type: 2
           }
         }
       }))

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

@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'monthByUserTypeQueryCRUD',
+      queryParamsName: 'DayReportQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -13,13 +13,16 @@ export default {
     return {
       // 导出列选择
       exportModalVisible: false,
+      summaryLoadingShow: false,
+      tipMsg: '正在获取汇总数据。。。',
       exportType: false,
       type: 'export',
       selectedExportColumns: [],
       exportSelectedRows: false,
       allColumnsSelected: false,
       exportFileName: null,
-      confirmLoading: null
+      confirmLoading: null,
+      printData: {}
     }
   },
   inject: ['tableContext'],
@@ -30,8 +33,9 @@ export default {
       this.handle(type)
     },
     // 导出选中或本页数据
-    handlePrint (type) {
+    handlePrint (type, printData) {
       this.type = 'print'
+      this.printData = printData
       this.handle(type)
     },
     handle (type) {
@@ -80,15 +84,27 @@ export default {
     async handlePrintByQuery (tHeader, filterVal) {
       try {
         const requestParameters = this.tableContext.requestParameters
+        this.summaryLoadingShow = true
+        this.tipMsg = '正在组织数据。。。'
         const res = await queryAll(Object.assign(requestParameters, { userId: this.tableContext.currUser?.id, pageSize: 200 }), this.tableContext.serviceName, this.tableContext.env === 'dev')
         this.handlePrintGen(tHeader, filterVal, res.data)
       } finally {
-          this.confirmLoading = false
+        this.confirmLoading = false
       }
     },
     // 获取模板内容
     handlePrintGen (tHeader, filterVal, exportData) {
       getConfigByNameAsync(this.tableContext.printTemplate, this.tableContext.serviceName).then(async res => {
+        if (this.printData && this.printData.summary) {
+          this.summaryLoadingShow = true
+          this.tipMsg = '正在获取汇总数据。。。'
+          this.printData.summaryData = {}
+          const tempSummary = await this.printData.summary()
+          tempSummary.forEach(row => {
+            this.printData.summaryData[row.key] = row.value
+          })
+          this.summaryLoadingShow = false
+        }
         // 如果模板中有默认表格 使用当前选中字段替换表格内容
         const crudTableIndex = res.panels[0].printElements.findIndex(h => h.printElementType?.type === 'table' && h.options.field === 'CRUD_TABLE')
         if (crudTableIndex !== -1) {
@@ -106,7 +122,7 @@ export default {
           })]
         }
         this.$nextTick(() => {
-          this.$print(undefined, res, { CRUD_TABLE: exportData, title: this.tableContext.title }, {}, {
+          this.$print(undefined, res, { ...this.printData, CRUD_TABLE: exportData }, {}, {
             callback: () => {
               this.confirmLoading = false
               this.closeModal()
@@ -118,6 +134,9 @@ export default {
             }
           })
         })
+      }).finally(() => {
+        this.confirmLoading = false
+        this.summaryLoadingShow = false
       })
     },
     // 导出选中或本页数据
@@ -154,6 +173,9 @@ export default {
             form: conditionParams,
             userId: that.tableContext.currUser.id
           }
+          const dateTime = formatDate(new Date(), 'yyyy-MM-dd_hh-mm-ss')
+          const fileNamePrefix = that.exportFileName || `${that.tableContext.currUser.username}`
+          const name = `${fileNamePrefix}_${dateTime}`
           const param = {
             exportData: defaultExportData,
             asyncExportData: {
@@ -163,11 +185,11 @@ export default {
               // 导出条件
               f_tag1: defaultExportData,
               // 导出文件名
-              f_tag2: that.exportFileName || `${formatDate(new Date(), 'yyyy-MM-dd_hh-mm-ss')}_${that.tableContext.currUser.username}`,
+              f_tag2: name,
               // 执行数据源
               f_tag3: process.env.VUE_APP_SYSTEM_NAME,
               f_service_name: that.tableContext.serviceName || process.env.VUE_APP_SYSTEM_NAME,
-              f_task_name: that.exportFileName || `${formatDate(new Date(), 'yyyy-MM-dd_hh-mm-ss')}_${that.tableContext.currUser.username}`,
+              f_task_name: name,
             }
           }
           exportData(param, that.tableContext.serviceName).then(res => {
@@ -210,7 +232,7 @@ export default {
     :destroy-on-close="true"
     @ok="handleGen"
   >
-    <a-row type="flex" justify="space-between" style="padding-left: 3rem">
+    <a-row type="flex" justify="space-between" style="padding-left: 3rem" v-show="!summaryLoadingShow">
       <a-col :span="8" style="margin-top: 3px">
         <a-checkbox
           :checked="selectedExportColumns.length === tableContext.tableColumns.length"
@@ -220,7 +242,7 @@ export default {
         </a-checkbox>
       </a-col>
     </a-row>
-    <a-checkbox-group v-model="selectedExportColumns">
+    <a-checkbox-group v-model="selectedExportColumns" v-show="!summaryLoadingShow">
       <a-row type="flex" justify="space-between" style="padding-left: 3rem">
         <a-col
           :span="8"
@@ -238,6 +260,9 @@ export default {
         </a-col>
       </a-row>
     </a-checkbox-group>
+    <a-row type="flex" justify="center" v-show="summaryLoadingShow">
+      <a-spin :tip="tipMsg" v-show="summaryLoadingShow" />
+    </a-row>
   </a-modal>
 </template>
 

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

@@ -237,7 +237,7 @@
                   <a-menu-item
                     v-for="(action_item, actionIndex) in item.actionArr"
                     :key="actionIndex"
-                    v-if="!action_item.customFunction || executeStrFunction( action_item.customFunction,[record,c_index])">
+                    v-show="!action_item.customFunction || executeStrFunction( action_item.customFunction,[record,c_index])">
                     <a
                       style="text-align: center"
                       @click="action(record, item.dataIndex, action_item.func)"
@@ -346,6 +346,7 @@ import { getRealKeyData } from '@vue2-client/utils/formatter'
 import ReportTableHome from '../../../../pages/report/ReportTableHome.vue'
 import CustomFuncCel from '@vue2-client/base-client/components/common/XTable/CustomFuncCel.vue'
 import ExportExcel from '@vue2-client/base-client/components/common/XTable/ExportExcel.vue'
+import moment from 'moment/moment'
 
 export default {
   name: 'XTable',
@@ -1039,7 +1040,14 @@ export default {
       this.$refs.exportExcel.handleExport(type)
     },
     handlePrint (type) {
-      this.$refs.exportExcel.handlePrint(type)
+      const printData = {
+        title: this.title,
+        form: this.form,
+        operaInfo: this.currUser.operaInfo,
+        operaTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+        summary: this.retrieveSummaryData
+      }
+      this.$refs.exportExcel.handlePrint(type, printData)
     },
     validateTableAndSyncData (currRow, defaultAppendRowData) {
       let isLastRow = false
@@ -1187,49 +1195,62 @@ export default {
     importData () {
       this.$refs.importExcel.importExcelHandleOpen()
     },
-    afterVisibleChange () {
-      this.retrieveSummaryData()
+    afterVisibleChange (val) {
+      if (val) {
+        this.retrieveSummaryData()
+      }
     },
     async retrieveSummaryData () {
+      const promises = []
+
       if (this.requestParameters.querySummary) {
-        querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev').then(res => {
-          if (this.compatible === 'V3') {
-            res = res.data
-          }
-          if (res.length > 0) {
-            this.summaryData.forEach(item => {
-              res.forEach(summary => {
-                if (item.title === summary.title) {
-                  item.value = summary.value
-                  item.success = true
-                  item.loading = false
-                }
+        const querySummaryPromise = querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+          .then(res => {
+            if (this.compatible === 'V3') {
+              res = res.data
+            }
+            if (res.length > 0) {
+              this.summaryData.forEach(item => {
+                res.forEach(summary => {
+                  if (item.title === summary.title) {
+                    item.value = summary.value
+                    item.success = true
+                    item.loading = false
+                  }
+                })
               })
-            })
-          }
-        })
+            }
+          })
+        promises.push(querySummaryPromise)
       }
+
       if (this.showCustomSummary) {
         this.customSummaryArray.forEach(item => {
-          runLogic(item.source, Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev').then((res) => {
-            this.summaryData.forEach(summary => {
-              if (item.key === summary.key) {
-                summary.value = res.value
-                summary.success = true
-                summary.loading = false
-              }
+          const runLogicPromise = runLogic(item.source, Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+            .then(res => {
+              this.summaryData.forEach(summary => {
+                if (item.key === summary.key) {
+                  summary.value = res.value
+                  summary.success = true
+                  summary.loading = false
+                }
+              })
             })
-          }).catch(e => {
-            this.summaryData.forEach(summary => {
-              if (item.key === summary.key) {
-                summary.value = 0
-                summary.success = false
-                summary.loading = false
-              }
+            .catch(e => {
+              this.summaryData.forEach(summary => {
+                if (item.key === summary.key) {
+                  summary.value = 0
+                  summary.success = false
+                  summary.loading = false
+                }
+              })
             })
-          })
+          promises.push(runLogicPromise)
         })
       }
+
+      await Promise.all(promises)
+      return this.summaryData
     },
     showDrawer () {
       if (this.summaryUpdate) {

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

@@ -83,10 +83,10 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),