Merge branch 'dev' into next

2020-08-09 20:40:22 +08:00
parent de66903bae 927268cc25
commit 7f76852ef3
12 changed files with 169 additions and 151 deletions
@@ -63,12 +63,16 @@ export default createComponent({

      if (this.loading) {
        Content.push(
-          <Loading
-            class={bem('loading')}
-            size={this.loadingSize}
-            type={this.loadingType}
-            color="currentColor"
-          />
+          this.$slots.loading ? (
+            this.$slots.loading()
+          ) : (
+            <Loading
+              class={bem('loading')}
+              size={this.loadingSize}
+              type={this.loadingType}
+              color="currentColor"
+            />
+          )
        );
      } else if (this.icon) {
        Content.push(