crabatool 1.0.831 → 1.0.834

package/index.js

@@ -78,6 +78,15 @@ exports.run = async function(options) {
 }
 
 async function checkFast(args) {
+  // 配置文件方式启用自动生成 ID（优先于长度判断，避免被提前 return 掉）
+  if (!args.includes('-autoId') && config.autoId === true) {
+    start.checkWebPath();
+    start.bindConfigByArgv('-ignoreAutoId', 'array');
+    start.bindConfigByArgv('-ignoreFiles', 'array');
+    require('./tool/addNodeId.js').start();
+    return false;
+  }
+
   // 1. 服务端构建环境，自动化，根据命令行参数，直接调用脚手架功能
   if (args.length < 3) {
     return true;

package/lib/config.js

@@ -25,6 +25,7 @@ class Config {
     this.ignoreCheck = [];
     this.ignoreFiles = [];
     this.ignoreAutoId = [];
+    this.autoId = false; // 是否在启动时自动生成 ID
     this.Version = pg.version;
     this.Debug = false;
     this.version = 'master';

package/lib/server.js

@@ -171,7 +171,7 @@ function createServer(app, options) {
         res.setHeader('Content-Type', 'text/html; charset=utf-8'); // 当做文本输出，才能显示到iframe中
       }
       var name = path.basename(pathname);
-      if (name == 'index.html' || name == 'login.html') {
+      if (name == 'index.html' || name == 'login.html') { // 入口文件：首页和登录页面不能被缓存
         res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
         res.setHeader('Pragma', 'no-cache');
         res.setHeader('Expires', '0');

package/package.json

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

package/tool/checkgspx.js

@@ -9,6 +9,7 @@ module.exports.getResults = function() {
   var data = {
     count: 0,
     tags: {},
+    labelList: {},
     bizList: {},
     tagList: [],
     customs1: {},
@@ -96,6 +97,20 @@ function readGspxToJSON(fileName, data) {
             }
           }
         }
+
+        if (name == 'Label') {
+          for (var key in attrs) {
+            if (key == 'ReadOnly') {
+              if (!data.labelList[fileName]) {
+                data.labelList[fileName] = [];
+              }
+              var id = attrs.ID || attrs.Label || attrs.Text;
+              data.labelList[fileName].push(id);
+              break;
+            }
+          }
+        }
+
         // 建议优化页面汇总
         if (warnTags.includes(name)) {
           if (name == 'CancelButton' || name == 'CloseButton') {

package/tool/checkjs.js

@@ -198,6 +198,7 @@ module.exports.start = async function() {
 
   // 生成检测报告 markdown语法
   var warnGspxCount = Object.keys(gspxData.warnList).length;
+  var readLabelCount = Object.keys(gspxData.labelList).length;
   var trimErrKeys = Object.keys(trimErrDatas);
   var errKeys = Object.keys(errDatas);
   var undefKeys = Object.keys(undefDatas);
@@ -211,7 +212,7 @@ module.exports.start = async function() {
 
   var branchName = getBranchName();
   var modName = getModName();
-  var id = modName + '_' + new Date().getTime();
+  var id = modName + '_' + branchName + '_' + new Date().getTime();
   var webhookList = [];
   var info = [];
   var localVersion = upgrade.getLocalVersion();
@@ -251,7 +252,9 @@ module.exports.start = async function() {
   }
 
   info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |${calc(bigList.length, jsFiles.length)}|`);
-
+  if (readLabelCount > 0) {
+    info.push(`| 只读Label优化数 | ${readLabelCount}个 |${calc(readLabelCount, gspxData.count)}|`);
+  }
   if (warnGspxCount > 0) {
     info.push(`| gspx建议优化数 | ${warnGspxCount}个 |${calc(warnGspxCount, gspxData.count)}|`);
   }
@@ -267,7 +270,8 @@ module.exports.start = async function() {
     tipCount: infoKeys.length,
     fileSize: fileSize,
     fileSizeCount: bigList.length,
-    gspxWarnCount: warnGspxCount.length,
+    gspxWarnCount: warnGspxCount,
+    readLabelCount: readLabelCount,
     gspxErrorCount: gspxData.errorList.length,
     jsTotal: jsFiles.length,
     gspxTotal: gspxData.count
@@ -323,7 +327,9 @@ module.exports.start = async function() {
   if (config.checkutf8 && notUtf8List.length > 0) {
     webhookList.push(`1. 非utf8文件数：${notUtf8List.length}个，占比${calc(notUtf8List.length, jsFiles.length)}`);
   }
-
+  if (readLabelCount > 0) {
+    webhookList.push(`1. 只读Label优化数：${readLabelCount}个，占比${calc(readLabelCount, gspxData.count)}`);
+  }
   if (bigList.length > 0) {
     webhookList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个，占比${calc(bigList.length, jsFiles.length)}`);
   }
@@ -486,6 +492,22 @@ module.exports.start = async function() {
     });
   }
 
+  if (readLabelCount > 0) {
+    detail.push(`# 只读Label清单如下`);
+    Object.keys(gspxData.labelList).forEach((key, index) => {
+      var ids = gspxData.labelList[key];
+
+      detail.push(`**${index + 1}. ${key}**`);
+      detail.push(`>建议优化Label明细: \`${ids.join('`、`')}\``);
+      detail.push("");
+      detail.push("| Label特性 | 优化建议 |");
+      detail.push("| ----- | ------ |");
+      ids.forEach((sid) => {
+        detail.push(`| ${sid} | 去掉ReadOnly |`);
+      });
+    });
+  }
+
   if (warnGspxCount > 0) {
     detail.push(`# 建议优化gspx清单如下`);
     Object.keys(gspxData.warnList).forEach((key, index) => {

package/tool/start.js

@@ -134,6 +134,7 @@ class Start {
 
       { name: '-ignoreCheck', type: 'array' },
       { name: '-ignoreAutoId', type: 'array' },
+      { name: '-autoId', type: 'boolean' },
       { name: '-childModList', type: 'array' },
       { name: '-globals', type: 'array' },