kn-cli 1.0.91 → 1.0.93

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

@@ -1,22 +1,273 @@
 // @ts-ignore
-import React,{  useState,useMemo } from 'react';
+import React,{  useState,useMemo, useEffect } from 'react';
+// @ts-ignore
+import { useLocation } from 'react-router-dom';
 // @ts-ignore
 import { createContainer } from "unstated-next"
 
-import {GET_MENU} from '@/services/auth';
+import useRouteMenu from '@/hooks/useRouteMenu';
+
+
+// @ts-ignore
+import { AppstoreOutlined, MailOutlined } from '@ant-design/icons';
+
+const MenuRoute=[
+  {
+    name:'常用管理',
+    url:'/',
+    children:[
+      {
+        name:'内容管理',
+        icon:<AppstoreOutlined />,
+        url:'/content',
+        children:[
+          {name:'剧集管理',url:'/content/video'},
+          {name:'素材管理',url:'/content/material'},
+        ]
+
+      },
+      {
+        name:'数据管理',
+        icon:<MailOutlined />,
+        url:'/data',
+        children:[
+          {primaryId:'orderData',name:'订单数据',msgCount:3,url:'/data/order'},
+          {name:'用户数据',url:'/data/userData'},
+        ]
+      },
+      {
+        name:'用户管理',
+        url:'/user',
+        children:[
+          {name:'账户管理',url:'/user/user'},
+          {name:'客诉管理',url:'/user/suggest'},
+        ]
+      },
+    ]
+  },
+  {
+    name:'权限管理',
+    url:'/auth',
+    children:[
+      {
+        name:'权限设置',
+        icon:<AppstoreOutlined />,
+        url:'/auth/config',
+        children:[
+          {name:'角色配置',url:'/auth/config/permission'},
+        ]
+      },
+    ]
+  }
+]
+
+const MenuRoute2=[
+  {
+    name:'数据管理',
+    icon:'AppstoreOutlined',
+    url:'/order',
+    auth:['super'],
+    children:[
+      {
+        name:'数据管理',
+        // icon:'AppstoreOutlined',
+        url:'/order',
+        // children:[
+        //   {name:'剧集管理',url:'/video'},
+        //   {name:'素材管理',url:'/material'},
+        // ]
+
+      },
+    ]
+  },
+  {
+    name:'手机管理',
+    url:'/device',
+    icon:'AppstoreOutlined',
+    children:[]
+  },
+  {
+    name:'服务设置',
+    url:'/service',
+    icon:'AppstoreOutlined',
+    children:[
+      {
+        name:'账号管理',
+        url:'/service/account'
+      },
+      // {
+      //   name:'账号健康设置',
+      //   url:'/service/accountHealth'
+      // },
+      // {
+      //   name:'排班管理',
+      //   url:'/service/workforce'
+      // },
+      // {
+      //   name:'表单设置',
+      //   url:'/service/workforce'
+      // },
+
+    ]
+
+  },
+  {
+    name:'内容管理',
+    url:'/video',
+    icon:'AppstoreOutlined',
+    children:[
+      {
+        name:'内容管理',
+        url:'/video',
+        // children:[
+        //   {name:'剧集管理',url:'/video'},
+        //   {name:'素材管理',url:'/material'},
+        // ]
+
+      },
+      // {
+      //   name:'数据管理',
+      //   icon:'AppstoreOutlined',
+      //   children:[
+      //     {name:'订单数据',url:'/order'},
+      //     {name:'用户数据',url:'/userData'},
+      //   ]
+      // },
+      // {
+      //   name:'用户管理',
+      //   icon:'UserOutlined',
+      //   url:'/user'
+      // },
+      // {
+      //   name:'客诉管理',
+      //   icon:'CustomerServiceOutlined',
+      //   url:'/suggest'
+      // },
+      // {
+      //   name:'权限配置',
+      //   icon:'CrownOutlined',
+      //   url:'/permission'
+      // },
+    ]
+  },
+  {
+    name: '权限设置',
+    url: '/authUser',
+    icon: 'AppstoreOutlined',
+    children: [
+      {
+        name: '用户管理',
+        url: '/authUser',
+      },
+      {
+        name: '角色管理',
+        url: '/authRole',
+      },
+      {
+        name: '用户组',
+        url: '/authUserGroup',
+      },
+    ]
+  },
+  {
+    name:'消息中心',
+    url:'/message',
+    icon:'AppstoreOutlined',
+    children:[
+      {
+        primaryId:'myMessage',
+        name:'我的消息',
+        // msgCount:MSG_COUNT++,
+        url:'/message/my',
+      },
+      {
+        name:'消息设置',
+        url:'/message/config',
+        children:[
+          {
+            name:'消息查询-2',
+            url:'/message/config/2',
+          },
+          {
+            name:'消息查询-3',
+            url:'/message/config/3',
+          },
+        ]
+      },
+      {
+        name:'消息查询',
+        url:'/message/query',
+        children:[
+          {
+            name:'消息查询-设置',
+            hideMenu:true,
+            routeTemplate:'/message/query/:type',
+          },
+        ]
+      },
+
+    ]
+
+  },
+]
+
 
 const useProvider=() =>{
-  const [menus,setMenus]= useState([]);
 
-  const reload= async ()=>{
-    await GET_MENU();
+  const routeMenu = useRouteMenu();
+
+  const curLocation =useLocation();
+
+  const [topMenu,setTopMenu]=useState([]);
+  const [leftMenu,setLeftMenu]=useState([]);
+
+  const [selectMenus,setSelectMenus] = useState({menus:[],keys:[]});
+
+  
+  const reload = async ()=>{
+    routeMenu.setSourceMap([...MenuRoute]);
+  }
+  const getTopMenu=(userAuth=[])=>{
+    const list = routeMenu.getMenu(routeMenu.source,userAuth);
+    setTopMenu(list||[]);
   }
-  const action=useMemo(()=>{
-    return {
-      menus,setMenus
+  const getLeftMenu=(userAuth=[])=>{
+    const list = routeMenu.getMenu(routeMenu.source,userAuth);
+    let menus= routeMenu.getOpenMenus(curLocation.pathname);
+
+    const req= list.filter(menu=>{
+      return menus.some(openMenu=>openMenu.key==menu.key)
+    })
+    
+    let subs=[];
+    if(req && req[0]){
+      subs=req[0].children||[];
     }
-  },[menus,setMenus]);
-  return action
+    setLeftMenu(subs);
+  }
+
+  const findMenuData=(menuKey)=>{
+    return routeMenu.findMenuData(menuKey);
+
+  }
+  const setMenuConfig=(params)=>{
+    routeMenu.setMenuConfig(params);
+  }
+
+  useEffect(()=>{
+    let menus= routeMenu.getOpenMenus(curLocation.pathname);
+    let keys=menus.map(item=>item.key);
+    setSelectMenus({menus,keys});
+  },[curLocation,routeMenu.source]);
+
+  useEffect(()=>{
+    getTopMenu();
+    getLeftMenu();
+  },[routeMenu.source,curLocation])
+
+
+
+  return {leftMenu,topMenu,reload,selectMenus,findMenuData,setMenuConfig}
 }
 const App = createContainer(useProvider);
 

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

@@ -10,7 +10,7 @@ import PageLoading from '@/components/page/pageLoading';
 import Login from '@/pages/login';
 import {AuthLogin} from '@/components/auth';
 import LeftMenu from '@/components/menu';
-import TopMenu from '@/components/topMenu';
+import TopMenu from '@/components/menu/topMenu';
 
 import ProviderMenu from '@/provider/menu';
 
@@ -54,14 +54,23 @@ export const RouteList = (
           </ProviderMenu.Provider>
         }
       >
-        <Route path='/' element={<Navigate to="/video"></Navigate> } />
-        <Route path='/video' element={<Video />} />
-        <Route path='/suggest' element={<Suggest />} />
-        <Route path='/order' element={<Order />} />
-        <Route path='/permission' element={<Permission />} />
-        <Route path='/material' element={<Material />} />
-        <Route path='/user' element={<User />} />
-        <Route path='/userData' element={<UserData />} />
+        <Route path='/' element={<Navigate to="/content/video"></Navigate> } />
+        <Route path='/content/video' element={<Video />} />
+        <Route path='/content/material' element={<Material />} />
+
+
+        <Route path='/data' element={<Navigate to="/data/order"></Navigate> } />
+        <Route path='/data/order' element={<Order />} />
+        <Route path='/data/userData' element={<UserData />} />
+
+        <Route path='/user' element={<Navigate to="/user/user"></Navigate> } />
+        <Route path='/user/user' element={<User />} />
+        <Route path='/user/suggest' element={<Suggest />} />
+
+        <Route path='/auth' element={<Navigate to="/auth/config/permission"></Navigate> } />
+        <Route path='/auth/config/permission' element={<Permission />} />
+
+
 
       </Route>
     </Route>

package/templates/template_app/.gitignore

@@ -0,0 +1,6 @@
+**/node_modules
+**/package-lock.json
+**/.DS_Store
+**/dist
+**/release
+

package/templates/template_oa/.gitignore

@@ -0,0 +1,6 @@
+**/node_modules
+**/package-lock.json
+**/.DS_Store
+**/dist
+**/release
+

package/templates/template_oa/jsconfig.json

@@ -3,8 +3,12 @@
     "baseUrl": ".",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "lib": ["dom", "ES2021"],
+    "allowJs":true,
+    "checkJs": true, 
+    "jsx": "react",
     "paths": {
       "@/*": ["./public/src/*"]
-    }
+    },
   }
 }

