crabatool 1.0.410 → 1.0.414

package/apis/data.js

@@ -10,13 +10,15 @@ class data {
   constructor() {
     this.dslMap = {};
     this.pagesDataChanged = {};
+    this.dsl = {};
+    this.dataRefs = [];
   }
 
   _init(req) {
     if (req.app.jsoncrud) { // 每个server只创建1个实例
       return;
     }
-    req.app.jsoncrud = new JSONCRUD({ storagePath: path.join(req.app.webPath, '../data/data.json') });
+    req.app.jsoncrud = new JSONCRUD({ storagePath: path.join(req.app.webPath, '../data/entities'), separateFiles: true });
 
     //读取dsl数据
     var dslData = fs.readFileSync(path.join(req.app.webPath, '../data/dslData.json'));
@@ -25,9 +27,9 @@ class data {
     } else {
       dslData = JSON.parse(dslData)
     }
-    var dsl = dslData.dsl;
+    this.dsl = dslData.dsl;
     var _this = this;
-    dsl && dsl.forEach(item => {
+    _this.dsl && _this.dsl.forEach(item => {
       _this.dslMap[crabatool.stringUtils.getFullPinyinCode(item.name)] = JSON.parse(JSON.stringify(item));
     });
     var dataRefs = dslData.dataRefs;
@@ -56,7 +58,6 @@ class data {
   async get(req, res) {
     var body = utils.getReqBody(req);
     var that = this;
-
     var queryParams = body.queryParams;
     var filterParams = body.filter;
     var items = null;
@@ -84,8 +85,8 @@ class data {
         items.push({ dataField: key, type: 0, value: queryParams[key] });
       });
     }
-
-    var info = await this._getDb(req).find(body.name, {
+    var db = this._getDb(req);
+    var info = await db.find(body.name, {
       page: body.pageIndex,
       pageSize: body.pageSize,
       filterFunc: function (item) {
@@ -95,7 +96,7 @@ class data {
         return true;
       }
     });
-
+    await this.fillData(body.name, info.data, db, true);
     crabatool.utils.end(res, {
       code: 200,
       msg: '操作成功',
@@ -104,6 +105,62 @@ class data {
     });
   }
 
+  async fillData(name, rows, db, searchDataRef) {
+    if (this.dslMap[name]) {
+      if (rows) {
+        for (var i = 0; i < rows.length; i++) {
+          var row = rows[i];
+          var dsl = this.dslMap[name];
+          for (var j = 0; j < dsl.fields.length; j++) { //join扩展表数据
+            var field = dsl.fields[j];
+            if (field.type != 'table') {
+              continue;
+            }
+            var temp = await db.getByField(crabatool.stringUtils.getFullPinyinCode(field.ref), crabatool.stringUtils.getFullPinyinCode(field.refField), row[crabatool.stringUtils.getFullPinyinCode(field.name)]);
+            if (!temp) {
+              continue;
+            }
+            var str = crabatool.stringUtils.getFullPinyinCode(field.refShowField ? field.refShowField : field.refField);
+            row[str] = temp[str];
+          }
+
+          if (searchDataRef) {
+            //查询关联明细数据
+            var dataRefs = this.dslMap[name].dataRefs;
+            if (dataRefs) {
+              for (var m = 0; m < dataRefs.length; m++) {
+                var dataRef = dataRefs[m];
+                var detailPy = crabatool.stringUtils.getFullPinyinCode(dataRef.detail);
+                var masterFieldPy = crabatool.stringUtils.getFullPinyinCode(dataRef.masterField);
+                var obj = row[masterFieldPy];
+                var detailFieldPy = crabatool.stringUtils.getFullPinyinCode(dataRef.detailField);
+                var size = 100;
+                var rtSize = 0;
+                var array = [];
+                do {
+                  //循环取外表数据
+                  var page = 1;
+                  var t = await db.find(detailPy, {
+                    page: page,
+                    pageSize: size,
+                    filterFunc: function (row) {
+                      return obj && obj === row[detailFieldPy];
+                    }
+                  });
+                  page++;
+                  rtSize = t.pageData.count;
+                  array = array.concat(t.data);
+                } while (rtSize == size);
+                row[detailPy] = array;
+                await this.fillData(detailPy, row[detailPy], db, false);//只查一级
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
   async reverseData(req, pageName, body) {
     var oldEntity = await this._getDb(req).get(body.name, body.data.id);
     if (!oldEntity) {
@@ -125,6 +182,8 @@ class data {
 
     var newData;
     var pageName = body.pageName;
+    var db = this._getDb(req);
+    var rtData = JSON.parse(JSON.stringify(body.data));
     if (body.data.id) {
       var oldData = await this.reverseData(req, pageName, body);
       if (!oldData) {
@@ -133,23 +192,46 @@ class data {
       await this.buildDataPrimaryAndForeignKey(body.name, body.data, true);
       //更新联动新数据
       await this.pageSaveToDataLinkage(req, body.name, pageName, body.data, oldData);
-      await this._getDb(req).update(body.name, body.data.id, body.data);
+      var name = body.name;
+      await this._saveRefData(name, body.data, rtData, db);
+      await db.update(body.name, body.data.id, body.data);
       newData = body.data;
     } else {
       //提前制定ID
       body.data.id = cuid.newCuidString()
       await this.buildDataPrimaryAndForeignKey(body.name, body.data);
       await this.pageSaveToDataLinkage(req, body.name, pageName, body.data)
-      newData = await this._getDb(req).create(body.name, body.data);
+      await this._saveRefData(name, body.data, rtData, db);
+      newData = await db.create(body.name, body.data);
     }
 
     crabatool.utils.end(res, {
       code: 200,
       msg: '操作成功',
-      data: newData
+      data: rtData
     });
   }
 
+  async _saveRefData(name, data, rtData, db) {
+    var dataRefs = this.dslMap[name].dataRefs;
+    for (var i = 0; dataRefs && i < dataRefs.length; i++) {
+      var dataRef = dataRefs[i];
+      var detailPy = crabatool.stringUtils.getFullPinyinCode(dataRef.detail)
+      var details = data[detailPy] ? data[detailPy] : [];
+      delete data[detailPy];
+      for (var j = 0; j < details.length; j++) {
+        var detail = details[j];
+        if (detail.id) {
+          await db.update(detailPy, detail.id, detail)
+        } else {
+          await db.create(detailPy, detail)
+          rtData[detailPy][j].id = detail.id;//补充新增行的ID
+        }
+        await this._saveRefData(detailPy, detail, rtData[detailPy][j], db);
+      }
+    }
+  }
+
   findLayerData(data, items, layer) {
     if (!data) {
       return null;
@@ -205,9 +287,9 @@ class data {
     }
     //查找涉及的所有实体
     var _this = this;
-    for(var i = 0 ; i < actions.length; i++){
+    for (var i = 0; i < actions.length; i++) {
       var action = actions[i];
-      for(var j = 0 ; j < action.length ; j++){
+      for (var j = 0; j < action.length; j++) {
         var item = action[j];
         if (item.type == 'external') {//外表处理
           await _this.externalDataLinkage(req, name, data, item, reverseNumber);
@@ -232,17 +314,17 @@ class data {
           //根据refData和sourceData计算结果
           var refNamePy = crabatool.stringUtils.getFullPinyinCode(item.ref);
           var fieldNamePy = crabatool.stringUtils.getFullPinyinCode(item.field);
-          Object.keys(refData).forEach(key => {
+          refData && Object.keys(refData).forEach(key => {
             var target = refData[key][0];
             //目标值为单一对象
             if (!target[refNamePy]) {
               return;
             }
             if (oldData) {
-              if(name != refNamePy){
+              if (name != refNamePy) {
                 //传入了老数据，当前计算的值可以直接取老数据的对应值，因为它已经排除本单
                 var oldDataTemp = oldData[name][refNamePy];
-                if(oldDataTemp instanceof Array){
+                if (oldDataTemp instanceof Array) {
                   target[refNamePy][fieldNamePy] = oldDataTemp[0][fieldNamePy];//强制取第一行
                 } else {
                   target[refNamePy][fieldNamePy] = oldDataTemp[fieldNamePy] ? oldDataTemp[fieldNamePy] : 0;
@@ -271,10 +353,10 @@ class data {
           if (refNamePy != name) {
             targetObj = data[refNamePy];
           }
-          if(targetObj instanceof Array){
-            targetObj.forEach(titem => { 
+          if (targetObj instanceof Array) {
+            targetObj.forEach(titem => {
               var primaryKey = titem[targetArray[1]];
-              if(!refData[primaryKey]){//没找到对应行，直接返回
+              if (!refData[primaryKey]) {//没找到对应行，直接返回
                 return;
               }
               var refDataTemp = refData[primaryKey][0][refNamePy];
@@ -289,7 +371,7 @@ class data {
             }
             //将结果赋值给实体对象
             var t = targetValue[refNamePy];
-            Object.keys(t).forEach(key => {
+            t && Object.keys(t).forEach(key => {
               targetObj[key] = t[key];
             });
           }
@@ -324,7 +406,7 @@ class data {
         page: page,
         pageSize: size,
         filterFunc: function (row) {
-          if (filterValue[row[refFieldPy]]) {
+          if (filterValue && filterValue[row[refFieldPy]]) {
             changeRefData.push({
               ref: row,
               formateValue: filterValue[row[refFieldPy]]
@@ -496,9 +578,9 @@ class data {
       }
       data[detailName].forEach(detail => {
         detail[crabatool.stringUtils.getFullPinyinCode(item.detailField)] = data[crabatool.stringUtils.getFullPinyinCode(item.masterField)];
-        if (!detail.id) {//明细行ID为空时需要生成新值
-          detail.id = cuid.newCuidString()
-        }
+        // if (!detail.id) {//明细行ID为空时需要生成新值
+        //   detail.id = cuid.newCuidString()
+        // }
         //嵌套处理明细中关联的主键和外键
         _this.buildDataPrimaryAndForeignKey(detailName, detail)
       });

package/lib/jsoncrud.js

@@ -7,6 +7,7 @@ class JSONCRUD {
    * @param {Object} config - 配置项
    * @param {string} [config.storagePath] - 文件存储路径
    * @param {boolean} [config.useMemory] - 是否使用内存存储
+   * @param {boolean} [config.separateFiles] - 按实体分文件存储
    */
   constructor(config = {}) {
     this.config = config
@@ -33,29 +34,54 @@ class JSONCRUD {
   }
 
   // 保存到文件
-  async saveToFile() {
+  async saveToFile(entityName) {
     if (!this.useMemory) {
-      // 构建包含所有实体的存储对象
-      const dataToSave = Object.entries(this.entities).reduce((acc, [entityName, entityData]) => {
-        acc[entityName] = entityData.data
-        return acc
-      }, {})
+      var data = Object.entries(this.entities);
+      var tempStorageFile = this.storageFile;
+      var dataToSave = null;
+      if (this.config.separateFiles) {
+        //按文件拆分存储
+        data = entityName && this.entities[entityName] ? this.entities[entityName].data : {};
+        dataToSave = data;
+        tempStorageFile = path.join(tempStorageFile, entityName + '.json');
+      } else {
+        // 构建包含所有实体的存储对象
+        dataToSave = data.reduce((acc, [entityName, entityData]) => {
+          acc[entityName] = entityData.data
+          return acc
+        }, {})
+      }
 
       // 创建存储目录（如果不存在）
-      await fs.mkdir(path.dirname(this.storageFile), { recursive: true })
+      await fs.mkdir(path.dirname(tempStorageFile), { recursive: true })
 
       // 原子化写入（避免写入过程中崩溃导致数据丢失）
-      const tmpFile = `${this.storageFile}.tmp`
-      try{
+      const tmpFile = `${tempStorageFile}.tmp`
+      try {
         //频繁写入时会导致数据错误
         await fs.writeFile(tmpFile, JSON.stringify(dataToSave, null, 2))
-        await fs.rename(tmpFile, this.storageFile)
-      }catch(e){
+        await fs.rename(tmpFile, tempStorageFile)
+      } catch (e) {
         console.log(e);
       }
     }
   }
 
+  async batchCreate(entityName, items) { 
+    await this.ready()
+    this.verifyEntityExists(entityName)
+    var _this = this;
+    items.forEach(item=>{
+      const newItem = {
+        id: cuid.newCuidString(),//允许外部提前制定ID
+        ...item,
+        createdAt: new Date().toISOString()
+      }
+      _this.entities[entityName].data.push(newItem)
+    })
+    await this.persist(entityName)
+  }
+
   // 核心CRUD方法
   async create(entityName, item) {
     await this.ready()
@@ -67,7 +93,7 @@ class JSONCRUD {
       createdAt: new Date().toISOString()
     }
     this.entities[entityName].data.push(newItem)
-    await this.persist()
+    await this.persist(entityName)
     return newItem
   }
 
@@ -135,6 +161,15 @@ class JSONCRUD {
     return this.entities[entityName].data[index]
   }
 
+  async getByField(entityName, field, value) {
+    await this.ready()
+    this.verifyEntityExists(entityName)
+
+    const index = this.entities[entityName].data.findIndex(item => item[field] === value)
+    if (index === -1) return null
+    return this.entities[entityName].data[index]
+  }
+
   async update(entityName, id, updates) {
     await this.ready()
     this.verifyEntityExists(entityName)
@@ -147,15 +182,15 @@ class JSONCRUD {
       ...updates,
       updatedAt: new Date().toISOString()
     }
-    await this.persist()
+    await this.persist(entityName)
     return this.entities[entityName].data[index]
   }
 
-  async batchUpdate(entityName, items){
+  async batchUpdate(entityName, items) {
     await this.ready()
     this.verifyEntityExists(entityName)
 
-    items.forEach(entity =>{
+    items.forEach(entity => {
       const index = this.entities[entityName].data.findIndex(item => item.id === entity.id)
       if (index === -1) return null
 
@@ -165,7 +200,7 @@ class JSONCRUD {
         updatedAt: new Date().toISOString()
       }
     })
-    await this.persist()
+    await this.persist(entityName)
   }
 
   async delete(entityName, id) {
@@ -177,7 +212,7 @@ class JSONCRUD {
       item => item.id !== id
     )
     const success = this.entities[entityName].data.length < initialLength
-    if (success) await this.persist()
+    if (success) await this.persist(entityName)
     return success
   }
 
@@ -194,14 +229,40 @@ class JSONCRUD {
       await new Promise(resolve => setTimeout(resolve, 50))
     }
   }
+  async readAllFilesInDirectory(dirPath) {
+    try {
+      var fileContent = {};
+      const files = await fs.readdir(dirPath);
+      for (const file of files) {
+        const filePath = path.join(dirPath, file);
+        var stats = await fs.stat(filePath);
+        if (stats.isFile()) {
+          var entityName = file.substring(0, file.lastIndexOf('.'));
+          var temp = await fs.readFile(filePath, 'utf-8')
+          fileContent[entityName] = temp?JSON.parse(temp):{};
+        } else if (stats.isDirectory()) {
+          // 如果需要递归处理子目录，可以在这里调用readAllFilesInDirectory(filePath)
+        }
+      }
+      return fileContent;
+    } catch (err) {
+      return {};
+    }
+  }
 
   // 初始化文件存储
   async initFileStorage() {
     try {
-      // 1. 读取存储文件内容
-      const fileContent = await fs.readFile(this.storageFile, 'utf-8')
-      const storedData = JSON.parse(fileContent || '{}')
-
+      var fileContent = null;
+      var storedData = {};
+      if (this.config.separateFiles) {
+        var dir = this.storageFile;
+        storedData = await this.readAllFilesInDirectory(dir);//读取文件夹中的所有文件
+      } else {
+        // 1. 读取存储文件内容
+        fileContent = await fs.readFile(this.storageFile, 'utf-8')
+        storedData = JSON.parse(fileContent || '{}')
+      }
       // 2. 自动创建存储中的实体（如果尚未定义）
       Object.keys(storedData).forEach(entityName => {
         if (!this.entities[entityName]) {
@@ -221,7 +282,6 @@ class JSONCRUD {
           }))
         }
       })
-
     } catch (err) {
       if (err.code === 'ENOENT') {
         // 4. 文件不存在时初始化空文件
@@ -240,9 +300,9 @@ class JSONCRUD {
   }
 
   // 通用保存方法
-  async persist() {
+  async persist(entityName) {
     if (this.useMemory) return
-    await this.saveToFile()
+    await this.saveToFile(entityName)
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.410",
+  "version": "1.0.414",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/checkjs.js

@@ -250,7 +250,8 @@ module.exports.start = async function() {
   }
 
   reportData.data = {
-    errorCount: errKeys.length + undefKeys.length,
+    errorCount: errKeys.length,
+    undefCount: undefKeys.length, // 未定义总数
     warnCount: warnKeys.length,
     tipCount: infoKeys.length,
     fileSize: fileSize,
@@ -281,7 +282,7 @@ module.exports.start = async function() {
   webhookList.push(`1. js语法undefined：${undefKeys.length}个，占比${calc(undefKeys.length, jsFiles.length)}`);
 
   // 随机显示5个异常文件到钉钉消息
-  var errCount = reportData.data.errCount;
+  var errCount = reportData.data.errCount + reportData.data.undefCount;
   /*
   if (errCount > 0) {
     var list0 = [];

package/tool/compress.js

@@ -88,6 +88,11 @@ function doCompress() {
   inNames = ['grid.js', 'controlsEx.js', 'treeView.js', 'print.js', 'workflow.js', '../../Carpa.Dress/Dress.js', 'htmlEditor.js'];
   compressCrabaJs(inNames, 'crabaEx.min.js');
 
+  // workflow流程图
+  //inNames = ['workflow.js'];
+  //compressCrabaJs(inNames, 'workflow.js');
+
+
   // echarts
   inNames = ['echarts4-all.js'];
   compressCrabaJs(inNames, 'echarts-all.js');

package/tool/gspxHash.js

@@ -1,90 +0,0 @@
-
-var config = require('../lib/config.js');
-var path = require('path');
-var fs = require('fs');
-var utils = require('../lib/utils.js');
-var os = require('os');
-const crypto = require('crypto');
-var requestSync = require('sync-request');
-
-
-module.exports.start = function() {
-  if (!config.hashName) {
-    config.hashName = 'sha384';
-  }
-
-  if (!config.files) {
-    config.files = [];
-  }
-
-  var results = {};
-  buildFiles(results, config.files);
-
-  utils.mkdirsSync(config.outJson);
-  fs.writeFileSync(config.outJson, JSON.stringify(results));
-}
-
-function buildFiles(results, files) {
-  files.forEach(function(f) {
-    console.log(f);
-
-    var content;
-    var isHttp = f.startsWith('http');
-    if (isHttp) {
-      var res = requestSync("GET", f);
-      content = res.getBody();
-    } else if (fs.existsSync(f)) {
-
-      // 磁盘目录
-      var statFs = fs.statSync(f);
-      if (!statFs.isFile()) {
-        var files2 = fs.readdirSync(f);
-        files2 = files2.map(function(s) {
-          return utils.join(f, s);
-        });
-        buildFiles(results, files2);
-        return;
-      }
-
-      if (config.exts && config.exts.length > 0) {
-        var ext = path.extname(f).toLowerCase();
-        if (!config.exts.includes(ext)) {
-          return;
-        }
-      }
-
-      content = fs.readFileSync(f);
-    } else {
-      console.error('文件不存在:' + f);
-      return;
-    }
-
-    var index = f.indexOf('?');
-    if (index > 0) {
-      f = f.substr(0, index);
-    }
-
-    // 转为相对webPath的路径
-    if (!isHttp) {
-      f = path.resolve(f);
-      var webPath = path.resolve(config.webPath);
-      f = f.replace(webPath, '');
-      if (config.modName) {
-        f = path.join(config.modName, f);
-      }
-      f = f.replace(/\\/g, '/');
-    }
-
-    // SRI Hash Generator
-    // https://www.srihash.org/
-
-    var base64 = makeHash(content, config.hashName); // 将文件内容进行hash计算
-    results[f] = config.hashName + '-' + base64; //  使用 base64 编码 sha384 算法计算出摘要后的 integrity 值的示例
-  });
-}
-
-function makeHash(str, name) {
-  const hash = crypto.createHash(name);
-  hash.update(str);
-  return hash.digest('base64');
-}