feat(core): 调整router和权限

stbui · Jan 2, 2020 · 5f09c6f · 5f09c6f
1 parent e464a2d
commit 5f09c6f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 27 deletions.
diff --git a/packages/core/src/auth/WithPermissions.tsx b/packages/core/src/auth/WithPermissions.tsx
@@ -40,4 +40,4 @@ const WithPermissions: FunctionComponent<WithPermissionsProps> = ({
     return children({ permissions, ...props });
 };
 
-export default WithPermissions as any;
+export default WithPermissions;
diff --git a/packages/core/src/auth/useAuthState.ts b/packages/core/src/auth/useAuthState.ts
@@ -32,7 +32,7 @@ const useAuthState = (params = {}) => {
             .catch(() =>
                 setState({ loading: false, loaded: true, authenticated: false })
             );
-    }, [checkAuth, params, setState]);
+    }, [checkAuth, JSON.stringify(params), setState]);
 
     return state;
 };

diff --git a/packages/core/src/auth/usePermissions.ts b/packages/core/src/auth/usePermissions.ts
@@ -38,7 +38,7 @@ const usePermissions = (params = {}) => {
                     error,
                 });
             });
-    }, [getPermissions, params, setState]);
+    }, [getPermissions, JSON.stringify(params), setState]);
 
     return state;
 };

diff --git a/packages/core/src/core/CoreAdmin.tsx b/packages/core/src/core/CoreAdmin.tsx
@@ -4,7 +4,7 @@
  * https://github.com/stbui/prophet
  */
 
-import React, { FunctionComponent, ComponentType, Children } from 'react';
+import React, { FunctionComponent, ComponentType } from 'react';
 import CoreContext from './CoreContext';
 import CoreUI from './CoreUI';
 

diff --git a/packages/core/src/core/CoreRouter.tsx b/packages/core/src/core/CoreRouter.tsx
@@ -13,7 +13,7 @@ import React, {
     useState,
     useEffect,
 } from 'react';
-import { Switch, Route, Redirect } from 'react-router-dom';
+import { Switch, Route } from 'react-router-dom';
 import CoreRoutesWithLayout from './CoreRoutesWithLayout';
 import { useGetPermissions, useAuthState } from '../auth';
 
@@ -96,11 +96,11 @@ const CoreRouter: FunctionComponent<CoreRouterProps> = ({
         typeof children === 'function' ? computedChildren : children;
 
     return (
-        <div>
+        <React.Fragment>
             {Children.map(childrenToRender, (child: any) =>
                 cloneElement(child, {
                     key: child.props.name,
-                    context: 'registration',
+                    intent: 'registration',
                 })
             )}
             <Switch>
@@ -124,6 +124,7 @@ const CoreRouter: FunctionComponent<CoreRouterProps> = ({
                                 dashboard,
                                 menu,
                                 title,
+                                brand,
                             },
                             <CoreRoutesWithLayout
                                 catchAll={catchAll}
@@ -144,7 +145,7 @@ const CoreRouter: FunctionComponent<CoreRouterProps> = ({
                     }
                 />
             </Switch>
-        </div>
+        </React.Fragment>
     );
 };
 

diff --git a/packages/core/src/core/Resource.tsx b/packages/core/src/core/Resource.tsx
@@ -4,13 +4,26 @@
  * https://github.com/stbui
  */
 
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, FunctionComponent } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Switch, Route } from 'react-router-dom';
 import { WithPermissions } from '../auth';
 import { registerResource, unregisterResource } from '../actions';
 
-const ResourceRegister: any = ({
+export interface ResourceProps {
+    name: string;
+    label?: any;
+    match?: any;
+    list?: any;
+    create?: any;
+    edit?: any;
+    show?: any;
+    options?: any;
+    icon?: any;
+    intent?: 'route' | 'registration';
+}
+
+const ResourceRegister: FunctionComponent<ResourceProps> = ({
     label,
     name,
     list,
@@ -44,7 +57,7 @@ const ResourceRegister: any = ({
     return null;
 };
 
-const ResourceRoutes: any = ({
+const ResourceRoutes: FunctionComponent<ResourceProps> = ({
     label,
     name,
     match,
@@ -80,55 +93,59 @@ const ResourceRoutes: any = ({
                 {create && (
                     <Route
                         path={`${basePath}/create`}
-                        render={props => (
+                        render={routeProps => (
                             <WithPermissions
                                 component={create}
                                 basePath={basePath}
-                                {...props}
+                                {...routeProps}
                                 {...resource}
-                            ></WithPermissions>
+                            />
                         )}
                     />
                 )}
                 {show && (
                     <Route
                         path={`${basePath}/:id/show`}
-                        render={props => (
+                        render={routeProps => (
                             <WithPermissions
                                 component={show}
                                 basePath={basePath}
-                                id={decodeURIComponent(props.match.params.id)}
-                                {...props}
+                                id={decodeURIComponent(
+                                    routeProps.match.params.id
+                                )}
+                                {...routeProps}
                                 {...resource}
-                            ></WithPermissions>
+                            />
                         )}
                     />
                 )}
                 {edit && (
                     <Route
                         path={`${basePath}/:id`}
-                        render={props => (
+                        render={routeProps => (
                             <WithPermissions
                                 component={edit}
                                 basePath={basePath}
-                                id={decodeURIComponent(props.match.params.id)}
-                                {...props}
+                                id={decodeURIComponent(
+                                    routeProps.match.params.id
+                                )}
+                                {...routeProps}
                                 {...resource}
-                            ></WithPermissions>
+                            />
                         )}
                     />
                 )}
 
                 {list && (
                     <Route
                         path={basePath}
-                        render={props => (
+                        render={routeProps => (
                             <WithPermissions
                                 component={list}
                                 basePath={basePath}
-                                {...props}
+                                {...routeProps}
                                 {...resource}
-                            ></WithPermissions>
+                            />
                         )}
                     />
                 )}
@@ -147,10 +164,15 @@ const ResourceRoutes: any = ({
     ]);
 };
 
-export default ({ context = 'route', ...props }) => {
-    return context === 'registration' ? (
+const Resource: FunctionComponent<ResourceProps> = ({
+    intent = 'route',
+    ...props
+}) => {
+    return intent === 'registration' ? (
         <ResourceRegister {...props} />
     ) : (
         <ResourceRoutes {...props} />
     );
 };
+
+export default Resource;
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ const usePermissions = (params = {}) => { @@
                         error,
                     });
                 });
-        }, [getPermissions, params, setState]);
+        }, [getPermissions, JSON.stringify(params), setState]);
         return state;
     };
@@ Expand Down @@