kn-cli 1.0.90 → 1.0.92

package/templates/template_offcial/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_offcial/public/src/components/page/pageLoading/index.jsx

@@ -0,0 +1,51 @@
+// @ts-ignore
+import React from 'react';
+// @ts-ignore
+import ReactDOM from 'react-dom';
+
+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 (
+    <div className={CSS.wrap } >
+      <div className={CSS.box} data-show={visible}>
+        <img src={imgLoading} />
+      </div>
+    </div>
+  );
+};
+
+/**
+ * 全屏置顶显示一个页面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(
+    <PageLoading visible={true} />,
+    popup.dom
+  );
+  return popup.destory;
+}
+
+export default React.memo(PageLoading);

package/templates/template_offcial/public/src/components/popup/index.jsx

@@ -0,0 +1,35 @@
+// @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';
+  if(options&&options.cantouch)rootDom.setAttribute('data-can-touch','1');
+  if(options&&options.transparent)rootDom.setAttribute('data-transparent','1');
+
+  let destory = (result) => {
+    ReactDOM.unmountComponentAtNode(rootDom);
+    rootDom.parentNode.removeChild(rootDom);
+    if (reslove) reslove(result);
+  };
+  document.body.appendChild(rootDom);
+  return { dom: rootDom, destory };
+};
+
+
+export default Popup;

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

@@ -1,7 +1,13 @@
+// @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 +49,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_offcial/public/src/hooks/index.jsx

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

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

@@ -1,3 +1,4 @@
+// @ts-ignore
 import React, { useEffect,useState,useMemo } from 'react';
 
 

package/templates/template_offcial/public/src/hooks/useInToView.jsx

@@ -1,3 +1,4 @@
+// @ts-ignore
 import React, { useEffect,useState,useMemo,useRef,useCallback } from 'react';
 
 
@@ -9,6 +10,7 @@ const useInToView=(props)=>{
 
   const destory=()=>{
     if(refObserver.current){
+      // @ts-ignore
       refObserver.current=disconnect();
       refObserver.current=null;
     }
@@ -34,6 +36,7 @@ const useInToView=(props)=>{
       setVisibled(true);
     });
     observe.observe(refDom.current);
+    // @ts-ignore
     refObserver.current=observe;
   }
   const setDom=(dom)=>{

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

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

package/templates/template_offcial/public/src/hooks/useScroll.jsx

@@ -1,3 +1,4 @@
+// @ts-ignore
 import React, { useEffect, useState, useRef } from 'react';
 
 
@@ -12,7 +13,9 @@ const useScroll=(targetDom='#appLayout')=>{
   const refScrollDom = useRef();
   const refSetIsScroll = useRef();
   const refIsScroll = useRef();
+  // @ts-ignore
   refIsScroll.current= isScroll;
+  // @ts-ignore
   refSetIsScroll.current= setIsScroll;
 
   useEffect(()=>{
@@ -22,15 +25,18 @@ const useScroll=(targetDom='#appLayout')=>{
       refScrollDom.current = targetDom;
     }
     let dom = refScrollDom.current;
+    // @ts-ignore
     setHeight(dom.clientHeight)
 
     const fn=(e)=>{
       if(e.target.scrollTop>0){
         if(!refIsScroll.current){
+          // @ts-ignore
           refSetIsScroll.current(true);
         }
       }else{
         if(refIsScroll.current){
+          // @ts-ignore
           refSetIsScroll.current(false);
         }
       }
@@ -38,8 +44,10 @@ const useScroll=(targetDom='#appLayout')=>{
         fn(e.target.scrollTop);
       })
     }
+    // @ts-ignore
     dom.addEventListener('scroll',fn);
     return ()=>{
+      // @ts-ignore
       dom.removeEventListener('scroll',fn);
     }
   },[]);

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

@@ -1,5 +1,8 @@
+// @ts-ignore
 import React from 'react';
+// @ts-ignore
 import ReactDOM from 'react-dom';
+// @ts-ignore
 import {HashRouter} from 'react-router-dom';
 // import {createRoot} from 'react-dom/client';
 // import { createHashRouter,RouterProvider } from 'react-router-dom';
@@ -7,33 +10,43 @@ import './_antd.less';
 import './_reset.less';
 import {RouteList} from './route';
 
-
+// @ts-ignore
 if(MOCK){
   let mock = require('@/mock');
   mock;
 }
-
+// @ts-ignore
 window.appLog=(txt)=>{
   console.log(txt);
 }
 
 /* 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}`);
 /* eslint-enable */
 

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

@@ -1,10 +1,17 @@
+// @ts-ignore
 import React, { useState, useEffect } from 'react';
