mooho-base-admin-plus 2.10.83 → 2.10.84

package/history.md

@@ -254,3 +254,4 @@ 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
+mooho-base-admin-plus@2.10.84 - 修复上一版本的bug

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

@@ -30421,7 +30421,8 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_re
       if (this.modelValue == null) {
         this.selected = null, this.selectedData = null;
         return;
-      } else if (this.multi) {
+      }
+      if (this.multi) {
         if (!this.isJSON(this.modelValue)) {
           this.selected = null, this.selectedData = null;
           return;
@@ -30446,8 +30447,20 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_re
         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 o;
+            if (this.sourceDataCode == "id")
+              o = this.sourceDisplayCode;
+            else if (this.sourceDataCode.endsWith("ID")) {
+              let s = this.sourceDataCode.substring(0, this.sourceDataCode.length - 2) + ".";
+              this.sourceDisplayCode.startsWith(s) && (o = this.sourceDisplayCode.substring(s.length));
+            }
+            if (o) {
+              let s = this.parseData(r, o);
+              if (s) {
+                this.selected = s;
+                return;
+              }
+            }
           }
         }
         let a = {