@gingkoo/base-server 0.0.4-alpha.10 → 0.0.4-alpha.11

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

@@ -99,11 +99,12 @@ router.post('/excel-export/:moduleId', async function (req, res) {
 
   let { moduleId } = req.params;
   let options = {
+    MODULE_ID: moduleId,
     ...req.query,
     ...req.body,
   };
 
-  let [err, result] = await importExportService.downloadFile(userid, moduleId, options);
+  let [err, result] = await importExportService.downloadFile(userid, options);
   if (err) {
     return res.sendErr(err?.message || '导出失败');
   }

package/backend/common/fss/services/import_export.js

@@ -3,6 +3,7 @@ const path = require('path');
 const fs = require('fs');
 const dayjs = require('dayjs');
 const { format: timeFormat } = require('date-fns');
+const config = require('../../../config');
 const { creatTask } = require('../../services/task');
 const { sse, bgTaskEnum } = require('../../sse');
 const tasks = require('../../task');
@@ -69,7 +70,7 @@ module.exports = {
           TASK_NAME,
           MODULE_ID: 'import',
           TASK_SERVICE: FWD,
-          TASK_ID: result?.TASK,
+          TASK_ID: taskId,
           taskProgressStatus: bgTaskEnum.taskProgressStatus.dataLoading,
           STATUS: 'Pending',
           DATA_CRT_DATE: curDate,
@@ -93,14 +94,13 @@ module.exports = {
   /**
    * 下载文件
    * @param {string} USER_ID 当前登录用户
-   * @param {string} moduleId 模块id
    * @param {object} options 参数
    */
-  async downloadFile(USER_ID, moduleId, options) {
-    let { FWD, ...rest } = options;
+  async downloadFile(USER_ID, options) {
+    let { FWD, MODULE_ID, ...rest } = options;
 
     let curTime = dayjs().format('YYYYMMDDHHmmss');
-    let FILE_NAME = moduleId + '_' + curTime + '.xlsx';
+    let FILE_NAME = MODULE_ID + '_' + curTime + '.xlsx';
     let storageDir = path.join(config['app']['home'], 'storage');
     let dir = path.join(global.orgid.toLowerCase(), 'users', USER_ID);
     let FILE_DIR = path.join(storageDir, dir);
@@ -119,7 +119,7 @@ module.exports = {
       FILE_DIR: dir, // 这里为什么不拼上 storageDir，这里不拼，那下载不也得拼吗？
       TASK_TYPE: 'excelExport',
       TASK_NAME,
-      MODULE_ID: moduleId,
+      MODULE_ID,
       TASK_SERVICE: FWD,
       DATA_CRT_DATE: curDate,
       DATA_CRT_TIME: curTime1,
@@ -140,7 +140,7 @@ module.exports = {
         FILE_DIR: dir, // 这里为什么不拼上 storageDir，这里不拼，那下载不也得拼吗？
         TASK_TYPE: 'excelExport',
         TASK_NAME,
-        MODULE_ID: moduleId,
+        MODULE_ID,
         TASK_SERVICE: FWD,
         TASK_ID: result.TASK,
         taskProgressStatus: bgTaskEnum.taskProgressStatus.exportOutData,

package/backend/common/page_engine.js

@@ -35,7 +35,9 @@ const handleDynamicParams = (layout, data) => {
     return obj;
   } else if (typeof layout === 'string') {
     // 字符串
-    return /\$\{.+\}/.test(layout) ? tokenize(handleSpecialChars(layout), data) : layout;
+    return /\$\{.+\}/.test(layout)
+      ? tokenize(handleSpecialChars(layout), data)
+      : handleSpecialChars(layout);
   } else {
     // 数字 boolean null undefined 等等 都不处理
     return layout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.4-alpha.10",
+  "version": "0.0.4-alpha.11",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "date-fns": "^2.29.3",
     "dayjs": "^1.11.6",
     "express": "^4.19.1",
+    "exceljs": "^4.3.0",
     "express-xml-bodyparser": "^0.3.0",
     "getavataaars": "^1.0.0",
     "http-proxy-middleware": "^2.0.1",