i18-fe-automator-beta 1.0.7 → 1.0.9

package/dist/commonjs/index.js

@@ -100,8 +100,9 @@ function importExcel({ uploadFilePath, token, env }) {
   return new Promise((resolve, reject) => {
     request(
       {
-        url: `https://${env === "pro" ? "" : `${env}-`
-          }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/importLangExcel`,
+        url: `https://${
+          env === "pro" ? "" : `${env}-`
+        }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/importLangExcel`,
         method: "POST",
         headers: {
           contentType: "multipart/form-data",
@@ -119,7 +120,9 @@ function importExcel({ uploadFilePath, token, env }) {
           resolve(true);
         } else {
           Loading$1.fail(`${env}: 导入文件失败`);
-          console.log(chalk.red(error || JSON.stringify(res.data)));
+          console.log(
+            chalk.red(error || (res.data ? JSON.stringify(res.data) : res.msg))
+          );
         }
       }
     );
@@ -165,8 +168,9 @@ function uploadExcel({ data, token, env }) {
   return new Promise((resolve, reject) => {
     request(
       {
-        url: `https://${env === "pro" ? "" : `${env}-`
-          }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/uploadI18nLangForFront`,
+        url: `https://${
+          env === "pro" ? "" : `${env}-`
+        }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/uploadI18nLangForFront`,
         method: "POST",
         json: true,
         headers: {
@@ -2029,7 +2033,7 @@ if (sass) {
   lint$1(lint, fix);
 } else if (lintc) {
   inquirer.prompt(rules).then(async ({ rule }) => {
-    const parentRule =rule;
+    const parentRule = rule;
     if (rule === "currency") {
       const ruleChoice = rules.find((item) => item.name === "rule");
       const currencySubChoice = ruleChoice.choices.find(
@@ -2037,8 +2041,8 @@ if (sass) {
       ).children;
       const { scene } = await inquirer.prompt(currencySubChoice);
       rule = scene;
-      if(rule==='customColumnModule'){
-        return customColumnModule(lintc,fix,rule,parentRule)
+      if (rule === "customColumnModule") {
+        return customColumnModule(lintc, fix, rule, parentRule);
       }
     }
     lint$1(lintc, fix, rule);
@@ -2161,7 +2165,9 @@ function translateUtil(appid, key, projectName, isLintFix) {
         if (isOk) {
           const reg1 = /key[\r\n\s]*:[\r\n\s]*('|")[\r\n\s]*('|")/g;
           let key = newAllArr.find(
-            (item) => item.path === fPath && item.ZH_CN === p1
+            (item) =>
+              item.path === fPath &&
+              (item.ZH_CN === p1 || item.ZH_CN === p1.trim()) // 去除前后空格,原[ 执行人: ]翻译变成[执行人:]
           ).key;
           // 去除{ slotxx }
           key = key.replace(/\{[\r\n\s]*slot\d[\r\n\s]*\}/g, "");
@@ -2204,7 +2210,7 @@ function translateUtil(appid, key, projectName, isLintFix) {
       groupArr = allArr;
     }
     console.log(chalk.green(`共有${groupArr.length}组数据需要翻译`));
-    if(!groupArr.length) return
+    if (!groupArr.length) return;
     const task = groupArr.map(async (item, index) => {
       let str = "";
       item.forEach((item1, index1) => {
@@ -2219,11 +2225,30 @@ function translateUtil(appid, key, projectName, isLintFix) {
       groupArr.forEach((item, index) => {
         Array.prototype.push.apply(newAllArr, item);
       });
+      // 如果中文不同,但翻译的英文相同(比如商品品类和商品类别翻译的英文都是Product Category),对key进行自动+1
+      for (let i = 0; i < newAllArr.length; i++) {
+        let num = 0;
+        for (let j = 0; j < newAllArr.length; j++) {
+          // key存在且不能为空
+          if (newAllArr[j].key && newAllArr[i].key) {
+            if (
+              newAllArr[j].key === newAllArr[i].key &&
+              newAllArr[j].ZH_CN !== newAllArr[i].ZH_CN
+            ) {
+              num++;
+              newAllArr[j].key = newAllArr[j].key + num;
+            }
+          }
+        }
+      }
       readFolder(true);
-
+      // 如果key相等去重
+      const uniqueArr = Array.from(
+        new Map(newAllArr.map((item) => [item.key, item])).values()
+      );
       let exportData = [];
       // key中有debug排后面
-      const sortNewAllArr = _.sortBy(newAllArr, function (item) {
+      const sortNewAllArr = _.sortBy(uniqueArr, function (item) {
         return item.key.indexOf("debug") > -1;
       });
       sortNewAllArr.forEach((item, index) => {
@@ -2288,7 +2313,7 @@ function translateUtil(appid, key, projectName, isLintFix) {
       }
       const buffer = xlsx.build([{ data: exportData }]);
       fs.writeFileSync(`./export.xlsx`, buffer, "binary");
-      console.log(chalk.green(`${isMerge?"合并":"覆盖"}文件成功`));
+      console.log(chalk.green(`${isMerge ? "合并" : "覆盖"}文件成功`));
     });
   }
 
@@ -2317,9 +2342,14 @@ function translateUtil(appid, key, projectName, isLintFix) {
           if (resBody.trans_result) {
             console.log(`ok`);
             let result = resBody.trans_result || [];
+
             item.forEach((item1, index1) => {
               const id = uuid.v5(item1.path, uuid.v5.URL).slice(0, 6);
-              if (result[index1] && result[index1].src === item1.ZH_CN) {
+              if (
+                result[index1] &&
+                (result[index1].src === item1.ZH_CN ||
+                  result[index1].src === item1.ZH_CN.trim()) // 去除前后空格,原[ 执行人: ]翻译变成[执行人:]
+              ) {
                 // 删除str中的单引号或双引号或斜杠或逗号
                 let str = result[index1].dst
                   .replace(/\'/g, "")
@@ -2330,7 +2360,7 @@ function translateUtil(appid, key, projectName, isLintFix) {
                 const s = str.split(" ");
                 let key = s
                   .map((item, index) => {
-                    return item?( item[0].toUpperCase() + item.slice(1)):item;
+                    return item ? item[0].toUpperCase() + item.slice(1) : item;
                   })
                   .join("");
                 // 去除key中的标点符号

package/dist/esm/index.mjs

@@ -78,8 +78,9 @@ function importExcel({ uploadFilePath, token, env }) {
   return new Promise((resolve, reject) => {
     request(
       {
-        url: `https://${env === "pro" ? "" : `${env}-`
-          }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/importLangExcel`,
+        url: `https://${
+          env === "pro" ? "" : `${env}-`
+        }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/importLangExcel`,
         method: "POST",
         headers: {
           contentType: "multipart/form-data",
@@ -97,7 +98,9 @@ function importExcel({ uploadFilePath, token, env }) {
           resolve(true);
         } else {
           Loading$1.fail(`${env}: 导入文件失败`);
-          console.log(chalk.red(error || JSON.stringify(res.data)));
+          console.log(
+            chalk.red(error || (res.data ? JSON.stringify(res.data) : res.msg))
+          );
         }
       }
     );
@@ -143,8 +146,9 @@ function uploadExcel({ data, token, env }) {
   return new Promise((resolve, reject) => {
     request(
       {
-        url: `https://${env === "pro" ? "" : `${env}-`
-          }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/uploadI18nLangForFront`,
+        url: `https://${
+          env === "pro" ? "" : `${env}-`
+        }hxjf.hongxinshop.com/vue-api/api-globalization/api/i18n/uploadI18nLangForFront`,
         method: "POST",
         json: true,
         headers: {
@@ -2007,7 +2011,7 @@ if (sass) {
   lint$1(lint, fix);
 } else if (lintc) {
   inquirer.prompt(rules).then(async ({ rule }) => {
-    const parentRule =rule;
+    const parentRule = rule;
     if (rule === "currency") {
       const ruleChoice = rules.find((item) => item.name === "rule");
       const currencySubChoice = ruleChoice.choices.find(
@@ -2015,8 +2019,8 @@ if (sass) {
       ).children;
       const { scene } = await inquirer.prompt(currencySubChoice);
       rule = scene;
-      if(rule==='customColumnModule'){
-        return customColumnModule(lintc,fix,rule,parentRule)
+      if (rule === "customColumnModule") {
+        return customColumnModule(lintc, fix, rule, parentRule);
       }
     }
     lint$1(lintc, fix, rule);
@@ -2139,7 +2143,9 @@ function translateUtil(appid, key, projectName, isLintFix) {
         if (isOk) {
           const reg1 = /key[\r\n\s]*:[\r\n\s]*('|")[\r\n\s]*('|")/g;
           let key = newAllArr.find(
-            (item) => item.path === fPath && item.ZH_CN === p1
+            (item) =>
+              item.path === fPath &&
+              (item.ZH_CN === p1 || item.ZH_CN === p1.trim()) // 去除前后空格,原[ 执行人: ]翻译变成[执行人:]
           ).key;
           // 去除{ slotxx }
           key = key.replace(/\{[\r\n\s]*slot\d[\r\n\s]*\}/g, "");
@@ -2182,7 +2188,7 @@ function translateUtil(appid, key, projectName, isLintFix) {
       groupArr = allArr;
     }
     console.log(chalk.green(`共有${groupArr.length}组数据需要翻译`));
-    if(!groupArr.length) return
+    if (!groupArr.length) return;
     const task = groupArr.map(async (item, index) => {
       let str = "";
       item.forEach((item1, index1) => {
@@ -2197,11 +2203,30 @@ function translateUtil(appid, key, projectName, isLintFix) {
       groupArr.forEach((item, index) => {
         Array.prototype.push.apply(newAllArr, item);
       });
+      // 如果中文不同,但翻译的英文相同(比如商品品类和商品类别翻译的英文都是Product Category),对key进行自动+1
+      for (let i = 0; i < newAllArr.length; i++) {
+        let num = 0;
+        for (let j = 0; j < newAllArr.length; j++) {
+          // key存在且不能为空
+          if (newAllArr[j].key && newAllArr[i].key) {
+            if (
+              newAllArr[j].key === newAllArr[i].key &&
+              newAllArr[j].ZH_CN !== newAllArr[i].ZH_CN
+            ) {
+              num++;
+              newAllArr[j].key = newAllArr[j].key + num;
+            }
+          }
+        }
+      }
       readFolder(true);
-
+      // 如果key相等去重
+      const uniqueArr = Array.from(
+        new Map(newAllArr.map((item) => [item.key, item])).values()
+      );
       let exportData = [];
       // key中有debug排后面
-      const sortNewAllArr = _.sortBy(newAllArr, function (item) {
+      const sortNewAllArr = _.sortBy(uniqueArr, function (item) {
         return item.key.indexOf("debug") > -1;
       });
       sortNewAllArr.forEach((item, index) => {
@@ -2266,7 +2291,7 @@ function translateUtil(appid, key, projectName, isLintFix) {
       }
       const buffer = xlsx.build([{ data: exportData }]);
       fs.writeFileSync(`./export.xlsx`, buffer, "binary");
-      console.log(chalk.green(`${isMerge?"合并":"覆盖"}文件成功`));
+      console.log(chalk.green(`${isMerge ? "合并" : "覆盖"}文件成功`));
     });
   }
 
@@ -2295,9 +2320,14 @@ function translateUtil(appid, key, projectName, isLintFix) {
           if (resBody.trans_result) {
             console.log(`ok`);
             let result = resBody.trans_result || [];
+
             item.forEach((item1, index1) => {
               const id = v5(item1.path, v5.URL).slice(0, 6);
-              if (result[index1] && result[index1].src === item1.ZH_CN) {
+              if (
+                result[index1] &&
+                (result[index1].src === item1.ZH_CN ||
+                  result[index1].src === item1.ZH_CN.trim()) // 去除前后空格,原[ 执行人: ]翻译变成[执行人:]
+              ) {
                 // 删除str中的单引号或双引号或斜杠或逗号
                 let str = result[index1].dst
                   .replace(/\'/g, "")
@@ -2308,7 +2338,7 @@ function translateUtil(appid, key, projectName, isLintFix) {
                 const s = str.split(" ");
                 let key = s
                   .map((item, index) => {
-                    return item?( item[0].toUpperCase() + item.slice(1)):item;
+                    return item ? item[0].toUpperCase() + item.slice(1) : item;
                   })
                   .join("");
                 // 去除key中的标点符号

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18-fe-automator-beta",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "i18-fe-automator-beta内测版本,只用于key: ''替换、检测中文规则等",
   "type": "module",
   "bin": {