fix(examples): 修复 engine-browser-examples 中类型错误问题

didi · Jul 2, 2024 · 14bca37 · 14bca37
1 parent df729da
commit 14bca37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/examples/engine-browser-examples/src/pages/graph/index.tsx b/examples/engine-browser-examples/src/pages/graph/index.tsx
@@ -118,7 +118,7 @@ export default function BasicNode() {
     ]
 
     map(elements, (customElement) => {
-      lf.register(customElement)
+      lf.register(customElement as LogicFlow.RegisterConfig)
     })
   }
   const registerEvents = (lf: LogicFlow) => {
@@ -261,7 +261,7 @@ export default function BasicNode() {
   const handleRefreshGraph = () => {
     const lf = lfRef.current
     if (lf) {
-      const data = lf.getGraphData()
+      const data = lf.getGraphRawData()
       console.log('current graph data', data)
       const refreshData = LogicFlowUtil.refreshGraphId(data)
       console.log('after refresh graphId', data)
@@ -288,15 +288,15 @@ export default function BasicNode() {
 
   const handleTurnAnimationOn = () => {
     if (lfRef.current) {
-      const { edges } = lfRef.current.getGraphData() as GraphConfigData
+      const { edges } = lfRef.current.getGraphRawData()
       forEach(edges, (edge) => {
         lfRef.current?.openEdgeAnimation(edge.id)
       })
     }
   }
   const handleTurnAnimationOff = () => {
     if (lfRef.current) {
-      const { edges } = lfRef.current.getGraphData() as GraphConfigData
+      const { edges } = lfRef.current.getGraphRawData()
       forEach(edges, (edge) => {
         lfRef.current?.closeEdgeAnimation(edge.id)
       })

diff --git a/examples/engine-browser-examples/src/pages/graph/nodes/combine.ts b/examples/engine-browser-examples/src/pages/graph/nodes/combine.ts
@@ -1,6 +1,11 @@
-import { h, BaseNode, BaseNodeModel } from '@logicflow/core'
+import { h, BaseNode, BaseNodeModel, GraphModel } from '@logicflow/core'
 
-export class CombineNode extends BaseNode {
+export type ICombineNodeProps = {
+  model: CombineModel
+  graphModel: GraphModel
+}
+
+export class CombineNode extends BaseNode<ICombineNodeProps> {
   getShape() {
     const { x, y } = this.props.model
     const { fill } = this.props.model.getNodeStyle()

diff --git a/examples/engine-browser-examples/src/pages/graph/nodes/uml.ts b/examples/engine-browser-examples/src/pages/graph/nodes/uml.ts
@@ -32,7 +32,7 @@ export class UmlModel extends HtmlNodeModel {
   }
 }
 export class UmlNode extends HtmlNode {
-  setHtml(rootEl: HTMLElement) {
+  setHtml(rootEl: SVGForeignObjectElement) {
     const { properties } = this.props.model
     const el = document.createElement('div')
     el.className = 'uml-wrapper'

diff --git a/packages/core/src/LogicFlow.tsx b/packages/core/src/LogicFlow.tsx
@@ -1403,7 +1403,7 @@ export namespace LogicFlow {
   }
   export type Point = {
     id?: string
-    [key: string]: any
+    [key: string]: any // TODO: 确认这个属性是干什么的呢？是有可以移除
   } & Position
   export type PointTuple = [number, number]
   export type ClientPosition = {
@@ -1435,7 +1435,7 @@ export namespace LogicFlow {
     value: string
     editable?: boolean
     draggable?: boolean
-  } & Point
+  } & Position
 
   export type AppendConfig = {
     startIndex: number