vue2-client 1.8.335 → 1.8.336

package/package.json

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

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

@@ -143,7 +143,7 @@ export default {
       table_selectedRowKeys: [],
       table_selectedRows: [],
       allowedCardMode: false,
-      cardModeConfig: undefined
+      cardModeConfig: undefined,
     }
   },
   computed: {
@@ -366,6 +366,7 @@ export default {
       if (res.valid) {
         // 表单赋值
         this.$refs.xTable.setQueryForm(res.form)
+        this.$refs.xTable.summaryUpdate = true
         // commit
         this.$emit('afterSearchSubmit', res)
       } else {

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

@@ -45,6 +45,11 @@
         <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
           <a-button-group>
             <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            <a-tooltip title="汇总" placement="bottom">
+              <a-button @click="showDrawer">
+                <a-icon :style="iconStyle" type="container"/>
+              </a-button>
+            </a-tooltip>
             <a-tooltip title="重新查询" placement="bottom">
               <a-button @click="refresh(true)">
                 <a-icon :style="iconStyle" type="reload"/>
@@ -120,15 +125,6 @@
         <template slot="footer">
           <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
         </template>
-        <template #fixedfooter v-if="showSummary && summaryData.length">
-          <div class="footer_sum_warp">
-            <span class="footer_sum_title">汇总信息&emsp;</span>
-            <span class="footer_sum_item" v-for="(f,index) in summaryData" :key="index">
-              <span>{{ f.title }}：</span>
-              <span>{{ f.value }}&emsp;</span>
-            </span>
-          </div>
-        </template>
       </s-table>
     </template>
     <!--  如果当前是看板模式  -->
@@ -141,6 +137,27 @@
         :card-data="loadData"/>
     </template>
     <!-- 上传文件 -->
+    <a-drawer
+      title="汇总信息"
+      placement="right"
+      :closable="false"
+      :visible="summaryDrawerVisible"
+      :z-index="2000"
+      :after-visible-change="afterVisibleChange"
+      @close="onClose"
+    >
+      <template>
+        <div>
+          <a-statistic
+            v-for="(f,index) in summaryData"
+            :key="index"
+            :title="f.title + '：'"
+            :value="f.value"
+            :precision="2"
+            style="margin-right: 50px" />
+        </div>
+      </template>
+    </a-drawer>
     <x-import-excel
       ref="importExcel"
       @ok="importExcelOk"
@@ -178,7 +195,7 @@ export default {
     STable,
     Ellipsis,
     XBadge,
-    XImportExcel
+    XImportExcel,
   },
   data () {
     return {
@@ -213,9 +230,11 @@ export default {
         requestParameters.conditionParams = conditionParams
         requestParameters.queryParamsName = this.queryParamsName
         requestParameters.queryParams = this.queryParams
+        this.requestParameters = requestParameters
         // 加载数据
         return this.loadTableData(requestParameters)
       },
+      requestParameters: {},
       rowKey: undefined,
       // x滚动条宽度
       scrollXWidth: 1600,
@@ -233,6 +252,7 @@ export default {
       tableColumns: [],
       // 查询用表单
       form: {},
+      oldForm: {},
       // 是否允许修改
       isModify: false,
       // 是否允许删除
@@ -260,7 +280,11 @@ export default {
       // 当前环境
       env: 'prod',
       // 预览模式（表格 or 看板）
-      isTableMode: true
+      isTableMode: true,
+      // 汇总抽屉是否显示
+      summaryDrawerVisible: false,
+      // 汇总更新标志
+      summaryUpdate: false
     }
   },
   props: {
@@ -326,7 +350,9 @@ export default {
     ...mapState('setting', ['compatible'])
   },
   mounted () {
-    this.setScrollYHeight({}) // 初始化时也调用一次，确保加载时高度正确
+    this.$nextTick(() => {
+      this.setScrollYHeight({}) // 初始化时也调用一次，确保加载时高度正确
+    })
     window.addEventListener('resize', this.handleResize)
   },
   beforeDestroy () {
@@ -419,10 +445,6 @@ export default {
           result = this.initTempTable(requestParameters)
         }
       }
-      if (requestParameters.querySummary) {
-        this.showSummary = true
-        this.summaryData = await querySummary(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
-      }
       if (!this.isTableTemp) {
         result = query(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
       }
@@ -584,16 +606,15 @@ export default {
         content: (h) => (
           <div>
             <p>此操作将导出当前条件下所有数据而非选中数据</p>
-            <a-input
-              placeholder="请输入导出文件名"
-              onChange={(e) => this.exportFileName = e.target.value}
-            />
+            {/* eslint-disable-next-line no-return-assign */}
+            <a-input placeholder="请输入导出文件名" onChange={(e) => this.exportFileName = e.target.value}/>
           </div>
         ),
         onOk: () => {
           if (!this.exportFileName) {
-            this.$message.error('文件名不能为空');
-            return Promise.reject(); // 阻止对话框关闭
+            this.$message.error('文件名不能为空')
+            // eslint-disable-next-line prefer-promise-reject-errors
+            return Promise.reject() // 阻止对话框关闭
           }
           // 在这里执行导出的逻辑，并使用 this.exportFileName 作为文件名
           const queryData = {
@@ -614,14 +635,14 @@ export default {
             f_task_name: `${this.exportFileName}_${that.currUser.username}_${date}`
           }, that.serviceName, that.env === 'dev')
             .then(res => {
-          }).catch(error => {
+            }).catch(error => {
             // 失败时的处理
-            console.log('失败:', error);
-          });
+            console.log('失败:', error)
+          })
         },
         onCancel () {
         }
-      });
+      })
     },
     // 新增业务
     add () {
@@ -742,7 +763,25 @@ export default {
       }).then(res => {
         return res
       })
-    }
+    },
+    afterVisibleChange () {
+      this.retrieveSummaryData()
+    },
+    async retrieveSummaryData () {
+      if (this.requestParameters.querySummary) {
+        this.summaryData = await querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+      }
+    },
+    showDrawer () {
+      if (this.summaryUpdate) {
+        this.summaryDrawerVisible = true
+      } else {
+        this.$message.warning('请查询后再来查看')
+      }
+    },
+    onClose () {
+      this.summaryDrawerVisible = false
+    },
   }
 }
 </script>