@riil-frontend/component-topology 8.0.4 → 8.0.6

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 (13) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +1 -1
  3. package/es/core/models/HistoryManager.js +2 -1
  4. package/es/core/models/TopoApp.js +14 -12
  5. package/es/core/store/models/topoMod.js +4 -0
  6. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +19 -12
  7. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +7 -0
  8. package/lib/core/models/HistoryManager.js +2 -1
  9. package/lib/core/models/TopoApp.js +14 -12
  10. package/lib/core/store/models/topoMod.js +4 -0
  11. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +19 -12
  12. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +7 -0
  13. package/package.json +2 -2
package/es/core/models/HistoryManager.js CHANGED
@@ -68,7 +68,8 @@ var HistoryManager = /*#__PURE__*/function () {
68
68
  var displayConfigProperties = [// 单多链路
69
69
  'expandAllEdges', // 节点标注
70
70
  'nodeLabelStyle', // 画布主题
71
- 'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
71
+ 'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip', // @V1.4 网络拓扑特有，待迁移到网络拓扑
72
+ 'autoChangeEdgeWidth', 'autoHideEdgeTag'];
72
73
  var items = [{
73
74
  modelName: 'topoMod',
74
75
  property: 'data'
package/es/core/models/TopoApp.js CHANGED
@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
23
23
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
24
24
  import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
25
25
 
26
- var version = typeof "8.0.4" === 'string' ? "8.0.4" : null;
26
+ var version = typeof "8.0.6" === 'string' ? "8.0.6" : null;
27
27
  console.info("\u62D3\u6251\u7248\u672C: " + version);
28
28
  /**
29
29
  * 拓扑显示和编辑
@@ -535,44 +535,46 @@ var Topo = /*#__PURE__*/function () {
535
535
  while (1) {
536
536
  switch (_context12.prev = _context12.next) {
537
537
  case 0:
538
+ rlog.info('TopoApp.enterEditMode');
539
+
538
540
  if (!this.options.onSwitchToEditModeBegin) {
539
- _context12.next = 3;
541
+ _context12.next = 4;
540
542
  break;
541
543
  }
542
544
 
543
- _context12.next = 3;
545
+ _context12.next = 4;
544
546
  return this.options.onSwitchToEditModeBegin(this);
545
547
 
546
- case 3:
548
+ case 4:
547
549
  topoDispatchers = this.store.getModelDispatchers('topoMod');
548
- _context12.next = 6;
550
+ _context12.next = 7;
549
551
  return topoDispatchers.update({
550
552
  viewState: 'edit'
551
553
  });
552
554
 
553
- case 6:
554
- _context12.next = 8;
555
+ case 7:
556
+ _context12.next = 9;
555
557
  return this.view.switchToEditMode();
556
558
 
557
- case 8:
559
+ case 9:
558
560
  updateEdgeExpanded(this);
559
561
 
560
562
  if (!this.options.onSwitchToEditMode) {
561
- _context12.next = 12;
563
+ _context12.next = 13;
562
564
  break;
563
565
  }
564
566
 
565
- _context12.next = 12;
567
+ _context12.next = 13;
566
568
  return this.options.onSwitchToEditMode(this);
567
569
 
568
- case 12:
570
+ case 13:
569
571
  // 更新节点名称显示隐藏
570
572
  this.attributeMetricDisplay.updateNodesNameVisible(); // 加载自定义上传的图标
571
573
 
572
574
  iconManageDispatchers = this.store.getModelDispatchers('customIcon');
573
575
  iconManageDispatchers.loadEditorIcons();
574
576
 
575
- case 15:
577
+ case 16:
576
578
  case "end":
577
579
  return _context12.stop();
578
580
  }
package/es/core/store/models/topoMod.js CHANGED
@@ -167,6 +167,10 @@ export default function (topoApp) {
167
167
  case 6:
168
168
  if (viewState === 'edit') {
169
169
  // TODO 待优化进入编辑模式方式
170
+ _this2.update({
171
+ graphLoaded2: false
172
+ });
173
+
170
174
  _this2.enterEditMode();
171
175
  }
172
176
 
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js CHANGED
@@ -155,7 +155,12 @@ export default function ResourceOverview(props) {
155
155
 
156
156
  function onClose() {
157
157
  isAppTopo && resourceOverviewProps.onClose && resourceOverviewProps.onClose();
158
- } // 基本信息可选项
158
+ }
159
+
160
+ var jump = function jump(roomLink) {
161
+ onClose();
162
+ roomLink && window.open("" + window.location.origin + roomLink);
163
+ }; // 基本信息可选项
159
164
 
160
165
 
161
166
  var baseInfoCol = useMemo(function () {
@@ -409,7 +414,7 @@ export default function ResourceOverview(props) {
409
414
  _baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(col) {
410
415
  var _col;
411
416
 
412
- var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
417
+ var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
413
418
 
414
419
  return _regeneratorRuntime.wrap(function _callee4$(_context4) {
415
420
  while (1) {
@@ -477,16 +482,18 @@ export default function ResourceOverview(props) {
477
482
  owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
478
483
 
479
484
  if (owned_computer_room && owned_cabinet) {
480
- // /visual/room/index_runtime.html?type=preview&room_id=00000000383e3381&rack_id=11&device_id=122
481
- roomLink = "/visual/room/index_runtime.html?type=preview&room_id=" + owned_computer_room + "&rack_id=" + owned_cabinet + "&device_id=" + id;
482
- value = /*#__PURE__*/React.createElement("span", {
483
- onClick: onClose
484
- }, /*#__PURE__*/React.createElement(Link, {
485
- className: styles.link,
486
- title: address,
487
- to: roomLink,
488
- target: "_blank"
489
- }, address));
485
+ (function () {
486
+ // /visual/room/index_runtime.html?type=preview&room_id=00000000383e3381&rack_id=11&device_id=122
487
+ var roomLink = "/visual/room/index_runtime.html?type=preview&room_id=" + owned_computer_room + "&rack_id=" + owned_cabinet + "&device_id=" + id;
488
+ value = /*#__PURE__*/React.createElement("span", {
489
+ onClick: function onClick() {
490
+ jump(roomLink);
491
+ }
492
+ }, /*#__PURE__*/React.createElement("span", {
493
+ className: styles.link,
494
+ title: address
495
+ }, address));
496
+ })();
490
497
  } else {
491
498
  value = address;
492
499
  }
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss CHANGED
@@ -30,6 +30,13 @@
30
30
  overflow: hidden;
31
31
  text-overflow: ellipsis;
32
32
  white-space: nowrap;
33
+ color: var(--color-link-1);
34
+ cursor: pointer;
35
+ }
36
+ .link:hover{
37
+ color: var(--btn-text-primary-color-hover);
38
+ background-color: transparent;
39
+ border-color: transparent;
33
40
  }
34
41
  }
35
42
  }
package/lib/core/models/HistoryManager.js CHANGED
@@ -80,7 +80,8 @@ var HistoryManager = /*#__PURE__*/function () {
80
80
  var displayConfigProperties = [// 单多链路
81
81
  'expandAllEdges', // 节点标注
82
82
  'nodeLabelStyle', // 画布主题
83
- 'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
83
+ 'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip', // @V1.4 网络拓扑特有，待迁移到网络拓扑
84
+ 'autoChangeEdgeWidth', 'autoHideEdgeTag'];
84
85
  var items = [{
85
86
  modelName: 'topoMod',
86
87
  property: 'data'
package/lib/core/models/TopoApp.js CHANGED
@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
54
54
  var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
55
55
 
56
56
  // eslint-disable-next-line no-undef
57
- var version = typeof "8.0.4" === 'string' ? "8.0.4" : null;
57
+ var version = typeof "8.0.6" === 'string' ? "8.0.6" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -566,44 +566,46 @@ var Topo = /*#__PURE__*/function () {
566
566
  while (1) {
567
567
  switch (_context12.prev = _context12.next) {
568
568
  case 0:
569
+ _rlog["default"].info('TopoApp.enterEditMode');
570
+
569
571
  if (!this.options.onSwitchToEditModeBegin) {
570
- _context12.next = 3;
572
+ _context12.next = 4;
571
573
  break;
572
574
  }
573
575
 
574
- _context12.next = 3;
576
+ _context12.next = 4;
575
577
  return this.options.onSwitchToEditModeBegin(this);
576
578
 
577
- case 3:
579
+ case 4:
578
580
  topoDispatchers = this.store.getModelDispatchers('topoMod');
579
- _context12.next = 6;
581
+ _context12.next = 7;
580
582
  return topoDispatchers.update({
581
583
  viewState: 'edit'
582
584
  });
583
585
 
584
- case 6:
585
- _context12.next = 8;
586
+ case 7:
587
+ _context12.next = 9;
586
588
  return this.view.switchToEditMode();
587
589
 
588
- case 8:
590
+ case 9:
589
591
  (0, _edgeUtil.updateEdgeExpanded)(this);
590
592
 
591
593
  if (!this.options.onSwitchToEditMode) {
592
- _context12.next = 12;
594
+ _context12.next = 13;
593
595
  break;
594
596
  }
595
597
 
596
- _context12.next = 12;
598
+ _context12.next = 13;
597
599
  return this.options.onSwitchToEditMode(this);
598
600
 
599
- case 12:
601
+ case 13:
600
602
  // 更新节点名称显示隐藏
601
603
  this.attributeMetricDisplay.updateNodesNameVisible(); // 加载自定义上传的图标
602
604
 
603
605
  iconManageDispatchers = this.store.getModelDispatchers('customIcon');
604
606
  iconManageDispatchers.loadEditorIcons();
605
607
 
606
- case 15:
608
+ case 16:
607
609
  case "end":
608
610
  return _context12.stop();
609
611
  }
package/lib/core/store/models/topoMod.js CHANGED
@@ -185,6 +185,10 @@ function _default(topoApp) {
185
185
  case 6:
186
186
  if (viewState === 'edit') {
187
187
  // TODO 待优化进入编辑模式方式
188
+ _this2.update({
189
+ graphLoaded2: false
190
+ });
191
+
188
192
  _this2.enterEditMode();
189
193
  }
190
194
 
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js CHANGED
@@ -188,7 +188,12 @@ function ResourceOverview(props) {
188
188
 
189
189
  function onClose() {
190
190
  isAppTopo && resourceOverviewProps.onClose && resourceOverviewProps.onClose();
191
- } // 基本信息可选项
191
+ }
192
+
193
+ var jump = function jump(roomLink) {
194
+ onClose();
195
+ roomLink && window.open("" + window.location.origin + roomLink);
196
+ }; // 基本信息可选项
192
197
 
193
198
 
194
199
  var baseInfoCol = (0, _react.useMemo)(function () {
@@ -442,7 +447,7 @@ function ResourceOverview(props) {
442
447
  _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(col) {
443
448
  var _col;
444
449
 
445
- var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
450
+ var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
446
451
 
447
452
  return _regenerator["default"].wrap(function _callee4$(_context4) {
448
453
  while (1) {
@@ -510,16 +515,18 @@ function ResourceOverview(props) {
510
515
  owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
511
516
 
512
517
  if (owned_computer_room && owned_cabinet) {
513
- // /visual/room/index_runtime.html?type=preview&room_id=00000000383e3381&rack_id=11&device_id=122
514
- roomLink = "/visual/room/index_runtime.html?type=preview&room_id=" + owned_computer_room + "&rack_id=" + owned_cabinet + "&device_id=" + id;
515
- value = /*#__PURE__*/_react["default"].createElement("span", {
516
- onClick: onClose
517
- }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
518
- className: _indexModule["default"].link,
519
- title: address,
520
- to: roomLink,
521
- target: "_blank"
522
- }, address));
518
+ (function () {
519
+ // /visual/room/index_runtime.html?type=preview&room_id=00000000383e3381&rack_id=11&device_id=122
520
+ var roomLink = "/visual/room/index_runtime.html?type=preview&room_id=" + owned_computer_room + "&rack_id=" + owned_cabinet + "&device_id=" + id;
521
+ value = /*#__PURE__*/_react["default"].createElement("span", {
522
+ onClick: function onClick() {
523
+ jump(roomLink);
524
+ }
525
+ }, /*#__PURE__*/_react["default"].createElement("span", {
526
+ className: _indexModule["default"].link,
527
+ title: address
528
+ }, address));
529
+ })();
523
530
  } else {
524
531
  value = address;
525
532
  }
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss CHANGED
@@ -30,6 +30,13 @@
30
30
  overflow: hidden;
31
31
  text-overflow: ellipsis;
32
32
  white-space: nowrap;
33
+ color: var(--color-link-1);
34
+ cursor: pointer;
35
+ }
36
+ .link:hover{
37
+ color: var(--btn-text-primary-color-hover);
38
+ background-color: transparent;
39
+ border-color: transparent;
33
40
  }
34
41
  }
35
42
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "8.0.4",
3
+ "version": "8.0.6",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -116,6 +116,6 @@
116
116
  "access": "public"
117
117
  },
118
118
  "license": "MIT",
119
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.4/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.6/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }