mooho-base-admin-plus 2.3.7 → 2.3.9

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

@@ -22870,6 +22870,8 @@ var mixinPage = {
   },
   methods: {
     ...mapActions("admin/cache", ["loadEnum", "loadDict", "loadUserName", "loadCache"]),
+    ...mapMutations("admin/loader", { enableLoader: "enable" }),
+    ...mapMutations("admin/loader", { disableLoader: "disable" }),
     copy(model2) {
       return lodash$1.exports.cloneDeep(model2);
     },
@@ -22983,7 +22985,7 @@ var mixinPage = {
       if (!dataType) {
         return null;
       }
-      if (dataType.indexOf("Enum:") === 0) {
+      if (dataType.startsWith("Enum:")) {
         return this.getEnum(dataType.replace("Enum:", ""), this.parseData(model2, expression2));
       } else if (dataType === "BigInteger" && format2 == "User") {
         return this.getUserName(this.parseData(model2, expression2));
@@ -23025,8 +23027,13 @@ var mixinPage = {
         }
       } else if (dataType === "String") {
         if (format2 === "Array") {
-          let array = JSON.parse(value);
-          return array.join(", ");
+          let result2 = "";
+          try {
+            let array = JSON.parse(value);
+            result2 = array.join(", ");
+          } catch (e3) {
+          }
+          return result2;
         } else {
           return this.tParam(value);
         }
@@ -23374,7 +23381,7 @@ var mixinPage = {
       return null;
     },
     isJSON(str) {
-      if (!!(str || "").trim()) {
+      if (typeof str == "string" && !!(str || "").trim()) {
         try {
           var obj = JSON.parse(str);
           if (typeof obj == "object" && obj) {
@@ -30986,7 +30993,7 @@ const _sfc_main$T = {
   computed: {
     needDataSource() {
       if (this.data) {
-        return (this.data.controlType === "Select" || this.data.controlType === "MultiSelect" || this.data.controlType === "TreeSelect" || this.data.controlType === "MultiTreeSelect" || this.data.controlType === "SelectWithOther" || this.data.controlType === "ComboSelect" || this.data.controlType === "Radio" || this.data.controlType === "CheckGroup") && !this.data.isStaticItem && this.data.dataType && this.data.dataType.indexOf("Enum:") !== 0 || this.data.controlType === "DialogSelect" || this.data.controlType === "MultiDialogSelect";
+        return (this.data.controlType === "Select" || this.data.controlType === "MultiSelect" || this.data.controlType === "TreeSelect" || this.data.controlType === "MultiTreeSelect" || this.data.controlType === "SelectWithOther" || this.data.controlType === "ComboSelect" || this.data.controlType === "MultiComboSelect" || this.data.controlType === "Radio" || this.data.controlType === "CheckGroup") && !this.data.isStaticItem && this.data.dataType && this.data.dataType.indexOf("Enum:") !== 0 || this.data.controlType === "DialogSelect" || this.data.controlType === "MultiDialogSelect";
       } else {
         return false;
       }
@@ -31485,7 +31492,7 @@ function _sfc_render$T(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16),
-                  $data.data.controlType == "Select" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 5 }, _ctx.grid8)), {
+                  $data.data.controlType == "Select" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 5 }, _ctx.grid8)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u56FA\u5B9A\u9009\u9879",
@@ -31505,7 +31512,7 @@ function _sfc_render$T(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16)) : createCommentVNode("v-if", true),
-                  ($data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") && !$data.data.isStaticItem ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 6 }, _ctx.grid8)), {
+                  ($data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") && !$data.data.isStaticItem ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 6 }, _ctx.grid8)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u5B57\u5178\u9009\u9879",
@@ -31528,7 +31535,7 @@ function _sfc_render$T(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16)) : createCommentVNode("v-if", true),
-                  $data.data.isStaticItem && ($data.data.controlType == "Select" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 7 }, _ctx.grid24)), {
+                  $data.data.isStaticItem && ($data.data.controlType == "Select" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 7 }, _ctx.grid24)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u9009\u9879\u5185\u5BB9\uFF08\u6BCF\u4E00\u884C\u4E3A\u4E00\u9879\uFF0Ckey/value\u7528\u5192\u53F7\u5206\u9694\uFF0C\u6CA1\u6709\u5192\u53F7\u8868\u793Akey/value\u4E00\u81F4\uFF09",
@@ -34599,7 +34606,7 @@ const _sfc_main$K = {
             left: this.setting.chartLegendAlign == null ? "right" : this.setting.chartLegendAlign
           }
         };
-        if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.indexOf("Enum:") === 0) {
+        if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.startsWith("Enum:")) {
           await this.loadEnum(this.setting.chartGroupCodeType.replace("Enum:", ""));
         }
         if (!this.setting.chartCustomSeries) {
@@ -34621,7 +34628,7 @@ const _sfc_main$K = {
                 new Set(
                   this.data.map((item) => {
                     let value = this.parseData(item, this.setting.chartGroupCode);
-                    if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.indexOf("Enum:") === 0) {
+                    if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.startsWith("Enum:")) {
                       value = this.getEnum(this.setting.chartGroupCodeType.replace("Enum:", ""), value);
                     }
                     return value;
@@ -34634,7 +34641,7 @@ const _sfc_main$K = {
               let keyData = {};
               this.data.filter((data3) => {
                 let value = this.parseData(data3, this.setting.chartGroupCode);
-                if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.indexOf("Enum:") === 0) {
+                if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.startsWith("Enum:")) {
                   value = this.getEnum(this.setting.chartGroupCodeType.replace("Enum:", ""), value);
                 }
                 return item == null && group.length == 1 || value == item;
@@ -34665,7 +34672,7 @@ const _sfc_main$K = {
                 new Set(
                   this.data.map((item) => {
                     let value = this.parseData(item, this.setting.chartGroupCode);
-                    if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.indexOf("Enum:") === 0) {
+                    if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.startsWith("Enum:")) {
                       value = this.getEnum(this.setting.chartGroupCodeType.replace("Enum:", ""), value);
                     }
                     return value;
@@ -34678,7 +34685,7 @@ const _sfc_main$K = {
               let keyData = {};
               this.data.filter((data3) => {
                 let value = this.parseData(data3, this.setting.chartGroupCode);
-                if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.indexOf("Enum:") === 0) {
+                if (this.setting.chartGroupCodeType && this.setting.chartGroupCodeType.startsWith("Enum:")) {
                   value = this.getEnum(this.setting.chartGroupCodeType.replace("Enum:", ""), value);
                 }
                 return item == null && group.length == 1 || value == item;
@@ -37148,12 +37155,17 @@ const _sfc_main$w = {
         value = this.parseTreeData(data2, column.code);
         column.dataSource = null;
       }
+      if (column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect") {
+        param.per = 20;
+      }
+      this.disableLoader();
       let res2;
       if (column.isSourceCustom) {
         res2 = await customModelApi.query(column.source, param);
       } else {
         res2 = await modelApi.query(column.source, param);
       }
+      this.enableLoader();
       column.rawData = res2.data;
       if (column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect") {
         let treeData = res2.data.map((item) => {
@@ -37175,7 +37187,7 @@ const _sfc_main$w = {
         if (data2) {
           if (this.parseData(data2, column.code) == null && column.isDefaultFirst && res2.data.length > 0) {
             this.setData(data2, column.code, this.parseData(res2.data[0], column.sourceDataCode));
-            this.$emit("on-change", column, null, value, null);
+            this.$emit("on-change", column, null, column.rawData[0], null);
             if (column.sourceDataCode == "id" && column.code.length > 2) {
               let code2 = column.code.substr(0, column.code.length - 2);
               let model2 = column.rawData.find((item) => {
@@ -37186,7 +37198,7 @@ const _sfc_main$w = {
           }
         }
       }
-      if (column.controlType == "Select" || column.controlType == "ComboSelect" || column.controlType == "Radio") {
+      if (column.controlType == "Select" || column.controlType == "Radio") {
         if (!column.dataSource.some((item) => {
           return item.id == this.parseData(data2, column.code);
         })) {
@@ -37217,7 +37229,7 @@ const _sfc_main$w = {
       return result2;
     },
     getDataSource(data2, column) {
-      if (!column.isStaticItem && column.dataType.indexOf("Enum:") === 0) {
+      if (!column.isStaticItem && column.dataType.startsWith("Enum:")) {
         return this.getEnumList(column.dataType.split(":")[1]);
       } else {
         return column.dataSource == null ? [] : column.dataSource;
@@ -37356,7 +37368,7 @@ const _sfc_main$w = {
           });
         } else if (column.needRefresh && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"))) {
           let param = this.getParam(this.data, column);
-          if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
+          if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
             if (param != null) {
               this.fillDataSource(this.data, column, param);
             } else {
@@ -37402,7 +37414,7 @@ const _sfc_main$w = {
       if (!(column.dataType || "").trim()) {
         return null;
       }
-      if (column.dataType.indexOf("Enum:") === 0) {
+      if (column.dataType.startsWith("Enum:")) {
         return "string";
       }
       switch (column.dataType) {
@@ -37505,6 +37517,83 @@ const _sfc_main$w = {
       } else {
         return column.name;
       }
+    },
+    async loadOption(data2, column, keyword) {
+      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
+        return;
+      }
+      let param = this.getParam(data2, column);
+      if (param != null) {
+        param[column.sourceDisplayCode + "_c"] = keyword;
+        this.fillDataSource(data2, column, param);
+      } else {
+        column.rawData = [];
+        column.dataSource = [];
+        this.setData(data2, column.code, null);
+        column.triggers.forEach((item) => {
+          item.needClear = true;
+        });
+      }
+    },
+    parseComboData(model2, column) {
+      let value = this.parseData(model2, column.code);
+      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]) {
+        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);
+          }
+        }
+        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") {
+              this.$refs["control_" + column.code][0].$data.query = label;
+            }
+            let newValue = pendings.find((i3) => i3.value == v);
+            if (newValue) {
+              newValue.label = label;
+            }
+          });
+          this.$forceUpdate();
+        }
+      }
     }
   }
 };
@@ -37807,11 +37896,15 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                   </AutoComplete>\r
               </template> `),
                           createVNode$1(_component_Select, {
-                            "model-value": _ctx.parseData($data.data, column.code),
+                            ref_for: true,
+                            ref: "control_" + column.code,
+                            "model-value": $options.parseComboData($data.data, column),
                             "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                             disabled: $props.readonly || 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,
@@ -37831,9 +37924,40 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                               }), 128))
                             ]),
                             _: 2
-                          }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "style", "placeholder", "onOnChange"])
-                        ], 64)) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                          }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])
+                        ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
                           key: 11,
+                          ref_for: true,
+                          ref: "control_" + column.code,
+                          "model-value": $options.parseMultiComboData($data.data, column),
+                          "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
+                          disabled: $props.readonly || column.isReadonly,
+                          clearable: true,
+                          multiple: 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) => $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$1(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, {
+                          key: 12,
                           "model-value": _ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           readonly: $props.readonly || column.isReadonly,
@@ -37844,7 +37968,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                           controlWidth: column.controlWidth,
                           onOnChange: (selected) => $options.onSelectDataChange(column, selected)
                         }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
-                          key: 12,
+                          key: 13,
                           "model-value": _ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           multi: true,
@@ -37855,7 +37979,7 @@ function _sfc_render$w(_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", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "SelectWithOther" ? (openBlock(), createElementBlock(Fragment, { key: 13 }, [
+                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "SelectWithOther" ? (openBlock(), createElementBlock(Fragment, { key: 14 }, [
                           createVNode$1(_component_Select, {
                             "model-value": $options.parseDataWithOther($data.data, column),
                             "onUpdate:modelValue": ($event) => $options.setDataWithOther($data.data, column.code, $event),
@@ -37904,7 +38028,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                             [vShow, $options.parseDataWithOther($data.data, column) == "__Other"]
                           ])
                         ], 64)) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" ? (openBlock(), createBlock(_component_DatePicker, {
-                          key: 14,
+                          key: 15,
                           type: column.controlType.toLowerCase(),
                           "model-value": _ctx.parseDateTimeData($data.data, column.code),
                           readonly: $props.readonly || column.isReadonly,
@@ -37916,7 +38040,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                             $options.onDataChange(column);
                           }
                         }, null, 8, ["type", "model-value", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
-                          key: 15,
+                          key: 16,
                           type: column.controlType.toLowerCase(),
                           "model-value": _ctx.parseDateRangeData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
@@ -37926,7 +38050,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                           style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                           onOnChange: ($event) => $options.onDataChange(column)
                         }, null, 8, ["type", "model-value", "onUpdate:modelValue", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "Time" ? (openBlock(), createBlock(_component_TimePicker, {
-                          key: 16,
+                          key: 17,
                           type: "time",
                           "model-value": _ctx.parseData($data.data, column.code),
                           readonly: $props.readonly || column.isReadonly,
@@ -37938,20 +38062,20 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                             $options.onDataChange(column);
                           }
                         }, null, 8, ["model-value", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "Check" ? (openBlock(), createBlock(_component_Checkbox, {
-                          key: 17,
+                          key: 18,
                           "model-value": !!_ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           disabled: $props.readonly || column.isReadonly,
                           size: "large",
                           onOnChange: ($event) => $options.onDataChange(column)
                         }, null, 8, ["model-value", "onUpdate:modelValue", "disabled", "onOnChange"])) : column.controlType === "Switch" ? (openBlock(), createBlock(_component_Switch, {
-                          key: 18,
+                          key: 19,
                           "model-value": !!_ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           disabled: $props.readonly || column.isReadonly,
                           onOnChange: ($event) => $options.onDataChange(column)
                         }, null, 8, ["model-value", "onUpdate:modelValue", "disabled", "onOnChange"])) : column.controlType === "Radio" ? (openBlock(), createBlock(_component_RadioGroup, {
-                          key: 19,
+                          key: 20,
                           "model-value": _ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           onOnChange: (selected) => $options.onSelectDataChange(column, selected)
@@ -37971,7 +38095,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                             }), 128))
                           ]),
                           _: 2
-                        }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "CheckGroup" ? (openBlock(), createElementBlock(Fragment, { key: 20 }, [
+                        }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "CheckGroup" ? (openBlock(), createElementBlock(Fragment, { key: 21 }, [
                           createCommentVNode(' <CheckboxGroup\r\n                    :model-value="parseArrayData(data, column.code)"\r\n                    @update:model-value="$event => setArrayData(data, column.code, $event)"\r\n                    @on-change="selected => onSelectDataChange(column, selected)"\r\n                  >\r\n                    <Checkbox v-for="item in getDataSource(data, column)" :key="item.id" :label="item.name" :disabled="readonly || column.isReadonly">\r\n                      <span>{{ item.name }}</span>\r\n                    </Checkbox>\r\n                  </CheckboxGroup> '),
                           createVNode$1(_component_check_group, {
                             "model-value": _ctx.parseData($data.data, column.code),
@@ -37983,7 +38107,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                             onOnChange: () => $options.onSelectDataChange(column)
                           }, null, 8, ["model-value", "onUpdate:modelValue", "dataSource", "readonly", "onOnChange"])
                         ], 64)) : column.controlType === "TextArea" ? (openBlock(), createBlock(_component_Input, {
-                          key: 21,
+                          key: 22,
                           type: "textarea",
                           "model-value": _ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
@@ -37993,13 +38117,13 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                           maxlength: column.maxLength,
                           placeholder: column.description
                         }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "style", "rows", "maxlength", "placeholder"])) : column.controlType === "RichEditor" ? (openBlock(), createBlock(_component_rich_editor, {
-                          key: 22,
+                          key: 23,
                           "model-value": _ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           readonly: $props.readonly || column.isReadonly,
                           height: column.controlHeight,
                           width: column.controlWidth
-                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "height", "width"])) : column.controlType === "Attachment" ? (openBlock(), createElementBlock(Fragment, { key: 23 }, [
+                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "height", "width"])) : column.controlType === "Attachment" ? (openBlock(), createElementBlock(Fragment, { key: 24 }, [
                           !$props.readonly && !column.isReadonly ? (openBlock(), createBlock(_component_upload_attachment, {
                             key: 0,
                             ref_for: true,
@@ -38022,7 +38146,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                             ], 8, _hoisted_10$3);
                           }), 128)) : createCommentVNode("v-if", true)
                         ], 64)) : column.controlType === "Image" ? (openBlock(), createBlock(_component_upload_image, {
-                          key: 24,
+                          key: 25,
                           "model-value": _ctx.parseData($data.data, column.code),
                           "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                           readonly: $props.readonly || column.isReadonly,
@@ -38030,7 +38154,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                           height: column.controlHeight,
                           width: column.controlWidth,
                           accept: column.pattern
-                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "height", "width", "accept"])) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 25 }, [
+                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "height", "width", "accept"])) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 26 }, [
                           !$props.readonly && !column.isReadonly ? (openBlock(), createBlock(_component_Slider, {
                             key: 0,
                             "model-value": _ctx.parseData($data.data, column.code),
@@ -38051,7 +38175,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                           }, null, 8, ["model-value", "style", "placeholder"])) : createCommentVNode("v-if", true)
                         ], 64)) : createCommentVNode("v-if", true),
                         !!(column.tooltip || "").trim() ? (openBlock(), createBlock(_component_Button, {
-                          key: 26,
+                          key: 27,
                           type: "primary",
                           style: { "margin-left": "4px" },
                           size: "small",
@@ -38159,7 +38283,7 @@ const _sfc_main$v = {
   computed: {
     needDataSource() {
       if (this.data) {
-        return (this.data.controlType === "Select" || this.data.controlType === "MultiSelect" || this.data.controlType === "TreeSelect" || this.data.controlType === "MultiTreeSelect" || this.data.controlType === "SelectWithOther" || this.data.controlType === "ComboSelect" || this.data.controlType === "Radio" || this.data.controlType === "CheckGroup") && !this.data.isStaticItem && this.data.dataType && this.data.dataType.indexOf("Enum:") !== 0 || this.data.controlType === "DialogSelect" || this.data.controlType === "MultiDialogSelect" || this.data.controlType === "Table" || this.data.controlType === "List";
+        return (this.data.controlType === "Select" || this.data.controlType === "MultiSelect" || this.data.controlType === "TreeSelect" || this.data.controlType === "MultiTreeSelect" || this.data.controlType === "SelectWithOther" || this.data.controlType === "ComboSelect" || this.data.controlType === "MultiComboSelect" || this.data.controlType === "Radio" || this.data.controlType === "CheckGroup") && !this.data.isStaticItem && this.data.dataType && this.data.dataType.indexOf("Enum:") !== 0 || this.data.controlType === "DialogSelect" || this.data.controlType === "MultiDialogSelect" || this.data.controlType === "Table" || this.data.controlType === "List";
       } else {
         return false;
       }
@@ -38689,7 +38813,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16)) : createCommentVNode("v-if", true),
-                  $data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 6 }, _ctx.grid8)), {
+                  $data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "MultiComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 6 }, _ctx.grid8)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u56FA\u5B9A\u9009\u9879",
@@ -38709,7 +38833,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16)) : createCommentVNode("v-if", true),
-                  ($data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") && !$data.data.isStaticItem ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 7 }, _ctx.grid8)), {
+                  ($data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "MultiComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") && !$data.data.isStaticItem ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 7 }, _ctx.grid8)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u5B57\u5178\u9009\u9879",
@@ -38732,7 +38856,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16)) : createCommentVNode("v-if", true),
-                  $data.data.isStaticItem && ($data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 8 }, _ctx.grid24)), {
+                  $data.data.isStaticItem && ($data.data.controlType == "Select" || $data.data.controlType == "SelectWithOther" || $data.data.controlType == "ComboSelect" || $data.data.controlType == "MultiSelect" || $data.data.controlType == "MultiComboSelect" || $data.data.controlType == "Radio" || $data.data.controlType == "CheckGroup") ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 8 }, _ctx.grid24)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u9009\u9879\u5185\u5BB9\uFF08\u6BCF\u4E00\u884C\u4E3A\u4E00\u9879\uFF0Ckey/value\u7528\u5192\u53F7\u5206\u9694\uFF0C\u6CA1\u6709\u5192\u53F7\u8868\u793Akey/value\u4E00\u81F4\uFF09",
@@ -41457,9 +41581,6 @@ const _sfc_main$r = {
     tableView: {
       type: Object
     },
-    filter: {
-      type: Object
-    },
     columns: {
       type: Array
     }
@@ -41473,10 +41594,6 @@ const _sfc_main$r = {
   methods: {
     init() {
       let data2 = this.data;
-      if (this.filter) {
-        lodash$1.exports.defaultsDeep(data2, this.filter);
-        lodash$1.exports.assign(this.filter, data2);
-      }
       this.columns.forEach((item) => {
         if (item.defaultValue) {
           if (item.defaultValue == "{today}") {
@@ -41579,22 +41696,33 @@ const _sfc_main$r = {
       });
     },
     async fillDataSource(data2, column, param) {
+      let value;
+      if (column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect") {
+        value = this.parseTreeFilterData(data2, column);
+        column.dataSource = null;
+      }
+      if (column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect") {
+        param.per = 20;
+      }
+      this.disableLoader();
       let res2;
       if (column.isSourceCustom) {
         res2 = await customModelApi.query(column.source, param);
       } else {
         res2 = await modelApi.query(column.source, param);
       }
+      this.enableLoader();
       column.rawData = res2.data;
       if (column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect") {
-        let data3 = res2.data.map((item) => {
+        let treeData = res2.data.map((item) => {
           return {
             id: !(column.sourceDataCode || "").trim() ? item.id : this.parseData(item, column.sourceDataCode),
             name: this.parseData(item, column.sourceDisplayCode),
             parentID: item.parentID
           };
         });
-        column.dataSource = this.getTreeDataSource(data3, column, null);
+        column.dataSource = this.getTreeDataSource(treeData, column, null);
+        this.setFilterData(data2, column, value);
       } else {
         column.dataSource = res2.data.map((item) => {
           return {
@@ -41605,10 +41733,27 @@ const _sfc_main$r = {
         if (data2) {
           if (this.parseFilterData(data2, column) == null && column.isDefaultFirst && res2.length > 0) {
             this.setData(data2, column.code, this.parseData(res2[0], column.sourceDataCode));
+            this.$emit("on-change", column, null, column.rawData[0], null);
+            if (column.sourceDataCode == "id" && column.code.length > 2) {
+              let code2 = column.code.substr(0, column.code.length - 2);
+              let model2 = column.rawData.find((item) => {
+                return item.id == this.parseData(data2, column.code);
+              });
+              this.setData(data2, code2, model2);
+            }
           }
         }
       }
-      this.onDataChange(column);
+      if (column.controlType == "Select" || column.controlType == "Radio") {
+        if (!column.dataSource.some((item) => {
+          return item.id == this.parseData(data2, column.code);
+        })) {
+          this.setData(data2, column.code, null);
+          column.triggers.forEach((item) => {
+            item.needClear = true;
+          });
+        }
+      }
     },
     getTreeDataSource(data2, column, parentID) {
       let result2 = data2.filter((item) => {
@@ -41630,7 +41775,7 @@ const _sfc_main$r = {
       return result2;
     },
     getDataSource(data2, column) {
-      if (!column.isStaticItem && column.dataType.indexOf("Enum:") === 0) {
+      if (!column.isStaticItem && column.dataType.startsWith("Enum:")) {
         return this.getEnumList(column.dataType.split(":")[1]);
       } else {
         return column.dataSource == null ? [] : column.dataSource;
@@ -41698,7 +41843,7 @@ const _sfc_main$r = {
           break;
         }
         let param = this.getParam(this.data, column);
-        if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio") {
+        if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect" || column.controlType === "Radio") {
           if (param != null) {
             this.fillDataSource(this.data, column, param);
           } else {
@@ -41724,15 +41869,15 @@ const _sfc_main$r = {
     parseArrayFilterData(model2, column) {
       let data2 = [];
       let value = this.parseFilterData(model2, column);
-      if (value != null && value !== "") {
-        data2 = value.split(",");
+      if (this.isJSON(value)) {
+        data2 = JSON.parse(value);
       }
       return data2;
     },
     setArrayFilterData(model2, column, value) {
       let data2 = "";
       if (value != null) {
-        data2 = value.join(",");
+        data2 = JSON.stringify(value);
       }
       this.setFilterData(model2, column, data2);
     },
@@ -41821,6 +41966,83 @@ const _sfc_main$r = {
       } else {
         return column.name;
       }
+    },
+    async loadOption(data2, column, keyword) {
+      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
+        return;
+      }
+      let param = this.getParam(data2, column);
+      if (param != null) {
+        param[column.sourceDisplayCode + "_c"] = keyword;
+        this.fillDataSource(data2, column, param);
+      } else {
+        column.rawData = [];
+        column.dataSource = [];
+        this.setData(data2, column.code, null);
+        column.triggers.forEach((item) => {
+          item.needClear = true;
+        });
+      }
+    },
+    parseComboData(model2, column) {
+      let value = this.parseFilterData(model2, column);
+      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]) {
+        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);
+          }
+        }
+        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") {
+              this.$refs["control_" + column.code][0].$data.query = label;
+            }
+            let newValue = pendings.find((i3) => i3.value == v);
+            if (newValue) {
+              newValue.label = label;
+            }
+          });
+          this.$forceUpdate();
+        }
+      }
     }
   }
 };
@@ -41830,7 +42052,7 @@ const _hoisted_2$f = {
   class: "label"
 };
 const _hoisted_3$d = {
-  key: 14,
+  key: 15,
   style: { "line-height": "24px" }
 };
 function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
@@ -42005,19 +42227,22 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     "model-value": $options.parseFilterData($data.data, column),
                     "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
                     style: normalizeStyle$1([{ width: column.controlWidth == null ? "40%" : column.controlWidth + "px" }, { "margin-left": "4px" }]),
-                    maxlength: column.maxLength,
                     placeholder: column.description,
                     onOnChange: ($event) => $options.onDataChange(column)
-                  }, null, 8, ["model-value", "onUpdate:modelValue", "style", "maxlength", "placeholder", "onOnChange"]), [
+                  }, null, 8, ["model-value", "onUpdate:modelValue", "style", "placeholder", "onOnChange"]), [
                     [vShow, $options.parseFilterDataWithOther($data.data, column) == "__Other"]
                   ])
                 ], 64)) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_Select, {
                   key: 9,
+                  ref_for: true,
+                  ref: "control_" + column.code,
                   size: "small",
-                  "model-value": $options.parseFilterData($data.data, column),
+                  "model-value": $options.parseComboData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
-                  clearable: "",
+                  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,
@@ -42037,8 +42262,39 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     }), 128))
                   ]),
                   _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
                   key: 10,
+                  ref_for: true,
+                  ref: "control_" + column.code,
+                  size: "small",
+                  "model-value": $options.parseMultiComboData($data.data, column),
+                  "onUpdate:modelValue": ($event) => $options.setArrayFilterData($data.data, column, $event),
+                  clearable: true,
+                  multiple: 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) => $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$1(item.name), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["value"]);
+                    }), 128))
+                  ]),
+                  _: 2
+                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                  key: 11,
                   size: "small",
                   "model-value": $options.parseFilterData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
@@ -42049,7 +42305,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   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: 11,
+                  key: 12,
                   size: "small",
                   type: column.controlType.toLowerCase(),
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42061,7 +42317,7 @@ function _sfc_render$r(_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: 12,
+                  key: 13,
                   size: "small",
                   type: "time",
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42071,7 +42327,7 @@ function _sfc_render$r(_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: 13,
+                  key: 14,
                   size: "small",
                   style: { "line-height": "26px" },
                   "model-value": !!$options.parseFilterData($data.data, column),
@@ -42085,7 +42341,7 @@ function _sfc_render$r(_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: 15,
+                  key: 16,
                   size: "small",
                   style: { "line-height": "22px" },
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42106,7 +42362,15 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     }), 128))
                   ]),
                   _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : (openBlock(), createElementBlock(Fragment, { key: 16 }, [
+                }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "TextArea" ? (openBlock(), createBlock(_component_Input, {
+                  key: 17,
+                  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 }, [
                   createTextVNode(toDisplayString$1(_ctx.$t("Front_Label_Control_Type_Not_Supported")) + " " + toDisplayString$1(column.controlType), 1)
                 ], 64))
               ]),
@@ -42861,7 +43125,7 @@ const _sfc_main$q = {
     },
     initDataSource() {
       this.columns.forEach((column) => {
-        if (column.controlType == "Select" || column.controlType == "SelectWithOther" || column.controlType == "ComboSelect" || column.controlType == "MultiSelect" || column.controlType == "Radio" || column.controlType == "CheckGroup") {
+        if (column.controlType == "Select" || column.controlType == "MultiSelect" || column.controlType == "SelectWithOther" || column.controlType == "ComboSelect" || column.controlType == "MultiComboSelect" || column.controlType == "Radio" || column.controlType == "CheckGroup") {
           if (column.isStaticItem) {
             this.data.forEach((row) => {
               if (!row._dataSource) {
@@ -42934,12 +43198,17 @@ const _sfc_main$q = {
         data2._needRefresh = {};
         data2._needClear = {};
       }
+      if (column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect") {
+        param.per = 20;
+      }
+      this.disableLoader();
       let res2;
       if (column.isSourceCustom) {
         res2 = await customModelApi.query(column.source, param);
       } else {
         res2 = await modelApi.query(column.source, param);
       }
+      this.enableLoader();
       data2._rawData[column.code] = res2.data;
       data2._dataSource[column.code] = res2.data.map((item) => {
         return {
@@ -42967,7 +43236,7 @@ const _sfc_main$q = {
       this.onDataChange(data2, column);
     },
     getDataSource(data2, column) {
-      if (!column.isStaticItem && column.dataType.indexOf("Enum:") === 0) {
+      if (!column.isStaticItem && column.dataType.startsWith("Enum:")) {
         return this.getEnumList(column.dataType.split(":")[1]);
       } else if (data2._dataSource != null && data2._dataSource[column.code] != null) {
         return data2._dataSource[column.code];
@@ -42993,7 +43262,7 @@ const _sfc_main$q = {
       this.orderBy = orderColumns.join(",");
       this.loadData();
     },
-    columnWidthResize(newWidth, oldWidth, column, event) {
+    columnWidthResize(newWidth, oldWidth, column) {
       let widthSetting = {};
       let widthSettingStr = localStorage.getItem("columnWidth_" + this.tableView.code);
       if (widthSettingStr) {
@@ -43156,22 +43425,30 @@ const _sfc_main$q = {
       this.search();
     },
     getAllFilter() {
-      var _a2;
+      var _a2, _b2;
       let filter2 = {
         ...this.viewFilter,
-        ...(_a2 = this.filterData) != null ? _a2 : {}
+        ...(_a2 = this.filter) != null ? _a2 : {},
+        ...(_b2 = this.filterData) != null ? _b2 : {}
       };
       for (let key in filter2) {
-        if (typeof filter2[key] == "object" && !(filter2[key] instanceof Date)) {
+        if (this.isJSON(filter2[key])) {
+          filter2[key] = JSON.parse(filter2[key]).join(",");
+        } else if (typeof filter2[key] == "object" && !(filter2[key] instanceof Date)) {
           delete filter2[key];
         }
       }
       return filter2;
     },
     getFilterResult() {
+      var _a2, _b2;
       let data2 = this.staticData;
       if (!this.filterDisable) {
-        let filter2 = this.filterData;
+        let filter2 = {
+          ...this.viewFilter,
+          ...(_a2 = this.filter) != null ? _a2 : {},
+          ...(_b2 = this.filterData) != null ? _b2 : {}
+        };
         for (let key in filter2) {
           let column = key;
           let value = filter2[key];
@@ -43254,12 +43531,11 @@ const _sfc_main$q = {
             } else {
               let c2 = column;
               if (typeof value == "string") {
-                for (let i3 = 0; i3 < value.split(",").length; i3++) {
-                  if (this.parseData(item, c2) == value.split(",")[i3]) {
-                    return true;
-                  }
+                if (this.isJSON(value)) {
+                  return JSON.parse(value).some((i3) => i3 == this.parseData(item, c2));
+                } else {
+                  return value.split(",").some((i3) => i3 == this.parseData(item, c2));
                 }
-                return false;
               } else if (value instanceof Date) {
                 return new Date(this.parseData(item, c2)) == value;
               } else {
@@ -43538,6 +43814,83 @@ const _sfc_main$q = {
       } else {
         return "end";
       }
+    },
+    async loadOption(data2, column, keyword) {
+      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
+        return;
+      }
+      let param = this.getParam(data2, column);
+      if (param != null) {
+        param[column.sourceDisplayCode + "_c"] = keyword;
+        this.fillDataSource(data2, column, param);
+      } else {
+        data2._rawData[column.code] = [];
+        data2._dataSource[column.code] = [];
+        this.setData(data2, column.code, null);
+        column.triggers.forEach((item) => {
+          item.needClear = true;
+        });
+      }
+    },
+    parseComboData(model2, column, index2) {
+      let value = this.parseData(model2, column.code);
+      this.loadComboDataLabel(model2, column, value, index2);
+      return value;
+    },
+    parseMultiComboData(model2, column, index2) {
+      let data2 = [];
+      let value = this.parseData(model2, column.code);
+      if (this.isJSON(value)) {
+        data2 = JSON.parse(value);
+      }
+      this.loadComboDataLabel(model2, column, data2, index2);
+      return data2;
+    },
+    async loadComboDataLabel(model2, column, data2, index2) {
+      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
+        return;
+      }
+      if (this.$refs["control_" + column.code + "_" + index2]) {
+        let values = this.$refs["control_" + column.code + "_" + index2].$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);
+          }
+        }
+        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") {
+              this.$refs["control_" + column.code + "_" + index2].$data.query = label;
+            }
+            let newValue = pendings.find((i3) => i3.value == v);
+            if (newValue) {
+              newValue.label = label;
+            }
+            this.$forceUpdate();
+          });
+        }
+      }
     }
   }
 };
@@ -43547,7 +43900,7 @@ const _hoisted_3$c = ["title", "innerHTML"];
 const _hoisted_4$6 = ["href", "target"];
 const _hoisted_5$4 = ["innerHTML"];
 const _hoisted_6$3 = {
-  key: 11,
+  key: 10,
   style: { "display": "flex" }
 };
 const _hoisted_7$3 = ["href"];
@@ -43629,7 +43982,6 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 renderSlot(_ctx.$slots, "customFilter", {}, void 0, true),
                 createVNode$1(_component_table_filter, {
                   ref: "tableFilter",
-                  filter: $props.filter,
                   columns: $data.filterColumns,
                   "table-view": $data.tableView,
                   onOnKeyup: $options.onKeyup
@@ -43642,7 +43994,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     }, void 0, true)
                   ]),
                   _: 3
-                }, 8, ["filter", "columns", "table-view", "onOnKeyup"]),
+                }, 8, ["columns", "table-view", "onOnKeyup"]),
                 createVNode$1(_component_Col, mergeProps(_ctx.getGrid($data.tableView.filterWidth), {
                   style: { "text-align": $data.tableView.filterAlign == null ? "left" : $data.tableView.filterAlign.toLowerCase() }
                 }), {
@@ -43910,50 +44262,62 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 }), 128))
               ]),
               _: 2
-            }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "style", "placeholder", "onOnChange"])) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_Select, {
-              key: 8,
-              size: "small",
-              "model-value": _ctx.parseData($options.rowData(row, index2), column.code),
-              "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
-              disabled: $options.isReadonly($options.rowData(row, index2), column),
-              clearable: "",
-              filterable: "",
-              style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth - 8 + "px" }),
-              placeholder: column.description,
-              transfer: true,
-              onOnChange: (selected) => $options.onSelectDataChange($options.rowData(row, index2), column, selected)
-            }, {
-              default: withCtx(() => [
-                (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($options.rowData(row, index2), column), (item) => {
-                  return openBlock(), createBlock(_component_Option, {
-                    key: item.id,
-                    value: item.id
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode(toDisplayString$1(item.name), 1)
-                    ]),
-                    _: 2
-                  }, 1032, ["value"]);
-                }), 128))
-              ]),
-              _: 2
-            }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+            }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createElementBlock(Fragment, { key: 8 }, [
+              createCommentVNode(` <template v-else-if="column.controlType === 'ComboSelect'">\r
+              <Select\r
+                :ref="'control_' + column.code + '_' + index"\r
+                size="small"\r
+                :model-value="parseComboData(rowData(row, index), column, index)"\r
+                @update:model-value="$event => setData(rowData(row, index), column.code, $event)"\r
+                :disabled="isReadonly(rowData(row, index), column)"\r
+                :clearable="true"\r
+                filterable\r
+                remote\r
+                :remote-method="search => loadOption(rowData(row, index), column, search)"\r
+                :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"\r
+                :placeholder="column.description"\r
+                :transfer="true"\r
+                @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"\r
+              >\r
+                <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>\r
+              </Select>\r
+            </template>\r
+            <template v-else-if="column.controlType === 'MultiComboSelect'">\r
+              <Select\r
+                :ref="'control_' + column.code + '_' + index"\r
+                :model-value="parseMultiComboData(rowData(row, index), column, index)"\r
+                @update:model-value="$event => setArrayData(rowData(row, index), column.code, $event)"\r
+                :disabled="isReadonly(rowData(row, index), column)"\r
+                :clearable="true"\r
+                :multiple="true"\r
+                filterable\r
+                remote\r
+                :remote-method="search => loadOption(rowData(row, index), column, search)"\r
+                :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"\r
+                :placeholder="column.description"\r
+                :transfer="true"\r
+                @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"\r
+              >\r
+                <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>\r
+              </Select>\r
+            </template> `),
+              createVNode$1(_component_dialog_select, {
+                "model-value": _ctx.parseData($options.rowData(row, index2), column.code),
+                size: "small",
+                "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
+                readonly: $options.isReadonly($options.rowData(row, index2), column),
+                source: column.source,
+                "source-data-code": column.sourceDataCode,
+                "source-display-code": column.sourceDisplayCode,
+                param: _ctx.getParam($options.rowData(row, index2), column, $props.parentData),
+                controlWidth: column.controlWidth == null ? null : column.controlWidth - 8,
+                onOnChange: (selected) => $options.onSelectDataChange($options.rowData(row, index2), column, selected)
+              }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])
+            ], 64)) : column.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
               key: 9,
               "model-value": _ctx.parseData($options.rowData(row, index2), column.code),
               size: "small",
               "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
-              readonly: $options.isReadonly($options.rowData(row, index2), column),
-              source: column.source,
-              "source-data-code": column.sourceDataCode,
-              "source-display-code": column.sourceDisplayCode,
-              param: _ctx.getParam($options.rowData(row, index2), column, $props.parentData),
-              controlWidth: column.controlWidth == null ? null : column.controlWidth - 8,
-              onOnChange: (selected) => $options.onSelectDataChange($options.rowData(row, index2), column, selected)
-            }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
-              key: 10,
-              "model-value": _ctx.parseData($options.rowData(row, index2), column.code),
-              size: "small",
-              "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
               multi: true,
               readonly: $options.isReadonly($options.rowData(row, index2), column),
               source: column.source,
@@ -44017,7 +44381,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 [vShow, $options.parseDataWithOther($options.rowData(row, index2), column) == "__Other"]
               ])
             ])) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" ? (openBlock(), createBlock(_component_DatePicker, {
-              key: 12,
+              key: 11,
               size: "small",
               type: column.controlType.toLowerCase(),
               "model-value": _ctx.parseDateTimeData($options.rowData(row, index2), column.code),
@@ -44030,7 +44394,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 $options.onDataChange($options.rowData(row, index2), column);
               }
             }, null, 8, ["type", "model-value", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
-              key: 13,
+              key: 12,
               size: "small",
               type: column.controlType.toLowerCase(),
               "model-value": _ctx.parseDateRangeData($options.rowData(row, index2), column.code),
@@ -44041,7 +44405,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               transfer: true,
               onOnChange: ($event) => $options.onDataChange($options.rowData(row, index2), column)
             }, null, 8, ["type", "model-value", "onUpdate:modelValue", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "Time" ? (openBlock(), createBlock(_component_TimePicker, {
-              key: 14,
+              key: 13,
               size: "small",
               type: "time",
               "model-value": _ctx.parseDateTimeData($options.rowData(row, index2), column.code),
@@ -44054,19 +44418,19 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 $options.onDataChange($options.rowData(row, index2), column);
               }
             }, null, 8, ["model-value", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "Check" ? (openBlock(), createBlock(_component_Checkbox, {
-              key: 15,
+              key: 14,
               "model-value": !!_ctx.parseData($options.rowData(row, index2), column.code),
               "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
               disabled: $options.isReadonly($options.rowData(row, index2), column),
               onOnChange: ($event) => $options.onDataChange($options.rowData(row, index2), column)
             }, null, 8, ["model-value", "onUpdate:modelValue", "disabled", "onOnChange"])) : column.controlType === "Switch" ? (openBlock(), createBlock(_component_Switch, {
-              key: 16,
+              key: 15,
               "model-value": !!_ctx.parseData($options.rowData(row, index2), column.code),
               "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
               disabled: $options.isReadonly($options.rowData(row, index2), column),
               onOnChange: ($event) => $options.onDataChange($options.rowData(row, index2), column)
             }, null, 8, ["model-value", "onUpdate:modelValue", "disabled", "onOnChange"])) : column.controlType === "Radio" ? (openBlock(), createBlock(_component_RadioGroup, {
-              key: 17,
+              key: 16,
               "model-value": _ctx.parseData($options.rowData(row, index2), column.code),
               "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
               onOnChange: (selected) => $options.onSelectDataChange($options.rowData(row, index2), column, selected)
@@ -44087,7 +44451,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               ]),
               _: 2
             }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "CheckGroup" ? (openBlock(), createBlock(_component_CheckboxGroup, {
-              key: 18,
+              key: 17,
               "model-value": _ctx.parseArrayData($options.rowData(row, index2), column.code),
               "onUpdate:modelValue": ($event) => _ctx.setArrayData($options.rowData(row, index2), column.code, $event),
               onOnChange: ($event) => $options.onDataChange($options.rowData(row, index2), column)
@@ -44107,7 +44471,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 }), 128))
               ]),
               _: 2
-            }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "Attachment" ? (openBlock(), createElementBlock(Fragment, { key: 19 }, [
+            }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "Attachment" ? (openBlock(), createElementBlock(Fragment, { key: 18 }, [
               createCommentVNode(' <upload-attachment :value="parseData(data, column.code)"\r\n            @update:model-value="$event => setData(data, column.code, $event)"\r\n            v-if="!readonly && !column.isReadonly"\r\n            size="small"\r\n            :maxCount="column.maxLength" /> '),
               !!(_ctx.parseData($options.rowData(row, index2), column.code) || "").trim() ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(JSON.parse(_ctx.parseData(row, column.code)), (attachment, attachmentIndex) => {
                 return openBlock(), createElementBlock("a", {
@@ -44121,7 +44485,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 ], 8, _hoisted_7$3);
               }), 128)) : createCommentVNode("v-if", true)
             ], 64)) : column.controlType === "Image" ? (openBlock(), createElementBlock("div", {
-              key: 20,
+              key: 19,
               class: "image-group",
               style: normalizeStyle$1({ "justify-content": column.align ? column.align.toLowerCase() : "center" })
             }, [
@@ -44137,7 +44501,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                   }, null, 8, _hoisted_9$2)) : createCommentVNode("v-if", true)
                 ]);
               }), 128))
-            ], 4)) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 21 }, [
+            ], 4)) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 20 }, [
               createVNode$1(_component_Slider, {
                 "model-value": _ctx.parseData($options.rowData(row, index2), column.code),
                 "onUpdate:modelValue": ($event) => _ctx.setData($options.rowData(row, index2), column.code, $event),
@@ -44164,7 +44528,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                 style: normalizeStyle$1({ width: column.controlWidth == null ? "100px" : column.controlWidth + "px" }),
                 placeholder: column.description
               }, null, 8, ["model-value", "style", "placeholder"])) : createCommentVNode("v-if", true)
-            ], 64)) : column.controlType === "Placeholder" ? (openBlock(), createElementBlock(Fragment, { key: 22 }, [], 64)) : (openBlock(), createElementBlock(Fragment, { key: 23 }, [
+            ], 64)) : column.controlType === "Placeholder" ? (openBlock(), createElementBlock(Fragment, { key: 21 }, [], 64)) : (openBlock(), createElementBlock(Fragment, { key: 22 }, [
               createTextVNode(toDisplayString$1(_ctx.$t("Front_Label_Control_Type_Not_Supported")) + " " + toDisplayString$1(column.controlType), 1)
             ], 64))
           ], 64)) : createCommentVNode("v-if", true)
@@ -51086,7 +51450,7 @@ const _sfc_main$o = {
       if (!(column.dataType || "").trim()) {
         return null;
       }
-      if (column.dataType.indexOf("Enum:") === 0) {
+      if (column.dataType.startsWith("Enum:")) {
         return "string";
       }
       switch (column.dataType) {
@@ -51199,22 +51563,33 @@ const _sfc_main$o = {
       });
     },
     async fillDataSource(data2, column, param) {
+      let value;
+      if (column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect") {
+        value = this.parseTreeData(data2, column.code);
+        column.dataSource = null;
+      }
+      if (column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect") {
+        param.per = 20;
+      }
+      this.disableLoader();
       let res2;
       if (column.isSourceCustom) {
         res2 = await customModelApi.query(column.source, param);
       } else {
         res2 = await modelApi.query(column.source, param);
       }
+      this.enableLoader();
       column.rawData = res2.data;
       if (column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect") {
-        let data3 = res2.data.map((item) => {
+        let treeData = res2.data.map((item) => {
           return {
             id: !(column.sourceDataCode || "").trim() ? item.id : this.parseData(item, column.sourceDataCode),
             name: this.parseData(item, column.sourceDisplayCode),
             parentID: item.parentID
           };
         });
-        column.dataSource = this.getTreeDataSource(data3, column, null);
+        column.dataSource = this.getTreeDataSource(treeData, column, null);
+        this.setData(data2, column.code, value);
       } else {
         column.dataSource = res2.data.map((item) => {
           return {
@@ -51225,6 +51600,7 @@ const _sfc_main$o = {
         if (data2) {
           if (this.parseData(data2, column.code) == null && column.isDefaultFirst && res2.data.length > 0) {
             this.setData(data2, column.code, this.parseData(res2.data[0], column.sourceDataCode));
+            this.$emit("on-change", column, null, column.rawData[0], null);
             if (column.sourceDataCode == "id" && column.code.length > 2) {
               let code2 = column.code.substr(0, column.code.length - 2);
               let model2 = column.rawData.find((item) => {
@@ -51235,7 +51611,7 @@ const _sfc_main$o = {
           }
         }
       }
-      if (column.controlType == "Select" || column.controlType == "ComboSelect" || column.controlType == "Radio") {
+      if (column.controlType == "Select" || column.controlType == "Radio") {
         if (!column.dataSource.some((item) => {
           return item.id == this.parseData(data2, column.code);
         })) {
@@ -51266,7 +51642,7 @@ const _sfc_main$o = {
       return result2;
     },
     getDataSource(data2, column) {
-      if (!column.isStaticItem && column.dataType && column.dataType.indexOf("Enum:") === 0) {
+      if (!column.isStaticItem && column.dataType && column.dataType.startsWith("Enum:")) {
         return this.getEnumList(column.dataType.split(":")[1]);
       } else {
         return column.dataSource == null ? [] : column.dataSource;
@@ -51296,7 +51672,7 @@ const _sfc_main$o = {
           });
         } else if (column.needRefresh && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"))) {
           let param = this.getParam(this.data, column);
-          if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
+          if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "MultiComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
             if (param != null) {
               this.fillDataSource(this.data, column, param);
             } else {
@@ -51472,6 +51848,83 @@ const _sfc_main$o = {
           col.parentNode.insertBefore(line, col);
         }
       });
+    },
+    async loadOption(data2, column, keyword) {
+      if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
+        return;
+      }
+      let param = this.getParam(data2, column);
+      if (param != null) {
+        param[column.sourceDisplayCode + "_c"] = keyword;
+        this.fillDataSource(data2, column, param);
+      } else {
+        column.rawData = [];
+        column.dataSource = [];
+        this.setData(data2, column.code, null);
+        column.triggers.forEach((item) => {
+          item.needClear = true;
+        });
+      }
+    },
+    parseComboData(model2, column) {
+      let value = this.parseData(model2, column.code);
+      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]) {
+        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);
+          }
+        }
+        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") {
+              this.$refs["control_" + column.code][0].$data.query = label;
+            }
+            let newValue = pendings.find((i3) => i3.value == v);
+            if (newValue) {
+              newValue.label = label;
+            }
+          });
+          this.$forceUpdate();
+        }
+      }
     }
   }
 };
@@ -51791,15 +52244,18 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                                 </AutoComplete>\r
                             </template> `),
                     createVNode$1(_component_Select, {
-                      "model-value": _ctx.parseData($data.data, column.code),
+                      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: "",
+                      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: ($event) => $options.onDataChange(column)
+                      onOnChange: (selected) => _ctx.onSelectDataChange(column, selected)
                     }, {
                       default: withCtx(() => [
                         (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
@@ -51815,9 +52271,38 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                         }), 128))
                       ]),
                       _: 2
-                    }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "style", "placeholder", "onOnChange"])
-                  ], 64)) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
+                    }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])
+                  ], 64)) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
                     key: 11,
+                    ref: "control_" + column.code,
+                    "model-value": $options.parseMultiComboData($data.data, column),
+                    "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
+                    clearable: true,
+                    multiple: 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)
+                  }, {
+                    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$1(item.name), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "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),
                     readonly: column.isReadonly,
@@ -51828,7 +52313,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     controlWidth: column.controlWidth,
                     onOnChange: (selected) => $options.onDataChange(column, selected)
                   }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
-                    key: 12,
+                    key: 13,
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     multi: true,
@@ -51840,7 +52325,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     controlWidth: column.controlWidth,
                     onOnChange: (selected) => $options.onDataChange(column, selected)
                   }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" ? (openBlock(), createBlock(_component_DatePicker, {
-                    key: 13,
+                    key: 14,
                     type: column.controlType.toLowerCase(),
                     "model-value": _ctx.parseData($data.data, column.code),
                     readonly: column.isReadonly,
@@ -51852,7 +52337,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                       $options.onDataChange(column);
                     }
                   }, null, 8, ["type", "model-value", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
-                    key: 14,
+                    key: 15,
                     type: column.controlType.toLowerCase(),
                     "model-value": _ctx.parseDateRangeData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
@@ -51862,7 +52347,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                     onOnChange: ($event) => $options.onDataChange(column)
                   }, null, 8, ["type", "model-value", "onUpdate:modelValue", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "Time" ? (openBlock(), createBlock(_component_TimePicker, {
-                    key: 15,
+                    key: 16,
                     type: "time",
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
@@ -51875,20 +52360,20 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                       $options.onDataChange(column);
                     }
                   }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "placeholder", "style", "onOnChange"])) : column.controlType === "Check" ? (openBlock(), createBlock(_component_Checkbox, {
-                    key: 16,
+                    key: 17,
                     "model-value": !!_ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     disabled: column.isReadonly,
                     size: "large",
                     onOnChange: ($event) => $options.onDataChange(column)
                   }, null, 8, ["model-value", "onUpdate:modelValue", "disabled", "onOnChange"])) : column.controlType === "Switch" ? (openBlock(), createBlock(_component_Switch, {
-                    key: 17,
+                    key: 18,
                     "model-value": !!_ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     disabled: column.isReadonly,
                     onOnChange: ($event) => $options.onDataChange(column)
                   }, null, 8, ["model-value", "onUpdate:modelValue", "disabled", "onOnChange"])) : column.controlType === "Radio" ? (openBlock(), createBlock(_component_RadioGroup, {
-                    key: 18,
+                    key: 19,
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     onOnChange: ($event) => $options.onDataChange(column)
@@ -51909,7 +52394,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 2
                   }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "CheckGroup" ? (openBlock(), createBlock(_component_CheckboxGroup, {
-                    key: 19,
+                    key: 20,
                     "model-value": _ctx.parseArrayData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setArrayData($data.data, column.code, $event),
                     onOnChange: ($event) => $options.onDataChange(column)
@@ -51930,7 +52415,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 2
                   }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "TextArea" ? (openBlock(), createBlock(_component_Input, {
-                    key: 20,
+                    key: 21,
                     type: "textarea",
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
@@ -51940,14 +52425,14 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     maxlength: column.maxLength,
                     placeholder: column.description
                   }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "style", "rows", "maxlength", "placeholder"])) : column.controlType === "RichEditor" ? (openBlock(), createBlock(_component_rich_editor, {
-                    key: 21,
+                    key: 22,
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     readonly: column.isReadonly,
                     height: column.controlHeight,
                     width: column.controlWidth
                   }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "height", "width"])) : column.controlType === "Attachment" ? (openBlock(), createBlock(_component_upload_attachment, {
-                    key: 22,
+                    key: 23,
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     readonly: column.isReadonly,
@@ -51955,14 +52440,14 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                     accept: column.pattern,
                     draggable: column.mergeSame
                   }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "accept", "draggable"])) : column.controlType === "Image" ? (openBlock(), createBlock(_component_upload_image, {
-                    key: 23,
+                    key: 24,
                     "model-value": _ctx.parseData($data.data, column.code),
                     "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
                     readonly: column.isReadonly,
                     maxCount: column.maxLength,
                     height: column.controlHeight,
                     width: column.controlWidth
-                  }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "height", "width"])) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 24 }, [
+                  }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "height", "width"])) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 25 }, [
                     !column.isReadonly ? (openBlock(), createBlock(_component_Slider, {
                       key: 0,
                       "model-value": _ctx.parseData($data.data, column.code),
@@ -52063,7 +52548,7 @@ const _sfc_main$n = {
         };
         if (item.id == "Label" || item.id == "TextInput" || item.id == "NumberInput" || item.id == "Hyperlink" || item.id == "Check" || item.id == "Switch" || item.id == "Slider" || item.id == "TextArea") {
           this.componentGroups.find((componentGroup) => componentGroup.key == "Normal").components.push(component);
-        } else if (item.id == "Select" || item.id == "SelectWithOther" || item.id == "MultiSelect" || item.id == "ComboSelect" || item.id == "DialogSelect" || item.id == "MultiDialogSelect" || item.id == "TreeSelect" || item.id == "MultiTreeSelect" || item.id == "Radio" || item.id == "CheckGroup") {
+        } else if (item.id == "Select" || item.id == "SelectWithOther" || item.id == "MultiSelect" || item.id == "ComboSelect" || item.id == "MultiComboSelect" || item.id == "DialogSelect" || item.id == "MultiDialogSelect" || item.id == "TreeSelect" || item.id == "MultiTreeSelect" || item.id == "Radio" || item.id == "CheckGroup") {
           this.componentGroups.find((componentGroup) => componentGroup.key == "Datasource").components.push(component);
         } else if (item.id == "Date" || item.id == "Time" || item.id == "DateTime" || item.id == "Year" || item.id == "Month" || item.id == "DateRange") {
           this.componentGroups.find((componentGroup) => componentGroup.key == "DateTime").components.push(component);