diff --git a/packages/core/client/src/schema-component/antd/grid/Grid.tsx b/packages/core/client/src/schema-component/antd/grid/Grid.tsx index ba8cce62c8..19472c2728 100644 --- a/packages/core/client/src/schema-component/antd/grid/Grid.tsx +++ b/packages/core/client/src/schema-component/antd/grid/Grid.tsx @@ -358,16 +358,7 @@ export const Grid: any = observer( return ( -
+
diff --git a/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx b/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx index 8d1a7bd909..9658fb2d78 100644 --- a/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx +++ b/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx @@ -46,10 +46,10 @@ const useStyle = (isSearchable: IconPickerProps['searchable']) => })(); function IconField(props: IconPickerProps) { - const { fontSizeHeading3 } = theme.useToken().token; + const { fontSizeXL } = theme.useToken().token; const availableIcons = [...icons.keys()]; const layout = useFormLayout(); - const { value, onChange, disabled, iconSize = fontSizeHeading3, searchable = true } = props; + const { value, onChange, disabled, iconSize = fontSizeXL, searchable = true } = props; const [visible, setVisible] = useState(false); const [filteredIcons, setFilteredIcons] = useState(availableIcons); const { t } = useTranslation(); diff --git a/packages/core/client/src/schema-component/antd/list/List.tsx b/packages/core/client/src/schema-component/antd/list/List.tsx index f33ec4d666..855975315b 100644 --- a/packages/core/client/src/schema-component/antd/list/List.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.tsx @@ -75,46 +75,47 @@ const InternalList = (props) => { componentCls, hashId, css` - .ant-spin-nested-loading { + .nb-list-container { height: ${height ? height + 'px' : '100%'}; - overflow-y: ${height ? 'auto' : 'null'}; - .ant-spin-container { - width: 100%; - overflow-x: clip; - padding-right: ${token.paddingSM + 'px'}; - } + overflow-y: auto; + margin-left: -${token.marginLG}px; + margin-right: -${token.marginLG}px; + padding-left: ${token.marginLG}px; + padding-right: ${token.marginLG}px; } `, )} > - - {field.value?.length - ? field.value.map((item, index) => { - return ( - - ); - }) - : null} - +
+ + {field.value?.length + ? field.value.map((item, index) => { + return ( + + ); + }) + : null} + +
, diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx index aefe1d7f69..c47bb4ec55 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx @@ -16,6 +16,7 @@ import { useAPIClient, withDynamicSchemaProps, useProps, + useDataSourceManager, } from '@nocobase/client'; import { useRemoteCollectionContext } from '../CollectionFields'; @@ -24,7 +25,7 @@ export const TitleField = withDynamicSchemaProps( const { t } = useTranslation(); const { isTitleField } = useCollectionManager_deprecated(); const [loadingRecord, setLoadingRecord] = React.useState(null); - + const dm = useDataSourceManager(); // 新版 UISchema(1.0 之后)中已经废弃了 useProps,这里之所以继续保留是为了兼容旧版的 UISchema const { setTitleField, filterByTk, dataSourceKey } = useProps(props); @@ -41,6 +42,7 @@ export const TitleField = withDynamicSchemaProps( message.success(t('Saved successfully')); refreshRM(); setTitleField(checked ? record.name : 'id'); + await dm.getDataSource(dataSourceKey).reload(); setLoadingRecord(null); }; return isTitleField(record) ? (