Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nemean-cli
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
superlin
nemean-cli
Commits
e8348e05
Commit
e8348e05
authored
Oct 18, 2019
by
super-lin0
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some compile err
parent
4b592c1d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
51 deletions
+44
-51
package.json
package.json
+1
-1
template/pro/src/layouts/BasicLayout.tsx
template/pro/src/layouts/BasicLayout.tsx
+43
-50
No files found.
package.json
View file @
e8348e05
{
{
"name"
:
"nemean-cli"
,
"name"
:
"nemean-cli"
,
"version"
:
"0.2.
8
"
,
"version"
:
"0.2.
9
"
,
"main"
:
"src/index.js"
,
"main"
:
"src/index.js"
,
"bin"
:
"bin/npmrc.js"
,
"bin"
:
"bin/npmrc.js"
,
"license"
:
"
ISC
"
,
"license"
:
"
ISC
"
,
...
...
template/pro/src/layouts/BasicLayout.tsx
View file @
e8348e05
...
@@ -9,20 +9,20 @@ import ProLayout, {
...
@@ -9,20 +9,20 @@ import ProLayout, {
BasicLayoutProps
as
ProLayoutProps
,
BasicLayoutProps
as
ProLayoutProps
,
Settings
,
Settings
,
DefaultFooter
,
DefaultFooter
,
SettingDrawer
SettingDrawer
,
}
from
"
@ant-design/pro-layout
"
;
}
from
'
@ant-design/pro-layout
'
;
import
React
,
{
useEffect
}
from
"
react
"
;
import
React
,
{
useEffect
,
useState
}
from
'
react
'
;
import
Link
from
"
umi/link
"
;
import
Link
from
'
umi/link
'
;
import
{
Dispatch
}
from
"
redux
"
;
import
{
Dispatch
}
from
'
redux
'
;
import
{
connect
}
from
"
dva
"
;
import
{
connect
}
from
'
dva
'
;
import
{
Icon
}
from
"
antd
"
;
import
{
Icon
}
from
'
antd
'
;
import
{
formatMessage
}
from
"
umi-plugin-react/locale
"
;
import
{
formatMessage
}
from
'
umi-plugin-react/locale
'
;
import
Authorized
from
"
@/utils/Authorized
"
;
import
Authorized
from
'
@/utils/Authorized
'
;
import
RightContent
from
"
@/components/GlobalHeader/RightContent
"
;
import
RightContent
from
'
@/components/GlobalHeader/RightContent
'
;
import
{
ConnectState
}
from
"
@/models/connect
"
;
import
{
ConnectState
}
from
'
@/models/connect
'
;
import
{
isAntDesignPro
}
from
"
@/utils/utils
"
;
import
{
isAntDesignPro
}
from
'
@/utils/utils
'
;
import
logo
from
"
../assets/logo.svg
"
;
import
logo
from
'
../assets/logo.svg
'
;
export
interface
BasicLayoutProps
extends
ProLayoutProps
{
export
interface
BasicLayoutProps
extends
ProLayoutProps
{
breadcrumbNameMap
:
{
breadcrumbNameMap
:
{
...
@@ -31,7 +31,7 @@ export interface BasicLayoutProps extends ProLayoutProps {
...
@@ -31,7 +31,7 @@ export interface BasicLayoutProps extends ProLayoutProps {
settings
:
Settings
;
settings
:
Settings
;
dispatch
:
Dispatch
;
dispatch
:
Dispatch
;
}
}
export
type
BasicLayoutContext
=
{
[
K
in
"
location
"
]:
BasicLayoutProps
[
K
]
}
&
{
export
type
BasicLayoutContext
=
{
[
K
in
'
location
'
]:
BasicLayoutProps
[
K
]
}
&
{
breadcrumbNameMap
:
{
breadcrumbNameMap
:
{
[
path
:
string
]:
MenuDataItem
;
[
path
:
string
]:
MenuDataItem
;
};
};
...
@@ -44,7 +44,7 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
...
@@ -44,7 +44,7 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
menuList
.
map
(
item
=>
{
menuList
.
map
(
item
=>
{
const
localItem
=
{
const
localItem
=
{
...
item
,
...
item
,
children
:
item
.
children
?
menuDataRender
(
item
.
children
)
:
[]
children
:
item
.
children
?
menuDataRender
(
item
.
children
)
:
[]
,
};
};
return
Authorized
.
check
(
item
.
authority
,
localItem
,
null
)
as
MenuDataItem
;
return
Authorized
.
check
(
item
.
authority
,
localItem
,
null
)
as
MenuDataItem
;
});
});
...
@@ -54,28 +54,28 @@ const defaultFooterDom = (
...
@@ -54,28 +54,28 @@ const defaultFooterDom = (
copyright
=
"2019 蚂蚁金服体验技术部出品"
copyright
=
"2019 蚂蚁金服体验技术部出品"
links
=
{
[
links
=
{
[
{
{
key
:
"
Ant Design Pro
"
,
key
:
'
Ant Design Pro
'
,
title
:
"
Ant Design Pro
"
,
title
:
'
Ant Design Pro
'
,
href
:
"
https://pro.ant.design
"
,
href
:
'
https://pro.ant.design
'
,
blankTarget
:
true
blankTarget
:
true
,
},
},
{
{
key
:
"
github
"
,
key
:
'
github
'
,
title
:
<
Icon
type
=
"github"
/>,
title
:
<
Icon
type
=
"github"
/>,
href
:
"
https://github.com/ant-design/ant-design-pro
"
,
href
:
'
https://github.com/ant-design/ant-design-pro
'
,
blankTarget
:
true
blankTarget
:
true
,
},
},
{
{
key
:
"
Ant Design
"
,
key
:
'
Ant Design
'
,
title
:
"
Ant Design
"
,
title
:
'
Ant Design
'
,
href
:
"
https://ant.design
"
,
href
:
'
https://ant.design
'
,
blankTarget
:
true
blankTarget
:
true
,
}
}
,
]
}
]
}
/>
/>
);
);
const
footerRender
:
BasicLayoutProps
[
"
footerRender
"
]
=
()
=>
{
const
footerRender
:
BasicLayoutProps
[
'
footerRender
'
]
=
()
=>
{
if
(
!
isAntDesignPro
())
{
if
(
!
isAntDesignPro
())
{
return
defaultFooterDom
;
return
defaultFooterDom
;
}
}
...
@@ -84,15 +84,11 @@ const footerRender: BasicLayoutProps["footerRender"] = () => {
...
@@ -84,15 +84,11 @@ const footerRender: BasicLayoutProps["footerRender"] = () => {
{
defaultFooterDom
}
{
defaultFooterDom
}
<
div
<
div
style
=
{
{
style
=
{
{
padding
:
"
0px 24px 24px
"
,
padding
:
'
0px 24px 24px
'
,
textAlign
:
"
center
"
textAlign
:
'
center
'
,
}
}
}
}
>
>
<
a
<
a
href
=
"https://www.netlify.com"
target
=
"_blank"
rel
=
"noopener noreferrer"
>
href
=
"https://www.netlify.com"
target
=
"_blank"
rel
=
"noopener noreferrer"
>
<
img
<
img
src
=
"https://www.netlify.com/img/global/badges/netlify-color-bg.svg"
src
=
"https://www.netlify.com/img/global/badges/netlify-color-bg.svg"
width
=
"82px"
width
=
"82px"
...
@@ -116,10 +112,10 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
...
@@ -116,10 +112,10 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
dispatch
)
{
if
(
dispatch
)
{
dispatch
({
dispatch
({
type
:
"
user/fetchCurrent
"
type
:
'
user/fetchCurrent
'
,
});
});
dispatch
({
dispatch
({
type
:
"
settings/getSetting
"
type
:
'
settings/getSetting
'
,
});
});
}
}
},
[]);
},
[]);
...
@@ -130,8 +126,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
...
@@ -130,8 +126,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
const
handleMenuCollapse
=
(
payload
:
boolean
):
void
=>
{
const
handleMenuCollapse
=
(
payload
:
boolean
):
void
=>
{
if
(
dispatch
)
{
if
(
dispatch
)
{
dispatch
({
dispatch
({
type
:
"
global/changeLayoutCollapsed
"
,
type
:
'
global/changeLayoutCollapsed
'
,
payload
payload
,
});
});
}
}
};
};
...
@@ -149,18 +145,18 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
...
@@ -149,18 +145,18 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
}
}
}
}
breadcrumbRender
=
{
(
routers
=
[])
=>
[
breadcrumbRender
=
{
(
routers
=
[])
=>
[
{
{
path
:
"
/
"
,
path
:
'
/
'
,
breadcrumbName
:
formatMessage
({
breadcrumbName
:
formatMessage
({
id
:
"
menu.home
"
,
id
:
'
menu.home
'
,
defaultMessage
:
"
Home
"
defaultMessage
:
'
Home
'
,
})
})
,
},
},
...
routers
...
routers
,
]
}
]
}
itemRender
=
{
(
route
,
params
,
routes
,
paths
)
=>
{
itemRender
=
{
(
route
,
params
,
routes
,
paths
)
=>
{
const
first
=
routes
.
indexOf
(
route
)
===
0
;
const
first
=
routes
.
indexOf
(
route
)
===
0
;
return
first
?
(
return
first
?
(
<
Link
to
=
{
paths
.
join
(
"
/
"
)
}
>
{
route
.
breadcrumbName
}
</
Link
>
<
Link
to
=
{
paths
.
join
(
'
/
'
)
}
>
{
route
.
breadcrumbName
}
</
Link
>
)
:
(
)
:
(
<
span
>
{
route
.
breadcrumbName
}
</
span
>
<
span
>
{
route
.
breadcrumbName
}
</
span
>
);
);
...
@@ -174,15 +170,12 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
...
@@ -174,15 +170,12 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
>
>
{
children
}
{
children
}
</
ProLayout
>
</
ProLayout
>
<
SettingDrawer
<
SettingDrawer
settings
=
{
settings
}
onSettingChange
=
{
config
=>
setSettingss
(
config
)
}
/>
settings
=
{
settings
}
onSettingChange
=
{
config
=>
setSettingss
(
config
)
}
/>
</>
</>
);
);
};
};
export
default
connect
(({
global
,
settings
}:
ConnectState
)
=>
({
export
default
connect
(({
global
,
settings
}:
ConnectState
)
=>
({
collapsed
:
global
.
collapsed
,
collapsed
:
global
.
collapsed
,
settings
settings
,
}))(
BasicLayout
);
}))(
BasicLayout
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment