kn-cli 1.0.106 → 1.0.108

package/templates/template_admin/public/src/hooks/useThrottole.jsx

@@ -0,0 +1,68 @@
+import React,{useRef} from 'react';
+import { useState } from 'react';
+
+/**
+ * @typedef useThrottole
+ * @property {boolean} throttleing - 是否在节流中
+ * @property {(fn:function)=>function} makeThrottole - 制作节流方法
+ * @property {()=>boolean} isThrottole - 判断是否节流中
+ */
+
+const OUTPUT_LOG=false;
+/**
+ * 节流函数
+ * @param {object} props 
+ * @param {number} props.throttle - 节流时间
+ * 
+ * @returns {useThrottole}
+ */
+const useThrottole = ({throttle})=>{
+  
+  const  refThrottle= useRef(0)
+  const [throttleing,setThrottle] = useState(false);
+
+  const isThrottole=()=>{
+    return refThrottle.current > 0;
+  }
+
+  const startThrottole=()=>{
+    if(OUTPUT_LOG)console.log('节流-开始')
+    setThrottle(true);
+    refThrottle.current=throttle;
+  }
+
+  const releaseThrottle=()=>{
+    
+    setTimeout(()=>{
+      if(OUTPUT_LOG)console.log('节流-释放')
+      setThrottle(false);
+      refThrottle.current=0;
+    },refThrottle.current)
+  }
+
+  const makeThrottole=(fn)=>{    
+    if(OUTPUT_LOG)console.log('节流-创建方法')
+    return  async (...args)=>{
+      if(isThrottole()){return;}
+      if(fn){
+        startThrottole();
+        try{
+          if(OUTPUT_LOG)console.log('节流-执行')
+          return await fn(...args);
+        }catch(ex){
+          if(OUTPUT_LOG)console.error('useThrottole:',ex);
+        }finally{
+          releaseThrottle();
+        }
+      }
+    }
+  }
+  if(OUTPUT_LOG)console.log('当前节流状态:',throttleing)
+  return {
+    throttleing,
+    makeThrottole,
+    isThrottole,
+  }
+}
+
+export default useThrottole;

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

@@ -1,18 +1,30 @@
 // @ts-ignore
 import React from 'react';
-// @ts-ignore
-import ReactDOM from 'react-dom';
-// @ts-ignore
-import {HashRouter} from 'react-router-dom';
-// import {createRoot} from 'react-dom/client';
-// import { createHashRouter,RouterProvider } from 'react-router-dom';
 import './_antd.less';
 import './_reset.less';
-import {RouteList} from './route';
+import RouteList from './route';
 // @ts-ignore
 import moment from 'moment';
+import { ReactRender } from './components/react';
 moment.locale('zh-cn');
 
+
+let _error=window.console.error;
+window.console.error=(...args)=>{
+  let filter=false;
+  for (const arg of args) {
+    console.log(arg);
+    if(typeof arg == 'string'){
+      if( /Form.*already.*set.*'initialValues'/.test(arg)){
+        filter=true;
+        break;
+      }
+    }
+  }
+  if(filter)return;
+  _error(...args)
+}
+
 // @ts-ignore
 if(MOCK){
   // @ts-ignore
@@ -54,14 +66,20 @@ window.appLog(`${location.href}`);
 window.appLog(`ua:${navigator.userAgent}`);
 /* eslint-enable */
 
-const BasicRoute = () => {
-  return (
-  <HashRouter>
-    {RouteList}
-  </HashRouter>
-  );
+
+ReactRender(<RouteList />, document.getElementById('main-view'));
+
+
+// 只需在入口文件中启用 HMR
+// @ts-ignore
+if (module.hot) {
+  console.warn('热更刷新监听')
+  // @ts-ignore
+  module.hot.accept('./route', () => {
+    console.warn('热更刷新')
+    const NextApp = require('./route').default;
+    ReactRender(<NextApp />, document.getElementById('main-view'));
+  });
 }
 
-ReactDOM.render(<BasicRoute />, document.getElementById('main-view'));
 
-// createRoot(document.getElementById('main-view')).render(<RouterProvider router={createHashRouter(router)} />);

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

@@ -0,0 +1,152 @@
+
+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'));
+
+
+import Home from '@/pages/home';
+
+
+const DASHBOARD={
+  name:'仪表盘',
+  url:'/',
+  component:<Home />,
+  children:[
+  ],
+}
+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'
+            }
+          ]
+        }
+      ]
+    },
+  ],
+}
+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 [DASHBOARD,DNA,AUTH];

