fix: fixed-layout catchBlock error, sidebar form render with node expanded (#323)

* fix: sidebar form render

* fix(fixed-layout): catch block error

apps/demo-fixed-layout/src/form-components/form-content/index.tsx

@@ -15,12 +15,10 @@ export function FormContent(props: { children?: React.ReactNode }) {
   const registry = node.getNodeRegistry<FlowNodeRegistry>();
   return (
     <FormWrapper>
-      {expanded ? (
-        <>
-          {isSidebar && <FormTitleDescription>{registry.info?.description}</FormTitleDescription>}
-          {props.children}
-        </>
-      ) : undefined}
+      <>
+        {isSidebar && <FormTitleDescription>{registry.info?.description}</FormTitleDescription>}
+        {(expanded || isSidebar) && props.children}
+      </>
     </FormWrapper>
   );
 }

apps/demo-free-layout/src/form-components/form-content/index.tsx

@@ -15,12 +15,10 @@ export function FormContent(props: { children?: React.ReactNode }) {
   const registry = node.getNodeRegistry<FlowNodeRegistry>();
   return (
     <FormWrapper>
-      {expanded ? (
-        <>
-          {isSidebar && <FormTitleDescription>{registry.info?.description}</FormTitleDescription>}
-          {props.children}
-        </>
-      ) : undefined}
+      <>
+        {isSidebar && <FormTitleDescription>{registry.info?.description}</FormTitleDescription>}
+        {(expanded || isSidebar) && props.children}
+      </>
     </FormWrapper>
   );
 }

packages/canvas-engine/fixed-layout-core/src/activities/try-catch.ts

@@ -109,7 +109,7 @@ export const TryCatchRegistry: FlowNodeRegistry = {
     const parent = node.document.getNode(`$catchInlineBlocks$${node.id}`);
     const block = node.document.addNode({
       id: blockData.id,
-      type: node.type || TryCatchTypeEnum.CATCH_BLOCK,
+      type: blockData.type || TryCatchTypeEnum.CATCH_BLOCK,
       originParent: node,
       parent,
       data: blockData.data,