mooho-base-admin-plus 0.4.0 → 0.4.1

package/dist/setting.js

@@ -38,21 +38,8 @@ window.setting = {
     // 默认语言
     default: 'zh-CN',
     // 是否根据用户电脑配置自动设置语言（仅第一次有效）
-    auto: false,
+    auto: true,
     // 切换语言时是否刷新页面
-    refresh: true,
-    // 支持的语言列表
-    list: [
-      {
-        locale: 'zh-CN',
-        language: '简体中文'
-      },
-      {
-        locale: 'en-US',
-        language: 'English'
-      }
-    ],
-    // 是否通过远程接口来获取 i81n 文件
-    remote: false
+    refresh: true
   }
 };

package/package.json

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

package/public/setting.js

@@ -38,21 +38,8 @@ window.setting = {
     // 默认语言
     default: 'zh-CN',
     // 是否根据用户电脑配置自动设置语言（仅第一次有效）
-    auto: false,
+    auto: true,
     // 切换语言时是否刷新页面
-    refresh: true,
-    // 支持的语言列表
-    list: [
-      {
-        locale: 'zh-CN',
-        language: '简体中文'
-      },
-      {
-        locale: 'en-US',
-        language: 'English'
-      }
-    ],
-    // 是否通过远程接口来获取 i81n 文件
-    remote: false
+    refresh: true
   }
 };

package/src/i18n/index.js

@@ -1,4 +1,9 @@
 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';
 
@@ -6,10 +11,42 @@ import { createI18n } from 'vue-i18n/index';
 
 //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/i18n/locale/en-US.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};

package/src/i18n/locale/lang.js

@@ -1 +1 @@
-const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};
+const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};

package/src/i18n/locale/zh-CN.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};

package/src/index.js

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

package/src/layouts/basic-layout/mixins/click-item.js

@@ -1,21 +1,21 @@
-import { findComponentUpward } from 'view-ui-plus/src/utils/assist';
-import { mapState } from 'vuex';
-
-export default {
-  computed: {
-    ...mapState('admin/layout', ['menuSiderReload', 'menuHeaderReload'])
-  },
-  methods: {
-    handleClick(path, type = 'sider') {
-      const current = this.$route.path;
-      if (current === path) {
-        if (type === 'sider' && this.menuSiderReload) this.handleReload();
-        else if (type === 'header' && this.menuHeaderReload) this.handleReload();
-      }
-    },
-    handleReload() {
-      const $layout = findComponentUpward(this, 'BasicLayout');
-      if ($layout) $layout.handleReload();
-    }
-  }
-};
+import { findComponentUpward } from 'view-ui-plus/src/utils/assist';
+import { mapState } from 'vuex';
+
+export default {
+  computed: {
+    ...mapState('admin/layout', ['menuSiderReload', 'menuHeaderReload'])
+  },
+  methods: {
+    handleClick(path, type = 'sider') {
+      const current = this.$route.path;
+      if (current === path) {
+        if (type === 'sider' && this.menuSiderReload) this.handleReload();
+        else if (type === 'header' && this.menuHeaderReload) this.handleReload();
+      }
+    },
+    handleReload() {
+      const $layout = findComponentUpward(this, 'BasicLayout');
+      if ($layout) $layout.handleReload();
+    }
+  }
+};

package/src/layouts/basic-layout/mixins/sider-menu-badge.js

@@ -1,13 +1,13 @@
-import { mapState } from 'vuex';
-
-export default {
-  computed: {
-    ...mapState('admin/menu', ['siderMenuBadge']),
-    badgeData() {
-      let data = null;
-      const siderMenuBadge = this.siderMenuBadge.find(item => item.path === this.menu.path);
-      if (siderMenuBadge) data = siderMenuBadge;
-      return data;
-    }
-  }
-};
+import { mapState } from 'vuex';
+
+export default {
+  computed: {
+    ...mapState('admin/menu', ['siderMenuBadge']),
+    badgeData() {
+      let data = null;
+      const siderMenuBadge = this.siderMenuBadge.find(item => item.path === this.menu.path);
+      if (siderMenuBadge) data = siderMenuBadge;
+      return data;
+    }
+  }
+};

