mooho-base-admin-plus 2.10.88 → 2.10.90

package/history.md

@@ -259,3 +259,5 @@ mooho-base-admin-plus@2.10.85 - 修复内嵌表格在打开新页面时无法更
 mooho-base-admin-plus@2.10.86 - 修复弹出选择框的bug
 mooho-base-admin-plus@2.10.87 - 修复分页控件下拉框被挡住的bug
 mooho-base-admin-plus@2.10.88 - 修复日期范围控件搜索清空后报错的bug
+mooho-base-admin-plus@2.10.89 - Excel表格报错
+mooho-base-admin-plus@2.10.90 - 表格增加禁用静态筛选

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

@@ -40209,6 +40209,13 @@ const modalForm = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_rend
      */
     returnColumns: {
       type: Array
+    },
+    /**
+     * 禁用静态筛选
+     */
+    disableStaticFilter: {
+      type: Boolean,
+      default: !1
     }
   },
   computed: {
@@ -40502,7 +40509,8 @@ function _sfc_render$s(a, r, o, s, l, c) {
           "load-data-enable": o.loadDataEnable,
           "row-class-name": o.rowClassName,
           "highlight-row": o.highlightRow,
-          returnColumns: o.returnColumns,
+          "return-columns": o.returnColumns,
+          "disable-static-filter": o.disableStaticFilter,
           onCreate: c.create,
           onEdit: c.edit,
           onShow: c.show,
@@ -40562,7 +40570,7 @@ function _sfc_render$s(a, r, o, s, l, c) {
             })
           ]),
           _: 3
-        }, 8, ["view-code", "static", "setting-enable", "select-enable", "check-cross-page", "tree-enable", "tree-load", "has-children", "create-enable", "edit-enable", "show-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", "highlight-row", "returnColumns", "onCreate", "onEdit", "onShow", "onOnBlur", "onOnChange", "onOnReady", "onOnLoadData", "onAfterInit", "onOnRowClick", "onOnRowDblclick", "onOnCellClick", "onOnSelectChange"])
+        }, 8, ["view-code", "static", "setting-enable", "select-enable", "check-cross-page", "tree-enable", "tree-load", "has-children", "create-enable", "edit-enable", "show-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", "highlight-row", "return-columns", "disable-static-filter", "onCreate", "onEdit", "onShow", "onOnBlur", "onOnChange", "onOnReady", "onOnLoadData", "onAfterInit", "onOnRowClick", "onOnRowDblclick", "onOnCellClick", "onOnSelectChange"])
       ])
     ]),
     _: 3
@@ -42353,7 +42361,7 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_r
           let o, s = {}, l = this.$refs["table_" + r.code][0].tableView, c = l.filtering;
           (c || "").trim() && (s = JSON.parse(c)), s[r.sourceDataCode] = this.data.id, r.isSourceCustom ? o = await customModelApi.query(r.sourceModel, s, null, l.isReturnSimple ? l : null) : o = await modelApi.query(r.sourceModel, s, null, l.isReturnSimple ? l : null, l.functionName, l.functionType), this.$refs["table_" + r.code][0].loadData(o.data);
         }
-        this.$refs["table_" + r.code][0].$refs.tableFilter.onDataChange();
+        this.$refs["table_" + r.code][0].$refs.tableFilter && this.$refs["table_" + r.code][0].$refs.tableFilter.onDataChange();
       });
     }
     // // 打印
@@ -104722,6 +104730,13 @@ const _sfc_main$n = {
      */
     returnColumns: {
       type: Array
+    },
+    /**
+     * 禁用静态筛选
+     */
+    disableStaticFilter: {
+      type: Boolean,
+      default: !1
     }
   },
   computed: {
@@ -104872,8 +104887,8 @@ const _sfc_main$n = {
       }
       if (!(!this.inited && (await this.init(this.viewCode), !this.inited))) {
         if (typeof this.beforeLoadData == "function" && this.beforeLoadData(), a && (this.staticData = this.copy(a)), this.current <= 0 && (this.current = 1), this.static) {
-          let r = this.getFilterResult();
-          this.total = r.length, this.total == 0 ? this.current = 1 : this.current > Math.ceil(this.total / this.size) && (this.current = Math.ceil(this.total / this.size));
+          let r = this.staticData;
+          this.disableStaticFilter || (r = this.getFilterResult()), this.total = r.length, this.total == 0 ? this.current = 1 : this.current > Math.ceil(this.total / this.size) && (this.current = Math.ceil(this.total / this.size));
           let o = (this.current - 1) * this.size;
           this.data = o + this.size >= r.length ? r.slice(o, r.length) : r.slice(o, o + this.size);
         } else {
@@ -106405,7 +106420,7 @@ function _sfc_render$n(a, r, o, s, l, c) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-14066509"]]), __vite_glob_1_33 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-2d80e5ff"]]), __vite_glob_1_33 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {