dcim-topology2d 2.2.3 → 2.2.5

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.
Files changed (191) hide show
  1. package/chart-diagram/src/echarts/index.js +2 -1
  2. package/chart-diagram/src/utils/conversion.js +12 -3
  3. package/core/src/activeLayer.d.ts +2 -0
  4. package/core/src/activeLayer.js +13 -0
  5. package/core/src/common.d.ts +1 -1
  6. package/core/src/common.js +109 -47
  7. package/core/src/core.d.ts +1 -1
  8. package/core/src/core.js +389 -317
  9. package/core/src/divLayer.js +65 -28
  10. package/core/src/element/select.js +2 -1
  11. package/core/src/healps/changeData.d.ts +0 -1
  12. package/core/src/healps/changeData.js +0 -4
  13. package/core/src/middles/default.js +8 -3
  14. package/core/src/middles/index.d.ts +1 -0
  15. package/core/src/middles/index.js +1 -0
  16. package/core/src/middles/nodes/{arbitrarygraph.anchor.d.ts → basic/arbitrarygraph.anchor.d.ts} +1 -1
  17. package/core/src/middles/nodes/{arbitrarygraph.anchor.js → basic/arbitrarygraph.anchor.js} +1 -1
  18. package/core/src/middles/nodes/{arbitrarygraph.d.ts → basic/arbitrarygraph.d.ts} +1 -1
  19. package/core/src/middles/nodes/{arrow.anchor.d.ts → basic/arrow.anchor.d.ts} +1 -1
  20. package/core/src/middles/nodes/{arrow.anchor.js → basic/arrow.anchor.js} +2 -2
  21. package/core/src/middles/nodes/{arrow.d.ts → basic/arrow.d.ts} +1 -1
  22. package/core/src/middles/nodes/{arrow.rect.d.ts → basic/arrow.rect.d.ts} +1 -1
  23. package/core/src/middles/nodes/{arrow.rect.js → basic/arrow.rect.js} +1 -1
  24. package/core/src/middles/nodes/{circle.anchor.d.ts → basic/circle.anchor.d.ts} +1 -1
  25. package/core/src/middles/nodes/{circle.anchor.js → basic/circle.anchor.js} +2 -2
  26. package/core/src/middles/nodes/{circle.d.ts → basic/circle.d.ts} +1 -1
  27. package/core/src/middles/nodes/basic/circle.js +8 -0
  28. package/core/src/middles/nodes/{circle.rect.d.ts → basic/circle.rect.d.ts} +1 -1
  29. package/core/src/middles/nodes/{circle.rect.js → basic/circle.rect.js} +1 -1
  30. package/core/src/middles/nodes/{cloud.anchor.d.ts → basic/cloud.anchor.d.ts} +1 -1
  31. package/core/src/middles/nodes/{cloud.anchor.js → basic/cloud.anchor.js} +2 -2
  32. package/core/src/middles/nodes/{cloud.d.ts → basic/cloud.d.ts} +1 -1
  33. package/core/src/middles/nodes/{cloud.rect.d.ts → basic/cloud.rect.d.ts} +1 -1
  34. package/core/src/middles/nodes/{cloud.rect.js → basic/cloud.rect.js} +1 -1
  35. package/core/src/middles/nodes/{cube.anchor.d.ts → basic/cube.anchor.d.ts} +1 -1
  36. package/core/src/middles/nodes/{cube.anchor.js → basic/cube.anchor.js} +2 -2
  37. package/core/src/middles/nodes/{cube.d.ts → basic/cube.d.ts} +1 -1
  38. package/core/src/middles/nodes/{cube.model.d.ts → basic/cube.model.d.ts} +2 -2
  39. package/core/src/middles/nodes/{cube.model.js → basic/cube.model.js} +2 -2
  40. package/core/src/middles/nodes/{cube.rect.d.ts → basic/cube.rect.d.ts} +1 -1
  41. package/core/src/middles/nodes/{cube.rect.js → basic/cube.rect.js} +1 -1
  42. package/core/src/middles/nodes/{diamond.d.ts → basic/diamond.d.ts} +1 -1
  43. package/core/src/middles/nodes/{diamond.rect.d.ts → basic/diamond.rect.d.ts} +1 -1
  44. package/core/src/middles/nodes/{diamond.rect.js → basic/diamond.rect.js} +1 -1
  45. package/core/src/middles/nodes/{file.d.ts → basic/file.d.ts} +1 -1
  46. package/core/src/middles/nodes/{iframe.d.ts → basic/iframe.d.ts} +1 -1
  47. package/core/src/middles/nodes/{iframe.js → basic/iframe.js} +7 -5
  48. package/core/src/middles/nodes/{image.anchor.d.ts → basic/image.anchor.d.ts} +1 -1
  49. package/core/src/middles/nodes/{image.anchor.js → basic/image.anchor.js} +2 -2
  50. package/core/src/middles/nodes/{image.rect.d.ts → basic/image.rect.d.ts} +1 -1
  51. package/core/src/middles/nodes/{image.rect.js → basic/image.rect.js} +1 -1
  52. package/core/src/middles/nodes/{line.anchor.d.ts → basic/line.anchor.d.ts} +1 -1
  53. package/core/src/middles/nodes/{line.anchor.js → basic/line.anchor.js} +2 -2
  54. package/core/src/middles/nodes/{line.d.ts → basic/line.d.ts} +1 -1
  55. package/core/src/middles/nodes/{line.rect.d.ts → basic/line.rect.d.ts} +1 -1
  56. package/core/src/middles/nodes/{line.rect.js → basic/line.rect.js} +1 -1
  57. package/core/src/middles/nodes/{message.anchor.d.ts → basic/message.anchor.d.ts} +1 -1
  58. package/core/src/middles/nodes/{message.anchor.js → basic/message.anchor.js} +2 -2
  59. package/core/src/middles/nodes/{message.d.ts → basic/message.d.ts} +1 -1
  60. package/core/src/middles/nodes/{message.rect.d.ts → basic/message.rect.d.ts} +1 -1
  61. package/core/src/middles/nodes/{message.rect.js → basic/message.rect.js} +1 -1
  62. package/core/src/middles/nodes/{pentagon.anchor.d.ts → basic/pentagon.anchor.d.ts} +1 -1
  63. package/core/src/middles/nodes/{pentagon.anchor.js → basic/pentagon.anchor.js} +2 -2
  64. package/core/src/middles/nodes/{pentagon.d.ts → basic/pentagon.d.ts} +1 -1
  65. package/core/src/middles/nodes/{pentagon.rect.d.ts → basic/pentagon.rect.d.ts} +1 -1
  66. package/core/src/middles/nodes/{pentagon.rect.js → basic/pentagon.rect.js} +1 -1
  67. package/core/src/middles/nodes/{pentagram.anchor.d.ts → basic/pentagram.anchor.d.ts} +1 -1
  68. package/core/src/middles/nodes/{pentagram.anchor.js → basic/pentagram.anchor.js} +2 -2
  69. package/core/src/middles/nodes/{pentagram.d.ts → basic/pentagram.d.ts} +1 -1
  70. package/core/src/middles/nodes/{pentagram.rect.d.ts → basic/pentagram.rect.d.ts} +1 -1
  71. package/core/src/middles/nodes/{pentagram.rect.js → basic/pentagram.rect.js} +1 -1
  72. package/core/src/middles/nodes/{people.d.ts → basic/people.d.ts} +1 -1
  73. package/core/src/middles/nodes/{people.rect.d.ts → basic/people.rect.d.ts} +1 -1
  74. package/core/src/middles/nodes/{people.rect.js → basic/people.rect.js} +1 -1
  75. package/core/src/middles/nodes/{rectangle.d.ts → basic/rectangle.d.ts} +1 -1
  76. package/core/src/middles/nodes/{rectangle.js → basic/rectangle.js} +1 -1
  77. package/core/src/middles/nodes/{rectangle.rect.d.ts → basic/rectangle.rect.d.ts} +1 -1
  78. package/core/src/middles/nodes/{rectangle.rect.js → basic/rectangle.rect.js} +1 -1
  79. package/core/src/middles/nodes/{text.d.ts → basic/text.d.ts} +3 -2
  80. package/core/src/middles/nodes/{triangle.anchor.d.ts → basic/triangle.anchor.d.ts} +1 -1
  81. package/core/src/middles/nodes/{triangle.anchor.js → basic/triangle.anchor.js} +2 -2
  82. package/core/src/middles/nodes/{triangle.d.ts → basic/triangle.d.ts} +1 -1
  83. package/core/src/middles/nodes/{triangle.rect.d.ts → basic/triangle.rect.d.ts} +1 -1
  84. package/core/src/middles/nodes/{triangle.rect.js → basic/triangle.rect.js} +1 -1
  85. package/core/src/middles/nodes/custom/humiture.d.ts +2 -0
  86. package/core/src/middles/nodes/custom/humiture.js +24 -0
  87. package/core/src/middles/nodes/{hexagon.anchor.d.ts → flow/hexagon.anchor.d.ts} +1 -1
  88. package/core/src/middles/nodes/{hexagon.anchor.js → flow/hexagon.anchor.js} +2 -2
  89. package/core/src/middles/nodes/{hexagon.d.ts → flow/hexagon.d.ts} +1 -1
  90. package/core/src/middles/nodes/{hexagon.rect.d.ts → flow/hexagon.rect.d.ts} +1 -1
  91. package/core/src/middles/nodes/{hexagon.rect.js → flow/hexagon.rect.js} +1 -1
  92. package/core/src/middles/nodes/form/formDatePicker.d.ts +2 -0
  93. package/core/src/middles/nodes/{formDatePicker.js → form/formDatePicker.js} +12 -5
  94. package/core/src/middles/nodes/{formoverflow.js → form/formoverflow.js} +11 -8
  95. package/core/src/middles/nodes/{formselect.d.ts → form/formselect.d.ts} +1 -1
  96. package/core/src/middles/nodes/{formselect.js → form/formselect.js} +6 -7
  97. package/core/src/middles/nodes/{formtable.d.ts → form/formtable.d.ts} +1 -1
  98. package/core/src/middles/nodes/{progress.d.ts → form/progress.d.ts} +2 -2
  99. package/core/src/middles/nodes/{tablePagination.d.ts → form/tablePagination.d.ts} +1 -1
  100. package/core/src/middles/nodes/{time.d.ts → form/time.d.ts} +1 -1
  101. package/core/src/middles/nodes/icon/echartLine.d.ts +2 -0
  102. package/core/src/middles/nodes/icon/echartLine.js +99 -0
  103. package/core/src/middles/nodes/index.d.ts +54 -52
  104. package/core/src/middles/nodes/index.js +54 -53
  105. package/core/src/models/line.js +1 -1
  106. package/core/src/models/node.js +16 -12
  107. package/core/src/models/pen.d.ts +6 -0
  108. package/core/src/models/rect.d.ts +1 -0
  109. package/core/src/models/rect.js +13 -7
  110. package/core/src/options.js +5 -1
  111. package/core/src/preview.js +55 -23
  112. package/core/src/renderLayer.js +5 -0
  113. package/core/src/store/data.d.ts +0 -1
  114. package/core/src/store/data.js +3 -46
  115. package/core/src/utils/assignment.js +41 -43
  116. package/core/src/utils/construction.d.ts +18 -0
  117. package/core/src/utils/construction.js +23 -0
  118. package/core/src/utils/conversion.d.ts +5 -7
  119. package/core/src/utils/conversion.js +212 -25
  120. package/core/src/utils/params.js +1 -0
  121. package/myShape-diagram/index.js +1 -2
  122. package/package.json +1 -1
  123. package/static/icon.js +10 -0
  124. package/static/index.js +2 -1
  125. package/store/actions.js +15 -1
  126. package/store/clear.js +67 -4
  127. package/core/src/middles/nodes/circle.js +0 -7
  128. package/core/src/middles/nodes/formDatePicker.d.ts +0 -2
  129. /package/core/src/middles/nodes/{arbitrarygraph.js → basic/arbitrarygraph.js} +0 -0
  130. /package/core/src/middles/nodes/{arrow.anchor.js.map → basic/arrow.anchor.js.map} +0 -0
  131. /package/core/src/middles/nodes/{arrow.js → basic/arrow.js} +0 -0
  132. /package/core/src/middles/nodes/{arrow.js.map → basic/arrow.js.map} +0 -0
  133. /package/core/src/middles/nodes/{arrow.rect.js.map → basic/arrow.rect.js.map} +0 -0
  134. /package/core/src/middles/nodes/{circle.anchor.js.map → basic/circle.anchor.js.map} +0 -0
  135. /package/core/src/middles/nodes/{circle.js.map → basic/circle.js.map} +0 -0
  136. /package/core/src/middles/nodes/{circle.rect.js.map → basic/circle.rect.js.map} +0 -0
  137. /package/core/src/middles/nodes/{cloud.anchor.js.map → basic/cloud.anchor.js.map} +0 -0
  138. /package/core/src/middles/nodes/{cloud.js → basic/cloud.js} +0 -0
  139. /package/core/src/middles/nodes/{cloud.js.map → basic/cloud.js.map} +0 -0
  140. /package/core/src/middles/nodes/{cloud.rect.js.map → basic/cloud.rect.js.map} +0 -0
  141. /package/core/src/middles/nodes/{cube.anchor.js.map → basic/cube.anchor.js.map} +0 -0
  142. /package/core/src/middles/nodes/{cube.js → basic/cube.js} +0 -0
  143. /package/core/src/middles/nodes/{cube.js.map → basic/cube.js.map} +0 -0
  144. /package/core/src/middles/nodes/{cube.model.js.map → basic/cube.model.js.map} +0 -0
  145. /package/core/src/middles/nodes/{cube.rect.js.map → basic/cube.rect.js.map} +0 -0
  146. /package/core/src/middles/nodes/{diamond.js → basic/diamond.js} +0 -0
  147. /package/core/src/middles/nodes/{diamond.js.map → basic/diamond.js.map} +0 -0
  148. /package/core/src/middles/nodes/{diamond.rect.js.map → basic/diamond.rect.js.map} +0 -0
  149. /package/core/src/middles/nodes/{file.js → basic/file.js} +0 -0
  150. /package/core/src/middles/nodes/{file.js.map → basic/file.js.map} +0 -0
  151. /package/core/src/middles/nodes/{image.anchor.js.map → basic/image.anchor.js.map} +0 -0
  152. /package/core/src/middles/nodes/{image.rect.js.map → basic/image.rect.js.map} +0 -0
  153. /package/core/src/middles/nodes/{line.anchor.js.map → basic/line.anchor.js.map} +0 -0
  154. /package/core/src/middles/nodes/{line.js → basic/line.js} +0 -0
  155. /package/core/src/middles/nodes/{line.js.map → basic/line.js.map} +0 -0
  156. /package/core/src/middles/nodes/{line.rect.js.map → basic/line.rect.js.map} +0 -0
  157. /package/core/src/middles/nodes/{message.anchor.js.map → basic/message.anchor.js.map} +0 -0
  158. /package/core/src/middles/nodes/{message.js → basic/message.js} +0 -0
  159. /package/core/src/middles/nodes/{message.js.map → basic/message.js.map} +0 -0
  160. /package/core/src/middles/nodes/{message.rect.js.map → basic/message.rect.js.map} +0 -0
  161. /package/core/src/middles/nodes/{pentagon.anchor.js.map → basic/pentagon.anchor.js.map} +0 -0
  162. /package/core/src/middles/nodes/{pentagon.js → basic/pentagon.js} +0 -0
  163. /package/core/src/middles/nodes/{pentagon.js.map → basic/pentagon.js.map} +0 -0
  164. /package/core/src/middles/nodes/{pentagon.rect.js.map → basic/pentagon.rect.js.map} +0 -0
  165. /package/core/src/middles/nodes/{pentagram.anchor.js.map → basic/pentagram.anchor.js.map} +0 -0
  166. /package/core/src/middles/nodes/{pentagram.js → basic/pentagram.js} +0 -0
  167. /package/core/src/middles/nodes/{pentagram.js.map → basic/pentagram.js.map} +0 -0
  168. /package/core/src/middles/nodes/{pentagram.rect.js.map → basic/pentagram.rect.js.map} +0 -0
  169. /package/core/src/middles/nodes/{people.js → basic/people.js} +0 -0
  170. /package/core/src/middles/nodes/{people.js.map → basic/people.js.map} +0 -0
  171. /package/core/src/middles/nodes/{people.rect.js.map → basic/people.rect.js.map} +0 -0
  172. /package/core/src/middles/nodes/{rectangle.js.map → basic/rectangle.js.map} +0 -0
  173. /package/core/src/middles/nodes/{rectangle.rect.js.map → basic/rectangle.rect.js.map} +0 -0
  174. /package/core/src/middles/nodes/{text.js → basic/text.js} +0 -0
  175. /package/core/src/middles/nodes/{text.js.map → basic/text.js.map} +0 -0
  176. /package/core/src/middles/nodes/{triangle.anchor.js.map → basic/triangle.anchor.js.map} +0 -0
  177. /package/core/src/middles/nodes/{triangle.js → basic/triangle.js} +0 -0
  178. /package/core/src/middles/nodes/{triangle.js.map → basic/triangle.js.map} +0 -0
  179. /package/core/src/middles/nodes/{triangle.rect.js.map → basic/triangle.rect.js.map} +0 -0
  180. /package/core/src/middles/nodes/{hexagon.anchor.js.map → flow/hexagon.anchor.js.map} +0 -0
  181. /package/core/src/middles/nodes/{hexagon.js → flow/hexagon.js} +0 -0
  182. /package/core/src/middles/nodes/{hexagon.js.map → flow/hexagon.js.map} +0 -0
  183. /package/core/src/middles/nodes/{hexagon.rect.js.map → flow/hexagon.rect.js.map} +0 -0
  184. /package/core/src/middles/nodes/{formtable.js → form/formtable.js} +0 -0
  185. /package/core/src/middles/nodes/{progress.js → form/progress.js} +0 -0
  186. /package/core/src/middles/nodes/{progress.js.map → form/progress.js.map} +0 -0
  187. /package/core/src/middles/nodes/{switchs.d.ts → form/switchs.d.ts} +0 -0
  188. /package/core/src/middles/nodes/{switchs.js → form/switchs.js} +0 -0
  189. /package/core/src/middles/nodes/{tablePagination.js → form/tablePagination.js} +0 -0
  190. /package/core/src/middles/nodes/{time.js → form/time.js} +0 -0
  191. /package/static/{echartsDefaultData.js → echarts.js} +0 -0
@@ -1,12 +1,12 @@
1
1
  var __extends = (this && this.__extends) || (function () {
2
2
  var extendStatics = function (d, b) {
3
3
  extendStatics = Object.setPrototypeOf ||
4
- ({__proto__: []} instanceof Array && function (d, b) {
5
- d.__proto__ = b;
6
- }) ||
7
- function (d, b) {
8
- for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
9
- };
4
+ ({ __proto__: [] } instanceof Array && function (d, b) {
5
+ d.__proto__ = b;
6
+ }) ||
7
+ function (d, b) {
8
+ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
9
+ };
10
10
  return extendStatics(d, b);
11
11
  };
12
12
  return function (d, b) {
@@ -19,9 +19,9 @@ var __extends = (this && this.__extends) || (function () {
19
19
  d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
20
20
  };
21
21
  })();
22
- import {Store} from 'le5le-store';
23
- import {Node, PenType, images, defaultImages} from './models';
24
- import {Layer} from './layer';
22
+ import { Store } from 'le5le-store';
23
+ import { Node, PenType, images, defaultImages } from './models';
24
+ import { Layer } from './layer';
25
25
  import { setStyleForElementIdDiv } from './element';
26
26
  import { commonStore } from './store';
27
27
  var DivLayer = /** @class */ (function (_super) {
@@ -42,18 +42,25 @@ var DivLayer = /** @class */ (function (_super) {
42
42
  _this.setElemPosition(node, _this.elements[node.id]);
43
43
  }
44
44
  if (node.gif) {
45
- if (node.image.indexOf('.gif') < 0) {
45
+ let isGif = node.image.includes('.gif');
46
+ let exsitGif = _this.gifs[node.id];
47
+ if (!isGif) {
46
48
  node.gif = false;
47
- if (_this.gifs[node.id] != null) {
48
- _this.canvas.removeChild(_this.gifs[node.id]);
49
- }
50
- _this.gifs[node.id] = null;
51
- } else {
52
- if (_this.gifs[node.id] && _this.gifs[node.id].src !== node.image) {
53
- _this.gifs[node.id].src = node.image;
49
+ if (exsitGif) exsitGif.remove();
50
+ return
51
+ }
52
+ // 新建 || 更换src
53
+ let isChange = exsitGif && (!(exsitGif.src.includes(node.image)) || exsitGif.dataset.floorImageIndex !== (String(node.floorImageIndex)));
54
+ if (!exsitGif || isChange) {
55
+ // 更换图片
56
+ if (isChange) {
57
+ exsitGif.remove();
54
58
  }
55
- _this.setElemPosition(node, _this.gifs[node.id] || _this.addGif(node));
59
+ exsitGif = _this.addGif(node);
60
+ _this.gifs[node.id] = exsitGif;
56
61
  }
62
+ // 设置位置
63
+ _this.setElemPosition(node, exsitGif);
57
64
  }
58
65
  if (node.children) {
59
66
  for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
@@ -75,16 +82,28 @@ var DivLayer = /** @class */ (function (_super) {
75
82
  _this.subcribe = Store.subscribe(_this.generateStoreKey('LT:addDiv'), _this.addDiv);
76
83
  return _this;
77
84
  }
78
- DivLayer.prototype.addElement = function (node){
79
- if(['iframe', 'echarts', 'formOverflow'].includes(node.name)) {
85
+ DivLayer.prototype.addElement = function (node) {
86
+ if (['iframe', 'echarts', 'formOverflow'].includes(node.name)) {
80
87
  this.canvas.parentNode.appendChild(this.elements[node.id]);
81
- }else {
88
+ } else {
82
89
  this.canvas.appendChild(this.elements[node.id]);
83
90
  }
84
91
  };
85
92
  DivLayer.prototype.addGif = function (node) {
93
+ let targetGifElement = node.img;
86
94
  this.gifs[node.id] = node.img;
87
- this.canvas.appendChild(node.img);
95
+ let targetContainer = node.floorImageIndex ? this.canvas.parentNode : this.canvas;
96
+ let isInsertBefore = node.floorImageIndex;
97
+ if (!targetContainer.contains(targetGifElement)) {
98
+ if (isInsertBefore) {
99
+ //配置了存为组件背景
100
+ targetContainer.insertBefore(targetGifElement, targetContainer.firstChild)
101
+ } else {
102
+ //默认
103
+ targetContainer.appendChild(targetGifElement);
104
+ }
105
+ }
106
+ node.img.dataset.floorImageIndex = isInsertBefore;
88
107
  return node.img;
89
108
  };
90
109
  DivLayer.prototype.setElemPosition = function (node, elem) {
@@ -96,13 +115,14 @@ var DivLayer = /** @class */ (function (_super) {
96
115
  }
97
116
  if (item.elementId) {
98
117
  const elementNode = this.elements[item.id];
99
- if(elementNode) {
118
+ if (elementNode) {
100
119
  elementNode.parentNode.removeChild(elementNode);
101
120
  this.elements[item.id] = null;
102
121
  }
103
122
  }
104
123
  if (item.gif) {
105
- this.canvas.removeChild(this.gifs[item.id]);
124
+
125
+ this.gifs[item.id].remove();
106
126
  this.gifs[item.id] = null;
107
127
  }
108
128
  if (item.children) {
@@ -118,6 +138,20 @@ var DivLayer = /** @class */ (function (_super) {
118
138
  DivLayer.prototype.clear = function () {
119
139
  this.canvas.innerHTML = '';
120
140
  this.elements = {};
141
+ for (let key in this.gifs) {
142
+ if (this.canvas.parentNode.contains(this.gifs[key]) && this.gifs[key].parentNode === this.canvas.parentNode) {
143
+
144
+ this.canvas.parentNode.removeChild(this.gifs[key])
145
+
146
+
147
+ }
148
+
149
+ if (this.canvas.contains(this.gifs[key])) {
150
+
151
+ this.canvas.removeChild(_this.gifs[key]);
152
+
153
+ }
154
+ }
121
155
  this.gifs = {};
122
156
  // tslint:disable-next-line:forin
123
157
  for (let key in images) {
@@ -144,7 +178,7 @@ var DivLayer = /** @class */ (function (_super) {
144
178
  };
145
179
  DivLayer.prototype.resize = function (size) {
146
180
  let store = commonStore[this.TID];
147
- if(!store || !store.options) return;
181
+ if (!store || !store.options) return;
148
182
  if (size) {
149
183
  this.canvas.style.width = size.width + 'px';
150
184
  this.canvas.style.height = size.height + 'px';
@@ -163,10 +197,13 @@ var DivLayer = /** @class */ (function (_super) {
163
197
  store = null;
164
198
  };
165
199
  DivLayer.prototype.render = function () {
166
- if(commonStore[this.TID] || !commonStore[this.TID].data) return;
200
+ if (!commonStore[this.TID] || !commonStore[this.TID].data) return;
167
201
  for (var _i = 0, _a = commonStore[this.TID].data.pens; _i < _a.length; _i++) {
168
202
  var item = _a[_i];
169
- if(!(item instanceof Node)) item = new Node(item);
203
+ if (!(item instanceof Node)) {
204
+ item = new Node(item);
205
+ _a[_i] = item;
206
+ }
170
207
  if (!item.getTID()) {
171
208
  item.setTID(this.TID);
172
209
  }
@@ -209,5 +246,5 @@ var DivLayer = /** @class */ (function (_super) {
209
246
  }
210
247
  return DivLayer;
211
248
  }(Layer));
212
- export {DivLayer};
249
+ export { DivLayer };
213
250
  //# sourceMappingURL=divLayer.js.map
@@ -46,7 +46,7 @@ export function createSelectOptions(data, node) {
46
46
  const selectDropdownUl = selectNode.dom.selectDropdownUl;
47
47
  if(selectDropdownUl) selectDropdownUl.innerHTML = '';
48
48
  let leElement = '';
49
- const order = selectNode.node.selected ? selectNode.node.selected.order : 0;
49
+ const order = selectNode.node.selected ? selectNode.node.selected.order || 0 : 0;
50
50
  for (let i = 0, length = data.length; i < length; i++) {
51
51
  let selected = i === order ? ' selected' : '';
52
52
  leElement += `<li
@@ -194,6 +194,7 @@ export function getSelectedData(e, data, editData) {
194
194
  const optionNode = data.formData.bindBlockId && currentStore.echartsOptionsPool[data.formData.bindBlockId];
195
195
  if(!optionNode) return;
196
196
  // 切换数据
197
+ optionNode.data.targetChange = true;
197
198
  currentStore.echartsRealDataPool[optionNode.data.id] = currentStore.echartsRealDataPool[node.id];
198
199
  const isInitTable = initTabSwitchPage(data.formData.bindBlockTag, optionNode.data, currentStore);
199
200
  setMapDataOptions(optionNode.option, optionNode.data);
@@ -1,7 +1,6 @@
1
1
  import {Pen} from "../models";
2
2
 
3
3
  export declare function setConfItemNode(item: any[], syncData: Node): Node;
4
- export declare function setNodeEvents(item: any[], pen: Pen): void;
5
4
  export declare function setControlData(pen: Pen, syncData: Node): void;
6
5
  export declare function getControlNode(item: any, data: any): Node;
7
6
  export declare function getDetailData(data: Node): void;
@@ -137,10 +137,6 @@ export function setConfItemNode(pen, syn_synata) {
137
137
  }
138
138
  }
139
139
 
140
- export function setNodeEvents(item, pen) {
141
-
142
- }
143
-
144
140
  export function setFanData(pen, syncData) {
145
141
  if (!syncData) return
146
142
  pen.text = ''
@@ -10,14 +10,15 @@ import {
10
10
  circle, circleIconRect, circleTextRect, circleAnchors,
11
11
  triangle, triangleIconRect, triangleTextRect, triangleAnchors,
12
12
  pentagon, pentagonIconRect, pentagonTextRect, pentagonAnchors,
13
- hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect,
13
+ hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect, humiture,
14
14
  pentagram, pentagramAnchors, pentagramIconRect, pentagramTextRect,
15
15
  cloud, cloudAnchors, cloudIconRect, cloudTextRect,
16
16
  message, messageIconRect, messageTextRect, messageAnchors,
17
17
  imageIconRect, imageTextRect,
18
18
  cube, cubeAnchors, cubeIconRect, cubeTextRect,
19
19
  people, peopleIconRect, peopleTextRect,
20
- arbitraryGraph, arbitraryGraphAnchors, time, switchs, progress
20
+ arbitraryGraph, arbitraryGraphAnchors, time, switchs, progress,
21
+ svgEchartsLine
21
22
  } from './nodes';
22
23
  import {
23
24
  line,
@@ -61,7 +62,9 @@ export var drawLineFns = {};
61
62
  export var drawArrowFns = {};
62
63
  function init() {
63
64
  console.log('Init middles.');
64
- // ********Default nodes.*******
65
+ // ********Default nodes.*******
66
+ // svgEchartsLine
67
+ drawNodeFns.svgEchartsLine = svgEchartsLine;
65
68
  // datePicker
66
69
  drawNodeFns.datePicker = fromDatePicker;
67
70
  // select
@@ -104,6 +107,8 @@ function init() {
104
107
  iconRectFns.hexagon = hexagonIconRect;
105
108
  textRectFns.hexagon = hexagonTextRect;
106
109
  anchorsFns.hexagon = hexagonAnchors;
110
+ // humiture
111
+ drawNodeFns.humiture = humiture;
107
112
  // Pentagon
108
113
  drawNodeFns.pentagon = pentagon;
109
114
  iconRectFns.pentagon = pentagonIconRect;
@@ -1,2 +1,3 @@
1
1
  export * from './default';
2
+ export * from './default.rect';
2
3
  export * from './nodes';
@@ -1,4 +1,5 @@
1
1
  export * from './default';
2
+ export * from './default.rect';
2
3
  export * from './nodes';
3
4
  // 以下导入注释掉,不再引入,三者方法有命名冲突,编译会报错,项目中有用到下面中的方法,可以单独导入
4
5
  // export * from './lines';
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models';
1
+ import { Node } from '../../../models';
2
2
  export declare function arbitraryGraphAnchors(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Point } from '../../models/point';
1
+ import { Point } from '../../../models/point';
2
2
  export function arbitraryGraphAnchors(node) {
3
3
 
4
4
  for(let i=0, circles=node.rect.circles; i<circles.length; i++) {
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models';
1
+ import { Node } from '../../../models';
2
2
  export declare function arbitraryGraph(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function arrowAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function arrowAnchors(node) {
4
4
  node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
5
5
  node.anchors.push(new Point(node.rect.x + node.rect.width, node.rect.y + node.rect.height / 2, Direction.Right));
@@ -1,4 +1,4 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function leftArrow(ctx: CanvasRenderingContext2D, node: Node): void;
3
3
  export declare function rightArrow(ctx: CanvasRenderingContext2D, node: Node): void;
4
4
  export declare function twowayArrow(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function leftArrowIconRect(node: Node): void;
3
3
  export declare function leftArrowTextRect(node: Node): void;
4
4
  export declare function rightArrowIconRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function leftArrowIconRect(node) {
3
3
  node.iconRect = new Rect(0, 0, 0, 0);
4
4
  }
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function circleAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function circleAnchors(node) {
4
4
  node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
5
5
  node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models';
1
+ import { Node } from '../../../models';
2
2
  export declare function circle(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -0,0 +1,8 @@
1
+ export function circle(ctx, node) {
2
+ ctx.beginPath();
3
+ const cR = node.rect.width < node.rect.height ? node.rect.width / 2 : node.rect.height / 2;
4
+ ctx.arc(node.rect.x + node.rect.width / 2, node.rect.y + node.rect.height / 2, cR, 0, Math.PI * 2);
5
+ (node.fillStyle || node.bkType) && ctx.fill();
6
+ ctx.stroke();
7
+ }
8
+ //# sourceMappingURL=circle.js.map
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function circleIconRect(node: Node): void;
3
3
  export declare function circleTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function circleIconRect(node) {
3
3
  var w = node.rect.width / 2;
4
4
  var h = node.rect.height / 2;
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models';
1
+ import { Node } from '../../../models';
2
2
  export declare function cloudAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function cloudAnchors(node) {
4
4
  node.anchors.push(new Point(node.rect.x, node.rect.y + (node.rect.height * 3) / 5, Direction.Left));
5
5
  node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y + node.rect.height / 9, Direction.Up));
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models';
1
+ import { Node } from '../../../models';
2
2
  export declare function cloud(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function cloudIconRect(node: Node): void;
3
3
  export declare function cloudTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function cloudIconRect(node) {
3
3
  node.iconRect = new Rect(0, 0, 0, 0);
4
4
  }
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function cubeAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function cubeAnchors(node) {
4
4
  var offset = node.z * Math.sin((45 * Math.PI) / 180);
5
5
  node.anchors.push(new Point(node.rect.x, node.rect.ey - (node.rect.height - offset) / 2, Direction.Left));
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function cube(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Rect } from '../../models/rect';
1
+ import { Point } from '../../../models/point';
2
+ import { Rect } from '../../../models/rect';
3
3
  export declare class Surface {
4
4
  points: Point[];
5
5
  fillStyle: string;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { pSBC } from '../../utils/math';
1
+ import { Point } from '../../../models/point';
2
+ import { pSBC } from '../../../utils/math';
3
3
  var Surface = /** @class */ (function () {
4
4
  function Surface(pt1, pt2, pt3, pt4, fillStyle, strokeStyle) {
5
5
  if (fillStyle === void 0) { fillStyle = ''; }
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function cubeIconRect(node: Node): void;
3
3
  export declare function cubeTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function cubeIconRect(node) {
3
3
  node.fullIconRect = node.fullTextRect;
4
4
  node.iconRect = new Rect(node.fullIconRect.x, node.fullIconRect.y, node.fullIconRect.width, (node.fullIconRect.height * 2) / 3);
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function diamond(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function diamondIconRect(node: Node): void;
3
3
  export declare function diamondTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function diamondIconRect(node) {
3
3
  var w = node.rect.width / 3;
4
4
  var h = node.rect.height / 3;
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function file(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models';
1
+ import { Node } from '../../../models';
2
2
  export declare function iframePrimeval(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,7 +1,7 @@
1
1
  import {rectangle} from './rectangle';
2
- import {s8} from "../../utils";
3
- import {createIframeElement} from "../../element";
4
- import {commonStore} from "../../store";
2
+ import {s8} from "../../../utils";
3
+ import {createIframeElement} from "../../../element";
4
+ import {commonStore} from "../../../store";
5
5
 
6
6
  export function iframePrimeval(ctx, node) {
7
7
  //console.log('iframePrimeval############', node)
@@ -9,14 +9,16 @@ export function iframePrimeval(ctx, node) {
9
9
  rectangle(ctx, node);
10
10
  if (!commonStore[node.TID].iframeDataPool[node.id]) {
11
11
  node.elementId = s8();
12
+ const iframe = createIframeElement(node);
12
13
  commonStore[node.TID].iframeDataPool[node.id] = {
13
14
  node: {
14
15
  id: node.id,
15
16
  src: node.iframe
17
+ },
18
+ dom: {
19
+ iframe
16
20
  }
17
21
  };
18
- const iframe = createIframeElement(node);
19
- commonStore[node.TID].iframeDataPool[node.id].iframe = iframe;
20
22
  const parentEle = window.location.pathname.includes('workspace') ? document.getElementById('topology-canvas') : document.body;
21
23
  parentEle.appendChild(iframe);
22
24
  // 添加当前节点到div层
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function imageAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function imageAnchors(node) {
4
4
  var textHeight = node.text
5
5
  ? node.paddingBottomNum || node.font.lineHeight * node.font.fontSize * (node.textMaxLine || 1)
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function imageIconRect(node: Node): void;
3
3
  export declare function imageTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  import { getLines, getWords } from './text';
3
3
  // import { Store } from 'le5le-store';
4
4
  var txtMarginTop = 5;
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function lineAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function lineAnchors(node) {
4
4
  var y = node.rect.y + node.rect.height / 2;
5
5
  node.anchors.push(new Point(node.rect.x, y, Direction.Left));
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function line(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function lineIconRect(node: Node): void;
3
3
  export declare function lineTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function lineIconRect(node) {
3
3
  node.iconRect = new Rect(0, 0, 0, 0);
4
4
  }
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function messageAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function messageAnchors(node) {
4
4
  node.anchors.push(new Point(node.rect.x, node.rect.y + (node.rect.height * 3) / 8, Direction.Left));
5
5
  node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function message(ctx: CanvasRenderingContext2D, node: Node): void;
@@ -1,3 +1,3 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function messageIconRect(node: Node): void;
3
3
  export declare function messageTextRect(node: Node): void;
@@ -1,4 +1,4 @@
1
- import { Rect } from '../../models/rect';
1
+ import { Rect } from '../../../models/rect';
2
2
  export function messageIconRect(node) {
3
3
  node.iconRect = new Rect(0, 0, 0, 0);
4
4
  node.fullIconRect = node.iconRect;
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function pentagonAnchors(node: Node): void;
@@ -1,5 +1,5 @@
1
- import { Point } from '../../models/point';
2
- import { Direction } from '../../models/direction';
1
+ import { Point } from '../../../models/point';
2
+ import { Direction } from '../../../models/direction';
3
3
  export function pentagonAnchors(node) {
4
4
  node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
5
5
  node.anchors.push(new Point(node.rect.x + node.rect.width, node.rect.y + (node.rect.height * 2) / 5, Direction.Right));
@@ -1,2 +1,2 @@
1
- import { Node } from '../../models/node';
1
+ import { Node } from '../../../models/node';
2
2
  export declare function pentagon(ctx: CanvasRenderingContext2D, node: Node): void;