mooho-base-admin-plus 2.0.18 → 2.0.21

package/package.json

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

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

@@ -2038,6 +2038,14 @@
               continue;
             }
 
+            if (
+              this.filterColumns.some(item => {
+                return item.code == key && item.operator == 'Custom';
+              })
+            ) {
+              continue;
+            }
+
             if (typeof value == 'object' && !(value instanceof Date)) {
               continue;
             }

package/src/index.js

@@ -21,7 +21,6 @@ import plugins from './plugins';
 
 // store
 import store from './store';
-import adminStore from './store/modules/admin';
 
 // ViewUIPlus
 import ViewUIPlus from 'view-ui-plus';
@@ -220,7 +219,6 @@ export {
   pages,
   App,
   store,
-  adminStore,
   i18n,
   setting,
   basicLayout,

package/test/main.js

@@ -3,10 +3,9 @@ if (!!window.ActiveXObject || 'ActiveXObject' in window) {
 }
 
 import { createApp, h } from 'vue';
-import { createStore } from 'vuex';
 
 // 基础框架
-import moohoBaseAdminPlus, { pages, App, adminStore, basicLayout, createRouter, created, routeChanged } from '../src';
+import moohoBaseAdminPlus, { pages, App, store, basicLayout, createRouter, created, routeChanged } from '../src';
 
 // 固定路由
 import routes from './router/routes';
@@ -16,6 +15,7 @@ import './styles/css/custom.css';
 
 // 自定义store
 import cusotmStore from './store/custom';
+store.registerModule('custom', cusotmStore);
 
 // 环境模式
 window.$mode = import.meta.env.MODE;
@@ -47,15 +47,6 @@ const app = createApp({
 app.use(router);
 app.use(moohoBaseAdminPlus);
 
-adminStore.modules['custom'] = cusotmStore;
-app.use(
-  createStore({
-    modules: {
-      admin: adminStore
-    }
-  })
-);
-
 //app.config.globalProperties.$pages = pages;
 
 app.mount('#app');

package/test/pages/test/logReport.vue

@@ -21,7 +21,7 @@
       return {};
     },
     computed: {
-      ...mapState('admin/custom', ['test'])
+      ...mapState('custom', ['test'])
     },
     created() {},
     methods: {}