kn-cli 1.0.113 → 1.0.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.113",
+  "version": "1.0.115",
   "description": "",
   "main": "index.js",
   "scripts": {

package/templates/template_admin/public/src/{menuConfig.jsx → _menuConfig.jsx}

@@ -13,16 +13,49 @@ const AuthUser = React.lazy(() => import('@/pages/auth/user'));
 const AuthUserCreate = React.lazy(() => import('@/pages/auth/user/create'));
 
 
-import Home from '@/pages/home';
+/**
+ * 自动计算菜单权限，使父级菜单权限包含所有子菜单的权限
+ * @param {RouteMenuItem} menu 
+ * @returns {RouteMenuItem}
+ */
+export const UpdateAuth=(menu)=>{
+  if(menu.children){
 
+    let auths= menu.children.map(childMenu=>{
+      let _childMenu = UpdateAuth(childMenu);
+      if( Array.isArray(_childMenu.auth) ){
+        return [..._childMenu.auth];
+      }
+      return [];
+    });
+    
+    if( Array.isArray(menu.auth) ){
+      
+      menu.auth = [...menu.auth,...auths.flat()];
+      // @ts-ignore
+      menu.auth = [...new Set(menu.auth)];// 去重
+    }
+  }
+  return menu;
+}
+
+export const LoadComponent=(lazyComponent)=>{
+  return React.createElement(lazyComponent)
+}
 
+/**
+ * @type {RouteMenuItem}
+ */
 const DASHBOARD={
   name:'仪表盘',
   url:'/',
-  component:<Home />,
+  component:LoadComponent(React.lazy(() => import('@/pages/home'))),
   children:[
   ],
 }
+/**
+ * @type {RouteMenuItem}
+ */
 const DNA={
   name:'基因库',
   url:'/dna',
@@ -79,6 +112,9 @@ const DNA={
     },
   ],
 }
+/**
+ * @type {RouteMenuItem}
+ */
 const AUTH={
   name:'控制室',
   url:'/auth',
@@ -149,4 +185,4 @@ const AUTH={
 }
 
 
-export default [DASHBOARD,DNA,AUTH];
+export default [UpdateAuth(DASHBOARD), UpdateAuth(DNA), UpdateAuth(AUTH) ];

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

@@ -2,7 +2,7 @@
 
 // 权限调试开关
 // @ts-ignore
-export const AUTH_DEBUG_OPEN=BUILD_ENV=='prod'?false:true;
+export const AUTH_DEBUG_OPEN= BUILD_ENV=='prod'?false:true;
 // 菜单权限调试开关
 export const AUTH_ROUTE_DEBUG_OPEN=false;
 
@@ -26,3 +26,6 @@ const DEBUG_API_HOST_CONFIG={
 // 配置本地调试时api调用的接口地址,
 export const DEBUG_API_HOST=DEBUG_API_HOST_CONFIG[DEBUG_ENV]
 
+// 调试vconsole
+// @ts-ignore
+export const DEBUG_VCONSOLE= BUILD_ENV=='local';

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

@@ -6,6 +6,7 @@ import RouteList from './route';
 // @ts-ignore
 import moment from 'moment';
 import { ReactRender } from './components/react';
+import {DEBUG_VCONSOLE} from '@/config';
 moment.locale('zh-cn');
 
 
@@ -39,25 +40,28 @@ window.appLog=(txt)=>{
 
 /* eslint-disable */
 // @ts-ignore
-if(BUILD_ENV!='prod'){
-  // // @ts-ignore
-  // let VConsole =  require('vconsole');
-  // // @ts-ignore
-  // const vConsole = new VConsole();
-  // setTimeout(() => {
-  //   vConsole.setSwitchPosition(70, 10);
-  // }, 2000);
+if(DEBUG_VCONSOLE){
+  // @ts-ignore
+  let VConsole =  require('vconsole');
+  // @ts-ignore
+  const vConsole = new VConsole();
+  setTimeout(() => {
+    vConsole.setSwitchPosition(70, 10);
+  }, 2000);
 }
+
 // @ts-ignore
 if(BUILD_ENV){
   // @ts-ignore
   window.appLog(`代码环境类型：${BUILD_ENV}`);
 }
+
 // @ts-ignore
 if (VERSION_HASH) {
   // @ts-ignore
   window.appLog(`VERSION_HASH：${VERSION_HASH}`);
 }
+
 // @ts-ignore
 window.appLog(`log init`);
 // @ts-ignore

package/templates/template_admin/public/src/menuConfig/auth.jsx

@@ -0,0 +1,92 @@
+import React from 'react';
+import {LoadComponent,UpdateAuth} from '@/utils/menu';
+
+// @ts-ignore
+import MenuIcon from '@/components/menuIcon';
+
+import PageTemplate from '@/pages/pageTemplate';
+
+const AuthUser = React.lazy(() => import('@/pages/auth/user'));
+const AuthUserCreate = React.lazy(() => import('@/pages/auth/user/create'));
+
+
+/**
+ * @type {RouteMenuItem}
+ */
+const _AUTH={
+  name:'控制室',
+  url:'/auth',
+  msgCount:12,
+  primaryId:'auth',
+  auth:['auth1'],
+  children:[
+    {
+      name: '用户',
+      component:<AuthUser />,
+      icon:<MenuIcon name='icon-user'/>,
+      url: '/auth/user',
+      auth:true,
+      primaryId:'authUser',
+      msgCount:0,
+      children:[
+        {
+          component:<AuthUserCreate />,
+          name:'新建用户',
+          url:'/auth/user/create',
+          hideMenu:true
+        }
+      ]
+    },
+    {
+      name: '部门',
+      icon:<MenuIcon name='icon-dep'/>,
+      url: '/auth/dep',
+      auth:true,
+      children:[
+        {
+          component:<PageTemplate name='部门列表' />,
+          name:'部门列表',
+          url:'/auth/dep/list',
+          auth:true,
+          children:[
+            {
+              component:<PageTemplate name='部门详情' />,
+              name:'部门详情',
+              routeTemplate:'/auth/dep/detail/:id',
+              hideMenu:true,
+              auth:true,
+            }
+          ]
+        },
+
+      ]
+    },
+    {
+      name: '角色',
+      component:<PageTemplate name='角色' />,
+      icon:<MenuIcon name='icon-role'/>,
+      url: '/auth/role',
+    },
+    {
+      name: '操作记录',
+      component:<PageTemplate name='操作记录' />,
+      icon:<MenuIcon name='icon-log'/>,
+      url: '/auth/log',
+      msgCount:12,
+    },
+    {
+      name: '登录日志',
+      component:<PageTemplate name='登录日志' />,
+      icon:<MenuIcon name='icon-loginlog'/>,
+      url: '/auth/loginLog',
+    },
+  ],
+}
+
+
+/**
+ * @type {RouteMenuItem}
+ */
+const AUTH=UpdateAuth(_AUTH);
+
+export default AUTH;

package/templates/template_admin/public/src/menuConfig/dashboard.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import {LoadComponent,UpdateAuth} from '@/utils/menu';
+
+
+
+
+
+/**
+ * @type {RouteMenuItem}
+ */
+const _DASHBOARD={
+  name:'仪表盘',
+  url:'/dashboard',
+  auth:['auth2'],
+  component:LoadComponent(React.lazy(() => import('@/pages/home'))),
+  children:[
+  ],
+}
+
+/**
+ * @type {RouteMenuItem}
+ */
+const DASHBOARD=UpdateAuth(_DASHBOARD);
+
+export default DASHBOARD;

package/templates/template_admin/public/src/menuConfig/dna.jsx

@@ -0,0 +1,76 @@
+import React from 'react';
+import {LoadComponent,UpdateAuth} from '@/utils/menu';
+
+// @ts-ignore
+import MenuIcon from '@/components/menuIcon';
+
+
+const Page2 = React.lazy(() => import('@/pages/demo/page2'));
+
+
+/**
+ * @type {RouteMenuItem}
+ */
+const _DNA={
+  name:'基因库',
+  url:'/dna',
+  auth:['auth1'],
+  children:[
+    {
+      name: '父菜单1',
+      icon:<MenuIcon name='icon-dep'/>,
+      url: '/dna/parent',
+      auth:['auth2'],
+      children:[
+        {
+          component:LoadComponent(React.lazy(() => import('@/pages/demo/page1'))),
+          name:'子菜单1-1',
+          auth:['auth3'],
+          url:'/dna/parent/child1'
+        }
+      ]
+    },
+    {
+      name: '父菜单2',
+      icon:<MenuIcon name='icon-dep'/>,
+      url: '/dna/parent2',
+      auth:true,
+      children:[
+        {
+          component:<Page2 name='父菜单2-子菜单1'/>,
+          name:'子菜单2-1',
+          auth:true,
+          url:'/dna/parent2/child1'
+        }
+      ]
+    },
+    {
+      name: '父菜单3',
+      icon:<MenuIcon name='icon-dep'/>,
+      url: '/dna/parent3',
+      auth:true,
+      children:[
+        {
+          name:'子菜单3-1',
+          auth:true,
+          url:'/dna/parent3/child1',
+          children:[
+            {
+              component:<Page2 name='父菜单3-子菜单1-子子菜单1'/>,
+              name:'子菜单3-1-1',
+              auth:true,
+              url:'/dna/parent3/child1/child1'
+            }
+          ]
+        }
+      ]
+    },
+  ],
+}
+
+/**
+ * @type {RouteMenuItem}
+ */
+const DNA=UpdateAuth(_DNA);
+
+export default DNA;

package/templates/template_admin/public/src/menuConfig/index.jsx

@@ -0,0 +1,17 @@
+// @ts-ignore
+import React from 'react';
+
+// @ts-ignore
+import DNA from './dna';
+// @ts-ignore
+import AUTH from './auth';
+// @ts-ignore
+import DASHBOARD from './dashboard';
+
+
+
+
+/**
+ * @type {RouteMenuItem[]}
+ */
+export default [DASHBOARD, DNA, AUTH]

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

@@ -8,7 +8,7 @@ import { createContainer } from "unstated-next";
 // @ts-ignore
 import { message } from "@/components/antd";
 
-import {setJwt,setLogout} from '@/services';
+import {setJwt,setLogout} from '@/services/token';
 
 import {jumpUrl} from '@/utils';
 import { KSSO_LOGIN } from '@/services/login';

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

@@ -21,6 +21,7 @@ import { AUTH_ROUTE_DEBUG_OPEN } from '@/config';
  * @property {(params:MenuConfig[])=>void} setMenuConfig - 设置菜单属性
  * @property {()=>Promise<void>} reload - 重新加载渲染菜单
  * @property {(pathname:string,auths:string[])=>any} getMenuNavigateTo - 获取菜单跳转匹配结果
+ * @property {(menu:RouteMenuItem,userAuth:string[])=>RouteMenuItem} findHasAuthMenu - 寻找有权限的菜单
  * 
  */
 
@@ -141,7 +142,7 @@ const useProvider=() =>{
     getLeftMenu(app.auths);
   },[routeMenu.source,curLocation,app.auths])
 
-  return {leftMenu,topMenu,reload,selectMenus,findMenuData,setMenuConfig,getMenuNavigateTo}
+  return {leftMenu,topMenu,reload,selectMenus,findMenuData,setMenuConfig,getMenuNavigateTo,findHasAuthMenu}
 }
 
 /**

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

@@ -1,6 +1,6 @@
-import React,{Suspense} from 'react';
+import React,{Suspense, useEffect} from 'react';
 // @ts-ignore
-import { HashRouter, Routes, Route, Navigate } from 'react-router-dom';
+import { HashRouter, Routes, Route, Navigate, useNavigate } from 'react-router-dom';
 // @ts-ignore
 import { LayoutBasic, AbsoluteLayout } from '@/components/layout';
 import ErrorBoundary from '@/components/error';
@@ -16,6 +16,7 @@ import TopMenu from '@/components/topMenu';
 import ProviderMenu from '@/provider/menu';
 import Login from '@/pages/login';
 import menuConfig from './menuConfig';
+import ProviderApp from '@/provider/app';
 
 
 
@@ -24,19 +25,49 @@ const Page404 = React.lazy(() => import('@/pages/error/404'));
 const Page503 = React.lazy(() => import('@/pages/error/503'));
 
 
+
+const GetIndexRoute=()=>{
+  const app = ProviderApp.useContainer();
+  const menu = ProviderMenu.useContainer();
+  const nav = useNavigate();
+
+  
+  const findRoute=()=>{
+    for(let _menu of menu.topMenu){
+      let req = menu.findHasAuthMenu(_menu,app.auths);
+      if(req){
+        debugger;
+        nav(req.url);
+        return;
+      }
+    }
+  }
+  useEffect(()=>{
+    findRoute();
+  },[])
+  return <></>
+}
+
+
 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}`)
+  if(!menu.noAutoMatch){
+    if(menu.component){
+      console.log(`${menu.routeTemplate||menu.url}->component`)
       req.push(
-        <Route path={menu.routeTemplate||menu.url} element={<NavCheck to={menu.children[0].url} />} />
-      ) 
+        <Route path={menu.routeTemplate||menu.url} element={menu.component} />
+      )
+    }else{
+      if(menu.children && menu.children[0]){
+        const childMenu = menu.children[0];
+        console.log(`${menu.routeTemplate||menu.url}->${childMenu.url}`)
+        if(!childMenu.url){
+          console.error('无法自动匹配下一个可跳转路由菜单:',menu)
+        }
+        req.push(
+          <Route path={menu.routeTemplate||menu.url} element={<NavCheck to={childMenu.url} />} />
+        ) 
+      }
     }
   }
   if(menu.children){
@@ -64,6 +95,10 @@ export const RouteList = (
           </ProviderMenu.Provider>
         }
       >
+
+        {/* 首页 */}
+        <Route path='/' element={<GetIndexRoute />} />
+
         {
           menuConfig.map(menu=>renderMenuConfig(menu))
         }

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

@@ -1,6 +1,6 @@
 
 
-import {GET_DEFAULT,POST_DEFAULT,API_ROOT} from './index.js';
+import {GET_DEFAULT,POST_DEFAULT,API_ROOT} from './index';
 
 
 

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

@@ -0,0 +1,43 @@
+// @ts-ignore
+import Axios from 'axios';
+// @ts-ignore
+import qs from 'qs';
+
+import {DefaultRequest} from './interceptor'
+
+const axiosExport = Axios.create();
+axiosExport.interceptors.request.use(DefaultRequest);
+
+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,
+  });
+  // @ts-ignore
+  let fileType = response.headers.get('content-type');
+  // @ts-ignore
+  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;
+}
+

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

