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 afb84e2c72..227a1b32ac 100644 --- a/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx +++ b/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx @@ -53,16 +53,7 @@ export const FixedBlockWrapper: React.FC = (props) => { * isPopup means that the FixedBlock is in the popup mode */ if (!fixedBlock && fixedBlockUID) return <>{props.children}; - return ( -
- {props.children} -
- ); + return
{props.children}
; }; export interface FixedBlockProps { @@ -99,14 +90,7 @@ export const FixedBlock: React.FC = (props) => { }; return ( -
- {props.children} -
+
{props.children}
); }; diff --git a/packages/plugins/@nocobase/plugin-block-iframe/src/client/Iframe.tsx b/packages/plugins/@nocobase/plugin-block-iframe/src/client/Iframe.tsx index 8de3945c86..4e542e32a9 100644 --- a/packages/plugins/@nocobase/plugin-block-iframe/src/client/Iframe.tsx +++ b/packages/plugins/@nocobase/plugin-block-iframe/src/client/Iframe.tsx @@ -63,7 +63,7 @@ export const Iframe: any = observer( try { const tempUrl = await replaceVariableValue(url, variables, localVariables); const queryString = await parseVariablesAndChangeParamsToQueryString({ - searchParams: params, + searchParams: params || [], variables, localVariables, replaceVariableValue, diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx index f80691cd9e..2b803a31f5 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx @@ -60,7 +60,7 @@ const InternalKanbanBlockProvider = (props) => { service, resource, groupField, - fixedBlock: field?.decoratorProps?.fixedBlock, + // fixedBlock: field?.decoratorProps?.fixedBlock, sortField: props?.sortField, }} > diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/board/hook.ts b/packages/plugins/@nocobase/plugin-kanban/src/client/board/hook.ts index 087ad879f4..e58b78c237 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/board/hook.ts +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/board/hook.ts @@ -28,7 +28,7 @@ export const useKanbanBlockHeight = () => { const blockTitleHeaderHeight = title ? token.fontSizeLG * token.lineHeightLG + token.padding * 2 - 1 : 0; - const footerheight = token.padding + 2 * token.marginSM + token.paddingLG + 10; + const footerheight = token.padding + 2 * token.marginSM + token.paddingLG + (designable ? 0 : 10); return height - actionBarHeight - kanbanHeaderHeight - footerheight - blockTitleHeaderHeight; };