mooho-base-admin-plus 2.5.34 → 2.5.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.5.34",
+  "version": "2.5.36",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

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

@@ -108,7 +108,10 @@
         :highlight-row="highlightRow"
         @on-column-width-resize="columnWidthResize"
         @on-sort-change="sortChange"
-        @on-selection-change="onSelectionChange"
+        @on-select="onSelect"
+        @on-select-cancel="onSelectCancel"
+        @on-select-all="onSelectAll"
+        @on-select-all-cancel="onSelectAllCancel"
         @on-drag-drop="(index1, index2) => this.$emit('on-drag-drop', index1, index2)"
         @on-current-change="(currentRow, oldCurrentRow) => $emit('on-current-change', currentRow, oldCurrentRow)"
       >
@@ -2173,32 +2176,53 @@
           this.$refs.filterSetting.open(this.tableView, this.copy(this.tableView.filterColumns));
         });
       },
-      // 选中变化
-      onSelectionChange(selection) {
+      onSelect(selection, row) {
+        row._checked = true;
+        this.selectedData.push(row);
+
+        /**
+         * 选中项变化事件
+         */
+        this.$emit('on-select-change');
+      },
+      onSelectCancel(selection, row) {
+        const index = this.selectedData.findIndex(i => {
+          return i.id == row.id;
+        });
+
+        row._checked = false;
+        this.selectedData.splice(index, 1);
+
+        /**
+         * 选中项变化事件
+         */
+        this.$emit('on-select-change');
+      },
+      onSelectAll(selection) {
         // 当页所有数据
         let allData = this.getDataWithChildren(this.data);
+        this.selectedData.length = 0;
 
         allData.forEach(item => {
-          const index = this.selectedData.findIndex(i => {
-            return i.id == item.id;
-          });
+          item._checked = true;
+          this.selectedData.push(item);
+        });
 
-          if (selection.some(i => i.id == item.id)) {
-            // 选中
-            if (index == -1) {
-              item._checked = true;
-              this.selectedData.push(item);
-            }
-          } else {
-            // 未选中， 剔除
+        /**
+         * 选中项变化事件
+         */
+        this.$emit('on-select-change');
+      },
+      onSelectAllCancel(selection) {
+        // 当页所有数据
+        let allData = this.getDataWithChildren(this.data);
 
-            if (index != -1) {
-              item._checked = false;
-              this.selectedData.splice(index, 1);
-            }
-          }
+        allData.forEach(item => {
+          item._checked = false;
         });
 
+        this.selectedData.length = 0;
+
         /**
          * 选中项变化事件
          */

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

@@ -5,6 +5,7 @@ import util from '../../../../libs/util';
 import router from '../../../../router';
 import userApi from '../../../../api/user';
 import swal from 'sweetalert2';
+import Setting from '../../../../setting';
 
 export default {
   namespaced: true,
@@ -17,7 +18,7 @@ export default {
      */
     async login({ dispatch }, { username = '', password = '' } = {}) {
       const res = await userApi.login({ account: username, password });
-      dispatch('admin/account/saveLoginData', res, { root: true });
+      await dispatch('admin/account/saveLoginData', res, { root: true });
     },
     /**
      * @description 保存登录信息
@@ -38,10 +39,12 @@ export default {
       // 设置 vuex 用户信息
       await dispatch('admin/user/set', user, { root: true });
       await dispatch('admin/user/setData', data, { root: true });
-      // 用户登录后从持久化数据加载一系列的设置
-      await dispatch('load');
+
       // 获取动态菜单
       await dispatch('admin/menu/getMenuList', true, { root: true });
+
+      // 用户登录后从持久化数据加载一系列的设置
+      await dispatch('load', { loadOpenedTabs: Setting.page.loadOpenedTabs });
     },
     /**
      * @description 退出登录
@@ -93,7 +96,7 @@ export default {
       // 加载用户登录信息
       await dispatch('admin/user/load', null, { root: true });
       // 持久化数据加载上次退出时的多页列表
-      //await dispatch('admin/page/openedLoad', { loadOpenedTabs }, { root: true });
+      await dispatch('admin/page/openedLoad', { loadOpenedTabs }, { root: true });
     }
   }
 };

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

@@ -251,6 +251,10 @@ export default {
       let path = to.path;
       let headerName = getHeaderName(path, menuSiderList);
 
+      if (headerName == null) {
+        headerName = 'home';
+      }
+
       //}
       // 在 404 时，是没有 headerName 的
       if (headerName !== null) {

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

@@ -4,7 +4,6 @@
 import { cloneDeep, get } from 'lodash';
 import router from '../../../../router';
 import Setting from '../../../../setting';
-import menuSider from '../../../../menu/sider';
 import { getAllSiderMenu, includeArray } from '../../../../libs/system';
 
 // 判定是否需要缓存
@@ -68,14 +67,20 @@ export default {
           .filter((opened, index) => valid[index] === 1)
           // 对 menu 鉴权过滤
           .filter(opened => {
+            let menuSider = rootState.admin.menu.menuSider;
+
             const allSiderMenu = getAllSiderMenu(menuSider);
+
             const find = allSiderMenu.find(item => item.path === opened.fullPath);
 
             let state = true;
-            if (find && find.auth) {
+            if (!find) {
+              state = false;
+            } else if (find && find.auth) {
               const userInfo = rootState.admin.user.info;
               // @权限
               const access = cloneDeep(userInfo.access);
+
               // 给 access 强制加一个 hidden 的权限，否则菜单隐藏后，Tabs 页签会不显示该页签
               access.push('hidden');
               // 如果用户当前的权限，不是该 menu 对应的 权限，则过滤这个 Tab