gc_i18n 1.1.5 → 1.1.7

package/packages/components/config.vue

@@ -1,8 +1,7 @@
 <script lang="jsx">
 import _ from "lodash-es";
 import { getAllTranslate, getLanguages, saveTranslate } from "../libs/service";
-import { Message, Modal } from "view-ui-plus";
-import { convertArrayToObject } from "../libs/utils";
+import { Message } from "view-ui-plus";
 
 export default {
   data() {
@@ -31,14 +30,9 @@ export default {
       let arr =
         this.type === "pageData"
           ? [
-              {
-                title: "字典键",
-                width: 150,
-                key: "dictKey"
-              },
               {
                 title: "状态",
-                width: 90,
+                width: 80,
                 key: "icon",
                 fixed: "left",
                 render: (h, { row }) => {
@@ -59,13 +53,19 @@ export default {
                     </span>
                   );
                 }
+              },
+              {
+                title: "关键词",
+                fixed: "left",
+                width: 80,
+                key: "dictKey"
               }
             ]
           : [
               {
-                title: "页面",
+                title: "状态",
                 fixed: "left",
-                width: 150,
+                width: 80,
                 key: "page",
                 render: (h, { row }) => {
                   return h(
@@ -74,6 +74,12 @@ export default {
                     row.page === "common" ? "全局" : row.page
                   );
                 }
+              },
+              {
+                title: "关键词",
+                fixed: "left",
+                width: 80,
+                key: "dictKey"
               }
             ];
       _.map(this.languages, (lang) => {
@@ -81,7 +87,7 @@ export default {
 
         return arr.push({
           title: lang.name,
-          fixed: lang.name === "中文" ? "left" : "",
+          width: 290,
           key,
           render: (h, { row, index }) => {
             const data = row[key];
@@ -119,6 +125,13 @@ export default {
     translationKeys: Array
   },
   methods: {
+    inputSearch() {
+      if (this.type === "pageData") {
+        this.getPageData();
+      } else {
+        this.search();
+      }
+    },
     closeModal() {
       this.searchText = "";
       this.type = "pageData";
@@ -218,12 +231,16 @@ export default {
             if (commonData) {
               arr.push({ ...commonData, page: this.name, common: true });
             } else {
-              arr.push({
-                dictKey: key,
-                page: this.name,
-                "zh-CN": key,
-                localhost: true
-              });
+              if (this.searchText) {
+                return;
+              } else {
+                arr.push({
+                  dictKey: key,
+                  page: this.name,
+                  "zh-CN": key,
+                  localhost: true
+                });
+              }
             }
           }
         });
@@ -246,6 +263,7 @@ export default {
       const res = await getAllTranslate(
         {
           appCode: this.appCode,
+          page: "common",
           searchBlur: this.searchText,
           commaSeparatedLangs: _.map(this.languages, "code").toString(),
           firstResult: 0,
@@ -336,17 +354,14 @@ export default {
             ></Table
           ></TabPane>
           <template #extra>
-            <div
-              class="extra"
-              v-if="type === 'data'"
-            >
+            <div class="extra">
               <Input
                 prefix="ios-search"
                 placeholder="请输入搜索内容"
                 v-model="searchText"
                 clearable
-                @on-enter="search"
-                @on-clear="search"
+                @on-enter="inputSearch"
+                @on-clear="inputSearch"
               />
             </div>
           </template>
@@ -406,9 +421,8 @@ export default {
 }
 .gc_i18n_tabs {
   padding-top: 5px;
-
-  .ivu-tabs-bar {
-    margin-bottom: 1px !important;
+  :deep(.ivu-tabs-bar) {
+    margin-bottom: 0px !important;
   }
   .ivu-tabs-content {
     position: relative;

package/packages/index.js

@@ -46,18 +46,19 @@ export default class I18n {
     // 初始化 i18n 实例
     this.initI18n(options);
 
-    // 路由首次加载完成后设置语言
-    this.router
-      .isReady()
-      .then(async () => {
-        // await this.setLanguage(this.locale);
-        this.createModal();
-      })
-      .catch((error) => {
-        console.error("路由首次加载出错:", error);
-      });
+    // // 路由首次加载完成后设置语言
+    // this.router
+    //   .isReady()
+    //   .then(async () => {
+    //     // await this.setLanguage(this.locale);
+    //     this.createModal();
+    //   })
+    //   .catch((error) => {
+    //     console.error("路由首次加载出错:", error);
+    //   });
 
     keyboardJS.bind("shift > t", (e) => {
+      this.configInstance = this.createModal(this.name);
       // 打开弹窗
       this.configInstance.openModal({ name: this.name });
     });
@@ -85,6 +86,7 @@ export default class I18n {
       this.configInstance && this.configInstance.closeModal();
       this.name = to.name;
       token && this.setToken(token);
+
       if (this.loadI18n) {
         await this.setLanguage(language || this.locale);
         // this.createModal(to.name);
@@ -239,7 +241,7 @@ export default class I18n {
   createModal(name) {
     this.modalLoad = true;
     // 创建 config 组件的实例
-    this.configInstance = createApp(configVue, {
+    return createApp(configVue, {
       appCode: this.appCode,
       token: this.token,
       setLanguage: this.setLanguage.bind(this, this.locale),

package/src/view/test.vue

@@ -3,4 +3,5 @@
 <template>
   <h1>首页</h1>
   <h1>测试</h1>
+  <h1>页面独有</h1>
 </template>