package/src/layouts/basic-layout/mixins/translate-title.js

@@ -1,11 +1,11 @@
-export default {
-  methods: {
-    tTitle(title) {
-      if (title && title.indexOf('$t:') === 0) {
-        return this.$t(title.split('$t:')[1]);
-      } else {
-        return title;
-      }
-    }
-  }
-};
+export default {
+  methods: {
+    tTitle(title) {
+      if (title && title.indexOf('$t:') === 0) {
+        return this.$t(title.split('$t:')[1]);
+      } else {
+        return title;
+      }
+    }
+  }
+};

package/src/layouts/basic-layout/water-mark/index.vue

@@ -1,29 +1,29 @@
-<template>
-  <div :style="styles" v-if="waterMark.show"></div>
-</template>
-<script>
-  import { mapState } from 'vuex';
-  import getWaterMarkCanvas from '../../../libs/water-mark';
-
-  export default {
-    name: 'i-water-mark',
-    computed: {
-      ...mapState('admin/layout', ['waterMark']),
-      styles() {
-        const url = getWaterMarkCanvas(this.waterMark.text, this.waterMark.options);
-        return {
-          width: '100%',
-          height: '100%',
-          position: 'absolute',
-          top: '0',
-          left: '0',
-          'z-index': '2000',
-          'background-size': '320px',
-          'background-repeat': 'repeat',
-          'background-image': `url(${url})`,
-          'pointer-events': 'none'
-        };
-      }
-    }
-  };
-</script>
+<template>
+  <div :style="styles" v-if="waterMark.show"></div>
+</template>
+<script>
+  import { mapState } from 'vuex';
+  import getWaterMarkCanvas from '../../../libs/water-mark';
+
+  export default {
+    name: 'i-water-mark',
+    computed: {
+      ...mapState('admin/layout', ['waterMark']),
+      styles() {
+        const url = getWaterMarkCanvas(this.waterMark.text, this.waterMark.options);
+        return {
+          width: '100%',
+          height: '100%',
+          position: 'absolute',
+          top: '0',
+          left: '0',
+          'z-index': '2000',
+          'background-size': '320px',
+          'background-repeat': 'repeat',
+          'background-image': `url(${url})`,
+          'pointer-events': 'none'
+        };
+      }
+    }
+  };
+</script>

package/src/libs/random_str.js

@@ -1,10 +1,10 @@
-// 生成随机字符串
-export default function (len = 32) {
-  const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-  const maxPos = $chars.length;
-  let str = '';
-  for (let i = 0; i < len; i++) {
-    str += $chars.charAt(Math.floor(Math.random() * maxPos));
-  }
-  return str;
-}
+// 生成随机字符串
+export default function (len = 32) {
+  const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+  const maxPos = $chars.length;
+  let str = '';
+  for (let i = 0; i < len; i++) {
+    str += $chars.charAt(Math.floor(Math.random() * maxPos));
+  }
+  return str;
+}

package/src/libs/water-mark.js