@@ -0,0 +1,155 @@
+
+// @ts-ignore
+import qs from 'qs';
+
+
+export const CreateHttpTools=(axios)=>{
+  let buffer = {};
+
+  /**
+   * GET请求
+   * @param {string} url - 接口地址 
+   * @param {Object} [param] - 接口参数
+   * @param {Object} [options] - 扩展参数
+   * @returns Promise<ServicesResponse>
+   */
+  const GET_DEFAULT= async (url, param, options) => {
+    if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
+    let now = Date.now();
+
+    let bufferItem;
+    if (options?.ttl) {
+      if (buffer[url]) {
+        bufferItem = buffer[url];
+        if (bufferItem.param == param && now <= bufferItem.endTime) {
+          return bufferItem?.response?.data || null;
+        }
+      }
+    }
+    let response = await axios({
+      method: 'GET',
+      url: param ? `${url}?${param}` : url,
+      ...options,
+    });
+
+    if (options?.ttl) {
+      if (!buffer[url]) {
+        buffer[url] = {};
+      }
+      buffer[url].param = param;
+      let ttl = options.ttl === true ? 1000 * 2 : options.ttl;
+      buffer[url].endTime = Date.now() + ttl;
+      buffer[url].response = response;
+    }
+
+    return response && response.data ? response.data : null;
+  }
+
+  /**
+   * GET请求
+   * @param {string} url - 接口地址 
+   * @param {Object} [param] - 接口参数
+   * @returns Promise<ServicesResponse>
+   */
+  const GET_DEFAULT_CROSS = async (url, param) => {
+    if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
+
+    let response = await axios({
+      method: 'GET',
+      xsrfCookieName: '',
+      xsrfHeaderName: '',
+      withCredentials: true,
+      url: param ? `${url}?${param}` : url,
+    });
+    return response && response.data ? response.data : null;
+  }
+
+  /**
+   * POST请求
+   * @param {string} url - 接口地址 
+   * @param {Object} [params] - 接口参数
+   * @param {Object} [options] - 特殊参数
+   * 
+   * @returns Promise<ServicesResponse>
+   */
+  const POST_DEFAULT= async (url, params, options) => {
+    let data = params;
+    // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
+    // if (typeof params === 'string') {
+    //   data = params;
+    // } else {
+    //   data = { ...params };
+    // }
+    let response = await axios({
+      method: 'POST',
+      url: url,
+      data,
+      ...options,
+      // headers: { 'content-type': 'application/x-www-form-urlencoded' },
+    });
+    return response && response.data ? response.data : null;
+  }
+
+
+  /**
+   * POST请求
+   * @param {string} url - 接口地址 
+   * @param {Object} [params] - 接口参数
+   * 
+   * @returns Promise<ServicesResponse>
+   */
+  const POST_DEFAULT_CROSS= async (url, params) => {
+    let data = {};
+    // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
+
+    if (typeof params === 'string') {
+      data = params;
+    } else {
+      data = { ...params };
+    }
+    let response = await axios({
+      method: 'POST',
+      url: url,
+      xsrfCookieName: '',
+      xsrfHeaderName: '',
+      withCredentials: true,
+      data,
+    });
+
+    return response && response.data ? response.data : null;
+  }
+
+  const PUT_DEFAULT= async (url,params,options)=> {
+    let data=params;
+
+    let response=await axios({
+      method: 'PUT',
+      url: url,
+      data,
+      ...options,
+    });
+    return response&&response.data? response.data:null;
+  }
+  
+  const DELETE_DEFAULT = async (url,params,options) => {
+    let data=params;
+
+    let response=await axios({
+      method: 'DELETE',
+      url: url,
+      data,
+      ...options,
+    });
+    return response&&response.data? response.data:null;
+  }
+
+  return {
+    GET_DEFAULT,
+    GET_DEFAULT_CROSS,
+    POST_DEFAULT,
+    POST_DEFAULT_CROSS,
+    PUT_DEFAULT,
+    DELETE_DEFAULT
+  }
+
+}

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

