crabatool 1.0.118 → 1.0.126

package/lib/utils.js

@@ -54,6 +54,25 @@ class Utils {
         return "";
     }
 
+    searchRootFolter(name, source) {
+        if (!path.basename(source)) return null;
+        if (fs.existsSync(source)) {
+            var files = fs.readdirSync(source);
+            //console.log(files);
+            for (var i = 0; i < files.length; i++) {
+                var fileName = files[i];
+                var filePath = utils.join(source, fileName);
+                //console.log(filePath);
+                var stat = fs.statSync(filePath);
+                if (stat.isDirectory()) {
+                    var basename = path.basename(fileName);
+                    if (basename == name) return filePath;
+                }
+            }
+        }
+        return utils.searchRootFolter(name, utils.join(source, '../'));
+    }
+
     format() {
         // 字符串参数化
         var args = new Array(arguments.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.118",
+  "version": "1.0.126",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {
@@ -40,4 +40,4 @@
   ],
   "license": "UNLICENSED",
   "devDependencies": {}
-}
+}

package/test/.eslintrc.json

@@ -0,0 +1,66 @@
+{
+    "env": {
+        "browser": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:native-ie/ie11",
+        "plugin:native-ie/ie10"
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "script"
+    },
+    "rules": {
+        "semi": "off",
+        "no-redeclare": "off",
+        //"no-unused-vars": "off",
+        "missingSemi": "off"
+    },
+    "globals": {
+        "Sys": "readonly",
+        "Craba": "readonly",
+        "Type": "readonly",
+        "$app": "readonly",
+        "$common": "readonly",
+        "$settings": "readonly",
+        "$craba": "readonly",
+        "$msg": "readonly",
+        "$print": "readonly",
+        "$notify": "readonly",
+        "$cache": "readonly",
+        "$user": "readonly",
+        "$userCache": "readonly",
+        "$dom": "readonly",
+        "$Dom": "readonly",
+        "$export": "readonly",
+        "$skin": "readonly",
+        "$step": "readonly",
+        "$ms": "readonly",
+        "$createDelegate": "readonly",
+        "$createControl": "readonly",
+        "$uploader": "readonly",
+        "$debug": "readonly",
+        "$skinUtils": "readonly",
+        "$scriptLoader": "readonly",
+        "$Message": "readonly",
+        "$removeNode": "readonly",
+        "$get": "readonly",
+        "$agency": "readonly",
+        "$createControlFromGspx": "readonly",
+        "handleError": "readonly",
+        "$jsLoader": "readonly",
+        "$create": "readonly",
+        "$addHandler": "readonly",
+        "$searchUtils": "readonly",
+        "$crabaJSON": "readonly",
+        "asyncCall": "readonly",
+        "$clearHandlers": "readonly",
+        "$removeHandler": "readonly",
+        "getClientBounds": "readonly",
+        "echarts": "readonly",
+        "SysConsts": "readonly",
+        "math": "readonly",
+        "createIterator": "readonly"
+    }
+}

package/test/test.js

