@logicflow/core 2.0.0-beta.0 → 2.0.0-beta.10

package/src/model/edge/BaseEdgeModel.ts

@@ -1,5 +1,5 @@
-import { assign, cloneDeep, find } from 'lodash-es'
-import { action, computed, observable, toJS } from 'mobx'
+import { assign, cloneDeep, find, isUndefined } from 'lodash-es'
+import { action, computed, isObservable, observable, toJS } from 'mobx'
 import { BaseNodeModel, GraphModel, Model } from '..'
 import LogicFlow from '../../LogicFlow'
 import {
@@ -15,17 +15,22 @@ import {
   ElementType,
   ModelType,
   OverlapMode,
+  TextMode,
 } from '../../constant'
 
 import Point = LogicFlow.Point
 import EdgeData = LogicFlow.EdgeData
 import EdgeConfig = LogicFlow.EdgeConfig
+import TextConfig = LogicFlow.TextConfig
+import PropertiesType = LogicFlow.PropertiesType
 
-export interface IBaseEdgeModel extends Model.BaseModel {
+export interface IBaseEdgeModel<P extends PropertiesType>
+  extends Model.BaseModel<P> {
   /**
    * model 基础类型，固定为 edge
    */
   readonly BaseType: ElementType.EDGE
+  properties: P
 
   sourceNodeId: string
   targetNodeId: string
@@ -44,7 +49,9 @@ export interface IBaseEdgeModel extends Model.BaseModel {
   arrowConfig?: LogicFlow.ArrowConfig
 }
 
-export class BaseEdgeModel implements IBaseEdgeModel {
+export class BaseEdgeModel<P extends PropertiesType = PropertiesType>
+  implements IBaseEdgeModel<P>
+{
   readonly BaseType = ElementType.EDGE
   static BaseType: ElementType = ElementType.EDGE
 
@@ -56,14 +63,15 @@ export class BaseEdgeModel implements IBaseEdgeModel {
   @observable startPoint!: Point
   @observable endPoint!: Point
 
-  @observable text = {
+  @observable textMode = TextMode.TEXT
+  @observable text: Required<TextConfig> = {
     value: '',
     x: 0,
     y: 0,
     draggable: false,
     editable: true,
   }
-  @observable properties: Record<string, unknown> = {}
+  @observable properties: P
   @observable points = ''
   @observable pointsList: Point[] = []
 
@@ -83,7 +91,6 @@ export class BaseEdgeModel implements IBaseEdgeModel {
   graphModel: GraphModel
   @observable zIndex: number = 0
   @observable state = ElementState.DEFAULT
-
   modelType = ModelType.EDGE
   additionStateData?: Model.AdditionStateDataType
 
@@ -102,11 +109,14 @@ export class BaseEdgeModel implements IBaseEdgeModel {
   };
   [propName: string]: unknown // 支持自定义
 
-  constructor(data: EdgeConfig, graphModel: GraphModel) {
+  constructor(data: EdgeConfig<P>, graphModel: GraphModel) {
     this.graphModel = graphModel
+    this.properties = data.properties ?? ({} as P)
+
     this.initEdgeData(data)
     this.setAttributes()
   }
+
   /**
    * 初始化边数据
    * @overridable 支持重写
@@ -145,15 +155,18 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     // 文本位置依赖于边上的所有拐点
     this.formatText(data)
   }
+
   /**
    * 设置model属性
    * @overridable 支持重写
    * 每次properties发生变化会触发
    */
   setAttributes() {}
+
   createId(): string | null {
     return null
   }
+
   /**
    * 自定义边样式
    *
@@ -166,6 +179,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       ...this.style,
     }
   }
+
   /**
    * 自定义边调整点样式
    *
@@ -187,6 +201,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     const { edgeText } = this.graphModel.theme
     return cloneDeep(edgeText)
   }
+
   /**
    * 自定义边动画样式
    *
@@ -204,6 +219,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     const { edgeAnimation } = this.graphModel.theme
     return cloneDeep(edgeAnimation)
   }
+
   /**
    * 自定义边箭头样式
    *
@@ -229,6 +245,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       ...arrow,
     }
   }
+
   /**
    * 自定义边被选中时展示其范围的矩形框样式
    *
@@ -247,6 +264,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     const { outline } = graphModel.theme
     return cloneDeep(outline)
   }
+
   /**
    * 重新自定义文本位置
    *
@@ -258,18 +276,21 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       y: 0,
     }
   }
+
   /**
    * 边的前一个节点
    */
   @computed get sourceNode() {
     return this.graphModel?.nodesMap[this.sourceNodeId]?.model
   }
+
   /**
    * 边的后一个节点
    */
   @computed get targetNode() {
     return this.graphModel?.nodesMap[this.targetNodeId]?.model
   }
+
   @computed get textPosition(): Point {
     return this.getTextPosition()
   }
@@ -346,28 +367,37 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     })
     return position
   }
+
   /**
    * 获取当前边的properties
    */
   getProperties() {
     return toJS(this.properties)
   }
+
   /**
    * 获取被保存时返回的数据
    *
    * @overridable 支持重写
    */
   getData(): EdgeData {
-    const { x, y, value } = this.text
+    let { properties } = this
+    if (isObservable(properties)) {
+      properties = toJS(properties)
+    }
     const data: EdgeData = {
       id: this.id,
       type: this.type,
+      properties,
       sourceNodeId: this.sourceNode.id,
       targetNodeId: this.targetNode.id,
       startPoint: assign({}, this.startPoint),
       endPoint: assign({}, this.endPoint),
-      properties: toJS(this.properties),
     }
+    if (this.graphModel.overlapMode === OverlapMode.INCREASE) {
+      data.zIndex = this.zIndex
+    }
+    const { x, y, value } = this.text
     if (value) {
       data.text = {
         x,
@@ -375,11 +405,9 @@ export class BaseEdgeModel implements IBaseEdgeModel {
         value,
       }
     }
-    if (this.graphModel.overlapMode === OverlapMode.INCREASE) {
-      data.zIndex = this.zIndex
-    }
     return data
   }
+
   /**
    * 获取边的数据
    *
@@ -391,6 +419,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
   getHistoryData(): EdgeData {
     return this.getData()
   }
+
   /**
    * 设置边的属性，会触发重新渲染
    * @param key 属性名
@@ -398,9 +427,15 @@ export class BaseEdgeModel implements IBaseEdgeModel {
    */
   @action
   setProperty(key: string, val: any): void {
-    this.properties[key] = formatData(val)
+    const preProperties = toJS(this.properties)
+    this.properties = {
+      ...preProperties,
+      [key]: formatData(val),
+    }
+
     this.setAttributes()
   }
+
   /**
    * 删除边的属性，会触发重新渲染
    * @param key 属性名
@@ -410,10 +445,10 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     delete this.properties[key]
     this.setAttributes()
   }
+
   /**
    * 设置边的属性，会触发重新渲染
-   * @param key 属性名
-   * @param val 属性值
+   * @param properties 要更新的 properties，会做合并
    */
   @action
   setProperties(properties: Record<string, any>): void {
@@ -423,6 +458,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     }
     this.setAttributes()
   }
+
   /**
    * 修改边的id
    */
@@ -437,6 +473,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     }
     this.id = id
   }
+
   /**
    * 设置边样式，用于插件开发时跳过自定义边的渲染。大多数情况下，不需要使用此方法。
    * 如果需要设置边的样式，请使用 getEdgeStyle 方法自定义边样式。
@@ -448,6 +485,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       [key]: formatData(val),
     }
   }
+
   /**
    * 设置边样式，用于插件开发时跳过自定义边的渲染。大多数情况下，不需要使用此方法。
    * 如果需要设置边的样式，请使用 getEdgeStyle 方法自定义边样式。
@@ -459,6 +497,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       ...formatData(styles),
     }
   }
+
   /**
    * 设置边样式，用于插件开发时跳过自定义边的渲染。大多数情况下，不需要使用此方法。
    * 如果需要设置边的样式，请使用 getEdgeStyle 方法自定义边样式。
@@ -470,32 +509,50 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     }
   }
 
+  /**
+   * 设置当前元素的文本模式
+   * @param mode
+   */
+  @action setTextMode(mode: TextMode) {
+    this.textMode = mode
+  }
+
   /**
    * 内部方法，处理初始化文本格式
    */
   @action formatText(data: EdgeConfig) {
-    // 暂时处理，只传入text的情况
     const { x, y } = this.textPosition
-    if (!data.text || typeof data.text === 'string') {
-      this.text = {
-        value: data.text || '',
-        x,
-        y,
-        draggable: this.text.draggable,
-        editable: this.text.editable,
-      }
-      return
+    const { text } = data
+    let textConfig: Required<TextConfig> = {
+      value: '',
+      x,
+      y,
+      draggable: false,
+      editable: true,
     }
 
-    if (Object.prototype.toString.call(data.text) === '[object Object]') {
-      this.text = {
-        x: data.text.x || x,
-        y: data.text.y || y,
-        value: data.text.value || '',
-        draggable: this.text.draggable,
-        editable: this.text.editable,
+    if (text) {
+      if (typeof text === 'string') {
+        textConfig = {
+          ...textConfig,
+          value: text,
+        }
+      } else {
+        textConfig = {
+          ...textConfig,
+          x: text.x ?? x,
+          y: text.y ?? y,
+          value: text.value ?? '',
+        }
+        if (!isUndefined(text.draggable)) {
+          textConfig.draggable = text.draggable
+        }
+        if (!isUndefined(text.editable)) {
+          textConfig.editable = text.editable
+        }
       }
     }
+    this.text = textConfig
   }
   /**
    * 重置文本位置
@@ -505,21 +562,21 @@ export class BaseEdgeModel implements IBaseEdgeModel {
     this.text.x = x
     this.text.y = y
   }
+
   /**
    * 移动边上的文本
    */
   @action moveText(deltaX: number, deltaY: number): void {
-    if (this.text) {
-      const { x, y, value, draggable, editable } = this.text
-      this.text = {
-        value,
-        draggable,
-        x: x + deltaX,
-        y: y + deltaY,
-        editable,
-      }
+    const { x, y, value, draggable, editable } = this.text
+    this.text = {
+      value,
+      editable,
+      draggable,
+      x: x + deltaX,
+      y: y + deltaY,
     }
   }
+
   /**
    * 设置文本位置和值
    */
@@ -528,6 +585,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       assign(this.text, textConfig)
     }
   }
+
   /**
    * 更新文本的值
    */
@@ -537,6 +595,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
       value,
     }
   }
+
   /**
    * 内部方法，计算边的起点和终点和其对于的锚点Id
    */
@@ -602,6 +661,7 @@ export class BaseEdgeModel implements IBaseEdgeModel {
   setHitable(flag = true): void {
     this.isHitable = flag
   }
+
   @action
   setHittable(flag = true): void {
     this.isHittable = flag
@@ -664,16 +724,19 @@ export class BaseEdgeModel implements IBaseEdgeModel {
   updateAttributes(attributes) {
     assign(this, attributes)
   }
+
   // 获取边调整的起点
   @action
   getAdjustStart() {
     return this.startPoint
   }
+
   // 获取边调整的终点
   @action
   getAdjustEnd() {
     return this.endPoint
   }
+
   // 起终点拖拽调整过程中，进行直线路径更新
   @action
   updateAfterAdjustStartAndEnd({

package/src/model/edge/BezierEdgeModel.ts

@@ -1,11 +1,11 @@
-import { cloneDeep } from 'lodash-es'
+import { assign, cloneDeep } from 'lodash-es'
 import { action, observable } from 'mobx'
 import BaseEdgeModel from './BaseEdgeModel'
 import { BaseNodeModel } from '../node'
 import LogicFlow from '../../LogicFlow'
+import GraphModel from '../GraphModel'
 import { ModelType } from '../../constant'
 import { getBezierControlPoints, IBezierControls } from '../../util'
-import GraphModel from '../GraphModel'
 
 import Point = LogicFlow.Point
 import EdgeConfig = LogicFlow.EdgeConfig
@@ -15,14 +15,11 @@ export class BezierEdgeModel extends BaseEdgeModel {
 
   offset!: number
   @observable path = ''
-
   constructor(data: EdgeConfig, graphModel: GraphModel) {
     super(data, graphModel)
-
     this.initEdgeData(data)
     this.setAttributes()
   }
-
   initEdgeData(data: EdgeConfig): void {
     this.offset = 100
     super.initEdgeData(data)
@@ -30,9 +27,11 @@ export class BezierEdgeModel extends BaseEdgeModel {
   getEdgeStyle() {
     const { bezier } = this.graphModel.theme
     const style = super.getEdgeStyle()
+    const { style: customStyle = {} } = this.properties
     return {
       ...style,
       ...cloneDeep(bezier),
+      ...cloneDeep(customStyle),
     }
   }
   getTextPosition(): Point {
@@ -155,7 +154,9 @@ export class BezierEdgeModel extends BaseEdgeModel {
       this.pointsList[2] = anchor
     }
     this.path = this.getPath(this.pointsList)
-    this.setText(Object.assign({}, this.text, this.textPosition))
+    if (this.text?.value) {
+      this.setText(assign({}, this.text, this.textPosition))
+    }
   }
   // 获取边调整的起点
   @action

package/src/model/edge/LineEdgeModel.ts

@@ -10,9 +10,11 @@ export class LineEdgeModel extends BaseEdgeModel {
   getEdgeStyle() {
     const { line } = this.graphModel.theme
     const style = super.getEdgeStyle()
+    const { style: customStyle = {} } = this.properties
     return {
       ...style,
       ...cloneDeep(line),
+      ...cloneDeep(customStyle),
     }
   }
   getTextPosition(): Point {

package/src/model/edge/PolylineEdgeModel.ts

@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash-es'
+import { assign, cloneDeep } from 'lodash-es'
 import { observable, action } from 'mobx'
 import { BaseEdgeModel } from '.'
 import { BaseNodeModel, RectNodeModel, CircleNodeModel, Model } from '..'
@@ -25,7 +25,7 @@ import {
 import Point = LogicFlow.Point
 import Position = LogicFlow.Position
 import AppendConfig = LogicFlow.AppendConfig
-import ArchorConfig = Model.AnchorConfig
+import AnchorConfig = Model.AnchorConfig
 
 export class PolylineEdgeModel extends BaseEdgeModel {
   modelType = ModelType.POLYLINE_EDGE
@@ -41,22 +41,22 @@ export class PolylineEdgeModel extends BaseEdgeModel {
   getEdgeStyle() {
     const { polyline } = this.graphModel.theme
     const style = super.getEdgeStyle()
+    const { style: customStyle = {} } = this.properties
     return {
       ...style,
       ...cloneDeep(polyline),
+      ...cloneDeep(customStyle),
     }
   }
 
   getTextPosition() {
-    // 在文案为空的情况下，文案位置为双击位置
+    // 在文本为空的情况下，文本位置为双击位置
     const textValue = this.text?.value
     if (this.dbClickPosition && !textValue) {
       const { x, y } = this.dbClickPosition
-      return {
-        x,
-        y,
-      }
+      return { x, y }
     }
+    // 文本不为空或者没有双击位置时，取最长边的中点作为文本位置
     const currentPositionList = points2PointsList(this.points)
     const [p1, p2] = getLongestEdge(currentPositionList)
     return {
@@ -69,9 +69,9 @@ export class PolylineEdgeModel extends BaseEdgeModel {
   getAfterAnchor(
     direction: SegmentDirection,
     position: Position,
-    anchorList: ArchorConfig[],
+    anchorList: AnchorConfig[],
   ) {
-    let anchor: ArchorConfig
+    let anchor: AnchorConfig
     let minDistance: number
     anchorList.forEach((item) => {
       let distanceX: number
@@ -186,7 +186,7 @@ export class PolylineEdgeModel extends BaseEdgeModel {
     direction: SegmentDirection,
     positionType: string,
     position: Position,
-    anchorList: ArchorConfig[],
+    anchorList: AnchorConfig[],
     draggingPointList: Point[],
   ) {
     const pointList = draggingPointList.map((i) => i)
@@ -438,10 +438,13 @@ export class PolylineEdgeModel extends BaseEdgeModel {
     }
     this.updatePointsAfterDrag(draggingPointList)
     this.draggingPointList = draggingPointList
-    this.setText(Object.assign({}, this.text, this.textPosition))
+    // TODO: 判断该逻辑是否需要
+    if (this.text?.value) {
+      this.setText(assign({}, this.text, this.textPosition))
+    }
     return {
-      start: Object.assign({}, pointsList[startIndex]),
-      end: Object.assign({}, pointsList[endIndex]),
+      start: assign({}, pointsList[startIndex]),
+      end: assign({}, pointsList[endIndex]),
       startIndex,
       endIndex,
       direction,
@@ -571,10 +574,13 @@ export class PolylineEdgeModel extends BaseEdgeModel {
       this.updatePointsAfterDrag(draggingPointList)
       this.draggingPointList = draggingPointList
     }
-    this.setText(Object.assign({}, this.text, this.textPosition))
+    // TODO: 确认该判断逻辑是否需要
+    if (this.text?.value) {
+      this.setText(assign({}, this.text, this.textPosition))
+    }
     return {
-      start: Object.assign({}, pointsList[startIndex]),
-      end: Object.assign({}, pointsList[endIndex]),
+      start: assign({}, pointsList[startIndex]),
+      end: assign({}, pointsList[endIndex]),
       startIndex,
       endIndex,
       direction,
@@ -591,9 +597,9 @@ export class PolylineEdgeModel extends BaseEdgeModel {
       this.draggingPointList = []
       // 更新起终点
       const startPoint = pointsList[0]
-      this.startPoint = Object.assign({}, startPoint)
+      this.startPoint = assign({}, startPoint)
       const endPoint = pointsList[pointsList.length - 1]
-      this.endPoint = Object.assign({}, endPoint)
+      this.endPoint = assign({}, endPoint)
     }
     this.isDragging = false
   }