From 84119e6a06c1b3c69fb88429dd94a3a0e6deb32a Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 8 Aug 2024 15:31:01 +0800 Subject: [PATCH] style: action style improve (#5018) * style: action style improve * style: style improve * style: style improve --- .../core/client/src/schema-component/antd/action/Action.tsx | 4 ++-- .../antd/grid-card/GridCard.Decorator.style.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx index 8e6645c16d..3c61383c0e 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -133,9 +133,9 @@ export const Action: ComposedAction = withDynamicSchemaProps( return { ...style, opacity: designable && (field?.data?.hidden || !aclCtx) && 0.1, - color: disabled ? 'rgba(0, 0, 0, 0.25)' : null, + color: disabled ? 'rgba(0, 0, 0, 0.25)' : style?.color, }; - }, [aclCtx, designable, field?.data?.hidden, style, disabled, disabled]); + }, [aclCtx, designable, field?.data?.hidden, style, disabled]); const handleMouseEnter = useCallback( (e) => { diff --git a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.style.ts b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.style.ts index 3c5792e37b..dd641ed636 100644 --- a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.style.ts +++ b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.style.ts @@ -21,7 +21,10 @@ const useStyles = genStyleHook('nb-grid-card', (token) => { }, '.ant-list-pagination': { padding: token.marginLG, background: token.colorBgContainer }, }, - '.ant-formily-item-feedback-layout-loose': { marginBottom: 0 }, + '.ant-formily-item-feedback-layout-loose': { marginBottom: 5 }, + '.ant-formily-item-feedback-layout-loose .ant-formily-item-label': { + marginBottom: -8, + }, }, }; });