ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: hiding the title of a subform will hide all embedded titles (#1904)

Browse Source 
* fix: hiding the title of a subform will hide all embedded titles

* fix: display title not immediately effective
This commit is contained in:
katherinehhh 2023-05-23 09:50:20 +08:00 committed by GitHub
parent 0318034b7c
commit d0f2bd96a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
View File

@ -84,7 +84,7 @@ export const FormItem: any = observer((props: any) => {
`,
{
[css`
& .ant-formily-item-label {
> .ant-formily-item-label {
display: none;
}
`]: showTitle === false,

10
packages/core/client/src/schema-items/GeneralSchemaItems.tsx
View File

@ -1,5 +1,5 @@
import { Field } from '@formily/core';
import { ISchema, useField, useFieldSchema } from '@formily/react';
import { ISchema, useField, useFieldSchema,observer } from '@formily/react';
import _ from 'lodash';
import { useTranslation } from 'react-i18next';
import React from 'react';
@ -9,7 +9,7 @@ import { SchemaSettings } from '../schema-settings';
export const GeneralSchemaItems: React.FC<{
required?: boolean;
}> = (props) => {
}> = observer((props) => {
const { required = true } = props;
const { getCollectionJoinField } = useCollectionManager();
const { getField } = useCollection();
@ -18,7 +18,7 @@ export const GeneralSchemaItems: React.FC<{
const { t } = useTranslation();
const { dn, refresh } = useDesignable();
const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
console.log(field,field.decoratorProps )
return (
<>
{collectionField && (
@ -60,6 +60,8 @@ export const GeneralSchemaItems: React.FC<{
checked={field.decoratorProps.showTitle ?? true}
title={t('Display title')}
onChange={(checked) => {
fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
fieldSchema['x-decorator-props']['showTitle'] = checked;
field.decoratorProps.showTitle = checked;
dn.emit('patch', {
schema: {
@ -158,4 +160,4 @@ export const GeneralSchemaItems: React.FC<{
)}
</>
);
};
});