ocpview-pro 0.1.10 → 0.1.12

package/package.json

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

package/src/components/label/showtext.vue

@@ -156,6 +156,7 @@ export default {
     white-space: pre-wrap;
 }
 .showtext-link {
+    color: #0000EE;
     text-decoration: underline;
     cursor: pointer;
 }

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

@@ -752,6 +752,8 @@ export default {
             list.forEach((item) => {
                 count = this.$utils.add(count, item[field]);
             });
+            // 修复 -0 显示为 -0.00 的问题
+            if (count === 0) count = 0;
             return count;
         },
 

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

@@ -24,6 +24,8 @@
                     :height="tableHeight"
                     :max-height="tableMaxHeight"
                     :loading="loading"
+                    :show-footer="myConfig.showSummary"
+                    :footer-method="footerMethod"
                     :sort-config="{ remote: true, trigger: 'cell' }"
                     :column-config="{ useKey: true }"
                     :row-config="{ useKey: true }"
@@ -343,6 +345,14 @@ export default {
                     this.myConfig.pageConfig.page_size,
             };
         },
+        /**
+         * 需要合计的字段列表
+         */
+        sumFields() {
+            return this.tableColumns
+                .filter((item) => item.summary)
+                .map((item) => item.name);
+        },
     },
     methods: {
         /**
@@ -400,6 +410,64 @@ export default {
             }
             return {};
         },
+        /**
+         * vxe-grid 合计行渲染
+         * 优先使用服务端返回的 total_summary，不存在时从当前页数据计算
+         */
+        footerMethod({ columns }) {
+            const sumSub = 0;
+            return [
+                columns.map((column) => {
+                    if (column.index === sumSub) {
+                        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;
+                            return this.$Method.formatNumber(
+                                rawValue,
+                                format,
+                                notzero
+                            );
+                        }
+                        // 服务端无合计时从当前页数据计算
+                        const sumData = this.handleSumField({
+                            list: this.tempData,
+                            field: column.field,
+                        });
+                        const columnConfig = this.tableColumns.find(
+                            (c) => c.name === column.field
+                        );
+                        const format = columnConfig?.format;
+                        const notzero = columnConfig?.notzero;
+                        return this.$Method.formatNumber(
+                            sumData,
+                            format,
+                            notzero
+                        );
+                    }
+                    return null;
+                }),
+            ];
+        },
+        handleSumField(params) {
+            const { list, field } = params;
+            let count = 0;
+            list.forEach((item) => {
+                count = this.$utils.add(count, item[field]);
+            });
+            // 修复 -0 显示为 -0.00 的问题
+            if (count === 0) count = 0;
+            return count;
+        },
     },
     mounted() {
         // console.log("我继承覆写了22222", this.myConfig);