fix: excel 布尔值展示错误

501351981 · Nov 10, 2023 · 7695535 · 7695535
1 parent 685c002
commit 7695535
Show file tree

Hide file tree

Showing 18 changed files with 340 additions and 7 deletions.
diff --git a/core/packages/js-excel/package.json b/core/packages/js-excel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@js-preview/excel",
   "type" :"module",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "",
   "main": "lib/index.js",
   "files": [

diff --git a/core/packages/vue-excel/package.json b/core/packages/vue-excel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-office/excel",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "",
   "main": "lib/index.js",
   "files": [

diff --git a/core/packages/vue-excel/src/excel.js b/core/packages/vue-excel/src/excel.js
@@ -163,6 +163,13 @@ function getCellText(cell){
                             return value * 100 + '%';
                         }
                     }else if(/0(\.0+)?/.test(cell.style.numFmt)){
+                        let prefix = '';
+                        if(cell.style.numFmt.startsWith('$')){
+                            prefix = '$';
+                        }else if(cell.style.numFmt.startsWith('"¥')){
+                            prefix = '¥';
+                        }
+
                         if(value === 0 && cell.style.numFmt.startsWith('_')){
                             return '-';
                         }
@@ -189,7 +196,7 @@ function getCellText(cell){
                             result[0] = newNumber.reverse().join('');
                             result = result.join('.');
                         }
-                        return result;
+                        return prefix + result;
                     }
 
                 }
@@ -225,6 +232,8 @@ function getCellText(cell){
             return get(value, 'result.error') || value.result;
         case 8: //富文本
             return cell.text;
+        case 9: //Boolean
+            return cell.text.toUpperCase();
         default:
             return value;
     }
@@ -344,7 +353,7 @@ function getStyle(cell){
 
 export function transferExcelToSpreadSheet(workbook, options){
     let workbookData = [];
-    // console.log(workbook, 'workbook');
+    console.log(workbook, 'workbook');
     let sheets = [];
     workbook.eachSheet((sheet) => {
         sheets.push(sheet);

diff --git a/core/packages/vue-pdf/index.d.ts b/core/packages/vue-pdf/index.d.ts
@@ -1,7 +1,7 @@
 declare const VueOfficePdf: {
     install?: (vue: any) => void;
     src: string|ArrayBuffer|Blob;
-    rerender: () => any;
+    rerender?: () => any;
     staticFileUrl?: string,
     requestOptions?: any;
     options?: any

diff --git a/core/packages/vue-pdf/package.json b/core/packages/vue-pdf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-office/pdf",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "",
   "main": "lib/index.js",
   "files": [

diff --git a/examples/dist/assets/DocxDemo-ff7579be.js b/examples/dist/assets/DocxDemo-ff7579be.js
diff --git a/examples/dist/assets/ExcelDemo-cc5fdc46.js b/examples/dist/assets/ExcelDemo-cc5fdc46.js
diff --git a/examples/dist/assets/JsDocxDemo-72182715.js b/examples/dist/assets/JsDocxDemo-72182715.js
diff --git a/examples/dist/assets/JsExcelDemo-e79b4fd7.js b/examples/dist/assets/JsExcelDemo-e79b4fd7.js
diff --git a/examples/dist/assets/JsPdfDemo-880a432c.js b/examples/dist/assets/JsPdfDemo-880a432c.js
diff --git a/examples/dist/assets/PdfDemo-4ea131d4.js b/examples/dist/assets/PdfDemo-4ea131d4.js
diff --git a/examples/dist/assets/PreviewWrapper-b14e5680.js b/examples/dist/assets/PreviewWrapper-b14e5680.js