@@ -1,44 +1,44 @@
-/**
- * @description 生成水印
- * */
-export default function getWaterMarkCanvas(text, options) {
-  const canvas = document.createElement('canvas');
-  const ctx = canvas.getContext('2d');
-  const canvasWidth = 400;
-  const canvasHeight = 400;
-  canvas.width = canvasWidth;
-  canvas.height = canvasHeight;
-  ctx.textAlign = 'center';
-  ctx.textBaseline = 'bottom';
-  ctx.globalAlpha = options.globalAlpha || 0.1;
-  ctx.font = options.font || '20px Microsoft Yahei';
-
-  ctx.translate(canvasWidth / 2, canvasHeight / 2);
-  ctx.rotate(options.rotateAngle || -0.4);
-
-  ctx.translate((-canvasWidth / 2) * 1.2, (-canvasHeight / 2) * 1.2);
-
-  const waterMarkText = [];
-  const chunkWidth = options.chunkWidth || 400;
-  const chunkHeight = options.chunkHeight || 120;
-  const horizontalChunkCount = 0;
-  const verticalChunkCount = 1;
-
-  for (let j = 0, initY = chunkHeight / 2, indent = 0; j <= verticalChunkCount; j += 1) {
-    indent = parseInt(j % 2);
-
-    for (let i = 0, initX = chunkWidth / 2; i <= horizontalChunkCount; i += 1) {
-      waterMarkText.push({
-        text,
-        x: i * chunkWidth + indent * initX,
-        y: j * chunkHeight + initY
-      });
-    }
-  }
-
-  waterMarkText.forEach(item => {
-    ctx.fillText(item.text, item.x, item.y);
-  });
-
-  return ctx.canvas.toDataURL();
-}
+/**
+ * @description 生成水印
+ * */
+export default function getWaterMarkCanvas(text, options) {
+  const canvas = document.createElement('canvas');
+  const ctx = canvas.getContext('2d');
+  const canvasWidth = 400;
+  const canvasHeight = 400;
+  canvas.width = canvasWidth;
+  canvas.height = canvasHeight;
+  ctx.textAlign = 'center';
+  ctx.textBaseline = 'bottom';
+  ctx.globalAlpha = options.globalAlpha || 0.1;
+  ctx.font = options.font || '20px Microsoft Yahei';
+
+  ctx.translate(canvasWidth / 2, canvasHeight / 2);
+  ctx.rotate(options.rotateAngle || -0.4);
+
+  ctx.translate((-canvasWidth / 2) * 1.2, (-canvasHeight / 2) * 1.2);
+
+  const waterMarkText = [];
+  const chunkWidth = options.chunkWidth || 400;
+  const chunkHeight = options.chunkHeight || 120;
+  const horizontalChunkCount = 0;
+  const verticalChunkCount = 1;
+
+  for (let j = 0, initY = chunkHeight / 2, indent = 0; j <= verticalChunkCount; j += 1) {
+    indent = parseInt(j % 2);
+
+    for (let i = 0, initX = chunkWidth / 2; i <= horizontalChunkCount; i += 1) {
+      waterMarkText.push({
+        text,
+        x: i * chunkWidth + indent * initX,
+        y: j * chunkHeight + initY
+      });
+    }
+  }
+
+  waterMarkText.forEach(item => {
+    ctx.fillText(item.text, item.x, item.y);
+  });
+
+  return ctx.canvas.toDataURL();
+}

package/src/setting.js

@@ -31,20 +31,7 @@ const Setting = {
     // 是否根据用户电脑配置自动设置语言（仅第一次有效）
     auto: false,
     // 切换语言时是否刷新页面
-    refresh: false,
-    // 支持的语言列表
-    list: [
-      {
-        locale: 'zh-CN',
-        language: '简体中文'
-      },
-      {
-        locale: 'en-US',
-        language: 'English'
-      }
-    ],
-    // 是否通过远程接口来获取 i81n 文件
-    remote: false
+    refresh: false
   },
   /**
    * 打印控件

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

@@ -67,12 +67,11 @@ export default {
       if (confirm) {
         swal
           .fire({
-            title: '确定要退出吗？\r\nAre you sure to logout?',
+            title: window.$t('Front_Msg_Sure_To_Logout'),
             icon: 'question',
             showCancelButton: true,
-            confirmButtonText: '确定 OK',
-            confirmButtonColor: '#2d8cf0',
-            cancelButtonText: '取消 Cancel'
+            confirmButtonText: window.$t('Front_Btn_OK'),
+            cancelButtonText: window.$t('Front_Btn_Cancel')
           })
           .then(result => {
             if (result.value) {

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

@@ -51,8 +51,6 @@ export default {
      * @param {Object} state vuex state
      */
     async load({ state }) {
-      let locale;
-
       const db = util.db.get(
         pathInit({
           dbName: 'database',
@@ -62,33 +60,9 @@ export default {
         })
       );
 
-      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;
-      i18n.locale = locale;
+      state.locale = db.get(savedLocaleKey).value();
 
       // 导入 View UI Plus 语言包
-      //const ViewUIPlusLocale = require.context('view-ui-plus/dist/locale', false, /.+-.+.js$/);
       const ViewUIPlusLocale = import.meta.globEager('../../../../i18n/locale/*-*.js');
 
       let res = await i18nTextApi.getAll();
@@ -100,26 +74,11 @@ export default {
 
           if (currentLocale.i.locale === lanCode) {
             res[lanCode]['text'].i = currentLocale.i;
-            // console.log('currentLocale', currentLocale);
-
-            // Object.keys(currentLocale.i).forEach(key => {
-            //   console.log('key', key, currentLocale.i[key]);
-            //   res[lanCode]['text'][key] = currentLocale.i[key];
-            // });
           }
         });
 
-        // if (currentLocale.i.locale === lanCode) {
-        //   Object.keys(currentLocale).forEach(key => {
-        //     res[lanCode]['text'][key] = currentLocale[key];
-        //   });
-        // }
-
-        //languages[lanCode] = res[lanCode]['text'];
         state.languages[lanCode] = res[lanCode].name;
 
-        //console.log('languages', lanCode, res[lanCode]['text']);
-
         i18n.global.setLocaleMessage(lanCode, res[lanCode]['text']);
       }
     }

