crabatool 1.0.426 → 1.0.427

package/apis/data.js

@@ -162,8 +162,7 @@ class data {
   }
 
   async reverseData(req, pageName, body) {
-    var db = this._getDb(req);
-    var oldEntity = await db.get(body.name, body.data.id);
+    var oldEntity = await this._getDb(req).get(body.name, body.data.id);
     if (!oldEntity) {
       crabatool.utils.end(res, {
         code: 404,
@@ -171,8 +170,6 @@ class data {
       });
       return;
     }
-    
-    await this.fillData(body.name, [oldEntity], db, true);
     //退回联动老数据
     var rt = await this.pageSaveToDataLinkage(req, body.name, pageName, oldEntity, null, true);
     return {
@@ -187,25 +184,25 @@ class data {
     var pageName = body.pageName;
     var db = this._getDb(req);
     var rtData = JSON.parse(JSON.stringify(body.data));
+    var name = body.name;
     if (body.data.id) {
       var oldData = await this.reverseData(req, pageName, body);
       if (!oldData) {
         return;
       }
-      await this.buildDataPrimaryAndForeignKey(body.name, body.data, true);
+      await this.buildDataPrimaryAndForeignKey(name, body.data, true);
       //更新联动新数据
-      await this.pageSaveToDataLinkage(req, body.name, pageName, body.data, oldData);
-      var name = body.name;
+      await this.pageSaveToDataLinkage(req, name, pageName, body.data, oldData);
       await this._saveRefData(name, body.data, rtData, db);
-      await db.update(body.name, body.data.id, body.data);
+      await db.update(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)
+      await this.buildDataPrimaryAndForeignKey(name, body.data);
+      await this.pageSaveToDataLinkage(req, name, pageName, body.data)
       await this._saveRefData(name, body.data, rtData, db);
-      newData = await db.create(body.name, body.data);
+      newData = await db.create(name, body.data);
     }
 
     crabatool.utils.end(res, {
@@ -300,7 +297,7 @@ class data {
           //从原始数据中获取对应字段的数据
           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, `${item.ref}.id`]));
+          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('.')
@@ -328,13 +325,7 @@ class data {
                 //传入了老数据，当前计算的值可以直接取老数据的对应值，因为它已经排除本单
                 var oldDataTemp = oldData[name][refNamePy];
                 if (oldDataTemp instanceof Array) {
-                  target[refNamePy][fieldNamePy] = 0;
-                  for(var m = 0 ; m < oldDataTemp.length; m++){
-                    if(oldDataTemp[m].id == target[refNamePy].id){
-                      target[refNamePy][fieldNamePy] = oldDataTemp[m][fieldNamePy];
-                      break;
-                    }
-                  }
+                  target[refNamePy][fieldNamePy] = oldDataTemp[0][fieldNamePy];//强制取第一行
                 } else {
                   target[refNamePy][fieldNamePy] = oldDataTemp[fieldNamePy] ? oldDataTemp[fieldNamePy] : 0;
                 }

package/index.js

@@ -11,6 +11,7 @@ exports.cuid = require('./lib/cuid.js');
 exports.JSONCRUD = require('./lib/jsoncrud.js');
 exports.DbHelper = require('./lib/db/dbHelper.js');
 exports.StringBuilder = require('./lib/stringBuilder.js');
+exports.hashUtils = require('./tool/hash.js');
 
 start.initArgs();
 
@@ -51,6 +52,22 @@ function checkFast(args) {
 
   config.progress = 0; // 通过命令行启动，默认不显示进度条
 
+  // 上传ngp的图标库和皮肤
+  if (args.includes('-uploadSkin')) {
+    start.bindAndCheckConfig('-skinPath');
+    start.bindAndCheckConfig('-version');
+    require('./tool/ngpSkinUtils.js').upload();
+    return false;
+  }
+
+  // 更新ngp的图标库和皮肤
+  if (args.includes('-updateSkin')) {
+    start.bindAndCheckConfig('-skinPath');
+    start.bindAndCheckConfig('-version');
+    require('./tool/ngpSkinUtils.js').update();
+    return false;
+  }
+
   if (args.includes('-checkjs')) {
     start.bindConfigByArgv('-ignoreFiles', 'array');
     start.bindConfigByArgv('-cssFiles', 'array');

package/package.json

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

package/res/login.html

@@ -11,6 +11,7 @@
 <body>
     <script>
         var modeName = '${modName}'; // 按各组的模块名称修改
+        var rv = new Date().getTime();
 
         function startPage() { // 供agency内部调用
             var authorization = $common.getCookie('ngp-authorization');
@@ -36,8 +37,8 @@
                 }
 
                 var srcs = [];
-                srcs.push('shell/js/help.plug.js?rv=' + Math.random());
-                srcs.push('shell/js/init.js?rv=' + Math.random());
+                srcs.push('shell/js/help.plug.js?_v_=' + rv);
+                srcs.push('shell/js/init.js?_v_=' + rv);
                 $common.loadScript(srcs, function() {
                     showMainPage();
                 });
@@ -88,11 +89,11 @@
             document.getElementsByTagName('HEAD')[0].appendChild(script);
         }
 
-        var agencyUrl = 'js/agency.js?vc=' + (new Date()).getTime(); // 加时间戳防止浏览器缓存
+        var agencyUrl = 'js/agency.js?_v_=' + rv; // 加时间戳防止浏览器缓存
         loadScript(agencyUrl, function() {
             $agency.load(['js/craba.min.js',
                 'js/crabaEx.min.js',
-                'js/math.min.js',
+                'js/math.min.js?_v_=5.2.0',
                 'js/crabaNgp.js'
             ], {}, startPage); // 这里写死首页脚本,agency内部使用。所有脚本由agency内部版本号防止浏览器缓存
         });

package/tool/hash.js

@@ -87,4 +87,12 @@ function makeHash(str, name) {
   const hash = crypto.createHash(name);
   hash.update(str);
   return hash.digest('base64');
+}
+
+module.exports.makeHash = function(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return 0;
+  }
+  var content = fs.readFileSync(filePath);
+  return makeHash(content, 'sha384');
 }

package/tool/ngpSkinUtils.js

@@ -0,0 +1,136 @@
+
+var config = require('../lib/config.js');
+var path = require('path');
+var fs = require('fs');
+var utils = require('../lib/utils.js');
+var axios = require('axios');
+const FormData = require('form-data');
+var _zipName = path.join(config.TempPath, 'uploadShellSkin', config.version + '.zip');
+var _zipName2 = path.join(config.TempPath, 'updateShellSkin', config.version + '.zip');
+var ngpSkinCache = path.join(config.TempPath, 'ngpSkinCache');
+
+// 上传图标库
+module.exports.upload = function() {
+  doZip();
+}
+
+function doZip() {
+  utils.mkdirsSync(_zipName);
+
+  // 将demo文件一起打包
+  utils.copyFiles(path.join(_jsPath, 'demo'), _tempPath);
+
+  // 打包平台资源
+  utils.zip(config.skinPath, _zipName, function() {
+    console.log('压缩完成');
+    doUpload(); // 根据配置上传到服务端指定路径（分支）下
+  }, { ignoreBase: true }); // 忽略跟路径
+}
+
+function doUpload() {
+  console.log('上传资源');
+  var host = config.host || config.SourceHost;
+  var apis = utils.joinPath(host, '/apis/publish/saveSkin');
+
+  console.log(apis);
+
+  const formData = new FormData();
+  formData.append('my_field', 'my value');
+  formData.append('my_file', fs.createReadStream(_zipName));
+  var headers = formData.getHeaders();
+
+  axios({
+    method: 'POST',
+    url: apis,
+    data: formData,
+    headers: {
+      ...headers,
+      version: config.version,
+      token: 'wssf2021' // 临时授权码
+    }
+  }).then(function(response) {
+    console.log(response.data);
+    doEnd();
+  }).catch(function(err) {
+    utils.postWeebhooks('shell皮肤发布失败');
+    console.log(err);
+  });
+}
+
+function doEnd() {
+  var text = new Date().toString() + "shell皮肤和图标库打包完成，上传资源到" + config.version;
+  console.log(text);
+  utils.postWeebhooks(text);
+}
+
+
+
+// 更新图标库
+module.exports.update = function() {
+  if (fs.existsSync(_zipName2)) {
+    checkUpdate();
+  } else {
+    doDownload();
+  }
+}
+
+function checkUpdate() {
+  console.log('检查皮肤是否有更新');
+
+  var host = config.host || config.SourceHost;
+  var apis = utils.joinPath(host, '/apis/publish/checkSkin');
+  var headers = formData.getHeaders();
+  var hashUtils = require('./hash.js');
+
+  axios({
+    method: 'POST',
+    url: apis,
+    data: {
+      version: config.version,
+      hash: hashUtils.makeHash(_zipName2)
+    },
+    headers: {
+      ...headers,
+      version: config.version,
+      token: 'wssf2021' // 临时授权码
+    }
+  }).then(function(response) {
+    //console.log(response.data);
+    if (response.data.code == 200) {
+      doDownload();
+    } else {
+      console.log(response.data.msg);
+    }
+  }).catch(function(err) {
+    console.log(err);
+  });
+}
+
+function doDownload() {
+  console.log('开始下载皮肤和图标库');
+  utils.downloadFile(getZipFileUrl(), _zipName2, downloadOk);
+}
+
+function getZipFileUrl() {
+  return utils.joinPath(config.SourceHost, "setup/shellSkin/" + config.version + ".zip");
+}
+
+function downloadOk(filePath) {
+  if (!fs.existsSync(filePath)) {// 检查文件
+    console.log(":::服务不可用，拉取皮肤文件失败，请联系平台管理员:::");
+    return;
+  }
+
+  console.log('皮肤数据包下载完成');
+  utils.unzip(filePath, ngpSkinCache, _copyFiles);
+}
+
+function _copyFiles() {
+  var ignores = [];
+  console.log("拷贝文件中..");
+  utils.copyFiles(ngpSkinCache, config.skinPath, ignores, function(fileName) {
+    utils.debug('拷贝文件', fileName);
+  });
+
+  console.log('图标库和皮肤更新完成');
+}