mooho-base-admin-plus 2.4.40 → 2.4.42

package/history.md

@@ -72,3 +72,5 @@ mooho-base-admin-plus@2.4.37 - 增加component导出
 mooho-base-admin-plus@2.4.38 - 修复上一版本bug
 mooho-base-admin-plus@2.4.39 - 修复菜单管理界面无法用关键词查询的bug
 mooho-base-admin-plus@2.4.40 - 表格序号列表头增加序号显示
+mooho-base-admin-plus@2.4.41 - 修复页面权限判断的bug
+mooho-base-admin-plus@2.4.42 - 修复可筛选下拉框的bug，修复页面出滚动条的问题

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

@@ -22204,11 +22204,7 @@ var menu = {
           }
           let permissions = {};
           res2.permissions.forEach((key) => {
-            let permissionKey = key.split("?")[0];
-            if (key.split("$").length > 1) {
-              permissionKey = permissionKey + "$" + key.split("$")[1];
-            }
-            permissions[permissionKey] = true;
+            permissions[key.split("?")[0]] = true;
           });
           state.userPermissions = permissions;
           setNativePermission(permissions);
@@ -22935,7 +22931,7 @@ var mixinPage = {
       if (key.startsWith("permission/")) {
         return this.userPermissions[key];
       } else {
-        let url = router$1.currentRoute.value.fullPath.substr(1);
+        let url = router$1.currentRoute.value.fullPath.substr(1).split("?")[0];
         if (this.userPermissions[url + "$" + key] == true) {
           return true;
         }
@@ -23156,7 +23152,6 @@ var mixinPage = {
       return data2;
     },
     setArrayData(model2, expression2, value) {
-      console.log("setArrayData", expression2, value);
       let data2 = "";
       if (value != null) {
         data2 = JSON.stringify(value);
@@ -36460,9 +36455,7 @@ const _sfc_main$1b = {
       if (this.isJSON(value)) {
         data2 = JSON.parse(value);
       }
-      setTimeout(() => {
-        this.loadComboDataLabel(model2, column, data2);
-      });
+      this.loadComboDataLabel(model2, column, data2);
       return data2;
     },
     async loadComboDataLabel(model2, column, data2) {
@@ -36492,27 +36485,34 @@ const _sfc_main$1b = {
             pendings.push(newValue);
           }
         }
-        if (pendings.length > 0) {
-          let param = this.getParam(model2, column);
-          param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
-          let res2;
-          if (column.isSourceCustom) {
-            res2 = await customModelApi.query(column.source, param);
-          } else {
-            res2 = await modelApi.query(column.source, param);
-          }
-          res2.data.forEach((item) => {
-            let v = this.parseData(item, column.sourceDataCode);
-            let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect")
-              ;
-            let newValue = pendings.find((i3) => i3.value == v);
-            if (newValue) {
-              newValue.label = label;
+        setTimeout(async () => {
+          if (pendings.length > 0) {
+            let param = this.getParam(model2, column);
+            param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
+            let res2;
+            if (column.isSourceCustom) {
+              res2 = await customModelApi.query(column.source, param);
+            } else {
+              res2 = await modelApi.query(column.source, param);
             }
-          });
-          this.$forceUpdate();
-        }
+            res2.data.forEach((item) => {
+              let v = this.parseData(item, column.sourceDataCode);
+              let label = this.parseData(item, column.sourceDisplayCode);
+              if (column.controlType == "ComboSelect")
+                ;
+              let newValue = pendings.find((i3) => i3.value == v);
+              if (newValue) {
+                newValue.label = label;
+              }
+            });
+            this.$forceUpdate();
+          }
+        });
+      }
+    },
+    onComboQueryChange(column, query) {
+      if (!(query || "").trim()) {
+        this.loadOption(this.data, column, null);
       }
     }
   }
@@ -36844,7 +36844,9 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
                       style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                       placeholder: column.description,
                       transfer: true,
-                      onOnChange: (selected) => _ctx.onSelectDataChange(column, selected)
+                      onOnChange: (selected) => _ctx.onSelectDataChange(column, selected),
+                      onOnQueryChange: (query) => $options.onComboQueryChange(column, query),
+                      onOnClear: ($event) => $options.loadOption($data.data, column, null)
                     }, {
                       default: withCtx(() => [
                         (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
@@ -36860,7 +36862,7 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
                         }), 128))
                       ]),
                       _: 2
-                    }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])
+                    }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange", "onOnClear"])
                   ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
                     key: 11,
                     ref: "control_" + column.code,
@@ -36874,7 +36876,8 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
                     style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                     placeholder: column.description,
                     transfer: true,
-                    onOnChange: (selected) => _ctx.onSelectDataChange(column, selected)
+                    onOnChange: (selected) => _ctx.onSelectDataChange(column, selected),
+                    onOnQueryChange: (query) => $options.onComboQueryChange(column, query)
                   }, {
                     default: withCtx(() => [
                       (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
@@ -36890,7 +36893,7 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
                       }), 128))
                     ]),
                     _: 2
-                  }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                  }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
                     key: 12,
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
@@ -40264,9 +40267,7 @@ const _sfc_main$12 = {
       if (this.isJSON(value)) {
         data2 = JSON.parse(value);
       }
-      setTimeout(() => {
-        this.loadComboDataLabel(model2, column, data2);
-      });
+      this.loadComboDataLabel(model2, column, data2);
       return data2;
     },
     async loadComboDataLabel(model2, column, data2) {
@@ -40291,27 +40292,34 @@ const _sfc_main$12 = {
             pendings.push(newValue);
           }
         }
-        if (pendings.length > 0) {
-          let param = this.getParam(model2, column);
-          param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
-          let res2;
-          if (column.isSourceCustom) {
-            res2 = await customModelApi.query(column.source, param);
-          } else {
-            res2 = await modelApi.query(column.source, param);
-          }
-          res2.data.forEach((item) => {
-            let v = this.parseData(item, column.sourceDataCode);
-            let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect")
-              ;
-            let newValue = pendings.find((i3) => i3.value == v);
-            if (newValue) {
-              newValue.label = label;
+        setTimeout(async () => {
+          if (pendings.length > 0) {
+            let param = this.getParam(model2, column);
+            param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
+            let res2;
+            if (column.isSourceCustom) {
+              res2 = await customModelApi.query(column.source, param);
+            } else {
+              res2 = await modelApi.query(column.source, param);
             }
-          });
-          this.$forceUpdate();
-        }
+            res2.data.forEach((item) => {
+              let v = this.parseData(item, column.sourceDataCode);
+              let label = this.parseData(item, column.sourceDisplayCode);
+              if (column.controlType == "ComboSelect")
+                ;
+              let newValue = pendings.find((i3) => i3.value == v);
+              if (newValue) {
+                newValue.label = label;
+              }
+            });
+            this.$forceUpdate();
+          }
+        });
+      }
+    },
+    onComboQueryChange(column, query) {
+      if (!(query || "").trim()) {
+        this.loadOption(this.data, column, null);
       }
     }
   }
@@ -40546,7 +40554,9 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   placeholder: column.description,
                   transfer: true,
-                  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                  onOnChange: (selected) => $options.onSelectDataChange(column, selected),
+                  onOnQueryChange: (query) => $options.onComboQueryChange(column, query),
+                  onOnClear: ($event) => $options.loadOption($data.data, column, null)
                 }, {
                   default: withCtx(() => [
                     (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
@@ -40562,7 +40572,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                     }), 128))
                   ]),
                   _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange", "onOnClear"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
                   key: 11,
                   ref_for: true,
                   ref: "control_" + column.code,
@@ -40577,7 +40587,8 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   placeholder: column.description,
                   transfer: true,
-                  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                  onOnChange: (selected) => $options.onSelectDataChange(column, selected),
+                  onOnQueryChange: (query) => $options.onComboQueryChange(column, query)
                 }, {
                   default: withCtx(() => [
                     (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
@@ -40593,7 +40604,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                     }), 128))
                   ]),
                   _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
                   key: 12,
                   size: "small",
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42627,9 +42638,7 @@ const _sfc_main$$ = {
       if (this.isJSON(value)) {
         data2 = JSON.parse(value);
       }
-      setTimeout(() => {
-        this.loadComboDataLabel(model2, column, data2);
-      });
+      this.loadComboDataLabel(model2, column, data2);
       return data2;
     },
     async loadComboDataLabel(model2, column, data2) {
@@ -42637,13 +42646,13 @@ const _sfc_main$$ = {
         return;
       }
       if (this.$refs["control_" + column.code] && data2) {
-        let values = this.$refs["control_" + column.code][0].$data.values;
+        let values = this.$refs["control_" + column.code][0].values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
           data2.forEach((value) => {
             if (!values.some((v) => v.value == value)) {
               let newValue = { value, label: null, disabled: false };
-              values.push(newValue);
+              this.$refs["control_" + column.code][0].values.push(newValue);
               pendings.push(newValue);
             }
           });
@@ -42654,27 +42663,34 @@ const _sfc_main$$ = {
             pendings.push(newValue);
           }
         }
-        if (pendings.length > 0) {
-          let param = this.getParam(model2, column);
-          param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
-          let res2;
-          if (column.isSourceCustom) {
-            res2 = await customModelApi.query(column.source, param);
-          } else {
-            res2 = await modelApi.query(column.source, param);
-          }
-          res2.data.forEach((item) => {
-            let v = this.parseData(item, column.sourceDataCode);
-            let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect")
-              ;
-            let newValue = pendings.find((i3) => i3.value == v);
-            if (newValue) {
-              newValue.label = label;
+        setTimeout(async () => {
+          if (pendings.length > 0) {
+            let param = this.getParam(model2, column);
+            param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
+            let res2;
+            if (column.isSourceCustom) {
+              res2 = await customModelApi.query(column.source, param);
+            } else {
+              res2 = await modelApi.query(column.source, param);
             }
-          });
-          this.$forceUpdate();
-        }
+            res2.data.forEach((item) => {
+              let v = this.parseData(item, column.sourceDataCode);
+              let label = this.parseData(item, column.sourceDisplayCode);
+              if (column.controlType == "ComboSelect")
+                ;
+              let newValue = pendings.find((i3) => i3.value == v);
+              if (newValue) {
+                newValue.label = label;
+              }
+            });
+            this.$forceUpdate();
+          }
+        });
+      }
+    },
+    onComboQueryChange(column, query) {
+      if (!(query || "").trim()) {
+        this.loadOption(this.data, column, null);
       }
     }
   }
@@ -42990,7 +43006,9 @@ function _sfc_render$$(_ctx, _cache, $props, $setup, $data, $options) {
                             style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                             placeholder: column.description,
                             transfer: true,
-                            onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                            onOnChange: (selected) => $options.onSelectDataChange(column, selected),
+                            onOnQueryChange: (query) => $options.onComboQueryChange(column, query),
+                            onOnClear: ($event) => $options.loadOption($data.data, column, null)
                           }, {
                             default: withCtx(() => [
                               (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
@@ -43006,7 +43024,7 @@ function _sfc_render$$(_ctx, _cache, $props, $setup, $data, $options) {
                               }), 128))
                             ]),
                             _: 2
-                          }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])
+                          }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange", "onOnClear"])
                         ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
                           key: 11,
                           ref_for: true,