kn-cli 1.0.107 → 1.0.109

package/templates/template_admin/webpack.api.js

@@ -29,6 +29,30 @@ const API_PROXY= {
       '^/api': '/', // rewrite path
     },
   },
+  '/devapi/**':{
+    target:'https://dev-zeus.kingnet.com/',
+    changeOrigin: true,
+    logLevel: 'debug',
+    pathRewrite: {
+      '^/devapi': '/', // rewrite path
+    },
+  },
+  '/preapi/**': {
+    target:'https://pre-zeus.kingnet.com/',
+    changeOrigin: true,
+    logLevel: 'debug',
+    pathRewrite: {
+      '^/preapi': '/', // rewrite path
+    },
+  },
+  '/prodapi/**': {
+    target:'https://zeus.kingnet.com/',
+    changeOrigin: true,
+    logLevel: 'debug',
+    pathRewrite: {
+      '^/prodapi': '/', // rewrite path
+    },
+  },
 };
 
 // @ts-ignore

package/templates/template_admin/public/src/pages/components/select/account/index.jsx

@@ -1,114 +0,0 @@
-
-import React, { useEffect, useState } from 'react';
-// @ts-ignore
-import { Select } from 'antd';
-import {GET_LIST} from '@/services/demo';
-
-
-/**
- * 账号选择
- * 数据来源：服务设置-账号管理-所有枚举
- * @param {object} props 
- * @param {'single'|'multiple'} [props.mode='single'] - 单选/多选模式
- * @param {(value:string|string[],items:object[])=>void} [props.onChange] - 选择发生变化时的回调
- * @param {string|string[]} [props.value] - 选择发生变化时的回调
- * @param {boolean} [props.withData=false] - 返回的数据是否包含原始用户数据
- * @param {object} [props.style={}] - 样式
- * @param {string} [props.placeholder] - 提示
- * @param {boolean} [props.allowClear=falsse] - 一键删除按钮
- * 
- * 
- * 
- * @returns {JSX.Element}
- */
-const SelectAccount=(props)=>{
-  const {mode='single',value:_value,onChange,withData=false,style:_style={},placeholder='',allowClear=false} = props;
-  const [list,setList]= useState([]);
-
-  const [value,setValue]=useState(mode=='single'?'':[]);
-
-  const init = async ()=>{
-    const req = await GET_LIST();
-    if(req?.code==0){
-      let users= req.data.map(user=>{
-        const {id,name} = user;
-        
-        // return <Select.Option value={`${id}`} data={user}>{`${name}(${account})`}</Select.Option>
-        return {
-          label:`${name}`,
-          value:`${id}`,
-          data:user
-        }
-      })
-      setList(users);
-    }else{setList([])}
-  }
-
-
-  const onUserChange=(newValue,options)=>{
-    if(onChange)onChange(newValue,options);
-  }
-
-  const onFilter=(input,option)=>{
-    const {label,value}= option;
-    if( `${label}`.toLocaleLowerCase().indexOf(input.toLocaleLowerCase()) >=0 ){
-      return true;
-    }
-    return false;
-  }
-
-  // useEffect(()=>{
-  //   if(list&&list.length>0){
-  //     if(mode=='single'){
-  //       let find = list.filter(user=>user.value == value);
-  //       if(!find || !find[0]){
-  //         if(onChange)onChange(undefined);
-  //       }
-  //     }else{
-  //       let newValue=[];
-  //       value.forEach(id=>{
-  //         let find = list.filter(user=>user.value == id);
-  //         if(find && find[0]){
-  //           newValue.push(id);
-  //         }
-  //       })
-  //       if(onChange)onChange(newValue);
-
-  //     }
-  //   }
-  // },[list])
-
-  useEffect(()=>{
-    init();
-  },[])
-  useEffect(()=>{
-    if(!_value){
-      setValue(undefined);
-      return;
-    }
-    let req;
-    if(mode=='multiple' && Array.isArray(_value)){
-      req= _value.map(id=>`${id}`)
-    }else{
-      req = `${_value}`
-    }
-    setValue(req)
-  },[_value]);
-
-  return (
-    <Select
-      style={{..._style}}
-      placeholder={placeholder}
-      allowClear={allowClear?true:false}
-      // @ts-ignore
-      mode={mode}
-      showSearch
-      value={value}
-      options={list}
-      onChange={onUserChange}
-      filterOption={onFilter}
-    />
-  );
-}
-
-export default SelectAccount;

