@logicflow/core 2.0.0-beta.6 → 2.0.0-beta.8

package/src/model/node/HtmlNodeModel.ts

@@ -3,7 +3,6 @@ import { Model } from '../BaseModel'
 import { ModelType } from '../../constant'
 
 import AnchorConfig = Model.AnchorConfig
-import { observable } from 'mobx'
 import LogicFlow from '../../LogicFlow'
 import GraphModel from '../GraphModel'
 
@@ -13,16 +12,18 @@ export type IHtmlNodeProperties = {
   style?: LogicFlow.CommonTheme
   textStyle?: LogicFlow.CommonTheme
 
-  [key: string]: any
+  [key: string]: unknown
 }
 
-export class HtmlNodeModel extends BaseNodeModel {
+export class HtmlNodeModel<
+  P extends IHtmlNodeProperties = IHtmlNodeProperties,
+> extends BaseNodeModel<P> {
   modelType = ModelType.HTML_NODE
-  @observable properties: IHtmlNodeProperties = {}
+  // @observable properties: IHtmlNodeProperties = {}
 
-  constructor(data: LogicFlow.NodeConfig, graphModel: GraphModel) {
+  constructor(data: LogicFlow.NodeConfig<P>, graphModel: GraphModel) {
     super(data, graphModel)
-    this.properties = data.properties || {}
+    // this.properties = data.properties || {}
 
     this.setAttributes()
   }

package/src/model/node/PolygonNodeModel.ts

@@ -19,10 +19,12 @@ export type IPolygonNodeProperties = {
   style?: LogicFlow.CommonTheme
   textStyle?: LogicFlow.CommonTheme
 
-  [key: string]: any
+  [key: string]: unknown
 }
 
-export class PolygonNodeModel extends BaseNodeModel {
+export class PolygonNodeModel<
+  P extends IPolygonNodeProperties = IPolygonNodeProperties,
+> extends BaseNodeModel<P> {
   modelType = ModelType.POLYGON_NODE
   @observable points: PointTuple[] = [
     [50, 0],
@@ -36,11 +38,11 @@ export class PolygonNodeModel extends BaseNodeModel {
     // [10, 78],
     // [160, 198], // 五角星
   ]
-  @observable properties: IPolygonNodeProperties = {}
+  // @observable properties: IPolygonNodeProperties = {}
 
-  constructor(data: NodeConfig, graphModel: GraphModel) {
+  constructor(data: NodeConfig<P>, graphModel: GraphModel) {
     super(data, graphModel)
-    this.properties = data.properties || {}
+    // this.properties = data.properties || {}
 
     this.setAttributes()
   }

package/src/model/node/RectNodeModel.ts

@@ -5,26 +5,28 @@ import GraphModel from '../GraphModel'
 import LogicFlow from '../../LogicFlow'
 import { ModelType } from '../../constant'
 
-export type IRectNodeModel = {
+export type IRectNodeProperties = {
   width?: number
   height?: number
   radius?: number
   style?: LogicFlow.CommonTheme
   textStyle?: LogicFlow.CommonTheme
 
-  [key: string]: any
+  [key: string]: unknown
 }
 
-export class RectNodeModel extends BaseNodeModel {
+export class RectNodeModel<
+  P extends IRectNodeProperties = IRectNodeProperties,
+> extends BaseNodeModel<P> {
   modelType = ModelType.RECT_NODE
   @observable radius = 0
-  @observable properties: IRectNodeModel = {}
+  // @observable properties: P
 
-  constructor(data: LogicFlow.NodeConfig, graphModel: GraphModel) {
+  constructor(data: LogicFlow.NodeConfig<P>, graphModel: GraphModel) {
     super(data, graphModel)
 
     // TODO：类字段初始化会覆盖 super、setAttributes 中设置的属性
-    this.properties = data.properties || {}
+    // this.properties = data.properties || {}
     // TODO: bug here, 上面更新 properties 会触发 setAttributes，下面再主动调用，会导致触发两次
     this.setAttributes()
   }
@@ -48,7 +50,6 @@ export class RectNodeModel extends BaseNodeModel {
       { x: x - width / 2, y, id: `${this.id}_3` },
     ]
   }
-
   getNodeStyle() {
     const style = super.getNodeStyle()
     const { rect } = this.graphModel.theme

package/src/model/node/TextNodeModel.ts

@@ -3,18 +3,31 @@ import { computed } from 'mobx'
 import BaseNodeModel from './BaseNodeModel'
 import { ModelType } from '../../constant'
 import { getSvgTextWidthHeight } from '../../util'
+import LogicFlow from '../../LogicFlow'
 
-export class TextNodeModel extends BaseNodeModel {
+export type ITextNodeProperties = {
+  style?: LogicFlow.CommonTheme
+  textStyle?: LogicFlow.CommonTheme
+
+  [key: string]: unknown
+}
+
+export class TextNodeModel<
+  P extends ITextNodeProperties = ITextNodeProperties,
+> extends BaseNodeModel<P> {
   modelType = ModelType.TEXT_NODE
 
   getTextStyle() {
     const style = super.getTextStyle()
     const { text } = this.graphModel.theme
+    const { textStyle } = this.properties
     return {
       ...style,
       ...cloneDeep(text),
+      ...cloneDeep(textStyle),
     }
   }
+
   @computed get width(): number {
     const rows = String(this.text.value).split(/[\r\n]/g)
     const { fontSize } = this.getTextStyle()

package/src/util/index.ts

@@ -9,6 +9,7 @@ export * from './matrix'
 export * from './mobx'
 export * from './node'
 export * from './raf'
+export * from './resize'
 export * from './sampling'
 export * from './theme'
 export * from './uuid'

package/src/util/node.ts

@@ -413,6 +413,10 @@ export const pickNodeConfig = (data: NodeConfig): NodeConfig => {
     'properties',
     'virtual', // 区域节点是否为dnd添加的虚拟节点
     'rotate',
+
+    // TODO: 确认是否可以加到此处
+    'resizable',
+    'rotatable',
   ])
   return nodeData
 }

package/src/util/resize.ts

@@ -0,0 +1,286 @@
+import { ResizeControl, ResizeControlIndex } from '../view/Control'
+import { cloneDeep, find, forEach } from 'lodash-es'
+import { BaseNodeModel, GraphModel } from '../model'
+import { EventType } from '../constant'
+
+import ResizeInfo = ResizeControl.ResizeInfo
+import ResizeNodeData = ResizeControl.ResizeNodeData
+
+/**
+ * 计算 Control 拖动后，节点的高度信息
+ * @param index
+ * @param resizeInfo
+ * @param pct
+ * @param freezeWidth
+ * @param freezeHeight
+ */
+export const recalcResizeInfo = (
+  index: ResizeControlIndex,
+  resizeInfo: ResizeInfo,
+  pct = 1,
+  freezeWidth = false,
+  freezeHeight = false,
+): ResizeInfo => {
+  const nextResizeInfo = cloneDeep(resizeInfo)
+  let { deltaX, deltaY } = nextResizeInfo
+  const { width, height, PCTResizeInfo } = nextResizeInfo
+  if (PCTResizeInfo) {
+    const sensitivity = 4 // 越低越灵敏
+    let deltaScale = 0
+    let combineDelta = 0
+    switch (index) {
+      case ResizeControlIndex.LEFT_TOP:
+        combineDelta = (deltaX * -1 - deltaY) / sensitivity
+        break
+      case ResizeControlIndex.RIGHT_TOP:
+        combineDelta = (deltaX - deltaY) / sensitivity
+        break
+      case ResizeControlIndex.RIGHT_BOTTOM:
+        combineDelta = (deltaX + deltaY) / sensitivity
+        break
+      case ResizeControlIndex.LEFT_BOTTOM:
+        combineDelta = (deltaX * -1 + deltaY) / sensitivity
+        break
+      default:
+        break
+    }
+
+    if (combineDelta !== 0) {
+      deltaScale =
+        Math.round(
+          (combineDelta / PCTResizeInfo.ResizeBasis.basisHeight) * 100000,
+        ) / 1000
+    }
+
+    PCTResizeInfo.ResizePCT.widthPCT = Math.max(
+      Math.min(
+        PCTResizeInfo.ResizePCT.widthPCT + deltaScale,
+        PCTResizeInfo.ScaleLimit.maxScaleLimit,
+      ),
+      PCTResizeInfo.ScaleLimit.minScaleLimit,
+    )
+    PCTResizeInfo.ResizePCT.heightPCT = Math.max(
+      Math.min(
+        PCTResizeInfo.ResizePCT.heightPCT + deltaScale,
+        PCTResizeInfo.ScaleLimit.maxScaleLimit,
+      ),
+      PCTResizeInfo.ScaleLimit.minScaleLimit,
+    )
+
+    const spcWidth = Math.round(
+      (PCTResizeInfo.ResizePCT.widthPCT *
+        PCTResizeInfo.ResizeBasis.basisWidth) /
+        100,
+    )
+    const spcHeight = Math.round(
+      (PCTResizeInfo.ResizePCT.heightPCT *
+        PCTResizeInfo.ResizeBasis.basisHeight) /
+        100,
+    )
+
+    switch (index) {
+      case ResizeControlIndex.LEFT_TOP:
+        deltaX = width - spcWidth
+        deltaY = height - spcHeight
+        break
+      case ResizeControlIndex.RIGHT_TOP:
+        deltaX = spcWidth - width
+        deltaY = height - spcHeight
+        break
+      case ResizeControlIndex.RIGHT_BOTTOM:
+        deltaX = spcWidth - width
+        deltaY = spcHeight - height
+        break
+      case ResizeControlIndex.LEFT_BOTTOM:
+        deltaX = width - spcWidth
+        deltaY = spcHeight - height
+        break
+      default:
+        break
+    }
+    return nextResizeInfo
+  }
+
+  // 如果限制了宽/高不变，对应的 width/height 保持一致
+  switch (index) {
+    case ResizeControlIndex.LEFT_TOP:
+      nextResizeInfo.width = freezeWidth ? width : width - deltaX * pct
+      nextResizeInfo.height = freezeHeight ? height : height - deltaY * pct
+      break
+    case ResizeControlIndex.RIGHT_TOP:
+      nextResizeInfo.width = freezeWidth ? width : width + deltaX * pct
+      nextResizeInfo.height = freezeHeight ? height : height - deltaY * pct
+      break
+    case ResizeControlIndex.RIGHT_BOTTOM:
+      nextResizeInfo.width = freezeWidth ? width : width + deltaX * pct
+      nextResizeInfo.height = freezeHeight ? height : height + deltaY * pct
+      break
+    case ResizeControlIndex.LEFT_BOTTOM:
+      nextResizeInfo.width = freezeWidth ? width : width - deltaX * pct
+      nextResizeInfo.height = freezeHeight ? height : height + deltaY * pct
+      break
+    default:
+      break
+  }
+
+  return nextResizeInfo
+}
+
+export const updateEdgePointByAnchors = (
+  nodeModel: BaseNodeModel,
+  graphModel: GraphModel,
+) => {
+  // https://github.com/didi/LogicFlow/issues/807
+  // https://github.com/didi/LogicFlow/issues/875
+  // 之前的做法，比如Rect是使用getRectResizeEdgePoint()计算边的point缩放后的位置
+  // getRectResizeEdgePoint()考虑了瞄点在四条边以及在4个圆角的情况
+  // 使用的是一种等比例缩放的模式，比如：
+  // const pct = (y - beforeNode.y) / (beforeNode.height / 2 - radius)
+  // afterPoint.y = afterNode.y + (afterNode.height / 2 - radius) * pct
+  // 但是用户自定义的getDefaultAnchor()不一定是按照比例编写的
+  // 它可能是 x: x + 20：每次缩放都会保持在x右边20的位置，因此用户自定义瞄点时，然后产生无法跟随的问题
+  // 现在的做法是：直接获取用户自定义瞄点的位置，然后用这个位置作为边的新的起点，而不是自己进行计算
+  const { id, anchors } = nodeModel
+  const edges = graphModel.getNodeEdges(id)
+  // 更新边
+  forEach(edges, (edge) => {
+    if (edge.sourceNodeId === id) {
+      // 边是以该节点为 sourceNode 时
+      const anchorItem = find(
+        anchors,
+        (anchor) => anchor.id === edge.sourceAnchorId,
+      )
+
+      if (anchorItem) {
+        edge.updateStartPoint({
+          x: anchorItem.x,
+          y: anchorItem.y,
+        })
+      }
+    } else if (edge.targetNodeId === id) {
+      // 边是以该节点为 targetNode 时
+      const anchorItem = find(
+        anchors,
+        (anchor) => anchor.id === edge.targetAnchorId,
+      )
+
+      if (anchorItem) {
+        edge.updateEndPoint({
+          x: anchorItem.x,
+          y: anchorItem.y,
+        })
+      }
+    }
+  })
+}
+
+export const triggerResizeEvent = (
+  preNodeData: ResizeNodeData,
+  curNodeData: ResizeNodeData,
+  deltaX: number,
+  deltaY: number,
+  index: number,
+  nodeModel: BaseNodeModel,
+  graphModel: GraphModel,
+) => {
+  graphModel.eventCenter.emit(EventType.NODE_RESIZE, {
+    preData: preNodeData,
+    data: curNodeData,
+    deltaX,
+    deltaY,
+    index,
+    model: nodeModel,
+  })
+}
+
+// TODO：确认 handleResize 函数的类型定义
+// export type IHandleResizeParams = {
+//   deltaX: number
+//   deltaY: number
+//   index: ResizeControlIndex
+//   nodeModel: BaseNodeModel
+//   graphModel: GraphModel
+//   cancelCallback?: () => void
+// }
+
+/**
+ * 处理节点的 resize 事件，提出来放到 utils 中，方便在外面（extension）中使用
+ * @param deltaX
+ * @param deltaY
+ * @param index
+ * @param nodeModel
+ * @param graphModel
+ * @param cancelCallback
+ */
+export const handleResize = ({
+  deltaX,
+  deltaY,
+  index,
+  nodeModel,
+  graphModel,
+  cancelCallback,
+}) => {
+  const {
+    r, // circle
+    rx, // ellipse/diamond
+    ry,
+    width, // rect/html
+    height,
+    PCTResizeInfo,
+
+    minWidth,
+    minHeight,
+    maxWidth,
+    maxHeight,
+  } = nodeModel
+  const isFreezeWidth = minWidth === maxWidth
+  const isFreezeHeight = minHeight === maxHeight
+
+  const resizeInfo = {
+    width: r || rx || width,
+    height: r || ry || height,
+    deltaX,
+    deltaY,
+    PCTResizeInfo,
+  }
+
+  const pct = r || (rx && ry) ? 1 / 2 : 1
+  const nextSize = recalcResizeInfo(
+    index,
+    resizeInfo,
+    pct,
+    isFreezeWidth,
+    isFreezeHeight,
+  )
+
+  // 限制放大缩小的最大最小范围
+  if (
+    nextSize.width < minWidth ||
+    nextSize.width > maxWidth ||
+    nextSize.height < minHeight ||
+    nextSize.height > maxHeight
+  ) {
+    // this.dragHandler.cancelDrag()
+    cancelCallback?.()
+    return
+  }
+  // 如果限制了宽高不变，对应的 x/y 不产生位移
+  nextSize.deltaX = isFreezeWidth ? 0 : nextSize.deltaX
+  nextSize.deltaY = isFreezeWidth ? 0 : nextSize.deltaY
+
+  const preNodeData = nodeModel.getData()
+  const curNodeData = nodeModel.resize(nextSize)
+
+  // 更新边
+  updateEdgePointByAnchors(nodeModel, graphModel)
+  // 触发 resize 事件
+  triggerResizeEvent(
+    preNodeData,
+    curNodeData,
+    deltaX,
+    deltaY,
+    index,
+    nodeModel,
+    graphModel,
+  )
+}

package/src/view/Control.tsx

@@ -2,7 +2,7 @@ import { createElement as h, Component } from 'preact/compat'
 import { cloneDeep, find, forEach, map } from 'lodash-es'
 import { Rect } from './shape'
 import LogicFlow from '../LogicFlow'
-import { getNodeBBox, IDragParams, StepDrag } from '../util'
+import { getNodeBBox, IDragParams, StepDrag, handleResize } from '../util'
 import { BaseNodeModel, GraphModel } from '../model'
 
 import NodeData = LogicFlow.NodeData
@@ -104,11 +104,17 @@ export class ResizeControl extends Component<
   triggerResizeEvent = (
     preNodeData: ResizeNodeData,
     curNodeData: ResizeNodeData,
+    deltaX,
+    deltaY,
+    index,
     nodeModel: BaseNodeModel,
   ) => {
     this.graphModel.eventCenter.emit(EventType.NODE_RESIZE, {
       preData: preNodeData,
       data: curNodeData,
+      deltaX,
+      deltaY,
+      index,
       model: nodeModel,
     })
   }
@@ -234,62 +240,75 @@ export class ResizeControl extends Component<
   }
 
   resizeNode = ({ deltaX, deltaY }: VectorData) => {
-    // TODO: 调用每个节点中更新缩放时的方法 updateNode 函数，用来各节点缩放的方法
-    // 1. 计算当前 Control 的一些信息，
-    const {
-      r, // circle
-      rx, // ellipse/diamond
-      ry,
-      width, // rect/html
-      height,
-      PCTResizeInfo,
-
-      minWidth,
-      minHeight,
-      maxWidth,
-      maxHeight,
-    } = this.nodeModel
-    const isFreezeWidth = minWidth === maxWidth
-    const isFreezeHeight = minHeight === maxHeight
-
-    const resizeInfo = {
-      width: r || rx || width,
-      height: r || ry || height,
+    const { index } = this
+    const { model, graphModel } = this.props
+
+    // DONE: 调用每个节点中更新缩放时的方法 updateNode 函数，用来各节点缩放的方法
+    handleResize({
       deltaX,
       deltaY,
-      PCTResizeInfo,
-    }
-
-    const pct = r || (rx && ry) ? 1 / 2 : 1
-    const nextSize = this.recalcResizeInfo(
-      this.index,
-      resizeInfo,
-      pct,
-      isFreezeWidth,
-      isFreezeHeight,
-    )
-
-    // 限制放大缩小的最大最小范围
-    if (
-      nextSize.width < minWidth ||
-      nextSize.width > maxWidth ||
-      nextSize.height < minHeight ||
-      nextSize.height > maxHeight
-    ) {
-      this.dragHandler.cancelDrag()
-      return
-    }
-    // 如果限制了宽高不变，对应的 x/y 不产生位移
-    nextSize.deltaX = isFreezeWidth ? 0 : nextSize.deltaX
-    nextSize.deltaY = isFreezeWidth ? 0 : nextSize.deltaY
-
-    const preNodeData = this.nodeModel.getData()
-    const curNodeData = this.nodeModel.resize(nextSize)
-
-    // 更新边
-    this.updateEdgePointByAnchors()
-    // 触发 resize 事件
-    this.triggerResizeEvent(preNodeData, curNodeData, this.nodeModel)
+      index,
+      nodeModel: model,
+      graphModel,
+      cancelCallback: () => {
+        this.dragHandler.cancelDrag()
+      },
+    })
+    // 1. 计算当前 Control 的一些信息，
+    // const {
+    //   r, // circle
+    //   rx, // ellipse/diamond
+    //   ry,
+    //   width, // rect/html
+    //   height,
+    //   PCTResizeInfo,
+    //
+    //   minWidth,
+    //   minHeight,
+    //   maxWidth,
+    //   maxHeight,
+    // } = this.nodeModel
+    // const isFreezeWidth = minWidth === maxWidth
+    // const isFreezeHeight = minHeight === maxHeight
+    //
+    // const resizeInfo = {
+    //   width: r || rx || width,
+    //   height: r || ry || height,
+    //   deltaX,
+    //   deltaY,
+    //   PCTResizeInfo,
+    // }
+    //
+    // const pct = r || (rx && ry) ? 1 / 2 : 1
+    // const nextSize = this.recalcResizeInfo(
+    //   this.index,
+    //   resizeInfo,
+    //   pct,
+    //   isFreezeWidth,
+    //   isFreezeHeight,
+    // )
+    //
+    // // 限制放大缩小的最大最小范围
+    // if (
+    //   nextSize.width < minWidth ||
+    //   nextSize.width > maxWidth ||
+    //   nextSize.height < minHeight ||
+    //   nextSize.height > maxHeight
+    // ) {
+    //   this.dragHandler.cancelDrag()
+    //   return
+    // }
+    // // 如果限制了宽高不变，对应的 x/y 不产生位移
+    // nextSize.deltaX = isFreezeWidth ? 0 : nextSize.deltaX
+    // nextSize.deltaY = isFreezeWidth ? 0 : nextSize.deltaY
+    //
+    // const preNodeData = this.nodeModel.getData()
+    // const curNodeData = this.nodeModel.resize(nextSize)
+    //
+    // // 更新边
+    // this.updateEdgePointByAnchors()
+    // // 触发 resize 事件
+    // this.triggerResizeEvent(preNodeData, curNodeData, deltaX, deltaY, this.index, this.nodeModel)
   }
 
   onDragging = ({ deltaX, deltaY }: IDragParams) => {
@@ -335,8 +354,8 @@ export class ResizeControl extends Component<
           className="lf-resize-control-content"
           x={x}
           y={y}
-          width={30}
-          height={30}
+          width={25}
+          height={25}
           fill="transparent"
           stroke="transparent"
           onMouseDown={this.dragHandler.handleMouseDown}

package/src/view/Graph.tsx

@@ -47,7 +47,8 @@ class Graph extends Component<IGraphProps> {
   }
 
   componentDidUpdate() {
-    this.props.graphModel.eventCenter.emit(EventType.GRAPH_UPDATED, {})
+    const data = this.props.graphModel.modelToGraphData()
+    this.props.graphModel.eventCenter.emit(EventType.GRAPH_UPDATED, { data })
   }
 
   componentWillUnmount() {