@indfnd/common 1.0.14 → 1.0.16

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.16](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.15...v1.0.16) (2024-07-10)
+
+
+### Features
+
+* 同步移动端表格修改内容表格 ([085ad56](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/085ad56e9198574c540af7c205096eeeca7b1b08))
+
+### [1.0.15](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.14...v1.0.15) (2024-07-08)
+
+
+### Features
+
+* 表格计算逻辑修改`` ([21a6a95](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/21a6a958528a6cb3c678bfa1b898aa8b1b8d6485))
+
 ### [1.0.14](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.13...v1.0.14) (2024-06-29)
 
 

package/dist/ind-common.es.js

@@ -2,7 +2,7 @@ import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Draw
 import { isNil, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, getLocalStorage, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "1.0.13";
+const version = "1.0.15";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -53551,70 +53551,57 @@ const __vue2_script$_ = {
     },
     renderSumRow: _.debounce(async function() {
       var _a;
-      let hasSumRow = _.some(this.flatColumns, (item2) => item2.isSum);
+      let hasSumRow = this.flatColumns.some((item2) => item2.isSum);
       if (hasSumRow) {
         console.time("calcSum");
-        let sumCols = _.filter(this.flatColumns, (item2) => item2.isSum);
-        let sumCalcCols = _.remove(sumCols, (item2) => isString(item2.isSum));
-        let sumFuncCols = _.remove(sumCols, (item2) => item2.isSum instanceof Function);
-        const sumCalcRuleMap = {};
-        _.forEach(sumCalcCols, (col) => {
-          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
-        });
         let sumData = {};
-        for (let i = 0; i < this.flatColumns.length; i++) {
-          if (!["checkbox", "radios", "index"].includes((_a = this.flatColumns[i]) == null ? void 0 : _a.type)) {
-            let colTmp = this.flatColumns[i];
-            sumData[colTmp.field || colTmp.key] = "\u5408\u8BA1";
+        for (let col of this.flatColumns) {
+          if (!["checkbox", "radios", "index"].includes(col.type)) {
+            sumData[col.field || col.key] = "\u5408\u8BA1";
             break;
           }
         }
-        sumCols.forEach((d) => sumData[d.field || d.key] = 0);
-        sumData = _.reduce(
-          this.rowDataFiltered,
-          (s, d, idx) => {
-            sumCols.forEach((dd) => {
-              if (isString(dd.isSum))
-                return;
-              let field = dd.field || dd.key;
-              let rowMergeInfo = this.tableRowSpanMergeIndexMap[field];
-              let mergedRows = [];
-              _.forEach(rowMergeInfo, (v, k) => {
-                let rows2 = _.range(k, parseInt(k) + v);
-                mergedRows.push(...rows2.slice(1));
-              });
-              if (!mergedRows.includes(idx)) {
-                sumData[field] = _.round(
-                  sumData[field] + (!d[field] || isNaN(d[field]) ? 0 : parseFloat(d[field])),
-                  6
-                );
-              }
-            });
-            return s;
-          },
-          sumData
-        );
-        _.forEach(sumFuncCols, (d) => {
-          sumData[d.field || d.key] = d.isSum(this.rowDataFiltered, d);
+        let sumCols = this.flatColumns.filter((item2) => item2.isSum);
+        let sumCalcCols = [], sumFuncCols = [];
+        sumCols.forEach((col) => {
+          if (typeof col.isSum === "string")
+            sumCalcCols.push(col);
+          else if (col.isSum instanceof Function)
+            sumFuncCols.push(col);
         });
-        let sumRows = [sumData];
-        let calcRules = {};
-        _.forEach(sumCalcRuleMap, (v, k) => {
-          _.merge(calcRules, v);
+        const sumCalcRuleMap = {};
+        sumCalcCols.forEach((col) => {
+          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
         });
-        let rules = [];
-        _.forEach(calcRules, (v, k) => {
-          var _a2;
-          let column = _.find(sumCalcCols, (d) => {
-            return d.field == k || d.key == k;
+        sumCols.forEach((col) => {
+          if (!(col.field || col.key) in sumData)
+            sumData[col.field || col.key] = 0;
+        });
+        this.rowDataFiltered.forEach((d) => {
+          sumCols.forEach((dd) => {
+            if (typeof dd.isSum === "string")
+              return;
+            let field = dd.field || dd.key;
+            let value = d[field];
+            if (typeof value === "number" && !isNaN(value)) {
+              sumData[field] = (sumData[field] || 0) + value;
+            }
           });
+        });
+        sumFuncCols.forEach((col) => {
+          sumData[col.field || col.key] = col.isSum(this.rowDataFiltered, col);
+        });
+        let sumRows = [sumData];
+        let rules = [];
+        for (let key in sumCalcRuleMap) {
+          let column = sumCalcCols.find((col) => col.field === key || col.key === key);
           rules.push({
-            rltKey: k,
-            ast: v,
-            precision: ((_a2 = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a2.scale) || 2,
+            rltKey: key,
+            ast: sumCalcRuleMap[key],
+            precision: ((_a = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a.scale) || 2,
             errRtn: 0
           });
-        });
+        }
         let options = { calcRules: rules };
         calcDatas(sumRows, options);
         this.topRows = this.pinnedTopRowDataWithUnit ? _.concat(this.pinnedTopRowDataWithUnit, sumRows) : sumRows;
@@ -53871,7 +53858,7 @@ var render$Y = function() {
   var _c = _vm._self._c || _h;
   return _c("div", { staticClass: "lambo-grid-table", class: [_vm.fullSreen ? "fullscreen-fixed" : ""] }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], ref: "search", staticClass: "search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], ref: "tip", staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.important - _vm.tip, expression: "$slots.important - tip" }], ref: "important-tip", staticClass: "important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { ref: "buttons", staticClass: "other-button" }, [_c("Row", [[_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "flex": "1 1 0%" } }, [_vm.showUnitSwitch && _vm.isShowUnitSwitch ? _c("IndUnitRadio", { staticStyle: { "margin-top": "var(--ind-unit-switch-bottom)", "line-height": "1", "margin-left": "10px" }, attrs: { "isShowWX": _vm.isShowWX, "isShowJ": _vm.isShowJ }, model: { value: _vm.unitType, callback: function($$v) {
     _vm.unitType = $$v;
-  }, expression: "unitType" } }) : _vm._e()], 1)], _c("i-col", { directives: [{ name: "show", rawName: "v-show", value: _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options, expression: "(showUnitSwitch && isShowUnitSwitch) || showTableOption || $slots.options" }], staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "var(--ivu-form-item-content-line-height)", "padding-bottom": "calc(var(--ind-table-button-padding) + 2px)", "margin-right": "10px" } }, [_vm._t("options")], 2)])])], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": _vm.rowSelection != "multiple", "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "getRowHeight": _vm.getRowHeight, "rowData": _vm.rowDataFiltered, "suppressRowClickSelection": _vm.isPc || _vm.isEditTable || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isPc && !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClassCommon, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded, "getContextMenuItems": _vm.getContextMenuItems }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "rowSelected": _vm.rowSelected, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
+  }, expression: "unitType" } }) : _vm._e()], 1)], _c("i-col", { directives: [{ name: "show", rawName: "v-show", value: _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options, expression: "(showUnitSwitch && isShowUnitSwitch) || showTableOption || $slots.options" }], staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "var(--ivu-form-item-content-line-height)", "padding-bottom": "calc(var(--ind-table-button-padding) + 2px)", "margin-right": "10px" } }, [_vm._t("options")], 2)])])], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": !_vm.showTableOption, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "rowHeight": _vm.getRowHeight(), "getRowHeight": _vm.getRowHeight, "rowData": _vm.rowDataFiltered, "suppressRowClickSelection": (_vm.isPc || _vm.isEditTable) && _vm.rowSelection == "multiple" || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isPc && !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClassCommon, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded, "getContextMenuItems": _vm.getContextMenuItems }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "rowSelected": _vm.rowSelected, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
 };
 var staticRenderFns$Y = [];
 function suppressNavigation(params) {
@@ -53962,6 +53949,7 @@ const __vue2_script$Z = {
     AgImage
   },
   props: {
+    rowSpanDefs: Array,
     headerHeight: {
       type: Number,
       default: 28
@@ -54086,6 +54074,7 @@ const __vue2_script$Z = {
       type: Boolean,
       default: false
     },
+    rowAddHeight: { type: Number, default: 0 },
     renderDataFn: Function,
     revertBtn: Boolean,
     isIndexManageTable: Boolean,
@@ -54102,11 +54091,11 @@ const __vue2_script$Z = {
     },
     xScale: {
       type: Number,
-      default: 4
+      default: 2
     },
     wzScale: {
       type: Number,
-      default: 4
+      default: 2
     },
     funId: String,
     groupDefaultExpanded: {
@@ -54119,6 +54108,10 @@ const __vue2_script$Z = {
       type: Boolean,
       default: true
     },
+    showZeroDefault: {
+      type: String,
+      default: "Y"
+    },
     noRowsTemplate: String
   },
   data() {
@@ -54179,7 +54172,7 @@ const __vue2_script$Z = {
       gridApi: null,
       gridColumnApi: null,
       overlayNoRowsTemplate: '<span style="padding: 10px;">\u8BF7\u9009\u62E9\u67E5\u8BE2\u6761\u4EF6</span>',
-      showZero: "Y",
+      showZero: this.showZeroDefault,
       showZeroSwitch: false,
       switchZeroCol: null,
       switchZeroTitle: "",
@@ -54197,6 +54190,18 @@ const __vue2_script$Z = {
     };
   },
   computed: {
+    mergeIndexCol() {
+      let mergeIndex = _.find(this.columns, (d) => {
+        return d.autoMergeRow === true;
+      });
+      return (mergeIndex == null ? void 0 : mergeIndex.key) || (mergeIndex == null ? void 0 : mergeIndex.field);
+    },
+    mergeColumns() {
+      let rlt = _.filter(this.columns, (d) => {
+        return !!d.autoMergeRow;
+      }).map((d) => d.key || d.field);
+      return (rlt == null ? void 0 : rlt.length) ? rlt : void 0;
+    },
     paramRightUnit() {
       return _.some(this.flatColumns, (d) => {
         return d.isSwitchUnit;
@@ -54307,41 +54312,21 @@ const __vue2_script$Z = {
       },
       deep: true
     },
-    unitType(val) {
+    unitType(val, oldValue) {
       let datasTmp = _.cloneDeep(this.tableData);
-      if (val == "X") {
-        datasTmp.forEach((d) => {
-          this.switchCols.forEach((dd) => {
-            let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
-          });
-        });
-      } else if (val == "WZ") {
-        datasTmp.forEach((d) => {
-          this.switchCols.forEach((dd) => {
-            let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
-          });
+      datasTmp.forEach((d) => {
+        this.switchCols.forEach((dd) => {
+          changeCellUnit(oldValue, val, d, dd);
         });
-      }
+      });
       this.tableData = datasTmp;
       if (this.pinnedTopRowDataWithUnit && this.pinnedTopRowDataWithUnit.length) {
         let pinnedTopRowDataWithUnitTmp = _.cloneDeep(this.pinnedTopRowDataWithUnit);
-        if (val == "X") {
-          pinnedTopRowDataWithUnitTmp.forEach((d) => {
-            this.switchCols.forEach((dd) => {
-              let t2 = _.round(parseFloat(d[dd]), 6);
-              d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
-            });
-          });
-        } else if (val == "WZ") {
-          pinnedTopRowDataWithUnitTmp.forEach((d) => {
-            this.switchCols.forEach((dd) => {
-              let t2 = _.round(parseFloat(d[dd]), 6);
-              d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
-            });
+        pinnedTopRowDataWithUnitTmp.forEach((d) => {
+          this.switchCols.forEach((dd) => {
+            changeCellUnit(oldValue, val, d, dd);
           });
-        }
+        });
         this.pinnedTopRowDataWithUnit = pinnedTopRowDataWithUnitTmp;
         this.renderSumRow();
       }
@@ -54432,6 +54417,9 @@ const __vue2_script$Z = {
       handler() {
         this.tableHeight = this.height;
       }
+    },
+    showZero() {
+      this.renderSumRow();
     }
   },
   async created() {
@@ -54460,13 +54448,6 @@ const __vue2_script$Z = {
     await this.$nextTick();
     this.checkAllGroup = this.columns.map((d) => d.title);
   },
-  mounted() {
-    window.agTable = this;
-    if (this.autoRefresh) {
-      this.tableRefresh();
-    }
-    this.columnsFilter();
-  },
   activated() {
     if (this.autoRefresh) {
       this.tableRefresh();
@@ -54512,6 +54493,15 @@ const __vue2_script$Z = {
             }
           }
         ];
+      } else {
+        return [
+          {
+            name: "\u5BFC\u51FA\u6570\u636E\u5230Excel",
+            action: () => {
+              this.$refs.exportData.exportCurrentPage();
+            }
+          }
+        ];
       }
     },
     getRowClassCommon(params) {
@@ -54716,7 +54706,7 @@ const __vue2_script$Z = {
         "ind-default-theme": 42,
         "ind-small-theme": 28
       };
-      return heightEnum[this.getTheme];
+      return (heightEnum[this.getTheme] || 0) + this.rowAddHeight;
     },
     onGridReady(params) {
       window.gridApi = this.gridApi = params.api;
@@ -54745,13 +54735,17 @@ const __vue2_script$Z = {
             idxArrEnum[i] = idxArr2;
           }
         });
-        let idxArr = idxArrEnum[params.node.rowIndex];
+        let idxUuidEnum = {};
+        _.forEach(this.rowDataFiltered, (row, idx) => {
+          idxUuidEnum[idx + ""] = row.uuid;
+        });
+        let idxArr = idxArrEnum[params.node.rowIndex] || [];
         if (!params.node.selected) {
           let selRows = this.getSelection();
           if (selRows.length > 0) {
             _.forEach(idxArr, (index2) => {
               _.remove(selRows, (row, idx) => {
-                return idx == index2;
+                return row.uuid == idxUuidEnum[index2 + ""];
               });
             });
           }
@@ -54765,9 +54759,9 @@ const __vue2_script$Z = {
           this.setSelection(selRows);
         }
       }
-      this.$nextTick(() => {
+      setTimeout(() => {
         this.selecting = false;
-      });
+      }, 100);
       var selectedRows = this.gridApi.getSelectedRows();
       this.$emit("on-select-change", selectedRows);
     },
@@ -54785,7 +54779,7 @@ const __vue2_script$Z = {
         return column.cellRendererParams.scale;
       if (column.isSwitchUnit) {
         const unitType = this.unitType.toLowerCase();
-        return this[`${unitType}Scale`] || 4;
+        return this[`${unitType}Scale`] || 2;
       }
       return null;
     },
@@ -54820,6 +54814,12 @@ const __vue2_script$Z = {
         if (column.hide) {
           agColumn.hide = column.hide;
         }
+        if (column.align) {
+          agColumn.align = column.align;
+        }
+        if (column.dataType) {
+          agColumn.dataType = column.dataType;
+        }
         if (column.headerTooltip) {
           agColumn.headerTooltip = agColumn.headerTooltip || column.headerTooltip;
         }
@@ -55007,7 +55007,7 @@ const __vue2_script$Z = {
               if (!isValid) {
                 const { newValue, oldValue, data, colDef, column: column2 } = params;
                 this.isRevertingOldValue = true;
-                data[colDef.key] = newValue;
+                data[colDef.field || colDef.key] = newValue;
                 setTimeout(() => {
                   params.node.setDataValue(column2, oldValue);
                   this.isRevertingOldValue = false;
@@ -55218,78 +55218,67 @@ const __vue2_script$Z = {
         this.hackReset = true;
       });
     },
-    renderSumRow() {
+    renderSumRow: _.debounce(async function() {
       var _a;
-      let hasSumRow = _.some(this.flatColumns, (item2) => item2.isSum);
+      let hasSumRow = this.flatColumns.some((item2) => item2.isSum);
       if (hasSumRow) {
-        let sumCols = _.filter(this.flatColumns, (item2) => item2.isSum);
-        let sumCalcCols = _.remove(sumCols, (item2) => isString(item2.isSum));
-        let sumFuncCols = _.remove(sumCols, (item2) => item2.isSum instanceof Function);
-        const sumCalcRuleMap = {};
-        _.forEach(sumCalcCols, (col) => {
-          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
-        });
+        console.time("calcSum");
         let sumData = {};
-        for (let i = 0; i < this.flatColumns.length; i++) {
-          if (!["checkbox", "radios", "index"].includes((_a = this.flatColumns[i]) == null ? void 0 : _a.type)) {
-            let colTmp = this.flatColumns[i];
-            sumData[colTmp.field || colTmp.key] = "\u5408\u8BA1";
+        for (let col of this.flatColumns) {
+          if (!["checkbox", "radios", "index"].includes(col.type)) {
+            sumData[col.field || col.key] = "\u5408\u8BA1";
             break;
           }
         }
-        sumCols.forEach((d) => sumData[d.field || d.key] = 0);
-        sumData = _.reduce(
-          this.tableData,
-          (s, d, idx) => {
-            sumCols.forEach((dd) => {
-              if (isString(dd.isSum))
-                return;
-              let field = dd.field || dd.key;
-              let rowMergeInfo = this.tableRowSpanMergeIndexMap[field];
-              let mergedRows = [];
-              _.forEach(rowMergeInfo, (v, k) => {
-                let rows2 = _.range(k, parseInt(k) + v);
-                mergedRows.push(...rows2.slice(1));
-              });
-              if (!mergedRows.includes(idx)) {
-                sumData[field] = _.round(
-                  sumData[field] + (!d[field] || isNaN(d[field]) ? 0 : parseFloat(d[field])),
-                  6
-                );
-              }
-            });
-            return s;
-          },
-          sumData
-        );
-        _.forEach(sumFuncCols, (d) => {
-          sumData[d.field || d.key] = d.isSum(this.tableData, d);
+        let sumCols = this.flatColumns.filter((item2) => item2.isSum);
+        let sumCalcCols = [], sumFuncCols = [];
+        sumCols.forEach((col) => {
+          if (typeof col.isSum === "string")
+            sumCalcCols.push(col);
+          else if (col.isSum instanceof Function)
+            sumFuncCols.push(col);
         });
-        let sumRows = [sumData];
-        let calcRules = {};
-        _.forEach(sumCalcRuleMap, (v, k) => {
-          _.merge(calcRules, v);
+        const sumCalcRuleMap = {};
+        sumCalcCols.forEach((col) => {
+          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
         });
-        let rules = [];
-        _.forEach(calcRules, (v, k) => {
-          var _a2;
-          let column = _.find(sumCalcCols, (d) => {
-            return d.field == k || d.key == k;
+        sumCols.forEach((col) => {
+          if (!(col.field || col.key) in sumData)
+            sumData[col.field || col.key] = 0;
+        });
+        this.rowDataFiltered.forEach((d) => {
+          sumCols.forEach((dd) => {
+            if (typeof dd.isSum === "string")
+              return;
+            let field = dd.field || dd.key;
+            let value = d[field];
+            if (typeof value === "number" && !isNaN(value)) {
+              sumData[field] = (sumData[field] || 0) + value;
+            }
           });
+        });
+        sumFuncCols.forEach((col) => {
+          sumData[col.field || col.key] = col.isSum(this.rowDataFiltered, col);
+        });
+        let sumRows = [sumData];
+        let rules = [];
+        for (let key in sumCalcRuleMap) {
+          let column = sumCalcCols.find((col) => col.field === key || col.key === key);
           rules.push({
-            rltKey: k,
-            ast: v,
-            precision: ((_a2 = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a2.scale) || 2,
+            rltKey: key,
+            ast: sumCalcRuleMap[key],
+            precision: ((_a = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a.scale) || 2,
             errRtn: 0
           });
-        });
+        }
         let options = { calcRules: rules };
         calcDatas(sumRows, options);
         this.topRows = this.pinnedTopRowDataWithUnit ? _.concat(this.pinnedTopRowDataWithUnit, sumRows) : sumRows;
+        console.timeEnd("calcSum");
       } else {
         this.topRows = this.pinnedTopRowDataWithUnit;
       }
-    },
+    }, 5),
     async renderTreeData(val) {
       this.treeData = _.some(val, (d) => {
         var _a, _b;
@@ -55326,9 +55315,8 @@ const __vue2_script$Z = {
         }
       });
     },
-    tableRefresh: _.debounce(function(noQuery) {
-      var _a;
-      if (this.dataApi && (!noQuery || !((_a = this.tableData) == null ? void 0 : _a.length))) {
+    tableRefresh: function(noQuery) {
+      if (this.dataApi && !noQuery) {
         if (this.gridApi) {
           this.gridApi.hideOverlay();
         }
@@ -55355,21 +55343,11 @@ const __vue2_script$Z = {
               d["_initialseq"] = idx;
             });
             if (this.unitType != this.defaultUnitType) {
-              if (this.unitType == "WZ") {
-                data.forEach((d) => {
-                  this.switchCols.forEach((dd) => {
-                    let t2 = _.round(parseFloat(d[dd]), 6);
-                    d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
-                  });
-                });
-              } else {
-                data.forEach((d) => {
-                  this.switchCols.forEach((dd) => {
-                    let t2 = _.round(parseFloat(d[dd]), 6);
-                    d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
-                  });
+              data.forEach((d) => {
+                this.switchCols.forEach((dd) => {
+                  changeCellUnit(this.defaultUnitType, this.unitType, d, dd);
                 });
-              }
+              });
             }
             this.tableData = await this.renderTreeData(data);
             this.totalNumber = result.data.total || 0;
@@ -55385,53 +55363,33 @@ const __vue2_script$Z = {
         this.totalNumber = this.value.length;
       }
       this.optionDropdownVisible = false;
-    }, 1),
+    },
     setUnitType(unitType) {
       this.unitType = unitType;
     },
-    toggleUnitIfNeeded: _.debounce(async function toggleUnitIfNeeded() {
+    toggleUnitIfNeeded: _.debounce(async function() {
       setTimeout(() => {
         if (this.pinnedTopRowDataWithUnit && this.pinnedTopRowDataWithUnit.length) {
           let pinnedTopRowDataWithUnitTmp = _.cloneDeep(this.pinnedTopRowDataWithUnit);
           if (this.unitType != this.defaultUnitType) {
-            if (this.unitType == "X") {
-              pinnedTopRowDataWithUnitTmp.forEach((d) => {
-                this.switchCols.forEach((dd) => {
-                  let t2 = _.round(parseFloat(d[dd]), 6);
-                  d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
-                });
-              });
-            } else if (this.unitType == "WZ") {
-              pinnedTopRowDataWithUnitTmp.forEach((d) => {
-                this.switchCols.forEach((dd) => {
-                  let t2 = _.round(parseFloat(d[dd]), 6);
-                  d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
-                });
+            pinnedTopRowDataWithUnitTmp.forEach((d) => {
+              this.switchCols.forEach((dd) => {
+                changeCellUnit(this.defaultUnitType, this.unitType, d, dd);
               });
-            }
+            });
+            this.pinnedTopRowDataWithUnit = pinnedTopRowDataWithUnitTmp;
+            this.renderSumRow();
           }
-          this.pinnedTopRowDataWithUnit = pinnedTopRowDataWithUnitTmp;
-          this.renderSumRow();
         }
         let datasTmp = _.cloneDeep(this.tableData);
         if (this.unitType != this.defaultUnitType) {
-          if (this.unitType == "WZ") {
-            datasTmp.forEach((d) => {
-              this.switchCols.forEach((dd) => {
-                let t2 = parseFloat(d[dd]);
-                d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
-              });
-            });
-          } else {
-            datasTmp.forEach((d) => {
-              this.switchCols.forEach((dd) => {
-                let t2 = parseFloat(d[dd]);
-                d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
-              });
+          datasTmp.forEach((d) => {
+            this.switchCols.forEach((dd) => {
+              changeCellUnit(this.defaultUnitType, this.unitType, d, dd);
             });
-          }
+          });
+          this.$emit("input", datasTmp);
         }
-        this.$emit("input", datasTmp);
       }, 10);
     }, 1),
     getSelection() {
@@ -55468,8 +55426,7 @@ const __vue2_script$Z = {
         let datasTmp = _.cloneDeep(this.tableData);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
+            changeCellUnit(this.unitType, "X", d, dd);
           });
         });
         return datasTmp;
@@ -55482,8 +55439,7 @@ const __vue2_script$Z = {
         let datasTmp = _.cloneDeep(this.tableData);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
+            changeCellUnit(this.unitType, "WZ", d, dd);
           });
         });
         return datasTmp;
@@ -55496,8 +55452,7 @@ const __vue2_script$Z = {
         let datasTmp = _.cloneDeep(this.topRows);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : _.round(t2 / 5, 6);
+            changeCellUnit(this.unitType, "X", d, dd);
           });
         });
         return datasTmp;
@@ -55510,8 +55465,7 @@ const __vue2_script$Z = {
         let datasTmp = _.cloneDeep(this.topRows);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = _.round(parseFloat(d[dd]), 6);
-            d[dd] = isNaN(t2) ? null : _.round(t2 * 5, 6);
+            changeCellUnit(this.unitType, "WZ", d, dd);
           });
         });
         return datasTmp;