gc_i18n 1.2.6 → 1.2.8

package/packages/components/config.vue

@@ -1,11 +1,6 @@
 <script lang="jsx">
 import _ from "lodash-es";
-import {
-  getAllTranslate,
-  getLanguages,
-  saveTranslate,
-  userDicts
-} from "../libs/service";
+import { getLanguages, saveTranslate, userDicts } from "../libs/service";
 import { Message, Tooltip } from "view-ui-plus";
 import store2 from "store2";
 
@@ -36,67 +31,23 @@ export default {
 
     columns() {
       let arr = [
-        // this.type === "pageData"
-        //   ? [
-        //       {
-        //         title: "状态",
-        //         width: 100,
-        //         key: "icon",
-        //         fixed: "left",
-        //         render: (h, { row }) => {
-        //           return row.localhost ? (
-        //             <span style={{ color: "red" }}>
-        //               <span style={{ marginRight: "2px" }}>本地</span>
-        //               <Tooltip
-        //                 content="该字段未在翻译数据库中"
-        //                 placement="top"
-        //                 transfer
-        //               >
-        //                 <Icon type="ios-alert-outline" />
-        //               </Tooltip>
-        //             </span>
-        //           ) : row.page === this.name ? (
-        //             <span style={{ color: "green" }}>当前页</span>
-        //           ) : (
-        //             <span>
-        //               全局{" "}
-        //               <Tooltip
-        //                 maxWidth={150}
-        //                 content="编辑该字段转化为当前页,不会覆盖全局"
-        //                 placement="top"
-        //                 transfer
-        //               >
-        //                 <Icon type="ios-alert-outline" />
-        //               </Tooltip>
-        //             </span>
-        //           );
-        //         }
-        //       },
-        //       {
-        //         title: "关键词",
-        //         fixed: "left",
-        //         width: 90,
-        //         key: "dictKey"
-        //       }
-        //     ]
-        //   : [
-        {
-          title: "状态",
-          fixed: "left",
-          width: 90,
-          key: "page",
-          render: (h, { row }) => {
-            return h(
-              "span",
-              {},
-              row.page === "common"
-                ? "全局"
-                : row.page === this.name
-                ? "当前页"
-                : "登录页"
-            );
-          }
-        },
+        // {
+        //   title: "状态",
+        //   fixed: "left",
+        //   width: 90,
+        //   key: "page",
+        //   render: (h, { row }) => {
+        //     return h(
+        //       "span",
+        //       {},
+        //       row.page === "common"
+        //         ? "全局"
+        //         : row.page === this.name
+        //         ? "当前页"
+        //         : "登录页"
+        //     );
+        //   }
+        // },
         {
           title: "关键词",
           fixed: "left",
@@ -106,7 +57,7 @@ export default {
       ];
       _.map(this.languages, (lang) => {
         const key = lang.code;
-        if (!lang.unChecked) {
+        if (lang.checked) {
           return arr.push({
             title: lang.name,
             key,
@@ -119,7 +70,6 @@ export default {
                   onOnChange={(e) => {
                     const value = e.target.value;
                     const { dictKey } = row;
-                    console.log("dictKey", dictKey);
                     const findIndex = _.findIndex(this.mySaveData, { dictKey });
 
                     if (findIndex > -1) {
@@ -150,6 +100,7 @@ export default {
     appCode: String,
     setLanguage: Function,
     token: String,
+    baseUrl: String, // 基础URL
     translationKeys: Array,
     loginRouteName: String, // 登录页路由名称
     loginTranslationKeys: Array, // 登录页翻译键
@@ -163,12 +114,10 @@ export default {
     saveLanguageSetting(val) {
       const settings = _.map(
         _.filter(this.languages, (val) => {
-          return val.unChecked;
+          return val.checked;
         }),
         "code"
       );
-      console.log("settings", settings);
-
       store2.set("I18N_LANGUAGE_SETTING", settings);
     },
     handleLanguageSettingOpen() {
@@ -220,14 +169,15 @@ export default {
         Message.error({ content: "没有需要保存的数据" });
         return;
       }
-      const res = await saveTranslate(
-        {
+      const res = await saveTranslate({
+        baseUrl: this.baseUrl,
+        data: {
           appCode: this.appCode,
           isLocal: "F",
           data
         },
-        this.token
-      );
+        token: this.token
+      });
       if (res && res.data.result === 0) {
         Message.success({ content: msg ? msg : res.data.msg });
         // 更新到本地缓存
@@ -273,8 +223,9 @@ export default {
     },
     async search(data, type) {
       this.loading = true;
-      const res = await userDicts(
-        {
+      const res = await userDicts({
+        baseUrl: this.baseUrl,
+        data: {
           appCode: this.appCode,
           searchBlur: this.searchText,
           commaSeparatedLangs: _.map(this.languages, "code").toString(),
@@ -287,8 +238,8 @@ export default {
           pageSize: 10,
           ...data
         },
-        this.token
-      );
+        token: this.token
+      });
       if (res) {
         this.initialData = _.cloneDeep(res.data.retVal.datas);
         let data = res.data.retVal.datas;
@@ -312,15 +263,23 @@ export default {
       }
     },
     async init() {
-      const res = await getLanguages(this.token);
+      let settingLanguages = store2.get("I18N_LANGUAGE_SETTING");
+      const res = await getLanguages({
+        token: this.token,
+        baseUrl: this.baseUrl
+      });
       if (res && res.data.result == 0) {
         let arr = res.data.retVal;
+        if (_.isEmpty(settingLanguages)) {
+          settingLanguages = ["zh-CN", "en-US", "zh-TW"];
+        }
         _.map(arr, (val) => {
-          if (_.includes(store2.get("I18N_LANGUAGE_SETTING"), val.code)) {
-            val.unChecked = true;
+          if (_.includes(settingLanguages, val.code)) {
+            val.checked = true;
           }
         });
         this.languages = arr;
+
         this.getPageData();
       } else {
         Message.error("获取语言失败,出错了");
@@ -421,10 +380,8 @@ export default {
                       :key="lang.code"
                     >
                       <Checkbox
-                        v-model="lang.unChecked"
+                        v-model="lang.checked"
                         @on-change="saveLanguageSetting"
-                        :true-value="false"
-                        :false-value="true"
                       >
                         <span>{{ lang.name }}</span>
                       </Checkbox>

package/packages/index.js

@@ -51,6 +51,9 @@ export default class I18n {
     this.login = login;
     this.loginTranslationKeys = [];
     this.keyboard = keyboard || "shift>t";
+    this.baseUrl = options.dev
+      ? "https://test.ihotel.cn"
+      : "https://trans.ihotel.cn";
     // 初始化路由守卫
     this.initRouterGuards();
 
@@ -193,21 +196,6 @@ export default class I18n {
       } else {
         return originalT(key, comment);
       }
-      // if (routeName) {
-      //   if (routeTranslation !== routerKey) {
-      //     return routeTranslation;
-      //   } else {
-      //     const commonKey = `common.${key}`;
-      //     const commonTranslation = originalT(commonKey);
-      //     if (commonTranslation !== commonKey) {
-      //       return commonTranslation;
-      //     } else {
-      //       return originalT(key, comment);
-      //     }
-      //   }
-      // } else {
-      //   return "abc";
-      // }
     };
 
     globalThis.$deepScan = function (val) {
@@ -233,6 +221,7 @@ export default class I18n {
       return langs;
     } else {
       const res = await getLanguages({
+        baseUrl: this.baseUrl,
         appCode: this.appCode,
         token: this.token
       });
@@ -246,6 +235,7 @@ export default class I18n {
   async setLanguage(language) {
     return new Promise(async (resolve, reject) => {
       const res = await getTranslate({
+        baseUrl: this.baseUrl,
         appCode: this.appCode,
         language: language ? language : this.locale,
         token: this.token
@@ -285,6 +275,7 @@ export default class I18n {
       loginRouteName: this.loginRouteName, // 登录页路由名称
       loginTranslationKeys: this.loginTranslationKeys,
       login: this.login,
+      baseUrl: this.baseUrl, // 基础URL
       emitter // 将事件总线作为 prop 传递
     })
       .use(iview)

package/packages/libs/service.js

@@ -2,11 +2,10 @@ import axios from "axios";
 import store2 from "store2";
 import _ from "lodash-es";
 import { mergeArraysByKey } from "./utils";
-export const service = "https://test.ihotel.cn";
-// export const service = "http://192.168.1.170:2018";
+// export const service = "https://test.ihotel.cn";
 
-export const getLanguages = async (token) => {
-  return axios.get(service + "/i18n-web/sysoption/getsupportedlangs", {
+export const getLanguages = async ({ baseUrl, token }) => {
+  return axios.get(baseUrl + "/i18n-web/sysoption/getsupportedlangs", {
     headers: {
       Authorization: token
     }
@@ -18,10 +17,11 @@ export const fetchTranslate = async ({
   language = "zh-CN",
   page,
   lastPullDate,
+  baseUrl,
   token
 }) => {
   return new Promise(async (resolve, reject) => {
-    const serverURI = service + "/i18n-web/kv_translate/kv_translates";
+    const serverURI = baseUrl + "/i18n-web/kv_translate/kv_translates";
     const url = lastPullDate
       ? serverURI + "?lastPullDate=" + lastPullDate
       : serverURI;
@@ -43,18 +43,18 @@ export const fetchTranslate = async ({
   });
 };
 
-export const getAllTranslate = async (data, token) => {
-  return axios({
-    url: service + "/i18n-web/kv_translate/kv_translates",
-    method: "POST",
-    data,
-    headers: { Authorization: token }
-  });
-};
+// export const getAllTranslate = async (data, token) => {
+//   return axios({
+//     url: service + "/i18n-web/kv_translate/kv_translates",
+//     method: "POST",
+//     data,
+//     headers: { Authorization: token }
+//   });
+// };
 
-export const userDicts = async (data, token) => {
+export const userDicts = async ({ data, token, baseUrl }) => {
   return axios({
-    url: service + "/i18n-web/kv_translate/userDicts",
+    url: baseUrl + "/i18n-web/kv_translate/userDicts",
     method: "POST",
     headers: {
       Authorization: token
@@ -63,9 +63,9 @@ export const userDicts = async (data, token) => {
   });
 };
 
-export const saveTranslate = async (data, token) => {
+export const saveTranslate = async ({ data, token, baseUrl }) => {
   return axios({
-    url: service + "/i18n-web/kv_translate/batch",
+    url: baseUrl + "/i18n-web/kv_translate/batch",
     method: "POST",
     data,
     headers: {
@@ -73,11 +73,17 @@ export const saveTranslate = async (data, token) => {
     }
   });
 };
-export const getTranslate = async ({ appCode, language = "zh-CN", token }) => {
+export const getTranslate = async ({
+  baseUrl,
+  appCode,
+  language = "zh-CN",
+  token
+}) => {
   return new Promise(async (resolve, reject) => {
     // const appCodeStore = i18nStore.get(appCode);
     const languageStore = store2.namespace(`I18N_${_.toUpper(appCode)}`);
     const options = {
+      baseUrl,
       appCode,
       language,
       token