mooho-base-admin-plus 2.10.79 → 2.10.81

package/history.md

@@ -250,3 +250,5 @@ mooho-base-admin-plus@2.10.76 - 增加筛选控件使用父对象作为条件的
 mooho-base-admin-plus@2.10.77 - 内嵌表格增加重新加载方法
 mooho-base-admin-plus@2.10.78 - 修复上一版本的bug
 mooho-base-admin-plus@2.10.79 - Excel表格必填标致放标题左边
+mooho-base-admin-plus@2.10.80 - Excel表格支持可筛选选择框
+mooho-base-admin-plus@2.10.81 - 优化弹出选择控件

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

@@ -7517,14 +7517,16 @@ const showFormat = {}, mixinPage = {
       return lodashExports.cloneDeep(a);
     },
     allow(a) {
-      if (a.startsWith("permission/"))
-        return this.userPermissions[a];
-      {
-        let r = this.$router.currentRoute.value.fullPath.substr(1).split("?")[0];
-        if (this.userPermissions[r + "$" + a] == !0)
-          return !0;
-        let o = Object.keys(this.userPermissions).filter((s) => s.startsWith(r + "$")).length;
-        return this.userPermissions[r] == !0 && o == 0;
+      if (this.userPermissions) {
+        if (a.startsWith("permission/"))
+          return this.userPermissions[a];
+        {
+          let r = this.$router.currentRoute.value.fullPath.substr(1).split("?")[0];
+          if (this.userPermissions[r + "$" + a] == !0)
+            return !0;
+          let o = Object.keys(this.userPermissions).filter((s) => s.startsWith(r + "$")).length;
+          return this.userPermissions[r] == !0 && o == 0;
+        }
       }
     },
     getCache(a, r) {
@@ -30327,7 +30329,8 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_re
     return {
       //changed: false,
       selected: null,
-      selectedData: null
+      selectedData: null,
+      dialogTable: null
     };
   },
   props: {
@@ -30448,37 +30451,34 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_re
     },
     // 弹出选择框
     dialogSelectOpen() {
-      !this.readonly && this.source && setTimeout(async () => {
-        for (let a in this.$refs.dialogTable.filterData)
-          delete this.$refs.dialogTable.filterData[a];
-        this.multi && (this.selectedData != null ? this.$refs.dialogTable.setSelected(this.selectedData) : this.$refs.dialogTable.setSelected([])), this.$refs.dialogTable.open(this.param);
+      let a = this.$parent;
+      for (; a.$parent != null && a.$refs.dialogTable == null; )
+        a = a.$parent;
+      this.multi ? this.dialogTable = a.$refs.multiDialogTable : this.dialogTable = a.$refs.dialogTable, this.dialogTable.init(this.source, () => {
+        !this.readonly && this.source && setTimeout(async () => {
+          for (let r in this.dialogTable.filterData)
+            delete this.dialogTable.filterData[r];
+          this.multi ? (this.selectedData != null ? this.dialogTable.setSelected(this.selectedData) : this.dialogTable.setSelected([]), a.openMultiDialogTable(this.param, this.multiSave)) : a.openDialogTable(this.param, this.dialogCheck);
+        });
       });
     },
-    // 弹出选择框选中
-    dialogCheck(a) {
-      this.$emit("update:modelValue", this.parseData(a, this.sourceDataCode)), this.selected = this.parseData(a, this.sourceDisplayCode), this.selectedData = a, this.$emit("on-change", a), this.$refs.dialogTable.close();
-    },
     // 弹出选择框移除内容
     dialogSelectRemove() {
       this.$emit("update:modelValue", null), this.selected = null, this.selectedData = null, this.$emit("on-change");
     },
+    // 弹出选择框选中
+    dialogCheck(a) {
+      this.$emit("update:modelValue", this.parseData(a, this.sourceDataCode)), this.selected = this.parseData(a, this.sourceDisplayCode), this.selectedData = a, this.$emit("on-change", a), this.dialogTable.close();
+    },
     // 多选保存
     multiSave() {
-      let a = this.$refs.dialogTable.getSelected(), r = a.length == 0 ? null : a.map((s) => this.parseData(s, this.sourceDataCode)), o = a.length == 0 ? null : a.map((s) => this.parseData(s, this.sourceDisplayCode)).join(",");
-      this.$emit("update:modelValue", JSON.stringify(r)), this.selected = o, this.selectedData = r, this.$emit("on-change", r, o), this.$refs.dialogTable.close();
-    },
-    // 关闭
-    close() {
-      this.$refs.dialogTable.close();
-    },
-    // 双击行选中
-    dialogTableRowDblclick(a) {
-      this.multi || this.dialogCheck(a);
+      let a = this.dialogTable.getSelected(), r = a.length == 0 ? null : a.map((s) => this.parseData(s, this.sourceDataCode)), o = a.length == 0 ? null : a.map((s) => this.parseData(s, this.sourceDisplayCode)).join(",");
+      this.$emit("update:modelValue", JSON.stringify(r)), this.selected = o, this.selectedData = r, this.$emit("on-change", r, o), this.dialogTable.close();
     }
   }
 };
 function _sfc_render$F(a, r, o, s, l, c) {
-  const u = resolveComponent("Button"), d = resolveComponent("Input"), f = resolveComponent("modal-table");
+  const u = resolveComponent("Button"), d = resolveComponent("Input");
   return openBlock(), createElementBlock("div", null, [
     createVNode$1(d, {
       type: "text",
@@ -30486,67 +30486,20 @@ function _sfc_render$F(a, r, o, s, l, c) {
       readonly: "",
       clearable: !o.readonly,
       modelValue: l.selected,
-      "onUpdate:modelValue": r[1] || (r[1] = (p) => l.selected = p),
+      "onUpdate:modelValue": r[1] || (r[1] = (f) => l.selected = f),
       style: normalizeStyle$1({ width: o.controlWidth == null ? null : o.controlWidth + "px" }),
-      onOnFocus: r[2] || (r[2] = (p) => c.dialogSelectOpen()),
-      onOnClear: r[3] || (r[3] = (p) => c.dialogSelectRemove())
+      onOnFocus: r[2] || (r[2] = (f) => c.dialogSelectOpen()),
+      onOnClear: r[3] || (r[3] = (f) => c.dialogSelectRemove())
     }, {
       prepend: withCtx(() => [
         createVNode$1(u, {
           size: o.size,
           "custom-icon": "fa fa-search",
-          onClick: r[0] || (r[0] = (p) => c.dialogSelectOpen())
+          onClick: r[0] || (r[0] = (f) => c.dialogSelectOpen())
         }, null, 8, ["size"])
       ]),
       _: 1
-    }, 8, ["size", "clearable", "modelValue", "style"]),
-    createVNode$1(f, {
-      ref: "dialogTable",
-      "view-code": o.source,
-      autoLoad: !1,
-      "select-enable": o.multi,
-      "check-cross-page": !0,
-      "footer-enable": o.multi,
-      onOnRowDblclick: c.dialogTableRowDblclick
-    }, {
-      command: withCtx(({ row: p }) => [
-        o.multi ? createCommentVNode("", !0) : (openBlock(), createBlock(u, {
-          key: 0,
-          size: "small",
-          type: "primary",
-          "custom-icon": "fa fa-check",
-          onClick: (g) => c.dialogCheck(p)
-        }, {
-          default: withCtx(() => [
-            createTextVNode(toDisplayString$2(a.$t("Front_Btn_Select")), 1)
-          ]),
-          _: 1
-        }, 8, ["onClick"]))
-      ]),
-      footer: withCtx(() => [
-        createVNode$1(u, {
-          type: "primary",
-          "custom-icon": "fa fa-save",
-          onClick: c.multiSave
-        }, {
-          default: withCtx(() => [
-            createTextVNode(toDisplayString$2(a.$t("Front_Btn_OK")), 1)
-          ]),
-          _: 1
-        }, 8, ["onClick"]),
-        createVNode$1(u, {
-          type: "default",
-          "custom-icon": "fa fa-times",
-          onClick: r[4] || (r[4] = (p) => c.close())
-        }, {
-          default: withCtx(() => [
-            createTextVNode(toDisplayString$2(a.$t("Front_Btn_Close")), 1)
-          ]),
-          _: 1
-        })
-      ]),
-      _: 1
-    }, 8, ["view-code", "select-enable", "footer-enable", "onOnRowDblclick"])
+    }, 8, ["size", "clearable", "modelValue", "style"])
   ]);
 }
 const DialogSelect = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_render$F]]), __vite_glob_1_5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -104104,8 +104057,7 @@ const _sfc_main$o = {
                 c.type = "numeric";
               else if (l.controlType === "Check")
                 c.type = "checkbox";
-              else if (l.controlType === "Select") {
-                c.editor = "select";
+              else if (l.controlType === "Select" || l.controlType == "ComboSelect") {
                 let u = [];
                 if (c.isStaticItem)
                   (c.itemData || "").trim() && c.itemData.split(/[\n]/).forEach((d) => {
@@ -104151,7 +104103,16 @@ const _sfc_main$o = {
                     name: this.parseData(p, c.sourceDisplayCode)
                   }));
                 }
-                c.selectOptions = u.map((d) => d.id);
+                l.controlType == "Select" ? (c.editor = "select", c.selectOptions = u.map((d) => d.id)) : l.controlType == "ComboSelect" && (c.type = "autocomplete", c.dropdownMenu = !0, c.strict = !0, c.source = (d, f) => {
+                  let p = [];
+                  if (d) {
+                    const v = d.toLowerCase();
+                    p = u.filter((y) => y.name.toLowerCase().includes(v));
+                  } else
+                    p = [...u];
+                  const g = p.map((v) => v.name);
+                  f(g);
+                });
               } else l.controlType === "Date" && (c.type = "date", c.dateFormat = "YYYY-MM-DD", c.correctFormat = !0);
             return c;
           })
