kn-cli 1.0.92 → 1.0.94

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

@@ -0,0 +1,274 @@
+//必填
+const rule_required = { validator: async (rule,value)=>{
+  if(value===null||value===undefined||value===Number.NaN){
+    throw new Error('请填写');
+  }
+  if(!/\S+/.test(value)){
+    throw new Error('请填写');
+  }
+  return true;
+}, message: '请填写' };
+
+
+//整数
+const rule_number = { pattern: /^\d*$/, message: '请填写整数数字' };
+//可以带小数
+const rule_float = {
+  pattern: /^([1-9]\d*$|\d+[.]\d{1,5}$)|0$/,
+  message: '请填写数字可以带小数,小数点后最长5位',
+};
+// pattern:/^\d+[.]{0,1}\d+$/};
+
+const rule_xss = {
+  validator: async (rule, value) => {
+    if (/<script>/gi.test(value) || /%3Cscript/gi.test(value)) {
+      throw new Error('不能包含<script>');
+    }
+    return true;
+  },
+  message: '不能包含<script>',
+};
+
+const rule_max_title = { max: 32, message: '长度不能超过32位' };
+const rule_max_normal = { max: 128, message: '长度不能超过128位'};
+const rule_max_textarea = { max: 20480, message: '长度不能超过20480位' };
+const rule_max_number = { pattern: /^\d{0,12}$/, message: '长度不能超过12位' };
+const rule_max_weight = { pattern: /^\d{0,4}$/, message: '长度不能超过4位' };
+const rule_max_numberStr = { pattern: /^\S{0,13}$/, message: '长度不能超过12位' };
+
+const RULE_INPUT = [rule_required, rule_max_normal];
+const RULE_INPUT_NR = [rule_max_normal];
+
+const RULE_TITLE = [rule_required, rule_max_title];
+const RULE_TEXTAREA = [rule_required, rule_max_textarea];
+const RULE_INPUT_NUMBER = [rule_required, rule_number, rule_max_number];
+const RULE_INPUT_NUMBER_NR = [rule_number, rule_max_number];
+const RULE_INPUT_FLOAT = [rule_required, rule_float, rule_max_numberStr];
+
+const RULE_INPUT_WEIGHT_NUMBER = [rule_required, rule_number, rule_max_weight];
+const RULE_INPUT_WEIGHT_NUMBER_NR = [rule_number, rule_max_weight];
+
+const RULE_SELECT = [{ required: true, message: '请选择' }];
+const RULE_UPLOAD = [{ required: true, message: '请上传' }];
+const rule_max_link = { max: 1024, message: '长度不能超过1024位' };
+
+const RULE_LINK = [rule_required, rule_max_link];
+const RULE_LINK_NR = [rule_max_link];
+
+const rule_pwd = {
+  pattern: /^\w{6,16}$/,
+  type: 'string',
+  message: '请输入6-16位字母、下划线、数字任意组合的字符',
+};
+
+const RULE_PWD = [rule_required, rule_pwd];
+const RULE_PWD_NR = [rule_pwd];
+
+const rule_account = {
+  pattern: /^\w{1,12}$/,
+  type: 'string',
+  message: '请输入1-12位字母、下划线、数字任意组合的字符',
+};
+
+const RULE_ACCOUNT = [rule_required, rule_account];
+const RULE_ACCOUNT_NR = [rule_account];
+
+const rule_nickname = {
+  pattern: /^[\u4E00-\u9FA5A-Za-z0-9`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]{2,16}$/,
+  message: '请输入2-16为可见字符',
+};
+
+const RULE_NICKNAME = [rule_required, rule_nickname];
+
+const RULE_NICKNAME_NR = [rule_nickname];
+
+const rule_phone = { pattern: /^1\d{10}$/, message: '请输入正确的手机格式' };
+const RULE_PHONE_NR = [rule_phone];
+const RULE_PHONE = [rule_required, rule_phone];
+
+
+export const CUSTOM={
+  INPUT:(options)=>{
+    const {required=true,max=false,min=false,noSpace=false} = options;
+    let ret=[];
+    if(required){ret.push(rule_required)}
+
+    if(noSpace){
+      ret.push({
+        validator:async (rule,value='')=>{
+          let temp = value.trim();
+          if (/\s+/g.test(temp)) {
+            throw new Error('字符串中间不能包含空格');
+          }
+          return true;
+        },
+        message:`字符串中间不能包含空格`
+      })
+    }
+    if(max===false){
+      ret.push(rule_max_normal);
+    }else{
+      ret.push({
+        validator:async (rule,value='')=>{
+          let temp = value.trim();
+          if(temp.length <= max) {
+            return true;
+          }
+          throw new Error(`最多不能超过${max}个字`);
+        },
+        message:`最多不能超过${max}个字`
+      })
+    }
+    if(min){
+      ret.push({
+        validator:async (rule,value='')=>{
+          let temp = value.trim();
+          if (temp.length>=min) {
+            return true;
+          }
+          throw new Error(`最少需要${min}个字`);
+        },
+        message:`最少需要${min}个字`
+      })
+    }
+    return ret;
+  },
+  NUMBER:(options)=>{
+    const {required=true,max=false,min=false} = options;
+    let ret=[];
+    if(required){ret.push(rule_required)}
+    if(max){
+      ret.push({
+        validator:async (rule,value='')=>{
+          if ( +value <= max ) {
+            return true
+          }
+          throw new Error(`数值必须小于${max}`);
+        }
+      })
+    }
+    if(min){
+      ret.push({
+        validator:async (rule,value='')=>{
+          if ( +value >= min ) {
+            return true;
+          }
+          throw new Error(`数值必须大于${min}`);
+        }
+      })
+    }
+    return ret;
+  }
+}
+
+const list = {
+  INPUT: RULE_INPUT,
+  INPUT_NR: RULE_INPUT_NR,
+  SELECT: RULE_SELECT,
+  UPLOAD: RULE_UPLOAD,
+  TEXTAREA: RULE_TEXTAREA,
+  NUMBER: RULE_INPUT_NUMBER,
+  NUMBER_NR: RULE_INPUT_NUMBER_NR,
+  TITLE: RULE_TITLE,
+  FLOAT: RULE_INPUT_FLOAT,
+  LINK: RULE_LINK,
+  LINK_NR: RULE_LINK_NR,
+  PWD: RULE_PWD,
+  PWD_NR: RULE_PWD_NR,
+  ACCOUNT: RULE_ACCOUNT,
+  ACCOUNT_NR: RULE_ACCOUNT_NR,
+  NICKNAME: RULE_NICKNAME,
+  NICKNAME_NR: RULE_NICKNAME_NR,
+  PHONE: RULE_PHONE,
+  PHONE_NR: RULE_PHONE_NR,
+  WEIGHT: RULE_INPUT_WEIGHT_NUMBER,
+  WEIGHT_NR: RULE_INPUT_WEIGHT_NUMBER_NR,
+};
+Object.keys(list).forEach((key) => {
+  const rule = list[key];
+  list[key] = [rule_xss, ...rule];
+});
+
+
+export const validate=async (value,rules)=>{
+  for(let i=0;i<rules.length;i++){
+    let rule = rules[i];
+    let type =rule.type||'string';
+    let pattern = rule.pattern||'';
+  
+    let numberValue;
+    let textValue;
+    if(type=='number'){
+      numberValue = Number(value);
+    }else{
+      textValue= `${value}`.trim();
+    }
+
+    if(pattern){
+      if(!pattern.test(value)){
+        return {success:false,message:rule.message};
+      }
+    }
+    // 必填
+    if(rule.required){
+      pattern = /\S+/
+      if(!pattern.test(textValue)){
+        return {success:false,message:rule.message};
+      }
+    }
+    // 字符长度
+    if(rule.len && type == 'string'){
+      pattern = `^.{${rule.len}}$`;
+      pattern = new RegExp(pattern);
+      if(!pattern.test(textValue)){
+        return {success:false,message:rule.message};
+      }
+    }
+    
+    if(rule.max){
+      if(type=='number'){ // 最大数值
+        if(numberValue > +rule.max){
+          return {success:false,message:rule.message};
+        }
+      }
+      else if(type=='string'){ // 最大字符串长度
+        pattern = `^.{0,${rule.max}}$`;
+        pattern = new RegExp(pattern);
+        if(!pattern.test(textValue)){
+          return {success:false,message:rule.message};
+        }
+      }
+    }
+    if(rule.min){
+      if(type=='number'){
+        if(numberValue < +rule.min){ // 最小数值
+          return {success:false,message:rule.message};;
+        }
+      }else if(type=='string'){// 最小字符串长度
+        pattern = `^.{${rule.min},}$`;
+        pattern = new RegExp(pattern);
+        if(!pattern.test(textValue)){
+          return {success:false,message:rule.message};
+        }
+      }
+    }
+    if(rule.enum){
+      if(!rule.enum.includes(textValue)){
+        return {success:false,message:rule.message};
+      }
+    }
+    if(rule.validator){
+      try{
+        let req = await rule.validator(null,value);
+      }catch(ex){
+        return {success:false,message:ex.message}
+      }
+      
+    }
+  }
+  return {success:true};
+}
+
+
+
+export default list;

package/templates/template_admin/readme.md

@@ -78,3 +78,7 @@ kn-cli --tool
   * tinypng: 压缩png工具  
 
 
+### ksso登录配置  
+1. 在`static/kssoLogin.html`内配置ksso登录的id配置  
+2. 访问`/static/kssoLogin.html`来触发ksso登录，登录完成会跳转到`/#/login`路由下进行校验  
+

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

@@ -1,267 +0,0 @@
-// @ts-ignore
-import React, { useState,useEffect, useRef} from 'react';
-// @ts-ignore
-import { matchPath,useLocation,useNavigate } from 'react-router-dom';
-// @ts-ignore
-import { LogoutOutlined, UserOutlined } from '@ant-design/icons';
-// @ts-ignore
-import { Menu,Dropdown } from 'antd';
-
-import ProviderApp from '@/provider/app';
-import ProviderMenu from '@/provider/menu';
-import {GET_MENU} from '@/services/auth';
-
-// @ts-ignore
-import imgAvatar from '@/assets/images/avatar.png';
-// @ts-ignore
-import styles from './index.less';
-
-/**
- * 菜单下的隐藏子路由集
- * 当这些隐藏子路由打开的时候，导航栏的选中菜单会显示被匹配的这个子菜单
- */
-const SUB_MENU_CONFIG=[
-  {
-    path:'/video',//匹配菜单路由是/video的菜单
-    // routeTemplate:''匹配某个模板菜单的模板
-    subRoute:[
-      {
-        path:'/video/detail',//将video/detail这个路由匹配给菜单/video
-        // routeTemplate:''//也可以将某个路由模板匹配给某个菜单
-      }
-    ]
-  },
-]
-
-/**
- * 顶部导航栏
- * 左侧导航栏的路由也继顶部导航栏来控制
- * 路由数据结构：
- *  const MenuRoute=[
-    {
-      label:'顶部菜单A',
-      path:'/home/sub/1',
-      menus:[
-        {
-          label:'菜单组A-1',
-          icon:'MailOutlined',
-          children:[
-            {label:'菜单组A-1-home',path:'/',},
-            {label:'菜单组A-1-sub:id',path:'/home/sub/1',routeTemplate:'/home/sub/:id'},
-            {label:'菜单组A-1-sub3:id',path:'/home/sub3/2',routeTemplate:'/home/sub3/:id'},
-          ]
-        },
-      ]
-    }
-  ]
-  顶部的导航栏结构为{label,path,menus}
-  左侧导航栏数据为顶部导航栏数据的menus内子项{label,icon,children}组成
-  routeTemplate用来识别动态参数的路由，同前端本地路由配置同步即可
-  当顶部导航栏只有一项时，将自动隐藏顶部导航菜单
- * @returns {JSX.Element}
- */
-const TopMenu=()=>{
-  const app = ProviderApp.useContainer();
-  const providerMenu = ProviderMenu.useContainer();
-  const curRoute = useLocation();
-
-  const [menus,setMenus]=useState([]);
-  const navigate = useNavigate();
-  const [selectedKeys,setSelectedKeys] = useState([]);
-
-
-  const MENU_KEY_COUNTER=useRef(1);
-  const MENU_KEY=useRef({})
-  const translateMenu=(data={})=>{
-    const {label,path}= data;
-    let myKey = `${MENU_KEY_COUNTER.current}`
-    let item ={
-      key:myKey,
-      label:`${label}`,
-      path,
-      source:data,
-    } 
-    MENU_KEY.current[myKey] = item;
-    MENU_KEY_COUNTER.current++;
-    return item;
-  }
-
-  const getSubConfig=(menu)=>{
-    const {url,routeTemplate}= menu;
-    for(let i=0;i<SUB_MENU_CONFIG.length;i++){
-      let sub= SUB_MENU_CONFIG[i];
-      if(routeTemplate&&sub.routeTemplate&&routeTemplate==sub.routeTemplate){
-        return sub.subRoute;
-      }
-      if(url&&sub.path&&url==sub.path){
-        return sub.subRoute;
-      }
-    }
-    return null;
-  }
-  const transServicesMenuChildren=(menu)=>{
-    let req=[];
-    for(let i=0;i<menu.length;i++){
-      let item= menu[i];
-      const {url:path,name:label,icon,children:menus,routeTemplate}= item;
-      let children;
-      if(menus&&menus.length>0){
-        children= transServicesMenuChildren(menus);
-      }
-      let subRoute= getSubConfig(item);
-      req.push({
-        path,label,icon,children,routeTemplate,subRoute
-      })
-    }
-    return req;
-  }
-  const loadMenu=async ()=>{
-    let reqMenu = await GET_MENU();
-    if(reqMenu?.code==0){
-      let originMenu= reqMenu.data;
-      reqMenu=[];
-      for(let i=0;i<originMenu.length;i++){
-        let topMenu= originMenu[i];
-        const {url:path,children,name:label}=topMenu;
-        const menus = transServicesMenuChildren(children);
-        reqMenu.push({
-          path,menus,label
-        })
-      }
-    }
-    if(!reqMenu){
-      setMenus([]);
-      return;
-    }
-    const data = reqMenu.map(topMenu=>{
-      return translateMenu(topMenu);
-    })
-    setMenus(data);    
-  }
-
-  const GET_ROUTE_MENU=(menu)=>{
-    const {routeTemplate,path,subRoute} = menu;
-    const children = menu.children||menu.menus||null;
-    if(routeTemplate||path){
-      let match= matchPath(routeTemplate||path,curRoute.pathname);
-      if(!match&&subRoute){
-        match= subRoute.some(sub=>{
-          let subMatch= matchPath(sub.routeTemplate||sub.path,curRoute.pathname);
-          if(subMatch){
-            console.log(`match sub route: ${sub.routeTemplate||sub.path} -> ${curRoute.pathname}` )
-            return true;
-          }
-          return false;
-        });
-      }
-      if(match){
-        console.log(`match route: ${routeTemplate||path} -> ${curRoute.pathname}` )
-        return true;
-      }
-    }
-    if(children){
-      for(let subMenu of children){
-        let match = GET_ROUTE_MENU(subMenu);
-        if(match){
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  const reloadOpenMenu=()=>{
-    for(let menuKey in MENU_KEY.current){
-      const topMenu = MENU_KEY.current[menuKey];
-      const match= GET_ROUTE_MENU(topMenu.source);
-      if(match){
-        let changeLeftMenu=false;//是否重新设置左侧导航菜单数据
-        if(selectedKeys[0] != menuKey){
-          changeLeftMenu= true;
-        }
-        if(!providerMenu.menus||providerMenu.menus.length<=0){
-          changeLeftMenu= true;
-        }
-        setSelectedKeys([menuKey]);
-        if(changeLeftMenu){
-          providerMenu.setMenus(topMenu.source.menus);
-        }
-        return;
-      }
-    }
-    setSelectedKeys([]);
-    providerMenu.setMenus([]);
-  }
-  useEffect(()=>{loadMenu()},[]);
-
-  useEffect(()=>{
-    reloadOpenMenu();
-  },[curRoute,menus]);
-
-
-
-  // 推出登录
-  const onAvatarClick = (e)=>{
-    if (e?.key === 'logout') {
-      app.logout();
-    }
-  }
-  const onHome=()=>{
-    navigate('/');
-  }
-  const onClickMenuItem=(e)=>{
-    const { item, key, keyPath, domEvent } = e;
-    const menuData = MENU_KEY.current[key];
-    const {path,source:{menus}} = menuData;
-    providerMenu.setMenus(menus);
-    if(path){
-      navigate(path)
-    }
-    setSelectedKeys([key])
-  }
-
-  return (
-    <section className={styles.topMenu}>
-      <div className={styles.left}>
-        <span className={styles.title} onClick={onHome}>后管系统</span>
-      </div>
-      
-      <div className={styles.center}>
-        {
-          menus&&menus.length>1&&
-          <Menu 
-            items={menus}
-            mode="horizontal" 
-            onClick={onClickMenuItem}
-
-            selectedKeys={selectedKeys}
-            className={styles.menu}
-          />
-        }
-      </div>
-      <div className={styles.right}>
-        
-        <span className={styles.username}>Hi,{app?.user?.username||''}!</span>
-        <Dropdown overlay={(
-          <Menu onClick={onAvatarClick} className={styles.avatarMenu}>
-            <Menu.Item key="user">
-            <UserOutlined />
-            用户名
-            </Menu.Item>
-            
-            <Menu.Item key="logout">
-              <LogoutOutlined />
-              退出登录
-            </Menu.Item>
-          </Menu>
-        )}>
-          <img className={styles.avatar} src={imgAvatar}/>
-        </Dropdown>
-        
-      </div>
-      
-    </section>
-  )
-}
-
-export default TopMenu;

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

@@ -1,91 +0,0 @@
-import {waitTime,REP_SUCCESS} from './utils.js';
-import qs from 'qs';
-import {GET_REQUEST} from './utils';
-
-async function GET_MENU(req,res){
-  await waitTime();
-  const MenuRoute=[
-    {
-      name:'顶部菜单',
-      url:'/video',
-      children:[
-        {
-          name:'内容管理',
-          icon:'AppstoreOutlined',
-          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'
-        },
-      ]
-    }
-  ]
-  return {code:0,data:MenuRoute}
-}
-
-async function LOGIN(req,res){
-  await waitTime();
-  return {code:0,data:{
-    authorities:['admin'],
-    token:'token',
-    userId:'1',
-    username:'cx',
-    realName:'cx',
-    name:'cx'
-
-  }}
-}
-
-async function KSSOLOGIN(req,res){
-  await waitTime();
-  return {code:0,data:{
-    authorities:['admin'],
-    token:'token',
-    userId:'1',
-    username:'cx',
-    realName:'cx',
-    name:'cx'
-
-  }}
-}
-
-
-async function LOGOUT(req,res){
-  await waitTime();
-  return {code:0}
-}
-
-
-LOGOUT
-export default {
-  '/api/menu/nav':{get:GET_MENU},
-  '/api/login':{post:LOGIN},
-  '/api/ksso/auth':{post:KSSOLOGIN},
-  '/api/logout':{post:LOGOUT},
-
-
-}

package/templates/template_admin/public/src/mock/user.js

@@ -1,70 +0,0 @@
-import {waitTime,REP_SUCCESS} from './utils.js';
-import qs from 'qs';
-import {GET_REQUEST} from './utils';
-async function GET_USER(req,res){
-  const query = qs.parse(req.url.split('?')[1]);
-  const {name} = query;
-  await waitTime();
-  return {code:0,data:{name}}
-}
-
-async function SET_USER(req,res){
-  const query = JSON.parse(req.body);
-  const {name,age}= query;
-  await waitTime();
-  
-  return {
-    "code": 0,
-    "data":{name,age}
-  }
-}
-
-async function GET_USER_LIST(req,res){
-  const {current,pageSize} = GET_REQUEST(req,res);
-  const MAX_TOTAL=98;
-  let data=[];
-  let idx=(current-1)*pageSize;
-
-  for(let i=0;i<pageSize;i++){
-    if(idx>=MAX_TOTAL)break;
-    data.push({
-      name:`${idx++}小朋友`
-    })
-  }
-  return {
-    code:0,
-    data:{
-      list:data,
-      page:{
-        pageNum:current,
-        pageSize:pageSize,
-        total:MAX_TOTAL
-      }
-    }
-  }
-}
-
-async function GET_USER_TYPE(req,res){
-  let data=[];
-  for(let i=0;i<10;i++){
-    data.push({
-      label:`标题${i}`,
-      value:i,
-      key:`title${i}`
-    })
-  }
-  return {
-    code:0,
-    data:data
-  }
-}
-
-
-
-
-export default {
-  '/userType':{get:GET_USER_TYPE},
-  '/userList':{get:GET_USER_LIST},
-  '/user':{get:GET_USER,post:SET_USER},
-
-}