From bed4f2922a6bf6940cda5f5735a80cda8ab7b03d Mon Sep 17 00:00:00 2001 From: Katherine Date: Tue, 6 Aug 2024 13:34:22 +0800 Subject: [PATCH 1/2] fix: disabled action to maintain font color on mouse hover (#4988) --- .../core/client/src/schema-component/antd/action/Action.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2f47549d91..5486119772 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -159,8 +159,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, }; - }, [designable, field?.data?.hidden, style]); + }, [designable, field?.data?.hidden, style, disabled]); const handleMouseEnter = useCallback( (e) => { From b13f40c455f1c0e75b881afc017b1cbb5a16dff2 Mon Sep 17 00:00:00 2001 From: jack zhang <1098626505@qq.com> Date: Fri, 2 Aug 2024 15:34:16 +0800 Subject: [PATCH 2/2] fix(T-4927): table performance bug (#4978) --- .../src/schema-component/antd/table-v2/Table.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx index 690884e47e..82eb8a9bf5 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx @@ -96,7 +96,7 @@ const useTableColumns = (props: { showDel?: boolean; isSubTable?: boolean }) => return buf; }, []); - // const hasChangedColumns = useColumnsDeepMemoized(columnsSchema); + const hasChangedColumns = useColumnsDeepMemoized(columnsSchema); const schemaToolbarBigger = useMemo(() => { return css` @@ -146,11 +146,11 @@ const useTableColumns = (props: { showDel?: boolean; isSubTable?: boolean }) => ); }, } as TableColumnProps; - - // 这里不能把 columnsSchema 作为依赖，因为其每次都会变化，这里使用 hasChangedColumns 作为依赖 - // eslint-disable-next-line react-hooks/exhaustive-deps }), - [columnsSchema, field.value, field.address, collection, parentRecordData, schemaToolbarBigger], + + // 这里不能把 columnsSchema 作为依赖，因为其每次都会变化，这里使用 hasChangedColumns 作为依赖 + // eslint-disable-next-line react-hooks/exhaustive-deps + [hasChangedColumns, field.value, field.address, collection, parentRecordData, schemaToolbarBigger], ); const tableColumns = useMemo(() => {