合并冲突

packages/workflow/src/Interface.ts

@@ -10,6 +10,13 @@ export type CanvasConnectionPort = {
     [key: string]: any
 }
 
+export interface CanvasElementPortWithRenderData extends CanvasConnectionPort {
+	handleId: string
+	connectionsCount: number
+	isConnecting: boolean
+	position: Position
+	offset?: { top?: string; left?: string }
+}
 export interface IWorkflowNode extends Node {
 	data: {
 		inputs: CanvasConnectionPort[]

packages/workflow/src/components/elements/CanvasNode.vue

@@ -75,14 +75,14 @@ const outputs = computed(() =>
 
 <template>
     <div class="w-full h-full bg-#fff box-border border-2 border-solid border-#dcdcdc rounded-4px relative">
-        <div className="w-full h-full relative flex items-center justify-center">
+        <div class="w-full h-full relative flex items-center justify-center">
             <Icon :icon="data?.icon" height="40" width="40" :color="data?.iconColor" />
         </div>
 
-        <div className="absolute w-full bottom--22px text-12px text-center text-#222">
+        <div class="absolute w-full bottom--22px text-12px text-center text-#222">
             {{ data?.displayName }}
         </div>
-        <div className="absolute w-full bottom--38px text-12px text-center text-#999 truncate">
+        <div class="absolute w-full bottom--38px text-12px text-center text-#999 truncate">
             {{ data.subtitle }}
         </div>