mooho-base-admin-plus 2.7.1 → 2.7.5

package/history.md

@@ -134,3 +134,7 @@ mooho-base-admin-plus@2.6.0 - 增加已办
 mooho-base-admin-plus@2.6.1 - 增加标签控件
 mooho-base-admin-plus@2.7.0 - 工作流增加折线
 mooho-base-admin-plus@2.7.1 - 弹出选择框弹出时默认清空筛选内容
+mooho-base-admin-plus@2.7.2 - 修复字典缓存的bug
+mooho-base-admin-plus@2.7.3 - 修复公式最后一位为)时的bug
+mooho-base-admin-plus@2.7.4 - 修复全选的bug
+mooho-base-admin-plus@2.7.5 - 将List组件改为后端分页

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

@@ -16908,20 +16908,22 @@ const initRouter = (r, a) => {
         return null;
       text = text.toString();
       let result = "", expression = "";
-      for (let r = 0; r < text.length; r++)
-        if (text[r] == " " || text[r] == "+" || text[r] == "-" || text[r] == "*" || text[r] == "/" || text[r] == "(" || text[r] == ")" || text[r] == ">" || text[r] == "<" || text[r] == "!" || text[r] == "|" || text[r] == "&" || text[r] == "=" || r == text.length - 1) {
-          if (r == text.length - 1 && (expression += text[r]), (expression || "").trim()) {
+      for (let r = 0; r < text.length; r++) {
+        const a = text[r] == " " || text[r] == "+" || text[r] == "-" || text[r] == "*" || text[r] == "/" || text[r] == "(" || text[r] == ")" || text[r] == ">" || text[r] == "<" || text[r] == "!" || text[r] == "|" || text[r] == "&" || text[r] == "=";
+        if (a || r == text.length - 1) {
+          if (a || (expression += text[r]), (expression || "").trim()) {
             if (!isNaN(expression) || expression.substr(0, 1) == "'" || expression.substr(0, 1) == '"' || expression == "null")
               result += expression;
             else {
-              let a = this.parseData(model, expression);
-              a == null || typeof a == "object" ? result += expression : isNaN(a) || a.toString().length > 16 ? result += "'" + String(a) + "'" : result += String(a);
+              let o = this.parseData(model, expression);
+              o == null || typeof o == "object" ? result += expression : isNaN(o) || o.toString().length > 16 ? result += "'" + String(o) + "'" : result += String(o);
             }
             expression = "";
           }
-          r != text.length - 1 && (result += text[r]);
+          a && (result += text[r]);
         } else
           expression += text[r];
+      }
       let data = null;
       try {
         console.log("expression", text, result), data = eval(result), (data != "NaN" && String(data) == "NaN" || typeof data == "number" && (String(data) == "Infinity" || String(data) == "-Infinity")) && (data = null);
@@ -39990,11 +39992,14 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_r
               d.needClear = !0;
             });
           else if (u.controlType === "List" && c != null) {
-            let d, f = this.$refs["list_" + u.code][0].tableView, p = f.filtering;
-            (p || "").trim() && (c = {
+            let f = this.$refs["list_" + u.code][0].tableView.filtering;
+            (f || "").trim() && (c = {
               ...c,
-              ...JSON.parse(p)
-            }), u.isSourceCustom ? d = await customModelApi.query(u.sourceModel, c) : d = await modelApi.query(u.sourceModel, c, f.functionName, f.functionType), this.$refs["list_" + u.code][0].loadData(d.data);
+              ...JSON.parse(f)
+            });
+            for (let p in c)
+              this.$refs["list_" + u.code][0].filterData[p] = c[p];
+            this.$refs["list_" + u.code][0].loadData();
           }
         }
         u.needClear = !1, u.needRefresh = !1;
@@ -40196,10 +40201,9 @@ function _sfc_render$o(r, a, o, s, l, u) {
                     createVNode$1(d, {
                       ref_for: !0,
                       ref: "list_" + B.code,
-                      static: !0,
                       "view-code": B.source,
                       readonly: !0,
-                      embedded: !0
+                      "auto-load": !1
                     }, null, 8, ["view-code"])
                   ])) : createCommentVNode("", !0),
                   B.controlType !== "Placeholder" && B.controlType !== "Title" && B.controlType !== "Table" && B.controlType !== "List" ? (openBlock(), createBlock(U, {
@@ -41448,15 +41452,17 @@ const _sfc_main$n = {
       a._checked = !1, this.selectedData.splice(o, 1), this.$emit("on-select-change");
     },
     onSelectAll(r) {
-      let a = this.getDataWithChildren(this.data);
-      this.selectedData.length = 0, a.forEach((o) => {
-        o._checked = !0, this.selectedData.push(o);
+      this.getDataWithChildren(this.data).forEach((o) => {
+        o._checked = !0, this.selectedData.some((s) => s.id == o.id) || this.selectedData.push(o);
       }), this.$emit("on-select-change");
     },
     onSelectAllCancel(r) {
       this.getDataWithChildren(this.data).forEach((o) => {
-        o._checked = !1;
-      }), this.selectedData.length = 0, this.$emit("on-select-change");
+        if (o._checked = !1, this.selectedData.some((s) => s.id == o.id)) {
+          const s = this.selectedData.findIndex((l) => l.id === o.id);
+          this.selectedData.splice(s, 1);
+        }
+      }), this.$emit("on-select-change");
     },
     // 键盘事件
     onKeyup(r) {
@@ -42517,7 +42523,7 @@ function _sfc_render$n(r, a, o, s, l, u) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-5d5ec11e"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-38e40259"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {