npm - mooho-base-admin-plus - Versions diffs - 2.4.44 → 2.4.46 - Mend

mooho-base-admin-plus 2.4.44 → 2.4.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/history.md +2 -0
package/package/mooho-base-admin-plus.min.esm.js +291 -376
package/package/mooho-base-admin-plus.min.js +115 -130
package/package.json +1 -1
package/src/components/input/combo-select.vue +218 -0
package/src/components/view/table-filter.vue +28 -120
package/src/components/view/view-form-draggable.vue +16 -45
package/src/components/view/view-form.vue +16 -119
package/src/components/view/view-table.vue +2 -1

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

@@ -5538,7 +5538,7 @@ var _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _sfc_main$1s = {
+const _sfc_main$1t = {
   name: "i-copyright",
   computed: {
     copyright() {
@@ -5551,7 +5551,7 @@ const _sfc_main$1s = {
     };
   }
 };
-function _sfc_render$1s(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$1t(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_GlobalFooter = resolveComponent("GlobalFooter");
   return openBlock(), createBlock(_component_GlobalFooter, {
     class: "i-copyright",
@@ -5559,7 +5559,7 @@ function _sfc_render$1s(_ctx, _cache, $props, $setup, $data, $options) {
     copyright: $options.copyright
   }, null, 8, ["links", "copyright"]);
 }
-var iCopyright = /* @__PURE__ */ _export_sfc(_sfc_main$1s, [["render", _sfc_render$1s], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/copyright/index.vue"]]);
+var iCopyright = /* @__PURE__ */ _export_sfc(_sfc_main$1t, [["render", _sfc_render$1t], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/copyright/index.vue"]]);
 var __glob_25_0 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": iCopyright
@@ -22172,7 +22172,7 @@ var mixinPage = {
     }
   }
 };
-const _sfc_main$1r = {
+const _sfc_main$1s = {
   name: "notice-list",
   mixins: [mixinPage],
   components: {},
@@ -22198,7 +22198,7 @@ const _hoisted_3$E = { class: "title" };
 const _hoisted_4$t = /* @__PURE__ */ createElementVNode("span", { class: "description" }, null, -1);
 const _hoisted_5$j = { style: { "margin": "16px", "max-height": "500px" } };
 const _hoisted_6$f = ["innerHTML"];
-function _sfc_render$1r(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$1s(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Avatar = resolveComponent("Avatar");
   const _component_view_table = resolveComponent("view-table");
   const _component_Card = resolveComponent("Card");
@@ -22286,7 +22286,7 @@ function _sfc_render$1r(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["modelValue", "mask-closable", "draggable"])
   ]);
 }
-var noticeList = /* @__PURE__ */ _export_sfc(_sfc_main$1r, [["render", _sfc_render$1r], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/home/notice-list.vue"]]);
+var noticeList = /* @__PURE__ */ _export_sfc(_sfc_main$1s, [["render", _sfc_render$1s], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/home/notice-list.vue"]]);
 var __glob_25_1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": noticeList
@@ -22309,7 +22309,7 @@ var shortcutApi = {
   }
 };
 var shortcut_vue_vue_type_style_index_0_scoped_true_lang = "";
-const _sfc_main$1q = {
+const _sfc_main$1r = {
   name: "home",
   mixins: [mixinPage],
   components: {},
@@ -22376,7 +22376,7 @@ const _hoisted_2$J = {
   style: { "height": "250px" }
 };
 const _hoisted_3$D = { class: "ivu-pt-8" };
-function _sfc_render$1q(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$1r(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Avatar = resolveComponent("Avatar");
   const _component_Icon = resolveComponent("Icon");
   const _component_Tooltip = resolveComponent("Tooltip");
@@ -22514,12 +22514,12 @@ function _sfc_render$1q(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["onOnDragDrop"])
   ]);
 }
-var shortcut = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["render", _sfc_render$1q], ["__scopeId", "data-v-a9e726d4"], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/home/shortcut.vue"]]);
+var shortcut = /* @__PURE__ */ _export_sfc(_sfc_main$1r, [["render", _sfc_render$1r], ["__scopeId", "data-v-a9e726d4"], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/home/shortcut.vue"]]);
 var __glob_25_2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": shortcut
 }, Symbol.toStringTag, { value: "Module" }));
-const _sfc_main$1p = {
+const _sfc_main$1q = {
   mixins: [mixinPage],
   data() {
     return {
@@ -22583,7 +22583,7 @@ const _sfc_main$1p = {
     }
   }
 };
-function _sfc_render$1p(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$1q(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Checkbox = resolveComponent("Checkbox");
   return openBlock(), createElementBlock("div", null, [
     (openBlock(true), createElementBlock(Fragment, null, renderList($props.dataSource, (item, index2) => {
@@ -22602,7 +22602,7 @@ function _sfc_render$1p(_ctx, _cache, $props, $setup, $data, $options) {
     }), 128))
   ]);
 }
-var CheckGroup = /* @__PURE__ */ _export_sfc(_sfc_main$1p, [["render", _sfc_render$1p], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/input/check-group.vue"]]);
+var CheckGroup = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["render", _sfc_render$1q], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/input/check-group.vue"]]);
 var __glob_25_3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": CheckGroup
@@ -22766,6 +22766,180 @@ var customModelApi = {
     LODOP.PRINTA();
   }
 };
+const _sfc_main$1p = {
+  mixins: [mixinPage],
+  data() {
+    return {
+      selected: null,
+      selectedData: null
+    };
+  },
+  props: {
+    modelValue: {
+      type: [Array, Number, String]
+    },
+    size: {
+      type: String
+    },
+    remoteMethod: {
+      type: Function
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    param: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    column: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    multi: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {},
+  watch: {
+    modelValue(value) {
+      this.selected = value;
+      this.showSelected();
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    parseComboData() {
+    },
+    setComboData(value) {
+      this.$emit("update:modelValue", value);
+    },
+    async showSelected() {
+      if (this.column.isStaticItem || this.column.dataType && this.column.dataType.startsWith("Enum:")) {
+        return;
+      }
+      if (this.$refs.select) {
+        let values = this.$refs.select.values;
+        let pendings = [];
+        if (this.multi) {
+          values.length = 0;
+          this.selected.forEach((value) => {
+            if (!values.some((v) => v.value == value)) {
+              let newValue = { value, label: null, disabled: false };
+              values.push(newValue);
+              pendings.push(newValue);
+            }
+          });
+        } else {
+          values.length = 0;
+          this.$refs.select.query = "";
+          if (!values.some((v) => v.value == this.selected)) {
+            let newValue = { value: this.selected, label: null, disabled: false };
+            values.push(newValue);
+            if (this.selected != null && this.selected != "") {
+              pendings.push(newValue);
+            }
+          }
+        }
+        setTimeout(async () => {
+          if (pendings.length > 0) {
+            let param = this.param;
+            param[this.column.sourceDataCode] = pendings.map((item) => item.value).join(",");
+            let res2;
+            if (this.column.isSourceCustom) {
+              res2 = await customModelApi.query(this.column.source, param);
+            } else {
+              res2 = await modelApi.query(this.column.source, param);
+            }
+            res2.data.forEach((item) => {
+              let v = this.parseData(item, this.column.sourceDataCode);
+              let label = this.parseData(item, this.column.sourceDisplayCode);
+              if (!this.multi) {
+                this.$refs.select.query = label;
+              }
+              let newValue = pendings.find((i3) => i3.value == v);
+              if (newValue) {
+                newValue.label = label;
+              }
+            });
+            this.$forceUpdate();
+          }
+        });
+      }
+    },
+    onComboQueryChange(query) {
+      if (!(query || "").trim()) {
+        this.remoteMethod(query);
+      }
+    },
+    onChange(selected) {
+      this.$emit("on-change", selected);
+    },
+    getDataSource() {
+      if (!this.column.isStaticItem && this.column.dataType.startsWith("Enum:")) {
+        return this.getEnumList(this.column.dataType.split(":")[1]);
+      } else {
+        return this.column.dataSource == null ? [] : this.column.dataSource;
+      }
+    }
+  }
+};
+function _sfc_render$1p(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_Option = resolveComponent("Option");
+  const _component_Select = resolveComponent("Select");
+  return openBlock(), createElementBlock("div", null, [
+    createVNode$1(_component_Select, {
+      ref: "select",
+      size: $props.size,
+      "model-value": $options.parseComboData(),
+      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => $options.setComboData($event)),
+      disabled: $props.readonly,
+      clearable: true,
+      multiple: $props.multi,
+      filterable: "",
+      remote: "",
+      "remote-method": $props.remoteMethod,
+      style: normalizeStyle$1({ width: $props.column.controlWidth == null ? null : $props.column.controlWidth + "px" }),
+      placeholder: $props.column.placeholder,
+      transfer: true,
+      onOnChange: _cache[1] || (_cache[1] = (selected) => $options.onChange(selected)),
+      onOnQueryChange: _cache[2] || (_cache[2] = (query) => $options.onComboQueryChange(query)),
+      onOnClear: $props.remoteMethod
+    }, {
+      default: withCtx(() => [
+        (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($props.data, $props.column), (item, index2) => {
+          return openBlock(), createBlock(_component_Option, {
+            key: index2,
+            value: item.id
+          }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString$2(item.name), 1)
+            ]),
+            _: 2
+          }, 1032, ["value"]);
+        }), 128))
+      ]),
+      _: 1
+    }, 8, ["size", "model-value", "disabled", "multiple", "remote-method", "style", "placeholder", "onOnClear"])
+  ]);
+}
+var comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$1p, [["render", _sfc_render$1p], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/input/combo-select.vue"]]);
+var __glob_25_4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  "default": comboSelect
+}, Symbol.toStringTag, { value: "Module" }));
 const res$g = "DataSource";
 var dataSourceApi = {
   query(dataSource, filter2) {
@@ -23091,7 +23265,7 @@ function _sfc_render$1o(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var DialogSelect = /* @__PURE__ */ _export_sfc(_sfc_main$1o, [["render", _sfc_render$1o], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/input/dialog-select.vue"]]);
-var __glob_25_4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": DialogSelect
 }, Symbol.toStringTag, { value: "Module" }));
@@ -23320,7 +23494,7 @@ function _sfc_render$1n(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var itemSelect = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_render$1n], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/input/item-select.vue"]]);
-var __glob_25_5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_6 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": itemSelect
 }, Symbol.toStringTag, { value: "Module" }));
@@ -23514,7 +23688,7 @@ function _sfc_render$1m(_ctx, _cache, $props, $setup, $data, $options) {
   ], 10, _hoisted_1$19);
 }
 var iLink = /* @__PURE__ */ _export_sfc(_sfc_main$1m, [["render", _sfc_render$1m], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/link/i-link.vue"]]);
-var __glob_25_6 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_7 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": iLink
 }, Symbol.toStringTag, { value: "Module" }));
@@ -23752,7 +23926,7 @@ function _sfc_render$1l(_ctx, _cache, $props, $setup, $data, $options) {
   }, null, 8, _hoisted_1$18);
 }
 var richEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1l, [["render", _sfc_render$1l], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/richEditor/index.vue"]]);
-var __glob_25_7 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": richEditor
 }, Symbol.toStringTag, { value: "Module" }));
@@ -23821,7 +23995,7 @@ function _sfc_render$1k(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8, ["action", "headers", "accept", "on-success", "on-error", "before-upload"]);
 }
 var fileUpload = /* @__PURE__ */ _export_sfc(_sfc_main$1k, [["render", _sfc_render$1k], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/upload/file-upload.vue"]]);
-var __glob_25_8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_9 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": fileUpload
 }, Symbol.toStringTag, { value: "Module" }));
@@ -23979,7 +24153,7 @@ function _sfc_render$1j(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var uploadAttachment = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["render", _sfc_render$1j], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/upload/upload-attachment.vue"]]);
-var __glob_25_9 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_10 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": uploadAttachment
 }, Symbol.toStringTag, { value: "Module" }));
@@ -24222,7 +24396,7 @@ function _sfc_render$1i(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var uploadImage = /* @__PURE__ */ _export_sfc(_sfc_main$1i, [["render", _sfc_render$1i], ["__scopeId", "data-v-41607b7d"], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/upload/upload-image.vue"]]);
-var __glob_25_10 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_11 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": uploadImage
 }, Symbol.toStringTag, { value: "Module" }));
@@ -24432,7 +24606,7 @@ function _sfc_render$1h(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8, ["modelValue", "mask-closable", "draggable"]);
 }
 var columnCheck = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["render", _sfc_render$1h], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/column-check.vue"]]);
-var __glob_25_11 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_12 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": columnCheck
 }, Symbol.toStringTag, { value: "Module" }));
@@ -24712,7 +24886,7 @@ function _sfc_render$1g(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var conditionEdit = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["render", _sfc_render$1g], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/condition-edit.vue"]]);
-var __glob_25_14 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_15 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": conditionEdit
 }, Symbol.toStringTag, { value: "Module" }));
@@ -26577,7 +26751,7 @@ function _sfc_render$1f(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var columnEdit = /* @__PURE__ */ _export_sfc(_sfc_main$1f, [["render", _sfc_render$1f], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/column-edit.vue"]]);
-var __glob_25_12 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_13 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": columnEdit
 }, Symbol.toStringTag, { value: "Module" }));
@@ -26792,7 +26966,7 @@ function _sfc_render$1e(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8, ["modelValue", "mask-closable", "draggable"]);
 }
 var columnSelect = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["render", _sfc_render$1e], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/column-select.vue"]]);
-var __glob_25_13 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_14 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": columnSelect
 }, Symbol.toStringTag, { value: "Module" }));
@@ -28075,7 +28249,7 @@ function _sfc_render$1d(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var filterEdit = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["render", _sfc_render$1d], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/filter-edit.vue"]]);
-var __glob_25_15 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_16 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": filterEdit
 }, Symbol.toStringTag, { value: "Module" }));
@@ -28247,7 +28421,7 @@ function _sfc_render$1c(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var filterSetting = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["render", _sfc_render$1c], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/filter-setting.vue"]]);
-var __glob_25_16 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_17 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": filterSetting
 }, Symbol.toStringTag, { value: "Module" }));
@@ -35210,6 +35384,7 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Option = resolveComponent("Option");
   const _component_Select = resolveComponent("Select");
   const _component_TreeSelect = resolveComponent("TreeSelect");
+  const _component_combo_select = resolveComponent("combo-select");
   const _component_dialog_select = resolveComponent("dialog-select");
   const _component_DatePicker = resolveComponent("DatePicker");
   const _component_TimePicker = resolveComponent("TimePicker");
@@ -35490,85 +35665,29 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
                     }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "style", "maxlength", "placeholder", "onOnChange"]), [
                       [vShow, $options.parseDataWithOther($data.data, column) == "__Other"]
                     ])
