@riil-frontend/component-topology 2.15.4 → 2.15.7

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 (31) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +9 -9
  3. package/es/core/models/AttributeMetricDisplay.js +1 -1
  4. package/es/core/models/PluginManager.js +41 -0
  5. package/es/core/models/TopoApp.js +75 -50
  6. package/es/core/models/TopoGraphView.js +1 -28
  7. package/es/core/models/plugins/index.js +2 -0
  8. package/es/core/models/plugins/resourceWebControllUrl.js +8 -7
  9. package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +32 -15
  10. package/es/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +2 -2
  11. package/es/core/viewer/components/titlebar/widgets/EditButton.js +5 -4
  12. package/es/core/viewer/contextmenu/buildNodeContextmenu.js +2 -1
  13. package/es/models/topoMod.js +23 -6
  14. package/es/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.js +1 -1
  15. package/es/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.module.scss +11 -1
  16. package/es/utils/tree.js +4 -2
  17. package/lib/core/models/AttributeMetricDisplay.js +1 -1
  18. package/lib/core/models/PluginManager.js +48 -0
  19. package/lib/core/models/TopoApp.js +75 -49
  20. package/lib/core/models/TopoGraphView.js +1 -29
  21. package/lib/core/models/plugins/index.js +11 -0
  22. package/lib/core/models/plugins/resourceWebControllUrl.js +8 -7
  23. package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +32 -15
  24. package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +2 -2
  25. package/lib/core/viewer/components/titlebar/widgets/EditButton.js +5 -4
  26. package/lib/core/viewer/contextmenu/buildNodeContextmenu.js +2 -1
  27. package/lib/models/topoMod.js +23 -6
  28. package/lib/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.js +1 -1
  29. package/lib/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.module.scss +11 -1
  30. package/lib/utils/tree.js +4 -2
  31. package/package.json +2 -2
@@ -13,8 +13,18 @@
13
13
 
14
14
  .labelValue {
15
15
  max-width: 160px;
16
- overflow-y: scroll;
17
16
  max-height: 200px;
17
+ overflow-x: hidden;
18
+ overflow-wrap: break-word;
19
+ }
20
+
21
+ .uselabelValue {
22
+ max-width: 160px;
23
+ max-height: 200px;
24
+ overflow-y: scroll;
25
+ overflow-x: hidden;
26
+ overflow-wrap: break-word;
27
+
18
28
  }
19
29
 
20
30
 
package/es/utils/tree.js CHANGED
@@ -40,7 +40,9 @@ export function formatTree(json, funcPermissions) {
40
40
  type: type,
41
41
  name: name,
42
42
  showDefault: showDefault,
43
- permission: node.operation,
43
+ // permission: node.operation,
44
+ // FIXME 拓扑数据权限临时方案,待移除
45
+ permission: funcPermissions.createTopo ? 'delete' : 'read',
44
46
  children: node !== null && node !== void 0 && node.children ? loop(node.children) : []
45
47
  };
46
48
  });
@@ -133,7 +135,7 @@ export var loopTreeFun = function loopTreeFun(data, callback) {
133
135
  loopTreeFun(item.children, callback);
134
136
  }
135
137
 
136
- return callback(item, index, arr);
138
+ callback(item, index, arr);
137
139
  });
138
140
  };
139
141
  /**
@@ -560,7 +560,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
560
560
 
561
561
  return _context3.abrupt("return", ciDatas.map(function (ciData) {
562
562
  var id = ciData.id;
563
- var attributeMap = (0, _extends2["default"])({}, ciData);
563
+ var attributeMap = (0, _extends2["default"])({}, ciData.attributeMap);
564
564
  ciRefAttributeMap[id].forEach(function (refAttrs) {
565
565
  var refCi = refCiMap[refAttrs.id];
566
566
 
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = void 0;
7
+
8
+ var _plugins = _interopRequireDefault(require("./plugins"));
9
+
10
+ var PluginManager = /*#__PURE__*/function () {
11
+ /**
12
+ * @type {Array}
13
+ */
14
+ function PluginManager(topo) {
15
+ this.topo = void 0;
16
+ this.pluginMap = {};
17
+ this.plugins = void 0;
18
+ this.topo = topo;
19
+ this.init(_plugins["default"]);
20
+ }
21
+
22
+ var _proto = PluginManager.prototype;
23
+
24
+ _proto.init = function init(plugins) {
25
+ var _this = this;
26
+
27
+ this.plugins = plugins.map(function (Plugin) {
28
+ var plugin = new Plugin(_this.topo);
29
+ _this.pluginMap[plugin.name] = plugin;
30
+ return plugin;
31
+ });
32
+ };
33
+
34
+ _proto.onTopoDataLoaded = function onTopoDataLoaded(topoData) {
35
+ this.plugins.forEach(function (plugin) {
36
+ if (plugin.onTopoDataLoaded) {
37
+ plugin.onTopoDataLoaded(topoData);
38
+ }
39
+ });
40
+ };
41
+
42
+ _proto.destroy = function destroy() {};
43
+
44
+ return PluginManager;
45
+ }();
46
+
47
+ exports["default"] = PluginManager;
48
+ ;
@@ -43,8 +43,10 @@ var _GraphDataModel = _interopRequireDefault(require("./GraphDataModel"));
43
43
 
44
44
  var _edgeUtil = require("../utils/edgeUtil");
45
45
 
46
+ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
47
+
46
48
  // eslint-disable-next-line no-undef
47
- var version = typeof "2.15.4" === 'string' ? "2.15.4" : null;
49
+ var version = typeof "2.15.7" === 'string' ? "2.15.7" : null;
48
50
  console.info("\u62D3\u6251\u7248\u672C: " + version);
49
51
  var topoDebug = {};
50
52
  window.topoDebug = topoDebug;
@@ -98,7 +100,8 @@ var Topo = /*#__PURE__*/function () {
98
100
  this.view = new _TopoGraphView["default"]();
99
101
  this.view.setStore(this.store);
100
102
  this.dataModel = new _DataModel["default"](this);
101
- this.graphDataModel = new _GraphDataModel["default"](this); // 初始化插件 ============================
103
+ this.graphDataModel = new _GraphDataModel["default"](this);
104
+ this.pluginManager = new _PluginManager["default"](this); // 初始化插件 ============================
102
105
  // 告警
103
106
 
104
107
  this.alarm.init(this); // 指标
@@ -517,7 +520,30 @@ var Topo = /*#__PURE__*/function () {
517
520
 
518
521
  _proto.isGraphLoaded = function isGraphLoaded() {
519
522
  return this.store.getModelState('topoMod').graphLoaded;
520
- }
523
+ };
524
+
525
+ _proto.onTopoDataLoaded = /*#__PURE__*/function () {
526
+ var _onTopoDataLoaded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(topoData) {
527
+ return _regenerator["default"].wrap(function _callee11$(_context11) {
528
+ while (1) {
529
+ switch (_context11.prev = _context11.next) {
530
+ case 0:
531
+ this.pluginManager.onTopoDataLoaded(topoData);
532
+
533
+ case 1:
534
+ case "end":
535
+ return _context11.stop();
536
+ }
537
+ }
538
+ }, _callee11, this);
539
+ }));
540
+
541
+ function onTopoDataLoaded(_x9) {
542
+ return _onTopoDataLoaded.apply(this, arguments);
543
+ }
544
+
545
+ return onTopoDataLoaded;
546
+ }()
521
547
  /**
522
548
  * 进入编辑模式
523
549
  */
