From a460b1f1f54d58608192bc9106e5121437b0fa40 Mon Sep 17 00:00:00 2001 From: jack zhang <1098626505@qq.com> Date: Fri, 26 Jul 2024 15:20:30 +0800 Subject: [PATCH] fix: remove theme token (#4947) --- packages/core/client/src/global-theme/type.ts | 4 ---- .../src/schema-component/antd/card-item/style.ts | 4 ---- .../plugin-mobile/src/client/mobile/Mobile.tsx | 2 +- .../client/antd-token-previewer/meta/category.ts | 2 +- .../token-panel-pro/token-meta.json | 16 ---------------- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/packages/core/client/src/global-theme/type.ts b/packages/core/client/src/global-theme/type.ts index ada711a918d..d41b7ffee13 100644 --- a/packages/core/client/src/global-theme/type.ts +++ b/packages/core/client/src/global-theme/type.ts @@ -47,10 +47,6 @@ export interface CustomToken extends AliasToken { marginBlock: number; /** 区块的圆角 */ borderRadiusBlock: number; - /** 区块的 boxShadow */ - boxShadowBlock: string; - /** 区块的下边框 */ - borderBottomBlock: string; } export interface ThemeConfig extends _ThemeConfig { diff --git a/packages/core/client/src/schema-component/antd/card-item/style.ts b/packages/core/client/src/schema-component/antd/card-item/style.ts index db0948111a9..ee7be96f5c0 100644 --- a/packages/core/client/src/schema-component/antd/card-item/style.ts +++ b/packages/core/client/src/schema-component/antd/card-item/style.ts @@ -15,10 +15,6 @@ const useStyles = genStyleHook('nb-card-item', (token) => { return { [componentCls]: { marginBottom: token.marginBlock, - '> .ant-card': { - boxShadow: token.boxShadowBlock, - borderBottom: token.borderBottomBlock, - }, }, }; }); diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx index ffe39d81ad3..b9e25282a8f 100644 --- a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx +++ b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx @@ -52,7 +52,7 @@ export const Mobile = () => { token: { marginBlock: 18, borderRadiusBlock: 0, - boxShadowBlock: 'none', + boxShadowTertiary: 'none', }, }} > diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/meta/category.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/meta/category.ts index ebc5ad6366a..04ec2621e6c 100644 --- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/meta/category.ts +++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/meta/category.ts @@ -262,7 +262,7 @@ const category: TokenTree = [ nameEn: 'Shadow', desc: '', descEn: '', - mapToken: ['boxShadow', 'boxShadowSecondary', 'boxShadowBlock'], + mapToken: ['boxShadow', 'boxShadowSecondary'], }, ], }, diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/token-meta.json b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/token-meta.json index 782fdbc46c1..86978d2a49c 100644 --- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/token-meta.json +++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/token-meta.json @@ -1759,21 +1759,5 @@ "descEn": "Used to set the radius of the block", "type": "number", "source": "map" - }, - "boxShadowBlock": { - "name": "区块的阴影", - "nameEn": "Shadow of block", - "desc": "用于设置区块的阴影", - "descEn": "Used to set the shadow of the block", - "type": "string", - "source": "map" - }, - "borderBottomBlock": { - "name": "区块的底边框", - "nameEn": "Bottom border of block", - "desc": "用于设置区块的底边框", - "descEn": "Used to set the bottom border of the block", - "type": "string", - "source": "map" } }