kn-cli 1.0.96 → 1.0.98

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

@@ -0,0 +1,35 @@
+
+
+
+.iconGroup{
+  width: 17px;
+  height: 100%;
+  margin-right: 12px;
+  display: inline-flex;
+  align-items: center;
+
+  img{width: 100%;}
+  .icon{
+    display: inline-block;
+  }
+  .iconActive{
+    display: none;
+  }
+}
+
+:global(.ant-menu-title-content){
+  font-size: 14px;
+}
+:global(.ant-menu-item-selected),
+:global(.ant-menu-item-active){
+  .iconGroup .iconActive{
+    display: inline-block;
+  }
+  .iconGroup .icon{
+    display: none;
+  }
+  :global(.ant-menu-title-content){
+    font-weight: bold;
+  }
+
+}

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

@@ -1,43 +1,39 @@
-
-// @ts-ignore
 import React,{Suspense} from 'react';
 // @ts-ignore
 import { Routes, Route, Navigate } from 'react-router-dom';
-
-import { LayoutBasic, Layout } from '@/components/layout';
+// @ts-ignore
+import { LayoutBasic, AbsoluteLayout } from '@/components/layout';
 import PageLoading from '@/components/page/pageLoading';
+import { AuthLogin } from '@/components/auth';
 
-import Login from '@/pages/login';
-import {AuthLogin} from '@/components/auth';
-import LeftMenu from '@/components/menu';
-import TopMenu from '@/components/menu/topMenu';
-
+import LeftMenu from '@/components/leftMenu';
+import TopMenu from '@/components/topMenu';
 import ProviderMenu from '@/provider/menu';
 
-const delayLoader=(loader)=>{
-  return new Promise(resolve=>{
-    loader.then(req=>{
-      setTimeout(()=>{
-        resolve(req);
-      },5000)
-    })
-  })
-}
+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'));
 
-const Page1 = React.lazy(()=>import('@/pages/demo/page1'));
-const Page1Detail = React.lazy(()=>import('@/pages/demo/detail'));
 
-import SuperAdminLogin from '@/pages/superAdminLogin';
+
+import Test from '@/pages/test';
 
 
 
 
 export const RouteList = (
   <Routes>
-    <Route path='/' element={<Suspense fallback={<PageLoading />}><Layout /></Suspense>}>
+    <Route path='/' element={
+      <Suspense fallback={<PageLoading />}>
+        <AbsoluteLayout />
+      </Suspense>}
+    >
       <Route path='login' element={<Login />} />
-      <Route path='superAdminLogin' element={<SuperAdminLogin />} />
+      <Route path='test' element={
+              <Test />
+        } />
 
       <Route
         path='/'
@@ -47,23 +43,28 @@ export const RouteList = (
           </ProviderMenu.Provider>
         }
       >
-        <Route path='/' element={<Navigate to="/demo/page1"></Navigate> } />
-        <Route path='/demo/page1' element={<Page1 label='内容管理1' />} />
-        <Route path='/demo/page2' element={<Page1 label='内容管理2' />} />
-        <Route path='/demo/page1/detail/:id' element={<Page1Detail />} />
-        <Route path='/demo/page2/detail/:id' element={<Page1Detail />} />
-
-
-        <Route path='/demo/data/page1' element={<Page1 label='数据管理1' />} />
-        <Route path='/demo/data/page2' element={<Page1 label='数据管理2' />} />
-        <Route path='/demo/data/page1/detail/:id' element={<Page1Detail />} />
-        <Route path='/demo/data/page2/detail/:id' element={<Page1Detail />} />
-
-        <Route path='/demo/admin' element={<Navigate to="/demo/admin/page1"></Navigate> } />
-        <Route path='/demo/admin/page1' element={<Page1 label='权限管理1' />} />
-        <Route path='/demo/admin/page2' element={<Page1 label='权限管理2' />} />
-        <Route path='/demo/admin/page1/detail/:id' element={<Page1Detail />} />
-        <Route path='/demo/admin/page2/detail/:id' element={<Page1Detail />} />
+        <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 />} />
+
+
 
 
       </Route>

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

