Merge branch '2.x' into dev

2020-12-26 15:52:18 +08:00
parent 455b9e6d44 ed2eaf005c
commit 037b6b8c10
10 changed files with 96 additions and 31 deletions
@@ -120,7 +120,7 @@ export default createComponent({
    };

    const renderPlaceholder = () => {
-      if (loading.value && props.showLoading && inBrowser) {
+      if (loading.value && props.showLoading) {
        return <div class={bem('loading')}>{renderLoadingIcon()}</div>;
      }
      if (error.value && props.showError) {