@logicflow/core 1.1.24 → 1.1.27

package/dist/logic-flow.js

@@ -5487,7 +5487,7 @@ $({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !CORRECT_PR
 var $ = __webpack_require__(16);
 var getBuiltIn = __webpack_require__(46);
 var apply = __webpack_require__(76);
-var bind = __webpack_require__(198);
+var bind = __webpack_require__(199);
 var aConstructor = __webpack_require__(157);
 var anObject = __webpack_require__(32);
 var isObject = __webpack_require__(33);
@@ -5966,6 +5966,21 @@ $({ target: 'Array', proto: true, forced: FORCED }, {
 
 /***/ }),
 /* 30 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var $ = __webpack_require__(16);
+var assign = __webpack_require__(198);
+
+// `Object.assign` method
+// https://tc39.es/ecma262/#sec-object.assign
+// eslint-disable-next-line es/no-object-assign -- required for testing
+$({ target: 'Object', stat: true, forced: Object.assign !== assign }, {
+  assign: assign
+});
+
+
+/***/ }),
+/* 31 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5981,21 +5996,6 @@ var root = _freeGlobal_js__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"] || fre
 /* harmony default export */ __webpack_exports__["a"] = (root);
 
 
-/***/ }),
-/* 31 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var $ = __webpack_require__(16);
-var assign = __webpack_require__(200);
-
-// `Object.assign` method
-// https://tc39.es/ecma262/#sec-object.assign
-// eslint-disable-next-line es/no-object-assign -- required for testing
-$({ target: 'Object', stat: true, forced: Object.assign !== assign }, {
-  assign: assign
-});
-
-
 /***/ }),
 /* 32 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -6332,7 +6332,7 @@ var $ = __webpack_require__(16);
 var call = __webpack_require__(35);
 var isObject = __webpack_require__(33);
 var anObject = __webpack_require__(32);
-var isDataDescriptor = __webpack_require__(199);
+var isDataDescriptor = __webpack_require__(200);
 var getOwnPropertyDescriptorModule = __webpack_require__(51);
 var getPrototypeOf = __webpack_require__(96);
 
@@ -6359,7 +6359,7 @@ $({ target: 'Reflect', stat: true }, {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(30);
+/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31);
 /* harmony import */ var _stubFalse_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(165);
 
 
@@ -8062,7 +8062,7 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(30);
+/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31);
 
 
 /** Detect free variable `exports`. */
@@ -14161,57 +14161,6 @@ module.exports = function (matched, str, position, captures, namedCaptures, repl
 
 "use strict";
 
-var global = __webpack_require__(7);
-var uncurryThis = __webpack_require__(15);
-var aCallable = __webpack_require__(55);
-var isObject = __webpack_require__(33);
-var hasOwn = __webpack_require__(34);
-var arraySlice = __webpack_require__(101);
-
-var Function = global.Function;
-var concat = uncurryThis([].concat);
-var join = uncurryThis([].join);
-var factories = {};
-
-var construct = function (C, argsLength, args) {
-  if (!hasOwn(factories, argsLength)) {
-    for (var list = [], i = 0; i < argsLength; i++) list[i] = 'a[' + i + ']';
-    factories[argsLength] = Function('C,a', 'return new C(' + join(list, ',') + ')');
-  } return factories[argsLength](C, args);
-};
-
-// `Function.prototype.bind` method implementation
-// https://tc39.es/ecma262/#sec-function.prototype.bind
-module.exports = Function.bind || function bind(that /* , ...args */) {
-  var F = aCallable(this);
-  var Prototype = F.prototype;
-  var partArgs = arraySlice(arguments, 1);
-  var boundFunction = function bound(/* args... */) {
-    var args = concat(partArgs, arraySlice(arguments));
-    return this instanceof boundFunction ? construct(F, args.length, args) : F.apply(that, args);
-  };
-  if (isObject(Prototype)) boundFunction.prototype = Prototype;
-  return boundFunction;
-};
-
-
-/***/ }),
-/* 199 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var hasOwn = __webpack_require__(34);
-
-module.exports = function (descriptor) {
-  return descriptor !== undefined && (hasOwn(descriptor, 'value') || hasOwn(descriptor, 'writable'));
-};
-
-
-/***/ }),
-/* 200 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
 var DESCRIPTORS = __webpack_require__(36);
 var uncurryThis = __webpack_require__(15);
 var call = __webpack_require__(35);
@@ -14270,6 +14219,57 @@ module.exports = !$assign || fails(function () {
 } : $assign;
 
 
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var global = __webpack_require__(7);
+var uncurryThis = __webpack_require__(15);
+var aCallable = __webpack_require__(55);
+var isObject = __webpack_require__(33);
+var hasOwn = __webpack_require__(34);
+var arraySlice = __webpack_require__(101);
+
+var Function = global.Function;
+var concat = uncurryThis([].concat);
+var join = uncurryThis([].join);
+var factories = {};
+
+var construct = function (C, argsLength, args) {
+  if (!hasOwn(factories, argsLength)) {
+    for (var list = [], i = 0; i < argsLength; i++) list[i] = 'a[' + i + ']';
+    factories[argsLength] = Function('C,a', 'return new C(' + join(list, ',') + ')');
+  } return factories[argsLength](C, args);
+};
+
+// `Function.prototype.bind` method implementation
+// https://tc39.es/ecma262/#sec-function.prototype.bind
+module.exports = Function.bind || function bind(that /* , ...args */) {
+  var F = aCallable(this);
+  var Prototype = F.prototype;
+  var partArgs = arraySlice(arguments, 1);
+  var boundFunction = function bound(/* args... */) {
+    var args = concat(partArgs, arraySlice(arguments));
+    return this instanceof boundFunction ? construct(F, args.length, args) : F.apply(that, args);
+  };
+  if (isObject(Prototype)) boundFunction.prototype = Prototype;
+  return boundFunction;
+};
+
+
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var hasOwn = __webpack_require__(34);
+
+module.exports = function (descriptor) {
+  return descriptor !== undefined && (hasOwn(descriptor, 'value') || hasOwn(descriptor, 'writable'));
+};
+
+
 /***/ }),
 /* 201 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -16699,7 +16699,7 @@ function stackHas(key) {
 /* harmony default export */ var _stackHas = (stackHas);
 
 // EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/lodash-es/_root.js