-                  ], 64)) : column.controlType === "ComboSelect" ? (openBlock(), createElementBlock(Fragment, { key: 10 }, [
-                    createCommentVNode(` <template v-else-if="column.controlType === 'AutoComplete'">\r
-                                <AutoComplete :value="parseData(data, column.code) ? parseData(data, column.code) : ''"\r
-                                    @update:model-value="$event => setData(data, column.code, $event)"\r
-                                    :disabled="column.isReadonly"\r
-                                    clearable\r
-                                    @on-search="search => loadOption(data, column, search)"\r
-                                    @on-clear="() => loadOption(data, column)"\r
-                                    :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"\r
-                                    :placeholder="column.description"\r
-                                    :transfer="true"\r
-                                    @on-change="selected => onDataChange(column, selected)">\r
-                                    <Option v-for="item in getDataSource(data, column)"\r
-                                        :key="item.id"\r
-                                        :value="item.name">{{ item.name }}</Option>\r
-                                </AutoComplete>\r
-                            </template> `),
-                    createVNode$1(_component_Select, {
-                      ref: "control_" + column.code,
-                      "model-value": $options.parseComboData($data.data, column),
-                      "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
-                      disabled: column.isReadonly,
-                      clearable: true,
-                      filterable: "",
-                      remote: "",
-                      "remote-method": (search) => $options.loadOption($data.data, column, search),
-                      style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                      placeholder: column.description,
-                      transfer: true,
-                      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) => {
-                          return openBlock(), createBlock(_component_Option, {
-                            key: item.id,
-                            value: item.id
-                          }, {
-                            default: withCtx(() => [
-                              createTextVNode(toDisplayString$2(item.name), 1)
-                            ]),
-                            _: 2
-                          }, 1032, ["value"]);
-                        }), 128))
-                      ]),
-                      _: 2
-                    }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange", "onOnClear"])
-                  ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                  ], 64)) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_combo_select, {
+                    key: 10,
+                    "model-value": _ctx.parseData($data.data, column.code),
+                    "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
+                    multi: false,
+                    readonly: column.isReadonly,
+                    "remote-method": (search) => $options.loadOption($data.data, column, search),
+                    data: $data.data,
+                    param: _ctx.getParam($data.data, column),
+                    column,
+                    onOnChange: (selected) => _ctx.onSelectDataChange(column, selected)
+                  }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "remote-method", "data", "param", "column", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_combo_select, {
                     key: 11,
-                    ref: "control_" + column.code,
-                    "model-value": $options.parseMultiComboData($data.data, column),
+                    "model-value": _ctx.parseArrayData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
-                    clearable: true,
-                    multiple: true,
-                    filterable: "",
-                    remote: "",
+                    multi: true,
+                    readonly: column.isReadonly,
                     "remote-method": (search) => $options.loadOption($data.data, column, search),
-                    style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                    placeholder: column.description,
-                    transfer: true,
-                    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) => {
-                        return openBlock(), createBlock(_component_Option, {
-                          key: item.id,
-                          value: item.id
-                        }, {
-                          default: withCtx(() => [
-                            createTextVNode(toDisplayString$2(item.name), 1)
-                          ]),
-                          _: 2
-                        }, 1032, ["value"]);
-                      }), 128))
-                    ]),
-                    _: 2
-                  }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                    data: $data.data,
+                    param: _ctx.getParam($data.data, column),
+                    column,
+                    onOnChange: (selected) => _ctx.onSelectDataChange(column, selected)
+                  }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "remote-method", "data", "param", "column", "onOnChange"])) : 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),
@@ -35750,7 +35869,7 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var viewFormDraggable = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["render", _sfc_render$1b], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/view-form-draggable.vue"]]);
-var __glob_25_28 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_29 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": viewFormDraggable
 }, Symbol.toStringTag, { value: "Module" }));
@@ -36209,7 +36328,7 @@ function _sfc_render$1a(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var formSettingLayout = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["render", _sfc_render$1a], ["__scopeId", "data-v-5a7f5816"], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/form-setting-layout.vue"]]);
-var __glob_25_17 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_18 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": formSettingLayout
 }, Symbol.toStringTag, { value: "Module" }));
@@ -36536,7 +36655,7 @@ function _sfc_render$19(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var formSetting = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$19], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/form-setting.vue"]]);
-var __glob_25_18 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_19 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": formSetting
 }, Symbol.toStringTag, { value: "Module" }));
@@ -36688,7 +36807,7 @@ function _sfc_render$18(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var groupColumn = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["render", _sfc_render$18], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/group-column.vue"]]);
-var __glob_25_19 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_20 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": groupColumn
 }, Symbol.toStringTag, { value: "Module" }));
@@ -36843,7 +36962,7 @@ function _sfc_render$17(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var groupMethod = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["render", _sfc_render$17], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/group-method.vue"]]);
-var __glob_25_20 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_21 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": groupMethod
 }, Symbol.toStringTag, { value: "Module" }));
@@ -37305,7 +37424,7 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
   ], 2112);
 }
 var modalFormFilter = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["render", _sfc_render$16], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-form-filter.vue"]]);