-import { isMobile } from '@/utils';
+// @ts-ignore
 import { useNavigate } from 'react-router-dom';
 
+import { isMobile } from '@/utils';
+
 
 
 
+/**
+ * 
+ * @returns {JSX.Element}
+ */
 const Home = () => {
   console.log('🌹🌹🌹 Home 🌹🌹🌹')
   const navigate = useNavigate();

package/templates/template_offcial/public/src/pages/pc/index.jsx

@@ -1,8 +1,10 @@
 
 import React, { useState, useEffect } from 'react';
-import Header from '@/components/Header';
+import Header from '@/components/header';
+
+// @ts-ignore
 import styles from './index.less';
-import Footer from '@/components/Footer';
+import Footer from '@/components/footer';
 import useInToView from '@/hooks/useInToView';
 
 const PcHome=()=>{

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

@@ -1,7 +1,28 @@
-import {  useState,useMemo, useEffect } from 'react';
-import {  useSearchParams,useNavigate } from 'react-router-dom';
+// @ts-ignore
+import {  useState,useMemo } from 'react';
+// @ts-ignore
+import { useNavigate } from 'react-router-dom';
+// @ts-ignore
 import { createContainer } from "unstated-next"
 
+
+
+/**
+ * @typedef AppContaniner
+ * @property {boolean} loading - 当前是否是加载状态
+ * @property {(open:boolean)=>void} setLoading - 设置加载状态
+ * @property {object} nav - 导航栏配置
+ * @property {(option:object)=>void} setNav - 设置导航栏配置
+ * 
+ */
+
+/**
+ * @typedef {object} AppProvider
+ * @property {function():AppContaniner} useContainer
+ * @property {React.ComponentType<any>} Provider
+ */ 
+
+
 const useApp=() =>{
   const navigate= useNavigate();
   const [loading,setLoading] = useState(true);
@@ -21,6 +42,11 @@ const useApp=() =>{
   return action
 }
 
+
+
+/**
+ * @type {AppProvider}
+ */
 const App = createContainer(useApp);
 
 export default App;

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

@@ -1,8 +1,10 @@
+// @ts-ignore
 import React,{Suspense} from 'react';
+// @ts-ignore
 import { Routes, Route } from 'react-router-dom';
 
-import {Layout} from '@/components/Layout';
-import PageLoading from '@/components/Page/PageLoading';
+import {Layout} from '@/components/layout';
+import PageLoading from '@/components/page/pageLoading';
 
 import Home from '@/pages/index.jsx';
 

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

@@ -1,9 +1,16 @@
+// @ts-ignore
 import Axios from 'axios';
+// @ts-ignore
 import qs from 'qs';
+// @ts-ignore
 import { message } from 'antd';
+
+
 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
@@ -29,6 +36,7 @@ export const setJwt = (value) => {
   jwt = value;
 };
 
+// @ts-ignore
 window.setJwt=setJwt;
 export const setLogout=(fn)=>{
   logout=fn;
@@ -96,6 +104,13 @@ axios.interceptors.response.use(
 
 
 let buffer = {};
+/**
+ * GET请求
+ * @param {string} url - 接口地址 
+ * @param {Object} [param] - 接口参数
+ * @param {Object} [options] - 扩展参数
+ * @returns Promise<ServicesResponse>
+ */
 export async function GET_DEFAULT(url, param, options) {
   if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
   let now = Date.now();
@@ -128,6 +143,12 @@ export async function GET_DEFAULT(url, param, options) {
   return response && response.data ? response.data : null;
 }
 
+/**
+ * GET请求
+ * @param {string} url - 接口地址 
+ * @param {Object} [param] - 接口参数
+ * @returns Promise<ServicesResponse>
+ */
 export async function GET_DEFAULT_CROSS(url, param) {
   if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
 
@@ -141,7 +162,15 @@ export async function GET_DEFAULT_CROSS(url, param) {
   return response && response.data ? response.data : null;
 }
 
-export async function POST_DEFAULT(url, params, method, options) {
+/**
+ * POST请求
+ * @param {string} url - 接口地址 
+ * @param {Object} [params] - 接口参数
+ * @param {Object} [options] - 特殊参数
+ * 
+ * @returns Promise<ServicesResponse>
+ */
+export async function POST_DEFAULT(url, params, options) {
   let data = params;
   // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
   // if (typeof params === 'string') {
@@ -151,7 +180,7 @@ export async function POST_DEFAULT(url, params, method, options) {
   // }
 
   let response = await axios({
-    method: method || 'POST',
+    method: 'POST',
     url: url,
     data,
     ...options,
@@ -160,6 +189,13 @@ 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<ServicesResponse>
+ */
 export async function POST_DEFAULT_CROSS(url, params) {
   let data = {};
   // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });

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

@@ -1,16 +1,16 @@
-import {GET_DEFAULT,PUT_DEFAULT,POST_DEFAULT,API_ROOT} from './index.js';
+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_offcial/public/src/type.js

@@ -0,0 +1,47 @@
+
+/**
+ * 可自行扩展任意数量的属性
+ * @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
+ */
+
+
+/**
+ * 分页
+ * @typedef {object} Pagination
+ * @property {number} current - 当前页码,1~N
+ * @property {number} pageSize=10 - 分页大小
+ * @property {number} total - 总记录条数
+ * @property {number} startIdx - 当前页面第一条的数据索引起始值
+ * 
+ */
+
+
+/**
+ * 接口response数据
+ * @typedef {object} ServicesResponse
+ * @property {number} code - 接口处理结果,0为成功
+ * @property {object} data - 接口返回的数据
+ * 
+ */

package/templates/template_admin/public/src/components/Header/index.jsx

@@ -1,57 +0,0 @@
-import React, { useEffect } from 'react';
-import IconFont from '../IconFont';
-import styles from './index.less';
-
-const Header=(props)=>{
-  const {
-    visible=true,
-    className='',
-    title='标题',
-    subTitle='',
-    leftLabel='',
-    rightLabel='',
-    left=<IconFont className={styles.leftIcon} icon='arrowBack' />,
-    right='',
-    syncDocumentTitle=false
-  } = props;
-
-  // 同步更新网页标题
-  useEffect(()=>{
-    if(syncDocumentTitle){
-      document.title= title;
-    }
-  },[title])
-  const onLeft=()=>{
-    window.history.back();
-  }
-  const onLeftLabel=()=>{
-    if(props.onLeftLabel){props.onLeftLabel()}
-  }
-  const onRight=()=>{
-    if(props.onRight){props.onRight()}
-  }
-  const onRightLabel=()=>{
-    if(props.onRightLabel){props.onRightLabel()}
-  }
-  const onTitle=()=>{
-    if(props.onTitle){props.onTitle()}
-  }
-  return (
-    <section className={`${styles.header} ${className}`} data-visible={visible}>
-      <hgroup className={styles.group}>
-        {left&&(<section className={styles.left} onClick={onLeft}>{left}</section>)}
-        {leftLabel&&<span className={styles.leftLabel} onClick={onLeftLabel}>{leftLabel}</span>}
-      </hgroup>
-      <section className={styles.center}>
-        {title&&<span onClick={onTitle}>{title}</span>}
-        {subTitle&&<span>{subTitle}</span>}
-      </section>
-      <hgroup className={styles.group}>
-        {rightLabel&&<span className={styles.rightLabel} onClick={onRightLabel}>{rightLabel}</span>}
-        {right&&(<section className={styles.right} onClick={onRight}>{right}</section>)}
-      </hgroup>
-      
-    </section>
-  )
-}
-export default Header;

package/templates/template_admin/public/src/components/Layout/CenterBody/index.jsx

@@ -1,15 +0,0 @@
-import React from 'react';
-
-import styles from './index.less';
-
-
-const LayoutCenterBody=(props)=>{
-  const {className,layout='normal'} = props;
-
-  return ( 
-    <section data-layout={layout} className={ className?`${styles.contentBody} ${className}`:styles.contentBody  }>
-      {props.children}
-    </section>
-  )
-}
-export default LayoutCenterBody;

package/templates/template_admin/public/src/components/Link/index.jsx

@@ -1,24 +0,0 @@
-import React  from 'react';
-import { openLink,jumpUrl } from '@/utils';
-import styles from './index.less';
-
-const Link=(props)=>{
-  const {children,className='',onClick,href='',target=''} = props;
-
-  const onLink=()=>{
-    if(href){
-      if(target=='_blank'){
-        openLink(href);
-        // window.open(href);
-      }else{
-        jumpUrl(href);
-      }
-      return;
-    }
-    if(onClick)onClick();
-  }
-  return (
-    <span onClick={onLink} className={`${styles.linkWrap} ${className}`}>{children}</span>
-  )
-}
-export default React.memo(Link);

package/templates/template_admin/public/src/components/Loading/index.jsx

@@ -1,14 +0,0 @@
-
-
-import React,{useMemo} from 'react';
-import styles from './index.less';
-styles;
-export const Loading=()=>{
-  return (
-    <div className="ldio-2oha7mxue8v">
-      <div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div>
-    </div>
-  )
-}
-
-export default React.memo(Loading);