-var _root = __webpack_require__(30);
+var _root = __webpack_require__(31);
 
 // CONCATENATED MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/lodash-es/_Symbol.js
 
@@ -22730,6 +22730,9 @@ var es_string_replace = __webpack_require__(125);
 // EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.number.max-safe-integer.js
 var es_number_max_safe_integer = __webpack_require__(80);
 
+// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.object.assign.js
+var es_object_assign = __webpack_require__(30);
+
 // EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.object.set-prototype-of.js
 var es_object_set_prototype_of = __webpack_require__(12);
 
@@ -22742,9 +22745,6 @@ var es_reflect_construct = __webpack_require__(14);
 // EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.reflect.get.js
 var es_reflect_get = __webpack_require__(47);
 
-// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.object.assign.js
-var es_object_assign = __webpack_require__(31);
-
 // CONCATENATED MODULE: ./node_modules/uuid/dist/esm-browser/rng.js
 // Unique ID creation requires a high quality random # generator. In the browser we therefore
 // require the crypto API and do not support built-in fallback to lower quality random number
@@ -23276,7 +23276,8 @@ var node_getCrossPointWithPolyone = function getCrossPointWithPolyone(point, dir
 }; // 规范节点初始化数据
 
 var node_pickNodeConfig = function pickNodeConfig(data) {
-  var nodeData = lodash_es_pick(data, ['id', 'type', 'x', 'y', 'text', 'properties']);
+  var nodeData = lodash_es_pick(data, ['id', 'type', 'x', 'y', 'text', 'properties', 'virtual' // 区域节点是否为dnd添加的虚拟节点
+  ]);
   return nodeData;
 };
 /**
@@ -23510,14 +23511,7 @@ var BaseEdgeModel_BaseEdgeModel = (BaseEdgeModel_class = /*#__PURE__*/function (
 
     this.graphModel = graphModel;
     this.initEdgeData(data);
-    this.setAttributes(); // 设置边的 anchors，也就是边的两个端点
-    // 端点依赖于 edgeData 的 sourceNode 和 targetNode
-
-    this.setAnchors(); // 边的拐点依赖于两个端点
-
-    this.initPoints(); // 文本位置依赖于边上的所有拐点
-
-    this.formatText(data);
+    this.setAttributes();
   }
   /**
    * @overridable 支持重写
@@ -23549,7 +23543,15 @@ var BaseEdgeModel_BaseEdgeModel = (BaseEdgeModel_class = /*#__PURE__*/function (
 
       if (overlapMode === OverlapMode.INCREASE) {
         this.zIndex = data.zIndex || getZIndex();
-      }
+      } // 设置边的 anchors，也就是边的两个端点
+      // 端点依赖于 edgeData 的 sourceNode 和 targetNode
+
+
+      this.setAnchors(); // 边的拐点依赖于两个端点
+
+      this.initPoints(); // 文本位置依赖于边上的所有拐点
+
+      this.formatText(data);
     }
     /**
      * 设置model属性，每次properties发生变化会触发
@@ -25102,6 +25104,7 @@ function edge_arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
 
 
 /* 手动创建边时edge->edgeModel */
