mooho-base-admin-plus 2.2.13 → 2.2.14

package/package.json

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

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

@@ -338,12 +338,19 @@
       }
     },
     computed: {
+      // 表格数据
       data() {
         return this.$refs.table.data;
       },
+      // 表格
       table() {
         return this.$refs.table;
       },
+      // 筛选条件数据
+      filterData() {
+        return this.$refs.tableFilter.data;
+      },
+      // 屏幕宽度
       screenWidth() {
         return document.body.clientWidth * 0.8;
       }

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

@@ -239,12 +239,15 @@
   import customModelApi from '../../api/customModel';
   import DialogSelect from '../input/dialog-select.vue';
   import dateFormat from 'date-fns/format';
+  import { assign, defaultsDeep } from 'lodash';
 
   export default {
     mixins: [mixin, mixinPage],
     components: { DialogSelect },
     data() {
-      return {};
+      return {
+        data: {}
+      };
     },
     async created() {
       this.init();
@@ -255,7 +258,7 @@
         type: Object
       },
       // 筛选项数据
-      data: {
+      filter: {
         type: Object
       },
       // 字段
@@ -272,6 +275,13 @@
     methods: {
       init() {
         let data = this.data;
+
+        // 默认值
+        if (this.filter) {
+          defaultsDeep(data, this.filter);
+          assign(this.filter, data);
+        }
+
         this.columns.forEach(item => {
           if (item.defaultValue) {
             if (item.defaultValue == '{today}') {
@@ -299,6 +309,8 @@
               } 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);
               }
             }
@@ -380,7 +392,7 @@
 
         this.columns
           .filter(column => {
-            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
+            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'));
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -501,6 +513,7 @@
       // },
       // 选项变化事件
       onSelectDataChange(sender, selected) {
+        console.log('onSelectDataChange', sender, selected);
         let code;
         if (sender.code.endsWith('ID')) {
           code = sender.code.substr(0, sender.code.length - 2);
@@ -556,7 +569,7 @@
             if (
               !column.isStaticItem &&
               !!(column.source || '').trim() &&
-              !column.dataType.startsWith('Enum:') &&
+              !(column.dataType && column.dataType.startsWith('Enum:')) &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.id === column.id;

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

@@ -610,7 +610,7 @@
         // 数据源中包含变量需要刷新
         this.columns
           .filter(column => {
-            return !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
+            return !!(column.source || '').trim() && !!(column.param || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'));
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -756,7 +756,7 @@
           this.columns.forEach(function (column) {
             if (
               !!(column.source || '').trim() &&
-              !column.dataType.startsWith('Enum:') &&
+              !(column.dataType && column.dataType.startsWith('Enum:')) &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.id === column.id;
@@ -785,7 +785,7 @@
             column.triggers.forEach(item => {
               item.needClear = true;
             });
-          } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
+          } else if (column.needRefresh && !!(column.source || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'))) {
             let param = this.getParam(this.data, column);
 
             if (

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

@@ -1011,7 +1011,7 @@
         // 数据源中包含变量需要刷新
         this.columns
           .filter(column => {
-            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
+            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'));
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -1333,7 +1333,7 @@
             if (
               !column.isStaticItem &&
               !!(column.source || '').trim() &&
-              !column.dataType.startsWith('Enum:') &&
+              !(column.dataType && column.dataType.startsWith('Enum:')) &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.code == column.code;
@@ -1366,7 +1366,7 @@
             column.triggers.forEach(item => {
               item.needClear = true;
             });
-          } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
+          } else if (column.needRefresh && !!(column.source || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'))) {
             let param = this.getParam(this.data, column);
 
             if (

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

@@ -23,20 +23,20 @@
             @binding {object} table 表格对象
             @binding {object} filter 筛选对象
         -->
-          <slot name="filter" :table="this" :filter="filter">
+          <slot name="filter" :table="this">
             <!--
               @slot 自定义筛选栏
           -->
             <slot name="customFilter"></slot>
-            <table-filter ref="tableFilter" :data="filter" :columns="filterColumns" :table-view="tableView" @on-keyup="onKeyup">
-              <template #column="{ filter, column }">
+            <table-filter ref="tableFilter" :filter="filter" :columns="filterColumns" :table-view="tableView" @on-keyup="onKeyup">
+              <template #column="{ column }">
                 <!--
                   @slot 筛选栏自定义列
                   @binding {object} filter 筛选条件对象
                   @binding {object} column 列对象
                   @binding {string} code 列代码
               -->
-                <slot name="filterColumn" :filter="filter" :column="column" :code="column.code"></slot>
+                <slot name="filterColumn" :column="column" :code="column.code"></slot>
               </template>
             </table-filter>
             <Col v-bind="getGrid(tableView.filterWidth)" :style="{ 'text-align': tableView.filterAlign == null ? 'left' : tableView.filterAlign.toLowerCase() }">
@@ -902,6 +902,10 @@
         } else {
           return this.height;
         }
+      },
+      // 筛选条件数据
+      filterData() {
+        return this.$refs.tableFilter.data;
       }
     },
     watch: {
@@ -1501,8 +1505,8 @@
        * @public
        */
       resetFilter() {
-        for (let key in this.filter) {
-          delete this.filter[key];
+        for (let key in this.filterData) {
+          delete this.filterData[key];
         }
 
         //this.$forceUpdate();
@@ -1668,7 +1672,7 @@
 
               //this.$forceUpdate();
             } else {
-              if (!!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
+              if (!!(column.source || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'))) {
                 this.data.forEach(row => {
                   if (row._dataSource && row._dataSource[column.code]) {
                     return;
@@ -1696,7 +1700,7 @@
         // 数据源中包含变量需要刷新
         this.columns
           .filter(column => {
-            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
+            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'));
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -1910,7 +1914,7 @@
             if (
               !column.isStaticItem &&
               !!(column.source || '').trim() &&
-              !column.dataType.startsWith('Enum:') &&
+              !(column.dataType && column.dataType.startsWith('Enum:')) &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.code == column.code;
@@ -1941,7 +1945,7 @@
             column.triggers.forEach(item => {
               data._needClear[item.code] = true;
             });
-          } else if (data._needRefresh[column.code] && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
+          } else if (data._needRefresh[column.code] && !!(column.source || '').trim() && !(column.dataType && column.dataType.startsWith('Enum:'))) {
             let param = this.getParam(data, column, this.parentData);
 
             if (
@@ -2083,9 +2087,11 @@
       },
       // 合并后最终的筛选项
       getAllFilter() {
+        console.log('getAllFilter');
+
         let filter = {
           ...this.viewFilter,
-          ...this.filter
+          ...this.filterData
         };
 
         for (let key in filter) {
@@ -2101,7 +2107,7 @@
         let data = this.staticData;
 
         if (!this.filterDisable) {
-          let filter = this.filter;
+          let filter = this.filterData;
 
           for (let key in filter) {
             let column = key;