mooho-base-admin-plus 2.10.81 → 2.10.83

package/history.md

@@ -252,3 +252,5 @@ mooho-base-admin-plus@2.10.78 - 修复上一版本的bug
 mooho-base-admin-plus@2.10.79 - Excel表格必填标致放标题左边
 mooho-base-admin-plus@2.10.80 - Excel表格支持可筛选选择框
 mooho-base-admin-plus@2.10.81 - 优化弹出选择控件
+mooho-base-admin-plus@2.10.82 - 优化弹出选择控件
+mooho-base-admin-plus@2.10.83 - 修复上一版本的bug

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

@@ -30340,6 +30340,18 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_re
     modelValue: {
       type: String
     },
+    /**
+     * 原始数据
+     */
+    rawData: {
+      type: Object
+    },
+    /**
+     * 字段代码
+     */
+    columnCode: {
+      type: String
+    },
     /**
      * 数据源
      */
@@ -30431,6 +30443,13 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_re
           }
         });
       } else {
+        if (this.rawData && this.columnCode.endsWith("ID")) {
+          let r = this.parseData(this.rawData, this.columnCode.substring(0, this.columnCode.length - 2));
+          if (r != null) {
+            this.selected = this.parseData(r, this.sourceDisplayCode), this.selectedData = r;
+            return;
+          }
+        }
         let a = {
           page: 1,
           per: 1
@@ -42653,15 +42672,17 @@ function _sfc_render$p(a, r, o, s, l, c) {
                       }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "remote-method", "data", "param", "column", "onOnChange"])) : W.controlType === "DialogSelect" ? (openBlock(), createBlock(b, {
                         key: 14,
                         "model-value": a.parseData(l.data, W.code),
+                        "raw-data": l.data,
+                        "column-code": W.code,
                         "onUpdate:modelValue": (he) => a.setData(l.data, W.code, he),
                         readonly: o.readonly || W.isReadonly,
                         source: W.source,
                         "source-data-code": W.sourceDataCode,
                         "source-display-code": W.sourceDisplayCode,
                         param: a.getParam(l.data, W),
-                        controlWidth: W.controlWidth,
+                        "control-width": W.controlWidth,
                         onOnChange: (he) => c.onSelectDataChange(W, he)
-                      }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : W.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(b, {
+                      }, null, 8, ["model-value", "raw-data", "column-code", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "control-width", "onOnChange"])) : W.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(b, {
                         key: 15,
                         "model-value": a.parseData(l.data, W.code),
                         "onUpdate:modelValue": (he) => a.setData(l.data, W.code, he),
@@ -42671,9 +42692,9 @@ function _sfc_render$p(a, r, o, s, l, c) {
                         "source-data-code": W.sourceDataCode,
                         "source-display-code": W.sourceDisplayCode,
                         param: a.getParam(l.data, W),
-                        controlWidth: W.controlWidth,
+                        "control-width": W.controlWidth,
                         onOnChange: (he) => c.onSelectDataChange(W, he)
-                      }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : W.controlType === "SelectWithOther" ? (openBlock(), createElementBlock(Fragment, { key: 16 }, [
+                      }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "control-width", "onOnChange"])) : W.controlType === "SelectWithOther" ? (openBlock(), createElementBlock(Fragment, { key: 16 }, [
                         createVNode$1(_, {
                           "model-value": c.parseDataWithOther(l.data, W),
                           "onUpdate:modelValue": (he) => c.setDataWithOther(l.data, W.code, he),
@@ -105203,7 +105224,11 @@ const _sfc_main$n = {
           l = o;
       else
         a._rawData && a._rawData[r.code] ? l = a._rawData[r.code].find((c) => this.parseData(c, r.sourceDataCode) == o) : l = o;
-      s && this.setData(a, s, l), this.onDataChange(a, r, l);
+      if (s) {
+        let c = l;
+        r.sourceDataCode.endsWith("ID") && (c = this.parseData(l, r.sourceDataCode.substr(0, r.sourceDataCode.length - 2))), this.setData(a, s, c);
+      }
+      this.onDataChange(a, r, l);
     },
     // 数据变化事件
     onDataChange(a, r, o) {
@@ -105911,6 +105936,8 @@ function _sfc_render$n(a, r, o, s, l, c) {
             }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "clearable", "style", "placeholder", "onOnChange"])) : ee.controlType === "DialogSelect" ? (openBlock(), createBlock(A, {
               key: 10,
               "model-value": a.parseData(c.rowData(ce, V), ee.code),
+              "raw-data": c.rowData(ce, V),
+              "column-code": ee.code,
               size: "small",
               "onUpdate:modelValue": (H) => a.setData(c.rowData(ce, V), ee.code, H),
               readonly: c.isReadonly(c.rowData(ce, V), ee),
@@ -105922,7 +105949,7 @@ function _sfc_render$n(a, r, o, s, l, c) {
               onOnChange: (H) => c.onSelectDataChange(c.rowData(ce, V), ee, H),
               onClick: r[9] || (r[9] = withModifiers(() => {
               }, ["stop"]))
-            }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : ee.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(A, {
+            }, null, 8, ["model-value", "raw-data", "column-code", "onUpdate:modelValue", "readonly", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : ee.controlType === "MultiDialogSelect" ? (openBlock(), createBlock(A, {
               key: 11,
               "model-value": a.parseData(c.rowData(ce, V), ee.code),
               size: "small",
@@ -106357,7 +106384,7 @@ function _sfc_render$n(a, r, o, s, l, c) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-22006e27"]]), __vite_glob_1_33 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-cf405477"]]), __vite_glob_1_33 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {