kn-cli 1.0.93 → 1.0.95

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

@@ -0,0 +1,54 @@
+
+
+import {GET_DEFAULT,POST_DEFAULT,API_ROOT,RESPONSE_STRUCT} from './index.js';
+
+
+
+export function GET_LIST(params) {
+  return  GET_DEFAULT(`${API_ROOT}/api/demo/list`,params);
+}
+export function GET_DETAIL(params) {
+  return  GET_DEFAULT(`${API_ROOT}/api/demo/detail`,params);
+}
+export function CREATE(params) {
+  return POST_DEFAULT(`${API_ROOT}/api/demo/create`,params)
+}
+export function UPDATE(params) {
+  return POST_DEFAULT(`${API_ROOT}/api/demo/update`,params)
+}
+export function GET_USER_INFO(){
+  return  GET_DEFAULT(`${API_ROOT}/api/demo/userInfo`);
+}
+
+export function GET_ENUM_TYPE(){
+  return  GET_DEFAULT(`${API_ROOT}/api/demo/enumType`);
+}
+
+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;
+};
+
+
+export function Login(params={
+  username:'',
+  password:'',
+}){
+  return POST_DEFAULT(`${API_ROOT}/api/demo/login`,params)
+
+}
+
+export function KssoLogin(params={
+  code:'',
+  redirectUri:'',
+}){
+  return POST_DEFAULT(`${API_ROOT}/api/demo/ksso/auth`,params)
+
+}

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

@@ -13,6 +13,15 @@ export const API_ROOT = API_HOST;
 const tokenMode='header';//header,cookie
 const tokenName='Authorization';
 
+
+
+export const RESPONSE_STRUCT={
+  CODE:'code',
+  MSG:'msg',
+  DATA:'data',
+  PAGINATION:'pagination'
+}
+
 let Modal = {
   error: (options) => {
     message.error(options.content);

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

@@ -0,0 +1,51 @@
+
+/**
+ * 格式化为货币格式
+ * @param {string|number} value - 数值
+ * @param {number} decimal=2 - 格式化到小数点后几位
+ * @param {object} extra - 扩展参数
+ * @returns {string} 格式化后的字符串 
+ */
+export const formatMoney=(value,decimal=2,extra={noValue:'-',carry:false})=>{
+  const {noValue='-',carry=false}=extra;
+  try{
+    value = parseFloat(`${value}`);
+    if(Number.isNaN(value)){
+      value='';
+      return;
+    }
+    if(carry){
+      value = value.toFixed(decimal);
+    }else{
+      value = value.toFixed(decimal+1);
+      value = value.slice(0,-1);
+    }
+  }
+  catch(ex){
+    value='';
+  }finally{
+    if(value===''){
+      return noValue||'';
+    }
+    return `${value}`;
+  }
+}
+
+export const formatText=(value,extra={noValue:'-'})=>{
+  const {noValue='-'}= extra;
+  if(!value){
+    if(noValue)return noValue;
+  }
+  return value;
+}
+
+
+export const formatPhone=(value,extra={noValue:'-'})=>{
+  const {noValue='-'}= extra;
+  if(!value){
+    if(noValue)return noValue;
+  }
+  return value.replace(/(\d)(?=(\d{4})+$)/g, '$1-');
+}
+
+

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/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},
-
-}

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

@@ -1,84 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import {usePaginationWithForm} from '@/hooks/index';
-import {GET_LIST} from '@/services/video';
-// @ts-ignore
-import {Table,Pagination,Form,Input,Button} from 'antd';
-
-const Page = () => {
-  const [form] = Form.useForm();
-
-  const request = usePaginationWithForm({
-    service:GET_LIST,
-    pagination:{pageSize:10},
-    form:form
-  })
-
-  useEffect(()=>{
-    request.update();
-  },[])
-
-  const columns=[{
-    dataIndex:'id',
-    title:'id',
-    render:(_,record,idx)=>{
-      return record.id;
-    }
-  },{
-    dataIndex:'value',
-    title:'数据值',
-    render:(_,record,idx)=>{
-      return record.value||'-'
-    }
-  }];
-
-  useEffect(()=>{
-    console.log(request)
-  },[request])
-
-  const getDataSource=()=>{
-    if(request?.data?.length>0){
-      let req=request?.data[request.pagination.current-1]||[];
-      return req;
-    }
-    return [];
-  }
-
-  const onPageChange=(current,pageSize)=>{
-    debugger;
-    request.update({pagination:{current,pageSize}})
-  }
-  const onSearch=()=>{
-    request.update();
-  }
-  const onReset=()=>{
-    request.reset();
-  }
-  return (
-    <section className='wrap-space'>
-      <section style={{display:'flex'}}>
-        <Form form={form} >
-          <Form.Item name='keywords' label='关键字'>
-            <Input />
-          </Form.Item>
-        </Form>
-        <Button onClick={onSearch} type='primary' style={{margin:'0 12px'}}>查询</Button>
-        <Button onClick={onReset}>重置</Button>
-      </section>
-      <Table 
-        rowKey={'id'}
-        loading={!request?.data?.length>0}
-        columns={columns}
-        dataSource={getDataSource()}
-        pagination={false}
-      />
-      <Pagination 
-        current={request?.pagination?.current} 
-        pageSize={request?.pagination?.pageSize}
-        onChange={onPageChange}
-        total={request?.pagination?.total}
-      />
-    </section>
-  )
-}
-
-export default Page;

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

@@ -1,12 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-const Page = () => {
-  const query = useParams();
-
-  return (
-    <p>order</p>
-  )
-}
-
-export default Page;

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

@@ -1,12 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-const Page = () => {
-  const query = useParams();
-
-  return (
-    <p>permission</p>
-  )
-}
-
-export default Page;

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

@@ -1,12 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-const Page = () => {
-  const query = useParams();
-
-  return (
-    <p>suggest</p>
-  )
-}
-
-export default Page;

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

@@ -1,18 +0,0 @@
-// @ts-ignore
-import React from 'react';
-
-import Link from '@/components/link';
-
-/**
- * @returns {JSX.Element}
- */
-const Page = () => {
-  return (
-    <div>
-      <p>用户信息页：用户已登录才可以看到本页，不然会跳转登录页面</p>
-      <Link href={'/'}>点击返回首页</Link>
-    </div>
-  )
-}
-
-export default Page;