@gingkoo/base-server 0.0.2-alpha.3 → 0.0.2-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.2-alpha.3",
+  "version": "0.0.2-alpha.4",
   "description": "",
   "main": "app.js",
   "scripts": {

package/static/1.csv

@@ -0,0 +1 @@
+1,2

package/static/excel/excel.js

@@ -135,16 +135,18 @@ var page = {
 
 function transform(sheet) {
   let finalCellData = [];
-  // let sheet = data?.[0] || null;
   let sheetCelldata = sheet?.celldata || [];
-  if (!sheetCelldata.length) return data;
+  if (!sheetCelldata.length) {
+    sheetCelldata = sheet?.data || [];
+  }
+  if (!sheetCelldata.length) return sheet;
 
   let sheetColumn = sheet.column < 60 ? 60 : sheet.column;
   let sheetRow = sheet.row < 84 ? 84 : sheet.row;
 
   // 兼容window电脑字体 模糊问题
   finalCellData = sheetCelldata.map((cell) => {
-    if (cell.v.fs < 12) {
+    if (cell && cell.v && cell.v.fs && cell.v.fs < 12) {
       cell.v.ff = '微软雅黑';
       cell.v.fs = 12;
       cell.v.tb = 2; // tb 为2会卡顿
@@ -198,7 +200,7 @@ function transform(sheet) {
 
 var loadLuckySheet = function (exportJson) {
   if (exportJson.sheets == null || exportJson.sheets.length == 0) {
-    alert('无法读取excel文件的内容，当前不支持xls文件!');
+    console.log('无法读取excel文件的内容');
     return;
   }
 
@@ -206,7 +208,7 @@ var loadLuckySheet = function (exportJson) {
   window.luckysheet.create({
     ...defaultOptions,
     container: 'luckysheet',
-    data: exportJson.sheets.map((v) => transform(v)),
+    data: !exportJson.ext ? exportJson.sheets.map((v) => transform(v)) : exportJson.sheets,
 
     hook: {
       workbookCreateAfter() {
@@ -255,5 +257,5 @@ page.getFileInfo(function (file) {
     _sheet.data = utils.xlsToLuckySheet(wb.Sheets[name], _sheet);
     sheets.push(_sheet);
   }
-  loadLuckySheet({ sheets: sheets });
+  loadLuckySheet({ sheets: sheets, ext: file.ext });
 });