-var __glob_25_21 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_22 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": modalFormFilter
 }, Symbol.toStringTag, { value: "Module" }));
@@ -37682,7 +37801,7 @@ function _sfc_render$15(_ctx, _cache, $props, $setup, $data, $options) {
   ], 2112);
 }
 var modalFormSort = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$15], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-form-sort.vue"]]);
-var __glob_25_22 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_23 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": modalFormSort
 }, Symbol.toStringTag, { value: "Module" }));
@@ -38087,7 +38206,7 @@ function _sfc_render$14(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var modalForm = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$14], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-form.vue"]]);
-var __glob_25_23 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_24 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": modalForm
 }, Symbol.toStringTag, { value: "Module" }));
@@ -38507,7 +38626,7 @@ function _sfc_render$13(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8, ["modelValue", "fullscreen", "mask-closable", "draggable", "width", "before-close", "footer-hide", "onOnVisibleChange"]);
 }
 var modalTable = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$13], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-table.vue"]]);
-var __glob_25_24 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_25 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": modalTable
 }, Symbol.toStringTag, { value: "Module" }));
@@ -38928,74 +39047,6 @@ const _sfc_main$12 = {
           item.needClear = true;
         });
       }
-    },
-    parseComboData(model2, column) {
-      let value = this.parseFilterData(model2, column);
-      setTimeout(() => {
-        this.loadComboDataLabel(model2, column, value);
-      });
-      return value;
-    },
-    parseMultiComboData(model2, column) {
-      let data2 = [];
-      let value = this.parseFilterData(model2, column);
-      if (this.isJSON(value)) {
-        data2 = JSON.parse(value);
-      }
-      this.loadComboDataLabel(model2, column, data2);
-      return data2;
-    },
-    async loadComboDataLabel(model2, column, data2) {
-      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
-        return;
-      }
-      if (this.$refs["control_" + column.code] && data2) {
-        let values = this.$refs["control_" + column.code][0].$data.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);
-              pendings.push(newValue);
-            }
-          });
-        } else {
-          if (!values.some((v) => v.value == data2)) {
-            let newValue = { value: data2, label: null, disabled: false };
-            values.push(newValue);
-            pendings.push(newValue);
-          }
-        }
-        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);
-            }
-            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);
-      }
     }
   }
 };
@@ -39005,7 +39056,7 @@ const _hoisted_2$v = {
   class: "label"
 };
 const _hoisted_3$p = {
-  key: 15,
+  key: 16,
   style: { "line-height": "24px" }
 };
 function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
@@ -39013,6 +39064,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Option = resolveComponent("Option");
   const _component_Select = resolveComponent("Select");
   const _component_TreeSelect = resolveComponent("TreeSelect");
+  const _component_combo_select = resolveComponent("combo-select");
   const _component_dialog_select = resolveComponent("dialog-select");
   const _component_DatePicker = resolveComponent("DatePicker");
   const _component_TimePicker = resolveComponent("TimePicker");
@@ -39185,71 +39237,29 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                   }, null, 8, ["model-value", "onUpdate:modelValue", "style", "placeholder", "onOnChange"]), [
                     [vShow, $options.parseFilterDataWithOther($data.data, column) == "__Other"]
                   ])
