kn-cli 1.0.114 → 1.0.116

package/package.json

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

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/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,6 +25,30 @@ 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.noAutoMatch){
@@ -71,6 +96,9 @@ export const RouteList = (
         }
       >
 
+        {/* 首页 */}
+        <Route path='/' element={<GetIndexRoute />} />
+
         {
           menuConfig.map(menu=>renderMenuConfig(menu))
         }

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/menuConfig.jsx

@@ -1,188 +0,0 @@
-
-import React from 'react';
-// @ts-ignore
-import MenuIcon from '@/components/menuIcon';
-import PageTemplate from './pages/pageTemplate';
-
-
-const Page1 = React.lazy(() => import('@/pages/demo/page1'));
-const Page2 = React.lazy(() => import('@/pages/demo/page2'));
-const Page3 = React.lazy(() => import('@/pages/demo/page3'));
-
-const AuthUser = React.lazy(() => import('@/pages/auth/user'));
-const AuthUserCreate = React.lazy(() => import('@/pages/auth/user/create'));
-
-
-/**
- * 自动计算菜单权限，使父级菜单权限包含所有子菜单的权限
- * @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:LoadComponent(React.lazy(() => import('@/pages/home'))),
-  children:[
-  ],
-}
-/**
- * @type {RouteMenuItem}
- */
-const DNA={
-  name:'基因库',
-  url:'/dna',
-  auth:true,
-  children:[
-    {
-      name: '父菜单1',
-      icon:<MenuIcon name='icon-dep'/>,
-      url: '/dna/parent',
-      auth:true,
-      children:[
-        {
-          component:<Page1 name='父菜单1-子菜单1'/>,
-          name:'子菜单1-1',
-          auth:true,
-          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 AUTH={
-  name:'控制室',
-  url:'/auth',
-  msgCount:12,
-  primaryId:'auth',
-  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',
-    },
-  ],
-}
-
-
-export default [UpdateAuth(DASHBOARD), UpdateAuth(DNA), UpdateAuth(AUTH) ];