@@ -526,11 +552,11 @@ var Topo = /*#__PURE__*/function () {
526
552
  _proto.enterEditMode =
527
553
  /*#__PURE__*/
528
554
  function () {
529
- var _enterEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
555
+ var _enterEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
530
556
  var topoDispatchers, editDispatchers, iconManageDispatchers;
531
- return _regenerator["default"].wrap(function _callee11$(_context11) {
557
+ return _regenerator["default"].wrap(function _callee12$(_context12) {
532
558
  while (1) {
533
- switch (_context11.prev = _context11.next) {
559
+ switch (_context12.prev = _context12.next) {
534
560
  case 0:
535
561
  topoDispatchers = this.store.getModelDispatchers('topoMod');
536
562
  topoDispatchers.update({
@@ -538,15 +564,15 @@ var Topo = /*#__PURE__*/function () {
538
564
  });
539
565
 
540
566
  if (!this.options.onSwitchToEditModeBegin) {
541
- _context11.next = 5;
567
+ _context12.next = 5;
542
568
  break;
543
569
  }
544
570
 
545
- _context11.next = 5;
571
+ _context12.next = 5;
546
572
  return this.options.onSwitchToEditModeBegin(this);
547
573
 
548
574
  case 5:
549
- _context11.next = 7;
575
+ _context12.next = 7;
550
576
  return this.view.switchToEditMode();
551
577
 
552
578
  case 7:
@@ -564,10 +590,10 @@ var Topo = /*#__PURE__*/function () {
564
590
 
565
591
  case 13:
566
592
  case "end":
567
- return _context11.stop();
593
+ return _context12.stop();
568
594
  }
569
595
  }
570
- }, _callee11, this);
596
+ }, _callee12, this);
571
597
  }));
572
598
 
573
599
  function enterEditMode() {
@@ -578,13 +604,13 @@ var Topo = /*#__PURE__*/function () {
578
604
  }();
579
605
 
580
606
  _proto.exitEditMode = /*#__PURE__*/function () {
581
- var _exitEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
607
+ var _exitEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
582
608
  var editDispatchers;
583
- return _regenerator["default"].wrap(function _callee12$(_context12) {
609
+ return _regenerator["default"].wrap(function _callee13$(_context13) {
584
610
  while (1) {
585
- switch (_context12.prev = _context12.next) {
611
+ switch (_context13.prev = _context13.next) {
586
612
  case 0:
587
- _context12.next = 2;
613
+ _context13.next = 2;
588
614
  return this.view.switchToViewMode();
589
615
 
590
616
  case 2:
@@ -597,10 +623,10 @@ var Topo = /*#__PURE__*/function () {
597
623
 
598
624
  case 5:
599
625
  case "end":
600
- return _context12.stop();
626
+ return _context13.stop();
601
627
  }
602
628
  }
603
- }, _callee12, this);
629
+ }, _callee13, this);
604
630
  }));
605
631
 
606
632
  function exitEditMode() {
@@ -617,19 +643,19 @@ var Topo = /*#__PURE__*/function () {
617
643
  _proto.triggerSaveEvent =
618
644
  /*#__PURE__*/
619
645
  function () {
620
- var _triggerSaveEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
621
- return _regenerator["default"].wrap(function _callee13$(_context13) {
646
+ var _triggerSaveEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
647
+ return _regenerator["default"].wrap(function _callee14$(_context14) {
622
648
  while (1) {
623
- switch (_context13.prev = _context13.next) {
649
+ switch (_context14.prev = _context14.next) {
624
650
  case 0:
625
651
  this.view.topoClient.saveExternal();
626
652
 
627
653
  case 1:
628
654
  case "end":
629
- return _context13.stop();
655
+ return _context14.stop();
630
656
  }
631
657
  }
632
- }, _callee13, this);
658
+ }, _callee14, this);
633
659
  }));
634
660
 
635
661
  function triggerSaveEvent() {
@@ -646,19 +672,19 @@ var Topo = /*#__PURE__*/function () {
646
672
  _proto.save =
647
673
  /*#__PURE__*/
648
674
  function () {
649
- var _save = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
650
- return _regenerator["default"].wrap(function _callee14$(_context14) {
675
+ var _save = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15() {
676
+ return _regenerator["default"].wrap(function _callee15$(_context15) {
651
677
  while (1) {
652
- switch (_context14.prev = _context14.next) {
678
+ switch (_context15.prev = _context15.next) {
653
679
  case 0:
654
680
  this.triggerSaveEvent();
655
681
 
656
682
  case 1:
657
683
  case "end":
658
- return _context14.stop();
684
+ return _context15.stop();
659
685
  }
660
686
  }
661
- }, _callee14, this);
687
+ }, _callee15, this);
662
688
  }));
663
689
 
664
690
  function save() {
@@ -677,11 +703,11 @@ var Topo = /*#__PURE__*/function () {
677
703
  _proto.exportImage =
678
704
  /*#__PURE__*/
679
705
  function () {
680
- var _exportImage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(name) {
706
+ var _exportImage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(name) {
681
707
  var fileName;
682
- return _regenerator["default"].wrap(function _callee15$(_context15) {
708
+ return _regenerator["default"].wrap(function _callee16$(_context16) {
683
709
  while (1) {
684
- switch (_context15.prev = _context15.next) {
710
+ switch (_context16.prev = _context16.next) {
685
711
  case 0:
686
712
  fileName = name;
687
713
 
@@ -692,13 +718,13 @@ var Topo = /*#__PURE__*/function () {
692
718
 
693
719
  case 3:
694
720
  case "end":
695
- return _context15.stop();
721
+ return _context16.stop();
696
722
  }
697
723
  }
698
- }, _callee15, this);
724
+ }, _callee16, this);
699
725
  }));
700
726
 
701
- function exportImage(_x9) {
727
+ function exportImage(_x10) {
702
728
  return _exportImage.apply(this, arguments);
703
729
  }
704
730
 
@@ -718,19 +744,19 @@ var Topo = /*#__PURE__*/function () {
718
744
  _proto.loadAttrsAndMetrics =
719
745
  /*#__PURE__*/
720
746
  function () {
721
- var _loadAttrsAndMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(data) {
722
- return _regenerator["default"].wrap(function _callee16$(_context16) {
747
+ var _loadAttrsAndMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee17(data) {
748
+ return _regenerator["default"].wrap(function _callee17$(_context17) {
723
749
  while (1) {
724
- switch (_context16.prev = _context16.next) {
750
+ switch (_context17.prev = _context17.next) {
725
751
  case 0:
726
752
  case "end":
727
- return _context16.stop();
753
+ return _context17.stop();
728
754
  }
729
755
  }
730
- }, _callee16);
756
+ }, _callee17);
731
757
  }));
732
758
 
733
- function loadAttrsAndMetrics(_x10) {
759
+ function loadAttrsAndMetrics(_x11) {
734
760
  return _loadAttrsAndMetrics.apply(this, arguments);
735
761
  }
736
762
 
@@ -738,16 +764,16 @@ var Topo = /*#__PURE__*/function () {
738
764
  }();
739
765
 
740
766
  _proto.switchToViewMode = /*#__PURE__*/function () {
741
- var _switchToViewMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee17() {
742
- return _regenerator["default"].wrap(function _callee17$(_context17) {
767
+ var _switchToViewMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee18() {
768
+ return _regenerator["default"].wrap(function _callee18$(_context18) {
743
769
  while (1) {
744
- switch (_context17.prev = _context17.next) {
770
+ switch (_context18.prev = _context18.next) {
745
771
  case 0:
746
772
  case "end":
747
- return _context17.stop();
773
+ return _context18.stop();
748
774
  }
749
775
  }
750
- }, _callee17);
776
+ }, _callee18);
751
777
  }));
752
778
 
753
779
  function switchToViewMode() {
@@ -758,16 +784,16 @@ var Topo = /*#__PURE__*/function () {
758
784
  }();
759
785
 
760
786
  _proto.switchToEditMode = /*#__PURE__*/function () {
761
- var _switchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee18() {
762
- return _regenerator["default"].wrap(function _callee18$(_context18) {
787
+ var _switchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee19() {
788
+ return _regenerator["default"].wrap(function _callee19$(_context19) {
763
789
  while (1) {
764
- switch (_context18.prev = _context18.next) {
790
+ switch (_context19.prev = _context19.next) {
765
791
  case 0:
766
792
  case "end":
767
- return _context18.stop();
793
+ return _context19.stop();
768
794
  }
769
795
  }
770
- }, _callee18);
796
+ }, _callee19);
771
797
  }));
772
798
 
773
799
  function switchToEditMode() {
@@ -11,8 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
11
11
 
12
12
  var _ContextMenu = _interopRequireDefault(require("./common/ContextMenu"));
13
13
 
14
- var _resourceWebControllUrl = _interopRequireDefault(require("./plugins/resourceWebControllUrl"));
15
-
16
14
  var _Background = _interopRequireDefault(require("./graph/Background"));
17
15
 
18
16
  /**
@@ -35,9 +33,7 @@ var TopoGraphView = /*#__PURE__*/function () {
35
33
 
36
34
  _proto.init = function init() {
37
35
  // 初始化核心组件
38
- this.contextMenu = new _ContextMenu["default"](); // 初始化插件功能
39
-
40
- this.resourceWebControllUrl = (0, _resourceWebControllUrl["default"])(this);
36
+ this.contextMenu = new _ContextMenu["default"]();
41
37
  };
42
38
 
43
39
  _proto.getHtDataModel = function getHtDataModel() {
@@ -117,30 +113,6 @@ var TopoGraphView = /*#__PURE__*/function () {
117
113
  this.background = new _Background["default"](this);
118
114
  };
119
115
 
120
- _proto.afterTopoDataLoaded = /*#__PURE__*/function () {
121
- var _afterTopoDataLoaded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(topoData) {
122
- return _regenerator["default"].wrap(function _callee3$(_context3) {
123
- while (1) {
124
- switch (_context3.prev = _context3.next) {
125
- case 0:
126
- _context3.next = 2;
127
- return this.resourceWebControllUrl.afterTopoDataLoaded(topoData);
128
-
129
- case 2:
130
- case "end":
131
- return _context3.stop();
132
- }
133
- }
134
- }, _callee3, this);
135
- }));
136
-
137
- function afterTopoDataLoaded(_x) {
138
- return _afterTopoDataLoaded.apply(this, arguments);
139
- }
140
-
141
- return afterTopoDataLoaded;
142
- }();
143
-
144
116
  _proto.setStore = function setStore(s) {
145
117
  this.store = s;
146
118
  };
@@ -0,0 +1,11 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = void 0;
7
+
8
+ var _resourceWebControllUrl = _interopRequireDefault(require("./resourceWebControllUrl"));
9
+
10
+ var _default = [_resourceWebControllUrl["default"]];
11
+ exports["default"] = _default;
@@ -22,7 +22,7 @@ function _default(topo) {
22
22
 
23
23
  function init() {
24
24
  // 注册菜单点击处理
25
- topo.contextMenu.registerCommands({
25
+ topo.view.contextMenu.registerCommands({
26
26
  'Resource.WebConsole.setting': function ResourceWebConsoleSetting(data) {
27
27
  openSettingDialog(data.bussiInformation.id);
28
28
  },
@@ -32,12 +32,12 @@ function _default(topo) {
32
32
  });
33
33
  }
34
34
 
35
- function afterTopoDataLoaded(_x) {
36
- return _afterTopoDataLoaded.apply(this, arguments);
35
+ function onTopoDataLoaded(_x) {
36
+ return _onTopoDataLoaded.apply(this, arguments);
37
37
  }
38
38
 
39
- function _afterTopoDataLoaded() {
40
- _afterTopoDataLoaded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
39
+ function _onTopoDataLoaded() {
40
+ _onTopoDataLoaded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
41
41
  return _regenerator["default"].wrap(function _callee$(_context) {
42
42
  while (1) {
43
43
  switch (_context.prev = _context.next) {
@@ -51,7 +51,7 @@ function _default(topo) {
51
51
  }
52
52
  }, _callee);
53
53
  }));
54
- return _afterTopoDataLoaded.apply(this, arguments);
54
+ return _onTopoDataLoaded.apply(this, arguments);
55
55
  }
56
56
 
57
57
  function initData(_x2) {
@@ -197,8 +197,9 @@ function _default(topo) {
197
197
  }
198
198
 
199
199
  var resourceWebUrl = {
200
+ name: 'resourceWebControllUrl',
200
201
  initData: initData,
201
- afterTopoDataLoaded: afterTopoDataLoaded,
202
+ onTopoDataLoaded: onTopoDataLoaded,
202
203
  getResourceUrl: getResourceUrl,
203
204
  setting: {
204
205
  getCurrentId: function getCurrentId() {
@@ -56,6 +56,7 @@ function BaseInfoRender(type, data) {
56
56
  label: '资源名称:',
57
57
  objKey: 'resource',
58
58
  render: function render(valueData, key) {
59
+ console.log('资源名称:', valueData, key);
59
60
  var display_name = valueData.display_name,
60
61
  link = valueData.link;
61
62
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -242,7 +243,7 @@ function ResourceOverview(props) {
242
243
  _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
243
244
  var _topo$options$resourc, _attributeMap$source_, _attributeMap$destina;
244
245
 
245
- var ciTypeMeta, link, linkConnectType, _ciTypeMeta, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics, isAppTopoFlag, _findItem, attributeMap, metrics, res_address, rated_bandwidth, _modelAttributeMap$;
246
+ var ciTypeMeta, link, linkConnectType, _ciTypeMeta, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics, isAppTopoFlag, _findItem, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$;
246
247
 
247
248
  return _regenerator["default"].wrap(function _callee$(_context) {
248
249
  while (1) {
@@ -280,29 +281,30 @@ function ResourceOverview(props) {
280
281
  case 10:
281
282
  // 拓扑(默认) ---------------------------
282
283
  // 基本信息
283
- _findItem = (0, _topoData.findItem)(attrsAndMetrics, 'id', id), attributeMap = _findItem.attributeMap, metrics = _findItem.metrics; // 位置
284
+ _findItem = (0, _topoData.findItem)(attrsAndMetrics, 'id', id), attributeMap = _findItem.attributeMap, metrics = _findItem.metrics;
285
+ console.log('基本信息', attributeMap, attrsAndMetrics); // 位置
284
286
 
285
287
  res_address = false;
286
288
 
287
289
  if (!modelAttributeMap['owned_computer_room']) {
288
- _context.next = 18;
290
+ _context.next = 19;
289
291
  break;
290
292
  }
291
293
 
292
- _context.next = 15;
294
+ _context.next = 16;
293
295
  return getAddressFormat(attributeMap);
294
296
 
295
- case 15:
297
+ case 16:
296
298
  res_address = _context.sent;
297
- _context.next = 19;
299
+ _context.next = 20;
298
300
  break;
299
301
 
300
- case 18:
301
- if (modelAttributeMap[ciType + ".computer_room"]) {
302
- res_address = attributeMap[ciType + ".computer_room"] || attributeMap[ciType + ".area"] ? (attributeMap[ciType + ".computer_room"] || '') + " " + (attributeMap[ciType + ".area"] || '') : '';
302
+ case 19:
303
+ if (modelAttributeMap[ciType + ".computer_room"] || modelAttributeMap[ciType + ".area"]) {
304
+ res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$ = attributeMap[ciType + ".area_object"]) === null || _attributeMap$ === void 0 ? void 0 : _attributeMap$.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
303
305
  }
304
306
 
305
- case 19:
307
+ case 20:
306
308
  // 链路带宽(取实际带宽)
307
309
  rated_bandwidth = false;
308
310
 
@@ -342,7 +344,7 @@ function ResourceOverview(props) {
342
344
 
343
345
  getAlarmRiskData(id);
344
346
 
345
- case 24:
347
+ case 25:
346
348
  case "end":
347
349
  return _context.stop();
348
350
  }
@@ -361,7 +363,7 @@ function ResourceOverview(props) {
361
363
  _initAppTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(topModelMetrics, modelAttributeMap, ciName, domain) {
362
364
  var _topo$options$resourc2, _alarmList;
363
365
 
364
- var _yield$topo$options$r, metrics, alarmList, attributeMap, res_address;
366
+ var _yield$topo$options$r, metrics, alarmList, attributeMap, res_address, _attributeMap$2;
365
367
 
366
368
  return _regenerator["default"].wrap(function _callee2$(_context2) {
367
369
  while (1) {
@@ -391,10 +393,25 @@ function ResourceOverview(props) {
391
393
  // 位置
392
394
  res_address = false;
393
395
 
394
- if (modelAttributeMap[ciType + ".computer_room"]) {
395
- res_address = attributeMap[ciType + ".computer_room"] || attributeMap[ciType + ".area"] ? (attributeMap[ciType + ".computer_room"] || '') + " " + (attributeMap[ciType + ".area"] || '') : '';
396
+ if (!modelAttributeMap['owned_computer_room']) {
397
+ _context2.next = 17;
398
+ break;
399
+ }
400
+
401
+ _context2.next = 14;
402
+ return getAddressFormat(attributeMap);
403
+
404
+ case 14:
405
+ res_address = _context2.sent;
406
+ _context2.next = 18;
407
+ break;
408
+
409
+ case 17:
410
+ if (modelAttributeMap[ciType + ".computer_room"] || modelAttributeMap[ciType + ".area"]) {
411
+ res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$2 = attributeMap[ciType + ".area_object"]) === null || _attributeMap$2 === void 0 ? void 0 : _attributeMap$2.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
396
412
  }
397
413
 
414
+ case 18:
398
415
  setBaseInfo({
399
416
  // 资源
400
417
  //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
@@ -434,7 +451,7 @@ function ResourceOverview(props) {
434
451
  })) || [];
435
452
  setAlarmRiskList(alarmList);
436
453
 
437
- case 16:
454
+ case 22:
438
455
  case "end":
439
456
  return _context2.stop();
440
457
  }
@@ -31,8 +31,8 @@ var FormItem = _form["default"].Item;
31
31
 
32
32
  function ResourceWebControllUrlSettingDialog(props) {
33
33
  var topo = props.topo;
34
- var store = topo.store,
35
- resourceWebControllUrl = topo.view.resourceWebControllUrl;
34
+ var store = topo.store;
35
+ var resourceWebControllUrl = topo.pluginManager.pluginMap.resourceWebControllUrl;
36
36
 
37
37
  var _store$useModel = store.useModel('resourceWebControllUrlSetting'),
38
38
  state = _store$useModel[0];
@@ -20,12 +20,13 @@ function EditButton(props) {
20
20
  var topo = props.topo,
21
21
  onEnterEdit = props.onEnterEdit,
22
22
  style = props.style;
23
- var store = topo.store; // const [topoState] = store.useModel('topoMod');
24
- // const { topoPermission, } = topoState;
23
+ var store = topo.store;
25
24
 
26
- var functionAuthState = store.useModelState('functionAuth'); // let show = topo.options.usePermission ? topoPermissonUtil.isEditable(topoPermission) : true;
25
+ var _store$useModel = store.useModel('topoMod'),
26
+ topoState = _store$useModel[0];
27
27
 
28
- var show = topo.options.usePermission ? functionAuthState.permissions.createTopo : true;
28
+ var topoPermission = topoState.topoPermission;
29
+ var show = topo.options.usePermission ? _topoPermissionUtil["default"].isEditable(topoPermission) : true;
29
30
 
30
31
  if (!show) {
31
32
  return null;
@@ -28,7 +28,8 @@ function buildNodeContextmenu(topoApp) {
28
28
  label: '访问',
29
29
  id: 'Resource.WebConsole.open',
30
30
  disable: function disable(data) {
31
- return !topoApp.view.resourceWebControllUrl.getResourceUrl(data.id);
31
+ var resourceWebControllUrl = topoApp.pluginManager.pluginMap.resourceWebControllUrl;
32
+ return !resourceWebControllUrl.getResourceUrl(data.id);
32
33
  }
33
34
  }, {
34
35
  label: '设置',