@indfnd/common 1.1.1 → 1.1.3

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.3](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.2...v1.1.3) (2025-09-04)
+
+
+### Features
+
+* 增加percent的支持 ([ea15150](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/ea1515017342832f5c9b852b6d59f0aae5f44350))
+
+### [1.1.2](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.1...v1.1.2) (2025-09-02)
+
 ### [1.1.1](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.0...v1.1.1) (2025-08-30)
 
 

package/dist/ind-common.es.js

@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.1.0";
+const version = "1.1.2";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -43833,7 +43833,11 @@ function exportJsonToExcel(excelData) {
             const mergeEndCol = j + 1 + colSpan - 1;
             if (mergeEndRow < rowsNow + jsonData.length && mergeEndCol <= columnCount) {
               worksheet.mergeCells(rowsNow + i, j + 1, mergeEndRow, mergeEndCol);
-              if (columnType[j] === "s") {
+              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) {
@@ -43842,11 +43846,11 @@ function exportJsonToExcel(excelData) {
                 } else {
                   worksheet.getCell(rowsNow + i, j + 1).value = "";
                 }
-                dataCellStyle2.numFmt = "";
+                worksheet.getCell(rowsNow + i, j + 1).numFmt = "";
               } else if (columnType[j] === "n" && 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 : numericValue;
-                dataCellStyle2.numFmt = numberFormat[j];
+                worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
               } else {
                 worksheet.getCell(rowsNow + i, j + 1).value = "";
               }
@@ -43883,7 +43887,11 @@ function exportJsonToExcel(excelData) {
             }
           }
           if (!mergedCells.has(cellKey)) {
-            if (columnType[j] === "s") {
+            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) {
@@ -43892,11 +43900,11 @@ function exportJsonToExcel(excelData) {
               } else {
                 worksheet.getCell(rowsNow + i, j + 1).value = "";
               }
-              dataCellStyle2.numFmt = "";
+              worksheet.getCell(rowsNow + i, j + 1).numFmt = "";
             } else if (columnType[j] === "n" && 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 : numericValue;
-              dataCellStyle2.numFmt = numberFormat[j];
+              worksheet.getCell(rowsNow + i, j + 1).numFmt = numberFormat[j];
             } else {
               worksheet.getCell(rowsNow + i, j + 1).value = "";
             }
@@ -43915,7 +43923,9 @@ function exportJsonToExcel(excelData) {
                 worksheet.getCell(rowsNow + i, j + 1).value = "#ERROR!";
               }
             }
-            worksheet.getCell(rowsNow + i, j + 1).border = dataCellStyle2.border;
+            _.forEach(dataCellStyle2, (v, k) => {
+              worksheet.getCell(rowsNow + i, j + 1)[k] = v;
+            });
           }
         } catch (cellError) {
           console.error(`\u5904\u7406\u5355\u5143\u683C\u6570\u636E\u65F6\u51FA\u9519 (\u884C: ${i + 1}, \u5217: ${j + 1}):`, cellError);