diff --git a/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx b/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx index 6982a829c..436ba9070 100644 --- a/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx @@ -1,7 +1,7 @@ import { ISchema, useField, useFieldSchema } from '@formily/react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { useCompile, useDesignable, useFixedBlockDesignerSetting } from '../..'; +import { FixedBlockDesignerItem, useCompile, useDesignable } from '../..'; import { useCalendarBlockContext } from '../../../block-provider'; import { useCollection, useCollectionManager } from '../../../collection-manager'; import { useCollectionFilterOptions } from '../../../collection-manager/action-hooks'; @@ -21,7 +21,6 @@ export const CalendarDesigner = () => { const defaultFilter = fieldSchema?.['x-decorator-props']?.params?.filter || {}; const fieldNames = fieldSchema?.['x-decorator-props']?.['fieldNames'] || {}; const defaultResource = fieldSchema?.['x-decorator-props']?.resource; - const fixedBlockDesignerSetting = useFixedBlockDesignerSetting(); return ( @@ -62,7 +61,7 @@ export const CalendarDesigner = () => { dn.refresh(); }} /> - {fixedBlockDesignerSetting} + { const { name, title } = useCollection(); @@ -20,7 +20,6 @@ export const KanbanDesigner = () => { const defaultFilter = fieldSchema?.['x-decorator-props']?.params?.filter || {}; const defaultResource = fieldSchema?.['x-decorator-props']?.resource; const template = useSchemaTemplate(); - const fixedBlockDesignerSetting = useFixedBlockDesignerSetting(); return ( @@ -55,7 +54,7 @@ export const KanbanDesigner = () => { }); }} /> - {fixedBlockDesignerSetting} + diff --git a/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx b/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx index 065258539..1c3cb3568 100644 --- a/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx +++ b/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx @@ -41,9 +41,13 @@ export const useFixedBlock = () => { export const FixedBlockWrapper: React.FC = (props) => { const fixedBlock = useFixedSchema(); const { height, fixedBlockUID } = useFixedBlock(); - - // The fixedBlockUID of false means that the page has no fixed blocks - if (!fixedBlock && fixedBlockUID) return null; + const record = useRecord(); + const isPopup = Object.keys(record); + /** + * The fixedBlockUID of false means that the page has no fixed blocks + * isPopup means that the FixedBlock is in the popup mode + */ + if (!fixedBlock && fixedBlockUID && !isPopup) return null; return (
{ ); }; -export const useFixedBlockDesignerSetting = () => { +export const FixedBlockDesignerItem = () => { const field = useField(); const { t } = useTranslation(); const fieldSchema = useFieldSchema(); diff --git a/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx index 870c2b26d..96d77a74a 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx +++ b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx @@ -53,14 +53,7 @@ export const ReadPrettyRecordPicker: React.FC = observer((props: any) => { {snapshot ? ( text ) : isTagsMode ? ( - - {text} - + {text} ) : ( { @@ -75,7 +68,7 @@ export const ReadPrettyRecordPicker: React.FC = observer((props: any) => { )} - {index < arr.length - 1 && !isTagsMode ? , : null} + {index < arr.length - 1 ? , : null} ); }); diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx index c5767e0c5..bc9907c12 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx @@ -10,7 +10,7 @@ import { FilterBlockType } from '../../../filter-provider/utils'; import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings'; import { useSchemaTemplate } from '../../../schema-templates'; import { useDesignable } from '../../hooks'; -import { useFixedBlockDesignerSetting } from '../page'; +import { FixedBlockDesignerItem } from '../page'; export const TableBlockDesigner = () => { const { name, title, sortable } = useCollection(); @@ -41,7 +41,6 @@ export const TableBlockDesigner = () => { const collection = useCollection(); const { dragSort, resource } = field.decoratorProps; const treeChildren = resource?.includes('.') ? getCollectionField(resource)?.treeChildren : !!collection?.tree; - const fixedBlockDesignerSetting = useFixedBlockDesignerSetting(); return ( @@ -82,7 +81,7 @@ export const TableBlockDesigner = () => { }} /> )} - {fixedBlockDesignerSetting} + { const defaultZoom = fieldSchema?.['x-component-props']?.['zoom'] || 13; const template = useSchemaTemplate(); - const fixedBlockDesignerSetting = useFixedBlockDesignerSetting(); const mapFieldOptions = getCollectionFieldsOptions(collection?.name, ['point', 'lineString', 'polygon']); const markerFieldOptions = getCollectionFieldsOptions(collection?.name, 'string'); @@ -41,7 +40,7 @@ export const MapBlockDesigner = () => { return ( - {fixedBlockDesignerSetting} +