Commit bed8717f authored by Sendya's avatar Sendya

fix: themeColor key toUpperCase vueComponent/ant-design-vue-pro/issues/1270

parent 750db02a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
export default { export default {
navTheme: 'dark', // theme for nav menu 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` layout: 'sidemenu', // nav menu position: `sidemenu` or `topmenu`
contentWidth: 'Fluid', // layout of content: `Fluid` or `Fixed`, only works when layout is topmenu contentWidth: 'Fluid', // layout of content: `Fluid` or `Fixed`, only works when layout is topmenu
fixedHeader: false, // sticky header fixedHeader: false, // sticky header
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
</template> </template>
<script> <script>
import { updateTheme } from '@ant-design-vue/pro-layout'
import { asyncRouterMap } from '../config/router.config' import { asyncRouterMap } from '../config/router.config'
import { i18nRender } from '../locales' import { i18nRender } from '../locales'
...@@ -106,6 +107,9 @@ export default { ...@@ -106,6 +107,9 @@ export default {
created () { created () {
this.menus = asyncRouterMap.find(item => item.path === '/').children this.menus = asyncRouterMap.find(item => item.path === '/').children
// first created, init theme...
updateTheme(defaultSettings.primaryColor)
this.$watch('$route', () => { this.$watch('$route', () => {
this.handleRouteUpdate() this.handleRouteUpdate()
}) })
......
{ {
"name": "@ant-design-vue/pro-layout", "name": "@ant-design-vue/pro-layout",
"version": "1.0.10", "version": "1.0.11",
"main": "./lib/index.js", "main": "./lib/index.js",
"module": "./es/index.js", "module": "./es/index.js",
"repository": { "repository": {
......
...@@ -50,18 +50,18 @@ const ThemeColor = { ...@@ -50,18 +50,18 @@ const ThemeColor = {
<h3 class={`${baseClassName}-title`}>{title}</h3> <h3 class={`${baseClassName}-title`}>{title}</h3>
<div class={`${baseClassName}-content`}> <div class={`${baseClassName}-content`}>
{colors.map(item => { {colors.map(item => {
const themeKey = genThemeToString(item.key) const themeKey = genThemeToString(item.key.toUpperCase())
const check = value === item.key || genThemeToString(value) === item.key const check = value.toUpperCase() === item.key.toUpperCase() || genThemeToString(value.toUpperCase()) === item.key.toUpperCase()
return ( return (
<Tooltip <Tooltip
key={item.color} key={item.color.toUpperCase()}
title={themeKey ? i18n(`app.setting.themecolor.${themeKey}`) : item.key} title={themeKey ? i18n(`app.setting.themecolor.${themeKey}`) : item.key.toUpperCase()}
> >
<Tag <Tag
class={`${baseClassName}-block`} class={`${baseClassName}-block`}
color={item.color} color={item.color.toUpperCase()}
check={check} check={check}
onClick={() => handleChange(item.key)} onClick={() => handleChange(item.key.toUpperCase())}
/> />
</Tooltip> </Tooltip>
) )
......
...@@ -23,7 +23,7 @@ export const layoutContentWidth = (contentType) => { ...@@ -23,7 +23,7 @@ export const layoutContentWidth = (contentType) => {
const themeConfig = { const themeConfig = {
daybreak: 'daybreak', daybreak: 'daybreak',
'#1890ff': 'daybreak', '#1890FF': 'daybreak',
'#F5222D': 'dust', '#F5222D': 'dust',
'#FA541C': 'volcano', '#FA541C': 'volcano',
'#FAAD14': 'sunset', '#FAAD14': 'sunset',
......
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