mooho-base-admin-plus 0.4.0 → 0.4.3

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.3",
   "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/components/view/column-edit.vue

@@ -402,7 +402,7 @@
         </div>
       </template>
       <div class="i-table-no-border">
-        <Table :columns="parpamColumns" :data="params" stripe size="small" no-data-text="暂无数据...">
+        <Table :columns="parpamColumns" :data="params" stripe size="small">
           <template #command="{ index }">
             <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="paramEdit(params[index], index)"></Button>
             <Button size="small" :title="$t('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="upParam(params[index], index)"></Button>

package/src/components/view/filter-edit.vue

@@ -197,7 +197,7 @@
         </div>
       </template>
       <div class="i-table-no-border">
-        <Table :columns="parpamColumns" :data="params" stripe size="small" no-data-text="暂无数据...">
+        <Table :columns="parpamColumns" :data="params" stripe size="small">
           <template #command="{ index }">
             <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="paramEdit(params[index], index)"></Button>
             <Button size="small" :title="$t('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="upParam(params[index], index)"></Button>

package/src/components/view/view-table.vue

@@ -106,7 +106,6 @@
         :show-summary="tableView.showSummary"
         :summary-method="summaryMethod"
         :page-size-opts="pageSizeOpts"
-        no-data-text="暂无数据..."
         @on-column-width-resize="columnWidthResize"
         @on-sort-change="sortChange"
         @on-selection-change="onSelectionChange"

package/src/index.js

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

package/src/layouts/basic-layout/header-breadcrumb/index.vue

@@ -54,15 +54,15 @@
         return newItems;
       },
       // 第一级，默认是 menu/header.js 中的第一项
-      title() {
-        return Setting.info.title;
-      },
       topItem() {
-        return Setting.layout.showI18n ? this.$t('Front_Label_Setting_Info_Title') : Setting.info.title;
+        return this.header.find(item => item.name === this.headerName);
       },
       // 得到所有侧边菜单，并转为平级，查询图标及显示对应内容
       allSiderMenu() {
         return flattenSiderMenu(this.menuSider, []);
+      },
+      title() {
+        return Setting.layout.showI18n ? this.$t('Front_Label_Setting_Info_Title') : Setting.info.title;
       }
     },
     data() {

package/src/pages/system/rolePropertyEdit.vue

@@ -120,7 +120,7 @@
         </div>
       </template>
       <div class="i-table-no-border">
-        <Table :columns="parpamColumns" :data="params" stripe size="small" no-data-text="暂无数据...">
+        <Table :columns="parpamColumns" :data="params" stripe size="small">
           <template #command="{ row, index }">
             <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="paramEdit(row, index)"></Button>
             <Button size="small" :title="$t('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="upParam(row, index)"></Button>

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

@@ -50,7 +50,7 @@ export default {
      * @description 加载语言
      * @param {Object} state vuex state
      */
-    async load({ state }) {
+    async load({ state }, app) {
       let locale;
 
       const db = util.db.get(
@@ -85,10 +85,9 @@ export default {
         db.set(savedLocaleKey, locale).write();
       }
       state.locale = locale;
-      i18n.locale = locale;
+      app.config.globalProperties.$i18n.locale = locale;
 
       // 导入 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 +99,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/test/main.js

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

package/src/layouts/basic-layout/i18n.js

@@ -1,50 +0,0 @@
-// 默认布局使用的多语言
-
-export default {
-  'zh-CN': {
-    basicLayout: {
-      search: {
-        placeholder: '搜索...',
-        cancel: '取消'
-      },
-      user: {
-        center: '个人中心',
-        setting: '设置',
-        logOut: '退出登录'
-      },
-      logout: {
-        confirmTitle: '退出登录确认',
-        confirmContent: '您确定退出登录当前账户吗？打开的标签页和个人设置将会保存。'
-      },
-      tabs: {
-        left: '关闭左侧',
-        right: '关闭右侧',
-        other: '关闭其它',
-        all: '全部关闭'
-      }
-    }
-  },
-  'en-US': {
-    basicLayout: {
-      search: {
-        placeholder: 'Search...',
-        cancel: 'Cancel'
-      },
-      user: {
-        center: 'My home',
-        setting: 'Setting',
-        logOut: 'Log out'
-      },
-      logout: {
-        confirmTitle: 'Logout confirmation',
-        confirmContent: 'Are you sure you are logged out of your current account? Open tabs and personal settings will be saved.'
-      },
-      tabs: {
-        left: 'Close left',
-        right: 'Close right',
-        other: 'Close other',
-        all: 'Close all'
-      }
-    }
-  }
-};