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
A
ant-design-pro
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
duanledexianxianxian
ant-design-pro
Commits
31efd937
Commit
31efd937
authored
Jun 28, 2019
by
陈帅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade scaffolding
fix #4637, ci is hung up up deps
parent
e5dad691
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
29 additions
and
37 deletions
+29
-37
.eslintrc.js
.eslintrc.js
+2
-5
package.json
package.json
+5
-7
src/components/GlobalHeader/AvatarDropdown.tsx
src/components/GlobalHeader/AvatarDropdown.tsx
+3
-3
src/components/GlobalHeader/NoticeIconView.tsx
src/components/GlobalHeader/NoticeIconView.tsx
+5
-5
src/components/GlobalHeader/RightContent.tsx
src/components/GlobalHeader/RightContent.tsx
+4
-4
src/layouts/UserLayout.tsx
src/layouts/UserLayout.tsx
+3
-3
src/models/global.ts
src/models/global.ts
+3
-2
src/models/setting.ts
src/models/setting.ts
+0
-2
src/models/user.ts
src/models/user.ts
+2
-2
src/pages/Authorized.tsx
src/pages/Authorized.tsx
+2
-3
src/typings.d.ts
src/typings.d.ts
+0
-1
No files found.
.eslintrc.js
View file @
31efd937
const
fabric
=
require
(
'
@umijs/fabric
'
);
const
{
strictEslint
}
=
require
(
'
@umijs/fabric
'
);
module
.
exports
=
{
...
fabric
.
default
,
rules
:
{
...
fabric
.
default
.
rules
,
},
...
strictEslint
,
globals
:
{
ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION
:
true
,
page
:
true
,
...
...
package.json
View file @
31efd937
...
...
@@ -54,7 +54,7 @@
"not ie <= 10"
],
"dependencies"
:
{
"
@ant-design/pro-layout
"
:
"
^4.5.
0
"
,
"
@ant-design/pro-layout
"
:
"
^4.5.
7
"
,
"
@antv/data-set
"
:
"
^0.10.2
"
,
"
antd
"
:
"
^3.19.1
"
,
"
classnames
"
:
"
^2.2.6
"
,
...
...
@@ -67,7 +67,6 @@
"
path-to-regexp
"
:
"
^3.0.0
"
,
"
prop-types
"
:
"
^15.7.2
"
,
"
qs
"
:
"
^6.7.0
"
,
"
rc-animate
"
:
"
^2.8.3
"
,
"
react
"
:
"
^16.8.6
"
,
"
react-container-query
"
:
"
^0.11.0
"
,
"
react-copy-to-clipboard
"
:
"
^5.0.1
"
,
...
...
@@ -76,10 +75,10 @@
"
react-media
"
:
"
^1.9.2
"
,
"
react-media-hook2
"
:
"
^1.0.5
"
,
"
redux
"
:
"
^4.0.1
"
,
"
umi
"
:
"
^2.
7.2
"
,
"
umi
"
:
"
^2.
8.7
"
,
"
umi-plugin-pro-block
"
:
"
^1.3.2
"
,
"
umi-plugin-react
"
:
"
^1.
8.2
"
,
"
umi-request
"
:
"
^1.0.
7
"
"
umi-plugin-react
"
:
"
^1.
9.5
"
,
"
umi-request
"
:
"
^1.0.
8
"
},
"devDependencies"
:
{
"
@ant-design/colors
"
:
"
^3.1.0
"
,
...
...
@@ -91,8 +90,7 @@
"
@types/react
"
:
"
^16.8.19
"
,
"
@types/react-document-title
"
:
"
^2.0.3
"
,
"
@types/react-dom
"
:
"
^16.8.4
"
,
"
@umijs/fabric
"
:
"
^1.0.4
"
,
"
babel-eslint
"
:
"
^10.0.1
"
,
"
@umijs/fabric
"
:
"
^1.1.0
"
,
"
chalk
"
:
"
^2.4.2
"
,
"
check-prettier
"
:
"
^1.0.3
"
,
"
cross-env
"
:
"
^5.2.0
"
,
...
...
src/components/GlobalHeader/AvatarDropdown.tsx
View file @
31efd937
import
{
Avatar
,
Icon
,
Menu
,
Spin
}
from
'
antd
'
;
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
{
ClickParam
}
from
'
antd/es/menu
'
;
import
{
CurrentUser
}
from
'
@/models/user
'
;
import
{
FormattedMessage
}
from
'
umi-plugin-react/locale
'
;
import
React
from
'
react
'
;
import
{
connect
}
from
'
dva
'
;
import
router
from
'
umi/router
'
;
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
{
CurrentUser
}
from
'
@/models/user
'
;
import
HeaderDropdown
from
'
../HeaderDropdown
'
;
import
styles
from
'
./index.less
'
;
...
...
src/components/GlobalHeader/NoticeIconView.tsx
View file @
31efd937
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
React
,
{
Component
}
from
'
react
'
;
import
{
Tag
,
message
}
from
'
antd
'
;
import
{
CurrentUser
}
from
'
@/models/user
'
;
import
NoticeIcon
from
'
../NoticeIcon
'
;
import
{
NoticeItem
}
from
'
@/models/global
'
;
import
{
connect
}
from
'
dva
'
;
import
{
formatMessage
}
from
'
umi-plugin-react/locale
'
;
import
groupBy
from
'
lodash/groupBy
'
;
import
moment
from
'
moment
'
;
import
{
NoticeItem
}
from
'
@/models/global
'
;
import
NoticeIcon
from
'
../NoticeIcon
'
;
import
{
CurrentUser
}
from
'
@/models/user
'
;
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
styles
from
'
./index.less
'
;
export
interface
GlobalHeaderRightProps
extends
ConnectProps
{
...
...
src/components/GlobalHeader/RightContent.tsx
View file @
31efd937
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
{
Icon
,
Tooltip
}
from
'
antd
'
;
import
React
from
'
react
'
;
import
{
connect
}
from
'
dva
'
;
import
{
formatMessage
}
from
'
umi-plugin-react/locale
'
;
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
Avatar
from
'
./AvatarDropdown
'
;
import
HeaderSearch
from
'
../HeaderSearch
'
;
import
React
from
'
react
'
;
import
SelectLang
from
'
../SelectLang
'
;
import
{
connect
}
from
'
dva
'
;
import
{
formatMessage
}
from
'
umi-plugin-react/locale
'
;
import
styles
from
'
./index.less
'
;
export
type
SiderTheme
=
'
light
'
|
'
dark
'
;
...
...
src/layouts/UserLayout.tsx
View file @
31efd937
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
{
DefaultFooter
,
MenuDataItem
,
getMenuData
,
getPageTitle
}
from
'
@ant-design/pro-layout
'
;
import
DocumentTitle
from
'
react-document-title
'
;
import
Link
from
'
umi/link
'
;
import
React
from
'
react
'
;
import
SelectLang
from
'
@/components/SelectLang
'
;
import
{
connect
}
from
'
dva
'
;
import
{
formatMessage
}
from
'
umi-plugin-react/locale
'
;
import
SelectLang
from
'
@/components/SelectLang
'
;
import
{
ConnectProps
,
ConnectState
}
from
'
@/models/connect
'
;
import
logo
from
'
../assets/logo.svg
'
;
import
styles
from
'
./UserLayout.less
'
;
...
...
src/models/global.ts
View file @
31efd937
import
{
Effect
}
from
'
./connect.d
'
;
import
{
NoticeIconData
}
from
'
@/components/NoticeIcon
'
;
import
{
Reducer
}
from
'
redux
'
;
import
{
Subscription
}
from
'
dva
'
;
import
{
Effect
}
from
'
./connect.d
'
;
import
{
NoticeIconData
}
from
'
@/components/NoticeIcon
'
;
import
{
queryNotices
}
from
'
@/services/user
'
;
export
interface
NoticeItem
extends
NoticeIconData
{
...
...
src/models/setting.ts
View file @
31efd937
import
{
Reducer
}
from
'
redux
'
;
// eslint-disable-next-line eslint-comments/disable-enable-pair
/* eslint-disable promise/catch-or-return */
import
{
message
}
from
'
antd
'
;
import
defaultSettings
,
{
DefaultSettings
}
from
'
../../config/defaultSettings
'
;
import
themeColorClient
from
'
../components/SettingDrawer/themeColorClient
'
;
...
...
src/models/user.ts
View file @
31efd937
import
{
queryCurrent
,
query
as
queryUsers
}
from
'
@/services/user
'
;
import
{
Effect
}
from
'
dva
'
;
import
{
Reducer
}
from
'
redux
'
;
import
{
queryCurrent
,
query
as
queryUsers
}
from
'
@/services/user
'
;
export
interface
CurrentUser
{
avatar
?:
string
;
name
?:
string
;
...
...
src/pages/Authorized.tsx
View file @
31efd937
import
{
ConnectProps
,
ConnectState
,
Route
,
UserModelState
}
from
'
@/models/connect
'
;
import
Authorized
from
'
@/utils/Authorized
'
;
import
React
from
'
react
'
;
import
Redirect
from
'
umi/redirect
'
;
import
{
connect
}
from
'
dva
'
;
import
pathToRegexp
from
'
path-to-regexp
'
;
import
Authorized
from
'
@/utils/Authorized
'
;
import
{
ConnectProps
,
ConnectState
,
Route
,
UserModelState
}
from
'
@/models/connect
'
;
interface
AuthComponentProps
extends
ConnectProps
{
user
:
UserModelState
;
...
...
src/typings.d.ts
View file @
31efd937
...
...
@@ -12,7 +12,6 @@ declare module '*.jpeg';
declare
module
'
*.gif
'
;
declare
module
'
*.bmp
'
;
declare
module
'
*.tiff
'
;
declare
module
'
rc-animate
'
;
declare
module
'
omit.js
'
;
declare
module
'
react-copy-to-clipboard
'
;
declare
module
'
react-fittext
'
;
...
...
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