mooho-base-admin-plus 2.0.49 → 2.0.50

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.0.49",
+  "version": "2.0.50",
   "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" v-if="dialogActive">
+    <modal-table ref="dialogTable" :view-code="source" :selectEnable="multi" :check-cross-page="true" :footer-enable="multi" v-if="dialogActive">
       <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>
@@ -225,7 +225,13 @@
               }
             }
 
-            this.$refs.dialogTable.open(this.param);
+            if (this.param) {
+              this.$refs.dialogTable.open(this.param);
+            } else {
+              // 参数不完整
+              this.$refs.dialogTable.clear();
+              this.$refs.dialogTable.opened = true;
+            }
           });
         }
       },

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

@@ -30,10 +30,9 @@
         :static="this.static"
         :filter="tableFilter"
         :setting-enable="settingEnable"
+        :auto-load="false"
         :select-enable="selectEnable"
-        :autoLoad="false"
-        :selectEnable="selectEnable"
-        :checkCrossPage="checkCrossPage"
+        :check-cross-page="checkCrossPage"
         :tree-enable="treeEnable"
         :tree-load="treeLoad"
         :has-children="hasChildren"
@@ -481,6 +480,10 @@
       selectAllCancel() {
         this.setSelected([]);
       },
+      // 清空数据
+      clear() {
+        this.$refs.table.clear();
+      },
       // 拖拽完成
       dragDrop(args) {
         /**

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

@@ -1361,6 +1361,18 @@
                 this.setData(this.data, column.code, null);
                 // column.displayValue = null;
 
+                // 触发
+                column.triggers.forEach(item => {
+                  item.needClear = true;
+                });
+              }
+            } else if (column.controlType === 'DialogSelect' || column.controlType === 'MultiDialogSelect') {
+              if (param == null) {
+                // 参数不完整，清空数据
+                column.dataSource = [];
+                this.setData(this.data, column.code, null);
+                // column.displayValue = null;
+
                 // 触发
                 column.triggers.forEach(item => {
                   item.needClear = true;

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

@@ -1918,6 +1918,17 @@
                 this.setData(data, column.code, null);
                 // column.displayValue = null;
 
+                // 触发
+                column.triggers.forEach(item => {
+                  data._needClear[item.code] = true;
+                });
+              }
+            } else if (column.controlType === 'DialogSelect' || column.controlType === 'MultiDialogSelect') {
+              if (param == null) {
+                // 参数不完整，清空数据
+                this.setData(data, column.code, null);
+                // column.displayValue = null;
+
                 // 触发
                 column.triggers.forEach(item => {
                   data._needClear[item.code] = true;
@@ -2468,6 +2479,11 @@
           this.loadData(data);
         }
       },
+      // 清空数据
+      clear() {
+        this.staticData = [];
+        this.data = [];
+      },
       // 根据表达式取值（带其他）
       parseDataWithOther(model, column) {
         let expression = column.code;