@@ -9,10 +9,11 @@ var crabaTool = require('../index.js'); // 引入craba脚手架工具包
 var config = {
   //【必填】
   // 告诉工具当前项目的端路径地址，填绝对路径哦
-  webPath: "F:\\jxc\\jxc-web\\src\\main\\resources\\static\\jxc",
+  //webPath: "F:\\jxc\\jxc-web\\src\\main\\resources\\static\\jxc",
   //webPath: "F:/shell_master/web/src/main/resources/static/shell",
   //webPath: "F:\\newcrabadoc\\www",
   //webPath: "F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\",
+  webPath: "F:/crabaevery/www",
 
   //【必填】
   // 告诉工具当前项目前端服务器端口地址
@@ -20,7 +21,7 @@ var config = {
 
   //【ngp必填】【非ngp项目不是必填】
   // 当前项目模块名称，各组按需修改
-  modName: "jxc", // 如：modName:"jxc"
+  modName: "shell", // 如：modName:"jxc"
 
   defaultPage: 'index.html',
 
@@ -32,7 +33,7 @@ var config = {
   // 1. 当前模块是由哪些过去的模块合并来的，各组按需修改
   // 2. 如果配置了子模块清单，工具会自动将所有子模块下的init.js和当前模块的jxc/js/jxc.js，合并打包到：jxc/js/init.js，实际运行过程中只加载:jxc/js/init.js，不会加载子模块下面的init.js，这样就可以大大减少http请求
   // 3. 同2，biz.js也是相同思路进行合并打包
-  childModList: ['recordsheet', 'baseinfo', 'accounting', 'analysiscloud', 'finance'],
+  //childModList: ['recordsheet', 'baseinfo', 'accounting', 'analysiscloud', 'finance'],
 
   // 【不是必填】
   // 上一步中打包后的文件是否压缩, true为忽略【不压缩】，false为【要压缩】，各组按需修改
@@ -47,7 +48,16 @@ var config = {
   globals: ['crabadoc', 'Type', 'CrabaMarkdown', '$doc', 'www', 'crabaJs'],
 
   // 告诉助手项目有哪些js忽略语法检查，可以填目录
-  ignoreCheck: ['js/lib/highlight.min.js', 'js/lib/markdown-it.min.js', 'Pages/Component.min.js'],
+  ignoreCheck: [
+    'js/lib/highlight.min.js',
+    'js/lib/markdown-it.min.js',
+    'Pages/Component.min.js',
+    '/js/es6-promise.auto.min.js',
+    'iconfont/iconfont.js',
+    'biconfont/iconfont.js',
+    'ueditor',
+    'js'
+  ],
 
   // 配置js语法检测报告推送地址
   webhooks: ''

package/tool/checkjs.js

@@ -153,6 +153,7 @@ module.exports.start = async function() {
     status = '有异常';
   }
 
+  var branchName = getBranchName();
   var modName = getModName();
   var id = modName + '_' + new Date().getTime();
   var webhookList = [];
@@ -169,21 +170,22 @@ module.exports.start = async function() {
     info.push(`| 平台日期 | ${localVersion.date} |`);
   }
   info.push(`| 生成报告时间 | ${new Date().toString()} |`);
+  info.push(`| 分支名 | ${branchName} |`);
   info.push(`| 网站路径 | ${config.webPath} |`);
   info.push(`| 共检查 | ${jsFiles.length}个js文件 |`);
   info.push(`| 共检查 | ${gspxData.count}个gspx文件 |`);
   info.push(`| 忽略目录和文件 | ${config.ignoreCheck ? config.ignoreCheck.join('、') : '无' + ' |'}`);
 
   info.push("# 检测结果汇总");
-  info.push("| 类型 | 数量 |");
-  info.push("| ------ | ------ |");
-  info.push(`| 语法异常文件数Error | ${errKeys.length}个 |`);
-  info.push(`| 语法警告文件数Warn | ${warnKeys.length}个 |`);
-  info.push(`| 语法提示文件数Info | ${warnKeys.length}个 |`);
-  info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |`);
-  info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |`);
-  info.push(`| gspx建议优化数 | ${warnGspxCount}个 |`);
-  info.push(`| gspx语法错误数 | ${gspxData.errorList.length}个 |`);
+  info.push("| 类型 | 数量 | 占比 |");
+  info.push("| ------ | ------ | ----- |");
+  info.push(`| 语法异常文件数Error | ${errKeys.length}个 |${calc(errKeys.length, jsFiles.length)}|`);
+  info.push(`| 语法警告文件数Warn | ${warnKeys.length}个 |${calc(warnKeys.length, jsFiles.length)}|`);
+  info.push(`| 语法提示文件数Info | ${infoKeys.length}个 |${calc(infoKeys.length, jsFiles.length)}|`);
+  info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |${calc(notUtf8List.length, jsFiles.length)}|`);
+  info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |${calc(bigList.length, jsFiles.length)}|`);
+  info.push(`| gspx建议优化数 | ${warnGspxCount}个 |${calc(warnGspxCount, gspxData.count)}|`);
+  info.push(`| gspx语法错误数 | ${gspxData.errorList.length}个 |${calc(gspxData.errorList.length, gspxData.count)}|`);
 
 
   webhookList.push(`1. 助手版本: ${config.Version} `);
@@ -191,12 +193,13 @@ module.exports.start = async function() {
     webhookList.push(`1. 平台版本：${localVersion.version}`);
     webhookList.push(`1. 平台日期：${localVersion.date}`);
   }
+  webhookList.push(`1. 分支名：${branchName}`);
   webhookList.push(`1. 共检测 ${jsFiles.length}个 js文件 `);
   webhookList.push(`1. 共检测 ${gspxData.count}个 gspx文件 `);
 
   // 输出到钉钉的简易报告
   //if (errKeys.length > 0) {
-  webhookList.push(`1. 语法异常文件数Error：${errKeys.length}个`);
+  webhookList.push(`1. 语法异常文件数Error：${errKeys.length}个，占比${calc(errKeys.length, jsFiles.length)}`);
 
   // 随机显示5个异常文件到钉钉消息
   var errCount = errKeys.length;
@@ -209,7 +212,7 @@ module.exports.start = async function() {
       list0.push(fileName);
     }
 
-    webhookList.push(`1. 语法异常文件清单随机5个  \r\n${list0.join(';  \r\n')}`);
+    webhookList.push(`1. 随机显示部分异常文件清单  \r\n${list0.join(';  \r\n')}`);
     var reportUrl1 = getReportUrl(id, 2);
     if (reportUrl1) {
       webhookList.push(`[更多异常...](${reportUrl1})`);
@@ -218,20 +221,20 @@ module.exports.start = async function() {
 
   //}
   //if (warnKeys.length > 0) {
-  webhookList.push(`7. 语法警告文件数Warn：${warnKeys.length}个`);
+  webhookList.push(`7. 语法警告文件数Warn：${warnKeys.length}个，占比${calc(warnKeys.length, jsFiles.length)}`);
   //}
-  webhookList.push(`8. 语法提示文件数Info：${infoKeys.length}个`);
+  webhookList.push(`8. 语法提示文件数Info：${infoKeys.length}个，占比${calc(infoKeys.length, jsFiles.length)}`);
   if (notUtf8List.length > 0) {
-    webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个`);
+    webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个，占比${calc(notUtf8List.length, jsFiles.length)}`);
   }
   if (bigList.length > 0) {
-    webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个`);
+    webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个，占比${calc(bigList.length, jsFiles.length)}`);
   }
   //if (warnGspxCount > 0) {
-  webhookList.push(`9. gspx建议优化数：${warnGspxCount}个`);
+  webhookList.push(`9. gspx建议优化数：${warnGspxCount}个，占比${calc(warnGspxCount, gspxData.count)}`);
   //}
   if (gspxData.errorList.length > 0) {
-    webhookList.push(`10. gspx语法错误数：${gspxData.errorList.length}个`);
+    webhookList.push(`10. gspx语法错误数：${gspxData.errorList.length}个，占比${calc(gspxData.errorList.length, gspxData.count)}`);
   }
 
   // 代码质量管理需要格式
@@ -385,6 +388,10 @@ async function eslintCheck(content) {
   return res;
 }
 
+function calc(a, b) {
+  return Math.ceil(a / b * 100) + '%';
+}
+
 function getMathReuslts(content, nreg, filterFun) {
   var all = content.matchAll(nreg);
   var list = [];
@@ -427,6 +434,10 @@ function getReportUrl(id, anchor) {
   return href;
 }
 
+function getBranchName() {
+  return config.branchName || 'null'
+}
+
 function getModName() {
   return config.modName || 'noname';
 }

package/tool/start.js

@@ -84,6 +84,7 @@ class Start {
     bindConfigByArgv('-ignoreCompress', 'boolean');
     bindConfigByArgv('-Debug', 'boolean');
     bindConfigByArgv('-checkgspx', 'boolean');
+    //bindConfigByArgv('-branchName');
   }
 
   checkPath() {
@@ -106,6 +107,8 @@ class Start {
       throw new Error(`请检查craba.js，配置的webPath路径不存在，支持相对路径，路径中用\\双斜杠或单反斜杠/；请检查拼写是否正确:${config.webPath}`);;
     }
 
+    bindBranchName();
+
     start.checkCraba();
   }
 
@@ -188,6 +191,38 @@ var start = new Start();
 module.exports = start;
 
 
+function bindBranchName() {
+  var gitPath = utils.searchRootFolter('.git', config.webPath);
+  if (!gitPath) return;
+  var headPath = utils.join(gitPath, 'HEAD');
+  if (!fs.existsSync(headPath)) return;
+
+  // 读取Head文件内容
+  var headStr = fs.readFileSync(headPath).toString().trim();
+  var arr = headStr.split('/');
+
+  // 情况1：取到分支名包含斜杠
+  if (arr.length > 1) {
+    config.branchName = arr[arr.length - 1]; // 分支名称
+    return;
+  }
+
+  // 情况2：取到hash值
+
+  headPath = utils.join(gitPath, 'FETCH_HEAD');
+  if (!fs.existsSync(headPath)) return;
+
+  // 读取Head文件内容
+  var content = fs.readFileSync(headPath).toString().trim();
+  arr = content.split('\n');
+  var results = arr.filter(function(str) {
+    if (str.startsWith(headStr)) return true;
+  });
+
+  if (!results || results.length == 0) return;
+
+  config.branchName = results[0].split(' ')[1];
+}
 
 
 /*内部私有方法*/