crabatool 1.0.93 → 1.0.96

package/.eslintrc.json

@@ -59,6 +59,7 @@
         "$removeHandler": "readonly",
         "getClientBounds": "readonly",
         "echarts": "readonly",
-        "SysConsts": "readonly"
+        "SysConsts": "readonly",
+        "math": "readonly"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.93",
+  "version": "1.0.96",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -41,8 +41,10 @@ var config = {
 
   Debug: true,
 
+  // 告诉助手项目有哪些是全局变量，不然会提示未定义
   globals: ['crabadoc', 'Type', 'CrabaMarkdown', '$doc', 'www', 'crabaJs'],
 
+  // 告诉助手项目有哪些js忽略语法检查，可以填目录
   ignoreCheck: ['js/lib/highlight.min.js', 'js/lib/markdown-it.min.js', 'Pages/Component.min.js'],
 
   // 配置js语法检测报告推送地址

package/tool/checkjs.js

@@ -14,7 +14,7 @@ var fileSize = 300;
 // 默认忽略大小的文件
 var blackList = ['agency.js', 'craba.min.js', 'crabaEx.min.js', 'crabaNgp.js', 'echarts-all.js', 'echarts.min.js', 'math.min.js', 'craba.rollup.min.js'];
 // 语法规则，不能包含这些关键词
-var dangerousJs = ['\\slet\\s', '\\sconst\\s', '\=\>\\s?\\(?\\{', '\\sasync\\s', '\\sawait\\s', '\\.then\\(', '\\sdebugger\\s', 'for\\s?\\(.*?\\sin.*?\\)'];
+var dangerousJs = ['\\slet\\s', '\\sconst\\s', '\=\>\\s?\\(?\\{', '\\sasync\\s', '\\sawait\\s', '\\.then\\(', '\\sdebugger\\s', 'for\\s*\\(\\s*var\\s*\\w+\\s*in'];
 
 // gspx无用标签的修改建议
 var warnTagsInfo = {
@@ -89,12 +89,16 @@ module.exports.start = async function() {
     var errInfo = { list: [] };
     if (eslintResults.length > 0 && eslintResults[0].errorCount > 0) {
       var res = eslintResults[0];
-      errList.push(filePath);
-      errRegList.push(errInfo);
-
       res.messages.forEach((item) => {
+        var reg = new RegExp(/'\$\w+'\sis\snot\sdefined\./);
+        if (reg.test(item.message)) return; // $字符开头的全局变量不输出
         errInfo.list.push({ char: item.ruleId + '，' + item.messageId, line: item.line, endLine: item.endLine, column: item.column, msg: item.message });
       });
+
+      if (errInfo.list.length > 0) {
+        errList.push(filePath);
+        errRegList.push(errInfo);
+      }
     }
 
     // ------检查语法1--------

package/tool/install.js

@@ -71,24 +71,35 @@ class Install {
     var xmldata = JSON.parse(xmljs.xml2json(xml, { compact: true, spaces: 2 }));
 
     var add = false;
+    var save = false;
     var xn = utils.selectSingleNode(xmldata, "/application/component/extensionMap");
     if (!xn) {
-      xn = { mapping: [] };
+      xn = { mapping: { _attributes: { ext: 'gspx', type: 'XML' } } };
       utils.addSingleNode(xmldata, "/application/component/extensionMap", xn);
-      add = true;
+      save = true;
     } else {
-      if (!xn.mapping) xn.mapping = [];
-      var child = xn.mapping.filter(data => { return data._attributes.ext == 'gspx'; });
-      if (child.length == 0) add = true;
+      if (!xn.mapping) xn.mapping = { _attributes: { ext: 'gspx', type: 'XML' } };
+
+      if (xn.mapping instanceof Array) {
+        var child = xn.mapping.filter(data => { return data._attributes.ext == 'gspx'; });
+        add = child.length == 0;
+      } else if (xn.mapping._attributes.ext == 'gspx') {
+        xn.mapping._attributes.type = 'XML';
+        save = true;
+      } else {
+        var old = JSON.parse(JSON.stringify(xn.mapping));
+        xn.mapping = [];
+        xn.mapping.push(old);
+        add = true;
+      }
     }
 
     if (add) {
-      xn.mapping.push({
-        _attributes: {
-          ext: 'gspx', type: 'XML'
-        }
-      });
+      xn.mapping.push({ _attributes: { ext: 'gspx', type: 'XML' } });
+      save = true;
+    }
 
+    if (save) {
       xml = xmljs.json2xml(xmldata, { compact: true, ignoreComment: true, spaces: 2 });
       fs.writeFileSync(fileTypes, xml);
     }