package/src/styles/common.less

@@ -1,47 +1,47 @@
-#app, body, html{
-    height: 100%;
-}
-body{
-    background-color: @background-color-base;
-    font-size: 14px;
-}
-
-// 隐藏滚动条样式
-.i-scrollbar-hide{
-    &::-webkit-scrollbar{
-        width: 0;
-    }
-    &::-webkit-scrollbar-track{
-        background-color: transparent;
-    }
-    &::-webkit-scrollbar-thumb{
-        background: #e8eaec;
-    }
-}
-
-// 极简滚动条样式
-.i-scrollbar{
-    &::-webkit-scrollbar{
-        width: 6px;
-    }
-    &::-webkit-scrollbar-track{
-        background-color: transparent;
-    }
-    &::-webkit-scrollbar-thumb{
-        background: #808695;
-        border-radius: 4px;
-    }
-}
-
-// 去除 Table 的左右边框，更精简
-.i-table-no-border{
-    .ivu-table th{
-        background-color: #fff;
-    }
-    .ivu-table-wrapper, .ivu-table tr:last-child td{
-        border: none;
-    }
-    .ivu-table:before, .ivu-table:after{
-        display: none;
-    }
-}
+#app, body, html{
+    height: 100%;
+}
+body{
+    background-color: @background-color-base;
+    font-size: 14px;
+}
+
+// 隐藏滚动条样式
+.i-scrollbar-hide{
+    &::-webkit-scrollbar{
+        width: 0;
+    }
+    &::-webkit-scrollbar-track{
+        background-color: transparent;
+    }
+    &::-webkit-scrollbar-thumb{
+        background: #e8eaec;
+    }
+}
+
+// 极简滚动条样式
+.i-scrollbar{
+    &::-webkit-scrollbar{
+        width: 6px;
+    }
+    &::-webkit-scrollbar-track{
+        background-color: transparent;
+    }
+    &::-webkit-scrollbar-thumb{
+        background: #808695;
+        border-radius: 4px;
+    }
+}
+
+// 去除 Table 的左右边框，更精简
+.i-table-no-border{
+    .ivu-table th{
+        background-color: #fff;
+    }
+    .ivu-table-wrapper, .ivu-table tr:last-child td{
+        border: none;
+    }
+    .ivu-table:before, .ivu-table:after{
+        display: none;
+    }
+}

package/src/styles/default/index.less

@@ -1,6 +1,6 @@
-// 自定义主题
-// 详见 https://www.iviewui.com/docs/guide/theme
-@import 'view-ui-plus/src/styles/index.less';
-
-@menu-dark-title: #191a23;
-@menu-dark-active-bg: #101117;
+// 自定义主题
+// 详见 https://www.iviewui.com/docs/guide/theme
+@import 'view-ui-plus/src/styles/index.less';
+
+@menu-dark-title: #191a23;
+@menu-dark-active-bg: #101117;