@riil-frontend/component-topology 13.0.0-dev.1 → 13.0.0-dev.2
Sign up to get free protection for your applications and to get access to all the features.
- package/build/1.js +1 -1
- package/build/index.js +14 -14
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
- package/es/core/components/TopoView/topoView.js +7 -4
- package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +2 -2
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +5 -15
- package/es/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +2 -27
- package/es/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -28
- package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +6 -52
- package/es/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js +29 -0
- package/es/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js +29 -0
- package/es/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +71 -0
- package/es/core/editor/components/settings/core/updateElementProperty.js +3 -2
- package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
- package/es/core/editor/hooks/useNewElementTheme.js +20 -16
- package/es/core/editor/utils/edgeTypeStyleUtil.js +11 -32
- package/es/core/hooks/useGraphAlarmDisplay.js +4 -0
- package/es/core/hooks/usePolling.js +2 -1
- package/es/core/hooks/useTopoEdit.js +206 -248
- package/es/core/models/AttributeMetricDisplay.js +4 -3
- package/es/core/models/HistoryManager.js +11 -9
- package/es/core/models/TopoApp.js +39 -45
- package/es/core/models/topoData.js +7 -14
- package/es/core/models/utils/linkUtils.js +36 -28
- package/es/core/store/models/topoConfig.js +14 -17
- package/es/core/utils/edgeUtil.js +7 -10
- package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +2 -2
- package/es/networkTopo/models/EdgeGroupTagTipBuilder.js +7 -7
- package/es/networkTopo/models/LinkDynamicStyleExecutor.js +7 -63
- package/es/networkTopo/services/topo/basic.js +4 -2
- package/es/networkTopo/utils/edgeGroupTagUtil.js +2 -2
- package/es/networkTopo/utils/exitLinkUtil.js +23 -11
- package/es/networkTopo/utils/relateTopoDataUtil.js +38 -0
- package/es/style.js +1 -1
- package/es/utils/clusterUtil.js +3 -3
- package/es/utils/htElementUtils.js +16 -84
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
- package/lib/core/components/TopoView/topoView.js +15 -19
- package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +2 -2
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +5 -14
- package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +3 -28
- package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -28
- package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +6 -56
- package/lib/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js +38 -0
- package/lib/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js +38 -0
- package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +83 -0
- package/lib/core/editor/components/settings/core/updateElementProperty.js +7 -2
- package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
- package/lib/core/editor/hooks/useNewElementTheme.js +20 -16
- package/lib/core/editor/utils/edgeTypeStyleUtil.js +10 -33
- package/lib/core/hooks/useGraphAlarmDisplay.js +4 -0
- package/lib/core/hooks/usePolling.js +6 -5
- package/lib/core/hooks/useTopoEdit.js +212 -272
- package/lib/core/models/AttributeMetricDisplay.js +6 -6
- package/lib/core/models/HistoryManager.js +13 -17
- package/lib/core/models/TopoApp.js +39 -43
- package/lib/core/models/topoData.js +7 -14
- package/lib/core/models/utils/linkUtils.js +36 -27
- package/lib/core/store/models/topoConfig.js +20 -31
- package/lib/core/utils/edgeUtil.js +8 -10
- package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +3 -2
- package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js +6 -6
- package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +6 -64
- package/lib/networkTopo/services/topo/basic.js +4 -2
- package/lib/networkTopo/utils/edgeGroupTagUtil.js +2 -2
- package/lib/networkTopo/utils/exitLinkUtil.js +23 -11
- package/lib/networkTopo/utils/relateTopoDataUtil.js +49 -0
- package/lib/style.js +1 -1
- package/lib/utils/clusterUtil.js +2 -2
- package/lib/utils/htElementUtils.js +19 -93
- package/package.json +2 -2
- package/es/networkTopo/models/LinkTagsTipsBuilder.js +0 -235
- package/lib/networkTopo/models/LinkTagsTipsBuilder.js +0 -245
@@ -7,39 +7,16 @@ exports["default"] = void 0;
|
|
7
7
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
9
9
|
|
10
|
-
var
|
10
|
+
var _FontStyleSelect = _interopRequireDefault(require("./components/FontStyleSelect"));
|
11
11
|
|
12
|
-
var
|
13
|
-
|
14
|
-
var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
|
15
|
-
|
16
|
-
var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
|
12
|
+
var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
|
17
13
|
|
18
14
|
var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
|
19
15
|
|
20
|
-
var _Tooltip = _interopRequireDefault(require("../components/Tooltip"));
|
21
|
-
|
22
16
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
23
17
|
|
24
18
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
25
19
|
|
26
|
-
var items = [{
|
27
|
-
key: 'bold',
|
28
|
-
label: '加粗',
|
29
|
-
icon: 'bold',
|
30
|
-
tooltip: '加粗'
|
31
|
-
}, {
|
32
|
-
key: 'italic',
|
33
|
-
label: '斜体',
|
34
|
-
icon: 'Italics',
|
35
|
-
tooltip: '斜体'
|
36
|
-
}, {
|
37
|
-
key: 'underline',
|
38
|
-
label: '下划线',
|
39
|
-
icon: 'Underline',
|
40
|
-
tooltip: '下划线'
|
41
|
-
}];
|
42
|
-
|
43
20
|
function buildValue(obj) {
|
44
21
|
return Object.keys(obj).filter(function (key) {
|
45
22
|
return !!obj[key];
|
@@ -107,39 +84,12 @@ function FontStyleButton(props) {
|
|
107
84
|
tooltip: "\u6587\u5B57\u6837\u5F0F\uFF08\u52A0\u7C97\u3001\u659C\u4F53\u3001\u4E0B\u5212\u7EBF\uFF09",
|
108
85
|
disabled: disabled,
|
109
86
|
showLabel: showLabel
|
110
|
-
}, /*#__PURE__*/_react["default"].createElement(
|
87
|
+
}, /*#__PURE__*/_react["default"].createElement(_FontStyleSelect["default"], {
|
111
88
|
value: value,
|
112
|
-
valueRender: function valueRender() {
|
113
|
-
return /*#__PURE__*/_react["default"].createElement("img", {
|
114
|
-
src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
|
115
|
-
alt: ""
|
116
|
-
});
|
117
|
-
},
|
118
|
-
multiple: true,
|
119
89
|
disabled: disabled,
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
key: item.key,
|
124
|
-
disabled: fieldDisabled[item.key]
|
125
|
-
}, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
|
126
|
-
trigger: /*#__PURE__*/_react["default"].createElement("div", {
|
127
|
-
style: {
|
128
|
-
display: 'flex',
|
129
|
-
alignItems: 'center'
|
130
|
-
}
|
131
|
-
}, /*#__PURE__*/_react["default"].createElement("img", {
|
132
|
-
src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
|
133
|
-
alt: ""
|
134
|
-
}), /*#__PURE__*/_react["default"].createElement("span", {
|
135
|
-
style: fieldDisabled[item.key] ? {} : {
|
136
|
-
color: _variables["default"]['$color-text1-4']
|
137
|
-
}
|
138
|
-
}, item.label)),
|
139
|
-
align: "r",
|
140
|
-
popupStyle: {}
|
141
|
-
}, item.tooltip));
|
142
|
-
})));
|
90
|
+
fieldDisabled: fieldDisabled,
|
91
|
+
onChange: handleSelect
|
92
|
+
}));
|
143
93
|
}
|
144
94
|
|
145
95
|
var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton, {
|
@@ -0,0 +1,38 @@
|
|
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 _react = _interopRequireDefault(require("react"));
|
9
|
+
|
10
|
+
var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
|
11
|
+
|
12
|
+
function FontFamilySelect(props) {
|
13
|
+
var value = props.value,
|
14
|
+
onChange = props.onChange;
|
15
|
+
var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
|
16
|
+
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
|
17
|
+
value: (items.includes(value) ? value : null) || '',
|
18
|
+
valueRender: function valueRender(val) {
|
19
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
20
|
+
style: {
|
21
|
+
width: 48
|
22
|
+
}
|
23
|
+
}, val || '微软雅黑');
|
24
|
+
},
|
25
|
+
onSelect: onChange
|
26
|
+
}, items.map(function (item) {
|
27
|
+
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
|
28
|
+
key: item
|
29
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
30
|
+
style: {
|
31
|
+
fontFamily: item
|
32
|
+
}
|
33
|
+
}, item));
|
34
|
+
}));
|
35
|
+
}
|
36
|
+
|
37
|
+
var _default = FontFamilySelect;
|
38
|
+
exports["default"] = _default;
|
@@ -0,0 +1,38 @@
|
|
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 _react = _interopRequireDefault(require("react"));
|
9
|
+
|
10
|
+
var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
|
11
|
+
|
12
|
+
function FontSizeSelect(props) {
|
13
|
+
var value = props.value,
|
14
|
+
disabled = props.disabled,
|
15
|
+
onChange = props.onChange;
|
16
|
+
var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
|
17
|
+
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
|
18
|
+
value: "" + (value || ''),
|
19
|
+
valueRender: function valueRender(val) {
|
20
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
21
|
+
style: {
|
22
|
+
width: 18
|
23
|
+
}
|
24
|
+
}, val || 20);
|
25
|
+
},
|
26
|
+
disabled: disabled,
|
27
|
+
onSelect: function onSelect(val) {
|
28
|
+
return onChange(parseInt(val, 10));
|
29
|
+
}
|
30
|
+
}, items.map(function (item) {
|
31
|
+
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
|
32
|
+
key: item
|
33
|
+
}, item);
|
34
|
+
}));
|
35
|
+
}
|
36
|
+
|
37
|
+
var _default = FontSizeSelect;
|
38
|
+
exports["default"] = _default;
|
@@ -0,0 +1,83 @@
|
|
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 _react = _interopRequireDefault(require("react"));
|
9
|
+
|
10
|
+
var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
|
11
|
+
|
12
|
+
var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
|
13
|
+
|
14
|
+
var _Tooltip = _interopRequireDefault(require("../../components/Tooltip"));
|
15
|
+
|
16
|
+
var items = [{
|
17
|
+
key: 'bold',
|
18
|
+
label: '加粗',
|
19
|
+
icon: 'bold',
|
20
|
+
tooltip: '加粗'
|
21
|
+
}, {
|
22
|
+
key: 'italic',
|
23
|
+
label: '斜体',
|
24
|
+
icon: 'Italics',
|
25
|
+
tooltip: '斜体'
|
26
|
+
}, {
|
27
|
+
key: 'underline',
|
28
|
+
label: '下划线',
|
29
|
+
icon: 'Underline',
|
30
|
+
tooltip: '下划线'
|
31
|
+
}];
|
32
|
+
|
33
|
+
function buildValue(obj) {
|
34
|
+
return Object.keys(obj).filter(function (key) {
|
35
|
+
return !!obj[key];
|
36
|
+
});
|
37
|
+
}
|
38
|
+
|
39
|
+
var fields = ['bold', 'italic', 'underline'];
|
40
|
+
|
41
|
+
function FontStyleSelect(props) {
|
42
|
+
var value = props.value,
|
43
|
+
disabled = props.disabled,
|
44
|
+
onChange = props.onChange,
|
45
|
+
_props$fieldDisabled = props.fieldDisabled,
|
46
|
+
fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
|
47
|
+
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
|
48
|
+
value: value,
|
49
|
+
valueRender: function valueRender() {
|
50
|
+
return /*#__PURE__*/_react["default"].createElement("img", {
|
51
|
+
src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
|
52
|
+
alt: ""
|
53
|
+
});
|
54
|
+
},
|
55
|
+
multiple: true,
|
56
|
+
disabled: disabled,
|
57
|
+
onSelect: onChange
|
58
|
+
}, items.map(function (item) {
|
59
|
+
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
|
60
|
+
key: item.key,
|
61
|
+
disabled: !!fieldDisabled[item.key]
|
62
|
+
}, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
|
63
|
+
trigger: /*#__PURE__*/_react["default"].createElement("div", {
|
64
|
+
style: {
|
65
|
+
display: 'flex',
|
66
|
+
alignItems: 'center'
|
67
|
+
}
|
68
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
69
|
+
src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
|
70
|
+
alt: ""
|
71
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
72
|
+
style: fieldDisabled[item.key] ? {} : {
|
73
|
+
color: _variables["default"]['$color-text1-4']
|
74
|
+
}
|
75
|
+
}, item.label)),
|
76
|
+
align: "r",
|
77
|
+
popupStyle: {}
|
78
|
+
}, item.tooltip));
|
79
|
+
}));
|
80
|
+
}
|
81
|
+
|
82
|
+
var _default = FontStyleSelect;
|
83
|
+
exports["default"] = _default;
|
@@ -1,12 +1,17 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
+
|
3
5
|
exports.__esModule = true;
|
4
6
|
exports["default"] = updateElementProperty;
|
5
7
|
|
8
|
+
var _loglevel = _interopRequireDefault(require("loglevel"));
|
9
|
+
|
10
|
+
var rlog = _loglevel["default"].getLogger('topo');
|
11
|
+
|
6
12
|
function updateElementProperty(topo, name, value) {
|
7
|
-
// const element = topo.getDataModel().getDataById(selection[0].id);
|
8
13
|
var element = topo.getSelectionModel().getFirstData();
|
9
|
-
|
14
|
+
rlog.debug("updateElementProperty. ", {
|
10
15
|
element: element,
|
11
16
|
name: name,
|
12
17
|
value: value
|
@@ -32,13 +32,13 @@ function GlobalEdgeToggle(props) {
|
|
32
32
|
topo: topo,
|
33
33
|
showType: 4
|
34
34
|
});
|
35
|
-
topo.getHtTopo().
|
35
|
+
topo.getHtTopo().toggleAllEdgeGroups(true);
|
36
36
|
} else {
|
37
37
|
(0, _linkUtils.showLinkByConfig)({
|
38
38
|
topo: topo,
|
39
39
|
showType: 1
|
40
40
|
});
|
41
|
-
topo.getHtTopo().
|
41
|
+
topo.getHtTopo().toggleAllEdgeGroups(false);
|
42
42
|
}
|
43
43
|
|
44
44
|
displayConfigDispatchers.update({
|
@@ -26,27 +26,31 @@ function useNewElementTheme(props) {
|
|
26
26
|
inited = true;
|
27
27
|
}
|
28
28
|
|
29
|
-
function
|
30
|
-
var
|
31
|
-
data = e.data;
|
29
|
+
function handleAddElement(e) {
|
30
|
+
var data = e.data; // 设置主题样式
|
32
31
|
|
33
|
-
|
34
|
-
|
35
|
-
var displayConfig = topo.store.getModelState('displayConfig');
|
36
|
-
var theme = displayConfig.canvasTheme || 'white';
|
32
|
+
var displayConfig = topo.store.getModelState('displayConfig');
|
33
|
+
var theme = displayConfig.canvasTheme || 'white';
|
37
34
|
|
38
|
-
|
39
|
-
|
40
|
-
|
35
|
+
var themeConfig = _themes["default"].find(function (item) {
|
36
|
+
return item.name === theme;
|
37
|
+
});
|
41
38
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
39
|
+
var _ThemeUtil = (0, _themeUtil["default"])({
|
40
|
+
topo: topo
|
41
|
+
}),
|
42
|
+
setElementTheme = _ThemeUtil.setElementTheme;
|
46
43
|
|
47
|
-
|
44
|
+
setElementTheme(data, themeConfig); // 临时放这里,新加入节点按配置显示隐藏名称
|
45
|
+
|
46
|
+
(0, _nodeNameVisibleUtil.setNewNodeNameVisible)(topo, data);
|
47
|
+
}
|
48
48
|
|
49
|
-
|
49
|
+
function handleDataModelChangeListener(e) {
|
50
|
+
var kind = e.kind;
|
51
|
+
|
52
|
+
if (kind === 'add') {
|
53
|
+
handleAddElement(e);
|
50
54
|
}
|
51
55
|
}
|
52
56
|
|
@@ -3,7 +3,6 @@
|
|
3
3
|
exports.__esModule = true;
|
4
4
|
exports.getEdgesBySelection = getEdgesBySelection;
|
5
5
|
exports.isNodeAllEdges = isNodeAllEdges;
|
6
|
-
exports.loopEdgesAndChildren = loopEdgesAndChildren;
|
7
6
|
exports.setEdgesType = setEdgesType;
|
8
7
|
exports.updateEdgesData = updateEdgesData;
|
9
8
|
|
@@ -25,6 +24,14 @@ function getEdgesBySelection(topo) {
|
|
25
24
|
return nodeIds;
|
26
25
|
};
|
27
26
|
|
27
|
+
function getVisibleEdgesInNodes(gv, nodes) {
|
28
|
+
var nodeIds = getChildrenNodeIds(nodes);
|
29
|
+
var dm = gv.getDataModel();
|
30
|
+
return (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
|
31
|
+
return nodeIds.includes(edge.getSource().getId()) && nodeIds.includes(edge.getTarget().getId());
|
32
|
+
}).filter(_htElementUtils.isEdgeVisible);
|
33
|
+
}
|
34
|
+
|
28
35
|
var getSelectedEdges = function getSelectedEdges(gv) {
|
29
36
|
var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
|
30
37
|
|
@@ -35,14 +42,8 @@ function getEdgesBySelection(topo) {
|
|
35
42
|
var nodes = selection.filter(function (element) {
|
36
43
|
return element instanceof ht.Node;
|
37
44
|
});
|
38
|
-
|
39
|
-
|
40
|
-
(0, _htElementUtils.getEdges)(dm).forEach(function (edge) {
|
41
|
-
if (nodeIds.find(function (nodeId) {
|
42
|
-
return nodeId === edge.getSource().getId();
|
43
|
-
}) && nodeIds.find(function (nodeId) {
|
44
|
-
return nodeId === edge.getTarget().getId();
|
45
|
-
}) && !edges.find(function (item) {
|
45
|
+
getVisibleEdgesInNodes(gv, nodes).forEach(function (edge) {
|
46
|
+
if (!edges.find(function (item) {
|
46
47
|
return item === edge;
|
47
48
|
})) {
|
48
49
|
edges.push(edge);
|
@@ -89,30 +90,6 @@ function isNodeAllEdges(topo) {
|
|
89
90
|
});
|
90
91
|
return inEdges;
|
91
92
|
}
|
92
|
-
/**
|
93
|
-
* 遍历连线及子连线
|
94
|
-
* @param {*} topo
|
95
|
-
* @param {*} edges
|
96
|
-
* @param {*} operateEdgeFn
|
97
|
-
*/
|
98
|
-
|
99
|
-
|
100
|
-
function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
|
101
|
-
var htTopo = topo.getHtTopo();
|
102
|
-
edges.forEach(function (edge) {
|
103
|
-
operateEdgeFn(edge);
|
104
|
-
|
105
|
-
if (edge.isEdgeGroupAgent()) {
|
106
|
-
// 连线组折叠时同时设置子连线
|
107
|
-
var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
|
108
|
-
htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
|
109
|
-
edgeChildren.forEach(function (edgeChild) {
|
110
|
-
operateEdgeFn(edgeChild);
|
111
|
-
});
|
112
|
-
htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
|
113
|
-
}
|
114
|
-
});
|
115
|
-
}
|
116
93
|
/**
|
117
94
|
* 设置连线及子连线。带回退事务控制
|
118
95
|
* @param {*} topo
|
@@ -137,6 +137,8 @@ function useGraphAlarmDisplay(options) {
|
|
137
137
|
});
|
138
138
|
|
139
139
|
function showAlarm() {
|
140
|
+
var _topo$historyManager, _topo$historyManager2;
|
141
|
+
|
140
142
|
if (!graphLoaded) {
|
141
143
|
return;
|
142
144
|
}
|
@@ -169,7 +171,9 @@ function useGraphAlarmDisplay(options) {
|
|
169
171
|
}); // 更新到ht拓扑
|
170
172
|
|
171
173
|
|
174
|
+
(_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '推送告警');
|
172
175
|
topo.view.loadAlarm(elementsAlarmLevels);
|
176
|
+
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '推送告警');
|
173
177
|
}
|
174
178
|
|
175
179
|
return function () {
|
@@ -17,7 +17,7 @@ var _ahooks = require("ahooks");
|
|
17
17
|
|
18
18
|
var _lodash = _interopRequireDefault(require("lodash"));
|
19
19
|
|
20
|
-
var
|
20
|
+
var _loglevel = _interopRequireDefault(require("loglevel"));
|
21
21
|
|
22
22
|
var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
|
23
23
|
|
@@ -27,10 +27,13 @@ var _useCiAttributeChange = _interopRequireDefault(require("./useCiAttributeChan
|
|
27
27
|
|
28
28
|
var _useHtDataPropertyChangeListener = _interopRequireDefault(require("./ht/useHtDataPropertyChangeListener"));
|
29
29
|
|
30
|
+
var rlog = _loglevel["default"].getLogger('topo');
|
30
31
|
/**
|
31
32
|
* 轮询获取指标hooks
|
32
33
|
* @param {*} props
|
33
34
|
*/
|
35
|
+
|
36
|
+
|
34
37
|
var usePolling = function usePolling(props) {
|
35
38
|
var topo = props.topo;
|
36
39
|
var store = topo.store;
|
@@ -227,20 +230,18 @@ var usePolling = function usePolling(props) {
|
|
227
230
|
|
228
231
|
(0, _react.useEffect)(function () {
|
229
232
|
if (topo.options.enableDefaultMetricLoader) {
|
230
|
-
|
233
|
+
rlog.debug('usePolling.useEffect: 开始轮询', {
|
231
234
|
pollingSwitch: pollingSwitch,
|
232
235
|
resIdsList: resIdsList,
|
233
236
|
resourceOverviewState: resourceOverviewState,
|
234
237
|
resAndMetrics: resAndMetrics
|
235
238
|
});
|
236
|
-
|
237
239
|
startPoll();
|
238
240
|
}
|
239
241
|
|
240
242
|
return function () {
|
241
243
|
if (loading) {
|
242
|
-
|
243
|
-
|
244
|
+
rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
|
244
245
|
stopPoll();
|
245
246
|
}
|
246
247
|
};
|