mooho-base-admin-plus 0.1.69 → 0.4.1

package/src/pages/system/user.vue

@@ -6,22 +6,22 @@
     <Card :bordered="false" dis-hover class="ivu-mt">
       <view-table ref="table" view-code="User" @create="$refs.form.open()">
         <template #command="{ row }">
-          <Button size="small" title="角色" type="info" custom-icon="fa fa-users" @click="$refs.userRoleTable.open({ userID: row.id })"></Button>
-          <Button size="small" title="编辑" type="primary" custom-icon="fa fa-edit" @click="$refs.form.open(row)"></Button>
-          <Button size="small" title="数据权限" type="primary" custom-icon="fa fa-sitemap" @click="openDataPermission(row)"></Button>
-          <Button size="small" title="删除" type="warning" custom-icon="fa fa-trash-alt" @click="$refs.table.remove(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Role')" type="info" custom-icon="fa fa-users" @click="$refs.userRoleTable.open({ userID: row.id })"></Button>
+          <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" custom-icon="fa fa-edit" @click="$refs.form.open(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Data_Permission')" type="primary" custom-icon="fa fa-sitemap" @click="openDataPermission(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Remove')" type="warning" custom-icon="fa fa-trash-alt" @click="$refs.table.remove(row)"></Button>
         </template>
       </view-table>
     </Card>
     <modal-form ref="form" view-code="UserEdit" @on-after-save="$refs.table.loadData()">
       <template #footer>
-        <Button type="primary" custom-icon="fa fa-save" @click="$refs.form.onSave()">保存</Button>
-        <Button type="primary" custom-icon="fa fa-user-lock" @click="resetPassword">重置密码</Button>
+        <Button type="primary" custom-icon="fa fa-save" @click="$refs.form.onSave()">{{ $t('Front_Btn_Save') }}</Button>
+        <Button type="primary" custom-icon="fa fa-user-lock" @click="resetPassword">{{ $t('Front_Btn_Reset_Password') }}</Button>
       </template>
     </modal-form>
     <modal-table ref="userRoleTable" view-code="UserRole" @edit="({ row }) => editUserRole(row)">
       <template #filterCommand>
-        <Button size="small" type="primary" custom-icon="fa fa-plus" @click="addUserRole()">添加</Button>
+        <Button size="small" type="primary" custom-icon="fa fa-plus" @click="addUserRole()">{{ $t('Front_Btn_Add') }}</Button>
       </template>
     </modal-table>
     <modal-form ref="userRoleForm" view-code="UserRoleEdit" @on-after-save="$refs.userRoleTable.loadData()" @on-change="userRoleChange">
@@ -67,12 +67,12 @@
         </view-table>
       </template>
       <template #footer>
-        <Button type="primary" custom-icon="fa fa-save" @click="userRoleSave">保存</Button>
+        <Button type="primary" custom-icon="fa fa-save" @click="userRoleSave">{{ $t('Front_Btn_Save') }}</Button>
       </template>
     </modal-form>
     <modal-form ref="dataPermissionForm" view-code="DataPermission">
       <template #footer>
-        <Button type="primary" custom-icon="fa fa-save" @click="saveDataPermission">保存</Button>
+        <Button type="primary" custom-icon="fa fa-save" @click="saveDataPermission">{{ $t('Front_Btn_Save') }}</Button>
       </template>
     </modal-form>
   </div>
