From 3648854909239997723ec1560192fb0266df2dd4 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Fri, 9 Aug 2024 14:00:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20info=E9=A2=9C=E8=89=B2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20https://gitee.com/dapppp/ruoyi-plus-vben5/issues/IAIR1X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/components/Dict/src/data.tsx | 5 +---- apps/web-antd/src/views/system/user/index.vue | 2 +- packages/effects/hooks/src/use-design-tokens.ts | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/web-antd/src/components/Dict/src/data.tsx b/apps/web-antd/src/components/Dict/src/data.tsx index 3172110a..68395f8a 100644 --- a/apps/web-antd/src/components/Dict/src/data.tsx +++ b/apps/web-antd/src/components/Dict/src/data.tsx @@ -16,10 +16,7 @@ export const tagTypes: TagType = { orange: { color: 'orange', label: 'orange' }, /** 自定义预设 color可以为16进制颜色 */ pink: { color: 'pink', label: 'pink' }, - /** - * 新版processing参数有问题 暂时用blue代替 - */ - primary: { color: 'blue', label: '主要(primary)' }, + primary: { color: 'processing', label: '主要(primary)' }, purple: { color: 'purple', label: 'purple' }, red: { color: 'red', label: 'red' }, success: { color: 'success', label: '成功(success)' }, diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index df1df7a2..46b45a69 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -64,7 +64,7 @@ const deviceOptions = getDictOptions('sys_device_type'); - + processing success error diff --git a/packages/effects/hooks/src/use-design-tokens.ts b/packages/effects/hooks/src/use-design-tokens.ts index 8cf4f922..9bd129a1 100644 --- a/packages/effects/hooks/src/use-design-tokens.ts +++ b/packages/effects/hooks/src/use-design-tokens.ts @@ -36,6 +36,8 @@ export function useAntdDesignTokens() { () => { tokens.colorPrimary = getCssVariableValue('--primary'); + tokens.colorInfo = getCssVariableValue('--primary'); + tokens.colorError = getCssVariableValue('--destructive'); tokens.colorWarning = getCssVariableValue('--warning');