i18-fe-automator-beta 1.0.2 → 1.0.4

package/dist/commonjs/index.js

@@ -1317,8 +1317,16 @@ var noSingleCurrencyRule = {
 /** @type {import('eslint').Rule.RuleModule} */
 const tagNameList = ["hx-search-list-page", "HxSearchListPage"];
 const attrNameList = ["custom-column-module", "customColumnModule"];
-const moduleArr = new Set();
-const getModuleArr = () => [...moduleArr];
+const moduleArr = [];
+const getModuleArr = () => moduleArr;
+const addModule = (moduleObj) => {
+  const isExist= moduleArr.some((item) => {
+    return item.module === moduleObj.module
+  });
+  if(!isExist){
+    moduleArr.push(moduleObj);
+  }
+};
 
 var noSingleCustomColumnModule = {
   meta: {
@@ -1357,7 +1365,7 @@ var noSingleCustomColumnModule = {
                 attr.value?.expression?.type === "Literal"
               ) {
                 const value = attr.value.expression.value;
-                moduleArr.add({
+                addModule({
                   module: value,
                   path: getPath(attr.loc),
                 });
@@ -1366,7 +1374,7 @@ var noSingleCustomColumnModule = {
                 attr.value.type === "VLiteral"
               ) {
                 const value = attr.value.value;
-                moduleArr.add({
+                addModule({
                   module: +value,
                   path: getPath(attr.loc),
                 });
@@ -1374,7 +1382,7 @@ var noSingleCustomColumnModule = {
                 attrNameList.includes(attr.key?.argument?.rawName) ||
                 attrNameList.includes(attr.key?.rawName)
               ) {
-                moduleArr.add({
+                addModule({
                   module: sourceCode.getText(attr.value.expression),
                   path: getPath(attr.loc),
                   isDynamics: true, // 变量
@@ -1397,12 +1405,12 @@ var noSingleCustomColumnModule = {
               if (attrNameList.includes(attr?.name?.name)) {
                 if (attr.value?.expression?.type === "Literal") {
                   const value = attr.value.expression.value;
-                  moduleArr.add({
+                  addModule({
                     module: value,
                     path: getPath(attr.loc),
                   });
                 } else {
-                  moduleArr.add({
+                  addModule({
                     module: sourceCode.getText(attr.value.expression),
                     path: getPath(attr.loc),
                     isDynamics: true, // 变量
@@ -1412,11 +1420,40 @@ var noSingleCustomColumnModule = {
             });
           }
         },
+        // $customColumnDialog
+        CallExpression(node) {
+          if (node.callee?.property?.name === "$customColumnDialog") {
+            const property = node.arguments[0]?.properties[0];
+            if (property.key.name === "module") {
+              if (property.value.type === "Literal") {
+                addModule({
+                  module: property.value.value,
+                  path: getPath(property.loc),
+                });
+              } else if (property.value.type === "ConditionalExpression") {
+                getConditionValue(property.value.consequent, moduleArr,getPath);
+                getConditionValue(property.value.alternate, moduleArr,getPath);
+              }
+            }
+          }
+        },
       }
     );
   },
 };
 
+function getConditionValue(node, moduleArr,getPath) {
+  if (node.type === "Literal") {
+    addModule({
+      module: node.value,
+      path: getPath(node.loc),
+    });
+  }else if (node.type === "ConditionalExpression") {
+    getConditionValue(node.consequent, moduleArr,getPath);
+    getConditionValue(node.alternate, moduleArr,getPath);
+  }
+}
+
 /**
  * @fileoverview 国际化
  * @author ypf
@@ -1746,7 +1783,7 @@ async function customColumnModule (lintc, fix, rule, parentRule) {
       type: "list",
       choices: [
         {
-          name: "自动检测HxSearchListPage的自定义列ID",
+          name: "自动检测HxSearchListPage、this.$customColumnDialog的自定义列ID",
           value: "normal",
         },
         {
@@ -1764,7 +1801,7 @@ async function customColumnModule (lintc, fix, rule, parentRule) {
         const normalArr = arr.filter((item) => !item.isDynamics);
 
         return new Promise((resolve) => {
-          Loading.succeed(`检测完成,${arr.length?'':'未'}匹配到规则`);
+          Loading.succeed(`检测完成,${arr.length ? "" : "未"}匹配到规则`);
           if (arr.length) {
             getColumn(normalArr, dynamicsArr, parentRule);
           }
@@ -1789,7 +1826,7 @@ async function customColumnModule (lintc, fix, rule, parentRule) {
   }
 }
 
-async function getColumn(moduleArr = [], dynamicsArr = [],parentRule) {
+async function getColumn(moduleArr = [], dynamicsArr = [], parentRule) {
   const token = await login({
     env: "sit",
     username: "superAdmin",
@@ -1866,42 +1903,56 @@ async function getColumn(moduleArr = [], dynamicsArr = [],parentRule) {
         return 1;
       }
     });
-    const successTableData = []; // 成功的数据
+    const successModuleArr = new Set();
+
     const naTableData = [];
+    const naModuleArr = new Set();
+
     const noNaTableData = [];
+    const noNaModuleArr =  new Set();
+
     const errorTableData = []; // 失败的数据
+    const errorModuleArr =  new Set();
+    
     tableData.forEach((item) => {
       if (item.field === "error") {
         errorTableData.push(item);
+        item.module && errorModuleArr.add(item.module);
       } else {
         if (item.field === "NA") {
           naTableData.push(item);
+          item.module &&naModuleArr.add(item.module);
         } else {
           noNaTableData.push(item);
+          item.module &&noNaModuleArr.add(item.module);
         }
-        successTableData.push(item);
+        item.module &&successModuleArr.add(item.module);
       }
     });
 
     console.log(
       chalk.green(
-        `共${tableData.length}个moduleId, 成功${
-          successTableData.length
-        }个(规则命中${noNaTableData.length}个, ${chalk.yellow(
-          `未命中${naTableData.length}个`
+        `共${moduleArr.length + dynamicsArr.length}个moduleId, 请求成功${
+          successModuleArr.size
+        }个(其中规则命中${noNaModuleArr.size}个, ${chalk.yellow(
+          `未命中${naModuleArr.size}个`
         )}),`
-      ) + chalk.red(`失败${errorTableData.length}个`)
+      ) + chalk.red(`请求失败${errorModuleArr.size}个`)
     );
+    console.log(chalk.green(`🚀🚀🚀🚀🚀共匹配到${noNaTableData.length+errorTableData.length}个字段🚀🚀🚀🚀🚀`));
+    
     if (noNaTableData.length) {
-      console.log(chalk.green(`成功命中规则`));
+      console.log(chalk.green(`成功命中字段${noNaTableData.length}个`));
       console.table(noNaTableData);
     }
     if (errorTableData.length) {
-      console.log(chalk.red(`失败,需手动处理或重试`));
+      console.log(chalk.red(`失败,需手动处理或重试${errorTableData.length}个`));
       console.table(errorTableData);
     }
     if (naTableData.length) {
-      console.log(chalk.yellow(`成功但未命中规则,无需处理`));
+      console.log(
+        chalk.yellow(`成功但未命中字段,无需处理${naTableData.length}个`)
+      );
       console.table(naTableData);
     }
   });

package/dist/esm/index.mjs

@@ -1295,8 +1295,16 @@ var noSingleCurrencyRule = {
 /** @type {import('eslint').Rule.RuleModule} */
 const tagNameList = ["hx-search-list-page", "HxSearchListPage"];
 const attrNameList = ["custom-column-module", "customColumnModule"];
-const moduleArr = new Set();
-const getModuleArr = () => [...moduleArr];
+const moduleArr = [];
+const getModuleArr = () => moduleArr;
+const addModule = (moduleObj) => {
+  const isExist= moduleArr.some((item) => {
+    return item.module === moduleObj.module
+  });
+  if(!isExist){
+    moduleArr.push(moduleObj);
+  }
+};
 
 var noSingleCustomColumnModule = {
   meta: {
@@ -1335,7 +1343,7 @@ var noSingleCustomColumnModule = {
                 attr.value?.expression?.type === "Literal"
               ) {
                 const value = attr.value.expression.value;
-                moduleArr.add({
+                addModule({
                   module: value,
                   path: getPath(attr.loc),
                 });
@@ -1344,7 +1352,7 @@ var noSingleCustomColumnModule = {
                 attr.value.type === "VLiteral"
               ) {
                 const value = attr.value.value;
-                moduleArr.add({
+                addModule({
                   module: +value,
                   path: getPath(attr.loc),
                 });
@@ -1352,7 +1360,7 @@ var noSingleCustomColumnModule = {
                 attrNameList.includes(attr.key?.argument?.rawName) ||
                 attrNameList.includes(attr.key?.rawName)
               ) {
-                moduleArr.add({
+                addModule({
                   module: sourceCode.getText(attr.value.expression),
                   path: getPath(attr.loc),
                   isDynamics: true, // 变量
@@ -1375,12 +1383,12 @@ var noSingleCustomColumnModule = {
               if (attrNameList.includes(attr?.name?.name)) {
                 if (attr.value?.expression?.type === "Literal") {
                   const value = attr.value.expression.value;
-                  moduleArr.add({
+                  addModule({
                     module: value,
                     path: getPath(attr.loc),
                   });
                 } else {
-                  moduleArr.add({
+                  addModule({
                     module: sourceCode.getText(attr.value.expression),
                     path: getPath(attr.loc),
                     isDynamics: true, // 变量
@@ -1390,11 +1398,40 @@ var noSingleCustomColumnModule = {
             });
           }
         },
+        // $customColumnDialog
+        CallExpression(node) {
+          if (node.callee?.property?.name === "$customColumnDialog") {
+            const property = node.arguments[0]?.properties[0];
+            if (property.key.name === "module") {
+              if (property.value.type === "Literal") {
+                addModule({
+                  module: property.value.value,
+                  path: getPath(property.loc),
+                });
+              } else if (property.value.type === "ConditionalExpression") {
+                getConditionValue(property.value.consequent, moduleArr,getPath);
+                getConditionValue(property.value.alternate, moduleArr,getPath);
+              }
+            }
+          }
+        },
       }
     );
   },
 };
 
+function getConditionValue(node, moduleArr,getPath) {
+  if (node.type === "Literal") {
+    addModule({
+      module: node.value,
+      path: getPath(node.loc),
+    });
+  }else if (node.type === "ConditionalExpression") {
+    getConditionValue(node.consequent, moduleArr,getPath);
+    getConditionValue(node.alternate, moduleArr,getPath);
+  }
+}
+
 /**
  * @fileoverview 国际化
  * @author ypf
@@ -1724,7 +1761,7 @@ async function customColumnModule (lintc, fix, rule, parentRule) {
       type: "list",
       choices: [
         {
-          name: "自动检测HxSearchListPage的自定义列ID",
+          name: "自动检测HxSearchListPage、this.$customColumnDialog的自定义列ID",
           value: "normal",
         },
         {
@@ -1742,7 +1779,7 @@ async function customColumnModule (lintc, fix, rule, parentRule) {
         const normalArr = arr.filter((item) => !item.isDynamics);
 
         return new Promise((resolve) => {
-          Loading.succeed(`检测完成,${arr.length?'':'未'}匹配到规则`);
+          Loading.succeed(`检测完成,${arr.length ? "" : "未"}匹配到规则`);
           if (arr.length) {
             getColumn(normalArr, dynamicsArr, parentRule);
           }
@@ -1767,7 +1804,7 @@ async function customColumnModule (lintc, fix, rule, parentRule) {
   }
 }
 
-async function getColumn(moduleArr = [], dynamicsArr = [],parentRule) {
+async function getColumn(moduleArr = [], dynamicsArr = [], parentRule) {
   const token = await login({
     env: "sit",
     username: "superAdmin",
@@ -1844,42 +1881,56 @@ async function getColumn(moduleArr = [], dynamicsArr = [],parentRule) {
         return 1;
       }
     });
-    const successTableData = []; // 成功的数据
+    const successModuleArr = new Set();
+
     const naTableData = [];
+    const naModuleArr = new Set();
+
     const noNaTableData = [];
+    const noNaModuleArr =  new Set();
+
     const errorTableData = []; // 失败的数据
+    const errorModuleArr =  new Set();
+    
     tableData.forEach((item) => {
       if (item.field === "error") {
         errorTableData.push(item);
+        item.module && errorModuleArr.add(item.module);
       } else {
         if (item.field === "NA") {
           naTableData.push(item);
+          item.module &&naModuleArr.add(item.module);
         } else {
           noNaTableData.push(item);
+          item.module &&noNaModuleArr.add(item.module);
         }
-        successTableData.push(item);
+        item.module &&successModuleArr.add(item.module);
       }
     });
 
     console.log(
       chalk.green(
-        `共${tableData.length}个moduleId, 成功${
-          successTableData.length
-        }个(规则命中${noNaTableData.length}个, ${chalk.yellow(
-          `未命中${naTableData.length}个`
+        `共${moduleArr.length + dynamicsArr.length}个moduleId, 请求成功${
+          successModuleArr.size
+        }个(其中规则命中${noNaModuleArr.size}个, ${chalk.yellow(
+          `未命中${naModuleArr.size}个`
         )}),`
-      ) + chalk.red(`失败${errorTableData.length}个`)
+      ) + chalk.red(`请求失败${errorModuleArr.size}个`)
     );
+    console.log(chalk.green(`🚀🚀🚀🚀🚀共匹配到${noNaTableData.length+errorTableData.length}个字段🚀🚀🚀🚀🚀`));
+    
     if (noNaTableData.length) {
-      console.log(chalk.green(`成功命中规则`));
+      console.log(chalk.green(`成功命中字段${noNaTableData.length}个`));
       console.table(noNaTableData);
     }
     if (errorTableData.length) {
-      console.log(chalk.red(`失败,需手动处理或重试`));
+      console.log(chalk.red(`失败,需手动处理或重试${errorTableData.length}个`));
       console.table(errorTableData);
     }
     if (naTableData.length) {
-      console.log(chalk.yellow(`成功但未命中规则,无需处理`));
+      console.log(
+        chalk.yellow(`成功但未命中字段,无需处理${naTableData.length}个`)
+      );
       console.table(naTableData);
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18-fe-automator-beta",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "i18-fe-automator-beta内测版本,只用于key: ''替换、检测中文规则等",
   "type": "module",
   "bin": {
@@ -29,7 +29,7 @@
     "eslint": "^8.57.0",
     "espree": "9.6.1",
     "glob": "^10.3.10",
-    "inquirer": "9.2.14",
+    "inquirer": "8.2.6",
     "js-md5": "^0.8.3",
     "lodash": "^4.17.21",
     "nanoid": "3.3.7",