mooho-base-admin-plus 2.3.8 → 2.3.10

package/history.md

@@ -26,3 +26,5 @@
 2.3.6 - 解决修改筛选导致的弹出选择框 bug
 2.3.7 - 继续解决修改筛选导致的弹出选择框 bug
 2.3.8 - 增加可筛选选择框支持
+2.3.9 - 优化默认筛选参数:filter 的处理方式
+2.3.10 - 可筛选选择框 bug 修复

package/package/mooho-base-admin-plus.min.esm.js

@@ -37553,7 +37553,7 @@ const _sfc_main$w = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code]) {
+      if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -41581,9 +41581,6 @@ const _sfc_main$r = {
     tableView: {
       type: Object
     },
-    filter: {
-      type: Object
-    },
     columns: {
       type: Array
     }
@@ -41597,10 +41594,6 @@ const _sfc_main$r = {
   methods: {
     init() {
       let data2 = this.data;
-      if (this.filter) {
-        lodash$1.exports.defaultsDeep(data2, this.filter);
-        lodash$1.exports.assign(this.filter, data2);
-      }
       this.columns.forEach((item) => {
         if (item.defaultValue) {
           if (item.defaultValue == "{today}") {
@@ -42009,7 +42002,7 @@ const _sfc_main$r = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code]) {
+      if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -43432,10 +43425,11 @@ const _sfc_main$q = {
       this.search();
     },
     getAllFilter() {
-      var _a2;
+      var _a2, _b2;
       let filter2 = {
         ...this.viewFilter,
-        ...(_a2 = this.filterData) != null ? _a2 : {}
+        ...(_a2 = this.filter) != null ? _a2 : {},
+        ...(_b2 = this.filterData) != null ? _b2 : {}
       };
       for (let key in filter2) {
         if (this.isJSON(filter2[key])) {
@@ -43447,9 +43441,14 @@ const _sfc_main$q = {
       return filter2;
     },
     getFilterResult() {
+      var _a2, _b2;
       let data2 = this.staticData;
       if (!this.filterDisable) {
-        let filter2 = this.filterData;
+        let filter2 = {
+          ...this.viewFilter,
+          ...(_a2 = this.filter) != null ? _a2 : {},
+          ...(_b2 = this.filterData) != null ? _b2 : {}
+        };
         for (let key in filter2) {
           let column = key;
           let value = filter2[key];
@@ -43851,7 +43850,7 @@ const _sfc_main$q = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code + "_" + index2]) {
+      if (this.$refs["control_" + column.code + "_" + index2] && data2) {
         let values = this.$refs["control_" + column.code + "_" + index2].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -43983,7 +43982,6 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 renderSlot(_ctx.$slots, "customFilter", {}, void 0, true),
                 createVNode$1(_component_table_filter, {
                   ref: "tableFilter",
-                  filter: $props.filter,
                   columns: $data.filterColumns,
                   "table-view": $data.tableView,
                   onOnKeyup: $options.onKeyup
@@ -43996,7 +43994,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     }, void 0, true)
                   ]),
                   _: 3
-                }, 8, ["filter", "columns", "table-view", "onOnKeyup"]),
+                }, 8, ["columns", "table-view", "onOnKeyup"]),
                 createVNode$1(_component_Col, mergeProps(_ctx.getGrid($data.tableView.filterWidth), {
                   style: { "text-align": $data.tableView.filterAlign == null ? "left" : $data.tableView.filterAlign.toLowerCase() }
                 }), {
@@ -51886,7 +51884,7 @@ const _sfc_main$o = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code]) {
+      if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {