From 10cf77141435edd844b9dfa963c5cb4b232012d9 Mon Sep 17 00:00:00 2001
From: 刘汉宸 <liuhanchen@zeyihuoyun.com>
Date: Fri, 12 Mar 2021 16:41:04 +0800
Subject: [PATCH] fix: 修复Select组件的lazy和update判断逻辑

---
 packages/schema-select/index.vue | 31 ++++++++++++++++++++++++++-----
 packages/select/index.vue        |  4 +++-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/schema-select/index.vue b/packages/schema-select/index.vue
index 11611b6..bc80d1c 100644
--- a/packages/schema-select/index.vue
+++ b/packages/schema-select/index.vue
@@ -12,7 +12,7 @@
 </style>
 
 <template>
-  <el-popover class="z-schema-select" popper-class="z-schema-select__popper" v-model="visible" trigger="click" placement="bottom-start" transition="el-zoom-in-top">
+  <el-popover class="z-schema-select" popper-class="z-schema-select__popper" v-model="visible" trigger="click" placement="bottom-start" transition="el-zoom-in-top" @show="onTriggerShow">
     <template #reference>
       <el-input
         v-model="model"
@@ -93,10 +93,6 @@ export default {
       type: Array,
       default: () => [],
     },
-    auto: {
-      type: Boolean,
-      default: true,
-    },
     clearable: {
       type: Boolean,
       default: true,
@@ -124,6 +120,8 @@ export default {
       },
     },
     apiSearch: Function,
+    lazy: Boolean,
+    update: Boolean,
   },
   inject: {
     elForm: {
@@ -141,6 +139,7 @@ export default {
       visible: false,
       inputHovering: false,
       tableData: [],
+      loaded: false,
     };
   },
   created() {
@@ -213,6 +212,15 @@ export default {
       }
       return [];
     },
+    auto() {
+      if (this.lazy) {
+        return false;
+      }
+      if (this.update) {
+        return false;
+      }
+      return true;
+    },
   },
   watch: {
     value(val) {
@@ -238,6 +246,19 @@ export default {
         }
       }
     },
+    // 显示弹框
+    onTriggerShow() {
+      if (this.lazy) {
+        if (!this.loaded) {
+          this.onInput();
+          this.loaded = true;
+        } else if (this.update) {
+          this.onInput();
+        }
+      } else if (this.update) {
+        this.onInput();
+      }
+    },
     onInputFocus() {
       if (!this.allowCreate) {
         this.model = '';
diff --git a/packages/select/index.vue b/packages/select/index.vue
index dded3d1..4709bc1 100644
--- a/packages/select/index.vue
+++ b/packages/select/index.vue
@@ -95,7 +95,7 @@ export default {
     };
   },
   created() {
-    if (this.remote && !this.lazy) {
+    if (this.remote && !(this.lazy || this.update)) {
       this.initing = true;
       this.remoteMethod();
     }
@@ -191,6 +191,8 @@ export default {
             if (this.lazy) {
               if (!this.loaded) {
                 this.remoteMethod();
+              } else if (this.update) {
+                this.remoteMethod();
               }
             } else if (this.update) {
               this.remoteMethod();
--
libgit2 0.21.0