kn-cli 1.0.90 → 1.0.92

package/templates/template_app/public/src/components/link/index.jsx

@@ -0,0 +1,39 @@
+// @ts-ignore
+import React  from 'react';
+
+import { openLink } from '@/utils';
+
+// @ts-ignore
+import styles from './index.less';
+
+/**
+ * 超链接组件
+ * @param {object} [props] 
+ * @param {JSX.Element|string} [props.children] - 子组件
+ * @param {string} [props.className] - 扩展类样式名称
+ * @param {Function} [props.onClick] - 点击链接的回调
+ * @param {string} [props.href] - 跳转链接
+ * @param {string} [props.target] - 当target='_blank'时代表新窗口打开
+ * 
+ * @returns {JSX.Element}
+ */
+const Link=(props)=>{
+  const {children,className='',onClick,href='',target=''} = props;
+
+  const onLink=()=>{
+    if(href){
+      if(target=='_blank'){
+        openLink(href);
+        // window.open(href);
+      }else{
+        location.href=href;
+      }
+      return;
+    }
+    if(onClick)onClick();
+  }
+  return (
+    <span onClick={onLink} className={`${styles.linkWrap} ${className}`}>{children}</span>
+  )
+}
+export default React.memo(Link);

package/templates/template_app/public/src/components/{Marquee → marquee}/index.jsx

@@ -1,11 +1,20 @@
+// @ts-ignore
 import React, { useEffect, useRef } from "react";
+// @ts-ignore
 import styles from'./index.less';
 
+
 /**
- * 跑马灯
- * <Marquee>跑马灯文案</Marquee>
+ * 跑马灯效果
+ * @param {object} [props] 
+ * @param {JSX.Element|string} [props.children] - 需要跑动的内容
+ * 
+ * @returns {JSX.Element}
  */
 const Marquee=(props)=>{
+  /**
+   * @type RefDomElement
+   */
   const refText = useRef();
   const refX = useRef(0);
   const refPause = useRef(false);

package/templates/{template_oa/public/src/components/Page/PageLoading → template_app/public/src/components/page/pageLoading}/index.jsx

@@ -1,13 +1,26 @@
+// @ts-ignore
 import React,{useEffect, useState} from 'react';
+// @ts-ignore
 import ReactDOM from 'react-dom';
-import CSS from './index.less';
-import Popup from '@/components/Popup';
+
+import Popup from '@/components/popup';
+// @ts-ignore
 import imgLoading from '@/assets/images/loading.svg';
 
+// @ts-ignore
+import CSS from './index.less';
+
+/**
+ * 页面Loading状态
+ * @param {object} [props] 
+ * @param {boolean} [props.visible=true] - 是否显示状态
+ * 
+ * @returns {JSX.Element}
+ */
 const PageLoading = (props) => {
   const {visible=true} = props;
   if(!visible){
-    return '';
+    return <></>;
   }
   return (
     <div className={CSS.wrap } >
@@ -18,6 +31,13 @@ const PageLoading = (props) => {
   );
 };
 
+/**
+ * 全屏置顶显示一个页面loading组件
+ * @param {object} [props] 
+ * @param {boolean} [props.canTouch=false] - 是否允许用户点击屏幕穿透到下面的组件
+ * 
+ * @returns {(string)=>void}
+ */
 export const ShowPageLoading=(props={canTouch:false})=>{
   let popup = Popup(()=>{},{cantouch:props.canTouch});
   ReactDOM.render(

package/templates/{template_oa_jwt/public/src/components/Popup → template_app/public/src/components/popup}/index.jsx

@@ -1,8 +1,21 @@
+// @ts-ignore
 import React from 'react';
+// @ts-ignore
 import ReactDOM from 'react-dom';
+
+// @ts-ignore
 import styles from './index.less';
 styles;
 
+/**
+ * 一个全屏置顶的遮罩层
+ * @param {(result)=>void} reslove - 遮罩层的关闭回调
+ * @param {Object} [options] - 参数
+ * @param {boolean} [options.cantouch=false] - 是否允许被点击穿透
+ * @param {boolean} [options.transparent=false] - 是否遮罩层完全透明
+ * 
+ * @returns { {dom:HTMLElement,destory:()=>void} }
+ */
 const Popup = (reslove,options) => {
   let rootDom = document.createElement('div');
   rootDom.className='popup-box';

package/templates/{template_oa_jwt/public/src/components/Toast → template_app/public/src/components/toast}/index.jsx

@@ -1,7 +1,14 @@
+// @ts-ignore
 import React,{useEffect} from 'react';
+// @ts-ignore
 import ReactDOM from 'react-dom';
+
+// @ts-ignore
+import Popup from '@/components/popup';
+
+// @ts-ignore
 import styles from './index.less';
-import Popup from '@/components/Popup/index.jsx';
+
 
 const toastList=[];
 const runNext=()=>{
@@ -43,12 +50,25 @@ const Toast=props=>{
   )
 }
 
+/**
+ * @typedef {object} ToastOptions
+ * @property {string} message - 吐司文案内容
+ * @property {number} [delay=2000] - 持续时间,毫秒
+ * @property {string} [position] - 显示位置,center|top|bottom
+ * @property {Function} [resolve] - 显示完毕的回调
+ */
 
+/**
+ * 显示一个吐司信息
+ * @param {ToastOptions|string} [props] - 文案内容或一个配置参数
+ * @returns { Promise }
+ */
 const ShowToast=props=>{
   if(typeof props === 'string'){
     props = {message:props}
   }
   return new Promise((resolve) => {
+    // @ts-ignore
     props.resolve = resolve;
     toastList.push(props);
     if(toastList.length===1){

package/templates/template_app/public/src/dictionary/index.js

@@ -1,8 +1,11 @@
-
+// @ts-ignore
 import React, { useState, useEffect,useMemo} from 'react';
-import {GET_USER_TYPE} from '@/services/user';
+// @ts-ignore
 import {useDictionary} from 'kn-hooks';
-import ShowToast from '@/components/Toast';
+
+import {GET_USER_TYPE} from '@/services/user';
+import ShowToast from '@/components/toast';
+
 export const SelectOption=(props)=>{
   const {value}=props;
   const name = props['data-keyname'];
@@ -10,6 +13,7 @@ export const SelectOption=(props)=>{
     ShowToast(`点击option name=${name},value=${value},label=${props.children}`)
     if(props.onClick)props.onClick();
   }
+  // @ts-ignore
   return <hgroup onClick={onClick} key={value} name={name} value={value}>{props.children}</hgroup>
 }
 

package/templates/template_app/public/src/hooks/index.jsx

@@ -4,6 +4,7 @@ import useImageLoader from './useImageLoader';
 import useDelay from './useDelay';
 import usePreload from './usePreload';
 import useLoading from './useLoading';
+// @ts-ignore
 import {usePagination} from 'kn-hooks';
 
 export {

package/templates/template_app/public/src/hooks/useDelay.jsx

@@ -1,18 +1,23 @@
+// @ts-ignore
 import { useRef,useState,useMemo, useEffect } from 'react';
 
 const useDelay=()=>{
   const [loading,setLoading] = useState(false);
   const refSet = useRef();
+  // @ts-ignore
   refSet.current = setLoading;
   useEffect(()=>{
+    // @ts-ignore
     refSet.current = setLoading;
   },[setLoading]);
 
   const actions=useMemo(()=>{
     const wait=(ms)=>{
+      // @ts-ignore
       refSet.current(true);
       return new Promise(res=>{
         setTimeout(()=>{
+          // @ts-ignore
           refSet.current(false);
           res();
         }, ms);

package/templates/template_app/public/src/hooks/useImageLoader.jsx

@@ -1,7 +1,6 @@
+// @ts-ignore
 import React, { useEffect,useState,useMemo } from 'react';
 
-
-
 const useImageLoader=(img_src)=>{
   const [src,setSrc] = useState('');
   useEffect(() => {

package/templates/template_app/public/src/hooks/useLoading.jsx

@@ -1,5 +1,7 @@
+// @ts-ignore
 import { useRef,useState, useEffect } from 'react';
-import {ShowPageLoading} from '@/components/Page/PageLoading';
+
+import {ShowPageLoading} from '@/components/page/pageLoading';
 
 const useLoading=(props={})=>{
   const {canTouch=false} = props;
@@ -20,10 +22,12 @@ const useLoading=(props={})=>{
   useEffect(()=>{
     if(count > 0 ){
       if(!refPageLoading.current){
+        // @ts-ignore
         refPageLoading.current = ShowPageLoading({canTouch:canTouch});
       }
     }else{
       if(refPageLoading.current){
+        // @ts-ignore
         refPageLoading.current();//销毁
         refPageLoading.current=null;
       }

package/templates/template_app/public/src/hooks/usePreload.jsx

@@ -1,4 +1,5 @@
-import React, { useEffect,useState,useMemo,useRef,useCallback } from 'react';
+// @ts-ignore
+import React, { useState,useMemo,useCallback } from 'react';
 
 const usePreload=(files)=>{
   const [list] = useState(files);

package/templates/template_app/public/src/hooks/useScrollTop.jsx

@@ -1,8 +1,19 @@
+// @ts-ignore
 import { useState, useMemo, useEffect } from 'react'
+// @ts-ignore
 import { createContainer } from 'unstated-next'
 
+/**
+ * @typedef {[HTMLElement,Function]} UseStateElement
+ */
+
+
 const useActivity = () => {
   const [scrollTop, setScrollTop] = useState(0);
+
+  /**
+   * @type UseStateElement
+   */
   const [containerNode, setContainerNode] = useState();
   const [clientHeight, setClientHeight] = useState(0);
   const [titleRefs, setTitleRefs] = useState({});
@@ -12,6 +23,7 @@ const useActivity = () => {
     setContainerNode(node);
     setClientHeight(node.clientHeight)
     node.addEventListener('scroll', (e) => {
+      // @ts-ignore
       setScrollTop(e.target.scrollTop);
     })
   }, [])

package/templates/template_app/public/src/index.jsx

@@ -1,46 +1,62 @@
+// @ts-ignore
 import React, { Suspense } from 'react';
+// @ts-ignore
 import ReactDOM from 'react-dom';
+// @ts-ignore
+import { HashRouter } from 'react-router-dom';
+// @ts-ignore
 import * as antdMobile from 'antd-mobile';
 antdMobile;
 
 import './_reset.less';
 import './_antd.less';
 
-import { HashRouter } from 'react-router-dom';
-import PageLoading from '@/components/Page/PageLoading';
+import PageLoading from '@/components/page/pageLoading';
 import {RouteList} from './route';
 
-
+// @ts-ignore
 if(MOCK){
   let mock = require('@/mock');
   mock;
 }
 
+// @ts-ignore
 window.appLog=(txt)=>{
   console.log(txt);
 }
 
-/* eslint-disable */
 
+/* eslint-disable */
+// @ts-ignore
 if(BUILD_ENV!='prod'){
+  // @ts-ignore
   let VConsole =  require('vconsole');
+  // @ts-ignore
   const vConsole = new VConsole();
   setTimeout(() => {
     vConsole.setSwitchPosition(70, 10);
   }, 2000);
 }
 
+// @ts-ignore
 if(BUILD_ENV){
+  // @ts-ignore
   window.appLog(`代码环境类型：${BUILD_ENV}`);
 }
+// @ts-ignore
 if (VERSION_HASH) {
+  // @ts-ignore
   window.appLog(`VERSION_HASH：${VERSION_HASH}`);
 }
+
+// @ts-ignore
 window.appLog(`log init`);
+// @ts-ignore
 window.appLog(`${location.href}`);
+// @ts-ignore
 window.appLog(`ua:${navigator.userAgent}`);
+// @ts-ignore
 window.appLog(`safe top-bottom:${getComputedStyle(document.documentElement).getPropertyValue("--safeTop")}-${getComputedStyle(document.documentElement).getPropertyValue("--safeBottom")}`);
-
 /* eslint-enable */
 
 
@@ -59,6 +75,7 @@ window.appLog(`safe top-bottom:${getComputedStyle(document.documentElement).getP
 //   }
 // });
 
+// @ts-ignore
 window.onInputBlur=()=>{
   setTimeout(() => {
     const currentPosition = document.documentElement.scrollTop || document.body.scrollTop||0;

package/templates/template_app/public/src/pages/dictionary/index.jsx

@@ -1,9 +1,17 @@
+// @ts-ignore
 import React, { useEffect } from 'react';
+// @ts-ignore
 import {List} from 'antd-mobile';
+
 import {useUserType,useTaskState} from '@/dictionary';
-import styles from './index.less';
 import ProviderApp from '@/provider/app';
 
+// @ts-ignore
+import styles from './index.less';
+
+/**
+ * @returns {JSX.Element}
+ */
 const Page = () => {
   const providerApp = ProviderApp.useContainer();
 

package/templates/template_app/public/src/pages/index.jsx

@@ -1,15 +1,23 @@
+// @ts-ignore
 import React, { useEffect } from 'react';
+// @ts-ignore
 import {PullToRefresh ,List} from 'antd-mobile';
-import {useLoading} from '@/hooks';
+// @ts-ignore
 import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
+// @ts-ignore
+import moment from 'moment';
 
+import {useLoading} from '@/hooks';
 import ProviderApp from '@/provider/app';
-import moment from 'moment';
-import ShowToast from '@/components/Toast';
-import {AuthShow} from '@/components/Auth';
+import ShowToast from '@/components/toast';
+import {AuthShow} from '@/components/auth';
 
+// @ts-ignore
 import styles from './index.less';
 
+/**
+ * @returns {JSX.Element}
+ */
 const Page = () => {
   const navigate= useNavigate();
   const providerApp = ProviderApp.useContainer();
@@ -20,6 +28,10 @@ const Page = () => {
   useEffect(()=>{
     providerApp.setNav({title:'APP演示'})
   },[])
+  const onReset=()=>{
+    console.log('下拉刷新')
+    return Promise.resolve(true);
+  }
   return (
     <section id="wall" className={styles.wall}>
       <PullToRefresh className={styles.wrap}

package/templates/template_app/public/src/pages/list/index.jsx

@@ -1,12 +1,18 @@
+// @ts-ignore
 import React, { useEffect, useState, useRef } from 'react';
+// @ts-ignore
 import {PullToRefresh ,InfiniteScroll,List} from 'antd-mobile';
+
 import {usePagination,useLoading} from '@/hooks';
 import {GET_USER_LIST} from '@/services/user';
 import ProviderApp from '@/provider/app';
 
-
+// @ts-ignore
 import styles from './index.less';
 
+/**
+ * @returns {JSX.Element}
+ */
 const Page = () => {
   const providerApp = ProviderApp.useContainer();
 

package/templates/template_app/public/src/pages/login/index.jsx

@@ -1,8 +1,14 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
+// @ts-ignore
+import React, { useEffect } from 'react';
+// @ts-ignore
+import { useSearchParams,useNavigate } from 'react-router-dom';
+
 import ProviderApp from '@/provider/app';
+import Link from '@/components/link';
 
-import Link from '@/components/Link';
+/**
+ * @returns {JSX.Element}
+ */
 const Page = () => {
   const navigate= useNavigate();
   const [search] = useSearchParams();
@@ -17,7 +23,7 @@ const Page = () => {
       }
     }
   }
-  useEffect(kssoLogin,[])
+  useEffect(()=>{kssoLogin()},[])
   return (
     <div>
       <p>您未登录，当前是登录页</p>

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

@@ -1,6 +1,11 @@
-import React, { useEffect, useState, useRef } from 'react';
-import Link from '@/components/Link';
+// @ts-ignore
+import React from 'react';
 
+import Link from '@/components/link';
+
+/**
+ * @returns {JSX.Element}
+ */
 const Page = () => {
   return (
     <div>

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

@@ -2,7 +2,9 @@
  * @module ProviderApp
  */
 import {  useState,useMemo } from 'react';
+// @ts-ignore
 import { createContainer } from "unstated-next"
+
 import {useDelay} from '@/hooks';
 import {logout as apiLogout} from '@/services';
 
@@ -57,9 +59,9 @@ const useApp=() =>{
  * @typedef UseAppResult
  * @property {boolean} loading=true - loading状态
  * @property {function} setLoading - 设置loading状态
- * @property {Promise<boolean>} isLogin - 用户是否已登录
- * @property {Promise<boolean>} login - 触发登录
- * @property {Promise<boolean>} logout - 触发注销
+ * @property {()=>Promise<boolean>} isLogin - 用户是否已登录
+ * @property {(string)=>Promise<boolean>} login - 触发登录
+ * @property {()=>Promise} logout - 触发注销
  * @property {Object} nav={visible:true} - 导航栏配置
  * @property {function} setNav - 设置导航栏配置
  * @property {function} setUser - 设置用户信息

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

@@ -1,14 +1,17 @@
+// @ts-ignore
 import React from 'react';
+// @ts-ignore
 import { Routes, Route, Navigate} from 'react-router-dom';
+
 import Home from '@/pages/index.jsx';
 import Login from '@/pages/login';
 import User from '@/pages/user';
 import List from '@/pages/list';
 import Dictionary from '@/pages/dictionary';
 
+import {LayoutApp,LayoutProvider} from '@/components/layout';
+import {AuthLogin} from '@/components/auth';
 
-import {LayoutApp,LayoutProvider} from '@/components/Layout';
-import {AuthLogin} from '@/components/Auth';
 export const RouteList = (
   <Routes>
     <Route path='/' element={<LayoutProvider />}>

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

@@ -1,11 +1,14 @@
 /**
  * @module Services
  */
+// @ts-ignore
 import Axios from 'axios';
 import qs from 'qs';
 const axios = Axios.create();
+// @ts-ignore
 console.log(`========API_ROOT:${API_HOST}========`);
 
+// @ts-ignore
 export const API_ROOT = API_HOST;
 const tokenMode='header';//header,cookie
 const tokenName='token';
@@ -86,8 +89,7 @@ axios.interceptors.response.use(
 
 
 /**
- * @typedef RequestOptions
- * @description 发送请求的扩展信息
+ * @typedef RequestOptions 发送请求的扩展信息
  * @property {number|boolean} ttl=false - 接口缓存周期，开启后默认为2秒，ttl单位为毫秒
  * @property {string|boolean} noInterceptors=false - 关闭拦截类型，'all'为关闭包括401、403在内的所有异常，默认情况下只拦截response.code不为0的情况
  * 
@@ -98,8 +100,8 @@ let buffer = {};
  * @function
  * @description 发送一个GET请求
  * @param {string} url - 请求地址 
- * @param {Object} param - 请求的参数
- * @param {RequestOptions} options - 扩展参数
+ * @param {Object} [param] - 请求的参数
+ * @param {RequestOptions} [options] - 扩展参数
  * @returns {Promise<Object>}
  */
 export async function GET_DEFAULT(url, param, options) {
@@ -152,11 +154,11 @@ export async function GET_DEFAULT_CROSS(url, param) {
 }
 
 /**
- * @function
- * @description 发送一个POST请求
+ * 发送一个POST请求
  * @param {string} url - 请求地址 
- * @param {Object} param - 请求的参数
- * @param {RequestOptions} options - 扩展参数
+ * @param {Object} [params] - 请求的参数
+ * @param {string} [method] - 请求方式
+ * @param {RequestOptions} [options] - 扩展参数
  * @returns {Promise<Object>}
  */
 export async function POST_DEFAULT(url, params, method, options) {

package/templates/template_app/public/src/services/user.js

@@ -1,16 +1,16 @@
-import {GET_DEFAULT,PUT_DEFAULT,POST_DEFAULT,API_ROOT} from './index.js';
-
+// @ts-ignore
+import {GET_DEFAULT,POST_DEFAULT,API_ROOT} from './index.js';
 
 
 export function GET_USER(){
-  return GET_DEFAULT(`${HOST}/user`);
+  return GET_DEFAULT(`${API_ROOT}/user`);
 }
 
 export function SET_USER(params={
   name:'',
   age:''
 }){
-  return POST_DEFAULT(`${HOST}/user`,params)
+  return POST_DEFAULT(`${API_ROOT}/user`,params)
 }
 
 

package/templates/template_app/public/src/type.js

@@ -0,0 +1,27 @@
+
+/**
+ * 可自行扩展任意数量的属性
+ * @typedef {Object<string, any>} OtherAny
+ */
+
+/**
+ * 指向DOM节点的ref
+ * @typedef {object} RefDomElement
+ * @property {HTMLElement} current - DOM节点
+ */
+
+
+
+/**
+ * @typedef {object} FormDataInfo
+ * @property {string} btnControl
+ */
+
+/**
+ * @typedef {[FormDataInfo,Function]} UseStateFormData
+ */
+
+
+/**
+ * @typedef {FormDataInfo & OtherAny} TableContentData
+ */

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

@@ -4,7 +4,9 @@ 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();
@@ -15,7 +17,9 @@ export const openLink = (link, target = '_blank') => {
 
 
 export const toHref = (url, replace, newWindow) => {
+  // @ts-ignore
   if(window.knFeishu){
+    // @ts-ignore
     window.knFeishu.ToHref(url,replace,newWindow);
     return;
   }
@@ -38,7 +42,9 @@ export const isMobile = () => {
 
 // 关闭页面
 export const closeWindow = () => {
+  // @ts-ignore
   if (window.knFeishu && window.knFeishu.closeWindow) {
+    // @ts-ignore
     window.knFeishu.closeWindow();
   } else {
     if (window.close) {