kn-cli 1.0.47 → 1.0.49

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/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_app/public/src/hooks/useSearch.jsx

@@ -1,137 +0,0 @@
-import { useRef,useState,useMemo, useEffect } from 'react';
-
-/**
- * 管理表格数据的查询搜索及分页
- */
-const useSearch=(props)=>{
-  const [search,setSearch] = useState(props.initSearch||{});
-  const [service] = useState(()=>props.service);
-  const [beforeSearch] = useState(()=>props.beforeSearch);
-  const [beforeService] = useState(()=>props.beforeService);
-  
-  const [pagination,setPagination] = useState(()=>{
-    let temp = {current:1,pageSize:10,total:0,startIdx:0,...props.pagination};
-    temp.startIdx = (temp.current-1)*temp.pageSize;
-    return temp;
-  });
-  const [updateData] = useState(()=>props.updateData);
-  const [orderInfo,setOrderInfo]=useState({});
-  
-  const onPaginationChange=async (pageInfo,sorterInfo)=>{
-    let {current,pageSize} = pagination;
-    let orderValue=orderInfo;
-    if(pageInfo){
-      current = pageInfo.current;
-      pageSize = pageInfo.pageSize;
-    }
-
-    if(sorterInfo){
-      const {field,order}= sorterInfo;
-      if(field){
-        if(order){
-          orderInfo[field] = order;
-        }else{
-          delete orderInfo[field];
-        }
-      }
-      orderValue = orderInfo;
-      setOrderInfo({...orderInfo});
-    }
-    
-
-    let searchValue = await getSearchValue();
-    refresh({
-      searchValue,
-      pageValue:{pageSize,current},
-      orderValue});
-  }
-
-  const onSorter=async (sorter)=>{
-    const {field,order}= sorter;
-    if(field){
-      if(order){
-        orderInfo[field] = order;
-      }else{
-        delete orderInfo[field];
-      }
-    }
-    setOrderInfo({...orderInfo});
-    console.log(`${JSON.stringify(orderInfo)}`);
-    refresh();
-    
-    
-    
-  }
-
-  const getSearchValue=async ()=>{
-    let value={};
-    value = search;
-
-    if(beforeSearch){
-      value = beforeSearch(value);
-    }
-    return value;
-
-  }
-  const btnSearch=async ()=>{
-    let value = await getSearchValue();
-    if(value){
-      refresh({searchValue:value});
-    }
-  }
-  const btnReset=()=>{
-    formRef.resetFields();
-  }
-
-  const refresh= async ({searchValue,pageValue,orderValue}={})=>{
-    searchValue = searchValue || search;
-    pageValue = pageValue || pagination;
-
-    // 排序暂无
-    // orderValue = orderValue || orderInfo;
-    // let order=[];
-    // if(orderValue){
-    //   Object.keys(orderValue).map(name=>{
-    //     if(orderValue[name]==='ascend'){
-    //       order.push(`${name}`);
-    //     }else if(orderValue[name]==='descend'){
-    //       order.push(`-${name}`);
-    //     }
-    //   })
-    // }
-
-    let {current,pageSize} = pageValue;
-    let params = {...searchValue,page:current,pageSize:pageSize};
-    if(beforeService)params=beforeService(params);
-    if(!params)return;
-    let ret = await service(params);
-    if(ret?.code==0){
-      const {page} = ret.data;
-      setPagination({
-        current:page.pageNum||1,
-        pageSize:page.pageSize||10,
-        total:page.total,
-        startIdx:(page.page-1)*page.pageSize
-      })
-    }
-
-    if(updateData)updateData(ret);
-    return ret;
-  }
-
-
-  return {
-    onPaginationChange,
-    pagination,
-    btnSearch,
-    search,
-    setSearch,
-    refresh,
-    btnReset,
-    onSorter
-    
-  };
-
-}
-
-export default useSearch;

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;