kn-cli 1.0.107 → 1.0.108

package/templates/template_admin/public/src/pages/pageTemplate.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+
+import {Layout,SearchBar,TitleBar,Content,Panel} from './components/layout'
+
+// @ts-ignore
+import styles from './home.less';
+
+const PageTemplate = (props) => {
+  const {name} = props;
+
+  return (
+    <Layout>
+      <SearchBar>
+        <TitleBar label={name}/>
+      </SearchBar>
+
+      <Content>
+        <Panel>
+          <section className={styles.row}>
+          </section>
+        </Panel>
+      </Content>
+      
+    </Layout>
+  )
+}
+
+export default PageTemplate;

package/templates/template_admin/public/src/provider/app.jsx

@@ -1,34 +1,33 @@
 // @ts-ignore
-import {  useState,useMemo, useRef } from 'react';
+import {  useState,useMemo } from 'react';
 // @ts-ignore
-import {  useSearchParams,useNavigate } from 'react-router-dom';
+import {  useSearchParams } from 'react-router-dom';
 // @ts-ignore
 import { createContainer } from "unstated-next";
 
 // @ts-ignore
-import { message } from "antd";
+import { message } from "@/components/antd";
 
 import {setJwt,setLogout} from '@/services';
 
 import {jumpUrl} from '@/utils';
-import { KSSO_LOGIN,Logout } from '@/services/login';
+import { KSSO_LOGIN } from '@/services/login';
+import _Storage from '@/utils/storage';
 
 
-const MODULE_NAME='ProviderApp';
-
 /**
  * @typedef AppContaniner
  * @property {boolean} loading - 当前是否是加载状态
  * @property {(open:boolean)=>void} setLoading - 设置加载状态
  * @property {()=>Promise<boolean>} isLogin - 检查是否已登录状态
- * @property {(username:string,password:string)=>Promise<boolean>} login - 触发登录
  * @property {()=>Promise} logout - 注销病退回登录界面
- * @property {(user:object)=>void} setUser - 注销病退回登录界面
  * @property {(auths:string[])=>void} setAuths - 设置权限
  * @property {object} user - 注销病退回登录界面
  * @property {()=>Promise<boolean>} kssoLogin - 触发ksso登录
  * @property {string[]} auths - 用户的权限列表
  * @property {()=>void} clearLoginInfo - 清理用户登录信息
+ * @property {(authName:string|string[])=>boolean} hasAuth - 判断有误某些权限
+ * @property {(userData:any,reload?:boolean)=>Promise<boolean>} LoginSuccess - 登录成功后的校验
  * 
  */
 
@@ -39,41 +38,30 @@ const MODULE_NAME='ProviderApp';
  */
 const useApp=() =>{
   const [search] = useSearchParams();
-  const navigate= useNavigate();
   const [loading,setLoading] = useState(true);
   const [user,setUser] = useState(null);
   /**
    * @type {[string[],React.Dispatch<React.SetStateAction<string[]>>]}
    */
   const [auths,setAuths]= useState(null);
- 
-  /**
-   * @type {React.MutableRefObject<object>}
-   */
-  const refSelf = useRef();
-  const LocalStorageName='zeus-user';
 
-  
   const isLogin=async ()=>{
     if(!user){
       try{
-        let userData = localStorage.getItem(LocalStorageName);
+        let userData = _Storage.load(_Storage.NAME.user)
         if(userData){
-          userData= JSON.parse(userData);
-          if(userData){
-            setUser(userData);
-            // @ts-ignore
-            setJwt(userData.token);
-            if(!auths){
-              await updateAuth();
-            }
-            return true;
+          setUser(userData);
+          // @ts-ignore
+          setJwt(userData.token);
+          if(!auths){
+            await updateAuth();
           }
+          return true;
         }else{
-          navigate('/login');
+          jumpUrl('/#/login');
         }
       }catch(ex){
-        navigate('/login');
+        jumpUrl('/#/login');
       }
     }else{
       if(!auths){
@@ -87,6 +75,31 @@ const useApp=() =>{
     return true;
   }
   
+  const LoginSuccess= async (userData,reload=false)=>{
+    const {token}= userData;
+    setUser(userData);
+    setJwt(token);
+    const authReq = await updateAuth();
+    if(authReq){
+      _Storage.write(_Storage.NAME.user,userData);
+      let redirect = _Storage.load(_Storage.NAME.redirect);
+      _Storage.remove(_Storage.NAME.redirect);
+      message.success('登录成功');
+      if(reload){
+        location.reload();
+        return;
+      }
+      if(redirect){
+        jumpUrl(redirect,{replace:true});
+        return true;
+      }
+      jumpUrl('/',{replace:true});
+      return true;
+    }else{
+      return false;
+    }
+  }
+
   const kssoLogin=async ()=>{
     let code = search.get('code');
     if(code){
@@ -94,27 +107,13 @@ const useApp=() =>{
       const req = await KSSO_LOGIN({code,redirect_uri})
       if(req?.code==0){
         const userData = req?.data;
-        const {token}= userData;
-        setUser(userData);
-        setJwt(token);
-        const authReq = await updateAuth();
-        if(authReq){
-          localStorage.setItem(LocalStorageName,JSON.stringify(userData));
-          let redirect = search.get('redirect');
-          message.success('登录成功');
-          if(redirect){
-            jumpUrl(redirect,{replace:true});
-            return true;
-          }
-          navigate('/');
-        }else{
-          return false;
-        }
+        const reqLogin = await LoginSuccess(userData);
+        return reqLogin;
       }else{
-        navigate('/login');
-        setTimeout(() => {
-          jumpUrl('',{reload:true});
-        }, 1000);
+        message.error('ksso登录验证失败,即将重新登录');
+        setTimeout(()=>{
+          jumpUrl('/#/login',{replace:true});
+        },1000)
         return false;
       }
     }else{
@@ -122,18 +121,48 @@ const useApp=() =>{
     }
     return true;
   }
-  const logout=async ()=>{
-    const req = await Logout();
-    navigate('/login');
+  const logout=async (changeAccount=false)=>{
+    try{
+      clearLoginInfo();
+    }finally{
+      // 防止在登录页出现401导致重定向又回login页面反复
+      if( !/[#]\/login/.test(location.href)){
+        _Storage.write(_Storage.NAME.redirect,location.href)
+      }
+      const redirect = `${location.protocol}//${location.host}/#/login`;
+      if(!changeAccount || user?.type!=1){
+        jumpUrl(redirect,{replace:true});
+        return;
+      }
+      if(changeAccount){
+        jumpUrl(`https://ksso.kingnet.com/auth/logout?redirect=${encodeURIComponent(redirect)}`,{replace:true})
+      }
+    }
   }
   const clearLoginInfo=()=>{
-
-    localStorage.removeItem(LocalStorageName);
+    _Storage.remove(_Storage.NAME.user);
     setUser(null);
     setAuths(null);
     setJwt('');
   }
 
+
+  const hasAuth=(name)=>{
+    let req=false;
+    if(Array.isArray(name)){
+      for(let i=0;i<name.length;i++){
+        let authName = name[i];
+        if(auths?.includes(authName)){
+          req=true;
+          break;
+        }
+      }
+    } else if(auths?.includes(name)){
+      req=true;
+    }
+    return req;
+  }
+
   setLogout(logout);
 
 
@@ -148,9 +177,11 @@ const useApp=() =>{
       kssoLogin,
       auths,
       setAuths,
-      clearLoginInfo
+      clearLoginInfo,
+      LoginSuccess,
+      hasAuth,
     }
-  },[clearLoginInfo,loading,user,isLogin,kssoLogin,auths]);
+  },[clearLoginInfo,loading,user,isLogin,kssoLogin,auths,LoginSuccess,hasAuth]);
 
   return action
 }

package/templates/template_admin/public/src/provider/menu.jsx

@@ -8,111 +8,8 @@ import { createContainer } from "unstated-next"
 import useRouteMenu from '@/hooks/useRouteMenu';
 import ProviderApp from '@/provider/app';
 
-// @ts-ignore
-import styles from './menu.less';
-
-
-const MenuIcon=(props)=>{
-  
-  const [icon,setIcon]= useState('');
-  const [iconActive,setIconActive]= useState('');
-
-  const getIcon= async (iconName)=>{
-    const req = await new Promise(resolve=>{
-      let iconActive =import(`@/assets/images/nav/${iconName}-active.png`);
-      let icon = import(`@/assets/images/nav/${iconName}.png`);
-      Promise.all([icon,iconActive]).then(values=>{
-        setIcon(values[0].default);
-        setIconActive(values[1].default)
-      })
-    })
-  }
-  useEffect(()=>{
-    getIcon(props.name);
-  },[])
-
-  return (
-    <div className={styles.iconGroup}>
-      <img className={styles.icon} src={icon} />
-      <img className={styles.iconActive} src={iconActive} />
-    </div>
-  )
-
-}
-
-const MenuRoute=[
-  {
-    name:'仪表盘',
-    url:'/',
-    children:[
-    ],
-
-  },
-  {
-    name:'发射场',
-    url:'/jet',
-    children:[],
-  },
-  {
-    name:'弹药库',
-    url:'/store',
-    children:[],
-  },
-  {
-    name:'配件仓',
-    url:'/parts',
-    children:[],
-  },
-  {
-    name:'基因库',
-    url:'/dna',
-    children:[],
-  },
-  {
-    name:'控制室',
-    url:'/auth',
-    msgCount:12,
-    primaryId:'auth',
-    children:[
-      {
-        name: '用户',
-        icon:<MenuIcon name='icon-user'/>,
-        url: '/auth/user',
-        auth:true,
-        primaryId:'authUser',
-        msgCount:0,
-        children:[
-          {
-            name:'新建用户',
-            url:'/auth/user/create',
-            hideMenu:true
-          }
-        ]
-      },
-      {
-        name: '部门',
-        icon:<MenuIcon name='icon-dep'/>,
-        url: '/auth/dep',
-      },
-      {
-        name: '角色',
-        icon:<MenuIcon name='icon-role'/>,
-        url: '/auth/role',
-      },
-      {
-        name: '操作记录',
-        icon:<MenuIcon name='icon-log'/>,
-        url: '/auth/log',
-        msgCount:12,
-      },
-      {
-        name: '登录日志',
-        icon:<MenuIcon name='icon-loginlog'/>,
-        url: '/auth/loginLog',
-      },
-    ],
-  }
-]
+import MenuConfig from '@/menuConfig';
+import { AUTH_ROUTE_DEBUG_OPEN } from '@/config';
 
 
 /**
@@ -123,12 +20,14 @@ const MenuRoute=[
  * @property {(key:string)=>RouteMenuItem} findMenuData - 通过key查找菜单数据
  * @property {(params:MenuConfig[])=>void} setMenuConfig - 设置菜单属性
  * @property {()=>Promise<void>} reload - 重新加载渲染菜单
+ * @property {(pathname:string,auths:string[])=>any} getMenuNavigateTo - 获取菜单跳转匹配结果
+ * 
  */
 
 const useProvider=() =>{
-
+  const MenuRoute=MenuConfig;
   const app = ProviderApp.useContainer();
-  const routeMenu = useRouteMenu();
+  const routeMenu = useRouteMenu({source:[...MenuRoute.map(menu=>{menu.key=menu.name;return menu})]});
   const curLocation =useLocation();
   const [topMenu,setTopMenu]=useState([]);
   const [leftMenu,setLeftMenu]=useState([]);
@@ -163,6 +62,74 @@ const useProvider=() =>{
     routeMenu.setMenuConfig(params);
   }
 
+  const checkAuthMenu=(menu,userAuth=[])=>{
+    if(AUTH_ROUTE_DEBUG_OPEN)return true;
+    let auth=true;
+    if(menu.auth && Array.isArray(menu.auth)){
+      if(menu.auth.some(menuAuthName=>userAuth?.includes(menuAuthName)) == false){
+        auth=false;
+      }
+    }else{
+      return menu.auth;
+    }
+    return auth;
+  }
+  const findHasAuthMenu=(menu,userAuth=[])=>{
+    let req;
+    req = checkAuthMenu(menu,userAuth);
+    if(req){return menu;}
+    if(!menu.parent)return null;
+    let {children} = menu.parent;
+    for(let i=0;i<children.length;i++){
+      let _menu = children[i];
+      req = checkAuthMenu(_menu,userAuth);
+      if(req)return _menu;
+    }
+    if(menu.parent.noPage)return null;
+    req = findHasAuthMenu(menu.parent,userAuth);
+    return req;
+  }
+  const getHasAuthMenu=(menus,userAuth=[])=>{
+    for(let i=0;i<menus.length;i++){
+      const menu = menus[i];
+      
+      if(!menu.noPage){
+        let  req = checkAuthMenu(menu,userAuth);
+        if(req)return menu;
+      }else{
+        if(checkAuthMenu(menu,userAuth)){
+          if(menu.children){
+            let req = getHasAuthMenu(menu.children,userAuth);
+            if(req)return req;
+          }
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * 检查当前路由是否有权限访问，没有权限则匹配有权限访问的页面进行跳转
+   */
+  const getMenuNavigateTo= (pathname,userAuths=[])=>{
+    // if(pathname=='/401'||pathname=='/404'||pathname=='/')return;
+    let curMenu = routeMenu.getMatchMenu(pathname)
+    // 找不到页面
+    if(!curMenu){
+      console.error('匹配不到路由，跳转404:',pathname)
+      return 404;
+    } 
+    let req = checkAuthMenu(curMenu,userAuths);
+    // 有权限，不做任何处理
+    if(req)return curMenu;
+    let findMenu = findHasAuthMenu(curMenu,userAuths)
+    if(!findMenu){
+      return 403;
+    }else{
+      return findMenu;
+    }
+  }
+
   useEffect(()=>{
     let menus= routeMenu.getOpenMenus(curLocation.pathname);
     let keys=menus.map(item=>item.key);
@@ -174,7 +141,7 @@ const useProvider=() =>{
     getLeftMenu(app.auths);
   },[routeMenu.source,curLocation,app.auths])
 
-  return {leftMenu,topMenu,reload,selectMenus,findMenuData,setMenuConfig}
+  return {leftMenu,topMenu,reload,selectMenus,findMenuData,setMenuConfig,getMenuNavigateTo}
 }
 
 /**

package/templates/template_admin/public/src/route.jsx

@@ -1,25 +1,52 @@
 import React,{Suspense} from 'react';
 // @ts-ignore
-import { Routes, Route, Navigate } from 'react-router-dom';
+import { HashRouter, Routes, Route, Navigate } from 'react-router-dom';
 // @ts-ignore
 import { LayoutBasic, AbsoluteLayout } from '@/components/layout';
+import ErrorBoundary from '@/components/error';
+
+
 import PageLoading from '@/components/page/pageLoading';
 import { AuthLogin } from '@/components/auth';
+import NavCheck from '@/components/auth/navCheck';
+
 
 import LeftMenu from '@/components/leftMenu';
 import TopMenu from '@/components/topMenu';
 import ProviderMenu from '@/provider/menu';
-
 import Login from '@/pages/login';
-import Home from '@/pages/home';
-
-const AuthUser = React.lazy(() => import('@/pages/auth/user'));
-const AuthUserCreate = React.lazy(() => import('@/pages/auth/user/create'));
-
-
-
-
-
+import menuConfig from './menuConfig';
+
+
+
+const Page403 = React.lazy(() => import('@/pages/error/403'));
+const Page404 = React.lazy(() => import('@/pages/error/404'));
+const Page503 = React.lazy(() => import('@/pages/error/503'));
+
+
+const renderMenuConfig=(menu)=>{
+  let req=[];
+  if(menu.component){
+    console.log(`${menu.routeTemplate||menu.url}->component`)
+    req.push(
+      <Route path={menu.routeTemplate||menu.url} element={menu.component} />
+    )
+  }else{
+    if(menu.children && menu.children[0]){
+      console.log(`${menu.routeTemplate||menu.url}->${menu.children[0].url}`)
+      req.push(
+        <Route path={menu.routeTemplate||menu.url} element={<NavCheck to={menu.children[0].url} />} />
+      ) 
+    }
+  }
+  if(menu.children){
+    menu.children.forEach(child=>{
+      let menus = renderMenuConfig(child);
+      req = [...req,...menus];
+    })
+  }
+  return req;
+}
 export const RouteList = (
   <Routes>
     <Route path='/' element={
@@ -37,32 +64,25 @@ export const RouteList = (
           </ProviderMenu.Provider>
         }
       >
-        <Route path='/' element={<Navigate to="/auth/user" />} />
-        <Route path='/auth' element={<Navigate to="/auth/user" />} />
-
-        {/* 控制室-用户 */}
-        <Route path='/auth/user' element={<AuthUser />} />
-        {/* 控制室-用户-新建用户 */}
-        <Route path='/auth/user/create' element={<AuthUserCreate />} />
-        {/* 控制室-角色 */}
-        <Route path='/auth/role' element={<Home />} />
-        {/* 控制室-操作记录 */}
-        <Route path='/auth/log' element={<Home />} />
-        {/* 控制室-登录日志 */}
-        <Route path='/auth/loginLog' element={<Home />} />
-
-
-        <Route path='/jet' element={<Home />} />
-        <Route path='/store' element={<Home />} />
-        <Route path='/parts' element={<Home />} />
-        <Route path='/dna' element={<Home />} />
-        <Route path='/auth/dep' element={<Home />} />
-
-
-
-
+        {
+          menuConfig.map(menu=>renderMenuConfig(menu))
+        }
+        <Route path='/403' element={<Page403/>} />
+        <Route path='/404' element={<Page404/>} />
+        <Route path='/503' element={<Page503/>} />
+        <Route path='*' element={<Navigate to='/404' />} />
       </Route>
     </Route>
   </Routes>
 );
 
+
+
+
+export default ()=>(
+  <HashRouter>
+    <ErrorBoundary>
+    {RouteList}
+    </ErrorBoundary>
+  </HashRouter>
+)

package/templates/template_admin/public/src/services/index.js

@@ -3,14 +3,19 @@ import Axios from 'axios';
 // @ts-ignore
 import qs from 'qs';
 // @ts-ignore
-import { message } from 'antd';
+import { message } from '@/components/antd';
 import {WriteLog} from '@/utils';
 
+import {DEBUG_API_HOST,DEBUG_REPORT_API_HOST } from '@/config';
+
+
 const axios = Axios.create();
+
 // @ts-ignore
-console.log(`========API_ROOT:${API_HOST}========`);
+export const API_ROOT= BUILD_ENV=='localdebug'?DEBUG_API_HOST:API_HOST;
 // @ts-ignore
-export const API_ROOT = API_HOST;
+console.log(`========API_ROOT:${API_ROOT}========`);
+
 const tokenMode='header';//header,cookie
 const tokenName='Authorization';
 
@@ -80,6 +85,7 @@ axios.interceptors.response.use(
     // setJwt(response?.headers['set-token'] || jwt);
     ERROR_401_COUNT=0;
     // 不需要接口统一处理异常错误
+    // @ts-ignore
     if (response.config.noInterceptors) {
       return response;
     }
@@ -342,9 +348,27 @@ export const FormatTableService = (response)=>{
  */
 export const FormatGetRequest=(requestParams)=>{
   for(let key in requestParams){
-    if(requestParams[key]==''||requestParams[key]===null){
+    if(requestParams[key]==''
+      ||requestParams[key]===null
+      ||requestParams[key]==undefined
+    ){
       delete requestParams[key];
     }
   }
   return requestParams;
 }
+
+
+/**
+ * 清理以_开头的不参与接口提交的参数
+ * @param {object} requestParams 
+ * @returns {object}
+ */
+export const FormatRequestClean=(requestParams)=>{
+  for(let key in requestParams){
+    if(/^[_].*/.test(key)){
+      delete requestParams[key];
+    }
+  }
+  return requestParams;
+}

package/templates/template_admin/public/src/services/socket/index.jsx

@@ -1,7 +1,7 @@
 
 import {getJwt} from '@/services'
 // @ts-ignore
-import {Modal} from 'antd';
+import {Modal} from '@/components/antd';
 
 import { CONSOLE_LOG ,WriteLog} from '@/utils';
 import {logout} from '@/services'

package/templates/template_admin/public/src/utils/storage.js

@@ -0,0 +1,30 @@
+
+const prevName='admin';
+const STORAGE_NAME={
+  user:'user',
+  dep:'dep',
+  redirect:'redirect'
+}
+
+const load=(name)=>{
+  let value = localStorage.getItem(prevName+name);
+  if(value){
+    value = JSON.parse(value);
+  }
+  let _value = value || null;
+  return _value;
+}
+const write=(name,data)=>{
+  if(!data){
+    localStorage.removeItem(prevName+name);
+    return;
+  }
+  data = JSON.stringify(data);
+  localStorage.setItem(prevName+name,data);
+  return;
+}
+const remove=(name)=>{
+  localStorage.removeItem(prevName+name);
+}
+
+export default {load,write,remove,NAME:STORAGE_NAME};