|
|
@@ -1,7 +1,4 @@
|
|
|
import React, {useMemo, useState} from 'react';
|
|
|
-import queryString from 'query-string';
|
|
|
-import PageHeader from "@layout/PageHeader";
|
|
|
-import AppGrid from "@layout/AppGrid";
|
|
|
import Popup from "@components/Popup";
|
|
|
import { useNavigate } from 'react-router-dom';
|
|
|
import {ROUTE_TYPE_FULL, ROUTE_TYPE_IN, ROUTE_TYPE_POP} from "@constants/routes";
|
|
|
@@ -10,38 +7,11 @@ const RouteWrapper = (props) => {
|
|
|
const { Comp, route} = props;
|
|
|
const navigate = useNavigate()
|
|
|
/** useMemo 缓存query，避免每次生成生的query */
|
|
|
- // const queryMemo = useMemo(() => {
|
|
|
- // const queryReg = /\?\S*/g;
|
|
|
- // const matchQuery = (reg) => {
|
|
|
- // const queryParams = restProps.location.search.match(reg);
|
|
|
- // return queryParams ? queryParams[0] : '{}';
|
|
|
- // };
|
|
|
- // return queryString.parse(matchQuery(queryReg));
|
|
|
- // }, [restProps.location.search]);
|
|
|
- // const mergeQueryToProps = () => {
|
|
|
- // const queryReg = /\?\S*/g;
|
|
|
- // const removeQueryInRouter = (restProps, reg) => {
|
|
|
- // const { params } = restProps.match;
|
|
|
- // Object.keys(params).forEach((key) => {
|
|
|
- // params[key] = params[key] && params[key].replace(reg, '');
|
|
|
- // });
|
|
|
- // restProps.match.params = { ...params };
|
|
|
- // };
|
|
|
- //
|
|
|
- // restProps = removeQueryInRouter(restProps, queryReg);
|
|
|
- // const merge = {
|
|
|
- // ...restProps,
|
|
|
- // query: queryMemo,
|
|
|
- // };
|
|
|
- // return merge;
|
|
|
- // };
|
|
|
const renderIn=()=>{
|
|
|
let isexit=false;
|
|
|
if (Comp!=null)isexit=true;
|
|
|
return (
|
|
|
<>
|
|
|
- {/*<PageHeader title={i18n.t(`links.${route.title}`)}/>*/}
|
|
|
- {/*<Comp {...mergeQueryToProps()} />*/}
|
|
|
{
|
|
|
isexit?<Comp />:<></>
|
|
|
}
|