package/templates/template_admin/public/src/pages/components/select/device/index.jsx

@@ -1,83 +0,0 @@
-
-import React, { useEffect, useState } from 'react';
-// @ts-ignore
-import { Select } from 'antd';
-import {DEVICE_ENUM} from '@/services/device';
-
-
-
-/**
- * 设备选择框
- * 数据来源：手机管理-所有枚举
- * @param {object} props 
- * @param {'single'|'multiple'} [props.mode='single'] - 单选/多选模式
- * @param {(value:string|string[])=>void} [props.onChange] - 选择发生变化时的回调
- * @param {string|string[]} [props.value] - 选择发生变化时的回调
- * @param {object} [props.deviceType={}] - 调用枚举接口可用的传参
- * 
- * @returns {JSX.Element}
- */
-const SelectDevice=(props)=>{
-  const {mode='single',value:_value,deviceType={},onChange} = props;
-  const [list,setList]= useState([]);
-
-  const [value,setValue]=useState(mode=='single'?'':[]);
-
-  const init = async ()=>{
-    const req = await DEVICE_ENUM(deviceType);
-    if(req?.code==0){
-      let devices= req.data.map(device=>{
-        const {id,title} = device;
-        let strId = `${id}`.padStart(2,'0');
-        return {
-          label:`[${strId}]${title}`,
-          value:`${id}`,
-          data:device
-        }
-      })
-      setList(devices);
-    }else{setList([])}
-  }
-  const onDeviceChange=(newValue)=>{
-    if(onChange)onChange(newValue);
-  }
-
-  const onFilter=(input,option)=>{
-    const {label,value}= option;
-    if( `${label}`.indexOf(input) >=0 ||
-      `${value}`.indexOf(input) >=0 
-    ){
-      return true;
-    }
-    return false;
-  }
-
-  useEffect(()=>{
-    init();
-  },[])
-  useEffect(()=>{
-    if(!_value){
-      setValue(mode=='multiple'?[]:'');
-      return;
-    }
-    let req;
-    if(mode=='multiple' && Array.isArray(_value) ){
-      req= _value.map(id=>`${id}`)
-    }else{
-      req = `${_value}`
-    }
-    setValue(req)
-  },[_value]);
-  return (
-    <Select
-      mode={mode}
-      showSearch
-      value={value}
-      options={list}
-      onChange={onDeviceChange}
-      filterOption={onFilter}
-    />
-  );
-}
-
-export default SelectDevice;

package/templates/template_admin/public/src/pages/components/select/groupUser/index.jsx

