kn-cli 1.0.46 → 1.0.48

package/build/cli.config.js

@@ -6,6 +6,9 @@ module.exports = {
     javascriptEnabled:false,//是否开启less js
   },
   version:'1.0',
+  // rules:{
+  //   compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  // },
   // https:true,//是否使用https本地调试
   // pxtorem:false,//默认:true,开启px转rem模式
   // site_root_path:'/dist/',// 默认:'',站点根目录

package/build/webpack.config.js

@@ -110,88 +110,58 @@ if(!hashMode){
 ////////////// OUTPUT-END ///////////////
 
 /////////////// RULES ////////////////
+
+const LOADER_JS=[
+  {
+    loader: 'babel-loader',
+    options: {
+      presets: [
+        '@babel/preset-react',
+        [
+          '@babel/preset-env',
+          {
+            targets: devMode
+              ? { chrome: '90' }
+              : {
+                  chrome: '40',
+                  ie: '11',
+                },
+          },
+        ],
+      ],
+      plugins: [
+        ['@babel/plugin-transform-runtime', { corejs: 3 }],
+        '@babel/plugin-proposal-optional-chaining',
+        '@babel/plugin-proposal-nullish-coalescing-operator',
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+        ['@babel/plugin-proposal-private-methods', { loose: true }],
+        ['@babel/plugin-proposal-class-properties', { loose: true }],
+        // ["import", {
+        //   style: false,//"css",
+        //   libraryName: "kn-hooks" ,
+        //   libraryDirectory:"src",
+        //   camel2DashComponentName:false,
+        // }],
+        // ["import", {
+        //   style: true,//"css",
+        //   libraryDirectory:"",
+        //   libraryName: "antd" ,
+        // }]
+      ],
+    },
+  },
+]
+
 const rules= [
   {
     test: /\.js[x]?$/,
     exclude: /node_modules/,
-    use: [
-      {
-        loader: 'babel-loader',
-        options: {
-          presets: [
-            '@babel/preset-react',
-            [
-              '@babel/preset-env',
-              {
-                targets: devMode
-                  ? { chrome: '90' }
-                  : {
-                      chrome: '40',
-                      ie: '11',
-                    },
-              },
-            ],
-          ],
-          plugins: [
-            ['@babel/plugin-transform-runtime', { corejs: 3 }],
-            '@babel/plugin-proposal-optional-chaining',
-            '@babel/plugin-proposal-nullish-coalescing-operator',
-            ['@babel/plugin-proposal-decorators', { legacy: true }],
-            ['@babel/plugin-proposal-private-methods', { loose: true }],
-            ['@babel/plugin-proposal-class-properties', { loose: true }],
-            // ["import", {
-            //   style: false,//"css",
-            //   libraryName: "kn-hooks" ,
-            //   libraryDirectory:"src",
-            //   camel2DashComponentName:false,
-            // }],
-            // ["import", {
-            //   style: true,//"css",
-            //   libraryDirectory:"",
-            //   libraryName: "antd" ,
-            // }]
-          ],
-        },
-      },
-    ],
+    use: LOADER_JS,
   },
   // {
   //   test: /\.json$/,
   //   use: 'json-loader'
   // },
-  {
-    test: /\.js[x]?$/,
-    include: /kn-hooks/,
-    use: [
-      {
-        loader: 'babel-loader',
-        options: {
-          presets: [
-            '@babel/preset-react',
-            [
-              '@babel/preset-env',
-              {
-                targets: devMode
-                  ? { chrome: '80' }
-                  : {
-                      chrome: '40',
-                      ie: '11',
-                    },
-              },
-            ],
-          ],
-          plugins: [
-            ['@babel/plugin-transform-runtime', { corejs: 3 }],
-            '@babel/plugin-proposal-optional-chaining',
-            '@babel/plugin-proposal-nullish-coalescing-operator',
-            ['@babel/plugin-proposal-decorators', { legacy: true }],
-            ['@babel/plugin-proposal-private-methods', { loose: true }],
-            ['@babel/plugin-proposal-class-properties', { loose: true }],
-          ],
-        },
-      },
-    ],
-  },
   {
     test: /\.(jpg|png|gif|svg)$/,
     loader: 'url-loader',
@@ -291,6 +261,16 @@ if(support_sass){
     ],
   })
 }