@@ -0,0 +1,39 @@
+import {GET_DEFAULT,API_ROOT,POST_DEFAULT,PUT_DEFAULT} from './index.js';
+
+
+/**
+ * 获取当前用户的权限列表
+ * @returns {Promise<ServicesResponse>}
+ */
+export function GET_MY_AUTH(params={
+  isTree:'',
+  isShow:''
+}){
+  return GET_DEFAULT(`${API_ROOT}/my/permissions`,params)
+}
+
+/**
+ * 获取我的角色列表
+ * @returns {Promise<ServicesResponse>}
+ */
+export function GET_MY_ROLES(params={}){
+  return GET_DEFAULT(`${API_ROOT}/my/roles`,params)
+
+}
+
+/**
+ * 获取我的账号列表
+ * @returns {Promise<ServicesResponse>}
+ */
+export function GET_MY_WORK_USERS(params={}){
+  return GET_DEFAULT(`${API_ROOT}/my/weworkUsers`,params)
+}
+
+/**
+ * 切换账号列表
+ * @returns {Promise<ServicesResponse>}
+ */
+export function CHANGE_MY_WORK_USERS(params={}) {
+  return PUT_DEFAULT(`${API_ROOT}/my/weworkUsers/selected`,params)
+}
+

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

@@ -1,11 +1,11 @@
 
 
-import {GET_DEFAULT,POST_DEFAULT,API_ROOT,RESPONSE_STRUCT} from './index.js';
+import {GET_DEFAULT,POST_DEFAULT,API_ROOT} from './index.js';
 
 
 
 export function GET_LIST(params) {
-  return  GET_DEFAULT(`${API_ROOT}/api/demo/list`,params);
+  return GET_DEFAULT(`${API_ROOT}/api/demo/list`,params);
 }
 export function GET_DETAIL(params) {
   return  GET_DEFAULT(`${API_ROOT}/api/demo/detail`,params);
@@ -13,42 +13,8 @@ export function GET_DETAIL(params) {
 export function CREATE(params) {
   return POST_DEFAULT(`${API_ROOT}/api/demo/create`,params)
 }
+
 export function UPDATE(params) {
   return POST_DEFAULT(`${API_ROOT}/api/demo/update`,params)
 }
-export function GET_USER_INFO(){
-  return  GET_DEFAULT(`${API_ROOT}/api/demo/userInfo`);
-}
-
-export function GET_ENUM_TYPE(){
-  return  GET_DEFAULT(`${API_ROOT}/api/demo/enumType`);
-}
-
-export const FormatTableService = (response)=>{
-  let req={
-    code:response[RESPONSE_STRUCT.CODE]||0,
-    data:response[RESPONSE_STRUCT.DATA]||null,
-    msg:response[RESPONSE_STRUCT.MSG]||''
-  };
-  if(response[RESPONSE_STRUCT.PAGINATION]){
-    req.page = response[RESPONSE_STRUCT.PAGINATION]
-  }
-  return req;
-};
-
-
-export function Login(params={
-  username:'',
-  password:'',
-}){
-  return POST_DEFAULT(`${API_ROOT}/api/demo/login`,params)
-
-}
-
-export function KssoLogin(params={
-  code:'',
-  redirectUri:'',
-}){
-  return POST_DEFAULT(`${API_ROOT}/api/demo/ksso/auth`,params)
 
-}

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

@@ -4,6 +4,7 @@ import Axios from 'axios';
 import qs from 'qs';
 // @ts-ignore
 import { message } from 'antd';
+import {WriteLog} from '@/utils';
 
 const axios = Axios.create();
 // @ts-ignore
@@ -13,8 +14,6 @@ export const API_ROOT = API_HOST;
 const tokenMode='header';//header,cookie
 const tokenName='Authorization';
 
-
-
 export const RESPONSE_STRUCT={
   CODE:'code',
   MSG:'msg',
@@ -29,7 +28,7 @@ let Modal = {
 };
 
 let jwt = '';
-let logout = ()=>{}
+let _logout = ()=>{}
 
 export const setJwt = (value) => {
   if(value==''){
@@ -41,10 +40,16 @@ export const setJwt = (value) => {
   localStorage.setItem('jwt', value);
   jwt = value;
 };
+export const getJwt=()=>{
+  return jwt;
+}
 // @ts-ignore
 window.setJwt=setJwt;
 export const setLogout=(fn)=>{
-  logout=fn;
+  _logout=fn;
+}
+export const logout=()=>{
+  _logout();
 }
 
 
@@ -65,6 +70,7 @@ axios.interceptors.request.use(function (config) {
   return config;
 });
 
+let ERROR_401_COUNT=0;
 /**
  * 统一拦截异常消息弹屏报错处理
  * 如果希望某条消息不拦截，可以再发送消息时带上 noInterceptors:true|'all'
@@ -72,36 +78,56 @@ axios.interceptors.request.use(function (config) {
 axios.interceptors.response.use(
   function (response) {
     // setJwt(response?.headers['set-token'] || jwt);
+    ERROR_401_COUNT=0;
+    // 不需要接口统一处理异常错误
     if (response.config.noInterceptors) {
       return response;
     }
+    const {data}= response;
+    const CODE = data[RESPONSE_STRUCT.CODE];
+    const MSG = data[RESPONSE_STRUCT.MSG];
 
-    if (Number(response.data.code) !== 0) {
-      console.log(`${JSON.stringify(response.data)}`);
-      Modal.error({ title: `注意`, content: `${response.data.message}(${response.data.code})` });
+    if (Number(CODE) !== 0) {
+      console.log(`${JSON.stringify(data)}`);
+      Modal.error({ title: `注意`, content: `${MSG}(${CODE})` });
     }
     return response;
   },
   function (error) {
+    if(!error||!error.response){
+      Modal.error({
+        title: '网络错误',
+        content: error.message||'',
+      });
+      return Promise.resolve(null);
+    }
+    
     if (error.response.config.noInterceptors === 'all') {
-      return Promise.reject(error.response);
+      return Promise.resolve(error.response);
     }
     // jwt失效
     if (error.response.status === 401) {
-      if(logout)logout();
-      return;
+      if(ERROR_401_COUNT>0)return;
+      if( !error.config.url.includes('passport/logOut') ){
+        Modal.error({title:'注意',content:'您的登录已过期，请尝试重新登录'});
+        ERROR_401_COUNT++;
+        WriteLog(`=重新登录=接口401(${error.config.url})`)
+        if(logout)logout();
+      }
+      return Promise.resolve(null);
     } else if (error.response.status === 403) {
       Modal.error({
         title: '提示',
-        content: `${error.response.data.message}`,
+        content: `${error.response.data[RESPONSE_STRUCT.MSG]}`,
       });
-      return;
+      // if(logout)logout();
+      return Promise.resolve(null);
     }
     Modal.error({
       title: `网络错误${error.response.status}`,
       content: `${error.response.config.url}`,
     });
-    return null;
+    return Promise.resolve(null);
   }
 );
 
@@ -222,3 +248,103 @@ export async function POST_DEFAULT_CROSS(url, params) {
 
   return response && response.data ? response.data : null;
 }
+
+export async function PUT_DEFAULT(url,params,options) {
+  let data=params;
+
+  let response=await axios({
+    method: 'PUT',
+    url: url,
+    data,
+    ...options,
+  });
+  return response&&response.data? response.data:null;
+}
+export async function DELETE_DEFAULT(url,params,options) {
+  let data=params;
+
+  let response=await axios({
+    method: 'DELETE',
+    url: url,
+    data,
+    ...options,
+  });
+  return response&&response.data? response.data:null;
+}
+
+
+
+const axiosExport = Axios.create();
+axiosExport.interceptors.request.use(function (config) {
+  const header = { 'X-Requested-With': 'XMLHttpRequest' };
+  if(tokenMode=='header'){
+    if (jwt) {
+      header[tokenName] = jwt;
+    }
+  }
+  if (config.headers) {
+    config.headers = { ...config.headers, ...header };
+  } else {
+    config.headers = header;
+  }
+
+  // 在发送请求之前做些什么
+  return config;
+});
+export async function EXPORT_EXCEL(url, param, options) {
+  if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
+
+  let response = await axiosExport({
+    method: 'GET',
+    url: param ? `${url}?${param}` : url,
+    responseType: 'blob',
+    getResponse: true,
+    ...options,
+  });
+  let fileType = response.headers.get('content-type');
+  const disposition = response.headers.get('content-disposition');
+
+  const blob = new Blob([response.data], { type: `${fileType},charset=UTF-8` });
+  const fileName = decodeURI(
+        disposition ? disposition.split(';')[1].split('filename=')[1] : 'download.xlsx',
+  );
+  let blobUrl = window.URL.createObjectURL(blob);
+
+  const link = document.createElement('a');
+  link.href = blobUrl;
+  link.download = fileName.replace(/"/g, '');
+  document.body.appendChild(link);
+  link.style.display='none';
+  link.click();
+  link.remove();
+  setTimeout(() => window.URL.revokeObjectURL(blobUrl), 1000);
+
+  return null;
+}
+
+
+export const FormatTableService = (response)=>{
+  let req={
+    code:response[RESPONSE_STRUCT.CODE]||0,
+    data:response[RESPONSE_STRUCT.DATA]||null,
+    msg:response[RESPONSE_STRUCT.MSG]||''
+  };
+  if(response[RESPONSE_STRUCT.PAGINATION]){
+    req.page = response[RESPONSE_STRUCT.PAGINATION]
+  }
+  return req;
+};
+
+/**
+ * 格式化处理GET请求的参数，将传参为空的删除掉，因为后端认为空字符串也是属于一个特定字符查询
+ * @param {object} requestParams 
+ * @returns {object}
+ */
+export const FormatGetRequest=(requestParams)=>{
+  for(let key in requestParams){
+    if(requestParams[key]==''||requestParams[key]===null){
+      delete requestParams[key];
+    }
+  }
+  return requestParams;
+}

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

@@ -0,0 +1,37 @@
+import {GET_DEFAULT,API_ROOT,POST_DEFAULT,PUT_DEFAULT} from './index.js';
+
+
+
+/**
+ * KSSO登录
+ * @returns {Promise<ServicesResponse>}
+ */
+export function KSSO_LOGIN(params={
+  code:'',
+  redirect_uri:''
+}){
+  return Promise.resolve({
+    code:0,
+    data:{
+      token:'123',
+      name:'cx'
+    }
+  })
+  return GET_DEFAULT(`${API_ROOT}/auth/oauth2_generic/callback`,params)
+
+}
+
+/**
+ * 退出登录
+ * @returns {Promise<ServicesResponse>}
+ */
+export function Logout(){
+  return Promise.resolve({
+    code:0,
+    data:{
+      token:'123',
+      name:'cx'
+    }
+  })
+  return POST_DEFAULT(`${API_ROOT}/passport/logOut`,{},{noInterceptors:'all'})
+}

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

@@ -0,0 +1,100 @@
+
+import {getJwt} from '@/services'
+// @ts-ignore
+import {Modal} from 'antd';
+
+import { CONSOLE_LOG ,WriteLog} from '@/utils';
+import {logout} from '@/services'
+let _ws;
+let timer=null;
+
+const MODULE_NAME='Websocket'
+
+const CHECK_PING_PONG=true;
+const TIME_OUT=15000; 
+const HEART_TICK=5000;
+
+export const GET_SOCKET=()=>{
+  if(_ws)return _ws;
+  let token = getJwt();
+  let alertCount=0;
+  // @ts-ignore
+  _ws = new WebSocket(WS_HOST+`?bearer_token=${token}`);
+
+  let lastPongTime;
+  const startHeartbeat=()=> {
+    if(timer){window.clearInterval(timer);}
+    timer = window.setInterval(function() {
+      if (_ws && _ws.readyState === WebSocket.OPEN) {
+        if(!lastPongTime){
+          lastPongTime = Date.now();
+        }
+        if( CHECK_PING_PONG && Date.now() - lastPongTime >= TIME_OUT){
+          clear();
+          Modal.error({
+            title: '网络连接中断',
+            content: '请重新连接',
+            okText:'重新连接',
+            onOk:()=>{
+              GET_SOCKET();
+            }
+          });
+          return;
+        }
+        _ws.send('ping');
+      }
+    }, HEART_TICK); // 每5秒发送一次ping
+  }
+
+  const clear=()=>{
+    if(timer){window.clearInterval(timer);}
+    _ws=null;
+  }
+  _ws.onopen=()=>{
+    alertCount=0;
+    CONSOLE_LOG(MODULE_NAME,'connect success')
+    startHeartbeat();
+  }
+  _ws.onmessage = function(event) {
+    if(event.data == 'pong' || event.data=='ping'){
+      lastPongTime = Date.now();
+      _ws.send('pong');
+      return;
+    }
+    const {type,data} = JSON.parse(event.data);
+    CONSOLE_LOG(MODULE_NAME,'new msg',type,data)
+    switch(type){
+      case 'Pong':{}break;
+    }
+  }
+
+  _ws.onerror=function(e){
+    CONSOLE_LOG.error(MODULE_NAME,'error',e,alertCount)
+  }
+
+  _ws.onclose = function(e) {
+    CONSOLE_LOG.error(MODULE_NAME,'close',e,alertCount)
+    if(alertCount>0){return;}
+    const {code} =e;
+    clear();
+    alertCount++;
+
+    Modal.error({
+      title: '网络连接中断websocket',
+      content: `请重新登录(${code})`,
+      okText:'重新登录',
+      onOk:()=>{
+        WriteLog(`=重新登录=socket断开(${code})`);
+        // GET_SOCKET();
+        logout();
+
+      }
+    });
+  }
+  return _ws;
+}
+export const WS_SEND=(message)=>{
+  const ws = GET_SOCKET();
+  ws.send(message);
+}
+

package/templates/template_admin/public/src/type.js

@@ -11,22 +11,6 @@
  */
 
 
-
-/**
- * @typedef {object} FormDataInfo
- * @property {string} btnControl
- */
-
-/**
- * @typedef {[FormDataInfo,Function]} UseStateFormData
- */
-
-
-/**
- * @typedef {FormDataInfo & OtherAny} TableContentData
- */
-
-
 /**
  * 分页
  * @typedef {object} Pagination
@@ -38,11 +22,44 @@
  */
 
 
+
 /**
  * 接口response数据
+ * @template [T=object]
  * @typedef {object} ServicesResponse
  * @property {number} code - 接口处理结果,0为成功
- * @property {object} data - 接口返回的数据
- * @property {Pagination} page - 分页数据
+ * @property {T} data - 接口返回的数据
+ * @property {Pagination} [page] - 分页数据
+ * @property {string} [msg] - 消息内容
  * 
- */
+ * 
+ */
+
+
+
+/**
+ * 设置菜单属性
+ * @typedef MenuConfig
+ * @property {string} primaryId - 菜单的primaryId值
+ * @property {('msgCount'|'icon'|'name')} key - 需要设置的字段名称
+ * @property {any} value - 字段值
+ */
+
+/**
+ * 菜单项
+ * @typedef RouteMenuItem
+ * @property {string} name - 菜单展示的名称
+ * @property {string|JSX.Element} [icon] - 菜单图标
+ * @property {string} [url] - 菜单的URL地址
+ * @property {string} [routeTemplate] - 菜单的路由模版，用于匹配动态路由
+ * @property {number} [msgCount] - 菜单的未读消息数量
+ * @property {boolean} [hideMenu=false] - 是否为隐藏的菜单，隐藏的菜单不会展示独立菜单，但是会匹配路由
+ * @property {string[]|boolean} [auth] - 允许访问该菜单的权限列表
+ * @property {RouteMenuItem[]} [children] - 子菜单
+ * @property {string} [primaryId] - 菜单的唯一ID，如果存在primaryId，则菜单的key同primaryId
+ * @property {string} [key] - 会自动生成的菜单唯一ID，如果菜单配置内存在了primaryId，则会取该id
+ * @property {string} [parentKey] - 父级菜单的key，自动生成的
+ * 
+ */
+
+