kn-cli 1.0.48 → 1.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "",
   "main": "index.js",
   "scripts": {

package/readme.md

@@ -69,6 +69,9 @@ module.exports = {
 ```
 
 # 更新日志
+* 1.0.49  
+  更新app和admin模板，主要是编写了使用案例  
+  
 * 1.0.48  
   1. cli.config增加rules:{compileNpmPackage:[]}配置，用于配置一些需要参与编译的npm包  
   2. 更新app及后管项目的模板  

package/templates/template_admin/package.json

@@ -10,7 +10,7 @@
     "antd": "~4.24.8",
     "axios": "~1.1.3",
     "moment": "~2.29.4",
-    "kn-hooks": "~0.0.13",
+    "kn-hooks": "~0.0.16",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-router": "~6.3.0",

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

@@ -29,7 +29,7 @@ export const AuthLogin=(props)=>{
     }else{
       console.log(`[Auth]检查用户登录态失败`)
       setPass(false);
-      navigate('/login');
+      navigate('/superAdminLogin');
     }
   }
   useEffect(check,[]);

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

@@ -113,7 +113,7 @@ const TopMenu=(props)=>{
   const loadMenu=async ()=>{
     const isLogin= await app.isLogin();
     if(!isLogin){
-      navigate('/login')
+      navigate('/superAdminLogin')
       return;
     }
     let reqMenu = await GET_MENU();

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

@@ -1,103 +1,39 @@
 
 import React, { useState, useEffect,useMemo} from 'react';
 import {GET_USER_TYPE} from '@/services/user';
+import {useDictionary} from 'kn-hooks';
+import ShowToast from '@/components/Toast';
+export const SelectOption=(props)=>{
+  const {value}=props;
+  const name = props['data-keyname'];
+  const onClick=(e)=>{
+    ShowToast(`点击option name=${name},value=${value},label=${props.children}`)
+    if(props.onClick)props.onClick();
+  }
+  return <hgroup onClick={onClick} key={value} name={name} value={value}>{props.children}</hgroup>
+}
 
-const bookCreater=options=>{
-  const {
-    service,
-    idKey='value',
-    titleKey='label',
-    keyName='key',
-    defaultTypes=null
-  }=options;
-  
-  return (props)=>{
-    const [types,setTypes]=useState(defaultTypes||null);
-
-    const init=async ()=>{
-      let ret = await service();
-      if(+ret?.code===0){
-        setTypes(ret.data||[]);
-      }
-    }
-    useEffect(()=>{
-      if(defaultTypes)return;
-      init();
-    },[]);
-
-    const getData=({id,title,key}={})=>{
-      let name='';
-      if(id){
-        name=idKey
-      }
-      else if(title){
-        name=titleKey
-      }
-      else if(key){
-        name=keyName;
-      }
-
-      for(let i=0;i<types.length;i++){
-        if(''+types[i][name]===''+id){
-          return types[i];
-        }
-      }
-      return null;
-    }
+useDictionary.SetConfig({SelectOption})
 
-    const getTitle=(id)=>{
-      if(types){
-        for(let i=0;i<types.length;i++){
-          if(''+types[i][idKey]===''+id){
-            return types[i][titleKey];
-          }
-        }
-      }
-      return '';
-    }
-    const getId=(title)=>{
-      if(types){
-        for(let i=0;i<types.length;i++){
-          if(''+types[i][titleKey]===''+title){
-            return types[i][idKey];
-          }
-        }
-      }
-      return '';
-    }
 
-    const isReady=()=>{
-      return types!==null;
-    }
-    const reload=()=>{
-      if(defaultTypes)return;
-      init();
-    }
-    const getList=()=>{
-      let ret=[]
-      for(let i=0;i<types.length;i++){
-        let item = types[i];
-        ret.push({
-          label:item[titleKey],
-          value:item[idKey],
-          key:item[keyName]
-        })
-      }
-      return ret;
+export const useUserType = useDictionary.createDictionary({
+  api:GET_USER_TYPE,
+  afterApi:(response)=>{
+    if(response?.code==0){
+      let req= response.data.map(item=>{
+        const  {label,value:id,key:name}=item;
+        return {label,id,name}
+      });
+      return req;
     }
-    
-
-    return {types,getTitle,getId,isReady,reload,getData,getList}
+    return [];
   }
-}
+});
 
-export const useUserType = bookCreater({
-  service:GET_USER_TYPE,
-})
-export const useTaskState=bookCreater({
+export const useTaskState= useDictionary.createDictionary({
   defaultTypes:[
-    {label:'进行中',value:'1',key:'run'},
-    {label:'已完成',value:'5',key:'complete'},
+    {label:'进行中',id:'1',name:'run'},
+    {label:'已完成',id:'5',name:'complete'},
   ]
 });
 

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

@@ -5,14 +5,16 @@ import useDelay from './useDelay';
 import usePreload from './usePreload';
 import useSearch from './useSearch';
 import useUpdate from './useUpdate';
-import useNextPage from './useNextPage';
 import useLoading from './useLoading';
+import {usePagination,usePaginationWithForm} from 'kn-hooks';
+
 export {
+  usePaginationWithForm,
+  usePagination,
   useImageLoader,
   useDelay,
   usePreload,
   useSearch,
   useUpdate,
-  useNextPage,
   useLoading
 }

package/templates/template_admin/public/src/pages/material/index.jsx

@@ -1,11 +1,82 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
+import {usePaginationWithForm} from '@/hooks';
+import {GET_LIST} from '@/services/video';
+import {Table,Pagination,Form,Input,Button} from 'antd';
 
 const Page = () => {
-  const query = useParams();
+  const [form] = Form.useForm();
 
+  const request = usePaginationWithForm({
+    service:GET_LIST,
+    pagination:{pageSize:10},
+    form:form
+  })
+
+  useEffect(()=>{
+    request.update();
+  },[])
+
+  const columns=[{
+    dataIndex:'id',
+    title:'id',
+    render:(_,record,idx)=>{
+      return record.id;
+    }
+  },{
+    dataIndex:'value',
+    title:'数据值',
+    render:(_,record,idx)=>{
+      return record.value||'-'
+    }
+  }];
+
+  useEffect(()=>{
+    console.log(request)
+  },[request])
+
+  const getDataSource=()=>{
+    if(request?.data?.length>0){
+      let req=request?.data[request.pagination.current-1]||[];
+      return req;
+    }
+    return [];
+  }
+
+  const onPageChange=(current,pageSize)=>{
+    debugger;
+    request.update({pagination:{current,pageSize}})
+  }
+  const onSearch=()=>{
+    request.update();
+  }
+  const onReset=()=>{
+    request.reset();
+  }
   return (
-    <p>material</p>
+    <section>
+      <section style={{display:'flex'}}>
+        <Form form={form} >
+          <Form.Item name='keywords' label='关键字'>
+            <Input />
+          </Form.Item>
+        </Form>
+        <Button onClick={onSearch} type='primary' style={{margin:'0 12px'}}>查询</Button>
+        <Button onClick={onReset}>重置</Button>
+      </section>
+      <Table 
+        rowKey={'id'}
+        loading={!request?.data?.length>0}
+        columns={columns}
+        dataSource={getDataSource()}
+        pagination={false}
+      />
+      <Pagination 
+        current={request?.pagination?.current} 
+        pageSize={request?.pagination?.pageSize}
+        onChange={onPageChange}
+        total={request?.pagination?.total}
+      />
+    </section>
   )
 }
 

package/templates/template_admin/public/src/pages/video/index.jsx

@@ -1,11 +1,64 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
+import {usePagination} from '@/hooks';
+import {GET_LIST} from '@/services/video';
+import {Table,Pagination} from 'antd';
 
 const Page = () => {
-  const query = useParams();
+  const request = usePagination({
+    service:GET_LIST,
+    pagination:{pageSize:10}
+  })
 
+  useEffect(()=>{
+    request.update();
+  },[])
+
+  const columns=[{
+    dataIndex:'id',
+    title:'id',
+    render:(_,record,idx)=>{
+      return record.id;
+    }
+  },{
+    dataIndex:'value',
+    title:'数据值',
+    render:(_,record,idx)=>{
+      return record.value||'-'
+    }
+  }];
+
+  useEffect(()=>{
+    console.log(request)
+  },[request])
+
+  const getDataSource=()=>{
+    if(request?.data?.length>0){
+      let req=request?.data[request.pagination.current-1]||[];
+      return req;
+    }
+    return [];
+  }
+
+  const onPageChange=(current,pageSize)=>{
+    debugger;
+    request.update({pagination:{current,pageSize}})
+  }
   return (
-    <p>video</p>
+    <section>
+        <Table 
+          rowKey={'id'}
+          loading={!request?.data?.length>0}
+          columns={columns}
+          dataSource={getDataSource()}
+          pagination={false}
+        />
+        <Pagination 
+          current={request?.pagination?.current} 
+          pageSize={request?.pagination?.pageSize}
+          onChange={onPageChange}
+          total={request?.pagination?.total}
+        />
+    </section>
   )
 }
 

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

@@ -87,7 +87,7 @@ const useApp=() =>{
     setUser(null);
     setJwt('');
     localStorage.removeItem('user');
-    navigate('/login');
+    navigate('/superAdminLogin');
   }
   setLogout(logout);
 

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

@@ -21,12 +21,6 @@ const delayLoader=(loader)=>{
   })
 }
 
-// /*webpackChunkName:'subGroup'*/
-const Home = React.lazy(()=>import('@/pages/index.jsx'));
-const SubHome = React.lazy(()=>import('@/pages/subHome'));
-const SubHome2 = React.lazy(()=>import('@/pages/subHome2'));
-const SubHome3 = React.lazy(()=>import('@/pages/subHome3'));
-const CheckLogin = React.lazy(()=>import('@/pages/checkLogin'));
 
 
 const Video = React.lazy(()=>import('@/pages/video'));
@@ -66,10 +60,6 @@ export const RouteList = (
         <Route path='/user' element={<User />} />
         <Route path='/userData' element={<UserData />} />
 
-        {/* <Route path='/home/sub' element={<SubHome />} />
-        <Route path='/home/sub/:id' element={<Suspense fallback={<PageLoading />}><SubHome2 /></Suspense>} />
-        <Route path='/home/sub3/:id' element={<SubHome3 />} />
-        <Route path='/checkLogin' element={<AuthLogin><CheckLogin /></AuthLogin>} /> */}
       </Route>
     </Route>
   </Routes>

package/templates/template_admin/public/src/services/video.js

@@ -0,0 +1,33 @@
+
+
+export function GET_LIST(params={
+  current:1,
+  pageSize:10,
+  keywords:''
+}){
+  const {current,pageSize,keywords='-'}=params;
+  let list=[];
+  for(let i=0;i<200;i++){
+    list.push({
+      id:i,
+      value:`item-${i}-${keywords}`,
+    })
+  }
+  let total=200;
+  let startIdx = (current-1)*pageSize;
+  let data = list.splice(startIdx,pageSize);
+  let req= {
+    code:0,
+    data,
+    page:{
+      current,
+      pageSize,
+      total
+    }
+  };
+  return new Promise(resolve=>{
+    setTimeout(()=>{
+      resolve(req)
+    },500)
+  })
+}

package/templates/template_app/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "antd-mobile": "~5.28.0",
     "axios": "~1.1.3",
-    "kn-hooks": "~0.0.13",
+    "kn-hooks": "~0.0.16",
     "moment": "~2.29.4",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",

package/templates/template_app/public/src/_reset.less

@@ -64,7 +64,7 @@ a,div,p,span,section,hgroup{
 
   * {
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    position: relative;
+    // position: relative;
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     -webkit-text-size-adjust: none;
     -webkit-box-sizing: border-box;

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

@@ -1,103 +1,39 @@
 
 import React, { useState, useEffect,useMemo} from 'react';
 import {GET_USER_TYPE} from '@/services/user';
+import {useDictionary} from 'kn-hooks';
+import ShowToast from '@/components/Toast';
+export const SelectOption=(props)=>{
+  const {value}=props;
+  const name = props['data-keyname'];
+  const onClick=(e)=>{
+    ShowToast(`点击option name=${name},value=${value},label=${props.children}`)
+    if(props.onClick)props.onClick();
+  }
+  return <hgroup onClick={onClick} key={value} name={name} value={value}>{props.children}</hgroup>
+}
 
-const bookCreater=options=>{
-  const {
-    service,
-    idKey='value',
-    titleKey='label',
-    keyName='key',
-    defaultTypes=null
-  }=options;
-  
-  return (props)=>{
-    const [types,setTypes]=useState(defaultTypes||null);
-
-    const init=async ()=>{
-      let ret = await service();
-      if(+ret?.code===0){
-        setTypes(ret.data||[]);
-      }
-    }
-    useEffect(()=>{
-      if(defaultTypes)return;
-      init();
-    },[]);
-
-    const getData=({id,title,key}={})=>{
-      let name='';
-      if(id){
-        name=idKey
-      }
-      else if(title){
-        name=titleKey
-      }
-      else if(key){
-        name=keyName;
-      }
-
-      for(let i=0;i<types.length;i++){
-        if(''+types[i][name]===''+id){
-          return types[i];
-        }
-      }
-      return null;
-    }
+useDictionary.SetConfig({SelectOption})
 
-    const getTitle=(id)=>{
-      if(types){
-        for(let i=0;i<types.length;i++){
-          if(''+types[i][idKey]===''+id){
-            return types[i][titleKey];
-          }
-        }
-      }
-      return '';
-    }
-    const getId=(title)=>{
-      if(types){
-        for(let i=0;i<types.length;i++){
-          if(''+types[i][titleKey]===''+title){
-            return types[i][idKey];
-          }
-        }
-      }
-      return '';
-    }
 
-    const isReady=()=>{
-      return types!==null;
-    }
-    const reload=()=>{
-      if(defaultTypes)return;
-      init();
-    }
-    const getList=()=>{
-      let ret=[]
-      for(let i=0;i<types.length;i++){
-        let item = types[i];
-        ret.push({
-          label:item[titleKey],
-          value:item[idKey],
-          key:item[keyName]
-        })
-      }
-      return ret;
+export const useUserType = useDictionary.createDictionary({
+  api:GET_USER_TYPE,
+  afterApi:(response)=>{
+    if(response?.code==0){
+      let req= response.data.map(item=>{
+        const  {label,value:id,key:name}=item;
+        return {label,id,name}
+      });
+      return req;
     }
-    
-
-    return {types,getTitle,getId,isReady,reload,getData,getList}
+    return [];
   }
-}
+});
 
-export const useUserType = bookCreater({
-  service:GET_USER_TYPE,
-})
-export const useTaskState=bookCreater({
+export const useTaskState= useDictionary.createDictionary({
   defaultTypes:[
-    {label:'进行中',value:'1',key:'run'},
-    {label:'已完成',value:'5',key:'complete'},
+    {label:'进行中',id:'1',name:'run'},
+    {label:'已完成',id:'5',name:'complete'},
   ]
 });
 

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

@@ -1,25 +1,28 @@
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect } from 'react';
 import {List} from 'antd-mobile';
-import {useUserType} from '@/dictionary';
-import ShowToast from '@/components/Toast';
-
-
+import {useUserType,useTaskState} from '@/dictionary';
 import styles from './index.less';
+import ProviderApp from '@/provider/app';
 
 const Page = () => {
+  const providerApp = ProviderApp.useContainer();
+
   const emUserType= useUserType();
+  const emUseTaskState = useTaskState();
 
+  useEffect(()=>{
+    providerApp.setNav({title:'字典工具'})
+  },[])
   return (
     <section id="wall" className={styles.wall}>
-      <List header='字典'>
+      <List header='emUseTaskState'>
+        {
+          emUseTaskState.isReady()&&emUseTaskState.selectOptions
+        }
+      </List>
+      <List header='emUserType'>
         {
-          emUserType.isReady()&&emUserType.getList().map(item=>{
-            return <List.Item key={item.key} data-value={item.value} onClick={ (e)=>{
-              let value = e.currentTarget.getAttribute('data-value');
-              let item = emUserType.getData({id:value});
-              ShowToast(`${JSON.stringify(item)}`)
-            }}>{item.label}</List.Item>
-          })
+          emUserType.isReady()&&emUserType.selectOptions
         }
       </List>
 

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import {PullToRefresh ,List} from 'antd-mobile';
 import {useLoading} from '@/hooks';
 import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
@@ -17,7 +17,9 @@ const Page = () => {
   const [search] = useSearchParams();
   const loading = useLoading();
   const loadingCanTouch = useLoading({canTouch:true});
-
+  useEffect(()=>{
+    providerApp.setNav({title:'APP演示'})
+  },[])
   return (
     <section id="wall" className={styles.wall}>
       <PullToRefresh className={styles.wrap}
@@ -92,7 +94,7 @@ const Page = () => {
         </List>
 
         <List header='其它'>
-          <List.Item key='dictionary' onClick={()=>{navigate('/dictionary')}}>字典</List.Item>
+          <List.Item key='dictionary' onClick={()=>{navigate('/dictionary')}}>字典工具</List.Item>
         </List>
     
       </PullToRefresh>

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

@@ -2,17 +2,24 @@ import React, { useEffect, useState, useRef } from 'react';
 import {PullToRefresh ,InfiniteScroll,List} from 'antd-mobile';
 import {usePagination,useLoading} from '@/hooks';
 import {GET_USER_LIST} from '@/services/user';
+import ProviderApp from '@/provider/app';
 
 
 import styles from './index.less';
 
 const Page = () => {
+  const providerApp = ProviderApp.useContainer();
+
   const request = usePagination({
     service:GET_USER_LIST,
   })
   const [list,setList]= useState([]);
   const loading = useLoading();
 
+  useEffect(()=>{
+    providerApp.setNav({title:'下拉刷新和滚动加载'})
+  },[])
+
 
   useEffect(()=>{
     let ret=[];

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

@@ -7,7 +7,6 @@ const Page = () => {
   const navigate= useNavigate();
   const [search] = useSearchParams();
   const providerApp = ProviderApp.useContainer();
-
   const kssoLogin=async ()=>{
     let code = search.get('code');
     if(code){

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

@@ -1,7 +1,16 @@
+/**
+ * @module ProviderApp
+ */
 import {  useState,useMemo } from 'react';
 import { createContainer } from "unstated-next"
 import {useDelay} from '@/hooks';
 import {logout as apiLogout} from '@/services';
+
+/**
+ * @function
+ * @description app状态管理的Provider
+ * @returns {UseAppResult}
+ */
 const useApp=() =>{
   const [loading,setLoading] = useState(true);
   const [nav,setNavConfig] = useState({visible:true,syncDocumentTitle:false});
@@ -44,6 +53,19 @@ const useApp=() =>{
   return action
 }
 
+/**
+ * @typedef UseAppResult
+ * @property {boolean} loading=true - loading状态
+ * @property {function} setLoading - 设置loading状态
+ * @property {Promise<boolean>} isLogin - 用户是否已登录
+ * @property {Promise<boolean>} login - 触发登录
+ * @property {Promise<boolean>} logout - 触发注销
+ * @property {Object} nav={visible:true} - 导航栏配置
+ * @property {function} setNav - 设置导航栏配置
+ * @property {function} setUser - 设置用户信息
+ * @property {Object} user=null - 用户信息
+ */
+
 const App = createContainer(useApp);
 
 export default App;

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

@@ -1,3 +1,6 @@
+/**
+ * @module Services
+ */
 import Axios from 'axios';
 import qs from 'qs';
 const axios = Axios.create();
@@ -82,8 +85,23 @@ axios.interceptors.response.use(
 
 
 
+/**
+ * @typedef RequestOptions
+ * @description 发送请求的扩展信息
+ * @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();
@@ -116,6 +134,10 @@ export async function GET_DEFAULT(url, param, options) {
   return response && response.data ? response.data : null;
 }
 
+/**
+ * @function
+ * @description 带允许cookie跨域的GET_DEFAULT
+ */
 export async function GET_DEFAULT_CROSS(url, param) {
   if (param) param = qs.stringify(param, { arrayFormat: 'indices' });
 
@@ -129,6 +151,14 @@ export async function GET_DEFAULT_CROSS(url, param) {
   return response && response.data ? response.data : null;
 }
 
+/**
+ * @function
+ * @description 发送一个POST请求
+ * @param {string} url - 请求地址 
+ * @param {Object} param - 请求的参数
+ * @param {RequestOptions} options - 扩展参数
+ * @returns {Promise<Object>}
+ */
 export async function POST_DEFAULT(url, params, method, options) {
   let data = params;
   // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
@@ -147,7 +177,10 @@ export async function POST_DEFAULT(url, params, method, options) {
   });
   return response && response.data ? response.data : null;
 }
-
+/**
+ * @function
+ * @description 带cookie跨域的POST_DEFAULT
+ */
 export async function POST_DEFAULT_CROSS(url, params) {
   let data = {};
   // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });

package/templates/template_admin/public/src/hooks/useNextPage.jsx

@@ -1,89 +0,0 @@
-import { useState,useRef } from 'react';
-
-
-const DEFAULT_PAGE_SIZE=20;
-const DEFAULT_PAGE_CURRENT=1;
-
-const useNextPage=(props)=>{
-  const [search,setSearch] = useState(props.initSearch||{});
-  const [service] = useState(()=>props.service);
-  const [beforeService] = useState(()=>props.beforeService);
-  const [pagination,setPagination] = useState(()=>{
-    let temp = {
-      current:DEFAULT_PAGE_CURRENT,
-      pageSize:DEFAULT_PAGE_SIZE,
-      total:0,
-      startIdx:0,
-      more:false,
-      ...props.pagination
-    };
-    temp.startIdx = (temp.current-1)*temp.pageSize;
-    return temp;
-  });
-  const resetCount = useRef(0);
-  const [data,setData] = useState([]);
-  
-  const reset= async ()=>{
-    resetCount.current++;
-    let page = {...pagination};
-    page.current =1;
-    return refresh({pageValue:page})
-  }
-  const nextPage= async ()=>{
-    if(!pagination.more){
-      return false;
-    }
-    let page = {...pagination};
-    page.current= +page.current+1;
-    return refresh({pageValue:page})
-  }
-  const refresh= async ({searchValue,pageValue}={})=>{
-    searchValue = searchValue || search;
-    pageValue = pageValue || pagination;
-    searchValue = {...search,...searchValue};
-    pageValue = {...pagination,...pageValue};
-
-    const {current,pageSize} = pageValue;
-    let params = {...searchValue,current:current,pageSize:pageSize};
-    if(beforeService)params=beforeService(params);
-    if(!params)return;
-
-    setSearch(searchValue);
-
-    let ret = await service(params);
-    if(ret?.code==0){
-      const {page} = ret.data;
-      const current= +(page.pageNum||DEFAULT_PAGE_CURRENT);
-      const pageSize= +(page.pageSize||DEFAULT_PAGE_SIZE);
-      const total= +page.total;
-      const startIdx= (current-1)*pageSize;
-      const more = current*pageSize<total;
-      setPagination({
-        current,pageSize,total,startIdx,more
-      })
-      if(ret.data.list){
-        ret.data.list.map(item=>{
-          item.resetCount = resetCount.current;
-        })
-        let newData = current==1?[]:data;
-        newData[current-1] = ret.data.list;
-        setData([...newData])
-      }
-    }
-    return ret;
-  }
-
-
-  return {
-    pagination,
-    search,
-    setSearch,
-    refresh,
-    reset,
-    nextPage,
-    data,
-  };
-
-}
-
-export default useNextPage;

package/templates/template_admin/public/src/pages/checkLogin/index.jsx

@@ -1,13 +0,0 @@
-import React, { useEffect } from 'react';
-import ProviderApp from '@/provider/app';
-
-const Page = () => {
-  const providerApp = ProviderApp.useContainer();
-  return (
-    <div>
-      <p>当前用户态:{JSON.stringify(providerApp.user)}</p>
-    </div>
-  )
-}
-
-export default Page;

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

@@ -1,23 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-import ProviderApp from '@/provider/app';
-
-import {Button} from 'antd';
-
-import styles from './index.less';
-
-const Page = () => {
-  const navigate= useNavigate();
-  const providerApp = ProviderApp.useContainer();
-  const query = useParams();
-  const [search] = useSearchParams();
-
-  return (
-    <section id="wall" className={styles.wall}>
-      <Button type='primary'>i am home {JSON.stringify(query)}</Button>
-    </section>
-  )
-}
-
-export default Page;

package/templates/template_admin/public/src/pages/index.less

@@ -1,22 +0,0 @@
-
-.wall{
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-}
-.wrap{
-  height:100%;
-  width:100%;
-}
-.item{
-  font-size: 40px;
-}
-.tips{
-  font-size: 36px;
-}
-
-.btnGroup{
-  :global(.adm-button ){
-    margin-bottom: 24px;
-  }
-}

package/templates/template_admin/public/src/pages/subHome/index.jsx

@@ -1,12 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-const Page = () => {
-  const query = useParams();
-
-  return (
-    <p>subHome1 {JSON.stringify(query)}</p>
-  )
-}
-
-export default Page;

package/templates/template_admin/public/src/pages/subHome2/index.jsx

@@ -1,12 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-const Page = () => {
-  const query = useParams();
-
-  return (
-    <p>subHome2 {JSON.stringify(query)}</p>
-  )
-}
-
-export default Page;

package/templates/template_admin/public/src/pages/subHome3/index.jsx

@@ -1,12 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
-
-const Page = () => {
-  const query = useParams();
-
-  return (
-    <p>subHome3 {JSON.stringify(query)}</p>
-  )
-}
-
-export default Page;

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

@@ -1,11 +0,0 @@
-import { useState, useMemo } from 'react';
-
-const useUpdate=()=>{
-  const [count,setCount] = useState(1);
-  const action = useMemo(()=>{
-    return [count,()=>{setCount(count+1)}]
-  },[count,setCount])
-  return action;
-}
-
-export default useUpdate;