crabatool 1.0.407 → 1.0.410

package/apis/data.js

@@ -198,71 +198,104 @@ class data {
     var dataChange = this.pagesDataChanged[pageName]
 
     var cs = this.getDataChangeItem(dataChange);
-    var map = this.findItemMapData(name, data, cs)
-    var action = this.findActionByMatchCondition(map, dataChange)
-    if (!action) {
+    var map = this.findItemMapData(name, name, data, cs)
+    var actions = this.findActionByMatchCondition(map, dataChange)
+    if (!actions || actions.length == 0) {
       return data;
     }
     //查找涉及的所有实体
     var _this = this;
-    await action && action.forEach(async item => {
-      if (item.type == 'external') {//外表处理
-        await _this.externalDataLinkage(req, name, data, item, reverseNumber);
-      } else {//内部处理
-        //从原始数据中获取对应字段的数据
-        var targetRef = _this.findFormateItem(item.filter.refField)
-        var targetRefField = _this.findFormateItem(`#[${item.ref}.${item.field}]`)
-        var targetValue = _this.findItemMapData(crabatool.stringUtils.getFullPinyinCode(item.ref), data, new Set([...targetRef, ...targetRefField]));
-        var refFieldName = this.matchFields(item.filter.refField)[0];
-        var refFieldNamePy = crabatool.stringUtils.getFullPinyinCode(refFieldName);
-        var t = refFieldNamePy.split('.')
-        var refData = _this.findLayerData(targetValue, t)
-
-        var filterCs = _this.findFormateItem(item.filter.refValue)
-        var tp = _this.findFormateItem(item.formate);
-        var sourceValue = _this.findItemMapData(name, data, new Set([...filterCs, ...tp]), reverseNumber);
-        var refValueName = this.matchFields(item.filter.refValue)[0];
-        var refValueNamePy = crabatool.stringUtils.getFullPinyinCode(refValueName);
-        var t = refValueNamePy.split('.')
-        var sourceData = _this.findLayerData(sourceValue, t)
-
-        //根据refData和sourceData计算结果
-        var refNamePy = crabatool.stringUtils.getFullPinyinCode(item.ref);
-        var fieldNamePy = crabatool.stringUtils.getFullPinyinCode(item.field);
-        Object.keys(refData).forEach(key => {
-          var target = refData[key][0];
-          //目标值为单一对象
-          if (!target[refNamePy]) {
-            return;
+    for(var i = 0 ; i < actions.length; i++){
+      var action = actions[i];
+      for(var j = 0 ; j < action.length ; j++){
+        var item = action[j];
+        if (item.type == 'external') {//外表处理
+          await _this.externalDataLinkage(req, name, data, item, reverseNumber);
+        } else {//内部处理
+          //从原始数据中获取对应字段的数据
+          var targetRef = _this.findFormateItem(item.filter.refField)
+          var targetRefField = _this.findFormateItem(`#[${item.ref}.${item.field}]`)
+          var targetValue = _this.findItemMapData(name, crabatool.stringUtils.getFullPinyinCode(item.ref), data, new Set([...targetRef, ...targetRefField]));
+          var refFieldName = this.matchFields(item.filter.refField)[0];
+          var refFieldNamePy = crabatool.stringUtils.getFullPinyinCode(refFieldName);
+          var targetArray = refFieldNamePy.split('.')
+          var refData = _this.findLayerData(targetValue, targetArray)
+
+          var filterCs = _this.findFormateItem(item.filter.refValue)
+          var tp = _this.findFormateItem(item.formate);
+          var sourceValue = _this.findItemMapData(name, crabatool.stringUtils.getFullPinyinCode(item.ref), data, new Set([...filterCs, ...tp]), reverseNumber);
+          var refValueName = this.matchFields(item.filter.refValue)[0];
+          var refValueNamePy = crabatool.stringUtils.getFullPinyinCode(refValueName);
+          var t = refValueNamePy.split('.')
+          var sourceData = _this.findLayerData(sourceValue, t)
+
+          //根据refData和sourceData计算结果
+          var refNamePy = crabatool.stringUtils.getFullPinyinCode(item.ref);
+          var fieldNamePy = crabatool.stringUtils.getFullPinyinCode(item.field);
+          Object.keys(refData).forEach(key => {
+            var target = refData[key][0];
+            //目标值为单一对象
+            if (!target[refNamePy]) {
+              return;
+            }
+            if (oldData) {
+              if(name != refNamePy){
+                //传入了老数据，当前计算的值可以直接取老数据的对应值，因为它已经排除本单
+                var oldDataTemp = oldData[name][refNamePy];
+                if(oldDataTemp instanceof Array){
+                  target[refNamePy][fieldNamePy] = oldDataTemp[0][fieldNamePy];//强制取第一行
+                } else {
+                  target[refNamePy][fieldNamePy] = oldDataTemp[fieldNamePy] ? oldDataTemp[fieldNamePy] : 0;
+                }
+              } else {
+                //传入了老数据，当前计算的值可以直接取老数据的对应值，因为它已经排除本单
+                target[refNamePy][fieldNamePy] = oldData[refNamePy][fieldNamePy] ? oldData[refNamePy][fieldNamePy] : 0;
+              }
+            } else {
+              target[refNamePy][fieldNamePy] = target[refNamePy][fieldNamePy] ? target[refNamePy][fieldNamePy] : 0;
+            }
+            var tempSourceValue = sourceData[key];
+            var fieldData = 0;
+            for (var j = 0; j < tempSourceValue.length; j++) {
+              var value = tempSourceValue[j]
+              //还原结果数字，避免在公式中计算时带入右边公式，反复计算（如商品余量=商品余量+商品库存）
+              value[refNamePy] && (value[refNamePy][fieldNamePy] = target[refNamePy][fieldNamePy]);
+              fieldData += this.execFormate(item.formate, value, 0)
+            }
+            target[refNamePy][fieldNamePy] = fieldData;
+          });
+
+
+          //把计算结果赋值给原来的值，让带到后面去
+          var targetObj = data;
+          if (refNamePy != name) {
+            targetObj = data[refNamePy];
           }
-          if (oldData) {
-            //传入了老数据，当前计算的值可以直接取老数据的对应值，因为它已经排除本单
-            target[refNamePy][fieldNamePy] = oldData[refNamePy][fieldNamePy] ? oldData[refNamePy][fieldNamePy] : 0;
+          if(targetObj instanceof Array){
+            targetObj.forEach(titem => { 
+              var primaryKey = titem[targetArray[1]];
+              if(!refData[primaryKey]){//没找到对应行，直接返回
+                return;
+              }
+              var refDataTemp = refData[primaryKey][0][refNamePy];
+              Object.keys(refDataTemp).forEach(key => {
+                titem[key] = refDataTemp[key];
+              });
+            })
           } else {
-            target[refNamePy][fieldNamePy] = target[refNamePy][fieldNamePy] ? target[refNamePy][fieldNamePy] : 0;
-          }
-          var tempSourceValue = sourceData[key];
-          var fieldData = 0;
-          for (var j = 0; j < tempSourceValue.length; j++) {
-            var value = tempSourceValue[j]
-            //还原结果数字，避免在公式中计算时带入右边公式，反复计算（如商品余量=商品余量+商品库存）
-            value[refNamePy] && (value[refNamePy][fieldNamePy] = target[refNamePy][fieldNamePy]);
-            fieldData += this.execFormate(item.formate, value, 0)
+            var targetObj = data;
+            if (refNamePy == name) {
+              targetObj = data;
+            }
+            //将结果赋值给实体对象
+            var t = targetValue[refNamePy];
+            Object.keys(t).forEach(key => {
+              targetObj[key] = t[key];
+            });
           }
-          target[refNamePy][fieldNamePy] = fieldData;
-        });
-
-        var targetObj = data;
-        if (crabatool.stringUtils.getFullPinyinCode(item.ref) == name) {
-          targetObj = data;
         }
-        //将结果赋值给实体对象
-        var t = targetValue[crabatool.stringUtils.getFullPinyinCode(item.ref)];
-        Object.keys(t).forEach(key => {
-          targetObj[key] = t[key];
-        });
       }
-    })
+    }
 
     return data;
   }
@@ -275,7 +308,7 @@ class data {
     //获取本来数据源的数据
     var filterCs = _this.findFormateItem(item.filter.refValue)
     var tp = _this.findFormateItem(item.formate);
-    var allValue = _this.findItemMapData(name, data, new Set([...filterCs, ...tp]), reverseNumber);
+    var allValue = _this.findItemMapData(name, name, data, new Set([...filterCs, ...tp]), reverseNumber);
     var filterValue = _this.findLayerData(allValue, crabatool.stringUtils.getFullPinyinCode(refValueFieldName).split('.'));
     //根据filterValue取外表数据
     var refPy = crabatool.stringUtils.getFullPinyinCode(item.ref)
@@ -283,14 +316,13 @@ class data {
     var size = 100;
     var rtSize = 0;
     var changeRefData = [];
+    var db = this._getDb(req);
     do {
       //循环取外表数据
       var page = 1;
-      var t = await this._getDb(req).find(refPy, {
+      var t = await db.find(refPy, {
         page: page,
         pageSize: size,
-
-
         filterFunc: function (row) {
           if (filterValue[row[refFieldPy]]) {
             changeRefData.push({
@@ -360,12 +392,12 @@ class data {
   }
 
   //查找项的映射链路数据值
-  findItemMapData(name, data, cs, reverseNumber) {
+  findItemMapData(name, itemName, data, cs, reverseNumber) {
     //合并相同数据,只考虑2层
     var rowMap = {};
     cs.forEach(item => {
       var arrays = item.split('.');
-      var pre = name;
+      var pre = itemName;
       var field = "";
       if (arrays.length == 2) {
         pre = arrays[0];
@@ -417,13 +449,12 @@ class data {
   //根据条件查找匹配的action
   findActionByMatchCondition(map, dataChange) {
     //对比条件，找到满足的条件的动作
-    var action = null;
+    var action = [];
     for (var i = 0; i < dataChange.length; i++) {
       var item = dataChange[i];
       if (this.execFormate(item.condition, map)) {
         //找到满足的条件
-        action = item.action;
-        break;
+        action.push(item.action);
       }
     }
     return action;

package/index.js

@@ -173,7 +173,7 @@ function checkFast(args) {
   if (args.includes('-pageHash')) {
     start.bindAndCheckConfig('-pageHash');
     start.bindConfigByArgv('-ngp', 'boolean');
-    require('./tool/pageHash.js').start(); // wps安全改造，工具生成js和css的hash值
+    require('./tool/pageHash.js').start(); // 手动生成页面的hash，用于配置id
     return false;
   }
 

package/lib/utils.js

@@ -229,7 +229,7 @@ class Utils {
     }
 
     getQueryValue(req, key) {
-        var query = req.parsed.query;
+        var query = req.query;
         if (!query) return null;
         if (query[key] == undefined) return null;
         return unescape(query[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.407",
+  "version": "1.0.410",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -27,7 +27,8 @@
     "makeHash": "node run.js -makeHash -webPath ./test/ -modName craba  -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json -hashName sha384",
     "makeHash2": "node run.js -makeHash -webPath ./test/ -modName craba -files ./test/  -exts .js -outJson ./hash2.json -hashName sha384",
     "pageHash": "node run.js -pageHash /Test/TestMasterDetail.gspx",
-    "addVersion":"node run.js -addVersion -file F:\\basicweb\\www\\index.html -exp AUTOVERSION"
+    "addVersion": "node run.js -addVersion -file F:\\basicweb\\www\\index.html -exp AUTOVERSION",
+    "gspxHash": "node run.js -gspxHash -webPath F:\\Beefun\\srcs\\Beefun"
   },
   "author": "wssf",
   "dependencies": {
@@ -69,4 +70,4 @@
     "crabatool"
   ],
   "license": "UNLICENSED"
-}
+}

package/tool/gspxHash.js

@@ -0,0 +1,90 @@
+
+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');
+}