diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx index b4c7d17528..9105d05eda 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx @@ -51,7 +51,7 @@ export const FormItem: any = withDynamicSchemaProps( const field = useField(); const schema = useFieldSchema(); const { addActiveFieldName } = useFormActiveFields() || {}; - const { wrapperStyle } = useDataFormItemProps(); + const { wrapperStyle }: { wrapperStyle: any } = useDataFormItemProps(); useParseDefaultValue(); useLazyLoadDisplayAssociationFieldsOfForm(); @@ -95,7 +95,15 @@ export const FormItem: any = withDynamicSchemaProps( )} > - + 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 46dade7aed..721142e38f 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 @@ -602,12 +602,16 @@ const InternalBodyCellComponent = React.memo((props) => const { record, schema, rowIndex, isSubTable, ...others } = props; const styleRules = schema?.[LinkageRuleDataKeyMap['style']]; const [dynamicStyle, setDynamicStyle] = useState({}); + const isReadyPrettyMode = + !!schema?.properties && Object.values(schema.properties).some((item) => item['x-read-pretty'] === true); const style = useMemo(() => ({ ...props.style, ...dynamicStyle }), [props.style, dynamicStyle]); return ( <> {/* To improve rendering performance, do not render GetStyleRules component when no style rules are set */} - {!_.isEmpty(styleRules) && } + {!_.isEmpty(styleRules) && ( + + )} {props.children}