mooho-base-admin-plus 0.4.1 → 0.4.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/i18n/index.js

@@ -1,9 +1,4 @@
 import { createI18n } from 'vue-i18n/index';
-import Setting from '../setting';
-import util from '../libs/util';
-import { pathInit } from '../store/modules/admin/modules/db';
-
-const savedLocaleKey = 'i18n-locale';
 //import store from '../store/index';
 //import messages from './locale';
 
@@ -11,42 +6,10 @@ const savedLocaleKey = 'i18n-locale';
 
 //const locale = store.state.admin.i18n.locale;
 
-let locale;
-
-const db = util.db.get(
-  pathInit({
-    dbName: 'database',
-    path: '',
-    user: false,
-    defaultValue: {}
-  })
-);
-
-const savedLocale = db.get(savedLocaleKey).value();
-
-console.log('savedLocale', savedLocale);
-
-// 先判断本地存储是否已有语言选择
-if (savedLocale) {
-  locale = savedLocale;
-} else {
-  // 判断是否开启自动识别语言
-  if (Setting.i18n.auto) {
-    // 如果自动识别的语言，本地没有该语言包，则设置为默认语言
-    const navLang = navigator.language;
-    locale = navLang;
-  } else {
-    locale = Setting.i18n.default;
-  }
-
-  // 将初次的语言保存在本地
-  db.set(savedLocaleKey, locale).write();
-}
-
 export default createI18n({
   allowComposition: true,
   globalInjection: true,
-  legacy: false,
-  locale
+  legacy: false
+  // locale,
   // messages
 });

package/src/index.js

@@ -163,9 +163,9 @@ Object.keys(files).forEach(key => {
 // 第一次进入时，取菜单数据用于更新
 let isFirstRouteChange = true;
 
-const created = async () => {
+const created = async app => {
   // 加载多语言
-  await store.dispatch('admin/i18n/load');
+  await store.dispatch('admin/i18n/load', app);
   // 初始化动态路由
   //let dynamicRoutes = await dynamicRouter.init(router, pages, layout);
   // 处理路由 得到每一级的路由设置

package/src/store/modules/admin/modules/i18n.js

@@ -50,7 +50,9 @@ export default {
      * @description 加载语言
      * @param {Object} state vuex state
      */
-    async load({ state }) {
+    async load({ state }, app) {
+      let locale;
+
       const db = util.db.get(
         pathInit({
           dbName: 'database',
@@ -60,7 +62,30 @@ export default {
         })
       );
 
-      state.locale = db.get(savedLocaleKey).value();
+      const savedLocale = db.get(savedLocaleKey).value();
+
+      // 先判断本地存储是否已有语言选择
+      if (savedLocale) {
+        locale = savedLocale;
+      } else {
+        // 判断是否开启自动识别语言
+        if (Setting.i18n.auto) {
+          // 如果自动识别的语言，本地没有该语言包，则设置为默认语言
+          const navLang = navigator.language;
+          if (state.languages[navLang]) {
+            locale = navLang;
+          } else {
+            locale = Setting.i18n.default;
+          }
+        } else {
+          locale = Setting.i18n.default;
+        }
+
+        // 将初次的语言保存在本地
+        db.set(savedLocaleKey, locale).write();
+      }
+      state.locale = locale;
+      app.config.globalProperties.$i18n.locale = locale;
 
       // 导入 View UI Plus 语言包
       const ViewUIPlusLocale = import.meta.globEager('../../../../i18n/locale/*-*.js');

package/test/main.js

@@ -33,7 +33,7 @@ const app = createApp({
   // mixins: [mixinApp],
   render: () => h(App),
   created() {
-    created();
+    created(app);
 
     // 将根实例存全局，可在特殊场景下调用
     if (window) {