@indfnd/common 1.1.53 → 1.1.55

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.1.55](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.54...v1.1.55) (2026-02-27)
+
+
+### Features
+
+* 增加zerovalueformatter ([b59b4d5](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/b59b4d53d938edf24c67fe1294e23c71ff14e31b))
+* 增加zerovalueformatter ([ec438f8](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/ec438f830b1db7dd583169f65ec8da34eb6d1b15))
+
+### [1.1.54](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.53...v1.1.54) (2026-02-27)
+
+
+### Features
+
+* 回滚 ([a42cf41](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/a42cf41962a342806d9a3700aa832368b1a97e78))
+* 移动端放开Excel ([81341ad](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/81341ad0a157d3287ab38aa2cadcac90017712da))
+
+
+### Bug Fixes
+
+* 表格导出到excel，isPerMille默认值处理 ([338ee3e](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/338ee3e5a9e809b6c4acd1847a81afad2d0b105e))
+
 ### [1.1.53](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.52...v1.1.53) (2026-02-24)
 
 

package/dist/ind-common.es.js

@@ -32,7 +32,7 @@ var lodash = { exports: {} };
 (function(module2, exports2) {
   (function() {
     var undefined$1;
-    var VERSION2 = "4.17.21";
+    var VERSION2 = "4.17.23";
     var LARGE_ARRAY_SIZE = 200;
     var CORE_ERROR_TEXT = "Unsupported core-js use. Try https://npms.io/search?q=ponyfill.", FUNC_ERROR_TEXT = "Expected a function", INVALID_TEMPL_VAR_ERROR_TEXT = "Invalid `variable` option passed into `_.template`";
     var HASH_UNDEFINED = "__lodash_hash_undefined__";
@@ -1918,8 +1918,28 @@ var lodash = { exports: {} };
       }
       function baseUnset(object, path) {
         path = castPath(path, object);
-        object = parent(object, path);
-        return object == null || delete object[toKey(last(path))];
+        var index2 = -1, length = path.length;
+        if (!length) {
+          return true;
+        }
+        var isRootPrimitive = object == null || typeof object !== "object" && typeof object !== "function";
+        while (++index2 < length) {
+          var key = path[index2];
+          if (typeof key !== "string") {
+            continue;
+          }
+          if (key === "__proto__" && !hasOwnProperty.call(object, "__proto__")) {
+            return false;
+          }
+          if (key === "constructor" && index2 + 1 < length && typeof path[index2 + 1] === "string" && path[index2 + 1] === "prototype") {
+            if (isRootPrimitive && index2 === 0) {
+              continue;
+            }
+            return false;
+          }
+        }
+        var obj = parent(object, path);
+        return obj == null || delete obj[toKey(last(path))];
       }
       function baseUpdate(object, path, updater, customizer) {
         return baseSet(object, path, updater(baseGet(object, path)), customizer);
@@ -5460,7 +5480,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.1.52";
+const version = "1.1.54";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -43396,15 +43416,21 @@ const titleHeight = 27;
 const paramHeight = 18;
 const columnTitleHeight = 18;
 const dataRowHeight = 18;
-function getAgColumnTitleAndData({ columns, datas }) {
+function getAgColumnTitleAndData({
+  columns,
+  datas,
+  remainAdditionZero = false
+}) {
+  console.log(
+    "--getAgColumnTitleAndData: remainAdditionZero",
+    remainAdditionZero
+  );
   var columnsClo = _.cloneDeep(columns);
   var datasClo = _.cloneDeep(datas);
-  console.log("columnsClo \u662F\u5565\u5440", columnsClo);
   _.remove(columnsClo, (d) => {
-    return d.cellClass.indexOf("button") != -1 || d.cellClass.indexOf("radio") != -1 || d.cellClass.indexOf("checkbox") != -1 || d.hide;
+    return d.cellClass.indexOf("button") != -1 || d.cellClass.indexOf("radio") != -1 || d.cellClass.indexOf("checkbox") != -1 || d.cellClass.indexOf("chart") != -1 || d.hide;
   });
   _.forEach(columnsClo, (d) => {
-    var _a;
     if (d.cellClass.indexOf("index") != -1) {
       d.field = "__seq";
       datasClo.forEach((dd, idx) => {
@@ -43412,32 +43438,28 @@ function getAgColumnTitleAndData({ columns, datas }) {
       });
     } else if (d.cellClass.indexOf("enum") != -1) {
       datasClo.forEach((dd) => {
-        var _a2, _b, _c;
-        let enumList = ((_a2 = d == null ? void 0 : d.cellRendererParams) == null ? void 0 : _a2.enumList) || [];
-        let enumData = ((_b = d == null ? void 0 : d.cellRendererParams) == null ? void 0 : _b.enumData) || {};
+        let enumList = d && d.cellRendererParams && d.cellRendererParams.enumList || [];
+        let enumData = d && d.cellRendererParams && d.cellRendererParams.enumData || {};
         if (enumList.length) {
-          let v = ((_c = _.find(enumList, { K: dd[d.field] })) == null ? void 0 : _c.V) || dd[d.field];
+          let v = (_.find(enumList, { K: dd[d.field] }) || {}).V || dd[d.field];
           dd[d.field] = v;
         } else {
           dd[d.field] = enumData[dd[d.field]] || dd[d.field];
         }
       });
-    } else if ((_a = d == null ? void 0 : d.cellRendererParams) == null ? void 0 : _a.dateFormat) {
+    } else if (d && d.cellRendererParams && d.cellRendererParams.dateFormat) {
       datasClo.forEach((dd) => {
         dd[d.field] = formatDate$1(dd[d.field]) || "";
       });
-    } else if (d.valueFormatter) {
-      if (typeof d.valueFormatter == "function") {
+    } else if (d && typeof d.valueGetter === "function") {
+      datasClo.forEach((dd) => {
         try {
-          datasClo.forEach((dd) => {
-            dd[d.field] = d.valueFormatter({ value: dd[d.field] }) || "";
-          });
-        } catch (error) {
-          console.error(error);
+          dd[d.field] = d.valueGetter({ data: dd });
+        } catch (e) {
+          console.warn(`\u6267\u884C valueGetter \u51FD\u6570\u65F6\u51FA\u9519\uFF0C\u5B57\u6BB5: ${d.field}`, e);
+          dd[d.field] = "";
         }
-      } else {
-        throw new Error("\u65F6\u95F4\u7C7B\u578B\u4E0D\u6B63\u786E\uFF0C\u5E94\u8BE5\u4E3A\u51FD\u6570\u7C7B\u578B");
-      }
+      });
     }
   });
   const getDeepthOfCol = (col) => {
@@ -43527,37 +43549,40 @@ 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"
+    (d) => 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
   );
   var numberFormat = columnsCalc.map((d) => {
-    var _a;
-    let scale = (_a = d == null ? void 0 : d.cellRendererParams) == null ? void 0 : _a.scale;
-    if (d.dataType == "percent") {
-      return "0.00%";
-    } else if (scale !== void 0) {
-      return scale === 0 ? "#,##0" : "#,##0." + _.range(scale).fill(0).join("");
+    let scale = d && d.cellRendererParams && d.cellRendererParams.scale;
+    if (scale !== void 0) {
+      if (remainAdditionZero) {
+        return scale === 0 ? "#,##0" : "#,##0." + _.range(scale).fill("0").join("");
+      } else {
+        return scale === 0 ? "#,##0" : "#,##0." + _.range(scale).fill("#").join("");
+      }
     } else {
       return d.align == "rightNum" ? "#,##0.0000" : d.align == "right" ? "#,##0.00" : "";
     }
   });
   columnsCalc.map((d, idx) => {
     d.field = d.field ? d.field : d.key;
+    let charSize = d.align == "right" || d.align == "rightNum" ? 0.5 : 2;
     var t2 = d.excelName || d.headerName || d.title;
-    t2 = t2 == null ? void 0 : t2.replace(/<br\/>/g, "");
-    if (t2 && columnWidth[idx] < t2.length * 2) {
-      columnWidth[idx] = t2.length * 2;
+    t2 = t2 && t2.replace(/<br\/>/g, "");
+    if (t2 && columnWidth[idx] < t2.length * charSize) {
+      columnWidth[idx] = t2.length * charSize;
     }
   });
   var exportData = datasClo.map((d) => {
     return columnsCalc.map((dd, idx) => {
+      let charSize = dd.align == "right" || dd.align == "rightNum" ? 0.5 : 2;
       if (dd.columnWidth !== void 0) {
         columnWidth[idx] = dd.columnWidth;
       } else {
-        if (d[dd.field] && columnWidth[idx] < ("" + d[dd.field]).length * 2) {
-          columnWidth[idx] = ("" + d[dd.field]).length * 2;
+        if (d[dd.field] && columnWidth[idx] < ("" + d[dd.field]).length * charSize) {
+          columnWidth[idx] = ("" + d[dd.field]).length * charSize;
         }
       }
       let formula = null;
@@ -43590,6 +43615,10 @@ function initRowSpanInfos(options) {
   if (!!options.rowSpanColumns) {
     let calcRowSpan = function(colId, followCol) {
       var colIdx = _.findIndex(options.columns, { field: colId });
+      if (colIdx == -1) {
+        console.log("\u8BA1\u7B97\u4E00\u4E2A\u4E0D\u5B58\u5728\u7684\u5217\u662F\u6CA1\u6709\u524D\u9014\u7684", colId);
+        return;
+      }
       if (!!rowSpanRlt[colId]) {
         return;
       }
@@ -43719,7 +43748,10 @@ function initRowSpanInfosNew(options) {
     var rowSpanRlt = {};
     var rowTmpMappingByColId = {};
     _.forEach(rowSpanDefs, function(col) {
-      calcRowSpan(col.field, col.field !== col.followCol ? col.followCol : null);
+      calcRowSpan(
+        col.field,
+        col.field !== col.followCol ? col.followCol : null
+      );
     });
   }
 }
@@ -43740,8 +43772,9 @@ function exportJsonToExcel(excelData, isPerMille) {
     var paramRight = excelData.paramRight;
     var jsonData = calcExportDatas.exportData;
     var numberFormat = excelData.numberFormat || calcExportDatas.numberFormat;
+    var remainAdditionZero = (excelData == null ? void 0 : excelData.remainAdditionZero) || false;
     const workbook = new ExcelJS.Workbook();
-    const worksheet = workbook.addWorksheet("Sheet1");
+    const worksheet = excelData.worksheet || workbook.addWorksheet("Sheet1");
     for (var i = 0; i < columnCount; i++) {
       worksheet.getColumn(i + 1).width = columnWidth[i] == 0 ? 10 : columnWidth[i];
     }
@@ -43812,7 +43845,14 @@ function exportJsonToExcel(excelData, isPerMille) {
       const cell = worksheet.getCell(srow, scol);
       cell.value = d.text && d.text.replace(/<br\/>/g, "");
       cell.style = columnTitleStyle2;
-      applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, columnTitleStyle2.border);
+      applyBorderToMergedCell(
+        worksheet,
+        srow,
+        scol,
+        erow,
+        ecol,
+        columnTitleStyle2.border
+      );
     });
     for (let i2 = 0; i2 < titleDeepth; i2++) {
       worksheet.getRow(rowsNow + i2).height = columnTitleHeight2;
@@ -43832,32 +43872,41 @@ function exportJsonToExcel(excelData, isPerMille) {
             const mergeEndRow = rowsNow + i + rowSpan - 1;
             const mergeEndCol = j + 1 + colSpan - 1;
             if (mergeEndRow < rowsNow + jsonData.length && mergeEndCol <= columnCount) {
-              worksheet.mergeCells(rowsNow + i, j + 1, mergeEndRow, mergeEndCol);
-              if (columnType[j] === "p" && lineData[j]) {
-                const numericValue = typeof lineData[j].value === "string" ? parseFloat(lineData[j].value.replace(/,/g, "")) : lineData[j].value;
-                worksheet.getCell(rowsNow + i, j + 1).value = isNaN(numericValue) ? 0 : parseFloat(numericValue / 100);
-                worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
-              } else if (columnType[j] === "s") {
-                if (lineData[j] === "0") {
-                  worksheet.getCell(rowsNow + i, j + 1).value = 0;
-                } else if (lineData[j] !== void 0 && lineData[j] !== null) {
+              worksheet.mergeCells(
+                rowsNow + i,
+                j + 1,
+                mergeEndRow,
+                mergeEndCol
+              );
+              if (columnType[j] === "s") {
+                if (lineData[j].value === "0") {
+                  worksheet.getCell(rowsNow + i, j + 1).value = excelData.zeroValueFormat === void 0 ? 0 : excelData.zeroValueFormat;
+                } else if (lineData[j].value !== void 0 && lineData[j].value !== null) {
                   const safeValue = typeof lineData[j].value === "string" ? lineData[j].value.replace(/[\u2028\u2029]/g, " ") : lineData[j].value;
                   worksheet.getCell(rowsNow + i, j + 1).value = safeValue;
                 } else {
                   worksheet.getCell(rowsNow + i, j + 1).value = "";
                 }
-                worksheet.getCell(rowsNow + i, j + 1).numFmt = "";
-              } else if (columnType[j] === "n" && lineData[j]) {
+                dataCellStyle2.numFmt = "";
+              } else if (columnType[j] === "n" && lineData[j].value) {
                 const numericValue = typeof lineData[j].value === "string" ? parseFloat(lineData[j].value.replace(/,/g, "")) : lineData[j].value;
-                worksheet.getCell(rowsNow + i, j + 1).value = isNaN(numericValue) ? 0 : numericValue;
-                worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
+                if (numericValue === 0) {
+                  worksheet.getCell(rowsNow + i, j + 1).value = excelData.zeroValueFormat === void 0 ? "0" : excelData.zeroValueFormat;
+                } else {
+                  worksheet.getCell(rowsNow + i, j + 1).value = isNaN(
+                    numericValue
+                  ) ? excelData.zeroValueFormat === void 0 ? 0 : excelData.zeroValueFormat : numericValue;
+                }
+                dataCellStyle2.numFmt = numberFormat[j];
               } else {
                 worksheet.getCell(rowsNow + i, j + 1).value = "";
               }
               if (lineData[j] && lineData[j].formula) {
                 try {
-                  if (/^[A-Za-z]+\(.*\)$/.test(lineData[j].formula)) {
-                    worksheet.getCell(rowsNow + i, j + 1).value = { formula: lineData[j].formula };
+                  if (/^=?[A-Za-z]+\(.*\)$/.test(lineData[j].formula)) {
+                    worksheet.getCell(rowsNow + i, j + 1).value = {
+                      formula: lineData[j].formula
+                    };
                   } else {
                     console.warn(
                       `\u65E0\u6548\u516C\u5F0F: ${lineData[j].formula}\uFF0C\u4F4D\u4E8E\u7B2C ${i + 1} \u884C\uFF0C\u7B2C ${j + 1} \u5217`
@@ -43865,12 +43914,18 @@ function exportJsonToExcel(excelData, isPerMille) {
                     worksheet.getCell(rowsNow + i, j + 1).value = "#FORMULA_ERROR";
                   }
                 } catch (e) {
-                  console.error(`\u8BBE\u7F6E\u516C\u5F0F\u65F6\u51FA\u9519: ${e.message}\uFF0C\u516C\u5F0F\u5185\u5BB9: ${lineData[j].formula}`);
+                  console.error(
+                    `\u8BBE\u7F6E\u516C\u5F0F\u65F6\u51FA\u9519: ${e.message}\uFF0C\u516C\u5F0F\u5185\u5BB9: ${lineData[j].formula}`
+                  );
                   worksheet.getCell(rowsNow + i, j + 1).value = "#ERROR!";
                 }
               }
               dataCellStyle2.alignment.horizontal = columnAlign[j];
-              worksheet.getCell(rowsNow + i, j + 1).style = dataCellStyle2;
+              if (remainAdditionZero) {
+                worksheet.getCell(rowsNow + i, j + 1).style = _.cloneDeep(dataCellStyle2);
+              } else {
+                worksheet.getCell(rowsNow + i, j + 1).style = dataCellStyle2;
+              }
               for (let r = 0; r < rowSpan; r++) {
                 for (let c = 0; c < colSpan; c++) {
                   mergedCells.add(`${rowsNow + i + r}-${j + 1 + c}`);
@@ -43887,31 +43942,33 @@ function exportJsonToExcel(excelData, isPerMille) {
             }
           }
           if (!mergedCells.has(cellKey)) {
-            if (columnType[j] === "p" && lineData[j]) {
-              const numericValue = typeof lineData[j].value === "string" ? parseFloat(lineData[j].value.replace(/,/g, "")) : lineData[j].value;
-              worksheet.getCell(rowsNow + i, j + 1).value = isNaN(numericValue) ? 0 : parseFloat(numericValue / 100);
-              worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
-            } else if (columnType[j] === "s") {
-              if (lineData[j] === "0") {
-                worksheet.getCell(rowsNow + i, j + 1).value = 0;
-              } else if (lineData[j] !== void 0 && lineData[j] !== null) {
+            if (columnType[j] === "s") {
+              if (lineData[j].value === "0") {
+                worksheet.getCell(rowsNow + i, j + 1).value = excelData.zeroValueFormat === void 0 ? 0 : excelData.zeroValueFormat;
+              } else if (lineData[j] !== void 0 && lineData[j].value !== null) {
                 const safeValue = typeof lineData[j].value === "string" ? lineData[j].value.replace(/[\u2028\u2029]/g, " ") : lineData[j].value;
                 worksheet.getCell(rowsNow + i, j + 1).value = safeValue;
               } else {
                 worksheet.getCell(rowsNow + i, j + 1).value = "";
               }
-              worksheet.getCell(rowsNow + i, j + 1).numFmt = "";
-            } else if (columnType[j] === "n" && lineData[j]) {
+              dataCellStyle2.numFmt = "";
+            } else if (columnType[j] === "n" && lineData[j].value) {
               const numericValue = typeof lineData[j].value === "string" ? parseFloat(lineData[j].value.replace(/,/g, "")) : lineData[j].value;
               worksheet.getCell(rowsNow + i, j + 1).value = isNaN(numericValue) ? 0 : numericValue;
-              worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
+              if (isPerMille) {
+                worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
+              } else {
+                worksheet.getCell(rowsNow + i, j + 1).numFmt = "";
+              }
             } else {
               worksheet.getCell(rowsNow + i, j + 1).value = "";
             }
             if (lineData[j] && lineData[j].formula) {
               try {
-                if (/^[A-Za-z]+\(.*\)$/.test(lineData[j].formula)) {
-                  worksheet.getCell(rowsNow + i, j + 1).value = { formula: lineData[j].formula };
+                if (/^=?[A-Za-z]+\(.*\)$/.test(lineData[j].formula)) {
+                  worksheet.getCell(rowsNow + i, j + 1).value = {
+                    formula: lineData[j].formula
+                  };
                 } else {
                   console.warn(
                     `\u65E0\u6548\u516C\u5F0F: ${lineData[j].formula}\uFF0C\u4F4D\u4E8E\u7B2C ${i + 1} \u884C\uFF0C\u7B2C ${j + 1} \u5217`
@@ -43919,19 +43976,21 @@ function exportJsonToExcel(excelData, isPerMille) {
                   worksheet.getCell(rowsNow + i, j + 1).value = "#FORMULA_ERROR";
                 }
               } catch (e) {
-                console.error(`\u8BBE\u7F6E\u516C\u5F0F\u65F6\u51FA\u9519: ${e.message}\uFF0C\u516C\u5F0F\u5185\u5BB9: ${lineData[j].formula}`);
+                console.error(
+                  `\u8BBE\u7F6E\u516C\u5F0F\u65F6\u51FA\u9519: ${e.message}\uFF0C\u516C\u5F0F\u5185\u5BB9: ${lineData[j].formula}`
+                );
                 worksheet.getCell(rowsNow + i, j + 1).value = "#ERROR!";
               }
             }
             _.forEach(dataCellStyle2, (v, k) => {
               worksheet.getCell(rowsNow + i, j + 1)[k] = v;
-              if (isPerMille) {
-                worksheet.getCell(rowsNow + i, j + 1).numFmt = "#,##0.00";
-              }
             });
           }
         } catch (cellError) {
-          console.error(`\u5904\u7406\u5355\u5143\u683C\u6570\u636E\u65F6\u51FA\u9519 (\u884C: ${i + 1}, \u5217: ${j + 1}):`, cellError);
+          console.error(
+            `\u5904\u7406\u5355\u5143\u683C\u6570\u636E\u65F6\u51FA\u9519 (\u884C: ${i + 1}, \u5217: ${j + 1}):`,
+            cellError
+          );
           worksheet.getCell(rowsNow + i, j + 1).value = "#CELL_ERROR";
         }
       }
@@ -43948,30 +44007,54 @@ function exportJsonToExcel(excelData, isPerMille) {
     }
     if (!!excelData.rowSpanDefs) {
       try {
-        initRowSpanInfosNew({ ...excelData, columns: calcExportDatas.columnsCalc });
+        initRowSpanInfosNew({
+          ...excelData,
+          columns: calcExportDatas.columnsCalc
+        });
         _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
           const srow = rowSpanInfo.mergeRowS + rowsNow;
           const scol = rowSpanInfo.megerColS + 1;
           const erow = rowSpanInfo.mergeRowE + rowsNow;
           const ecol = rowSpanInfo.megerColE + 1;
           worksheet.mergeCells(srow, scol, erow, ecol);
-          applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, dataCellStyle2.border);
+          applyBorderToMergedCell(
+            worksheet,
+            srow,
+            scol,
+            erow,
+            ecol,
+            dataCellStyle2.border
+          );
         });
+        rowSpanExcelInfos = [];
       } catch (spanError) {
+        rowSpanExcelInfos = [];
         console.error("\u5408\u5E76\u5355\u5143\u683C\u65F6\u51FA\u9519:", spanError);
       }
     } else if (!!excelData.rowSpanColumns) {
       try {
-        initRowSpanInfos({ ...excelData, columns: calcExportDatas.columnsCalc });
+        initRowSpanInfos({
+          ...excelData,
+          columns: calcExportDatas.columnsCalc
+        });
         _.forEach(rowSpanExcelInfos, function(rowSpanInfo) {
           const srow = rowSpanInfo.mergeRowS + rowsNow;
           const scol = rowSpanInfo.megerColS + 1;
           const erow = rowSpanInfo.mergeRowE + rowsNow;
           const ecol = rowSpanInfo.megerColE + 1;
           worksheet.mergeCells(srow, scol, erow, ecol);
-          applyBorderToMergedCell(worksheet, srow, scol, erow, ecol, dataCellStyle2.border);
+          applyBorderToMergedCell(
+            worksheet,
+            srow,
+            scol,
+            erow,
+            ecol,
+            dataCellStyle2.border
+          );
         });
+        rowSpanExcelInfos = [];
       } catch (spanError) {
+        rowSpanExcelInfos = [];
         console.error("\u5408\u5E76\u5355\u5143\u683C\u65F6\u51FA\u9519:", spanError);
       }
     }
@@ -43994,18 +44077,9 @@ function exportJsonToExcel(excelData, isPerMille) {
         extension: "png"
       });
       worksheet.addBackgroundImage(imageId);
-      return workbook.xlsx.writeBuffer().then((buffer) => {
-        FileSaver_min.exports.saveAs(
-          new Blob([buffer], {
-            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-          }),
-          sanitizeFilename(title) + ".xlsx"
-        );
-        return true;
-      }).catch((err) => {
-        console.error("\u5199\u5165Excel\u6587\u4EF6\u65F6\u51FA\u9519:", err);
-        throw new Error("\u5BFC\u51FAExcel\u5931\u8D25: " + err.message);
-      });
+      if (!excelData.worksheet) {
+        return doExportExcel(workbook, title);
+      }
     });
   } catch (error) {
     console.error("\u5BFC\u51FAExcel\u8FC7\u7A0B\u4E2D\u53D1\u751F\u610F\u5916\u9519\u8BEF:", error);
@@ -44194,6 +44268,20 @@ function previewJsonToExcel(excelData) {
     });
   });
 }
+function doExportExcel(workbook, title = "\u4E0B\u8F7D\u62A5\u8868") {
+  workbook.xlsx.writeBuffer().then((buffer) => {
+    FileSaver_min.exports.saveAs(
+      new Blob([buffer], {
+        type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+      }),
+      sanitizeFilename(title) + ".xlsx"
+    );
+    return true;
+  }).catch((err) => {
+    console.error("\u5199\u5165Excel\u6587\u4EF6\u65F6\u51FA\u9519:", err);
+    throw new Error("\u5BFC\u51FAExcel\u5931\u8D25: " + err.message);
+  });
+}
 const isDev = false;
 var config = useConfig(isDev);
 _.isObject;
@@ -50950,7 +51038,7 @@ const __vue2_script$1n = {
     },
     isPerMille: {
       type: Boolean,
-      default: true
+      default: false
     }
   },
   data() {
@@ -53243,7 +53331,7 @@ var render$14 = function() {
     return _vm.$emit("revertColumnRow");
   } } }, [_vm._v(" \u8F6C\u7F6E ")]) : _vm._e(), !_vm.isIndexManageTable && _vm.$config.indexManage ? _c("IndexManage", { attrs: { "tableRef": _vm.tableRef, "funId": (_vm.funId || "") + "-" + _vm.$route.meta.permissionId }, on: { "resetColumns": _vm.resetColumns } }) : _vm._e(), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.tableSettingToggle("3");
-  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_c("ExportData", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "3", expression: "btnSel == '3'" }], ref: "exportData", attrs: { "rowSpanDefs": _vm.rowSpanDefs, "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns || _vm.mergeColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol || _vm.mergeIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "renderDataFn": _vm.renderDataFn, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren, "defaultUnitType": _vm.defaultUnitType, "unitType": _vm.unitType, "switchCols": _vm.switchCols, "watermark": _vm.watermark, "disablePage": _vm.disablePage, "isPerMille": _vm.isPerMille }, on: { "doExport": function($event) {
+  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_c("ExportData", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "3", expression: "btnSel == '3'" }], ref: "exportData", attrs: { "rowSpanDefs": _vm.rowSpanDefs, "exportFileName": _vm.exportFileName, "zeroValueFormat": _vm.zeroValueFormat, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns || _vm.mergeColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol || _vm.mergeIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "renderDataFn": _vm.renderDataFn, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren, "defaultUnitType": _vm.defaultUnitType, "unitType": _vm.unitType, "switchCols": _vm.switchCols, "watermark": _vm.watermark, "disablePage": _vm.disablePage, "isPerMille": _vm.isPerMille }, on: { "doExport": function($event) {
     _vm.optionDropdownVisible = false;
   }, "doPreview": function($event) {
     _vm.optionDropdownVisible = false;
@@ -53363,7 +53451,7 @@ const __vue2_script$15 = {
     },
     isPerMille: {
       type: Boolean,
-      default: true
+      default: false
     },
     mini: {
       type: Boolean,
@@ -53536,7 +53624,36 @@ const __vue2_script$15 = {
       default: "Y"
     },
     noRowsTemplate: String,
-    watermark: String
+    watermark: String,
+    nullValueFormat: {
+      type: String,
+      default() {
+        var _a;
+        return ((_a = this.$config) == null ? void 0 : _a.nullValueFormat) || "";
+      }
+    },
+    zeroValueFormat: {
+      type: String,
+      default() {
+        var _a;
+        const configValue = (_a = this.$config) == null ? void 0 : _a.zeroValueFormat;
+        return configValue !== void 0 && configValue !== null ? configValue : "0";
+      }
+    },
+    limitNumber: {
+      type: Number,
+      default() {
+        var _a;
+        return ((_a = this.$config) == null ? void 0 : _a.pageSize) || 20;
+      }
+    },
+    pageSizeOpts: {
+      type: Array,
+      default() {
+        var _a;
+        return ((_a = this.$config) == null ? void 0 : _a.pageSizeOpts) || [10, 20, 30, 40];
+      }
+    }
   },
   data() {
     var _a, _b;
@@ -54563,7 +54680,27 @@ const __vue2_script$15 = {
             };
           }
           if (column.valueFormatter) {
-            agColumn.valueFormatter = column.valueFormatter;
+            let self2 = this;
+            const originalValueFormatter = column.valueFormatter;
+            agColumn.valueFormatter = (params) => {
+              let formattedValue = originalValueFormatter(params);
+              if (formattedValue === void 0 || formattedValue === "" || formattedValue === null) {
+                formattedValue = self2.nullValueFormat;
+              } else if (formattedValue === "0" || formattedValue === 0) {
+                formattedValue = self2.zeroValueFormat;
+              }
+              return formattedValue;
+            };
+          } else {
+            agColumn.valueFormatter = (params) => {
+              let value = params.value;
+              if (value === void 0 || value === null || value === "") {
+                value = this.nullValueFormat;
+              } else if (value === "0" || value === 0) {
+                value = this.zeroValueFormat;
+              }
+              return value;
+            };
           }
           if (column.align) {
             agColumn.cellClass = agColumn.cellClass + (column.align == "right" ? " ag-right-aligned-cell" : column.align == "center" ? " ag-center-aligned-cell" : "");
@@ -64079,8 +64216,8 @@ var ConditionPanel = /* @__PURE__ */ function() {
   return __component__$n.exports;
 }();
 /*!
- * Signature Pad v4.1.7 | https://github.com/szimek/signature_pad
- * (c) 2023 Szymon Nowak | Released under the MIT license
+ * Signature Pad v4.2.0 | https://github.com/szimek/signature_pad
+ * (c) 2024 Szymon Nowak | Released under the MIT license
  */
 class Point {
   constructor(x, y, pressure, time) {
@@ -64285,8 +64422,9 @@ class SignaturePad extends SignatureEventTarget {
     this.penColor = options.penColor || "black";
     this.backgroundColor = options.backgroundColor || "rgba(0,0,0,0)";
     this.compositeOperation = options.compositeOperation || "source-over";
+    this.canvasContextOptions = "canvasContextOptions" in options ? options.canvasContextOptions : {};
     this._strokeMoveUpdate = this.throttle ? throttle(SignaturePad.prototype._strokeUpdate, this.throttle) : SignaturePad.prototype._strokeUpdate;
-    this._ctx = canvas.getContext("2d");
+    this._ctx = canvas.getContext("2d", this.canvasContextOptions);
     this.clear();
     this.on();
   }