mooho-base-admin-plus 2.4.37 → 2.4.39

package/package.json

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

package/src/components/view/view-form-draggable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Form ref="form" :model="data" label-position="top" label-colon="：" class="ivu-mt draggable">
+    <Form ref="form" :model="data" label-position="top" label-colon="：" class="ivu-mt">
       <draggable
         v-model="columns"
         item-key="index"

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

@@ -765,7 +765,7 @@
         default: false
       },
       /**
-       * 筛选
+       * 筛选（即将废弃）
        */
       filter: {
         type: Object,

package/src/index.js

@@ -32,31 +32,6 @@ import i18n from './i18n';
 // 路由工厂
 import router, { initRouter } from './router';
 
-// 方法
-//import { getHeaderName, getMenuSider, getSiderSubmenu } from './libs/system';
-
-// 组件
-// import Copyright from './components/copyright/index.vue';
-// import Link from './components/link/index.vue';
-// import RichEditor from './components/richEditor/index.vue';
-// import DialogSelect from './components/input/dialog-select.vue';
-// import ItemSelect from './components/input/item-select.vue';
-// import AttachmentUpload from './components/upload/upload-attachment.vue';
-// import ImageUpload from './components/upload/upload-image.vue';
-// import FileUpload from './components/upload/file-upload.vue';
-// import ViewForm from './components/view/view-form.vue';
-// import ViewTable from './components/view/view-table.vue';
-// import ViewChart from './components/view/view-chart.vue';
-// import ModalForm from './components/view/modal-form.vue';
-// import ModalTable from './components/view/modal-table.vue';
-// import FormSetting from './components/view/form-setting.vue';
-// import FormSettingLayout from './components/view/form-setting-layout.vue';
-// import TableSetting from './components/view/table-setting.vue';
-// import ModalFormFilter from './components/view/modal-form-filter.vue';
-// import ModalFormSort from './components/view/modal-form-sort.vue';
-// import Shortcut from './components/home/shortcut.vue';
-// import NoticeList from './components/home/notice-list.vue';
-
 // API
 import modelApi from './api/model';
 import customModelApi from './api/customModel';
@@ -101,9 +76,9 @@ const install = function (app) {
   //Vue.use(ckEditor);
 
   // 组件
-  Object.keys(components).forEach(key => {
-    app.component(key, components[key]);
-  });
+  // Object.keys(components).forEach(key => {
+  //   app.component(key, components[key]);
+  // });
 
   // 指令，自动获得焦点
   app.directive('focus', focus);

package/src/pages/common/todo.vue

@@ -4,7 +4,7 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <view-table ref="table" :filter="filter" view-code="TodoList">
+      <view-table ref="table" view-code="TodoList">
         <template #command="{ row }">
           <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
         </template>
@@ -22,16 +22,17 @@
     mixins: [mixinPage],
     components: { taskForm },
     data() {
-      return {
-        filter: {}
-      };
+      return {};
     },
     computed: {},
     created() {
-      for (let key in this.$route.query) {
-        this.filter[key] = this.$route.query[key];
-      }
+      setTimeout(() => {
+        for (let key in this.$route.query) {
+          this.$refs.table.filterData[key] = this.$route.query[key];
+        }
+      });
     },
     methods: {}
   };
 </script>
+e

package/src/pages/system/permission.vue

@@ -7,7 +7,6 @@
       <view-table
         ref="table"
         view-code="Permission"
-        :filter="filter"
         :selectEnable="true"
         :tree-enable="true"
         :tree-load="row => onTreeLoad(row)"
@@ -53,10 +52,7 @@
     components: {},
     data() {
       return {
-        data: null,
-        filter: {
-          parentID: 'null'
-        }
+        data: null
       };
     },
     computed: {},
@@ -172,16 +168,19 @@
         }
       },
       beforeLoadData() {
-        if (!(this.filter['keyword'] || '').trim()) {
+        let filterData = this.$refs.table.filterData;
+
+        if (!(filterData['keyword'] || '').trim()) {
           // 普通查询，只查询顶层包装
-          this.filter['parentID'] = 'null';
+          filterData['parentID'] = 'null';
         } else {
           // 根据关键词查询，查询所有层级
-          this.filter['parentID'] = null;
+          filterData['parentID'] = null;
         }
       },
       async onLoadData() {
-        if (!!(this.filter['keyword'] || '').trim()) {
+        let filterData = this.$refs.table.filterData;
+        if (!!(filterData['keyword'] || '').trim()) {
           // 根据关键词查询的结果，递归查找所有上层
           let data = this.$refs.table.data;
           if (data.length > 0) {