fix(comp:tag): modify tag normal bg color (#1792)

IDuxFE · Jan 8, 2024 · 5990a28 · 5990a28
1 parent 664c34b
commit 5990a28
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/packages/components/tag/theme/default.ts b/packages/components/tag/theme/default.ts
@@ -5,22 +5,34 @@
  * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE
  */
 
-import { type CertainThemeTokens, type GlobalThemeTokens, getAlphaColor } from '@idux/components/theme'
-export function getDefaultThemeTokens(tokens: GlobalThemeTokens): CertainThemeTokens<'tag'> {
+import {
+  type CertainThemeTokens,
+  type GlobalThemeTokens,
+  type ThemeTokenAlgorithms,
+  getAlphaColor,
+} from '@idux/components/theme'
+export function getDefaultThemeTokens(
+  tokens: GlobalThemeTokens,
+  algrithms: ThemeTokenAlgorithms,
+): CertainThemeTokens<'tag'> {
   const {
     lineWidth,
     borderRadiusSm,
     tagCompColorAlpha,
+    colorTextInfo,
     colorSuccessBg,
     colorInfoBg,
     colorWarningBg,
     colorRiskBg,
     colorErrorBg,
     colorFatalBg,
   } = tokens
+  const { getGreyColors } = algrithms
+  const greyColors = getGreyColors()
 
   return {
-    bgColorFilled: '#99acd1',
+    bgColorNormal: getAlphaColor(colorTextInfo, tagCompColorAlpha),
+    bgColorFilled: greyColors.base,
     borderWidth: lineWidth,
     borderRadius: borderRadiusSm,
 

diff --git a/packages/components/tag/theme/index.ts b/packages/components/tag/theme/index.ts
@@ -9,8 +9,8 @@ import type { TokenGetter } from '@idux/components/theme'
 
 import { getDefaultThemeTokens } from './default'
 
-export const getThemeTokens: TokenGetter<'tag'> = (tokens, presetTheme) => {
-  return presetTheme === 'default' ? getDefaultThemeTokens(tokens) : getDefaultThemeTokens(tokens)
+export const getThemeTokens: TokenGetter<'tag'> = (tokens, presetTheme, algrithms) => {
+  return presetTheme === 'default' ? getDefaultThemeTokens(tokens, algrithms) : getDefaultThemeTokens(tokens, algrithms)
 }
 
 export type { TagThemeTokens } from './tokens'
diff --git a/packages/components/tag/theme/tokens.ts b/packages/components/tag/theme/tokens.ts
@@ -7,7 +7,12 @@
 
 export interface TagThemeTokens {
   /**
-   * @desc 标签背景颜色
+   * @desc 标签普通背景颜色
+   */
+  bgColorNormal: string
+
+  /**
+   * @desc 标签填充背景颜色
    */
   bgColorFilled: string