Commit e8348e05 authored by super-lin0's avatar super-lin0

fix some compile err

parent 4b592c1d
{
"name": "nemean-cli",
"version": "0.2.8",
"version": "0.2.9",
"main": "src/index.js",
"bin": "bin/npmrc.js",
"license": "ISC",
......
......@@ -9,20 +9,20 @@ import ProLayout, {
BasicLayoutProps as ProLayoutProps,
Settings,
DefaultFooter,
SettingDrawer
} from "@ant-design/pro-layout";
import React, { useEffect } from "react";
import Link from "umi/link";
import { Dispatch } from "redux";
import { connect } from "dva";
import { Icon } from "antd";
import { formatMessage } from "umi-plugin-react/locale";
SettingDrawer,
} from '@ant-design/pro-layout';
import React, { useEffect, useState } from 'react';
import Link from 'umi/link';
import { Dispatch } from 'redux';
import { connect } from 'dva';
import { Icon } from 'antd';
import { formatMessage } from 'umi-plugin-react/locale';
import Authorized from "@/utils/Authorized";
import RightContent from "@/components/GlobalHeader/RightContent";
import { ConnectState } from "@/models/connect";
import { isAntDesignPro } from "@/utils/utils";
import logo from "../assets/logo.svg";
import Authorized from '@/utils/Authorized';
import RightContent from '@/components/GlobalHeader/RightContent';
import { ConnectState } from '@/models/connect';
import { isAntDesignPro } from '@/utils/utils';
import logo from '../assets/logo.svg';
export interface BasicLayoutProps extends ProLayoutProps {
breadcrumbNameMap: {
......@@ -31,7 +31,7 @@ export interface BasicLayoutProps extends ProLayoutProps {
settings: Settings;
dispatch: Dispatch;
}
export type BasicLayoutContext = { [K in "location"]: BasicLayoutProps[K] } & {
export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & {
breadcrumbNameMap: {
[path: string]: MenuDataItem;
};
......@@ -44,7 +44,7 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
menuList.map(item => {
const localItem = {
...item,
children: item.children ? menuDataRender(item.children) : []
children: item.children ? menuDataRender(item.children) : [],
};
return Authorized.check(item.authority, localItem, null) as MenuDataItem;
});
......@@ -54,28 +54,28 @@ const defaultFooterDom = (
copyright="2019 蚂蚁金服体验技术部出品"
links={[
{
key: "Ant Design Pro",
title: "Ant Design Pro",
href: "https://pro.ant.design",
blankTarget: true
key: 'Ant Design Pro',
title: 'Ant Design Pro',
href: 'https://pro.ant.design',
blankTarget: true,
},
{
key: "github",
key: 'github',
title: <Icon type="github" />,
href: "https://github.com/ant-design/ant-design-pro",
blankTarget: true
href: 'https://github.com/ant-design/ant-design-pro',
blankTarget: true,
},
{
key: "Ant Design",
title: "Ant Design",
href: "https://ant.design",
blankTarget: true
}
key: 'Ant Design',
title: 'Ant Design',
href: 'https://ant.design',
blankTarget: true,
},
]}
/>
);
const footerRender: BasicLayoutProps["footerRender"] = () => {
const footerRender: BasicLayoutProps['footerRender'] = () => {
if (!isAntDesignPro()) {
return defaultFooterDom;
}
......@@ -84,15 +84,11 @@ const footerRender: BasicLayoutProps["footerRender"] = () => {
{defaultFooterDom}
<div
style={{
padding: "0px 24px 24px",
textAlign: "center"
padding: '0px 24px 24px',
textAlign: 'center',
}}
>
<a
href="https://www.netlify.com"
target="_blank"
rel="noopener noreferrer"
>
<a href="https://www.netlify.com" target="_blank" rel="noopener noreferrer">
<img
src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg"
width="82px"
......@@ -116,10 +112,10 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
useEffect(() => {
if (dispatch) {
dispatch({
type: "user/fetchCurrent"
type: 'user/fetchCurrent',
});
dispatch({
type: "settings/getSetting"
type: 'settings/getSetting',
});
}
}, []);
......@@ -130,8 +126,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
const handleMenuCollapse = (payload: boolean): void => {
if (dispatch) {
dispatch({
type: "global/changeLayoutCollapsed",
payload
type: 'global/changeLayoutCollapsed',
payload,
});
}
};
......@@ -149,18 +145,18 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
}}
breadcrumbRender={(routers = []) => [
{
path: "/",
path: '/',
breadcrumbName: formatMessage({
id: "menu.home",
defaultMessage: "Home"
})
id: 'menu.home',
defaultMessage: 'Home',
}),
},
...routers
...routers,
]}
itemRender={(route, params, routes, paths) => {
const first = routes.indexOf(route) === 0;
return first ? (
<Link to={paths.join("/")}>{route.breadcrumbName}</Link>
<Link to={paths.join('/')}>{route.breadcrumbName}</Link>
) : (
<span>{route.breadcrumbName}</span>
);
......@@ -174,15 +170,12 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
>
{children}
</ProLayout>
<SettingDrawer
settings={settings}
onSettingChange={config => setSettingss(config)}
/>
<SettingDrawer settings={settings} onSettingChange={config => setSettingss(config)} />
</>
);
};
export default connect(({ global, settings }: ConnectState) => ({
collapsed: global.collapsed,
settings
settings,
}))(BasicLayout);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment