mooho-base-admin-plus 2.10.81 → 2.10.83

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.81",
+  "version": "2.10.83",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/input/dialog-select.vue

@@ -43,6 +43,18 @@
       modelValue: {
         type: String
       },
+      /**
+       * 原始数据
+       */
+      rawData: {
+        type: Object
+      },
+      /**
+       * 字段代码
+       */
+      columnCode: {
+        type: String
+      },
       /**
        * 数据源
        */
@@ -172,6 +184,17 @@
             }
           });
         } else {
+          if (this.rawData && this.columnCode.endsWith('ID')) {
+            let selected = this.parseData(this.rawData, this.columnCode.substring(0, this.columnCode.length - 2));
+
+            if (selected != null) {
+              this.selected = this.parseData(selected, this.sourceDisplayCode);
+              this.selectedData = selected;
+
+              return;
+            }
+          }
+
           let filter = {
             page: 1,
             per: 1

package/src/components/view/view-form.vue

@@ -292,13 +292,15 @@
               <template v-else-if="column.controlType === 'DialogSelect'">
                 <dialog-select
                   :model-value="parseData(data, column.code)"
+                  :raw-data="data"
+                  :column-code="column.code"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
                   :source="column.source"
                   :source-data-code="column.sourceDataCode"
                   :source-display-code="column.sourceDisplayCode"
                   :param="getParam(data, column)"
-                  :controlWidth="column.controlWidth"
+                  :control-width="column.controlWidth"
                   @on-change="selected => onSelectDataChange(column, selected)"
                 ></dialog-select>
               </template>
@@ -312,7 +314,7 @@
                   :source-data-code="column.sourceDataCode"
                   :source-display-code="column.sourceDisplayCode"
                   :param="getParam(data, column)"
-                  :controlWidth="column.controlWidth"
+                  :control-width="column.controlWidth"
                   @on-change="selected => onSelectDataChange(column, selected)"
                 ></dialog-select>
               </template>

package/src/components/view/view-table.vue

@@ -279,6 +279,8 @@
             <template v-else-if="column.controlType === 'DialogSelect'">
               <dialog-select
                 :model-value="parseData(rowData(row, index), column.code)"
+                :raw-data="rowData(row, index)"
+                :column-code="column.code"
                 size="small"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :readonly="isReadonly(rowData(row, index), column)"
@@ -2140,7 +2142,12 @@
         }
 
         if (code) {
-          this.setData(data, code, model);
+          let objModel = model;
+          if (sender.sourceDataCode.endsWith('ID')) {
+            objModel = this.parseData(model, sender.sourceDataCode.substr(0, sender.sourceDataCode.length - 2));
+          }
+
+          this.setData(data, code, objModel);
         }
 
         this.onDataChange(data, sender, model);