@logicflow/core 2.0.1 → 2.0.2

package/lib/util/theme.js

@@ -157,4 +157,3 @@ var setupTheme = function (customTheme) {
 exports.setupTheme = setupTheme;
 /* 更新 theme 方法 */
 exports.updateTheme = exports.setupTheme;
-//# sourceMappingURL=theme.js.map

package/lib/util/uuid.js

@@ -22,4 +22,3 @@ var refreshGraphId = function (graphData, prefix) {
     return graphData;
 };
 exports.refreshGraphId = refreshGraphId;
-//# sourceMappingURL=uuid.js.map

package/lib/util/vector.js

@@ -98,4 +98,3 @@ var Point = /** @class */ (function (_super) {
     return Point;
 }(Base));
 exports.Point = Point;
-//# sourceMappingURL=vector.js.map

package/lib/util/zIndex.js

@@ -7,4 +7,3 @@ var getZIndex = function () { return ++maxIndex; };
 exports.getZIndex = getZIndex;
 var getMinIndex = function () { return --minIndex; };
 exports.getMinIndex = getMinIndex;
-//# sourceMappingURL=zIndex.js.map

package/lib/view/Anchor.js

@@ -317,4 +317,3 @@ var Anchor = /** @class */ (function (_super) {
     return Anchor;
 }(compat_1.Component));
 exports.default = Anchor;
-//# sourceMappingURL=Anchor.js.map

package/lib/view/Control.js

@@ -373,4 +373,3 @@ var ResizeControlGroup = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.ResizeControlGroup = ResizeControlGroup;
 exports.default = ResizeControlGroup;
-//# sourceMappingURL=Control.js.map

package/lib/view/Graph.d.ts

@@ -12,8 +12,8 @@ type IGraphProps = {
     graphModel: GraphModel;
 };
 declare class Graph extends Component<IGraphProps> {
-    private resizeFunction;
-    handleResize: () => void;
+    private handleResize;
+    private throttleResize;
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentWillUnmount(): void;

package/lib/view/Graph.js

@@ -67,21 +67,21 @@ var Graph = /** @class */ (function (_super) {
     __extends(Graph, _super);
     function Graph() {
         var _this = _super.apply(this, __spreadArray([], __read(arguments), false)) || this;
-        _this.resizeFunction = function () { return (0, lodash_es_1.throttle)(_this.handleResize, 200); };
         _this.handleResize = function () {
             _this.props.graphModel.resize();
         };
+        _this.throttleResize = function () { return (0, lodash_es_1.throttle)(_this.handleResize, 200); };
         return _this;
     }
     Graph.prototype.componentDidMount = function () {
-        window.addEventListener('resize', this.resizeFunction);
+        window.addEventListener('resize', this.throttleResize);
     };
     Graph.prototype.componentDidUpdate = function () {
         var data = this.props.graphModel.modelToGraphData();
         this.props.graphModel.eventCenter.emit(constant_1.EventType.GRAPH_UPDATED, { data: data });
     };
     Graph.prototype.componentWillUnmount = function () {
-        window.removeEventListener('resize', this.resizeFunction);
+        window.removeEventListener('resize', this.throttleResize);
     };
     Graph.prototype.getComponent = function (model, graphModel, overlay) {
         if (overlay === void 0) { overlay = 'canvas-overlay'; }
@@ -117,4 +117,3 @@ var Graph = /** @class */ (function (_super) {
     return Graph;
 }(compat_1.Component));
 exports.default = Graph;
-//# sourceMappingURL=Graph.js.map

package/lib/view/Rotate.js

@@ -111,4 +111,3 @@ var RotateControlPoint = /** @class */ (function (_super) {
     return RotateControlPoint;
 }(compat_1.Component));
 exports.default = RotateControlPoint;
-//# sourceMappingURL=Rotate.js.map

package/lib/view/behavior/dnd.js

@@ -110,4 +110,3 @@ var Dnd = /** @class */ (function () {
 }());
 exports.Dnd = Dnd;
 exports.default = Dnd;
-//# sourceMappingURL=dnd.js.map

package/lib/view/behavior/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./dnd"), exports);
 __exportStar(require("./snapline"), exports);
-//# sourceMappingURL=index.js.map

package/lib/view/behavior/snapline.js

@@ -13,4 +13,3 @@ function snapline(eventCenter, snaplineModel) {
     });
 }
 exports.snapline = snapline;
-//# sourceMappingURL=snapline.js.map

package/lib/view/edge/AdjustPoint.js

@@ -357,4 +357,3 @@ var AdjustPoint = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.AdjustPoint = AdjustPoint;
 exports.default = AdjustPoint;
-//# sourceMappingURL=AdjustPoint.js.map

package/lib/view/edge/Arrow.js

@@ -60,4 +60,3 @@ var Arrow = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.Arrow = Arrow;
 exports.default = Arrow;
-//# sourceMappingURL=Arrow.js.map

package/lib/view/edge/BaseEdge.js

@@ -412,4 +412,3 @@ var BaseEdge = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.BaseEdge = BaseEdge;
 exports.default = BaseEdge;
-//# sourceMappingURL=BaseEdge.js.map

package/lib/view/edge/BezierEdge.js

@@ -121,4 +121,3 @@ var BezierEdge = /** @class */ (function (_super) {
 }(BaseEdge_1.default));
 exports.BezierEdge = BezierEdge;
 exports.default = BezierEdge;
-//# sourceMappingURL=BezierEdge.js.map

package/lib/view/edge/LineEdge.js

@@ -81,4 +81,3 @@ var LineEdge = /** @class */ (function (_super) {
 }(BaseEdge_1.default));
 exports.LineEdge = LineEdge;
 exports.default = LineEdge;
-//# sourceMappingURL=LineEdge.js.map

package/lib/view/edge/PolylineEdge.js

@@ -277,4 +277,3 @@ var PolylineEdge = /** @class */ (function (_super) {
 }(BaseEdge_1.default));
 exports.PolylineEdge = PolylineEdge;
 exports.default = PolylineEdge;
-//# sourceMappingURL=PolylineEdge.js.map

package/lib/view/edge/index.js

@@ -20,4 +20,3 @@ __exportStar(require("./BaseEdge"), exports);
 __exportStar(require("./BezierEdge"), exports);
 __exportStar(require("./LineEdge"), exports);
 __exportStar(require("./PolylineEdge"), exports);
-//# sourceMappingURL=index.js.map

package/lib/view/index.js

@@ -21,4 +21,3 @@ __exportStar(require("./shape"), exports);
 __exportStar(require("./node"), exports);
 __exportStar(require("./edge"), exports);
 __exportStar(require("./text"), exports);
-//# sourceMappingURL=index.js.map

package/lib/view/node/BaseNode.js

@@ -104,8 +104,6 @@ var BaseNode = /** @class */ (function (_super) {
             // 将x, y移动到grid上
             x = (0, util_1.snapToGrid)(x, gridSize);
             y = (0, util_1.snapToGrid)(y, gridSize);
-            console.log('x --->>>', x);
-            console.log('y --->>>', y);
             if (!width || !height) {
                 graphModel.moveNode2Coordinate(model.id, x, y);
                 return;
@@ -432,4 +430,3 @@ var BaseNode = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.BaseNode = BaseNode;
 exports.default = BaseNode;
-//# sourceMappingURL=BaseNode.js.map

package/lib/view/node/CircleNode.js

@@ -48,4 +48,3 @@ var CircleNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.CircleNode = CircleNode;
 exports.default = CircleNode;
-//# sourceMappingURL=CircleNode.js.map

package/lib/view/node/DiamondNode.js

@@ -47,4 +47,3 @@ var DiamondNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.DiamondNode = DiamondNode;
 exports.default = DiamondNode;
-//# sourceMappingURL=DiamondNode.js.map

package/lib/view/node/EllipseNode.js

@@ -47,4 +47,3 @@ var EllipseNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.EllipseNode = EllipseNode;
 exports.default = EllipseNode;
-//# sourceMappingURL=EllipseNode.js.map

package/lib/view/node/HtmlNode.js

@@ -132,4 +132,3 @@ var HtmlNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.HtmlNode = HtmlNode;
 exports.default = HtmlNode;
-//# sourceMappingURL=HtmlNode.js.map

package/lib/view/node/PolygonNode.js

@@ -51,4 +51,3 @@ var PolygonNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.PolygonNode = PolygonNode;
 exports.default = PolygonNode;
-//# sourceMappingURL=PolygonNode.js.map

package/lib/view/node/RectNode.js

@@ -47,4 +47,3 @@ var RectNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.RectNode = RectNode;
 exports.default = RectNode;
-//# sourceMappingURL=RectNode.js.map

package/lib/view/node/TextNode.js

@@ -58,4 +58,3 @@ var TextNode = /** @class */ (function (_super) {
 }(BaseNode_1.default));
 exports.TextNode = TextNode;
 exports.default = TextNode;
-//# sourceMappingURL=TextNode.js.map

package/lib/view/node/index.js

@@ -22,4 +22,3 @@ __exportStar(require("./DiamondNode"), exports);
 __exportStar(require("./EllipseNode"), exports);
 __exportStar(require("./TextNode"), exports);
 __exportStar(require("./HtmlNode"), exports);
-//# sourceMappingURL=index.js.map

package/lib/view/overlay/BackgroundOverlay.js

@@ -31,4 +31,3 @@ var BackgroundOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.BackgroundOverlay = BackgroundOverlay;
 exports.default = BackgroundOverlay;
-//# sourceMappingURL=BackgroundOverlay.js.map

package/lib/view/overlay/BezierAdjustOverlay.js

@@ -142,4 +142,3 @@ var BezierAdjustOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.BezierAdjustOverlay = BezierAdjustOverlay;
 exports.default = BezierAdjustOverlay;
-//# sourceMappingURL=BezierAdjustOverlay.js.map

package/lib/view/overlay/CanvasOverlay.js

@@ -173,4 +173,3 @@ var CanvasOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.CanvasOverlay = CanvasOverlay;
 exports.default = CanvasOverlay;
-//# sourceMappingURL=CanvasOverlay.js.map

package/lib/view/overlay/Grid.js

@@ -127,4 +127,3 @@ exports.Grid = Grid;
     }
     Grid.getGridOptions = getGridOptions;
 })(Grid || (exports.Grid = Grid = {}));
-//# sourceMappingURL=Grid.js.map

package/lib/view/overlay/ModificationOverlay.js

@@ -43,4 +43,3 @@ var ModificationOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.ModificationOverlay = ModificationOverlay;
 exports.default = ModificationOverlay;
-//# sourceMappingURL=ModificationOverlay.js.map

package/lib/view/overlay/OutlineOverlay.js

@@ -134,4 +134,3 @@ var OutlineOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.OutlineOverlay = OutlineOverlay;
 exports.default = OutlineOverlay;
-//# sourceMappingURL=OutlineOverlay.js.map

package/lib/view/overlay/SnaplineOverlay.js

@@ -63,4 +63,3 @@ var SnaplineOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.SnaplineOverlay = SnaplineOverlay;
 exports.default = OutlineOverlay_1.default;
-//# sourceMappingURL=SnaplineOverlay.js.map

package/lib/view/overlay/ToolOverlay.js

@@ -76,4 +76,3 @@ var ToolOverlay = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.ToolOverlay = ToolOverlay;
 exports.default = _1.OutlineOverlay;
-//# sourceMappingURL=ToolOverlay.js.map

package/lib/view/overlay/getTransformHoc.js

@@ -58,4 +58,3 @@ function getTransform(WrappedComponent) {
     }(preact_1.Component));
 }
 exports.getTransform = getTransform;
-//# sourceMappingURL=getTransformHoc.js.map

package/lib/view/overlay/index.js

@@ -22,4 +22,3 @@ __exportStar(require("./ModificationOverlay"), exports);
 __exportStar(require("./OutlineOverlay"), exports);
 __exportStar(require("./SnaplineOverlay"), exports);
 __exportStar(require("./ToolOverlay"), exports);
-//# sourceMappingURL=index.js.map

package/lib/view/shape/Circle.js

@@ -58,4 +58,3 @@ function Circle(props) {
 }
 exports.Circle = Circle;
 exports.default = Circle;
-//# sourceMappingURL=Circle.js.map

package/lib/view/shape/Ellipse.js

@@ -59,4 +59,3 @@ function Ellipse(props) {
 }
 exports.Ellipse = Ellipse;
 exports.default = Ellipse;
-//# sourceMappingURL=Ellipse.js.map

package/lib/view/shape/Line.js

@@ -53,4 +53,3 @@ function Line(props) {
 }
 exports.Line = Line;
 exports.default = Line;
-//# sourceMappingURL=Line.js.map

package/lib/view/shape/Path.js

@@ -44,4 +44,3 @@ function Path(props) {
 }
 exports.Path = Path;
 exports.default = Path;
-//# sourceMappingURL=Path.js.map

package/lib/view/shape/Polygon.js

@@ -57,4 +57,3 @@ function Polygon(props) {
 }
 exports.Polygon = Polygon;
 exports.default = Polygon;
-//# sourceMappingURL=Polygon.js.map

package/lib/view/shape/Polyline.js

@@ -52,4 +52,3 @@ function Polyline(props) {
 }
 exports.Polyline = Polyline;
 exports.default = Polyline;
-//# sourceMappingURL=Polyline.js.map

package/lib/view/shape/Rect.js

@@ -58,4 +58,3 @@ function Rect(props) {
 }
 exports.Rect = Rect;
 exports.default = Rect;
-//# sourceMappingURL=Rect.js.map

package/lib/view/shape/Text.js

@@ -119,4 +119,3 @@ function renderHtmlText(props) {
 }
 exports.renderHtmlText = renderHtmlText;
 exports.default = Text;
-//# sourceMappingURL=Text.js.map

package/lib/view/shape/index.js

@@ -22,4 +22,3 @@ __exportStar(require("./Circle"), exports);
 __exportStar(require("./Ellipse"), exports);
 __exportStar(require("./Polygon"), exports);
 __exportStar(require("./Polyline"), exports);
-//# sourceMappingURL=index.js.map

package/lib/view/text/BaseText.js

@@ -131,4 +131,3 @@ var BaseText = /** @class */ (function (_super) {
 }(compat_1.Component));
 exports.BaseText = BaseText;
 exports.default = BaseText;
-//# sourceMappingURL=BaseText.js.map

package/lib/view/text/LineText.js

@@ -157,4 +157,3 @@ var LineText = /** @class */ (function (_super) {
 }(_1.BaseText));
 exports.LineText = LineText;
 exports.default = LineText;
-//# sourceMappingURL=LineText.js.map

package/lib/view/text/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BaseText"), exports);
 __exportStar(require("./LineText"), exports);
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "LogicFlow, help you quickly create flowcharts",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/model/edge/BaseEdgeModel.ts

@@ -1,5 +1,5 @@
 import { assign, cloneDeep, find, isUndefined } from 'lodash-es'
-import { action, computed, isObservable, observable, toJS } from 'mobx'
+import { action, computed, isObservable, observable, set, toJS } from 'mobx'
 import { BaseNodeModel, GraphModel, Model } from '..'
 import LogicFlow from '../../LogicFlow'
 import {
@@ -425,14 +425,12 @@ export class BaseEdgeModel<P extends PropertiesType = PropertiesType>
    * @param key 属性名
    * @param val 属性值
    */
-  @action
-  setProperty(key: string, val: any): void {
+  @action setProperty(key: string, val: any): void {
     const preProperties = toJS(this.properties)
-    this.properties = {
-      ...preProperties,
-      [key]: formatData(val),
-    }
+    const newProperties = cloneDeep(preProperties)
+    set(newProperties, key, formatData(val))
 
+    this.properties = newProperties
     this.setAttributes()
   }
 
@@ -440,8 +438,7 @@ export class BaseEdgeModel<P extends PropertiesType = PropertiesType>
    * 删除边的属性，会触发重新渲染
    * @param key 属性名
    */
-  @action
-  deleteProperty(key: string): void {
+  @action deleteProperty(key: string): void {
     delete this.properties[key]
     this.setAttributes()
   }

package/src/model/node/BaseNodeModel.ts

@@ -1,5 +1,13 @@
 import { action, computed, isObservable, observable, toJS } from 'mobx'
-import { assign, cloneDeep, has, isNil, mapKeys, isUndefined } from 'lodash-es'
+import {
+  assign,
+  cloneDeep,
+  has,
+  isNil,
+  mapKeys,
+  isUndefined,
+  set,
+} from 'lodash-es'
 import { GraphModel, Model } from '..'
 import LogicFlow from '../../LogicFlow'
 import {
@@ -790,10 +798,12 @@ export class BaseNodeModel<P extends PropertiesType = PropertiesType>
 
   @action setProperty(key: string, val: any): void {
     const preProperties = toJS(this.properties)
-    const nextProperties = {
-      ...preProperties,
-      [key]: formatData(val),
-    }
+    const nextProperties = cloneDeep(preProperties)
+    // https://lodash.com/docs/4.17.15#set
+    // 使用 lodash 的 set 方法更新某个属性，可以支持 key 为 'a.b.c' 的情况
+    // TODO：待测试
+    set(nextProperties, key, formatData(val))
+
     this.updateProperties(nextProperties, [key])
   }
 

package/src/model/node/CircleNodeModel.ts

@@ -37,6 +37,7 @@ export class CircleNodeModel<
     super(data, graphModel)
     // this.properties = data.properties || {}
 
+    this.initNodeData(data)
     this.setAttributes()
   }
 

package/src/model/node/DiamondNodeModel.ts

@@ -33,6 +33,7 @@ export class DiamondNodeModel<
     super(data, graphModel)
     // this.properties = data.properties || {}
 
+    this.initNodeData(data)
     this.setAttributes()
   }
 

package/src/model/node/EllipseNodeModel.ts

@@ -31,6 +31,7 @@ export class EllipseNodeModel<
     super(data, graphModel)
     // this.properties = data.properties || {}
 
+    this.initNodeData(data)
     this.setAttributes()
   }
 

package/src/model/node/PolygonNodeModel.ts

@@ -44,6 +44,7 @@ export class PolygonNodeModel<
     super(data, graphModel)
     // this.properties = data.properties || {}
 
+    this.initNodeData(data)
     this.setAttributes()
   }
 

package/src/model/node/RectNodeModel.ts

@@ -28,6 +28,7 @@ export class RectNodeModel<
     // TODO：类字段初始化会覆盖 super、setAttributes 中设置的属性
     // this.properties = data.properties || {}
     // TODO: bug here, 上面更新 properties 会触发 setAttributes，下面再主动调用，会导致触发两次
+    this.initNodeData(data)
     this.setAttributes()
   }