kn-cli 1.0.91 → 1.0.93

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

@@ -1,9 +1,15 @@
+// @ts-ignore
 import Axios from 'axios';
+// @ts-ignore
 import qs from 'qs';
+// @ts-ignore
 import { message } from 'antd';
+
 import { toHref, exportExcel } from '@/utils';
 import { CHANGE_TOKEN, setRefreshToken ,toLogin} from './token';
 const axios = Axios.create();
+
+// @ts-ignore
 console.log(`========API_HOST:${API_HOST}========`);
 
 const tokenMode='header';//header,cookie
@@ -95,10 +101,23 @@ axios.interceptors.response.use(
   }
 );
 
-
+/**
+ * @typedef RequestOptions 发送请求的扩展信息
+ * @property {number|boolean} ttl=false - 接口缓存周期，开启后默认为2秒，ttl单位为毫秒
+ * @property {string|boolean} noInterceptors=false - 关闭拦截类型，'all'为关闭包括401、403在内的所有异常，默认情况下只拦截response.code不为0的情况
+ * 
+ */
 
 
 let buffer = {};
+/**
+ * @function
+ * @description 发送一个GET请求
+ * @param {string} url - 请求地址 
+ * @param {Object} [param] - 请求的参数
+ * @param {RequestOptions} [options] - 扩展参数
+ * @returns {Promise<Object>}
+ */
 export async function GET_DEFAULT(url, param, options) {
   if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
   let now = Date.now();
@@ -131,6 +150,13 @@ export async function GET_DEFAULT(url, param, options) {
   return response && response.data ? response.data : null;
 }
 
+/**
+ * @function
+ * @description 发送一个GET请求
+ * @param {string} url - 请求地址 
+ * @param {Object} [param] - 请求的参数
+ * @returns {Promise<Object>}
+ */
 export async function GET_DEFAULT_CROSS(url, param) {
   if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
 
@@ -143,6 +169,14 @@ export async function GET_DEFAULT_CROSS(url, param) {
   });
   return response && response.data ? response.data : null;
 }
