mooho-base-admin-plus 2.3.0 → 2.3.2

package/history.md

@@ -17,3 +17,5 @@
 2.2.13 - 修复 2.2.10 bug
 2.2.14 - 筛选栏数据处理机制变化，修复默认值 bug
 2.3.0 - 表格只读文本字段增加强制单行、固定在最前选项
+2.3.1 - 前端增加默认每页默认数量配置 layout.pageSize
+2.3.2 - 修改表格 open 时参数无法带入的 bug

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

@@ -6807,7 +6807,8 @@ const Setting = {
     maskClosable: true,
     draggable: true,
     alertStyle: "SweetAlert",
-    filterWidth: 125
+    filterWidth: 125,
+    pageSize: 10
   },
   page: {
     opened: [],
@@ -41498,7 +41499,6 @@ const _sfc_main$r = {
             } else if (item.dataType === "Boolean" && item.defaultValue.toUpperCase == "FALSE") {
               this.setFilterData(data2, item, false);
             } else {
-              console.log("this.setFilterData", data2, item, item.defaultValue);
               this.setFilterData(data2, item, item.defaultValue);
             }
           }
@@ -41636,7 +41636,6 @@ const _sfc_main$r = {
       }
     },
     onSelectDataChange(sender, selected) {
-      console.log("onSelectDataChange", sender, selected);
       let code2;
       if (sender.code.endsWith("ID")) {
         code2 = sender.code.substr(0, sender.code.length - 2);
@@ -42357,7 +42356,7 @@ const _sfc_main$q = {
       }
     },
     filterData() {
-      return this.$refs.tableFilter.data;
+      return this.$refs.tableFilter ? this.$refs.tableFilter.data : null;
     }
   },
   watch: {},
@@ -42474,7 +42473,7 @@ const _sfc_main$q = {
       if (this.tableView.size) {
         this.size = this.tableView.size;
       } else if (this.tableView.pageEnable && this.pageEnable) {
-        this.size = 10;
+        this.size = Setting.layout.pageSize;
       } else {
         this.size = 1e3;
       }
@@ -43156,10 +43155,10 @@ const _sfc_main$q = {
       this.search();
     },
     getAllFilter() {
-      console.log("getAllFilter");
+      var _a2;
       let filter2 = {
         ...this.viewFilter,
-        ...this.filterData
+        ...(_a2 = this.filterData) != null ? _a2 : {}
       };
       for (let key in filter2) {
         if (typeof filter2[key] == "object" && !(filter2[key] instanceof Date)) {
@@ -52832,8 +52831,7 @@ const _sfc_main$l = {
     return {
       opened: false,
       tableView: {},
-      param: {},
-      tableFilter: {}
+      param: {}
     };
   },
   created() {
@@ -52951,7 +52949,7 @@ const _sfc_main$l = {
       return this.$refs.table;
     },
     filterData() {
-      return this.$refs.tableFilter.data;
+      return this.$refs.table.filterData;
     },
     screenWidth() {
       return document.body.clientWidth * 0.8;
@@ -52962,12 +52960,16 @@ const _sfc_main$l = {
       await this.$refs.table.init(viewCode, callback, onFail);
     },
     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(() => {
         this.$refs.table.loadData();
@@ -53105,7 +53107,6 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
           ref: "table",
           "view-code": $props.viewCode,
           static: this.static,
-          filter: $data.tableFilter,
           "setting-enable": $props.settingEnable,
           "auto-load": false,
           "select-enable": $props.selectEnable,
@@ -53186,7 +53187,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
             })
           ]),
           _: 3
-        }, 8, ["view-code", "static", "filter", "setting-enable", "select-enable", "check-cross-page", "tree-enable", "tree-load", "has-children", "create-enable", "edit-enable", "remove-enable", "draggable", "filter-enable", "page-enable", "embedded", "before-load-data", "on-search", "summary-method", "page-size-opts", "span-method", "load-data-enable", "row-class-name", "onCreate", "onEdit", "onOnReady", "onOnLoadData", "onAfterInit", "onOnDragDrop"])
+        }, 8, ["view-code", "static", "setting-enable", "select-enable", "check-cross-page", "tree-enable", "tree-load", "has-children", "create-enable", "edit-enable", "remove-enable", "draggable", "filter-enable", "page-enable", "embedded", "before-load-data", "on-search", "summary-method", "page-size-opts", "span-method", "load-data-enable", "row-class-name", "onCreate", "onEdit", "onOnReady", "onOnLoadData", "onAfterInit", "onOnDragDrop"])
       ])
     ]),
     _: 3