package/templates/template_admin/public/src/pages/auth/user/create/index.jsx

@@ -1,16 +1,8 @@
 import React from 'react';
 import {
-  Space,
-  Form,
   Button,
-  Input,
-  Select,
-  Tabs,
-  Badge
   // @ts-ignore
-} from 'antd';
-// @ts-ignore
-import {PlusOutlined} from '@ant-design/icons';
+} from '@/components/antd';
 
 import ruler from '@/utils/rule';
 import {px2rem} from '@/utils';

package/templates/template_admin/public/src/pages/auth/user/dialog/index.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import ReactDom from 'react-dom';
 // @ts-ignore
-import { Modal, Form, Input, message,Spin } from 'antd';
+import { Modal, Form, Input, message,Spin } from '@/components/antd';
 import Popup from '@/components/popup';
 import { UPDATE,GET_DETAIL } from '@/services/demo';
 import rule from '@/utils/rule';

package/templates/template_admin/public/src/pages/auth/user/index.jsx

@@ -8,7 +8,7 @@ import {
   Tabs,
   Badge
   // @ts-ignore
-} from 'antd';
+} from '@/components/antd';
 // @ts-ignore
 import {useNavigate,} from 'react-router-dom';
 // @ts-ignore
@@ -17,7 +17,6 @@ import {PlusOutlined} from '@ant-design/icons';
 import ruler from '@/utils/rule';
 import {px2rem} from '@/utils';
 import {Layout,SearchBar,TitleBar,Content,Panel} from '@/pages/components/layout'
-import {emUserState} from '@/dictionary';
 import Table from '@/components/table';
 import { usePaginationWithForm } from '@/hooks';
 import Link from '@/components/link';
@@ -95,25 +94,7 @@ const AuthUser = () => {
       dataIndex: 'longName',
       render:(text,record)=>(<Table.Column minWidth={129} maxWidth={211}>{text}</Table.Column>)
     },
-    {
-      title: '状态',
-      dataIndex: 'select',
-      width:70,
-      fixed:'right',
-      render:(state)=>{
-        const stateLabel = emUserState.getLabel(`${state}`);
-        if(!stateLabel)return '-'
-        const colors={
-          '1':'green',
-          '0':'red',
-          '2':'#FAAD14',
-        }
-        return  <Badge
-            color={colors[`${state}`]}
-            text={stateLabel}
-          />
-      }
-    },
+   
     {
       title: '操作',
       key: 'option',
@@ -159,25 +140,7 @@ const AuthUser = () => {
       dataIndex: 'longName',
       render:(text,record)=>(<Table.Column minWidth={129} maxWidth={211}>{text}</Table.Column>)
     },
-    {
-      title: '状态',
-      dataIndex: 'select',
-      width:70,
-      fixed:'right',
-      render:(state)=>{
-        const stateLabel = emUserState.getLabel(`${state}`);
-        if(!stateLabel)return '-'
-        const colors={
-          '1':'green',
-          '0':'red',
-          '2':'#FAAD14',
-        }
-        return  <Badge
-            color={colors[`${state}`]}
-            text={stateLabel}
-          />
-      }
-    },
+    
     {
       title: '操作',
       key: 'option',
@@ -222,26 +185,6 @@ const AuthUser = () => {
           <Form.Item label="关键字" name={'keyword'} rules={ruler.KEYWORDS}>
             <Input placeholder="请输入用户名/姓名" onPressEnter={onSearch} />
           </Form.Item>
-          <Form.Item label="状态" name={'status'} style={{width:px2rem(150)}}>
-            <Select>
-              <Select.Option value=''>全部</Select.Option>
-              {emUserState.selectOptions}
-            </Select>
-          </Form.Item>
-
-          <Form.Item label="部门" name={'dep'} style={{width:px2rem(150)}}>
-            <Select>
-              <Select.Option value=''>全部</Select.Option>
-              {emUserState.selectOptions}
-            </Select>
-          </Form.Item>
-
-          <Form.Item label="角色" name={'role'} style={{width:px2rem(150)}}>
-            <Select>
-              <Select.Option value=''>全部</Select.Option>
-              {emUserState.selectOptions}
-            </Select>
-          </Form.Item>
 
           <Space size='middle'>
             <Button onClick={onSearch} type="primary">

package/templates/template_admin/public/src/pages/components/select/user.jsx

@@ -0,0 +1,18 @@
+import React from "react";
+
+import {DictSelect} from "@/components/select";
+// import { emAppState } from "@/dictionary";
+
+
+/**
+ * APP状态
+ * @param {import("@/components/select/useSelectList").SelectListProps} props
+ * @returns {JSX.Element}
+ */
+const SelectUser = (props) => {
+  const emDict = [];
+  return <DictSelect {...props} emDict={emDict} />;
+};
+
+
+export default SelectUser;

package/templates/template_admin/public/src/pages/demo/page1.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+
+import {Layout,SearchBar,TitleBar,Content,Panel} from '@/pages/components/layout'
+
+const PageTemplate = (props) => {
+  const {name} = props;
+  return (
+    <Layout>
+      <SearchBar>
+        <TitleBar label={`page1-${name}`}/>
+      </SearchBar>
+      <Content>
+        <Panel>
+        </Panel>
+      </Content>
+      
+    </Layout>
+  )
+}
+
+export default PageTemplate;

package/templates/template_admin/public/src/pages/demo/page2.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+
+import {Layout,SearchBar,TitleBar,Content,Panel} from '@/pages/components/layout'
+
+const PageTemplate = (props) => {
+  const {name} = props;
+  return (
+    <Layout>
+      <SearchBar>
+        <TitleBar label={`page2-${name}`}/>
+      </SearchBar>
+      <Content>
+        <Panel>
+        </Panel>
+      </Content>
+      
+    </Layout>
+  )
+}
+
+export default PageTemplate;

package/templates/template_admin/public/src/pages/demo/page3.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+
+import {Layout,SearchBar,TitleBar,Content,Panel} from '@/pages/components/layout'
+
+const PageTemplate = (props) => {
+  const {name} = props;
+  return (
+    <Layout>
+      <SearchBar>
+        <TitleBar label={`page3-${name}`}/>
+      </SearchBar>
+      <Content>
+        <Panel>
+        </Panel>
+      </Content>
+      
+    </Layout>
+  )
+}
+
+export default PageTemplate;

package/templates/template_admin/public/src/pages/error/403.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+// @ts-ignore
+import image403 from '@/assets/images/permission/403.png';
+import Permission from './permission';
+
+/**
+ * 403页面
+ * @returns {JSX.Element}
+ */
+const Page403 = () => {
+  
+  return <Permission title='没有访问权限！' backButton img={image403} />
+}
+
+export default Page403;

package/templates/template_admin/public/src/pages/error/404.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+// @ts-ignore
+import image404 from '@/assets/images/permission/404.png';
+import Permission from './permission';
+
+/**
+ * 404页面
+ * @returns {JSX.Element}
+ */
+const Page404 = () => {
+  
+  return <Permission title='您访问的页面不存在！' backButton img={image404} />
+}
+
+export default Page404;

package/templates/template_admin/public/src/pages/error/503.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+// @ts-ignore
+import image503 from '@/assets/images/permission/503.png';
+import Permission from './permission';
+
+/**
+ * 503页面
+ * @returns {JSX.Element}
+ */
+const Page503 = () => {
+  
+  return <Permission title='系统维护中，请稍后...' img={image503} />
+}
+
+export default Page503;

package/templates/template_admin/public/src/pages/error/permission.jsx

@@ -0,0 +1,40 @@
+import React from 'react';
+// @ts-ignore
+import { useNavigate, } from 'react-router-dom';
+import { Layout } from '@/pages/components/layout';
+// @ts-ignore
+import { Button } from "@/components/antd";
+// @ts-ignore
+import { px2rem } from '@/utils';
+// @ts-ignore
+import styles from './permission.less';
+
+/**
+ * permission页面
+ * @param {object} props 
+ * @param {string} props.img - 图片
+ * @param {string} props.title - 标题头
+ * @param {boolean} [props.backButton] - 返回按钮
+ * @returns {JSX.Element}
+ */
+
+const Permission = (props) => {
+  const { img, backButton = false, title } = props;
+  const navigator = useNavigate();
+
+  const onBack = () => navigator('/')
+
+  return (
+    <Layout>
+      <div className={styles.content}>
+        <img src={img} width={480} height={480} />
+        <div className={styles.info}>
+          <div className={styles.title} style={{ marginBottom: backButton ? px2rem(36) : '' }}>{title}</div>
+          {backButton && <Button type='primary' onClick={onBack}>返回首页</Button>}
+        </div>
+      </div>
+    </Layout>
+  )
+}
+
+export default Permission;

package/templates/template_admin/public/src/pages/error/permission.less

@@ -0,0 +1,16 @@
+.content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+  background-color: #fff;
+}
+.info {
+  margin-left: 80px;
+}
+.title {
+  font-weight: 600;
+  font-size: 32px;
+  color: #1F2329;
+}

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

@@ -1,15 +1,18 @@
 import React, { useRef } from 'react';
 
 import {
-  Button
+  Button,
+  Select
   // @ts-ignore
-} from 'antd';
+} from '@/components/antd';
 
 import {Layout,SearchBar,TitleBar,Content,Panel} from './components/layout'
 
 import AppProvider from '@/provider/app';
 import MenuProvider from '@/provider/menu';
 import { AuthShow } from '@/components/auth';
+
+import {useMessageStatus} from '@/dictionary';
 // @ts-ignore
 import styles from './home.less';
 
@@ -18,6 +21,8 @@ const Home = () => {
   const app = AppProvider.useContainer();
   const menu = MenuProvider.useContainer();
 
+  const emMessageStatus = useMessageStatus();
+
   /**
    * @type {React.MutableRefObject<number>}
    */
@@ -58,13 +63,19 @@ const Home = () => {
 
       <Content>
         <Panel>
+          <TitleBar label='权限' />
+
           <section className={styles.row}>
             <Button onClick={onMenuMessage}>增加菜单未读消息数</Button>
-
             <Button onClick={onAuthAdd}>增加权限A</Button>
             <AuthShow name='authA'><Button onClick={onAuthRemove}>去除权限A(有authA时才能看见)</Button></AuthShow>
-            
+          </section>
 
+          <TitleBar label='字典' />
+          <section className={styles.row}>
+            <Select style={{width:'300px'}}>
+              {emMessageStatus.render()}
+            </Select>
           </section>
 
 

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

@@ -5,7 +5,7 @@ import {  useSearchParams } from 'react-router-dom';
 
 import ruler from '@/utils/rule';
 // @ts-ignore
-import {Button,Tabs,Form,Input} from 'antd';
+import {Button,Tabs,Form,Input} from '@/components/antd';
 // @ts-ignore
 import styles from './index.less';
 
@@ -32,7 +32,8 @@ const Page = () => {
     }
   }
   const onLogin= async ()=>{
-    jumpUrl(`${location.protocol}//${location.host}/static/kssoLogin.html`,{replace:true})
+    let nextURL = new URL(`${location.protocol}//${location.host}/static/kssoLogin.html`);
+    jumpUrl(nextURL.toString(),{replace:true})
   }
 
   const tabs=[