Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-layout
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
packages
pro-layout
Commits
bed8717f
Commit
bed8717f
authored
Nov 30, 2021
by
Sendya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: themeColor key toUpperCase vueComponent/ant-design-vue-pro/issues/1270
parent
750db02a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
9 deletions
+13
-9
defaultSettings.js
examples/src/config/defaultSettings.js
+1
-1
BasicLayout.vue
examples/src/layouts/BasicLayout.vue
+4
-0
package.json
package.json
+1
-1
ThemeColor.jsx
src/components/SettingDrawer/ThemeColor.jsx
+6
-6
util.js
src/utils/util.js
+1
-1
No files found.
examples/src/config/defaultSettings.js
View file @
bed8717f
...
...
@@ -14,7 +14,7 @@
export
default
{
navTheme
:
'dark'
,
// theme for nav menu
primaryColor
:
'#
52C41A
'
,
// primary color of ant design
primaryColor
:
'#
1890ff
'
,
// primary color of ant design
layout
:
'sidemenu'
,
// nav menu position: `sidemenu` or `topmenu`
contentWidth
:
'Fluid'
,
// layout of content: `Fluid` or `Fixed`, only works when layout is topmenu
fixedHeader
:
false
,
// sticky header
...
...
examples/src/layouts/BasicLayout.vue
View file @
bed8717f
...
...
@@ -54,6 +54,7 @@
</template>
<
script
>
import
{
updateTheme
}
from
'@ant-design-vue/pro-layout'
import
{
asyncRouterMap
}
from
'../config/router.config'
import
{
i18nRender
}
from
'../locales'
...
...
@@ -106,6 +107,9 @@ export default {
created
()
{
this
.
menus
=
asyncRouterMap
.
find
(
item
=>
item
.
path
===
'/'
).
children
// first created, init theme...
updateTheme
(
defaultSettings
.
primaryColor
)
this
.
$watch
(
'$route'
,
()
=>
{
this
.
handleRouteUpdate
()
})
...
...
package.json
View file @
bed8717f
{
"name"
:
"@ant-design-vue/pro-layout"
,
"version"
:
"1.0.1
0
"
,
"version"
:
"1.0.1
1
"
,
"main"
:
"./lib/index.js"
,
"module"
:
"./es/index.js"
,
"repository"
:
{
...
...
src/components/SettingDrawer/ThemeColor.jsx
View file @
bed8717f
...
...
@@ -50,18 +50,18 @@ const ThemeColor = {
<
h3
class=
{
`${baseClassName}-title`
}
>
{
title
}
</
h3
>
<
div
class=
{
`${baseClassName}-content`
}
>
{
colors
.
map
(
item
=>
{
const
themeKey
=
genThemeToString
(
item
.
key
)
const
check
=
value
===
item
.
key
||
genThemeToString
(
value
)
===
item
.
key
const
themeKey
=
genThemeToString
(
item
.
key
.
toUpperCase
()
)
const
check
=
value
.
toUpperCase
()
===
item
.
key
.
toUpperCase
()
||
genThemeToString
(
value
.
toUpperCase
())
===
item
.
key
.
toUpperCase
()
return
(
<
Tooltip
key=
{
item
.
color
}
title=
{
themeKey
?
i18n
(
`app.setting.themecolor.${themeKey}`
)
:
item
.
key
}
key=
{
item
.
color
.
toUpperCase
()
}
title=
{
themeKey
?
i18n
(
`app.setting.themecolor.${themeKey}`
)
:
item
.
key
.
toUpperCase
()
}
>
<
Tag
class=
{
`${baseClassName}-block`
}
color=
{
item
.
color
}
color=
{
item
.
color
.
toUpperCase
()
}
check=
{
check
}
onClick=
{
()
=>
handleChange
(
item
.
key
)
}
onClick=
{
()
=>
handleChange
(
item
.
key
.
toUpperCase
()
)
}
/>
</
Tooltip
>
)
...
...
src/utils/util.js
View file @
bed8717f
...
...
@@ -23,7 +23,7 @@ export const layoutContentWidth = (contentType) => {
const
themeConfig
=
{
daybreak
:
'daybreak'
,
'#1890
ff
'
:
'daybreak'
,
'#1890
FF
'
:
'daybreak'
,
'#F5222D'
:
'dust'
,
'#FA541C'
:
'volcano'
,
'#FAAD14'
:
'sunset'
,
...
...
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