@@ -1,172 +0,0 @@
-
-import React, { useEffect, useState } from 'react';
-// @ts-ignore
-import { Select } from 'antd';
-
-import {USERGROUP_ENUM} from '@/services/authAdmin/userGroup';
-import {USER_ENUM} from '@/services/authAdmin/user';
-import {formatUserName} from '@/utils/format';
-
-const GROUP_PRE_NAME='group-';
-
-/**
- * 将组ID和用户ID，转义为 SelectGroupUser 能识别的id
- * @param {number[]|number|string|string[]} groupId - 组ID列表
- * @param {number[]|number|string|string[]} groupId - 用户ID列表
- * @returns {string[]}
- */
-const encodeValue=(groupId=[],userId=[])=>{
-  let req=[];
-  if(Array.isArray(groupId)){
-    req = groupId.map(id=>`${GROUP_PRE_NAME}${id}`);
-  }else{
-    if(groupId){
-      req.push(`${GROUP_PRE_NAME}${groupId}`)
-    }
-  }
-  if(Array.isArray(userId)){
-    let temp= userId.map(id=>`${id}`);
-    req=[...req,...temp]
-  }else{
-    if(userId){
-      req.push(`${userId}`)
-    }
-  }
-  return req;
-}
-
-/***
- * 将 SelectGroupUser 组件的值转义回需要提交给接口的 groupId和userId
- * @param {string[]|string} value - 当前选中的值
- * 
- * @returns {{groupId:string[],userId:string[]}} 
- */
-const decodeValue=(value)=>{
-  let groupId=[];
-  let userId=[];
-
-  if(Array.isArray(value)){
-    value.forEach(v=>{
-      if(`${v}`.indexOf(GROUP_PRE_NAME)>=0){
-        groupId.push(`${v}`.split(GROUP_PRE_NAME)[1]);
-      }else{
-        userId.push(`${v}`);
-      }
-    })
-  }else{
-    if(`${value}`.indexOf(GROUP_PRE_NAME)>=0){
-      groupId.push( `${value}`.split(GROUP_PRE_NAME)[1] );
-    }
-  }
-  return {groupId,userId}
-}
-
-export const convert = {setValue:encodeValue,getValue:decodeValue};
-
-/**
- * 选择用户组和用户的下拉选择框组件
- * @param {object} props 
- * @param {string|string[]} [props.value] - 值,值为组ID和用户ID混合的，组ID由group-前缀打头:['group-组id','用户id']，所以需要进行转义
- * @param {(newValue:string[])=>void} [props.onChange] - 值 
- * 
- * @returns {JSX.Element}
- */
-const SelectGroupUser=(props)=>{
-  const {value:_value,onChange=null}= props;
-
-  const [groupList,setGroupList] = useState([]);
-
-  const [value,setValue]=useState(_value||[]);
-
-  const init=async ()=>{
-    let req1 =  USERGROUP_ENUM();
-    let req2 =  USER_ENUM({status:1});
-
-    /**
-     * @type  {ServicesResponse}
-     */
-    let reqUserGroup = await req1;
-    /**
-     * @type  {ServicesResponse}
-     */
-    let reqUsers = await req2;
-    let list=[];
-    if(reqUserGroup?.code==0){
-      const groupList = reqUserGroup.data.map(group=>{
-        const {id,name:label}=group;
-        let groupId = `${GROUP_PRE_NAME}${id}`;
-        const groupInfo = {
-          label,
-          value:groupId,
-        }
-        return groupInfo;
-      });
-      list.push({
-        label:'用户组',
-        title:'group',
-        options:groupList
-      });
-    }
-    if(reqUsers?.code==0){
-      const userList = reqUsers.data.map(user=>{
-        const {id:value,name:label}=user;
-        let userName =  formatUserName(user);
-        const userInfo = {
-          label:userName,
-          value:`${value}`,
-          data:user
-        }
-        return userInfo;
-      });
-
-      list.push({
-        label:'用户',
-        title:'users',
-        options:userList
-      });
-    }
-    setGroupList(list);
-  }
-
-  const onGroupUserChange = (newValue) => {
-    console.log('onChange ', newValue);
-    if(onChange)onChange(newValue);
-  };
-
-  const onFilter=(input,option)=>{
-    if(option.options)return false;
-    const {label,value,data}= option;
-    if( `${label}`.indexOf(input) >=0 ||
-      `${value}`.indexOf(input) >=0 
-    ){
-      return true;
-    }
-    if(data && data.account.indexOf(input) >=0 ){
-      return true;
-    }
-    return false;
-  }
-
-  useEffect(()=>{
-    if(!_value){setValue([]);return;}
-    setValue(_value)
-  },[_value]);
-
-  useEffect(()=>{
-    init();
-  },[])
-
-  return (
-    <Select 
-      mode="multiple"
-      showSearch
-      value={value}
-      options={groupList}
-      onChange={onGroupUserChange}
-      filterOption={onFilter}
-      placeholder='请选择组名或用户名'
-    />
-  )
-}
-
-export default SelectGroupUser;

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