@@ -1,24 +1,19 @@
 // @ts-ignore
 import Axios from 'axios';
 // @ts-ignore
-import qs from 'qs';
-// @ts-ignore
 import { message } from '@/components/antd';
 import {WriteLog} from '@/utils';
+import {CreateHttpTools} from './http';
 
-import {DEBUG_API_HOST,DEBUG_REPORT_API_HOST } from '@/config';
+import { DEBUG_API_HOST } from '@/config';
+import {logout} from './token';
+import {DefaultRequest} from './interceptor';
+import {FormatTableService,FormatGetRequest,FormatRequestClean} from './interceptor';
 
 
-const axios = Axios.create();
 
 // @ts-ignore
 export const API_ROOT= BUILD_ENV=='localdebug'?DEBUG_API_HOST:API_HOST;
-// @ts-ignore
-console.log(`========API_ROOT:${API_ROOT}========`);
-
-const tokenMode='header';//header,cookie
-const tokenName='Authorization';
-
 export const RESPONSE_STRUCT={
   CODE:'code',
   MSG:'msg',
@@ -26,54 +21,17 @@ export const RESPONSE_STRUCT={
   PAGINATION:'pagination'
 }
 
-let Modal = {
+// @ts-ignore
+console.log(`========API_ROOT:${API_ROOT}========`);
+
+const Modal = {
   error: (options) => {
     message.error(options.content);
   },
 };
 
-let jwt = '';
-let _logout = ()=>{}
-
-export const setJwt = (value) => {
-  if(value==''){
-    localStorage.removeItem('jwt');
-    jwt='';
-    return;
-
-  }
-  localStorage.setItem('jwt', value);
-  jwt = value;
-};
-export const getJwt=()=>{
-  return jwt;
-}
-// @ts-ignore
-window.setJwt=setJwt;
-export const setLogout=(fn)=>{
-  _logout=fn;
-}
-export const logout=()=>{
-  _logout();
-}
-
-
-axios.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;
-});
+const axios = Axios.create();
+axios.interceptors.request.use(DefaultRequest);
 
 let ERROR_401_COUNT=0;
 /**
@@ -139,236 +97,30 @@ axios.interceptors.response.use(
 
 
 
-
-let buffer = {};
-/**
- * GET请求
- * @param {string} url - 接口地址 
- * @param {Object} [param] - 接口参数
- * @param {Object} [options] - 扩展参数
- * @returns Promise<ServicesResponse>
- */
-export async function GET_DEFAULT(url, param, options) {
-  if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
-  let now = Date.now();
-
-  let bufferItem;
-  if (options?.ttl) {
-    if (buffer[url]) {
-      bufferItem = buffer[url];
-      if (bufferItem.param == param && now <= bufferItem.endTime) {
-        return bufferItem?.response?.data || null;
-      }
-    }
-  }
-  let response = await axios({
-    method: 'GET',
-    url: param ? `${url}?${param}` : url,
-    ...options,
-  });
-
-  if (options?.ttl) {
-    if (!buffer[url]) {
-      buffer[url] = {};
-    }
-    buffer[url].param = param;
-    let ttl = options.ttl === true ? 1000 * 2 : options.ttl;
-    buffer[url].endTime = Date.now() + ttl;
-    buffer[url].response = response;
-  }
-
-  return response && response.data ? response.data : null;
+const DEFAULT_HTTP = CreateHttpTools(axios);
+const {
+  GET_DEFAULT,
+  GET_DEFAULT_CROSS,
+  POST_DEFAULT,
+  POST_DEFAULT_CROSS,
+  DELETE_DEFAULT,
+  PUT_DEFAULT
+} = DEFAULT_HTTP;
+
+export {
+  GET_DEFAULT,
+  GET_DEFAULT_CROSS,
+  POST_DEFAULT,
+  POST_DEFAULT_CROSS,
+  DELETE_DEFAULT,
+  PUT_DEFAULT
 }
 
-/**
- * GET请求
- * @param {string} url - 接口地址 
- * @param {Object} [param] - 接口参数
- * @returns Promise<ServicesResponse>
- */
-export async function GET_DEFAULT_CROSS(url, param) {
-  if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
 
-  let response = await axios({
-    method: 'GET',
-    xsrfCookieName: '',
-    xsrfHeaderName: '',
-    withCredentials: true,
-    url: param ? `${url}?${param}` : url,
-  });
-  return response && response.data ? response.data : null;
-}
 
-/**
- * POST请求
- * @param {string} url - 接口地址 
- * @param {Object} [params] - 接口参数
- * @param {Object} [options] - 特殊参数
- * 
- * @returns Promise<ServicesResponse>
- */
-export async function POST_DEFAULT(url, params, options) {
-  let data = params;
-  // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
-  // if (typeof params === 'string') {
-  //   data = params;
-  // } else {
-  //   data = { ...params };
-  // }
 
-  let response = await axios({
-    method: 'POST',
-    url: url,
-    data,
-    ...options,
-    // headers: { 'content-type': 'application/x-www-form-urlencoded' },
-  });
-  return response && response.data ? response.data : null;
+export {
+  FormatTableService,
+  FormatGetRequest,
+  FormatRequestClean
 }
-
-
-/**
- * POST请求
- * @param {string} url - 接口地址 
- * @param {Object} [params] - 接口参数
- * 
- * @returns Promise<ServicesResponse>
- */
-export async function POST_DEFAULT_CROSS(url, params) {
-  let data = {};
-  // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
-
-  if (typeof params === 'string') {
-    data = params;
-  } else {
-    data = { ...params };
-  }
-  let response = await axios({
-    method: 'POST',
-    url: url,
-    xsrfCookieName: '',
-    xsrfHeaderName: '',
-    withCredentials: true,
-    data,
-  });
-
-  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
-      ||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/interceptor/index.js

@@ -0,0 +1,67 @@
+
+
+import {RESPONSE_STRUCT} from '../';
+import {addToken} from '../token';
+
+
+
+export const DefaultRequest=(config)=> {
+  let header = { 'X-Requested-With': 'XMLHttpRequest' };
+  header = addToken(header);
+  if (config.headers) {
+    config.headers = { ...config.headers, ...header };
+  } else {
+    config.headers = header;
+  }
+  // 在发送请求之前做些什么
+  return config;
+}
+
+
+
+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
+      ||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/login.js

@@ -1,4 +1,4 @@
-import {GET_DEFAULT,API_ROOT,POST_DEFAULT,PUT_DEFAULT} from './index.js';
+import {GET_DEFAULT,API_ROOT,POST_DEFAULT} from './index';
 
 
 

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

@@ -1,10 +1,9 @@
 
-import {getJwt} from '@/services'
+import {getJwt,logout} from '../token'
 // @ts-ignore
 import {Modal} from '@/components/antd';
-
 import { CONSOLE_LOG ,WriteLog} from '@/utils';
-import {logout} from '@/services'
+
 let _ws;
 let timer=null;
 

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

@@ -0,0 +1,41 @@
+
+const tokenMode='header';//header,cookie
+const tokenName='Authorization';
+
+let jwt = '';
+let _logout = ()=>{}
+
+
+export const setJwt = (value) => {
+  if(value==''){
+    localStorage.removeItem('jwt');
+    jwt='';
+    return;
+
+  }
+  localStorage.setItem('jwt', value);
+  jwt = value;
+};
+export const getJwt=()=>{
+  return jwt;
+}
+
+export const setLogout=(fn)=>{
+  _logout=fn;
+}
+export const logout=()=>{
+  _logout();
+}
+
+export const addToken=(header)=>{
+  if(tokenMode=='header'){
+    if (jwt) {
+      header[tokenName] = jwt;
+    }
+  }
+  return header;
+}
+
+if(window){
+  window['setJwt']=setJwt;
+}

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

@@ -49,7 +49,9 @@
  * 菜单项
  * @typedef RouteMenuItem
  * @property {string} name - 菜单展示的名称
- * @property {string|JSX.Element} [icon] - 菜单图标
+ * @property {boolean} [noAutoMatch=false] - 关闭自动菜单匹配跳转
+ * @property {import("react").JSX.Element} [component] - 菜单对应的页面JSX组件
+ * @property {string|import("react").JSX.Element} [icon] - 菜单图标
  * @property {string} [url] - 菜单的URL地址
  * @property {string} [routeTemplate] - 菜单的路由模版，用于匹配动态路由
  * @property {number} [msgCount] - 菜单的未读消息数量

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

@@ -0,0 +1,33 @@
+import React from "react";
+
+
+export const LoadComponent=(lazyComponent)=>{
+  return React.createElement(lazyComponent)
+}
+
+/**
+ * 自动计算菜单权限，使父级菜单权限包含所有子菜单的权限
+ * @param {RouteMenuItem} menu 
+ * @returns {RouteMenuItem}
+ */
+export const UpdateAuth=(menu)=>{
+  if(menu.children){
+
+    let auths= menu.children.map(childMenu=>{
+      let _childMenu = UpdateAuth(childMenu);
+      if( Array.isArray(_childMenu.auth) ){
+        return [..._childMenu.auth];
+      }
+      return [];
+    });
+    
+    if( Array.isArray(menu.auth) ){
+      
+      menu.auth = [...menu.auth,...auths.flat()];
+      // @ts-ignore
+      menu.auth = [...new Set(menu.auth)];// 去重
+    }
+  }
+  return menu;
+}
+

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

@@ -1,39 +0,0 @@
-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)
-}
-