+
+/**
+ * 导出EXCEL
+ * @param {string} url - 接口地址
+ * @param {any} param - 接口参数
+ * @param {any} user - 用户信息 
+ * @returns {Promise} 
+ */
 export async function EXPORT_DEFAULT_CROSS(url, param, user) {
   if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
 
@@ -158,7 +192,14 @@ export async function EXPORT_DEFAULT_CROSS(url, param, user) {
   exportExcel(response, user);
 }
 
-export async function POST_DEFAULT(url, params, method, options) {
+/**
+ * 发送一个POST请求
+ * @param {string} url - 请求地址 
+ * @param {Object} [params] - 请求的参数
+ * @param {RequestOptions} [options] - 扩展参数
+ * @returns {Promise<Object>}
+ */
+export async function POST_DEFAULT(url, params, options) {
   let data = params;
   // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
   // if (typeof params === 'string') {
@@ -168,7 +209,7 @@ export async function POST_DEFAULT(url, params, method, options) {
   // }
   // let token= await GET_TOKEN();
   let response = await axios({
-    method: method || 'POST',
+    method: 'POST',
     url: url,
     data:{
       // _token:token,
@@ -180,6 +221,12 @@ export async function POST_DEFAULT(url, params, method, options) {
   return response && response.data ? response.data : null;
 }
 
+/**
+ * 发送一个POST请求
+ * @param {string} url - 请求地址 
+ * @param {Object} [params] - 请求的参数
+ * @returns {Promise<Object>}
+ */
 export async function POST_DEFAULT_CROSS(url, params) {
   // let token= await GET_TOKEN();
 
@@ -246,13 +293,10 @@ export function FORMAT_RESPONSE_NO_PAGINATION(response){
   return req;
 }
 
-/**
- * 
- * @param {} error 业务接口401时，用 refreshToken 重新获取token，再重试当前接口
- * @returns 
- */
+
 const refreshAndRetry = async (error) => {
   if (!localStorage.getItem('refreshToken')) {
+    // @ts-ignore
     if(toLogin)toLogin(error.response.data.data.auth_url);
     return;
   }

package/templates/template_oa_jwt/public/src/services/token.js

@@ -1,5 +1,8 @@
+// @ts-ignore
 import Axios from 'axios';
+// @ts-ignore
 import { message } from 'antd';
+
 import { toHref } from '@/utils';
 const axios = Axios.create();
 
@@ -30,6 +33,7 @@ export const setRefreshToken = (value) => {
 
 export let logout = ()=>{}
 export const setLogout=(fn)=>{
+  // @ts-ignore
   window.logout=fn;
   logout=fn;
 }
@@ -71,11 +75,13 @@ axios.interceptors.response.use(
     }
     console.log('token error：', JSON.stringify(error));
     const url = error.response.data.data.auth_url;
+    // @ts-ignore
     if(toLogin)toLogin(url);
     return;
     // jwt失效
     if (error.response.status === 401) {
       const url = error.response.data.data.auth_url;
+      // @ts-ignore
       if(toLogin)toLogin(url);
       return;
     } else if (error.response.status === 403) {
@@ -127,6 +133,7 @@ async function POST_DEFAULT_CROSS(url, params) {
  */
 export async function CHANGE_TOKEN(params){
   let values = params ? params : {refresh_token: refreshToken};
+  // @ts-ignore
   const res = await POST_DEFAULT_CROSS(`${KSSO_HOST}/oauth/ksso/exchange`, values);
   return res;
 }

package/templates/template_oa_jwt/public/src/utils/index.js

@@ -1,10 +1,19 @@
+// @ts-ignore
 import moment from 'moment';
 
+
+/**
+ * 打开一个第三方链接
+ * @param {string} link - 链接地址
+ * @param {string} [target='_blank'] - 打开方式,_blank:新窗口打开 
+ */
 export const openLink = (link, target = '_blank') => {
   let domLink = document.createElement('a');
   domLink.href = link;
   domLink.setAttribute('target', target);
+  // @ts-ignore
   domLink.style.opacity = 0;
+  // @ts-ignore
   domLink.style.zIndex = -999;
   document.body.appendChild(domLink);
   domLink.click();
@@ -13,50 +22,60 @@ export const openLink = (link, target = '_blank') => {
   }, 200);
 }
 
+/**
+ * 判断当前是否为移动端
+ * @returns {boolean}
+ */
 export const isMobile = () => {
   return navigator.userAgent.match(
     /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
-  )
+  )?true:false
 }
 
-export const toHref = (url, replace, newWindow) => {
-  if (window.knFeishu) {
-    window.knFeishu.ToHref(url, replace, newWindow);
-    return;
-  }
-  if (newWindow) {
-    window.open(url);
-    return;
-  }
-  if (replace) {
-    location.replace(url);
-    return;
-  }
-  location.href = url;
-};
 
-export const jumpUrl = (url, options = {}) => {
-  const { replace, newWindow, reload } = options;
-  if (reload) {
+/**
+ * 跳转URL-兼容飞书
+ * @param {string} url - 链接地址
+ * @param {object} [options] - 参数
+ * @param {boolean} [options.replace] - 是否要覆盖当前URL记录
+ * @param {boolean} [options.newWindow] - 是否新窗口中打开
+ * @param {boolean} [options.reload] - 是否重载当前页面
+ * 
+ * 
+ */
+export const jumpUrl=(url,options={})=>{
+  const {replace=false,newWindow=false,reload=false}= options;
+  if(!reload){
+    // @ts-ignore
+    if(window.knFeishu){
+      // @ts-ignore
+      window.knFeishu.ToHref(url,replace,newWindow);
+      return;
+    }
+  }
+  
+  if(reload){
     location.reload();
     return;
   }
-  if (replace) {
+  if(replace){
     location.replace(url);
     return;
   }
-  if (newWindow) {
+  if(newWindow){
     window.open(url);
     return;
   }
-  location.href = url;
+  location.href=url;
 
 }
 
 
 // 关闭页面
 export const closeWindow = () => {
+  // @ts-ignore
   if (window.knFeishu && window.knFeishu.closeWindow) {
+    // @ts-ignore
     window.knFeishu.closeWindow();
   } else {
     if (window.close) {
@@ -66,6 +85,26 @@ export const closeWindow = () => {
 };
 
 
+
+export const toHref = (url, replace, newWindow) => {
+  // @ts-ignore
+  if (window.knFeishu) {
+    // @ts-ignore
+    window.knFeishu.ToHref(url, replace, newWindow);
+    return;
+  }
+  if (newWindow) {
+    window.open(url);
+    return;
+  }
+  if (replace) {
+    location.replace(url);
+    return;
+  }
+  location.href = url;
+};
+
+
 export function formatMoney(s, n = 2) {
   if (typeof s === 'undefined' || s === '') {
     return '-'
@@ -99,6 +138,7 @@ export const isEditAuth = (user) => {
 }
 
 export const exportExcel = (response, user) => {
+  // @ts-ignore
   const blob = new Blob([response.data], { type: `${type},charset=UTF-8` });
   const disposition = response.headers.get('content-disposition');
   const fileName = `管理系统-${user.usr_username}-${moment().format('YYYY-MM-DD')}.xlsx`;

package/templates/template_offcial/.gitignore

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

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_oa/public/src/components/Auth/index.jsx

@@ -1,44 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import ProviderApp from '@/provider/app';
-import { useNavigate } from 'react-router-dom';
-import {useLoading} from '@/hooks';
-
-export const AuthShow=(props)=>{
-  const {name} = props;
-  const app = ProviderApp.useContainer();
-  if(app?.user?.authorities?.includes(name)){
-    return props.children;
-  }
-  return <></>
-}
-
-export const AuthLogin=(props)=>{
-  const navigate = useNavigate();
-  const [pass,setPass] = useState(false)
-  const app = ProviderApp.useContainer();
-  const loading = useLoading();
-
-  const check=async ()=>{
-    loading.setLoading(true);
-    console.log(`[Auth]检查用户登录态`)
-    const req =await app.isLogin();
-    loading.setLoading(false);
-    if(req){
-      console.log(`[Auth]检查用户登录态成功`)
-      setPass(true);
-    }else{
-      console.log(`[Auth]检查用户登录态失败`)
-      setPass(false);
-      navigate('/login');
-    }
-  }
-  useEffect(check,[]);
-
-  if(pass){
-    return props.children;
-  }
-  return <>检查登录态中...</>
-}
-
-
-export default {AuthShow,AuthLogin};