package/templates/template_oa/public/src/components/dialog/index.jsx

@@ -0,0 +1,237 @@
+// @ts-ignore
+import React from 'react';
+// @ts-ignore
+import ReactDOM from 'react-dom';
+// @ts-ignore
+import { Button } from 'antd';
+
+import IconFont from '@/components/iconFont';
+
+import Popup from '@/components/popup';
+// @ts-ignore
+import styles from './index.less';
+
+
+/**
+ * 对话框组件
+ * @param {object} props 
+ * @param {string} props.title - 对话框的标题内容
+ * @param {string} [props.okText='确认'] - 确认按钮文案
+ * @param {string} [props.cancelText='取消'] - 取消按钮文案
+ * @param {boolean} [props.noCancel=false] - 不显示取消按钮
+ * @param {()=>Promise<boolean>} [props.onOk] - 点击确认按钮回调
+ * @param {()=>Promise<boolean>} [props.onClose] - 点击关闭的回调
+ * @param {()=>void} [props.destory] - 对话框销毁的回调
+ * @param {JSX.Element|any} [props.children] - 子组件
+ * 
+ * @returns {JSX.Element}
+ */
+const Dialog = (props) => {
+  const {
+    title='',
+    okText='确认',
+    cancelText='取消',
+    noCancel=false,
+    onOk:fnOnOk,
+    onClose:fnOnClose,
+    destory,
+    children
+  }= props;
+  async function onClose() {
+    if (fnOnClose) {
+      let ret = await fnOnClose();
+      if (ret) {
+        destory();
+      }
+    } else {
+      destory();
+    }
+  }
+  async function onOk() {
+    if (fnOnOk) {
+      let ret = await fnOnOk();
+      if (ret) {
+        destory();
+      }
+    } else {
+      destory();
+    }
+  }
+  return (
+    <section className={styles.body}>
+      <div className={styles.mask} />
+      <section className={styles.wrap}>
+        <div className={styles.header}>
+          <span>{title}</span>
+          <IconFont icon='close' className={styles.close} onClick={onClose} />
+        </div>
+
+        {children}
+
+        <div className={styles.footer}>
+          <Button type='primary' onClick={onOk}>
+            {okText}
+          </Button>
+          {noCancel ? (
+            ''
+          ) : (
+            <Button onClick={onClose} style={{ marginLeft: '10px' }}>
+              {cancelText}
+            </Button>
+          )}
+        </div>
+      </section>
+    </section>
+  );
+};
+
+/**
+ * 显示一个对话框
+ * @param {Object} props 
+ * @param {string} props.title - 对话框标题
+ * @param {string} [props.okText='确认'] - 确认按钮文案
+ * @param {string} [props.cancelText='取消'] - 取消按钮文案
+ * @param {boolean} [props.noCancel=false] - 不显示取消按钮
+ * @param {()=>Promise<boolean>} [props.onOk] - 点击确认按钮回调
+ * @param {()=>Promise<boolean>} [props.onClose] - 点击关闭的回调
+ * @param {JSX.Element|any} [props.component] - 对话框内的实际内容
+ * 
+ * @returns {Promise<boolean>}
+ */
+export const ShowDialog = (props={title:''}) => {
+  const {title,onOk,okText,cancelText,noCancel,onClose,component}= props;
+  return new Promise((reslove) => {
+    let popup = Popup(reslove);
+    ReactDOM.render(
+      <Dialog
+        title={title}
+        destory={popup.destory}
+        onOk={onOk}
+        okText={okText}
+        cancelText={cancelText}
+        noCancel={noCancel}
+        onClose={onClose}
+      >
+        {component}
+      </Dialog>,
+      popup.dom
+    );
+  });
+};
+
+/**
+ * 一个带确认和取消的确认对话框
+ * @param {Object} props 
+ * @param {string} props.title - 对话框标题
+ * @param {string} [props.okText='确认'] - 确认按钮文案
+ * @param {string} [props.cancelText='取消'] - 取消按钮文案
+ * @param {boolean} [props.noCancel=false] - 不显示取消按钮
+ * @param {JSX.Element|any} [props.content] - 对话框内的实际内容
+ * @returns {Promise<boolean>}
+ */
+export const ShowConfirm = async (props) => {
+  if (typeof props === 'string') {
+    // @ts-ignore
+    props = { content: props };
+  }
+  const {title='注意',okText='确认',cancelText='取消',noCancel=false,content}= props;
+
+  let result = false;
+  await ShowDialog({
+    title: title || '注意',
+    okText: okText || '确认',
+    cancelText: cancelText || '取消',
+    noCancel: noCancel,
+    onClose: async () => {
+      result = false;
+      return Promise.resolve(true);
+    },
+    onOk: async () => {
+      result = true;
+      return Promise.resolve(true);
+    },
+    component: (
+      <div className={styles.confirmWrap}>
+        {content}
+      </div>
+    ),
+  });
+  return result;
+};
+
+/**
+ * 一个只有确认按钮的提示框
+ * @param {Object} props 
+ * @param {string} [props.okText='确认'] - 确认按钮文案
+ * @param {JSX.Element|any} [props.content] - 对话框内的实际内容
+ * @param {()=>void} [props.onOk] - 点击确认的回调
+ * @param {()=>void} props.destory - 关闭对话框的回调
+ * @param {string} [props.type='error'] - 警告类型,'error'|'suuccess'
+ * 
+ * @returns {JSX.Element}
+ */
+const Alert = (props) => {
+  const {onOk:fnOnOk,destory,type,content,okText='确认'}= props;
+  function onOk() {
+    if (fnOnOk) fnOnOk();
+    destory();
+  }
+  return (
+    <section className={styles.body }>
+      <div className={styles.mask} />
+      <section className={styles.wrapAlert}>
+        <div className={styles.alertContent}>
+          <div className={type === 'success' ? styles.iconSuccess : styles.iconError} />
+          <span>{content}</span>
+        </div>
+        <div className={styles.alertFooter}>
+          <span onClick={onOk}>{okText}</span>
+        </div>
+      </section>
+    </section>
+  );
+};
+
+/**
+ * 显示一个alert
+ * @param {Object} props 
+ * @param {JSX.Element|any} [props.content] - 对话框内的实际内容
+ * @param {()=>void} [props.onOk] - 点击确认的回调
+ * @param {string} [props.type='success'] - 警告类型,'error'|'suuccess'
+ * 
+ * @returns {Promise<void>}
+ */
+export const ShowAlert = (props) => {
+  if (props.constructor === String) {
+    // @ts-ignore
+    props = { content: props };
+  }
+
+  const {type='success',onOk,content}=props;
+
+  return new Promise((reslove) => {
+    let popup = Popup(reslove);
+
+    ReactDOM.render(
+      <Alert destory={popup.destory} type={type} onOk={onOk} content={content} />,
+      popup.dom
+    );
+  });
+};
+
+/**
+ * 显示一个错误提示alert
+ * @param {Object} props 
+ * @param {JSX.Element|any} [props.content] - 对话框内的实际内容
+ * @param {()=>void} [props.onOk] - 点击确认的回调
+ * 
+ * @returns {Promise<void>}
+ */
+export const ShowErrorAlert = (props) => {
+  if (props.constructor === String) {
+    props = { content: props };
+  }
+  return ShowAlert({ ...props, type: 'fail' });
+};
+
+export default Dialog;