@@ -25937,6 +25940,39 @@ var twoPointDistance = function twoPointDistance(source, target) {
   // };
   return Math.sqrt(Math.pow(source.x - target.x, 2) + Math.pow(source.y - target.y, 2));
 };
+/**
+ * 包装边生成函数
+ * @param graphModel graph model
+ * @param generator 用户自定义的边生成函数
+ */
+
+function createEdgeGenerator(graphModel, generator) {
+  if (typeof generator !== 'function') {
+    return function (sourceNode, targetNode, currentEdge) {
+      return Object.assign({
+        type: graphModel.edgeType
+      }, currentEdge);
+    };
+  }
+
+  return function (sourceNode, targetNode, currentEdge) {
+    var result = generator(sourceNode, targetNode, currentEdge); // 无结果使用默认类型
+
+    if (!result) return {
+      type: graphModel.edgeType
+    };
+
+    if (typeof result === 'string') {
+      return Object.assign({}, currentEdge, {
+        type: result
+      });
+    }
+
+    return Object.assign({
+      type: result
+    }, currentEdge);
+  };
+}
 // EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.promise.js
 var es_promise = __webpack_require__(204);
 
@@ -26357,6 +26393,8 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
 
     GraphModel_defineProperty(this, "idGenerator", void 0);
 
+    GraphModel_defineProperty(this, "edgeGenerator", void 0);
+
     GraphModel_defineProperty(this, "nodeMoveRules", []);
 
     GraphModel_initializerDefineProperty(this, "edgeType", GraphModel_descriptor3, this);
@@ -26384,6 +26422,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
         background = _options$background === void 0 ? {} : _options$background,
         grid = options.grid,
         idGenerator = options.idGenerator,
+        edgeGenerator = options.edgeGenerator,
         animation = options.animation;
     this.background = background;
 
@@ -26403,6 +26442,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
     this.partial = options.partial;
     this.overlapMode = options.overlapMode || 0;
     this.idGenerator = idGenerator;
+    this.edgeGenerator = createEdgeGenerator(this, edgeGenerator);
     this.width = options.width || this.rootEl.getBoundingClientRect().width;
     this.height = options.height || this.rootEl.getBoundingClientRect().height;
   }
@@ -27071,9 +27111,10 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
 
       if (!Model) {
         throw new Error("\u627E\u4E0D\u5230".concat(nodeOriginData.type, "\u5BF9\u5E94\u7684\u8282\u70B9\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u5DF2\u6CE8\u518C\u6B64\u7C7B\u578B\u8282\u70B9\u3002"));
-      } // TODO 元素的 model 不应该直接可以操作 graphModel 的属性，但可以调方法
-
+      }
 
+      nodeOriginData.x = snapToGrid(nodeOriginData.x, this.gridSize);
+      nodeOriginData.y = snapToGrid(nodeOriginData.y, this.gridSize);
       var nodeModel = new Model(nodeOriginData, this);
       this.nodes.push(nodeModel);
       var nodeData = nodeModel.getData();
@@ -27127,9 +27168,15 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
       }
 
       var nodeModel = node.model;
-      var r = nodeModel.move(deltaX, deltaY, isignoreRule); // 2) 移动边
 
