@indfnd/common 1.0.45 → 1.0.51

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.51](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.50...v1.0.51) (2024-09-06)
+
+
+### Features
+
+* 表格导出增加预览 ([a4ebae7](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/a4ebae7f11249af5c9b6a2072a6ef6d2fb10cfe7))
+
+### [1.0.50](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.49...v1.0.50) (2024-09-05)
+
+### [1.0.49](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.48...v1.0.49) (2024-09-05)
+
+### [1.0.48](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.47...v1.0.48) (2024-09-05)
+
+### [1.0.47](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.46...v1.0.47) (2024-09-05)
+
+### [1.0.46](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.45...v1.0.46) (2024-09-05)
+
+
+### Features
+
+* 附件预览 ([d8cd3a4](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/d8cd3a469b8f261e1970ab974405446dafb8d8be))
+
 ### [1.0.45](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.44...v1.0.45) (2024-09-02)
 
 ### [1.0.44](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.43...v1.0.44) (2024-08-28)

package/dist/ind-common.es.js

@@ -1,8 +1,8 @@
 import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Badge, DropdownMenu, DropdownItem, Submenu, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
-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, getLocalStorage, getSessionStorage, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getPreviewUrlApi, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
+import { isNil, putOssFileApi, 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, getLocalStorage, getSessionStorage, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getPreviewUrlApi, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, 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.44";
+const version = "1.0.50";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -43160,7 +43160,9 @@ function getAgColumnTitleAndData({ columns, datas }) {
   }
   calcColumns(columnsClo, columnsCalc);
   var columnAlign = columnsCalc.map((d) => d.align || "left");
-  var columnType = columnsCalc.map((d) => d.dataType == "percent" ? "p" : d.align == "right" || d.align == "rightNum" ? "n" : "s");
+  var columnType = columnsCalc.map(
+    (d) => d.dataType == "percent" ? "p" : d.align == "right" || d.align == "rightNum" ? "n" : "s"
+  );
   var columnWidth = columnsCalc.map(
     (d) => d.excelWidth ? d.excelWidth : d.width ? Math.floor(d.width / 10) : 10
   );
@@ -43463,6 +43465,124 @@ function exportJsonToExcel(excelData) {
     });
   }).catch((err) => console.log(err));
 }
