diff --git a/src/components/Select2/index.vue b/src/components/Select2/index.vue index b9b5d8eb1..24b511dd0 100644 --- a/src/components/Select2/index.vue +++ b/src/components/Select2/index.vue @@ -124,16 +124,24 @@ export default { this.initialSelect() }, methods: { - loadMore(load) { + async loadMore(load) { + if (this.loading) { + return + } if (!this.params.hasMore) { return } + this.loading = true this.params.page = this.params.page ? this.params.page + 1 : 1 const defaultLoad = this.getOptions if (!load) { load = defaultLoad } - load() + try { + await load() + } finally { + this.loading = false + } }, resetParams() { this.params = _.cloneDeep(this.defaultParams) @@ -166,7 +174,7 @@ export default { this.params.hasMore = false this.resetParams() } else { - this.loadMore(this.getInitialOptions) + await this.loadMore(this.getInitialOptions) } }, async getOptions() { diff --git a/src/layout/components/SubMenuPage/index.vue b/src/layout/components/TabPage/index.vue similarity index 98% rename from src/layout/components/SubMenuPage/index.vue rename to src/layout/components/TabPage/index.vue index d513662e8..0b004a57c 100644 --- a/src/layout/components/SubMenuPage/index.vue +++ b/src/layout/components/TabPage/index.vue @@ -24,7 +24,7 @@