mooho-base-admin-plus 2.4.42 → 2.4.44

package/package.json

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

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

@@ -14,7 +14,7 @@
         <Button :size="size" custom-icon="fa fa-search" @click="dialogSelectOpen()"></Button>
       </template>
     </Input>
-    <modal-table ref="dialogTable" :view-code="source" :selectEnable="multi" :check-cross-page="true" :footer-enable="multi" :load-data-enable="loadDataEnable" v-if="dialogActive">
+    <modal-table ref="dialogTable" :view-code="source" :autoLoad="false" :selectEnable="multi" :check-cross-page="true" :footer-enable="multi">
       <template #command="{ row }">
         <Button size="small" v-if="!multi" type="primary" custom-icon="fa fa-check" @click="dialogCheck(row)">{{ $t('Front_Btn_Select') }}</Button>
       </template>
@@ -42,7 +42,6 @@
         //changed: false,
         selected: null,
         selectedData: null,
-        dialogActive: false,
         loadDataEnable: true
       };
     },
@@ -218,7 +217,15 @@
       // 弹出选择框
       dialogSelectOpen() {
         if (!this.readonly && this.source) {
-          this.dialogActive = true;
+          if (this.param) {
+            // 参数完整
+            this.loadDataEnable = true;
+          } else {
+            // 参数不完整
+            this.loadDataEnable = false;
+          }
+
+          this.$refs.dialogTable.loadData();
 
           setTimeout(async () => {
             if (this.multi) {
@@ -229,14 +236,6 @@
               }
             }
 
-            if (this.param) {
-              // 参数完整
-              this.loadDataEnable = true;
-            } else {
-              // 参数不完整
-              this.loadDataEnable = false;
-            }
-
             this.$refs.dialogTable.open(this.param);
           });
         }

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

@@ -138,32 +138,12 @@
               :placeholder="column.description"
               :transfer="true"
               @on-change="selected => onSelectDataChange(column, selected)"
-            >
-              <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
-            </Select>
-          </template>
-
-          <template v-else-if="column.controlType === 'ComboSelect'">
-            <Select
-              :ref="'control_' + column.code"
-              :model-value="parseComboData(data, column)"
-              @update:model-value="$event => setData(data, column.code, $event)"
-              :disabled="readonly || column.isReadonly"
-              :clearable="true"
-              filterable
-              remote
-              :remote-method="search => loadOption(data, column, search)"
-              :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
-              :placeholder="column.description"
-              :transfer="true"
-              @on-change="selected => onSelectDataChange(column, selected)"
               @on-query-change="query => onComboQueryChange(column, query)"
               @on-clear="loadOption(data, column, null)"
             >
               <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
             </Select>
           </template>
-
           <template v-else-if="column.controlType === 'MultiComboSelect'">
             <Select
               :ref="'control_' + column.code"