kn-cli 1.0.91 → 1.0.92

package/templates/template_oa_jwt/public/src/provider/app.jsx

@@ -1,9 +1,29 @@
+// @ts-ignore
 import {  useState,useMemo, useEffect } from 'react';
+// @ts-ignore
 import {  useSearchParams,useNavigate } from 'react-router-dom';
+// @ts-ignore
+import { createContainer } from "unstated-next"
+
 import {setLogout,setToLogin,setRefreshToken} from '@/services/token';
 import { setJwt } from '@/services';
 
-import { createContainer } from "unstated-next"
+
+
+/**
+ * @typedef AppContaniner
+ * @property {boolean} loading - 当前是否是加载状态
+ * @property {(open:boolean)=>void} setLoading - 设置加载状态
+ * @property {object} nav - 导航栏配置
+ * @property {(option:object)=>void} setNav - 设置导航栏配置
+ * @property {()=>Promise} logout - 注销病退回登录界面
+ * @property {(redirectUrl:string)=>Promise} toLogin - 登录并跳转
+ * @property {(user:object)=>void} setUser - 注销病退回登录界面
+ * @property {object} user - 注销病退回登录界面
+ * 
+ */
+
+
 const useApp=() =>{
   const [search] = useSearchParams();
   const navigate= useNavigate();
@@ -61,6 +81,15 @@ const useApp=() =>{
   return action
 }
 
+/**
+ * @typedef {object} AppProvider
+ * @property {function():AppContaniner} useContainer
+ * @property {React.ComponentType<any>} Provider
+ */ 
+
+/**
+ * @type {AppProvider}
+ */
 const App = createContainer(useApp);
 
 export default App;

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

@@ -1,8 +1,10 @@
+// @ts-ignore
 import React,{Suspense} from 'react';
+// @ts-ignore
 import { Routes, Route, Navigate } from 'react-router-dom';
 
-import { LayoutBasic, Layout } from '@/components/Layout';
-import PageLoading from '@/components/Page/PageLoading';
+import { LayoutBasic, Layout } from '@/components/layout';
+import PageLoading from '@/components/page/pageLoading';
 
 import Login from '@/pages/login';
 // import {AuthLogin} from '@/components/Auth';

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

@@ -1,11 +1,14 @@
+// @ts-ignore
+import axios from 'axios';
 
 import {GET_TOKEN,GET_DEFAULT_CROSS} from '@/services';
-import axios from 'axios';
+
 
 /**
  * 获取员工列表
  */
 export async function GET_STAFF_LIST() {
+  // @ts-ignore
   let ret = await GET_DEFAULT_CROSS(`${OA_HOST}/common/getNewUserList`);
   return ret;
   // let response = await axios({
@@ -23,6 +26,7 @@ export async function GET_STAFF_LIST() {
  * 所有部门信息
  */
 export async function GET_DEP_LIST() {
+  // @ts-ignore
   return GET_DEFAULT_CROSS(`${OA_HOST}/common/getBenefitDept`);
 }
 
@@ -31,6 +35,7 @@ export async function GET_DEP_LIST() {
  * @returns 
  */
 export function GET_COMPANY_LIST(){
+  // @ts-ignore
   return GET_DEFAULT_CROSS(`${OA_HOST}/filestore/list?status=1`);
 }
 
@@ -51,6 +56,7 @@ export async function POST_IMPORT_EXCEL(url, file, onProgress) {
     url: url,
     data: formdata,
     onUploadProgress: (e) => {
+      // @ts-ignore
       onProgress({ percent: `${e.loaded}/${e.total}` * 100 });
     },
   });
@@ -61,6 +67,7 @@ export async function POST_IMPORT_EXCEL(url, file, onProgress) {
  * 获取下载文件的url路径
  */
 export function GET_DOWNLOAD_FILE(s_name) {
+  // @ts-ignore
   return `${OA_HOST}/file/download?name=${s_name}`;
 }
 
@@ -81,6 +88,7 @@ export async function UPLOAD_FILE(file, param, onProgress) {
 
   let response = await axios({
     method: 'post',
+    // @ts-ignore
     url: `${OA_HOST}/file/upload`,
     data: formdata,
     xsrfCookieName: '',
@@ -88,6 +96,7 @@ export async function UPLOAD_FILE(file, param, onProgress) {
     withCredentials: true,
 
     onUploadProgress: (e) => {
+      // @ts-ignore
       let per = parseFloat((e.loaded / e.total) * 100).toFixed(0);
       onProgress({ percent: per });
     },
@@ -111,6 +120,9 @@ export async function UPLOAD_FILE(file, param, onProgress) {
  * types:array|string,['png','gif']|'png' 类型
  */
 export function CHECK_FILE_TYPE(types, filename) {
+  /**
+   * @type RegExp|string
+   */
   let reg = '';
 
   if (types.constructor === Array) {

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_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};

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

@@ -1,150 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import IconFont from '@/components/IconFont';
-
-import Popup from '@/components/Popup';
-
-import styles from './index.less';
-import { Button } from 'antd';
-
-const Dialog = (props) => {
-  async function onClose() {
-    if (props.onClose) {
-      let ret = await props.onClose();
-      if (ret) {
-        props.destory();
-      }
-    } else {
-      props.destory();
-    }
-  }
-  async function onOk() {
-    if (props.onOk) {
-      let ret = await props.onOk();
-      if (ret) {
-        props.destory();
-      }
-    } else {
-      props.destory();
-    }
-  }
-  return (
-    <section className={styles.body}>
-      <div className={styles.mask} />
-      <section className={styles.wrap}>
-        <div className={styles.header}>
-          <span>{props.title}</span>
-          <IconFont icon='close' className={styles.close} onClick={onClose} />
-        </div>
-
-        {props.children}
-
-        <div className={styles.footer}>
-          <Button type='primary' onClick={onOk}>
-            {props.okText || '确认'}
-          </Button>
-          {props.noCancel ? (
-            ''
-          ) : (
-            <Button onClick={onClose} style={{ marginLeft: '10px' }}>
-              {props.cancelText || '取消'}
-            </Button>
-          )}
-        </div>
-      </section>
-    </section>
-  );
-};
-
-export const ShowDialog = (props) => {
-  return new Promise((reslove) => {
-    let popup = Popup(reslove);
-    ReactDOM.render(
-      <Dialog
-        title={props.title}
-        destory={popup.destory}
-        onOk={props.onOk}
-        okText={props.okText}
-        cancelText={props.cancelText}
-        noCancel={props.noCancel}
-        onClose={props.onClose}
-      >
-        {props.component}
-      </Dialog>,
-      popup.dom
-    );
-  });
-};
-
-export const ShowConfirm = async (props) => {
-  if (typeof props === 'string') {
-    props = { content: props };
-  }
-
-  let result = false;
-  await ShowDialog({
-    title: props.title || '注意',
-    okText: props.okText || '确认',
-    cancelText: props.cancelText || '取消',
-    noCancel: typeof props.noCancel !== 'undefined' ? props.noCancel : false,
-    onClose: async () => {
-      result = false;
-      return Promise.resolve(true);
-    },
-    onOk: async () => {
-      result = true;
-      return Promise.resolve(true);
-    },
-    component: (
-      <div className={styles.confirmWrap}>
-        {props.content}
-      </div>
-    ),
-  });
-  return result;
-};
-
-const Alert = (props) => {
-  function onOk() {
-    if (props.onOk) props.onOk();
-    props.destory();
-  }
-  return (
-    <section className={styles.body }>
-      <div className={styles.mask} />
-      <section className={styles.wrapAlert}>
-        <div className={styles.alertContent}>
-          <div className={props.type === 'success' ? styles.iconSuccess : styles.iconError} />
-          <span>{props.content}</span>
-        </div>
-        <div className={styles.alertFooter}>
-          <span onClick={onOk}>{props.okText || '确认'}</span>
-        </div>
-      </section>
-    </section>
-  );
-};
-
-export const ShowAlert = (props) => {
-  if (props.constructor === String) {
-    props = { content: props };
-  }
-  return new Promise((reslove) => {
-    let popup = Popup(reslove);
-
-    ReactDOM.render(
-      <Alert destory={popup.destory} type={props.type || 'success'} onOk={props.onOk} content={props.content} />,
-      popup.dom
-    );
-  });
-};
-
-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/Footer/index.jsx

@@ -1,17 +0,0 @@
-import React from 'react';
-import styles from './index.less';
-
-const Footer = (props) => {
-  return (
-    <section className={styles.footer}>
-      <hgroup>
-        <p>Copyright@2017 版权所有 kingnet.com,All Rights Reserved 沪ICP备10215773号-1</p>
-        <p>本系统现仅支持Chrome和Safari浏览器，其他浏览器可能会出现兼容性问题。</p>
-        <a href='http://oa.test.com/versionlog/view' target='_blank' style={{ marginTop: '10px' }}>
-          版本日志
-        </a>
-      </hgroup>
-    </section>
-  );
-};
-export default Footer;

package/templates/template_oa/public/src/components/Footer/index.less

@@ -1,28 +0,0 @@
-@import '~@/_variable.less';
-
-.footer {
-  position: absolute;
-  bottom: 0;
-
-  box-shadow: 0px -2px 3px #dde3e7;
-  min-height: var(--height-footer);
-  width: 100%;
-  background-color: white;
-  hgroup {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    min-height: var(--height-footer);
-  }
-  p {
-    color: #9bb5c9;
-    font-size: 12px;
-    margin-bottom: 0;
-  }
-  a {
-    color: rgb(119, 119, 119);
-    font-size: 14px;
-  }
-}

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

@@ -1,10 +0,0 @@
-import React from "react";
-import styles from'./index.less';
-
-const IconFont=(props)=>{
-  const {icon,className,...others} = props;
-  return (
-    <span {...others} className={`iconfont icon-${icon} ${styles.iconBox} ${className||''}`} ></span>
-  )
-}
-export default IconFont;