@@ -1,119 +0,0 @@
-
-import React, { useEffect, useState } from 'react';
-// @ts-ignore
-import { Select } from 'antd';
-import {USER_ENUM} from '@/services/authAdmin/user';
-
-/**
- * @typedef userEnumPrams
- * @property {1|0|''} status - 1启用中的 0禁用中的 空为所有
- */
-
-/**
- * 用户选择框
- * 数据来源：用户管理-所有枚举
- * @param {object} props 
- * @param {'single'|'multiple'} [props.mode='single'] - 单选/多选模式
- * @param {(value:string|string[],items:object[])=>void} [props.onChange] - 选择发生变化时的回调
- * @param {string|string[]} [props.value] - 选择发生变化时的回调
- * @param {userEnumPrams} [props.userType={status:1}] - 选择发生变化时的回调
- * @param {boolean} [props.withData=false] - 返回的数据是否包含原始用户数据
- * @param {object} [props.style={}] - 样式
- * @param {string} [props.placeholder] - 提示
- * @param {boolean} [props.allowClear=falsse] - 一键删除按钮
- * 
- * 
- * 
- * @returns {JSX.Element}
- */
-const SelectUser=(props)=>{
-  const {mode='single',value:_value,userType={status:1},onChange,withData=false,style:_style={},placeholder='',allowClear=false} = props;
-  const [list,setList]= useState([]);
-
-  const [value,setValue]=useState(mode=='single'?'':[]);
-
-  const init = async ()=>{
-    const req = await USER_ENUM(userType);
-    if(req?.code==0){
-      let users= req.data.map(user=>{
-        const {id,name,account,status} = user;
-        
-        // return <Select.Option value={`${id}`} data={user}>{`${name}(${account})`}</Select.Option>
-        return {
-          label:status==0?`${name}(${account})[已禁用]`:`${name}(${account})`,
-          value:`${id}`,
-          data:user
-        }
-      })
-      setList(users);
-    }else{setList([])}
-  }
-
-
-  const onUserChange=(newValue,options)=>{
-    if(onChange)onChange(newValue,options);
-  }
-
-  const onFilter=(input,option)=>{
-    const {label,value}= option;
-    if( `${label}`.indexOf(input) >=0 ){
-      return true;
-    }
-    return false;
-  }
-
-  // useEffect(()=>{
-  //   if(list&&list.length>0){
-  //     if(mode=='single'){
-  //       let find = list.filter(user=>user.value == value);
-  //       if(!find || !find[0]){
-  //         if(onChange)onChange(undefined);
-  //       }
-  //     }else{
-  //       let newValue=[];
-  //       value.forEach(id=>{
-  //         let find = list.filter(user=>user.value == id);
-  //         if(find && find[0]){
-  //           newValue.push(id);
-  //         }
-  //       })
-  //       if(onChange)onChange(newValue);
-
-  //     }
-  //   }
-  // },[list])
-
-  useEffect(()=>{
-    init();
-  },[])
-  useEffect(()=>{
-    if(!_value){
-      setValue(undefined);
-      return;
-    }
-    let req;
-    if(mode=='multiple' && Array.isArray(_value)){
-      req= _value.map(id=>`${id}`)
-    }else{
-      req = `${_value}`
-    }
-    setValue(req)
-  },[_value]);
-
-  return (
-    <Select
-      style={{..._style}}
-      placeholder={placeholder}
-      allowClear={allowClear?true:false}
-      // @ts-ignore
-      mode={mode}
-      showSearch
-      value={value}
-      options={list}
-      onChange={onUserChange}
-      filterOption={onFilter}
-    />
-  );
-}
-
-export default SelectUser;