crabatool 1.0.435 → 1.0.437

package/package.json

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

package/tool/checkgspx.js

@@ -9,6 +9,7 @@ module.exports.getResults = function() {
   var data = {
     count: 0,
     tags: {},
+    bizList: {},
     tagList: [],
     customs1: {},
     customs2: {},
@@ -49,6 +50,7 @@ function readGspxToJSON(fileName, data) {
   if (!byte.toString().trim().startsWith('<?xml')) {
     data.errorList.push({ fileName: fileName, tag: '', error: 'gspx文件第一行必须是:<?xml version="1.0" encoding="UTF-8"?>' });
   }
+  fileName = utils.joinSep(fileName.replaceAll('\\', '/'));
 
   function HtmlParser2ToXml(xml) {
     var parser = new htmlparser2.Parser({
@@ -65,25 +67,35 @@ function readGspxToJSON(fileName, data) {
           data.tags[name]++;
         }
 
-        // 统计customs
-        if (name == 'CustomControl' && config.checkCustomControl) {
-          if (attrs.Src) {
-            // 统计当前页面引用了哪些CustomControl
-            var key1 = utils.joinSep(fileName.replaceAll('\\', '/'));
-            var key2 = utils.joinSep(attrs.Src.replace('~', '').replace('..',''));
-            if (!data.customs1[key1]) {
-              data.customs1[key1] = [];
+        if (config.checkCustomControl) {
+          // 统计customs
+          if (name == 'CustomControl') {
+            if (attrs.Src) {
+              // 统计当前页面引用了哪些CustomControl
+              var key2 = utils.joinSep(attrs.Src.replace('~', '').replace('..', ''));
+              if (!data.customs1[fileName]) {
+                data.customs1[fileName] = [];
+              }
+              data.customs1[fileName].push(key2);
+
+              // 统计某个CustomControl被哪些页面引用
+              if (!data.customs2[key2]) {
+                data.customs2[key2] = [];
+              }
+              data.customs2[key2].push(fileName);
             }
-            data.customs1[key1].push(key2);
+          }
 
-            // 统计某个CustomControl被哪些页面引用
-            if (!data.customs2[key2]) {
-              data.customs2[key2] = [];
+          for (var key in attrs) {
+            if (key == 'Business') {
+              addBiz(data.bizList, attrs[key], fileName);
+              break;
+            } else if (key == 'BusinessEx') {
+              addBiz(data.bizList, attrs[key], fileName);
+              break;
             }
-            data.customs2[key2].push(key1);
           }
         }
-
         // 建议优化页面汇总
         if (warnTags.includes(name)) {
           if (name == 'CancelButton' || name == 'CloseButton') {
@@ -129,4 +141,21 @@ function readGspxToJSON(fileName, data) {
   HtmlParser2ToXml(gspxXML);
 
   return rootNode;
+}
+
+function addBiz(bizList, bizName, fileName) {
+  if (!bizName) return;
+  try {
+    var s = bizName.replaceAll("'", '"');
+    var bizData = JSON.parse(s);
+    bizName = bizData.Name;
+  } catch (ex) { }
+
+  if (bizName.indexOf('.') < 0) {
+    bizName = config.modName + '.' + bizName;
+  }
+  if (!bizList[bizName]) {
+    bizList[bizName] = [];
+  }
+  bizList[bizName].push(fileName);
 }

package/tool/checkjs.js

@@ -732,7 +732,7 @@ function postReportData(data) {
 }
 
 function postBaseData(data0, gspxData) {
-  if(!config.checkCustomControl){
+  if (!config.checkCustomControl) {
     return;
   }
   axios({
@@ -741,6 +741,7 @@ function postBaseData(data0, gspxData) {
     data: {
       customs1: gspxData.customs1,
       customs2: gspxData.customs2,
+      bizList: gspxData.bizList,
       branchName: data0.branchName,
       projectName: data0.projectName
     },