+function previewJsonToExcel(excelData) {
+  var calcExportDatas = getAgColumnTitleAndData(excelData);
+  var previewUrl = "";
+  console.log("calcExportDatas", calcExportDatas);
+  var title = excelData.title;
+  var titleDeepth = calcExportDatas.deepth;
+  var columnAlign = excelData.columnAlign || calcExportDatas.columnAlign;
+  var columnType = excelData.columnType || calcExportDatas.columnType;
+  var columnTitle = calcExportDatas.columnTitle;
+  var columnWidth = excelData.columnWidth || calcExportDatas.columnWidth;
+  var columnCount = columnAlign.length;
+  var paramLeft = excelData.paramLeft;
+  var paramRight = excelData.paramRight;
+  var jsonData = calcExportDatas.exportData;
+  var numberFormat = excelData.numberFormat || calcExportDatas.numberFormat;
+  XlsxPopulate.fromBlankAsync().then((workbook) => {
+    var sheet = workbook.sheet("Sheet1");
+    for (var i = 0; i < columnCount; i++) {
+      sheet.column(i + 1).width(columnWidth[i] == 0 ? 10 : columnWidth[i]);
+    }
+    var titleRange = sheet.range(1, 1, 1, columnCount);
+    titleRange.merged(true);
+    titleRange.style(titleStyle);
+    titleRange.cell(0, 0).value(title);
+    sheet.row(1).height(titleHeight);
+    var rowsNow = 2;
+    if (!!excelData.paramLeft || !!excelData.paramRight) {
+      var paramLeftRange = sheet.range(2, 1, 2, Math.round(columnCount / 2));
+      paramLeftRange.cell(0, 0).value(paramLeft || "");
+      paramLeftRange.merged(true);
+      paramLeftRange.style(paramLeftStyle);
+      var paramRightRange = sheet.range(2, Math.round(columnCount / 2) + 1, 2, columnCount);
+      paramRightRange.cell(0, 0).value(paramRight || "");
+      paramRightRange.merged(true);
+      paramRightRange.style(paramRightStyle);
+      sheet.row(2).height(paramHeight);
+      rowsNow += 1;
+    }
+    columnTitle.forEach((d) => {
+      var _a;
+      var columnTitleRange = sheet.range(
+        d.srow + rowsNow - 1,
+        d.scol,
+        d.erow + rowsNow - 1,
+        d.ecol
+      );
+      columnTitleRange.merged(true);
+      columnTitleRange.style(columnTitleStyle);
+      columnTitleRange.cell(0, 0).value((_a = d.text) == null ? void 0 : _a.replace(/<br\/>/g, ""));
+    });
+    for (let i2 = 0; i2 < titleDeepth; i2++) {
+      sheet.row(rowsNow + i2).height(columnTitleHeight);
+    }
+    rowsNow += titleDeepth;
+    for (var i = 0; i < jsonData.length; i++) {
+      var lineData = jsonData[i];
+      for (var j = 0; j < lineData.length; j++) {
+        if (columnType[j] === "p" && lineData[j]) {
+          sheet.cell(rowsNow + i, j + 1).value(parseFloat(lineData[j] / 100));
+          dataCellStyle.numberFormat = numberFormat[j];
+        } else if (columnType[j] === "n" && lineData[j]) {
+          sheet.cell(rowsNow + i, j + 1).value(parseFloat(lineData[j]));
+          dataCellStyle.numberFormat = numberFormat[j];
+        } else if (columnType[j] === "s" && lineData[j]) {
+          sheet.cell(rowsNow + i, j + 1).value(lineData[j]);
+          dataCellStyle.numberFormat = "";
+        } else {
+          if (columnType[j] === "p" || columnType[j] === "n") {
+            dataCellStyle.numberFormat = numberFormat[j];
+          } else {
+            sheet.cell(rowsNow + i, j + 1).value("");
+          }
+        }
+        dataCellStyle.horizontalAlignment = columnAlign[j];
+        sheet.cell(rowsNow + i, j + 1).style(dataCellStyle);
+      }
+      if (excelData.rowColor && i % 2 != 0) {
+        var row = sheet.range(rowsNow + i, 1, rowsNow + i, columnCount);
+        row.style({ fill: "f8f8f9" });
+      }
+      sheet.row(rowsNow + i).height(dataRowHeight);
+    }
+    if (!!excelData.rowSpanDefs) {
+      initRowSpanInfosNew({ ...excelData, columns: calcExportDatas.columnsCalc });
+      _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
+        var columnTitleRange = sheet.range(
+          rowSpanInfo.mergeRowS + rowsNow,
+          rowSpanInfo.megerColS + 1,
+          rowSpanInfo.mergeRowE + rowsNow,
+          rowSpanInfo.megerColE + 1
+        );
+        columnTitleRange.merged(true);
+      });
+    } else if (!!excelData.rowSpanColumns) {
+      initRowSpanInfos({ ...excelData, columns: calcExportDatas.columnsCalc });
+      _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
+        var columnTitleRange = sheet.range(
+          rowSpanInfo.mergeRowS + rowsNow,
+          rowSpanInfo.megerColS + 1,
+          rowSpanInfo.mergeRowE + rowsNow,
+          rowSpanInfo.megerColE + 1
+        );
+        columnTitleRange.merged(true);
+      });
+    }
+    if (excelData.leftColumns || excelData.topRows) {
+      sheet.freezePanes(excelData.leftColumns || 0, (excelData.topRows || 0) + rowsNow - 1);
+    }
+    workbook.outputAsync().then(async function(blob) {
+      const timestamp = new Date().getTime();
+      const filename = `${timestamp}.xlsx`;
+      const { data } = await putOssFileApi(filename, blob);
+      console.log("data is --111111", data);
+      (data == null ? void 0 : data[0].fileId) || "";
+    });
+  }).catch((err) => console.log(err));
+  return previewUrl;
+}
 var dayjs_min = { exports: {} };
 (function(module2, exports2) {
   !function(t2, e) {
@@ -50251,7 +50371,9 @@ var render$14 = function() {
   var _c = _vm._self._c || _h;
   return _c("div", { staticClass: "export-data" }, [_c("Row", [_c("Form", { attrs: { "label-width": 80, "label-colon": "" } }, [_c("FormItem", { attrs: { "label": "\u5BFC\u51FA\u683C\u5F0F" } }, [_vm._v("xlsx")]), _c("FormItem", { attrs: { "label": "\u6587\u4EF6\u540D" } }, [_c("Input", { staticStyle: { "width": "270px" }, attrs: { "maxlength": "30", "icon": "document", "placeholder": "\u8868\u683C\u6570\u636E" }, model: { value: _vm.fileName, callback: function($$v) {
     _vm.fileName = typeof $$v === "string" ? $$v.trim() : $$v;
-  }, expression: "fileName" } })], 1), _c("FormItem", [_c("Button", { attrs: { "type": "default", "loading": _vm.exportCurrentLoading }, on: { "click": _vm.exportCurrentPage } }, [_vm._v("\u5BFC\u51FA\u5F53\u524D\u9875")]), _vm._v(" \xA0 "), _c("Button", { attrs: { "type": "default", "loading": _vm.exportAllLoading }, on: { "click": _vm.exportAllData } }, [_vm._v("\u5BFC\u51FA\u5168\u90E8")])], 1)], 1)], 1)], 1);
+  }, expression: "fileName" } })], 1), _c("FormItem", [_c("Button", { attrs: { "type": "default", "loading": _vm.exportCurrentLoading }, on: { "click": _vm.exportCurrentPage } }, [_vm._v("\u5BFC\u51FA\u5F53\u524D\u9875")]), _vm._v(" \xA0 "), _c("Button", { attrs: { "type": "default", "loading": _vm.exportAllLoading }, on: { "click": _vm.exportAllData } }, [_vm._v("\u5BFC\u51FA\u5168\u90E8")])], 1)], 1)], 1), _c("Modal", { staticClass: "preview-modal", attrs: { "width": "80" }, on: { "on-cancel": _vm.onCancel }, model: { value: _vm.boxShow, callback: function($$v) {
+    _vm.boxShow = $$v;
+  }, expression: "boxShow" } }, [_c("div", { staticStyle: { "width": "100%", "height": "100%", "display": "flex", "justify-content": "center" } }, [_vm.boxShow ? _c("div", { staticClass: "preview-content", attrs: { "id": _vm.id } }) : _vm._e()]), _c("div", { attrs: { "slot": "footer" }, slot: "footer" })])], 1);
 };
 var staticRenderFns$14 = [];
 const __vue2_script$1h = {
@@ -50329,6 +50451,8 @@ const __vue2_script$1h = {
   },
   data() {
     return {
+      id: "previewModal",
+      boxShow: false,
       exportCurrentLoading: false,
       exportAllLoading: false,
       fileName: "\u8868\u683C\u6570\u636E",
@@ -50345,6 +50469,33 @@ const __vue2_script$1h = {
     }
   },
   methods: {
+    onCancel() {
+      this.boxShow = false;
+    },
+    async openPreview() {
+      const result = await upmsApi.wpsEdit(this.fileId);
+      console.log("wps preview url is", result.data);
+      var tempUrl = "";
+      if (result.code == "1") {
+        tempUrl = result.data;
+      }
+      const token2 = localStorage["v8-token"];
+      console.log("preview token", token2);
+      window["WPS_GetToken"] = () => {
+        return { token: token2 };
+      };
+      console.log("tempUrl is", tempUrl);
+      var instance = this.wps.config({
+        url: tempUrl,
+        mount: document.getElementById(this.id)
+      });
+      console.log("instance-----", instance);
+      instance.setToken({
+        token: token2,
+        timeout: 10 * 60 * 1e3
+      });
+      console.log("wps instance", instance);
+    },
     exportCurrentPage() {
       this.$emit("doExport");
       this.exportCurrentLoading = true;
@@ -50371,6 +50522,32 @@ const __vue2_script$1h = {
         this.getDataFromData();
       }
     },
+    previewCurrentPage() {
+      this.$emit("doPreview");
+      this.exportCurrentLoading = true;
+      let exportParams = Object.assign(
+        {},
+        this.paginationParams,
+        this.sortParams,
+        this.searchParams
+      );
+      if (this.dataApi) {
+        this.getDataFromServerPreview(exportParams);
+      } else {
+        this.getDataFromDataPreview();
+      }
+    },
+    previewAllData() {
+      this.$emit("doPreview");
+      this.exportAllLoading = true;
+      let paginationParams = { offset: 0, limit: 1e5 };
+      let exportParams = Object.assign({}, paginationParams, this.sortParams, this.searchParams);
+      if (this.dataApi) {
+        this.getDataFromServerPreview(exportParams);
+      } else {
+        this.getDataFromDataPreview();
+      }
+    },
     toggleUnit(data) {
       if (this.unitType != this.defaultUnitType) {
         if (this.unitType == "WZ") {
@@ -50408,6 +50585,24 @@ const __vue2_script$1h = {
       }
       this.exportExcel(this.setExportEnum(resultData));
     },
+    getDataFromServerPreview(params) {
+      this.dataApi(params).then((result) => {
+        let resultData = _.cloneDeep(result.data.rows || result.data.records || result.data || []);
+        if (this.showSummary) {
+          let sum = this.summaryData(resultData);
+          resultData.push(sum);
+        }
+        this.toggleUnit(resultData);
+        this.preveiwExcel(this.setExportEnum(resultData));
+      });
+    },
+    getDataFromDataPreview() {
+      const resultData = _.cloneDeep(this.data);
+      if (this.showSummary) {
+        resultData.push(this.summaryData(resultData));
+      }
+      this.preveiwExcel(this.setExportEnum(resultData));
+    },
     setExportEnum(resultData) {
       let data = _.cloneDeep(resultData);
       data.forEach((e) => {
@@ -50500,6 +50695,34 @@ const __vue2_script$1h = {
       }
       this.exportCurrentLoading = false;
       this.exportAllLoading = false;
+    },
+    preveiwExcel(tableDatas) {
+      if (tableDatas.length) {
+        if (this.dataChildren) {
+          tableDatas = data_children_transform(tableDatas);
+        }
+        let data = _.cloneDeep(tableDatas);
+        if (this.pinnedTopRowData) {
+          data = _.concat(this.pinnedTopRowData, data);
+        }
+        const params = {
+          title: (this.fileName || "\u8868\u683C\u6570\u636E") + dayjs().format("YYYYMMDDHHmmss"),
+          columns: this.tableColumns,
+          datas: data,
+          paramLeft: this.paramLeft || "",
+          paramRight: this.paramRight || "",
+          rowSpanColumns: this.rowSpanColumns,
+          rowSpanIndexCol: this.rowSpanIndexCol,
+          topRows: 0,
+          leftColumns: 0,
+          rowSpanDefs: this.rowSpanDefs
+        };
+        previewJsonToExcel(params);
+      } else {
+        this.$Message.info("\u8868\u683C\u6570\u636E\u4E0D\u80FD\u4E3A\u7A7A\uFF01");
+      }
+      this.exportCurrentLoading = false;
+      this.exportAllLoading = false;
     }
   },
   watch: {
@@ -52989,6 +53212,12 @@ const __vue2_script$11 = {
     getContextMenuItems: function() {
       if (this.rowSelection == "multiple") {
         return [
+          {
+            name: "\u9884\u89C8\u5BFC\u51FAExcel",
+            action: () => {
+              this.$refs.exportData.previewCurrentPage();
+            }
+          },
           {
             name: "\u5BFC\u51FA\u6570\u636E\u5230Excel",
             action: () => {
@@ -53021,6 +53250,12 @@ const __vue2_script$11 = {
         ];
       } else {
         return [
+          {
+            name: "\u9884\u89C8\u5BFC\u51FAExcel",
+            action: () => {
+              this.$refs.exportData.previewCurrentPage();
+            }
+          },
           {
             name: "\u5BFC\u51FA\u6570\u636E\u5230Excel",
             action: () => {
@@ -53755,79 +53990,34 @@ const __vue2_script$11 = {
         this.hackReset = true;
       });
     },
-    renderSumRow: _.debounce(async function() {
-      var _a;
-      let hasSumRow = _.some(this.flatColumns, (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";
-            break;
-          }
+    renderSumRow: _.debounce(function() {
+      let sumData = this.flatColumns.reduce((acc, col) => {
+        if (!["checkbox", "radios", "index"].includes(col.type)) {
+          acc[col.field || col.key] = "\u5408\u8BA1";
+        } else if (col.isSum) {
+          acc[col.field || col.key] = 0;
         }
-        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 sumRows = [sumData];
-        let calcRules = {};
-        _.forEach(sumCalcRuleMap, (v, k) => {
-          _.merge(calcRules, v);
-        });
-        let rules = [];
-        _.forEach(calcRules, (v, k) => {
-          var _a2;
-          let column = _.find(sumCalcCols, (d) => {
-            return d.field == k || d.key == k;
-          });
-          rules.push({
-            rltKey: k,
-            ast: v,
-            precision: ((_a2 = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a2.scale) || 2,
-            errRtn: 0
-          });
+        return acc;
+      }, {});
+      let rowsToAccumulate = this.rowDataFiltered.map((row, idx) => {
+        return sumCols.reduce((acc, col) => {
+          let field = col.field || col.key;
+          let isMerged = !!this.tableRowSpanMergeIndexMap[field] && this.tableRowSpanMergeIndexMap[field][idx] > 1;
+          acc[field] = isMerged ? null : row[field];
+          return acc;
+        }, {});
+      }).filter((row) => Object.values(row).some((val) => val !== null));
+      sumData = rowsToAccumulate.reduce((acc, row) => {
+        Object.keys(row).forEach((key) => {
+          if (row[key] !== null) {
+            acc[key] = (acc[key] || 0) + parseFloat(row[key] || 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;
-      }
+        return acc;
+      }, sumData);
+      sumFuncCols.forEach((col) => {
+        sumData[col.field || col.key] = col.isSum(this.rowDataFiltered, col);
+      });
     }, 5),
     async renderTreeData(val) {
       this.treeData = _.some(val, (d) => {
@@ -55453,24 +55643,24 @@ const __vue2_script$10 = {
             break;
           }
         }
-        let sumCols = this.flatColumns.filter((item2) => item2.isSum);
-        let sumCalcCols = [], sumFuncCols = [];
-        sumCols.forEach((col) => {
+        let sumCols2 = this.flatColumns.filter((item2) => item2.isSum);
+        let sumCalcCols = [], sumFuncCols2 = [];
+        sumCols2.forEach((col) => {
           if (typeof col.isSum === "string")
             sumCalcCols.push(col);
           else if (col.isSum instanceof Function)
-            sumFuncCols.push(col);
+            sumFuncCols2.push(col);
         });
         const sumCalcRuleMap = {};
         sumCalcCols.forEach((col) => {
           addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
         });
-        sumCols.forEach((col) => {
+        sumCols2.forEach((col) => {
           if (!((col.field || col.key) in sumData))
             sumData[col.field || col.key] = 0;
         });
         this.rowDataFiltered.forEach((d) => {
-          sumCols.forEach((dd) => {
+          sumCols2.forEach((dd) => {
             if (typeof dd.isSum === "string")
               return;
             let field = dd.field || dd.key;
@@ -55480,7 +55670,7 @@ const __vue2_script$10 = {
             }
           });
         });
-        sumFuncCols.forEach((col) => {
+        sumFuncCols2.forEach((col) => {
           sumData[col.field || col.key] = col.isSum(this.rowDataFiltered, col);
         });
         let sumRows = [sumData];
@@ -65753,7 +65943,7 @@ var __component__$4 = /* @__PURE__ */ normalizeComponent(
   staticRenderFns$4,
   false,
   __vue2_injectStyles$4,
-  "53b6c10d",
+  "763a051d",
   null,
   null
 );