Merge branch 'dev'

FEMessage · Dec 11, 2019 · 08e2ee6 · 08e2ee6
2 parents d242d18 + 7773639
commit 08e2ee6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/el-data-table.vue b/src/el-data-table.vue
@@ -925,6 +925,7 @@ export default {
            * @event error
            */
           this.$emit('error', err)
+          this.total = 0
           this.loading = false
         })
     },

diff --git a/yarn.lock b/yarn.lock
@@ -791,9 +791,9 @@
     minimist "^1.2.0"
 
 "@femessage/el-form-renderer@^1.6.0":
-  version "1.11.2"
-  resolved "https://registry.npm.taobao.org/@femessage/el-form-renderer/download/@femessage/el-form-renderer-1.11.2.tgz#bcd209fa3f9057de6463d91aa71b052219764eaa"
-  integrity sha1-vNIJ+j+QV95kY9kapxsFIhl2Tqo=
+  version "1.12.1"
+  resolved "https://registry.npm.taobao.org/@femessage/el-form-renderer/download/@femessage/el-form-renderer-1.12.1.tgz#07c021f56ad25b11040d605bccf9d369af9a1861"
+  integrity sha1-B8Ah9WrSWxEEDWBbzPnTaa+aGGE=
   dependencies:
     lodash.get "^4.4.2"
     lodash.set "^4.3.2"