@gingkoo/base-server 0.0.4-alpha.17 → 0.0.4-alpha.18

package/backend/common/fss/routers/download.js

@@ -22,6 +22,9 @@ router.get('/:fileFolder/*', async function (req, res) {
   let filename = '';
   if (fileFolder === 'share') {
     filename = req.path.split('/').slice(-1)[0];
+  }
+  if (fileFolder === 'system') {
+    filename = req.params[0];
   } else {
     filename = req.path.substr();
   }

package/backend/common/fss/utils.js

@@ -28,6 +28,9 @@ function resourcePath(userid = '', fileFolder, filePath = '') {
   } else if (fileFolder == 'avatar') {
   } else if (fileFolder == 'upload') {
     fileRealPath = path.join(config.app.home, filePath);
+  } else if (fileFolder == 'system') {
+    // 系统内部文件
+    fileRealPath = path.resolve(filePath);
   } else {
     return null;
   }

package/backend/utils/excel.js

@@ -17,6 +17,23 @@ const borderHeader = {
   right: { style: 'thin' },
 };
 
+const numberToColumn = (number) => {
+  let column = '';
+  while (number >= 0) {
+    column = String.fromCharCode((number % 26) + 65) + column;
+    number = Math.floor(number / 26) - 1;
+  }
+  return column;
+};
+
+const columnToNumber = (column) => {
+  let number = 0;
+  for (let i = 0; i < column.length; i++) {
+    number = number * 26 + (column.charCodeAt(i) - 64);
+  }
+  return number - 1;
+};
+
 /**
  * 解析excel
  * @param {string} filePath 本地文件路径
@@ -137,7 +154,6 @@ async function _excelExport(
   const mappingsheet = workbook.addWorksheet(dictSheetName);
   let titles = []; // 表头
   let columns = []; // 表 列信息
-  let mappingTitles = [];
   let mappingColumns = []; // 字典 列信息
 
   let mapColIndex = {};
@@ -377,12 +393,11 @@ const _excelExportMultisheet = async (
     return mo;
   }, 0);
 
-  // 处理数据字典
-  mappings.map((it) => {
+  // 设置数据字典的一些配置
+  mappings.forEach((it) => {
     mappingMap[it.key] = it;
     mapColIndex[it.key] = {};
     if (it.blankSheet) return false;
-    const mappingsheet = workbook.addWorksheet(it.sheetName);
     let mappingColumns = []; // 字典 列信息
 
     //处理头
@@ -396,27 +411,8 @@ const _excelExportMultisheet = async (
       mappingColumns.push(colinfo);
     }
 
-    mappingsheet.columns = mappingColumns;
-
-    //字典处理
-    for (let k in mappingData) {
-      let excelCol = mappingsheet.getColumn(k);
-      let mapList = [];
-      mapList.push(mappingData[k].label);
-      for (let x in mappingData[k].data) {
-        mapList.push(mappingData[k].data[x]);
-      }
-      excelCol.values = mapList;
-    }
-
-    let firstRow = mappingsheet.getRow(1);
-    firstRow.eachCell((cell, colNumber) => {
-      cell.font = fontHeader;
-      cell.fill = fillHeader;
-      cell.border = borderHeader;
-      let colObj = mappingsheet.getColumn(cell.col);
-      let colId = cell.address.match(/[a-zA-Z]+/g)[0];
-      mapColIndex[it.key][colObj.key] = colId;
+    mappingColumns.forEach((v, i) => {
+      mapColIndex[it.key][v.key] = numberToColumn(i); // 0 -> A
     });
   });
 
@@ -506,6 +502,44 @@ const _excelExportMultisheet = async (
     }
   });
 
+  // 处理数据字典
+  mappings.forEach((it) => {
+    if (it.blankSheet) return false;
+    const mappingsheet = workbook.addWorksheet(it.sheetName);
+    let mappingColumns = []; // 字典 列信息
+
+    //处理头
+    let mappingData = it.mappingData;
+    for (let k in mappingData) {
+      let colinfo = {
+        header: mappingData[k].label,
+        key: k,
+        width: mappingData[k].width || 20,
+      };
+      mappingColumns.push(colinfo);
+    }
+
+    mappingsheet.columns = mappingColumns;
+
+    //字典处理
+    for (let k in mappingData) {
+      let excelCol = mappingsheet.getColumn(k);
+      let mapList = [];
+      mapList.push(mappingData[k].label);
+      for (let x in mappingData[k].data) {
+        mapList.push(mappingData[k].data[x]);
+      }
+      excelCol.values = mapList;
+    }
+
+    let firstRow = mappingsheet.getRow(1);
+    firstRow.eachCell((cell, colNumber) => {
+      cell.font = fontHeader;
+      cell.fill = fillHeader;
+      cell.border = borderHeader;
+    });
+  });
+
   let ret = await workbook.xlsx.writeFile(filePath);
   return ret;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.4-alpha.17",
+  "version": "0.0.4-alpha.18",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -8,8 +8,7 @@
     "build": "npm run clean && vite build --mode production",
     "serve": "nodemon serve -p 1000",
     "check": "node scripts/check_publish.js",
-    "clean": "rimraf dist",
-    "prepublishOnly": "npm run check && npm run build"
+    "clean": "rimraf dist"
   },
   "files": [
     "dist",