ocpview-pro 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-pro",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/RewriteBillListDetails/BillListPanelTable.vue

@@ -244,7 +244,22 @@ export default {
     name: "BillListPanelTable",
     extends: simpleviewgrid,
     data() {
-        return {};
+        return {
+            /**
+             * 用户配置的 showSummary 原始值，避免被 viewgridbase 自动切换
+             */
+            userShowSummary: undefined,
+        };
+    },
+    watch: {
+        /**
+         * 列表页合计由前端计算，不清除 summaryColumn 会导致自动拼接 summary_fld 请求后端
+         */
+        summaryColumn(val) {
+            if (val && val.length > 0) {
+                this.summaryColumn = [];
+            }
+        },
     },
     computed: {
         /**
@@ -355,6 +370,40 @@ export default {
         },
     },
     methods: {
+        /**
+         * 【覆写】列表页合计不由后端决定，恢复用户 showSummary 配置
+         */
+        refurbishSucceedDefault() {
+            // 父类 viewgridbase.refurbishSucceedDefault 的完整逻辑，去掉合计行自动切换
+            this.sumGroupNum = 0;
+            if (this.dynamicInitData && this.dynamicInitData[this.myConfig.response]) {
+                if (this.myConfig.showAll) {
+                    if (this.myConfig.rowAll) {
+                        this.dynamicInitData[this.myConfig.response].splice(0, 0, this.myConfig.rowAll);
+                    }
+                }
+                let data = [];
+                if (this.myConfig.overrideData) {
+                    data = this.myConfig.overrideData(this.dynamicInitData[this.myConfig.response]);
+                } else {
+                    data = this.dynamicInitData[this.myConfig.response];
+                }
+                if (this.dynamicInitData.sumgroups) {
+                    data = this.doSumgroups(data, this.dynamicInitData.sumgroups);
+                }
+                this.data = data;
+                this.tempData = this.$Method.copy(data);
+            }
+            if (this.dynamicInitData.total_results !== undefined) {
+                this.myConfig.pageConfig.total_results = Number(this.dynamicInitData.total_results);
+            }
+            // 列表页合计由前端从 tempData 计算，不依赖后端 total_summary
+            this.total_summary = {};
+            // 恢复用户配置的 showSummary，不被后端总控
+            if (this.userShowSummary !== undefined) {
+                this.myConfig.showSummary = this.userShowSummary;
+            }
+        },
         /**
          * 【覆写】获取多选数据事件
          */
@@ -411,8 +460,7 @@ export default {
             return {};
         },
         /**
-         * vxe-grid 合计行渲染
-         * 优先使用服务端返回的 total_summary，不存在时从当前页数据计算
+         * vxe-grid 合计行渲染 — 纯前端从当前页 tempData 计算
          */
         footerMethod({ columns }) {
             const sumSub = 0;
@@ -422,25 +470,6 @@ export default {
                         return this.myConfig.sumText;
                     }
                     if (this.sumFields.includes(column.field)) {
-                        // 优先使用服务端合计
-                        const serverValue = this.total_summary[column.field];
-                        if (serverValue !== undefined) {
-                            const columnConfig = this.tableColumns.find(
-                                (c) => c.name === column.field
-                            );
-                            const format = columnConfig?.format;
-                            const notzero = columnConfig?.notzero;
-                            // 修复 -0 显示为 -0.00 的问题
-                            const rawValue = (serverValue === 0) ? 0 : serverValue;
-                            const result = this.$Method.formatNumber(
-                                rawValue,
-                                format,
-                                notzero
-                            );
-                            if (result === '-0.00' || result === '-0') return '0.00';
-                            return result;
-                        }
-                        // 服务端无合计时从当前页数据计算
                         const sumData = this.handleSumField({
                             list: this.tempData,
                             field: column.field,
@@ -450,14 +479,14 @@ export default {
                         );
                         const format = columnConfig?.format;
                         const notzero = columnConfig?.notzero;
-                        const result2 = this.$Method.formatNumber(
+                        const result = this.$Method.formatNumber(
                             sumData,
                             format,
                             notzero
                         );
                         // 修复 -0.00 显示问题
-                        if (result2 === '-0.00' || result2 === '-0') return '0.00';
-                        return result2;
+                        if (result === '-0.00' || result === '-0') return '0.00';
+                        return result;
                     }
                     return null;
                 }),
@@ -477,6 +506,10 @@ export default {
     mounted() {
         // console.log("我继承覆写了22222", this.myConfig);
     },
+    created() {
+        // 保存用户原始 showSummary 配置，避免被 viewgridbase.refurbishSucceedDefault 自动切换
+        this.userShowSummary = this.config?.showSummary;
+    },
 };
 </script>