@@ -116,7 +116,7 @@
         for (let i = 0; i < this.roleProperties.length; i++) {
           let item = this.roleProperties[i];
           if (!!(item.source || '').trim()) {
-            if (item.controlType === 'Select') {
+            if (item.controlType === 'Select' || item.controlType === 'MultiSelect') {
               item._dataSource = [];
               let param = this.getParam(item);
 
@@ -181,9 +181,9 @@
         let isOK = await this.$refs.userRoleForm.validate();
 
         if (!isOK) {
-          this.error('有内容不符合要求，请正确填写！');
+          this.error('Front_Msg_Form_Validate_Fail');
         } else {
-          this.confirm('确定要保存吗？', async () => {
+          this.confirm('Front_Msg_Sure_To_Save', async () => {
             let userRole = this.$refs.userRoleForm.getFullData();
 
             if (!userRole) {
@@ -204,7 +204,7 @@
               await modelApi.update('UserRole', data);
             }
 
-            this.success('操作成功！', () => {
+            this.success('Front_Msg_Success', () => {
               this.$refs.userRoleDataTable.loadData([]);
               this.$refs.userRoleTable.loadData();
               this.$refs.userRoleForm.close();
@@ -247,9 +247,9 @@
       },
       // 重置密码
       async resetPassword() {
-        this.confirm('确定要重置该用户的密码吗？', async () => {
+        this.confirm('Front_Msg_Sure_To_Reset_Password', async () => {
           await userApi.resetPassword(this.$refs.form.data.id);
-          this.success('已重置为初始密码！');
+          this.success('Front_Msg_Reset_Password_Success');
         });
       },
       // 打开数据权限
@@ -273,9 +273,9 @@
 
         this.user.dataPermission = JSON.stringify(data);
 
-        this.confirm('确定要保存数据权限吗？', async () => {
+        this.confirm('Front_Msg_Sure_To_Save', async () => {
           await modelApi.update('User', this.user);
-          this.success('操作成功！');
+          this.success('Front_Msg_Success');
           this.$refs.dataPermissionForm.close();
         });
       }

package/src/pages/template/processPage.vue

@@ -9,7 +9,7 @@
           <Button
             size="small"
             v-if="row.application.status != 'Draft' && row.application.status != 'Rejected'"
-            title="详细"
+            :title="$t('Front_Btn_Detail')"
             type="info"
             custom-icon="fa fa-file-alt"
             @click="$refs.showForm.open(row)"
@@ -17,7 +17,7 @@
           <Button
             size="small"
             v-if="(row.application.status == 'Draft' || row.application.status == 'Rejected') && row.application.applicantID == info.id"
-            title="编辑"
+            :title="$t('Front_Btn_Edit')"
             type="primary"
             custom-icon="fa fa-edit"
             @click="$refs.form.open(row)"
@@ -28,8 +28,8 @@
     <modal-form ref="form" v-if="page" @on-after-save="$refs.table.loadData()">
       <template #footer>
         <span></span>
-        <Button type="primary" custom-icon="fa fa-cloud-upload-alt" @click="submit">提交</Button>
-        <Button type="primary" custom-icon="fa fa-save" @click="save">保存</Button>
+        <Button type="primary" custom-icon="fa fa-cloud-upload-alt" @click="submit">{{ $t('Front_Btn_Submit') }}</Button>
+        <Button type="primary" custom-icon="fa fa-save" @click="save">{{ $t('Front_Btn_Save') }}</Button>
         <Button
           type="warning"
           v-if="
@@ -42,7 +42,7 @@
           custom-icon="fa fa-trash-alt"
           @click="cancel"
         >
-          撤销
+          {{ $t('Front_Btn_Cancel') }}
         </Button>
         <Button
           type="info"
@@ -50,7 +50,7 @@
           custom-icon="fa fa-history"
           @click="$refs.approvalHistoryTable.open({ processInstID: $refs.form.data.application.processInstID })"
         >
-          历史
+          {{ $t('Front_Btn_History') }}
         </Button>
       </template>
     </modal-form>
@@ -78,8 +78,8 @@
     <Modal v-model="messageOpened" scrollable>
       <template #header>
         <div>
-          <span class="title">意见发表</span>
-          <span class="description">Message</span>
+          <span class="title">{{ $t('Front_Label_Leave_Message') }}</span>
+          <span class="description">{{ $t('Front_Label_Leave_Message_Desc') }}</span>
         </div>
       </template>
       <div class="ivu-ml-8 ivu-mr-8">
@@ -87,12 +87,12 @@
           <Row :gutter="24" type="flex">
             <Col v-bind="grid24">
               <FormItem
-                label="意见内容"
+                :label="$t('Front_Label_Message_Content')"
                 key="message"
                 prop="message"
                 :rules="{
                   required: true,
-                  message: '请输入',
+                  message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Message_Content')),
                   trigger: 'blur,change'
                 }"
               >
@@ -103,8 +103,8 @@
         </Form>
       </div>
       <template #footer>
-        <Button type="primary" custom-icon="fa fa-check" @click="submitMessage">提交</Button>
-        <Button type="default" custom-icon="fa fa-times" @click="messageOpened = false">关闭</Button>
+        <Button type="primary" custom-icon="fa fa-check" @click="submitMessage">{{ $t('Front_Btn_Submit') }}</Button>
+        <Button type="default" custom-icon="fa fa-times" @click="messageOpened = false">{{ $t('Front_Btn_Close') }}</Button>
       </template>
     </Modal>
   </div>
@@ -176,7 +176,7 @@
         let isOK = await this.$refs.form.validate();
 
         if (!isOK) {
-          this.error('有内容不符合要求，请正确填写！');
+          this.error('Front_Msg_Form_Validate_Fail');
         } else {
           let data = this.$refs.form.getFullData();
 
@@ -185,10 +185,10 @@
             return;
           }
 
-          this.confirm('确定要提交吗？', async () => {
+          this.confirm('Front_Msg_Sure_To_Submit', async () => {
             await applicationApi.submit(this.page.applicationTypeID, data);
 
-            this.success('提交成功！', () => {
+            this.success('Front_Msg_Success', () => {
               this.$refs.table.loadData();
               this.$refs.form.close();
             });
@@ -204,10 +204,10 @@
           return;
         }
 
-        this.confirm('确定要保存吗？', async () => {
+        this.confirm('Front_Msg_Sure_To_Save', async () => {
           let res = await applicationApi.save(this.page.applicationTypeID, data);
 
-          this.success('保存成功！', () => {
+          this.success('Front_Msg_Success', () => {
             this.$refs.table.loadData();
             this.$refs.form.setData(res);
           });
@@ -223,12 +223,12 @@
         let isOK = await this.$refs.messageForm.validate();
 
         if (!isOK) {
-          this.error('有内容不符合要求，请正确填写！');
+          this.error('Front_Msg_Form_Validate_Fail');
         } else {
-          this.confirm('确定要发表意见吗？', async () => {
+          this.confirm('Front_Msg_Sure_To_Message_Application', async () => {
             await processInstApi.addMessage(this.$refs.showForm.data.application.processInstID, this.messageData.message);
 
-            this.success('操作成功！', () => {
+            this.success('Front_Msg_Success', () => {
               this.messageData.message = null;
               this.messageOpened = false;
             });
@@ -237,10 +237,10 @@
       },
       // 撤销
       async cancel() {
-        this.confirm('确定要撤销该申请吗？', async () => {
+        this.confirm('Front_Msg_Sure_To_Cancel_Application', async () => {
           await applicationApi.cancel(this.$refs.form.data.applicationID);
 
-          this.success('操作成功！', () => {
+          this.success('Front_Msg_Success', () => {
             this.$refs.table.loadData();
             this.$refs.form.close();
           });

package/src/plugins/sweetalert2/index.js

@@ -5,11 +5,7 @@ import 'sweetalert2/dist/sweetalert2.min.css';
 export default {
   install: app => {
     // sweetalert2 的设置默认配置的方法
-    const swal = sweetalert2.mixin({
-      confirmButtonText: '确定',
-      confirmButtonColor: '#2d8cf0',
-      cancelButtonText: '取消'
-    });
+    const swal = sweetalert2;
 
     // 添加全局方法
     //Vue.swal = swal;

package/src/router/dynamic.js

@@ -1,4 +1,5 @@
 import permissionApi from '../api/permission';
+import Setting from '../setting';
 
 // 动态路由
 export default {
@@ -66,10 +67,10 @@ export default {
           name: url.replace(/\//g, '-'),
           meta: {
             auth: false,
-            title: item.name,
-            description: item.subName,
+            title: Setting.layout.showNotice ? window.$t('Permission_' + url) : item.name,
+            description: Setting.layout.showNotice ? window.$t('Permission_' + url + '_SubName') : item.subName,
             data,
-            cache: item.isMenu
+            cache: true
           },
           component: () => {
             return new Promise(resolve => {
@@ -129,10 +130,10 @@ function buildPermission(pages, perArry, routes, layout, parent) {
         name: url.replace(/\//g, '-'),
         meta: {
           auth: false,
-          title: item.name,
-          description: item.subName,
+          title: Setting.layout.showNotice ? window.$t('Permission_' + url) : item.name,
+          description: Setting.layout.showNotice ? window.$t('Permission_' + url + '_SubName') : item.subName,
           data,
-          cache: item.isMenu
+          cache: true
         },
         component: () => {
           return new Promise(resolve => {

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

@@ -1,58 +1,21 @@
 /**
  * 多语言
  * */
-import Languages from '../../../../i18n/locale';
 import Setting from '../../../../setting';
 import util from '../../../../libs/util';
 import { pathInit } from '../../../../store/modules/admin/modules/db';
+import i18n from '../../../../i18n';
+import i18nTextApi from '../../../../api/i18nText';
 
 const savedLocaleKey = 'i18n-locale';
 
 export default {
   namespaced: true,
   state: {
-    locale: ''
+    locale: '',
+    languages: {}
   },
   actions: {
-    /**
-     * @description 获取当前语言
-     * */
-    getLocale({ state }) {
-      let locale;
-
-      const db = util.db.get(
-        pathInit({
-          dbName: 'database',
-          path: '',
-          user: true,
-          defaultValue: {}
-        })
-      );
-
-      const savedLocale = db.get(savedLocaleKey).value();
-
-      // 先判断本地存储是否已有语言选择
-      if (savedLocale) {
-        locale = savedLocale;
-      } else {
-        // 判断是否开启自动识别语言
-        if (Setting.i18n.auto) {
-          // 如果自动识别的语言，本地没有该语言包，则设置为默认语言
-          const navLang = navigator.language;
-          if (Languages[navLang]) {
-            locale = navLang;
-          } else {
-            locale = Setting.i18n.default;
-          }
-        } else {
-          locale = Setting.i18n.default;
-        }
-
-        // 将初次的语言保存在本地
-        db.set(savedLocaleKey, locale).write();
-      }
-      state.locale = locale;
-    },
     /**
      * @description 设置当前语言
      * */
@@ -61,7 +24,7 @@ export default {
         pathInit({
           dbName: 'database',
           path: '',
-          user: true,
+          user: false,
           defaultValue: {}
         })
       );
@@ -82,6 +45,42 @@ export default {
           title: vm.$route.meta.title
         });
       }
+    },
+    /**
+     * @description 加载语言
+     * @param {Object} state vuex state
+     */
+    async load({ state }) {
+      const db = util.db.get(
+        pathInit({
+          dbName: 'database',
+          path: '',
+          user: false,
+          defaultValue: {}
+        })
+      );
+
+      state.locale = db.get(savedLocaleKey).value();
+
+      // 导入 View UI Plus 语言包
+      const ViewUIPlusLocale = import.meta.globEager('../../../../i18n/locale/*-*.js');
+
+      let res = await i18nTextApi.getAll();
+      state.languages = {};
+
+      for (let lanCode in res) {
+        Object.keys(ViewUIPlusLocale).forEach(path => {
+          const currentLocale = ViewUIPlusLocale[path].default;
+
+          if (currentLocale.i.locale === lanCode) {
+            res[lanCode]['text'].i = currentLocale.i;
+          }
+        });
+
+        state.languages[lanCode] = res[lanCode].name;
+
+        i18n.global.setLocaleMessage(lanCode, res[lanCode]['text']);
+      }
     }
   }
 };

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

@@ -47,6 +47,7 @@ function convertMenu(source) {
   return source.map(item => {
     return {
       path: reg.test(item.url) ? item.url : '/' + item.url.split('?')[0],
+      code: item.url,
       title: item.name,
       subtitle: item.subName,
       target: item.isNewWindow ? '_blank' : null,

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/css/default.css

@@ -97,6 +97,10 @@
   line-height: 30px;
 }
 
+.ivu-form-label-top .ivu-form-item-label {
+  padding: 0 0 4px;
+}
+
 /* .form-title::before {
     background: #078dcf;
     position: absolute;

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;

package/src/styles/font/iconfont.css

@@ -1,47 +1,47 @@
-@font-face {
-  font-family: "i-icon"; /* Project id 1125611 */
-  src: url('iconfont.woff2?t=1651052284018') format('woff2'),
-       url('iconfont.woff?t=1651052284018') format('woff'),
-       url('iconfont.ttf?t=1651052284018') format('truetype');
-}
-
-.i-icon {
-  font-family: "i-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.i-icon-i18n:before {
-  content: "\e8e9";
-}
-
-.i-icon-refresh:before {
-  content: "\e7d1";
-}
-
-.i-icon-record:before {
-  content: "\e61f";
-}
-
-.i-icon-notification:before {
-  content: "\e69d";
-}
-
-.i-icon-full-screen:before {
-  content: "\e743";
-}
-
-.i-icon-exit-full-screen:before {
-  content: "\e657";
-}
-
-.i-icon-menu-unfold:before {
-  content: "\e68b";
-}
-
-.i-icon-menu-fold:before {
-  content: "\e600";
-}
-
+@font-face {
+  font-family: "i-icon"; /* Project id 1125611 */
+  src: url('iconfont.woff2?t=1651052284018') format('woff2'),
+       url('iconfont.woff?t=1651052284018') format('woff'),
+       url('iconfont.ttf?t=1651052284018') format('truetype');
+}
+
+.i-icon {
+  font-family: "i-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.i-icon-i18n:before {
+  content: "\e8e9";
+}
+
+.i-icon-refresh:before {
+  content: "\e7d1";
+}
+
+.i-icon-record:before {
+  content: "\e61f";
+}
+
+.i-icon-notification:before {
+  content: "\e69d";
+}
+
+.i-icon-full-screen:before {
+  content: "\e743";
+}
+
+.i-icon-exit-full-screen:before {
+  content: "\e657";
+}
+
+.i-icon-menu-unfold:before {
+  content: "\e68b";
+}
+
+.i-icon-menu-fold:before {
+  content: "\e600";
+}
+