-                ], 64)) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                ], 64)) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_combo_select, {
                   key: 9,
-                  ref_for: true,
-                  ref: "control_" + column.code,
                   size: "small",
-                  "model-value": $options.parseComboData($data.data, column),
+                  "model-value": $options.parseFilterData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
-                  clearable: true,
-                  filterable: "",
-                  remote: "",
+                  multi: false,
                   "remote-method": (search) => $options.loadOption($data.data, column, search),
-                  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                  placeholder: column.description,
-                  transfer: true,
-                  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) => {
-                      return openBlock(), createBlock(_component_Option, {
-                        key: item.id,
-                        value: item.id
-                      }, {
-                        default: withCtx(() => [
-                          createTextVNode(toDisplayString$2(item.name), 1)
-                        ]),
-                        _: 2
-                      }, 1032, ["value"]);
-                    }), 128))
-                  ]),
-                  _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange", "onOnClear"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                  data: $data.data,
+                  param: _ctx.getParam($data.data, column),
+                  column,
+                  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                }, null, 8, ["model-value", "onUpdate:modelValue", "remote-method", "data", "param", "column", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_combo_select, {
                   key: 10,
-                  ref_for: true,
-                  ref: "control_" + column.code,
                   size: "small",
-                  "model-value": $options.parseMultiComboData($data.data, column),
+                  "model-value": $options.parseArrayFilterData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setArrayFilterData($data.data, column, $event),
-                  clearable: true,
-                  multiple: true,
-                  filterable: "",
-                  remote: "",
+                  multi: true,
                   "remote-method": (search) => $options.loadOption($data.data, column, search),
-                  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                  placeholder: column.description,
-                  transfer: true,
-                  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) => {
-                      return openBlock(), createBlock(_component_Option, {
-                        key: item.id,
-                        value: item.id
-                      }, {
-                        default: withCtx(() => [
-                          createTextVNode(toDisplayString$2(item.name), 1)
-                        ]),
-                        _: 2
-                      }, 1032, ["value"]);
-                    }), 128))
-                  ]),
-                  _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                  data: $data.data,
+                  param: _ctx.getParam($data.data, column),
+                  column,
+                  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                }, null, 8, ["model-value", "onUpdate:modelValue", "remote-method", "data", "param", "column", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
                   key: 11,
                   size: "small",
                   "model-value": $options.parseFilterData($data.data, column),
@@ -39260,9 +39270,21 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                   param: _ctx.getParam($data.data, column),
                   controlWidth: column.controlWidth,
                   onOnChange: (selected) => $options.onSelectDataChange(column, selected)
-                }, null, 8, ["model-value", "onUpdate:modelValue", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" || column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
+                }, null, 8, ["model-value", "onUpdate:modelValue", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
                   key: 12,
                   size: "small",
+                  "model-value": $options.parseFilterData($data.data, column),
+                  "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
+                  multi: true,
+                  source: column.source,
+                  "source-data-code": column.sourceDataCode,
+                  "source-display-code": column.sourceDisplayCode,
+                  param: _ctx.getParam($data.data, column),
+                  controlWidth: column.controlWidth,
+                  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                }, null, 8, ["model-value", "onUpdate:modelValue", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" || column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
+                  key: 13,
+                  size: "small",
                   type: column.controlType.toLowerCase(),
                   "model-value": $options.parseFilterData($data.data, column),
                   placeholder: column.description,
@@ -39273,7 +39295,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                     $options.onDataChange(column);
                   }
                 }, null, 8, ["type", "model-value", "placeholder", "style", "onOnChange"])) : column.controlType === "Time" ? (openBlock(), createBlock(_component_TimePicker, {
-                  key: 13,
+                  key: 14,
                   size: "small",
                   type: "time",
                   "model-value": $options.parseFilterData($data.data, column),
@@ -39283,7 +39305,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   onOnChange: ($event) => $options.onDataChange(column)
                 }, null, 8, ["model-value", "onUpdate:modelValue", "placeholder", "style", "onOnChange"])) : column.controlType === "Check" ? (openBlock(), createBlock(_component_Checkbox, {
-                  key: 14,
+                  key: 15,
                   size: "small",
                   style: { "line-height": "26px" },
                   "model-value": !!$options.parseFilterData($data.data, column),
@@ -39297,7 +39319,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                     onOnChange: ($event) => $options.onDataChange(column)
                   }, null, 8, ["model-value", "onUpdate:modelValue", "onOnChange"])
                 ])) : column.controlType === "Radio" ? (openBlock(), createBlock(_component_RadioGroup, {
-                  key: 16,
+                  key: 17,
                   size: "small",
                   style: { "line-height": "22px" },
                   "model-value": $options.parseFilterData($data.data, column),
@@ -39319,14 +39341,14 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   _: 2
                 }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "TextArea" ? (openBlock(), createBlock(_component_Input, {
-                  key: 17,
+                  key: 18,
                   type: "textarea",
                   "model-value": $options.parseFilterData($data.data, column.code),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column.code, $event),
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   rows: column.controlHeight / 20,
                   placeholder: column.description
-                }, null, 8, ["model-value", "onUpdate:modelValue", "style", "rows", "placeholder"])) : (openBlock(), createElementBlock(Fragment, { key: 18 }, [
+                }, null, 8, ["model-value", "onUpdate:modelValue", "style", "rows", "placeholder"])) : (openBlock(), createElementBlock(Fragment, { key: 19 }, [
                   createTextVNode(toDisplayString$2(_ctx.$t("Front_Label_Control_Type_Not_Supported")) + " " + toDisplayString$2(column.controlType), 1)
                 ], 64))
               ]),
@@ -39360,7 +39382,7 @@ function _sfc_render$12(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var tableFilter = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["render", _sfc_render$12], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/table-filter.vue"]]);
-var __glob_25_25 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_26 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": tableFilter
 }, Symbol.toStringTag, { value: "Module" }));
@@ -40075,7 +40097,7 @@ function _sfc_render$11(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["render", _sfc_render$11], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/table-setting.vue"]]);
-var __glob_25_26 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_27 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": tableSetting
 }, Symbol.toStringTag, { value: "Module" }));
@@ -40509,7 +40531,7 @@ function _sfc_render$10(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var viewChart = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["render", _sfc_render$10], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/view-chart.vue"]]);
-var __glob_25_27 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_28 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": viewChart
 }, Symbol.toStringTag, { value: "Module" }));
@@ -41269,74 +41291,6 @@ const _sfc_main$$ = {
           item.needClear = true;
         });
       }
