修复 Page loading 不显示问题

scss/layout/_layout.scss

@@ -256,6 +256,7 @@ body {
 
                 &:before {
                     position: fixed;
+                    z-index: 15;
                 }
             }
 

src/renderers/Page.tsx

@@ -43,7 +43,7 @@ export interface PageProps extends RendererProps {
 }
 
 export default class Page extends React.Component<PageProps> {
-    timer: NodeJS.Timer;
+    timer: number;
     mounted: boolean;
 
     static defaultProps = {
@@ -406,13 +406,11 @@ export default class Page extends React.Component<PageProps> {
                     <div className={cx('Page-main')}>
                         {this.renderHeader()}
                         <div className={cx(`Page-body`, bodyClassName)}>
-                            {store.loading
-                                ? render('spinner', {
+                            {store.loading ? render('spinner', {
                                 type: 'spinner',
                                 overlay: true,
                                 size: 'lg',
-                                  })
-                                : null}
+                            }) : null}
 
                             {store.error ? (
                                 <Alert level="danger" showCloseButton onClose={store.clearMessage}>
@@ -425,37 +423,29 @@ export default class Page extends React.Component<PageProps> {
                     </div>
                 </div>
 
-                {render(
-                    'dialog',
-                    {
+                {render('dialog', {
                     ...((store.action as Action) && ((store.action as Action).dialog as object)),
                     type: 'dialog',
-                    },
-                    {
+                }, {
                     key: 'dialog',
                     data: store.dialogData,
                     onConfirm: this.handleDialogConfirm,
                     onClose: this.handleDialogClose,
                     show: store.dialogOpen,
                     onAction: this.handleAction,
-                    }
-                )}
+                })}
 
-                {render(
-                    'drawer',
-                    {
+                {render('drawer', {
                     ...((store.action as Action) && ((store.action as Action).drawer as object)),
                     type: 'drawer',
-                    },
-                    {
+                }, {
                     key: 'drawer',
                     data: store.drawerData,
                     onConfirm: this.handleDrawerConfirm,
                     onClose: this.handleDrawerClose,
                     show: store.drawerOpen,
                     onAction: this.handleAction,
-                    }
-                )}
+                })}
             </div>
         );
     }

src/renderers/Service.tsx

@@ -25,7 +25,7 @@ export interface ServiceProps extends RendererProps {
     };
 }
 export default class Service extends React.Component<ServiceProps> {
-    timer: NodeJS.Timeout;
+    timer: number;
     mounted: boolean;
 
     static defaultProps: Partial<ServiceProps> = {
@@ -206,8 +206,7 @@ export default class Service extends React.Component<ServiceProps> {
 
                 {this.renderBody()}
 
-                {store.loading
-                    ? render(
+                {store.loading ? render(
                     'info',
                     {
                         type: 'spinner',
@@ -217,8 +216,7 @@ export default class Service extends React.Component<ServiceProps> {
                         key: 'info',
                         size: 'lg',
                     }
-                    )
-                    : null}
+                ) : null}
             </div>
         );
     }

src/store/service.ts

@@ -124,11 +124,11 @@ export const ServiceStore = iRendererStore
                     return;
                 }
 
-                markFetching(false);
                 if (root.isCancel(e)) {
                     return;
                 }
                 
+                markFetching(false);
                 e.stack && console.error(e.stack);
                 root.notify('error', e.message || e);
             }
@@ -185,11 +185,11 @@ export const ServiceStore = iRendererStore
                     return;
                 }
 
-                markFetching(false);
                 if (root.isCancel(e)) {
                     return;
                 }
 
+                markFetching(false);
                 e.stack && console.error(e.stack);
                 root.notify('error', e.message || e);
             }