Merge branch 'dev'

FEMessage · Sep 12, 2019 · 9712966 · 9712966
2 parents ff7bcfa + 4d1079a
commit 9712966
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/el-data-table.vue b/src/el-data-table.vue
@@ -13,11 +13,7 @@
         :is-search-collapse="isSearchCollapse"
         :located-slot-keys="searchLocatedSlotKeys"
       >
-        <slot
-          v-for="slot in searchLocatedSlotKeys"
-          :name="slot"
-          :slot="slot"
-        />
+        <slot v-for="slot in searchLocatedSlotKeys" :name="slot" :slot="slot" />
         <!--@slot 额外的搜索内容, 当searchForm不满足需求时可以使用-->
         <slot name="search"></slot>
         <el-form-item>
@@ -905,17 +901,17 @@ export default {
         history.replaceState(history.state, '', newUrl)
       }
 
-      this.$nextTick(() => {
-        this.getList()
-      })
-
       /**
        * 按下重置按钮后触发
        */
       this.$emit('reset')
 
       this.$emit('update:customQuery', JSON.parse(this.initExtraQuery))
       this.$emit('update:extraQuery', JSON.parse(this.initExtraQuery))
+
+      this.$nextTick(() => {
+        this.getList()
+      })
     },
     handleSizeChange(val) {
       if (this.size === val) return