Merge branch 'dev' into next

2020-07-25 15:50:49 +08:00
parent 5879abbaf9 5c5761fc86
commit 73d538be05
109 changed files with 1699 additions and 744 deletions
@@ -120,7 +120,7 @@ export default createComponent({

        function OptionContent() {
          if (loading) {
-            return <Loading size="20px" />;
+            return <Loading class={bem('loading-icon')} />;
          }

          return [