+if(CLI_CONFIG.rules){
+  if(CLI_CONFIG.rules.compileNpmPackage){
+    let JS_LIST= CLI_CONFIG.rules.compileNpmPackage.join('|');
+    rules.push({
+      test: /\.js[x]?$/,
+      include: new RegExp(`(${JS_LIST})`),
+      use: LOADER_JS
+    },)
+  }
+}
 ////////////// RULES-END ///////////////
 
 
@@ -320,6 +300,13 @@ if(jsSplitMode){
   }
   optimization.splitChunks= {
     cacheGroups: {
+      knHooks:{
+        test: /(kn-hooks)/,
+        priority: 10220,
+        name: 'kn-hooks',
+        chunks: 'all',
+        enforce: true,
+      },
       react: {
         test: /(react)/,
         priority: 100,
@@ -381,7 +368,7 @@ const plugins= [
 
 
 if(indexHtml){
-  const shareJs = jsSplitMode?['react-bundle', 'modules-bundle', 'default-bundle', 'styles-bundle']:[];
+  const shareJs = jsSplitMode?['react-bundle', 'modules-bundle', 'default-bundle', 'styles-bundle','kn-hooks']:[];
   if(jsSplitMode===true || jsSplitMode?.runtime !== false){
     shareJs.splice(0,0,'runtime');
   }

package/package.json

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

package/readme.md

@@ -62,10 +62,20 @@ module.exports = {
   // }
   // pxtorem:false,//默认:true,开启px转rem模式
   // https:true,//是否使用https本地调试
+  // rules:{
+  //   compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  // },
 };
 ```
 
 # 更新日志
+* 1.0.48  
+  1. cli.config增加rules:{compileNpmPackage:[]}配置，用于配置一些需要参与编译的npm包  
+  2. 更新app及后管项目的模板  
+
+* 1.0.47  
+  后管模板工程对菜单路由的隐藏子路由控制方法  
+
 * 1.0.46  
   模板工程下增加jsconfig.json用于解决配置资源根目录别名后vscode无法快捷定位文件  
   

package/templates/template_admin/cli.config.js

@@ -5,6 +5,9 @@ module.exports = {
   less:{
     javascriptEnabled:true,//是否开启less js
   },
+  rules:{
+    compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  },
   cssModule: (resourcePath) => {
     console.log(resourcePath)
     // antd.less编译的时候使用global模式

package/templates/template_admin/package.json

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

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

@@ -62,10 +62,19 @@ const LeftMenu=(props)=>{
     let groupKeys=[];
     for(let key in menuList){
       const menuItem = menuList[key];
-      const {path,routeTemplate}= menuItem.source;
+      const {path,routeTemplate,subRoute}= menuItem.source;
       if(path){
         let fn = matchPath;
         let match= fn(routeTemplate||path,curRoute.pathname);
+        if(!match&&subRoute){
+          match= subRoute.some(sub=>{
+            let subMatch= fn(sub.routeTemplate||sub.path,curRoute.pathname);
+            if(subMatch){
+              return true;
+            }
+            return false;
+          })
+        }
         if(match){
           groupKeys = menuItem.routepath?menuItem.routepath.split('-'):'';
         }

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

@@ -11,7 +11,22 @@ import styles from './index.less';
 import {GET_MENU} from '@/services/auth';
 
 
-
+/**
+ * 菜单下的隐藏子路由集
+ * 当这些隐藏子路由打开的时候，导航栏的选中菜单会显示被匹配的这个子菜单
+ */
+const SUB_MENU_CONFIG=[
+  {
+    path:'/video',//匹配菜单路由是/video的菜单
+    // routeTemplate:''匹配某个模板菜单的模板
+    subRoute:[
+      {
+        path:'/video/detail',//将video/detail这个路由匹配给菜单/video
+        // routeTemplate:''//也可以将某个路由模板匹配给某个菜单
+      }
+    ]
+  },
+]
 
 /**
  * 顶部导航栏
@@ -66,17 +81,31 @@ const TopMenu=(props)=>{
     return item;
   }
 
+  const getSubConfig=(menu)=>{
+    const {url,routeTemplate}= menu;
+    for(let i=0;i<SUB_MENU_CONFIG.length;i++){
+      let sub= SUB_MENU_CONFIG[i];
+      if(routeTemplate&&sub.routeTemplate&&routeTemplate==sub.routeTemplate){
+        return sub.subRoute;
+      }
+      if(url&&sub.path&&url==sub.path){
+        return sub.subRoute;
+      }
+    }
+    return null;
+  }
   const transServicesMenuChildren=(menu)=>{
     let req=[];
     for(let i=0;i<menu.length;i++){
       let item= menu[i];
-      const {url:path,name:label,icon,children:menus}= item;
+      const {url:path,name:label,icon,children:menus,routeTemplate}= item;
       let children;
       if(menus&&menus.length>0){
         children= transServicesMenuChildren(menus);
       }
+      let subRoute= getSubConfig(item);
       req.push({
-        path,label,icon,children
+        path,label,icon,children,routeTemplate,subRoute
       })
     }
     return req;
@@ -111,10 +140,20 @@ const TopMenu=(props)=>{
   }
 
   const GET_ROUTE_MENU=(menu)=>{
-    const {routeTemplate,path} = menu;
+    const {routeTemplate,path,subRoute} = menu;
     const children = menu.children||menu.menus||null;
     if(routeTemplate||path){
       let match= matchPath(routeTemplate||path,curRoute.pathname);
+      if(!match&&subRoute){
+        match= subRoute.some(sub=>{
+          let subMatch= matchPath(sub.routeTemplate||sub.path,curRoute.pathname);
+          if(subMatch){
+            console.log(`match sub route: ${sub.routeTemplate||sub.path} -> ${curRoute.pathname}` )
+            return true;
+          }
+          return false;
+        });
+      }
       if(match){
         console.log(`match route: ${routeTemplate||path} -> ${curRoute.pathname}` )
         return true;

package/templates/template_app/cli.config.js

@@ -6,6 +6,9 @@ module.exports = {
     javascriptEnabled:false,//是否开启less js
   },
   version:'1.0',
+  rules:{
+    compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  },
   // 自定义多入口
   // entry:{
   //   'home/index': 'src/jsx/home/index.jsx',

package/templates/template_app/package.json

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

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

@@ -3,16 +3,13 @@
 import useImageLoader from './useImageLoader';
 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} from 'kn-hooks';
+
 export {
+  usePagination,
   useImageLoader,
   useDelay,
   usePreload,
-  useSearch,
-  useUpdate,
-  useNextPage,
-  useLoading
+  useLoading,
 }

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

@@ -33,13 +33,11 @@ async function GET_USER_LIST(req,res){
   }
   return {
     code:0,
-    data:{
-      list:data,
-      page:{
-        pageNum:current,
-        pageSize:pageSize,
-        total:MAX_TOTAL
-      }
+    data:data,
+    page:{
+      current:current,
+      pageSize:pageSize,
+      total:MAX_TOTAL
     }
   }
 }

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

@@ -0,0 +1,30 @@
+import React, { useEffect, useState, useRef } from 'react';
+import {List} from 'antd-mobile';
+import {useUserType} from '@/dictionary';
+import ShowToast from '@/components/Toast';
+
+
+import styles from './index.less';
+
+const Page = () => {
+  const emUserType= useUserType();
+
+  return (
+    <section id="wall" className={styles.wall}>
+      <List header='字典'>
+        {
+          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>
+          })
+        }
+      </List>
+
+    </section>
+  )
+}
+
+export default Page;

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

@@ -0,0 +1,22 @@
+
+.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_app/public/src/pages/index.jsx

@@ -1,13 +1,11 @@
-import React, { useEffect, useState, useRef } from 'react';
-import {PullToRefresh ,InfiniteScroll,List} from 'antd-mobile';
-import {useNextPage,useLoading} from '@/hooks';
-import {GET_USER_LIST} from '@/services/user';
+import React from 'react';
+import {PullToRefresh ,List} from 'antd-mobile';
+import {useLoading} from '@/hooks';
 import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
 
 import ProviderApp from '@/provider/app';
 import moment from 'moment';
 import ShowToast from '@/components/Toast';
-import {useUserType} from '@/dictionary';
 import {AuthShow} from '@/components/Auth';
 
 import styles from './index.less';
@@ -17,54 +15,9 @@ const Page = () => {
   const providerApp = ProviderApp.useContainer();
   const query = useParams();
   const [search] = useSearchParams();
-  const request = useNextPage({
-    service:GET_USER_LIST,
-  })
-  const [list,setList]= useState([]);
   const loading = useLoading();
   const loadingCanTouch = useLoading({canTouch:true});
 
-  const emUserType= useUserType();
-
-  useEffect(()=>{
-    let ret=[];
-    request?.data?.forEach(page=>{
-      try{
-      ret = [...ret,...page];
-      }catch(ex){
-        console.error(ex)
-        debugger;
-      }
-    })
-    setList(ret);
-
-  },[request.data])
-
-
-  const onReset= async ()=>{
-    return request.reset();
-  }
-
-  const onNextPage= async ()=>{
-    if(loading.loading>0){
-      return;
-    }
-    loading.setLoading(true)
-    let dom = document.querySelector('#wall');
-    dom.scrollTop-=200;
-    await request.nextPage();
-    loading.setLoading(false)
-    return true;
-  }
-  const refresh=async ()=>{
-    loading.setLoading(true)
-    await request.refresh(); 
-    loading.setLoading(false);
-  }
-  useEffect(()=>{
-    refresh();
-  },[]);
-
   return (
     <section id="wall" className={styles.wall}>
       <PullToRefresh className={styles.wrap}
@@ -134,31 +87,15 @@ const Page = () => {
             loadingCanTouch.setLoading(false);
           }}>打开全局loading-持续3秒(不阻止交互)</List.Item>
         </List>
-        
-        <List header='字典'>
-          {
-            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>
-            })
-          }
+        <List header='UI组件'>
+          <List.Item key='scrollList' onClick={()=>{navigate('/list')}}>下拉刷新及滚动加载</List.Item>
         </List>
 
-        <List header='下拉刷新，滚动加载案例'>
-          {
-            list.map((item,idx)=>{
-              return (
-                <List.Item key={item.name}>{item.name}-{item.resetCount}</List.Item>
-              )
-            })
-          }
+        <List header='其它'>
+          <List.Item key='dictionary' onClick={()=>{navigate('/dictionary')}}>字典</List.Item>
         </List>
     
       </PullToRefresh>
-      <InfiniteScroll threshold={40} loadMore={onNextPage} hasMore={request.pagination.more} />
 
     </section>
   )

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

@@ -0,0 +1,81 @@
+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 styles from './index.less';
+
+const Page = () => {
+  const request = usePagination({
+    service:GET_USER_LIST,
+  })
+  const [list,setList]= useState([]);
+  const loading = useLoading();
+
+
+  useEffect(()=>{
+    let ret=[];
+    request?.data?.forEach(page=>{
+      try{
+      ret = [...ret,...page];
+      }catch(ex){
+        console.error(ex)
+        debugger;
+      }
+    })
+    setList(ret);
+
+  },[request.data])
+
+
+  const onReset= async ()=>{
+    return request.reset();
+  }
+
+  const onNextPage= async ()=>{
+    if(loading.loading>0){
+      return;
+    }
+    loading.setLoading(true)
+    let dom = document.querySelector('#wall');
+    dom.scrollTop-=200;
+    await request.nextPage();
+    loading.setLoading(false)
+    return true;
+  }
+  const refresh=async ()=>{
+    loading.setLoading(true)
+    await request.update(); 
+    loading.setLoading(false);
+  }
+  useEffect(()=>{
+    refresh();
+  },[]);
+
+  return (
+    <section id="wall" className={styles.wall}>
+      <PullToRefresh className={styles.wrap}
+        onRefresh={async () => {
+          await onReset();
+          return true;
+        }}
+      >
+        <List header='下拉刷新，滚动加载案例'>
+          {
+            list.map((item,idx)=>{
+              return (
+                <List.Item key={item.name}>{item.name}-{item.resetCount}</List.Item>
+              )
+            })
+          }
+        </List>
+    
+      </PullToRefresh>
+      <InfiniteScroll threshold={40} loadMore={onNextPage} hasMore={request.pagination.more} />
+
+    </section>
+  )
+}
+
+export default Page;

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

@@ -0,0 +1,22 @@
+
+.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_app/public/src/route.jsx

@@ -3,6 +3,10 @@ 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';
 export const RouteList = (
@@ -13,6 +17,10 @@ export const RouteList = (
         <Route path='/' element={<Navigate to='/demo/1001?type=test&name=demo' />} />
         <Route path='/demo/:id' element={<Home />} />
         <Route path='/user'  element={<AuthLogin><User /></AuthLogin>} />
+        <Route path='/list'  element={<List />} />
+        <Route path='/dictionary'  element={<Dictionary />} />
+        
+
       </Route>
       <Route path='/login' element={<Login />} />
     </Route>

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;