@@ -106892,6 +106853,12 @@ setMatchMedia();
 const _sfc_main$l = {
   name: "app",
   components: { loader: loader$1 },
+  data() {
+    return {
+      dialogCheck: null,
+      multiSave: null
+    };
+  },
   computed: {},
   methods: {
     ...mapMutations("admin/layout", ["setDevice", "setBodyHeight"]),
@@ -106904,6 +106871,18 @@ const _sfc_main$l = {
     },
     handleSetBodyHeight() {
       this.setBodyHeight(document.body.offsetHeight);
+    },
+    // 打开多选表格
+    openMultiDialogTable(a, r) {
+      this.multiSave = r, this.$refs.multiDialogTable.open(a);
+    },
+    // 打开单选表格
+    openDialogTable(a, r) {
+      this.dialogCheck = r, this.$refs.dialogTable.open(a);
+    },
+    // 双击行选中
+    dialogTableRowDblclick(a) {
+      this.dialogCheck(a);
     }
   },
   mounted() {
@@ -106914,10 +106893,62 @@ const _sfc_main$l = {
   }
 }, _hoisted_1$c = { id: "app" };
 function _sfc_render$l(a, r, o, s, l, c) {
-  const u = resolveComponent("router-view"), d = resolveComponent("loader");
+  const u = resolveComponent("router-view"), d = resolveComponent("loader"), f = resolveComponent("Button"), p = resolveComponent("modal-table");
   return openBlock(), createElementBlock("div", _hoisted_1$c, [
     createVNode$1(u),
-    createVNode$1(d)
+    createVNode$1(d),
+    createVNode$1(p, {
+      ref: "multiDialogTable",
+      autoLoad: !1,
+      "select-enable": !0,
+      "check-cross-page": !0,
+      "footer-enable": !0
+    }, {
+      footer: withCtx(() => [
+        createVNode$1(f, {
+          type: "primary",
+          "custom-icon": "fa fa-save",
+          onClick: l.multiSave
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString$2(a.$t("Front_Btn_OK")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"]),
+        createVNode$1(f, {
+          type: "default",
+          "custom-icon": "fa fa-times",
+          onClick: r[0] || (r[0] = (g) => a.$refs.dialogTable.close())
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString$2(a.$t("Front_Btn_Close")), 1)
+          ]),
+          _: 1
+        })
+      ]),
+      _: 1
+    }, 512),
+    createVNode$1(p, {
+      ref: "dialogTable",
+      autoLoad: !1,
+      "check-cross-page": !0,
+      onOnRowDblclick: c.dialogTableRowDblclick
+    }, {
+      command: withCtx(({ row: g }) => [
+        createVNode$1(f, {
+          size: "small",
+          type: "primary",
+          "custom-icon": "fa fa-check",
+          onClick: (v) => l.dialogCheck(g)
+        }, {
+          default: withCtx(() => [
+            createTextVNode(toDisplayString$2(a.$t("Front_Btn_Select")), 1)
+          ]),
+          _: 1
+        }, 8, ["onClick"])
+      ]),
+      _: 1
+    }, 8, ["onOnRowDblclick"])
   ]);
 }
 const App = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l]]), mixinApp = {