mooho-base-admin-plus 2.7.0 → 2.7.4

package/history.md

@@ -133,3 +133,7 @@ mooho-base-admin-plus@2.5.36 - 优化了表格选择的性能
 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

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

@@ -16573,7 +16573,20 @@ const admin = {
         const c = ((u = l.url) == null ? void 0 : u.split("?")[0]) || "", d = c.replace(/\//g, "-"), f = {};
         l.url && l.url.split("?").length > 1 && l.url.split("?")[1].split("&").forEach((p) => {
           p.split("=").length > 1 && p.split("=")[0].length > 0 && (f[p.split("=")[0]] = p.split("=")[1]);
-        }), s.children.push({
+        }), l.isFrameOut ? r.addRoute({
+          path: "/" + c,
+          name: d,
+          meta: {
+            title: getNameI18n(l),
+            description: getDescI18n(l),
+            data: f,
+            auth: !0,
+            cache: !0
+          },
+          component: () => new Promise((p) => {
+            p(a[l.templateUrl]);
+          })
+        }) : s.children.push({
           path: c,
           name: d,
           meta: {
@@ -16895,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);
@@ -27356,8 +27371,7 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["render", _sfc_re
     return {
       //changed: false,
       selected: null,
-      selectedData: null,
-      loadDataEnable: !0
+      selectedData: null
     };
   },
   props: {
@@ -27478,9 +27492,11 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["render", _sfc_re
     },
     // 弹出选择框
     dialogSelectOpen() {
-      !this.readonly && this.source && (this.param ? this.loadDataEnable = !0 : this.loadDataEnable = !1, setTimeout(async () => {
+      !this.readonly && this.source && setTimeout(async () => {
+        for (let r in this.$refs.dialogTable.filterData)
+          delete this.$refs.dialogTable.filterData[r];
         this.multi && (this.selectedData != null ? this.$refs.dialogTable.setSelected(this.selectedData) : this.$refs.dialogTable.setSelected([])), this.$refs.dialogTable.open(this.param);
-      }));
+      });
     },
     // 弹出选择框选中
     dialogCheck(r) {
@@ -41434,15 +41450,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) {
@@ -42503,7 +42521,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 = {