mooho-base-admin-plus 2.3.1 → 2.3.3

package/package.json

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

package/public/setting.js

@@ -47,6 +47,8 @@ window.setting = {
     menuSiderReload: false,
     // 再次点击当前顶部菜单时，是否重载当前页面
     menuHeaderReload: false,
+    // 菜单筛选
+    menuFilter: true,
     // 侧边菜单折起时，是否在子菜单前显示父级菜单名称
     showCollapseMenuTitle: false,
     // 是否显示重载按钮

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

@@ -28,7 +28,6 @@
         ref="table"
         :view-code="viewCode"
         :static="this.static"
-        :filter="tableFilter"
         :setting-enable="settingEnable"
         :auto-load="false"
         :select-enable="selectEnable"
@@ -143,8 +142,7 @@
       return {
         opened: false,
         tableView: {},
-        param: {},
-        tableFilter: {}
+        param: {}
       };
     },
     created() {},
@@ -348,7 +346,7 @@
       },
       // 筛选条件数据
       filterData() {
-        return this.$refs.tableFilter.data;
+        return this.$refs.table.filterData;
       },
       // 屏幕宽度
       screenWidth() {
@@ -374,14 +372,18 @@
        * @public
        */
       open(param) {
-        for (let key in this.param) {
-          delete this.tableFilter[key];
+        if (this.param) {
+          for (let key in this.param) {
+            delete this.filterData[key];
+          }
         }
 
         this.param = param;
 
-        for (let key in this.param) {
-          this.tableFilter[key] = this.param[key];
+        if (this.param) {
+          for (let key in this.param) {
+            this.filterData[key] = this.param[key];
+          }
         }
 
         setTimeout(() => {

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

@@ -309,8 +309,6 @@
               } else if (item.dataType === 'Boolean' && item.defaultValue.toUpperCase == 'FALSE') {
                 this.setFilterData(data, item, false);
               } else {
-                console.log('this.setFilterData', data, item, item.defaultValue);
-
                 this.setFilterData(data, item, item.defaultValue);
               }
             }
@@ -513,7 +511,6 @@
       // },
       // 选项变化事件
       onSelectDataChange(sender, selected) {
-        console.log('onSelectDataChange', sender, selected);
         let code;
         if (sender.code.endsWith('ID')) {
           code = sender.code.substr(0, sender.code.length - 2);

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

@@ -909,7 +909,7 @@
       },
       // 筛选条件数据
       filterData() {
-        return this.$refs.tableFilter.data;
+        return this.$refs.tableFilter ? this.$refs.tableFilter.data : null;
       }
     },
     watch: {
@@ -2092,11 +2092,9 @@
       },
       // 合并后最终的筛选项
       getAllFilter() {
-        console.log('getAllFilter');
-
         let filter = {
           ...this.viewFilter,
-          ...this.filterData
+          ...(this.filterData ?? {})
         };
 
         for (let key in filter) {

package/src/layouts/basic-layout/menu-side/index.vue

@@ -9,6 +9,7 @@
         </i-link>
       </transition>
     </div>
+    <div v-if="!menuCollapse && layout.menuFilter"><Input v-model="menuFilter" prefix="ios-search" placeholder="搜索菜单..." style="margin: 2%; width: 96%" /></div>
     <Menu
       ref="menu"
       class="i-layout-menu-side i-scrollbar-hide"
@@ -19,7 +20,7 @@
       :open-names="openNames"
       width="auto"
     >
-      <template v-for="(item, index) in filterSider" :key="index">
+      <template v-for="(item, index) in siderMenuData" :key="index">
         <template v-if="!menuCollapse">
           <i-menu-side-item v-if="item.children == null || !item.children.length" :menu="item" :key="index" />
           <i-menu-side-submenu v-else :menu="item" />
@@ -65,18 +66,31 @@
     name: 'iMenuSide',
     mixins: [mixinPage],
     components: { iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse },
+    data() {
+      return {
+        menuFilter: null
+      };
+    },
     props: {
       hideLogo: {
         type: Boolean,
         default: false
       }
     },
+
     computed: {
       ...mapState('admin/layout', ['siderTheme', 'menuAccordion', 'menuCollapse']),
       ...mapState('admin/menu', ['activePath', 'openNames']),
       ...mapGetters('admin/menu', ['filterSider']),
       rootPath() {
         return Setting.rootPath;
+      },
+      siderMenuData() {
+        if (this.menuFilter) {
+          return this.getSiderMenuData(this.copy(this.filterSider));
+        } else {
+          return this.filterSider;
+        }
       }
     },
     watch: {
@@ -113,6 +127,29 @@
             });
           }
         });
+      },
+      isMatch(menu, deep) {
+        let name = this.layout.showI18n ? this.$t('Permission_' + menu.code) : menu.title;
+        if (name.indexOf(this.menuFilter) >= 0) {
+          return true;
+        } else {
+          if (menu.children && deep) {
+            return menu.children.some(item => this.isMatch(item));
+          } else {
+            return false;
+          }
+        }
+      },
+      getSiderMenuData(data) {
+        let result = data.filter(item => this.isMatch(item, true));
+
+        for (let menu of result) {
+          if (menu.children && !this.isMatch(menu, false)) {
+            menu.children = this.getSiderMenuData(menu.children);
+          }
+        }
+
+        return result;
       }
     }
   };

package/src/setting.js

@@ -89,6 +89,8 @@ const Setting = {
     menuSiderReload: false,
     // 再次点击当前顶部菜单时，是否重载当前页面
     menuHeaderReload: false,
+    // 菜单筛选
+    menuFilter: true,
     // 侧边菜单折起时，是否在子菜单前显示父级菜单名称
     showCollapseMenuTitle: false,
     // 是否显示重载按钮