package/templates/template_oa/public/src/components/{Empty → empty}/index.jsx

@@ -1,9 +1,18 @@
+// @ts-ignore 
 import React from 'react';
+// @ts-ignore 
 import { Empty, Button } from 'antd';
+
+// @ts-ignore 
 import styles from './index.less';
 
 /**
  * 当table数据为空时下方有“添加数据”按钮
+ * @param {object} props 
+ * @param {()=>void} [props.onClick] - 点击添加数据的回调
+ * @param {boolean} [props.editmode] - 是否允许编辑模式，允许的话就会有添加数据的按钮
+ * 
+ * @returns {JSX.Element}
  */
 function TableEmpty(props) {
   return (

package/templates/{template_oa_jwt/public/src/components/FormRow → template_oa/public/src/components/formRow}/index.jsx

@@ -1,6 +1,16 @@
-import React, { useState } from 'react';
+// @ts-ignore
+import React from 'react';
+
+// @ts-ignore
 import styles from './index.less';
 
+/**
+ * 表单的行组件,用于将子组件按照一行2列方式排列
+ * @param {Object} props 
+ * @param {JSX.Element[]|JSX.Element} props.children
+ * 
+ * @returns {JSX.Element}
+ */
 const FormRow = (props) => {
   function createCol(item, idx) {
     if (!item) return '';
@@ -9,6 +19,7 @@ const FormRow = (props) => {
       <div key={idx} className={styles.formRow}>
         <hgroup className={styles.row}>
           <div className={styles.title}>
+            {/* @ts-ignore */}
             <div required={editmode && item.props.required}>{item.props.label}</div>
           </div>
           <div className={styles.data}>{item}</div>
@@ -18,20 +29,31 @@ const FormRow = (props) => {
   }
   return (
     <section className={styles.formRowBody}>
+      {/* @ts-ignore */}
       {props.children.length > 0 ? props.children.map(createCol) : createCol(props.children)}
     </section>
   );
 };
 
+/**
+ * 表单的行组件中的列组件
+ * @param {Object} props 
+ * @param {JSX.Element[]|JSX.Element} props.children
+ * @param {boolean} [props.editmode=true] - 可编辑模式
+ * @param {string} [props.txtdata='-'] - 列的标题
+ * @param {boolean} [props.textarea=false] - 是否多行显示文本
+ * 
+ * @returns {JSX.Element|JSX.Element[]|any}
+ */
 function HocEditControl(props) {
   const { editmode = true, txtdata ,textarea} = props;
   if (editmode) {
     return props.children;
   }
   if(textarea){
-    return <span style={{whiteSpace:'pre-wrap'}}>{txtdata||'-'}</span>
+    return <span style={{whiteSpace:'pre-wrap'}}>{txtdata}</span>
   }
-  return <span>{txtdata || '-'}</span>;
+  return <span>{txtdata}</span>;
 }
 
 FormRow.Col = HocEditControl;