@logicflow/core 1.1.23 → 1.1.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/logic-flow.js +194 -101
- package/dist/logic-flow.min.js +1 -1
- package/package.json +1 -1
- package/types/LogicFlow.d.ts +1 -1
- package/types/model/BaseModel.d.ts +7 -0
- package/types/model/GraphModel.d.ts +6 -1
- package/types/model/edge/BaseEdgeModel.d.ts +1 -0
- package/types/model/node/BaseNodeModel.d.ts +4 -2
- package/types/options.d.ts +22 -0
- package/types/util/edge.d.ts +6 -0
package/dist/logic-flow.js
CHANGED
|
@@ -5487,7 +5487,7 @@ $({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !CORRECT_PR
|
|
|
5487
5487
|
var $ = __webpack_require__(16);
|
|
5488
5488
|
var getBuiltIn = __webpack_require__(46);
|
|
5489
5489
|
var apply = __webpack_require__(76);
|
|
5490
|
-
var bind = __webpack_require__(
|
|
5490
|
+
var bind = __webpack_require__(199);
|
|
5491
5491
|
var aConstructor = __webpack_require__(157);
|
|
5492
5492
|
var anObject = __webpack_require__(32);
|
|
5493
5493
|
var isObject = __webpack_require__(33);
|
|
@@ -5966,6 +5966,21 @@ $({ target: 'Array', proto: true, forced: FORCED }, {
|
|
|
5966
5966
|
|
|
5967
5967
|
/***/ }),
|
|
5968
5968
|
/* 30 */
|
|
5969
|
+
/***/ (function(module, exports, __webpack_require__) {
|
|
5970
|
+
|
|
5971
|
+
var $ = __webpack_require__(16);
|
|
5972
|
+
var assign = __webpack_require__(198);
|
|
5973
|
+
|
|
5974
|
+
// `Object.assign` method
|
|
5975
|
+
// https://tc39.es/ecma262/#sec-object.assign
|
|
5976
|
+
// eslint-disable-next-line es/no-object-assign -- required for testing
|
|
5977
|
+
$({ target: 'Object', stat: true, forced: Object.assign !== assign }, {
|
|
5978
|
+
assign: assign
|
|
5979
|
+
});
|
|
5980
|
+
|
|
5981
|
+
|
|
5982
|
+
/***/ }),
|
|
5983
|
+
/* 31 */
|
|
5969
5984
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
5970
5985
|
|
|
5971
5986
|
"use strict";
|
|
@@ -5981,21 +5996,6 @@ var root = _freeGlobal_js__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"] || fre
|
|
|
5981
5996
|
/* harmony default export */ __webpack_exports__["a"] = (root);
|
|
5982
5997
|
|
|
5983
5998
|
|
|
5984
|
-
/***/ }),
|
|
5985
|
-
/* 31 */
|
|
5986
|
-
/***/ (function(module, exports, __webpack_require__) {
|
|
5987
|
-
|
|
5988
|
-
var $ = __webpack_require__(16);
|
|
5989
|
-
var assign = __webpack_require__(200);
|
|
5990
|
-
|
|
5991
|
-
// `Object.assign` method
|
|
5992
|
-
// https://tc39.es/ecma262/#sec-object.assign
|
|
5993
|
-
// eslint-disable-next-line es/no-object-assign -- required for testing
|
|
5994
|
-
$({ target: 'Object', stat: true, forced: Object.assign !== assign }, {
|
|
5995
|
-
assign: assign
|
|
5996
|
-
});
|
|
5997
|
-
|
|
5998
|
-
|
|
5999
5999
|
/***/ }),
|
|
6000
6000
|
/* 32 */
|
|
6001
6001
|
/***/ (function(module, exports, __webpack_require__) {
|
|
@@ -6332,7 +6332,7 @@ var $ = __webpack_require__(16);
|
|
|
6332
6332
|
var call = __webpack_require__(35);
|
|
6333
6333
|
var isObject = __webpack_require__(33);
|
|
6334
6334
|
var anObject = __webpack_require__(32);
|
|
6335
|
-
var isDataDescriptor = __webpack_require__(
|
|
6335
|
+
var isDataDescriptor = __webpack_require__(200);
|
|
6336
6336
|
var getOwnPropertyDescriptorModule = __webpack_require__(51);
|
|
6337
6337
|
var getPrototypeOf = __webpack_require__(96);
|
|
6338
6338
|
|
|
@@ -6359,7 +6359,7 @@ $({ target: 'Reflect', stat: true }, {
|
|
|
6359
6359
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
6360
6360
|
|
|
6361
6361
|
"use strict";
|
|
6362
|
-
/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
|
|
6362
|
+
/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31);
|
|
6363
6363
|
/* harmony import */ var _stubFalse_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(165);
|
|
6364
6364
|
|
|
6365
6365
|
|
|
@@ -8062,7 +8062,7 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object
|
|
|
8062
8062
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
8063
8063
|
|
|
8064
8064
|
"use strict";
|
|
8065
|
-
/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
|
|
8065
|
+
/* WEBPACK VAR INJECTION */(function(module) {/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31);
|
|
8066
8066
|
|
|
8067
8067
|
|
|
8068
8068
|
/** Detect free variable `exports`. */
|
|
@@ -14161,57 +14161,6 @@ module.exports = function (matched, str, position, captures, namedCaptures, repl
|
|
|
14161
14161
|
|
|
14162
14162
|
"use strict";
|
|
14163
14163
|
|
|
14164
|
-
var global = __webpack_require__(7);
|
|
14165
|
-
var uncurryThis = __webpack_require__(15);
|
|
14166
|
-
var aCallable = __webpack_require__(55);
|
|
14167
|
-
var isObject = __webpack_require__(33);
|
|
14168
|
-
var hasOwn = __webpack_require__(34);
|
|
14169
|
-
var arraySlice = __webpack_require__(101);
|
|
14170
|
-
|
|
14171
|
-
var Function = global.Function;
|
|
14172
|
-
var concat = uncurryThis([].concat);
|
|
14173
|
-
var join = uncurryThis([].join);
|
|
14174
|
-
var factories = {};
|
|
14175
|
-
|
|
14176
|
-
var construct = function (C, argsLength, args) {
|
|
14177
|
-
if (!hasOwn(factories, argsLength)) {
|
|
14178
|
-
for (var list = [], i = 0; i < argsLength; i++) list[i] = 'a[' + i + ']';
|
|
14179
|
-
factories[argsLength] = Function('C,a', 'return new C(' + join(list, ',') + ')');
|
|
14180
|
-
} return factories[argsLength](C, args);
|
|
14181
|
-
};
|
|
14182
|
-
|
|
14183
|
-
// `Function.prototype.bind` method implementation
|
|
14184
|
-
// https://tc39.es/ecma262/#sec-function.prototype.bind
|
|
14185
|
-
module.exports = Function.bind || function bind(that /* , ...args */) {
|
|
14186
|
-
var F = aCallable(this);
|
|
14187
|
-
var Prototype = F.prototype;
|
|
14188
|
-
var partArgs = arraySlice(arguments, 1);
|
|
14189
|
-
var boundFunction = function bound(/* args... */) {
|
|
14190
|
-
var args = concat(partArgs, arraySlice(arguments));
|
|
14191
|
-
return this instanceof boundFunction ? construct(F, args.length, args) : F.apply(that, args);
|
|
14192
|
-
};
|
|
14193
|
-
if (isObject(Prototype)) boundFunction.prototype = Prototype;
|
|
14194
|
-
return boundFunction;
|
|
14195
|
-
};
|
|
14196
|
-
|
|
14197
|
-
|
|
14198
|
-
/***/ }),
|
|
14199
|
-
/* 199 */
|
|
14200
|
-
/***/ (function(module, exports, __webpack_require__) {
|
|
14201
|
-
|
|
14202
|
-
var hasOwn = __webpack_require__(34);
|
|
14203
|
-
|
|
14204
|
-
module.exports = function (descriptor) {
|
|
14205
|
-
return descriptor !== undefined && (hasOwn(descriptor, 'value') || hasOwn(descriptor, 'writable'));
|
|
14206
|
-
};
|
|
14207
|
-
|
|
14208
|
-
|
|
14209
|
-
/***/ }),
|
|
14210
|
-
/* 200 */
|
|
14211
|
-
/***/ (function(module, exports, __webpack_require__) {
|
|
14212
|
-
|
|
14213
|
-
"use strict";
|
|
14214
|
-
|
|
14215
14164
|
var DESCRIPTORS = __webpack_require__(36);
|
|
14216
14165
|
var uncurryThis = __webpack_require__(15);
|
|
14217
14166
|
var call = __webpack_require__(35);
|
|
@@ -14270,6 +14219,57 @@ module.exports = !$assign || fails(function () {
|
|
|
14270
14219
|
} : $assign;
|
|
14271
14220
|
|
|
14272
14221
|
|
|
14222
|
+
/***/ }),
|
|
14223
|
+
/* 199 */
|
|
14224
|
+
/***/ (function(module, exports, __webpack_require__) {
|
|
14225
|
+
|
|
14226
|
+
"use strict";
|
|
14227
|
+
|
|
14228
|
+
var global = __webpack_require__(7);
|
|
14229
|
+
var uncurryThis = __webpack_require__(15);
|
|
14230
|
+
var aCallable = __webpack_require__(55);
|
|
14231
|
+
var isObject = __webpack_require__(33);
|
|
14232
|
+
var hasOwn = __webpack_require__(34);
|
|
14233
|
+
var arraySlice = __webpack_require__(101);
|
|
14234
|
+
|
|
14235
|
+
var Function = global.Function;
|
|
14236
|
+
var concat = uncurryThis([].concat);
|
|
14237
|
+
var join = uncurryThis([].join);
|
|
14238
|
+
var factories = {};
|
|
14239
|
+
|
|
14240
|
+
var construct = function (C, argsLength, args) {
|
|
14241
|
+
if (!hasOwn(factories, argsLength)) {
|
|
14242
|
+
for (var list = [], i = 0; i < argsLength; i++) list[i] = 'a[' + i + ']';
|
|
14243
|
+
factories[argsLength] = Function('C,a', 'return new C(' + join(list, ',') + ')');
|
|
14244
|
+
} return factories[argsLength](C, args);
|
|
14245
|
+
};
|
|
14246
|
+
|
|
14247
|
+
// `Function.prototype.bind` method implementation
|
|
14248
|
+
// https://tc39.es/ecma262/#sec-function.prototype.bind
|
|
14249
|
+
module.exports = Function.bind || function bind(that /* , ...args */) {
|
|
14250
|
+
var F = aCallable(this);
|
|
14251
|
+
var Prototype = F.prototype;
|
|
14252
|
+
var partArgs = arraySlice(arguments, 1);
|
|
14253
|
+
var boundFunction = function bound(/* args... */) {
|
|
14254
|
+
var args = concat(partArgs, arraySlice(arguments));
|
|
14255
|
+
return this instanceof boundFunction ? construct(F, args.length, args) : F.apply(that, args);
|
|
14256
|
+
};
|
|
14257
|
+
if (isObject(Prototype)) boundFunction.prototype = Prototype;
|
|
14258
|
+
return boundFunction;
|
|
14259
|
+
};
|
|
14260
|
+
|
|
14261
|
+
|
|
14262
|
+
/***/ }),
|
|
14263
|
+
/* 200 */
|
|
14264
|
+
/***/ (function(module, exports, __webpack_require__) {
|
|
14265
|
+
|
|
14266
|
+
var hasOwn = __webpack_require__(34);
|
|
14267
|
+
|
|
14268
|
+
module.exports = function (descriptor) {
|
|
14269
|
+
return descriptor !== undefined && (hasOwn(descriptor, 'value') || hasOwn(descriptor, 'writable'));
|
|
14270
|
+
};
|
|
14271
|
+
|
|
14272
|
+
|
|
14273
14273
|
/***/ }),
|
|
14274
14274
|
/* 201 */
|
|
14275
14275
|
/***/ (function(module, exports, __webpack_require__) {
|
|
@@ -16699,7 +16699,7 @@ function stackHas(key) {
|
|
|
16699
16699
|
/* harmony default export */ var _stackHas = (stackHas);
|
|
16700
16700
|
|
|
16701
16701
|
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/lodash-es/_root.js
|
|
16702
|
-
var _root = __webpack_require__(
|
|
16702
|
+
var _root = __webpack_require__(31);
|
|
16703
16703
|
|
|
16704
16704
|
// CONCATENATED MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/lodash-es/_Symbol.js
|
|
16705
16705
|
|
|
@@ -22730,6 +22730,9 @@ var es_string_replace = __webpack_require__(125);
|
|
|
22730
22730
|
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.number.max-safe-integer.js
|
|
22731
22731
|
var es_number_max_safe_integer = __webpack_require__(80);
|
|
22732
22732
|
|
|
22733
|
+
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.object.assign.js
|
|
22734
|
+
var es_object_assign = __webpack_require__(30);
|
|
22735
|
+
|
|
22733
22736
|
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.object.set-prototype-of.js
|
|
22734
22737
|
var es_object_set_prototype_of = __webpack_require__(12);
|
|
22735
22738
|
|
|
@@ -22742,9 +22745,6 @@ var es_reflect_construct = __webpack_require__(14);
|
|
|
22742
22745
|
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.reflect.get.js
|
|
22743
22746
|
var es_reflect_get = __webpack_require__(47);
|
|
22744
22747
|
|
|
22745
|
-
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.object.assign.js
|
|
22746
|
-
var es_object_assign = __webpack_require__(31);
|
|
22747
|
-
|
|
22748
22748
|
// CONCATENATED MODULE: ./node_modules/uuid/dist/esm-browser/rng.js
|
|
22749
22749
|
// Unique ID creation requires a high quality random # generator. In the browser we therefore
|
|
22750
22750
|
// require the crypto API and do not support built-in fallback to lower quality random number
|
|
@@ -23478,6 +23478,8 @@ var BaseEdgeModel_BaseEdgeModel = (BaseEdgeModel_class = /*#__PURE__*/function (
|
|
|
23478
23478
|
|
|
23479
23479
|
BaseEdgeModel_initializerDefineProperty(this, "visible", BaseEdgeModel_descriptor14, this);
|
|
23480
23480
|
|
|
23481
|
+
BaseEdgeModel_defineProperty(this, "virtual", false);
|
|
23482
|
+
|
|
23481
23483
|
BaseEdgeModel_initializerDefineProperty(this, "isAnimation", BaseEdgeModel_descriptor15, this);
|
|
23482
23484
|
|
|
23483
23485
|
BaseEdgeModel_defineProperty(this, "graphModel", void 0);
|
|
@@ -23508,14 +23510,7 @@ var BaseEdgeModel_BaseEdgeModel = (BaseEdgeModel_class = /*#__PURE__*/function (
|
|
|
23508
23510
|
|
|
23509
23511
|
this.graphModel = graphModel;
|
|
23510
23512
|
this.initEdgeData(data);
|
|
23511
|
-
this.setAttributes();
|
|
23512
|
-
// 端点依赖于 edgeData 的 sourceNode 和 targetNode
|
|
23513
|
-
|
|
23514
|
-
this.setAnchors(); // 边的拐点依赖于两个端点
|
|
23515
|
-
|
|
23516
|
-
this.initPoints(); // 文本位置依赖于边上的所有拐点
|
|
23517
|
-
|
|
23518
|
-
this.formatText(data);
|
|
23513
|
+
this.setAttributes();
|
|
23519
23514
|
}
|
|
23520
23515
|
/**
|
|
23521
23516
|
* @overridable 支持重写
|
|
@@ -23547,7 +23542,15 @@ var BaseEdgeModel_BaseEdgeModel = (BaseEdgeModel_class = /*#__PURE__*/function (
|
|
|
23547
23542
|
|
|
23548
23543
|
if (overlapMode === OverlapMode.INCREASE) {
|
|
23549
23544
|
this.zIndex = data.zIndex || getZIndex();
|
|
23550
|
-
}
|
|
23545
|
+
} // 设置边的 anchors,也就是边的两个端点
|
|
23546
|
+
// 端点依赖于 edgeData 的 sourceNode 和 targetNode
|
|
23547
|
+
|
|
23548
|
+
|
|
23549
|
+
this.setAnchors(); // 边的拐点依赖于两个端点
|
|
23550
|
+
|
|
23551
|
+
this.initPoints(); // 文本位置依赖于边上的所有拐点
|
|
23552
|
+
|
|
23553
|
+
this.formatText(data);
|
|
23551
23554
|
}
|
|
23552
23555
|
/**
|
|
23553
23556
|
* 设置model属性,每次properties发生变化会触发
|
|
@@ -25100,6 +25103,7 @@ function edge_arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
25100
25103
|
|
|
25101
25104
|
|
|
25102
25105
|
|
|
25106
|
+
|
|
25103
25107
|
|
|
25104
25108
|
|
|
25105
25109
|
/* 手动创建边时edge->edgeModel */
|
|
@@ -25935,6 +25939,39 @@ var twoPointDistance = function twoPointDistance(source, target) {
|
|
|
25935
25939
|
// };
|
|
25936
25940
|
return Math.sqrt(Math.pow(source.x - target.x, 2) + Math.pow(source.y - target.y, 2));
|
|
25937
25941
|
};
|
|
25942
|
+
/**
|
|
25943
|
+
* 包装边生成函数
|
|
25944
|
+
* @param graphModel graph model
|
|
25945
|
+
* @param generator 用户自定义的边生成函数
|
|
25946
|
+
*/
|
|
25947
|
+
|
|
25948
|
+
function createEdgeGenerator(graphModel, generator) {
|
|
25949
|
+
if (typeof generator !== 'function') {
|
|
25950
|
+
return function (sourceNode, targetNode, currentEdge) {
|
|
25951
|
+
return Object.assign({
|
|
25952
|
+
type: graphModel.edgeType
|
|
25953
|
+
}, currentEdge);
|
|
25954
|
+
};
|
|
25955
|
+
}
|
|
25956
|
+
|
|
25957
|
+
return function (sourceNode, targetNode, currentEdge) {
|
|
25958
|
+
var result = generator(sourceNode, targetNode, currentEdge); // 无结果使用默认类型
|
|
25959
|
+
|
|
25960
|
+
if (!result) return {
|
|
25961
|
+
type: graphModel.edgeType
|
|
25962
|
+
};
|
|
25963
|
+
|
|
25964
|
+
if (typeof result === 'string') {
|
|
25965
|
+
return Object.assign({}, currentEdge, {
|
|
25966
|
+
type: result
|
|
25967
|
+
});
|
|
25968
|
+
}
|
|
25969
|
+
|
|
25970
|
+
return Object.assign({
|
|
25971
|
+
type: result
|
|
25972
|
+
}, currentEdge);
|
|
25973
|
+
};
|
|
25974
|
+
}
|
|
25938
25975
|
// EXTERNAL MODULE: /Users/didi/niu-workspace/LogicFlow/node_modules/core-js/modules/es.promise.js
|
|
25939
25976
|
var es_promise = __webpack_require__(204);
|
|
25940
25977
|
|
|
@@ -26355,6 +26392,8 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26355
26392
|
|
|
26356
26393
|
GraphModel_defineProperty(this, "idGenerator", void 0);
|
|
26357
26394
|
|
|
26395
|
+
GraphModel_defineProperty(this, "edgeGenerator", void 0);
|
|
26396
|
+
|
|
26358
26397
|
GraphModel_defineProperty(this, "nodeMoveRules", []);
|
|
26359
26398
|
|
|
26360
26399
|
GraphModel_initializerDefineProperty(this, "edgeType", GraphModel_descriptor3, this);
|
|
@@ -26382,6 +26421,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26382
26421
|
background = _options$background === void 0 ? {} : _options$background,
|
|
26383
26422
|
grid = options.grid,
|
|
26384
26423
|
idGenerator = options.idGenerator,
|
|
26424
|
+
edgeGenerator = options.edgeGenerator,
|
|
26385
26425
|
animation = options.animation;
|
|
26386
26426
|
this.background = background;
|
|
26387
26427
|
|
|
@@ -26401,6 +26441,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26401
26441
|
this.partial = options.partial;
|
|
26402
26442
|
this.overlapMode = options.overlapMode || 0;
|
|
26403
26443
|
this.idGenerator = idGenerator;
|
|
26444
|
+
this.edgeGenerator = createEdgeGenerator(this, edgeGenerator);
|
|
26404
26445
|
this.width = options.width || this.rootEl.getBoundingClientRect().width;
|
|
26405
26446
|
this.height = options.height || this.rootEl.getBoundingClientRect().height;
|
|
26406
26447
|
}
|
|
@@ -26521,6 +26562,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26521
26562
|
* @param rightBottomPoint 表示区域右下角的点
|
|
26522
26563
|
* @param wholeEdge 是否要整个边都在区域内部
|
|
26523
26564
|
* @param wholeNode 是否要整个节点都在区域内部
|
|
26565
|
+
* @param ignoreHideElement 是否忽略隐藏的节点
|
|
26524
26566
|
*/
|
|
26525
26567
|
|
|
26526
26568
|
}, {
|
|
@@ -26528,6 +26570,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26528
26570
|
value: function getAreaElement(leftTopPoint, rightBottomPoint) {
|
|
26529
26571
|
var wholeEdge = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
|
|
26530
26572
|
var wholeNode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
26573
|
+
var ignoreHideElement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
26531
26574
|
var areaElements = [];
|
|
26532
26575
|
var elements = [];
|
|
26533
26576
|
this.nodes.forEach(function (node) {
|
|
@@ -26540,7 +26583,7 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26540
26583
|
for (var i = 0; i < elements.length; i++) {
|
|
26541
26584
|
var currentItem = elements[i];
|
|
26542
26585
|
|
|
26543
|
-
if (this.isElementInArea(currentItem, leftTopPoint, rightBottomPoint, wholeEdge, wholeNode)) {
|
|
26586
|
+
if ((!ignoreHideElement || currentItem.visible) && this.isElementInArea(currentItem, leftTopPoint, rightBottomPoint, wholeEdge, wholeNode)) {
|
|
26544
26587
|
areaElements.push(currentItem);
|
|
26545
26588
|
}
|
|
26546
26589
|
}
|
|
@@ -26732,12 +26775,12 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
26732
26775
|
var edges = [];
|
|
26733
26776
|
this.edges.forEach(function (edge) {
|
|
26734
26777
|
var data = edge.getData();
|
|
26735
|
-
if (data) edges.push(data);
|
|
26778
|
+
if (data && !edge.virtual) edges.push(data);
|
|
26736
26779
|
});
|
|
26737
26780
|
var nodes = [];
|
|
26738
26781
|
this.nodes.forEach(function (node) {
|
|
26739
26782
|
var data = node.getData();
|
|
26740
|
-
if (data) nodes.push(data);
|
|
26783
|
+
if (data && !node.virtual) nodes.push(data);
|
|
26741
26784
|
});
|
|
26742
26785
|
return {
|
|
26743
26786
|
nodes: nodes,
|
|
@@ -27123,9 +27166,15 @@ var GraphModel_GraphModel = (GraphModel_class = /*#__PURE__*/function () {
|
|
|
27123
27166
|
}
|
|
27124
27167
|
|
|
27125
27168
|
var nodeModel = node.model;
|
|
27126
|
-
var r = nodeModel.move(deltaX, deltaY, isignoreRule); // 2) 移动边
|
|
27127
27169
|
|
|
27128
|
-
|
|
27170
|
+
var _nodeModel$getMoveDis = nodeModel.getMoveDistance(deltaX, deltaY, isignoreRule);
|
|
27171
|
+
|
|
27172
|
+
var _nodeModel$getMoveDis2 = GraphModel_slicedToArray(_nodeModel$getMoveDis, 2);
|
|
27173
|
+
|
|
27174
|
+
deltaX = _nodeModel$getMoveDis2[0];
|
|
27175
|
+
deltaY = _nodeModel$getMoveDis2[1];
|
|
27176
|
+
// 2) 移动边
|
|
27177
|
+
this.moveEdge(nodeId, deltaX, deltaY);
|
|
27129
27178
|
}
|
|
27130
27179
|
/**
|
|
27131
27180
|
* 移动节点-绝对位置
|
|
@@ -30107,6 +30156,8 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
|
|
|
30107
30156
|
|
|
30108
30157
|
BaseNodeModel_initializerDefineProperty(this, "visible", BaseNodeModel_descriptor14, this);
|
|
30109
30158
|
|
|
30159
|
+
BaseNodeModel_defineProperty(this, "virtual", false);
|
|
30160
|
+
|
|
30110
30161
|
BaseNodeModel_defineProperty(this, "graphModel", void 0);
|
|
30111
30162
|
|
|
30112
30163
|
BaseNodeModel_initializerDefineProperty(this, "zIndex", BaseNodeModel_descriptor15, this);
|
|
@@ -30590,11 +30641,11 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
|
|
|
30590
30641
|
}, {
|
|
30591
30642
|
key: "move",
|
|
30592
30643
|
value: function move(deltaX, deltaY) {
|
|
30593
|
-
var
|
|
30644
|
+
var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
30594
30645
|
var isAllowMoveX = false;
|
|
30595
30646
|
var isAllowMoveY = false;
|
|
30596
30647
|
|
|
30597
|
-
if (
|
|
30648
|
+
if (isIgnoreRule) {
|
|
30598
30649
|
isAllowMoveX = true;
|
|
30599
30650
|
isAllowMoveY = true;
|
|
30600
30651
|
} else {
|
|
@@ -30623,13 +30674,53 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
|
|
|
30623
30674
|
|
|
30624
30675
|
return isAllowMoveX || isAllowMoveY;
|
|
30625
30676
|
}
|
|
30677
|
+
}, {
|
|
30678
|
+
key: "getMoveDistance",
|
|
30679
|
+
value: function getMoveDistance(deltaX, deltaY) {
|
|
30680
|
+
var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
30681
|
+
var isAllowMoveX = false;
|
|
30682
|
+
var isAllowMoveY = false;
|
|
30683
|
+
var moveX = 0;
|
|
30684
|
+
var moveY = 0;
|
|
30685
|
+
|
|
30686
|
+
if (isIgnoreRule) {
|
|
30687
|
+
isAllowMoveX = true;
|
|
30688
|
+
isAllowMoveY = true;
|
|
30689
|
+
} else {
|
|
30690
|
+
var r = this.isAllowMoveNode(deltaX, deltaY);
|
|
30691
|
+
|
|
30692
|
+
if (typeof r === 'boolean') {
|
|
30693
|
+
isAllowMoveX = r;
|
|
30694
|
+
isAllowMoveY = r;
|
|
30695
|
+
} else {
|
|
30696
|
+
isAllowMoveX = r.x;
|
|
30697
|
+
isAllowMoveY = r.y;
|
|
30698
|
+
}
|
|
30699
|
+
}
|
|
30700
|
+
|
|
30701
|
+
if (isAllowMoveX && deltaX) {
|
|
30702
|
+
var targetX = this.x + deltaX;
|
|
30703
|
+
this.x = targetX;
|
|
30704
|
+
this.text && this.moveText(deltaX, 0);
|
|
30705
|
+
moveX = deltaX;
|
|
30706
|
+
}
|
|
30707
|
+
|
|
30708
|
+
if (isAllowMoveY && deltaY) {
|
|
30709
|
+
var targetY = this.y + deltaY;
|
|
30710
|
+
this.y = targetY;
|
|
30711
|
+
this.text && this.moveText(0, deltaY);
|
|
30712
|
+
moveY = deltaY;
|
|
30713
|
+
}
|
|
30714
|
+
|
|
30715
|
+
return [moveX, moveY];
|
|
30716
|
+
}
|
|
30626
30717
|
}, {
|
|
30627
30718
|
key: "moveTo",
|
|
30628
30719
|
value: function moveTo(x, y) {
|
|
30629
|
-
var
|
|
30720
|
+
var isIgnoreRule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
30630
30721
|
var deltaX = x - this.x;
|
|
30631
30722
|
var deltaY = y - this.y;
|
|
30632
|
-
if (!
|
|
30723
|
+
if (!isIgnoreRule && !this.isAllowMoveNode(deltaX, deltaY)) return false;
|
|
30633
30724
|
|
|
30634
30725
|
if (this.text) {
|
|
30635
30726
|
this.text && this.moveText(deltaX, deltaY);
|
|
@@ -30860,7 +30951,7 @@ var BaseNodeModel_BaseNodeModel = (BaseNodeModel_class = /*#__PURE__*/function (
|
|
|
30860
30951
|
initializer: function initializer() {
|
|
30861
30952
|
return {};
|
|
30862
30953
|
}
|
|
30863
|
-
}), 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);
|
|
30954
|
+
}), 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);
|
|
30864
30955
|
|
|
30865
30956
|
// CONCATENATED MODULE: ./src/model/node/CircleNodeModel.ts
|
|
30866
30957
|
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); }
|
|
@@ -32483,8 +32574,6 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
|
|
|
32483
32574
|
cancelRaf(_this.t);
|
|
32484
32575
|
}
|
|
32485
32576
|
|
|
32486
|
-
console.log(555, 'dragend');
|
|
32487
|
-
|
|
32488
32577
|
_this.checkEnd(event);
|
|
32489
32578
|
|
|
32490
32579
|
_this.setState({
|
|
@@ -32544,8 +32633,8 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
|
|
|
32544
32633
|
|
|
32545
32634
|
if (isSourcePass && isTargetPass) {
|
|
32546
32635
|
targetNode.setElementState(ElementState.DEFAULT);
|
|
32547
|
-
var
|
|
32548
|
-
|
|
32636
|
+
var edgeData = graphModel.edgeGenerator(nodeModel.getData(), graphModel.getNodeModelById(info.node.id).getData());
|
|
32637
|
+
var edgeModel = graphModel.addEdge(Anchor_objectSpread(Anchor_objectSpread({}, edgeData), {}, {
|
|
32549
32638
|
sourceNodeId: nodeModel.id,
|
|
32550
32639
|
sourceAnchorId: id,
|
|
32551
32640
|
startPoint: {
|
|
@@ -32558,7 +32647,7 @@ var Anchor_Anchor = /*#__PURE__*/function (_Component) {
|
|
|
32558
32647
|
x: info.anchor.x,
|
|
32559
32648
|
y: info.anchor.y
|
|
32560
32649
|
}
|
|
32561
|
-
});
|
|
32650
|
+
}));
|
|
32562
32651
|
var anchorData = _this.props.anchorData;
|
|
32563
32652
|
graphModel.eventCenter.emit(EventType.ANCHOR_DROP, {
|
|
32564
32653
|
data: anchorData,
|
|
@@ -34807,7 +34896,8 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
|
|
|
34807
34896
|
|
|
34808
34897
|
|
|
34809
34898
|
if (type === AdjustType.SOURCE) {
|
|
34810
|
-
|
|
34899
|
+
var edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(info.node.id).getData(), graphModel.getNodeModelById(edgeModel.targetNodeId).getData(), createEdgeInfo);
|
|
34900
|
+
createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, edgeInfo), {}, {
|
|
34811
34901
|
sourceNodeId: info.node.id,
|
|
34812
34902
|
sourceAnchorId: info.anchor.id,
|
|
34813
34903
|
startPoint: {
|
|
@@ -34818,7 +34908,9 @@ var AdjustPoint_AdjustPoint = /*#__PURE__*/function (_Component) {
|
|
|
34818
34908
|
endPoint: AdjustPoint_objectSpread({}, edgeModel.endPoint)
|
|
34819
34909
|
});
|
|
34820
34910
|
} else if (type === AdjustType.TARGET) {
|
|
34821
|
-
|
|
34911
|
+
var _edgeInfo = graphModel.edgeGenerator(graphModel.getNodeModelById(edgeModel.sourceNodeId).getData(), graphModel.getNodeModelById(info.node.id).getData(), createEdgeInfo);
|
|
34912
|
+
|
|
34913
|
+
createEdgeInfo = AdjustPoint_objectSpread(AdjustPoint_objectSpread({}, _edgeInfo), {}, {
|
|
34822
34914
|
sourceNodeId: edgeModel.sourceNodeId,
|
|
34823
34915
|
startPoint: AdjustPoint_objectSpread({}, edgeModel.startPoint),
|
|
34824
34916
|
targetNodeId: info.node.id,
|
|
@@ -38626,7 +38718,8 @@ var LogicFlow_LogicFlow = /*#__PURE__*/function () {
|
|
|
38626
38718
|
value: function getAreaElement(leftTopPoint, rightBottomPoint) {
|
|
38627
38719
|
var wholeEdge = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
|
|
38628
38720
|
var wholeNode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
38629
|
-
|
|
38721
|
+
var ignoreHideElement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
38722
|
+
return this.graphModel.getAreaElement(leftTopPoint, rightBottomPoint, wholeEdge, wholeNode, ignoreHideElement).map(function (element) {
|
|
38630
38723
|
return element.getData();
|
|
38631
38724
|
});
|
|
38632
38725
|
}
|