-      r && this.moveEdge(nodeId, deltaX, deltaY);
+      var _nodeModel$getMoveDis = nodeModel.getMoveDistance(deltaX, deltaY, isignoreRule);
+
+      var _nodeModel$getMoveDis2 = GraphModel_slicedToArray(_nodeModel$getMoveDis, 2);
+
+      deltaX = _nodeModel$getMoveDis2[0];
+      deltaY = _nodeModel$getMoveDis2[1];
+      // 2) 移动边
+      this.moveEdge(nodeId, deltaX, deltaY);
     }
     /**
      * 移动节点-绝对位置
@@ -30629,6 +30676,46 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
 
       return isAllowMoveX || isAllowMoveY;
     }
+  }, {
+    key: "getMoveDistance",
+    value: function getMoveDistance(deltaX, deltaY) {
+      var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var isAllowMoveX = false;
+      var isAllowMoveY = false;
+      var moveX = 0;
+      var moveY = 0;
+
+      if (isIgnoreRule) {
+        isAllowMoveX = true;
+        isAllowMoveY = true;
+      } else {
+        var r = this.isAllowMoveNode(deltaX, deltaY);
+
+        if (typeof r === 'boolean') {
+          isAllowMoveX = r;
+          isAllowMoveY = r;
+        } else {
+          isAllowMoveX = r.x;
+          isAllowMoveY = r.y;
+        }
+      }
+
+      if (isAllowMoveX && deltaX) {
+        var targetX = this.x + deltaX;
+        this.x = targetX;
+        this.text && this.moveText(deltaX, 0);
+        moveX = deltaX;
+      }
+
+      if (isAllowMoveY && deltaY) {
+        var targetY = this.y + deltaY;
+        this.y = targetY;
+        this.text && this.moveText(0, deltaY);
+        moveY = deltaY;
+      }
+
+      return [moveX, moveY];
+    }
   }, {
     key: "moveTo",
     value: function moveTo(x, y) {
@@ -30866,7 +30953,7 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
   initializer: function initializer() {
     return {};
   }
-}), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "incoming", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "incoming"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "outgoing", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "outgoing"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "move", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "move"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveTo", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveTo"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setSelected", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setSelected"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHovered", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHovered"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHitable", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHitable"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setElementState", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setElementState"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperty", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperty"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperties", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperties"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyle", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyle"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setZIndex", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setZIndex"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateAttributes", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateAttributes"), BaseNodeModel_class.prototype)), BaseNodeModel_class);
+}), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "incoming", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "incoming"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "outgoing", [mobx_module["m" /* computed */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "outgoing"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "addNodeMoveRules"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "move", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "move"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "getMoveDistance", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "getMoveDistance"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveTo", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveTo"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "moveText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "moveText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateText", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateText"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setSelected", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setSelected"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHovered", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHovered"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setHitable", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setHitable"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setElementState", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setElementState"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperty", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperty"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setProperties", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setProperties"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyle", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyle"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateStyles", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateStyles"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "setZIndex", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "setZIndex"), BaseNodeModel_class.prototype), BaseNodeModel_applyDecoratedDescriptor(BaseNodeModel_class.prototype, "updateAttributes", [mobx_module["k" /* action */]], Object.getOwnPropertyDescriptor(BaseNodeModel_class.prototype, "updateAttributes"), BaseNodeModel_class.prototype)), BaseNodeModel_class);
 
 // CONCATENATED MODULE: ./src/model/node/CircleNodeModel.ts
 function CircleNodeModel_typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { CircleNodeModel_typeof = function _typeof(obj) { return typeof obj; }; } else { CircleNodeModel_typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return CircleNodeModel_typeof(obj); }
@@ -32548,8 +32635,8 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
 
         if (isSourcePass && isTargetPass) {
           targetNode.setElementState(ElementState.DEFAULT);
-          var edgeModel = graphModel.addEdge({
-            type: edgeType,
+          var edgeData = graphModel.edgeGenerator(nodeModel.getData(), graphModel.getNodeModelById(info.node.id).getData());
+          var edgeModel = graphModel.addEdge(Anchor_objectSpread(Anchor_objectSpread({}, edgeData), {}, {
             sourceNodeId: nodeModel.id,
             sourceAnchorId: id,
             startPoint: {
@@ -32562,7 +32649,7 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
               x: info.anchor.x,
               y: info.anchor.y
             }
-          });
+          }));
           var anchorData = _this.props.anchorData;
           graphModel.eventCenter.emit(EventType.ANCHOR_DROP, {
             data: anchorData,
@@ -33297,7 +33384,7 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
 
       var time = new Date().getTime() - _this.startTime;
 
-      if (time > 200) return; // 事件大于200ms，认为是拖拽。
+      if (time > 200) return; // 事件大于200ms，认为是拖拽, 不触发click事件。
 
       var _this$props3 = _this.props,
           model = _this$props3.model,
@@ -33363,9 +33450,6 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
       var _this$props5 = _this.props,
           model = _this$props5.model,
           graphModel = _this$props5.graphModel;
-
-      _this.toFront();
-
       _this.startTime = new Date().getTime();
       var editConfigModel = graphModel.editConfigModel;
 
@@ -33579,7 +33663,7 @@ var BaseNode_BaseNode = /*#__PURE__*/function (_Component) {
         nodeShape = Object(preact_module["g" /* h */])("g", {
           className: this.getStateClassName(),
           onMouseDown: this.handleMouseDown,
-          onMouseUp: this.handleClick,
+          onClick: this.handleClick,
           onMouseEnter: this.setHoverON,
           onMouseOver: this.setHoverON,
           onMouseLeave: this.setHoverOFF,
@@ -34811,7 +34895,8 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
 
 
         if (type === AdjustType.SOURCE) {
-          createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, createEdgeInfo), {}, {
+          var edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(info.node.id).getData(), graphModel.getNodeModelById(edgeModel.targetNodeId).getData(), createEdgeInfo);
+          createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, edgeInfo), {}, {
             sourceNodeId: info.node.id,
             sourceAnchorId: info.anchor.id,
             startPoint: {
@@ -34822,7 +34907,9 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
             endPoint: AdjustPoint_objectSpread({}, edgeModel.endPoint)
           });
         } else if (type === AdjustType.TARGET) {
-          createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, createEdgeInfo), {}, {
+          var _edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(edgeModel.sourceNodeId).getData(), graphModel.getNodeModelById(info.node.id).getData(), createEdgeInfo);
+
+          createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, _edgeInfo), {}, {
             sourceNodeId: edgeModel.sourceNodeId,
             startPoint: AdjustPoint_objectSpread({}, edgeModel.startPoint),
             targetNodeId: info.node.id,
@@ -35269,72 +35356,70 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
   }, {
     key: "getArrow",
     value: function getArrow() {
-      return Object(preact_module["g" /* h */])("g", null, Object(preact_module["g" /* h */])("defs", null, this.getStartArrow(), this.getEndArrow()));
-    }
-  }, {
-    key: "getStartArrow",
-    value: function getStartArrow() {
-      var _this$props6 = this.props,
-          model = _this$props6.model,
-          graphModel = _this$props6.graphModel;
-      var id = model.id;
-      var arrow = graphModel.theme.arrow;
-      var offset = arrow.offset,
-          verticalLength = arrow.verticalLength;
+      var id = this.props.model.id;
 
       var _this$getArrowStyle = this.getArrowStyle(),
-          stroke = _this$getArrowStyle.stroke,
-          strokeWidth = _this$getArrowStyle.strokeWidth;
+          _this$getArrowStyle$r = _this$getArrowStyle.refY,
+          refY = _this$getArrowStyle$r === void 0 ? 0 : _this$getArrowStyle$r,
+          _this$getArrowStyle$r2 = _this$getArrowStyle.refX,
+          refX = _this$getArrowStyle$r2 === void 0 ? 2 : _this$getArrowStyle$r2;
 
-      return Object(preact_module["g" /* h */])("marker", {
+      return Object(preact_module["g" /* h */])("g", null, Object(preact_module["g" /* h */])("defs", null, Object(preact_module["g" /* h */])("marker", {
         id: "marker-start-".concat(id),
-        refX: "-1",
+        refX: refX,
+        refY: refY,
         overflow: "visible",
         orient: "auto",
         markerUnits: "userSpaceOnUse"
-      }, Object(preact_module["g" /* h */])("path", {
+      }, this.getStartArrow()), Object(preact_module["g" /* h */])("marker", {
+        id: "marker-end-".concat(id),
+        refX: refX,
+        refY: refY,
+        overflow: "visible",
+        orient: "auto",
+        markerUnits: "userSpaceOnUse"
+      }, this.getEndArrow())));
+    }
+  }, {
+    key: "getStartArrow",
+    value: function getStartArrow() {
+      var _this$getArrowStyle2 = this.getArrowStyle(),
+          stroke = _this$getArrowStyle2.stroke,
+          strokeWidth = _this$getArrowStyle2.strokeWidth,
+          offset = _this$getArrowStyle2.offset,
+          verticalLength = _this$getArrowStyle2.verticalLength;
+
+      return Object(preact_module["g" /* h */])("path", {
         stroke: stroke,
         fill: stroke,
         strokeWidth: strokeWidth,
         d: "M 0 0 L ".concat(offset, " -").concat(verticalLength, " L ").concat(offset, " ").concat(verticalLength, " Z")
-      }));
+      });
     }
   }, {
     key: "getEndArrow",
     value: function getEndArrow() {
-      var _this$props7 = this.props,
-          model = _this$props7.model,
-          graphModel = _this$props7.graphModel;
-      var id = model.id;
-      var arrow = graphModel.theme.arrow;
-      var offset = arrow.offset,
-          verticalLength = arrow.verticalLength;
+      var _this$getArrowStyle3 = this.getArrowStyle(),
+          stroke = _this$getArrowStyle3.stroke,
+          strokeWidth = _this$getArrowStyle3.strokeWidth,
+          offset = _this$getArrowStyle3.offset,
+          verticalLength = _this$getArrowStyle3.verticalLength;
 
-      var _this$getArrowStyle2 = this.getArrowStyle(),
-          stroke = _this$getArrowStyle2.stroke,
-          strokeWidth = _this$getArrowStyle2.strokeWidth;
-
-      return Object(preact_module["g" /* h */])("marker", {
-        id: "marker-end-".concat(id),
-        refX: "-1",
-        overflow: "visible",
-        orient: "auto",
-        markerUnits: "userSpaceOnUse"
-      }, Object(preact_module["g" /* h */])("path", {
+      return Object(preact_module["g" /* h */])("path", {
         stroke: stroke,
         fill: stroke,
         strokeWidth: strokeWidth,
         transform: "rotate(180)",
         d: "M 0 0 L ".concat(offset, " -").concat(verticalLength, " L ").concat(offset, " ").concat(verticalLength, " Z")
-      }));
+      });
     } // 起点终点，可以修改起点/终点为其他节点
 
   }, {
     key: "getAdjustPoints",
     value: function getAdjustPoints() {
-      var _this$props8 = this.props,
-          model = _this$props8.model,
-          graphModel = _this$props8.graphModel;
+      var _this$props6 = this.props,
+          model = _this$props6.model,
+          graphModel = _this$props6.graphModel;
       var start = model.getAdjustStart();
       var end = model.getAdjustEnd();
       return Object(preact_module["g" /* h */])("g", null, Object(preact_module["g" /* h */])(AdjustPoint_AdjustPoint, BaseEdge_extends({
@@ -35367,9 +35452,9 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
   }, {
     key: "toFront",
     value: function toFront() {
-      var _this$props9 = this.props,
-          graphModel = _this$props9.graphModel,
-          model = _this$props9.model;
+      var _this$props7 = this.props,
+          graphModel = _this$props7.graphModel,
+          model = _this$props7.model;
       var overlapMode = graphModel.overlapMode;
 
       if (overlapMode !== OverlapMode.INCREASE) {
@@ -35379,11 +35464,11 @@ var BaseEdge_BaseEdge = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props10 = this.props,
-          _this$props10$model = _this$props10.model,
-          isSelected = _this$props10$model.isSelected,
-          isHitable = _this$props10$model.isHitable,
-          graphModel = _this$props10.graphModel;
+      var _this$props8 = this.props,
+          _this$props8$model = _this$props8.model,
+          isSelected = _this$props8$model.isSelected,
+          isHitable = _this$props8$model.isHitable,
+          graphModel = _this$props8.graphModel;
       var isDraging = this.getIsDraging();
       var adjustEdgeStartAndEnd = graphModel.editConfigModel.adjustEdgeStartAndEnd,
           animation = graphModel.animation; // performance 只允许出现一条edge有动画
@@ -36942,7 +37027,7 @@ var TextEditTool_TextEdit = src_observer(TextEditTool_class = (_temp = _class2 =
     });
 
     TextEditTool_defineProperty(TextEditTool_assertThisInitialized(_this), "keyupHandler", function (ev) {
-      var textEditElement = _this.props.graphModel.textEditElement;
+      var textEditElement = _this.props.graphModel.textEditElement; // 按下alt+enter表示输入完成
 
       if (ev.key === 'Enter' && ev.altKey) {
         textEditElement.setElementState(0);
@@ -37045,6 +37130,7 @@ var TextEditTool_TextEdit = src_observer(TextEditTool_class = (_temp = _class2 =
         key: textEditElement.id,
         onKeyUp: this.keyupHandler,
         onKeyDown: this.keydownHandler,
+        onKeyPress: this.keydownHandler,
         onInput: this.inputHandler
       }, (_textEditElement$text = textEditElement.text) === null || _textEditElement$text === void 0 ? void 0 : _textEditElement$text.value) : null;
     }