mooho-base-admin-plus 2.4.26 → 2.4.28

package/history.md

@@ -58,3 +58,5 @@
 2.4.24 - 修复登录时未更新菜单的 bug
 2.4.25 - 增加上传文件大小限制
 2.4.26 - 优化计算列，避免转换对象
+2.4.27 - 优化标题默认样式
+2.4.28 - 修复可筛选下拉框选中内容会跳回原值的bug

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

@@ -23085,6 +23085,7 @@ var mixinPage = {
       return lodash$1.exports.get(model2, expression2);
     },
     setData(model2, expression2, value) {
+      console.log("setData", expression2, value);
       lodash$1.exports.set(model2, expression2, value);
     },
     parseDateTimeData(model2, expression2) {
@@ -37624,6 +37625,7 @@ const _sfc_main$w = {
     },
     parseComboData(model2, column) {
       let value = this.parseData(model2, column.code);
+      console.log("parseComboData", column.code, value);
       this.loadComboDataLabel(model2, column, value);
       return value;
     },
@@ -37640,8 +37642,10 @@ const _sfc_main$w = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
+      console.log("loadComboDataLabel", column.code, data2);
       if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
+        console.log("values", values);
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
           data2.forEach((value) => {
@@ -37659,9 +37663,11 @@ const _sfc_main$w = {
           }
         }
         if (pendings.length > 0) {
+          console.log("pendings", pendings);
           let param = this.getParam(model2, column);
           param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
           let res2;
+          console.log("param", param);
           if (column.isSourceCustom) {
             res2 = await customModelApi.query(column.source, param);
           } else {
@@ -37671,7 +37677,7 @@ const _sfc_main$w = {
             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;
+              console.log("label", label);
             }
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
@@ -42167,9 +42173,8 @@ const _sfc_main$r = {
           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;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;
@@ -42187,7 +42192,7 @@ const _hoisted_2$f = {
   class: "label"
 };
 const _hoisted_3$d = {
-  key: 15,
+  key: 16,
   style: { "line-height": "24px" }
 };
 function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
@@ -42397,10 +42402,40 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     }), 128))
                   ]),
                   _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_Select, {
                   key: 10,
                   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: _ctx.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,
+                  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 === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                  key: 11,
+                  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),
@@ -42429,7 +42464,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   _: 2
                 }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
-                  key: 11,
+                  key: 12,
                   size: "small",
                   "model-value": $options.parseFilterData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
@@ -42440,7 +42475,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: 12,
+                  key: 13,
                   size: "small",
                   type: column.controlType.toLowerCase(),
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42452,7 +42487,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: 13,
+                  key: 14,
                   size: "small",
                   type: "time",
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42462,7 +42497,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: 14,
+                  key: 15,
                   size: "small",
                   style: { "line-height": "26px" },
                   "model-value": !!$options.parseFilterData($data.data, column),
@@ -42476,7 +42511,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: 16,
+                  key: 17,
                   size: "small",
                   style: { "line-height": "22px" },
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42498,14 +42533,14 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   _: 2
                 }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "TextArea" ? (openBlock(), createBlock(_component_Input, {
-                  key: 17,
+                  key: 18,
                   type: "textarea",
                   "model-value": $options.parseFilterData($data.data, column.code),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column.code, $event),
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   rows: column.controlHeight / 20,
                   placeholder: column.description
-                }, null, 8, ["model-value", "onUpdate:modelValue", "style", "rows", "placeholder"])) : (openBlock(), createElementBlock(Fragment, { key: 18 }, [
+                }, null, 8, ["model-value", "onUpdate:modelValue", "style", "rows", "placeholder"])) : (openBlock(), createElementBlock(Fragment, { key: 19 }, [
                   createTextVNode(toDisplayString$1(_ctx.$t("Front_Label_Control_Type_Not_Supported")) + " " + toDisplayString$1(column.controlType), 1)
                 ], 64))
               ]),
@@ -44025,9 +44060,8 @@ const _sfc_main$q = {
           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;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;
@@ -52070,9 +52104,8 @@ const _sfc_main$o = {
           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;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;