-    },
-    parseComboData(model2, column) {
-      let value = this.parseData(model2, column.code);
-      setTimeout(() => {
-        this.loadComboDataLabel(model2, column, value);
-      });
-      return value;
-    },
-    parseMultiComboData(model2, column) {
-      let data2 = [];
-      let value = this.parseData(model2, column.code);
-      if (this.isJSON(value)) {
-        data2 = JSON.parse(value);
-      }
-      this.loadComboDataLabel(model2, column, data2);
-      return data2;
-    },
-    async loadComboDataLabel(model2, column, data2) {
-      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
-        return;
-      }
-      if (this.$refs["control_" + column.code] && data2) {
-        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 };
-              this.$refs["control_" + column.code][0].values.push(newValue);
-              pendings.push(newValue);
-            }
-          });
-        } else {
-          if (!values.some((v) => v.value == data2)) {
-            let newValue = { value: data2, label: null, disabled: false };
-            values.push(newValue);
-            pendings.push(newValue);
-          }
-        }
-        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);
-            }
-            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);
-      }
     }
   }
 };
@@ -41357,6 +41311,7 @@ function _sfc_render$$(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Option = resolveComponent("Option");
   const _component_Select = resolveComponent("Select");
   const _component_TreeSelect = resolveComponent("TreeSelect");
+  const _component_combo_select = resolveComponent("combo-select");
   const _component_dialog_select = resolveComponent("dialog-select");
   const _component_DatePicker = resolveComponent("DatePicker");
   const _component_TimePicker = resolveComponent("TimePicker");
@@ -41638,70 +41593,29 @@ function _sfc_render$$(_ctx, _cache, $props, $setup, $data, $options) {
                           :value="item.name">{{ item.name }}</Option>\r
                   </AutoComplete>\r
               </template> `),
-                          createVNode$1(_component_Select, {
-                            ref_for: true,
-                            ref: "control_" + column.code,
-                            "model-value": $options.parseComboData($data.data, column),
+                          createVNode$1(_component_combo_select, {
+                            "model-value": _ctx.parseData($data.data, column.code),
                             "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
-                            disabled: $props.readonly || column.isReadonly,
-                            clearable: true,
-                            filterable: "",
-                            remote: "",
+                            multi: false,
+                            readonly: $props.readonly || column.isReadonly,
                             "remote-method": (search) => $options.loadOption($data.data, column, search),
-                            style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                            placeholder: column.description,
-                            transfer: true,
-                            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) => {
-                                return openBlock(), createBlock(_component_Option, {
-                                  key: item.id,
-                                  value: item.id
-                                }, {
-                                  default: withCtx(() => [
-                                    createTextVNode(toDisplayString$2(item.name), 1)
-                                  ]),
-                                  _: 2
-                                }, 1032, ["value"]);
-                              }), 128))
-                            ]),
-                            _: 2
-                          }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange", "onOnQueryChange", "onOnClear"])
-                        ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                            data: $data.data,
+                            param: _ctx.getParam($data.data, column),
+                            column,
+                            onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                          }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "remote-method", "data", "param", "column", "onOnChange"])
+                        ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_combo_select, {
                           key: 11,
-                          ref_for: true,
-                          ref: "control_" + column.code,
-                          "model-value": $options.parseMultiComboData($data.data, column),
+                          "model-value": _ctx.parseArrayData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
-                          disabled: $props.readonly || column.isReadonly,
-                          clearable: true,
-                          multiple: true,
-                          filterable: "",
-                          remote: "",
+                          multi: true,
+                          readonly: $props.readonly || column.isReadonly,
                           "remote-method": (search) => $options.loadOption($data.data, column, search),
-                          style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
-                          placeholder: column.description,
-                          transfer: true,
+                          data: $data.data,
+                          param: _ctx.getParam($data.data, column),
+                          column,
                           onOnChange: (selected) => $options.onSelectDataChange(column, selected)
-                        }, {
-                          default: withCtx(() => [
-                            (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
-                              return openBlock(), createBlock(_component_Option, {
-                                key: item.id,
-                                value: item.id
-                              }, {
-                                default: withCtx(() => [
-                                  createTextVNode(toDisplayString$2(item.name), 1)
-                                ]),
-                                _: 2
-                              }, 1032, ["value"]);
-                            }), 128))
-                          ]),
-                          _: 2
-                        }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "remote-method", "data", "param", "column", "onOnChange"])) : 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),
@@ -41956,7 +41870,7 @@ function _sfc_render$$(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var viewForm = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["render", _sfc_render$$], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/view-form.vue"]]);
-var __glob_25_29 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_30 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": viewForm
 }, Symbol.toStringTag, { value: "Module" }));
@@ -44177,7 +44091,7 @@ function _sfc_render$_(_ctx, _cache, $props, $setup, $data, $options) {
       createElementVNode("div", _hoisted_10$4, [
         $props.settingEnable && _ctx.allow("permission/tableView") ? (openBlock(), createBlock(_component_Button, {
           key: 0,
-          class: "ivu-fr",
+          class: "ivu-fr ivu-ml-8",
           type: "error",
           title: _ctx.$t("Front_Btn_Setting"),
           "custom-icon": "fa fa-cog",
@@ -44187,6 +44101,7 @@ function _sfc_render$_(_ctx, _cache, $props, $setup, $data, $options) {
           key: 1,
           "show-sizer": "",
           "show-total": "",
+          "show-elevator": "",
           modelValue: $data.current,
           "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => $data.current = $event),
           "page-size": $data.size,
@@ -44313,7 +44228,7 @@ function _sfc_render$_(_ctx, _cache, $props, $setup, $data, $options) {
   ], 2);
 }
 var viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["render", _sfc_render$_], ["__scopeId", "data-v-217bfb20"], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/view-table.vue"]]);
-var __glob_25_30 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_31 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": viewTable
 }, Symbol.toStringTag, { value: "Module" }));
@@ -45343,7 +45258,7 @@ function _sfc_render$Z(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var flowChart = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["render", _sfc_render$Z], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/workflow/flow-chart.vue"]]);
-var __glob_25_31 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+var __glob_25_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": flowChart
 }, Symbol.toStringTag, { value: "Module" }));
@@ -127639,7 +127554,7 @@ const pages = {};
 Object.keys(files).forEach((key) => {
   pages[key.replace(/(\.\/pages\/)/g, "")] = files[key].default;
 });
-const componentFiles = { "./components/copyright/index.vue": __glob_25_0, "./components/home/notice-list.vue": __glob_25_1, "./components/home/shortcut.vue": __glob_25_2, "./components/input/check-group.vue": __glob_25_3, "./components/input/dialog-select.vue": __glob_25_4, "./components/input/item-select.vue": __glob_25_5, "./components/link/i-link.vue": __glob_25_6, "./components/richEditor/index.vue": __glob_25_7, "./components/upload/file-upload.vue": __glob_25_8, "./components/upload/upload-attachment.vue": __glob_25_9, "./components/upload/upload-image.vue": __glob_25_10, "./components/view/column-check.vue": __glob_25_11, "./components/view/column-edit.vue": __glob_25_12, "./components/view/column-select.vue": __glob_25_13, "./components/view/condition-edit.vue": __glob_25_14, "./components/view/filter-edit.vue": __glob_25_15, "./components/view/filter-setting.vue": __glob_25_16, "./components/view/form-setting-layout.vue": __glob_25_17, "./components/view/form-setting.vue": __glob_25_18, "./components/view/group-column.vue": __glob_25_19, "./components/view/group-method.vue": __glob_25_20, "./components/view/modal-form-filter.vue": __glob_25_21, "./components/view/modal-form-sort.vue": __glob_25_22, "./components/view/modal-form.vue": __glob_25_23, "./components/view/modal-table.vue": __glob_25_24, "./components/view/table-filter.vue": __glob_25_25, "./components/view/table-setting.vue": __glob_25_26, "./components/view/view-chart.vue": __glob_25_27, "./components/view/view-form-draggable.vue": __glob_25_28, "./components/view/view-form.vue": __glob_25_29, "./components/view/view-table.vue": __glob_25_30, "./components/workflow/flow-chart.vue": __glob_25_31 };
+const componentFiles = { "./components/copyright/index.vue": __glob_25_0, "./components/home/notice-list.vue": __glob_25_1, "./components/home/shortcut.vue": __glob_25_2, "./components/input/check-group.vue": __glob_25_3, "./components/input/combo-select.vue": __glob_25_4, "./components/input/dialog-select.vue": __glob_25_5, "./components/input/item-select.vue": __glob_25_6, "./components/link/i-link.vue": __glob_25_7, "./components/richEditor/index.vue": __glob_25_8, "./components/upload/file-upload.vue": __glob_25_9, "./components/upload/upload-attachment.vue": __glob_25_10, "./components/upload/upload-image.vue": __glob_25_11, "./components/view/column-check.vue": __glob_25_12, "./components/view/column-edit.vue": __glob_25_13, "./components/view/column-select.vue": __glob_25_14, "./components/view/condition-edit.vue": __glob_25_15, "./components/view/filter-edit.vue": __glob_25_16, "./components/view/filter-setting.vue": __glob_25_17, "./components/view/form-setting-layout.vue": __glob_25_18, "./components/view/form-setting.vue": __glob_25_19, "./components/view/group-column.vue": __glob_25_20, "./components/view/group-method.vue": __glob_25_21, "./components/view/modal-form-filter.vue": __glob_25_22, "./components/view/modal-form-sort.vue": __glob_25_23, "./components/view/modal-form.vue": __glob_25_24, "./components/view/modal-table.vue": __glob_25_25, "./components/view/table-filter.vue": __glob_25_26, "./components/view/table-setting.vue": __glob_25_27, "./components/view/view-chart.vue": __glob_25_28, "./components/view/view-form-draggable.vue": __glob_25_29, "./components/view/view-form.vue": __glob_25_30, "./components/view/view-table.vue": __glob_25_31, "./components/workflow/flow-chart.vue": __glob_25_32 };
 const components = {};
 Object.keys(componentFiles).forEach((key) => {
   components[key.replace(/(\.\/pages\/)/g, "").split("/").pop().split(".")[0]] = componentFiles[key].default;