@riil-frontend/component-topology 2.15.20 → 2.15.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/1.js +1 -1
- package/build/index.css +1 -1
- package/build/index.js +23 -23
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +2 -0
- package/es/core/common/icons/defaultIcons.js +3 -9
- package/es/core/common/icons/icon.js +1 -22
- package/es/core/components/AlarmListPanel/index.js +17 -35
- package/es/core/components/TopoView/topoView.js +2 -0
- package/es/core/components/titlebar/TitleBar.js +3 -3
- package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +1 -3
- package/es/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -3
- package/es/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js +2 -2
- package/es/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js +3 -4
- package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js +3 -3
- package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +4 -4
- package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +1 -3
- package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js +1 -3
- package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +5 -0
- package/es/core/editor/components/settings/propertyViews/text/TextPropertyView.js +5 -7
- package/es/core/models/Alarm.js +30 -51
- package/es/core/models/AttributeMetricDisplay.js +22 -13
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/utils/linkUtils.js +3 -0
- package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +1 -1
- package/es/core/viewer/components/plugins/BaseInfo/index.js +58 -79
- package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.js +31 -29
- package/es/hooks/useTopoEdit.js +16 -5
- package/es/index.js +3 -1
- package/es/style.js +1 -0
- package/es/topoCenter/components/TopoView.js +7 -6
- package/es/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js +2 -3
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +1 -3
- package/es/topoCenter/hooks/editor/useDeleteEdges.js +19 -11
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +2 -0
- package/lib/core/common/icons/defaultIcons.js +4 -13
- package/lib/core/common/icons/icon.js +1 -30
- package/lib/core/components/AlarmListPanel/index.js +19 -36
- package/lib/core/components/TopoView/topoView.js +2 -0
- package/lib/core/components/titlebar/TitleBar.js +2 -2
- package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js +3 -3
- package/lib/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js +3 -4
- package/lib/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js +4 -8
- package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +4 -4
- package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +5 -0
- package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js +5 -7
- package/lib/core/models/Alarm.js +30 -51
- package/lib/core/models/AttributeMetricDisplay.js +22 -13
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/utils/linkUtils.js +5 -0
- package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +1 -1
- package/lib/core/viewer/components/plugins/BaseInfo/index.js +58 -79
- package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js +33 -28
- package/lib/hooks/useTopoEdit.js +16 -5
- package/lib/index.js +17 -2
- package/lib/style.js +1 -0
- package/lib/topoCenter/components/TopoView.js +5 -4
- package/lib/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js +2 -4
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +1 -3
- package/lib/topoCenter/hooks/editor/useDeleteEdges.js +20 -11
- package/package.json +4 -4
|
@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports["default"] = void 0;
|
|
7
7
|
|
|
8
|
-
var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
|
|
9
|
-
|
|
10
8
|
var _list = _interopRequireDefault(require("@alifd/next/lib/list"));
|
|
11
9
|
|
|
12
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
@@ -21,6 +19,8 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
|
|
|
21
19
|
|
|
22
20
|
var _mocks = require("./mocks");
|
|
23
21
|
|
|
22
|
+
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
|
23
|
+
|
|
24
24
|
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); }
|
|
25
25
|
|
|
26
26
|
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; }
|
|
@@ -29,18 +29,16 @@ function AlarmListPanel(props, ref) {
|
|
|
29
29
|
// 传入参数
|
|
30
30
|
var topo = props.topo,
|
|
31
31
|
target = props.toolBarRef,
|
|
32
|
+
titleBarRef = props.titleBarRef,
|
|
32
33
|
visible = props.visible;
|
|
33
|
-
var alarm = topo.alarm;
|
|
34
34
|
|
|
35
35
|
var _useState = (0, _react.useState)([]),
|
|
36
36
|
alarmList = _useState[0],
|
|
37
37
|
setAlarmList = _useState[1];
|
|
38
38
|
|
|
39
|
-
var _topo$store$useModel = topo.store.useModel(
|
|
39
|
+
var _topo$store$useModel = topo.store.useModel("topoAlarm"),
|
|
40
40
|
alarmState = _topo$store$useModel[0],
|
|
41
|
-
alarmDispatchers = _topo$store$useModel[1];
|
|
42
|
-
// const{ alarmPanelIsOpen } = store.getState().topoMod;
|
|
43
|
-
|
|
41
|
+
alarmDispatchers = _topo$store$useModel[1];
|
|
44
42
|
|
|
45
43
|
var alarmData = alarmState.alarmData,
|
|
46
44
|
alarmPanelIsOpen = alarmState.alarmPanelIsOpen,
|
|
@@ -52,42 +50,20 @@ function AlarmListPanel(props, ref) {
|
|
|
52
50
|
};
|
|
53
51
|
|
|
54
52
|
(0, _react.useEffect)(function () {
|
|
55
|
-
// console.log(
|
|
56
|
-
// "AlarmListPanel-useEffect",
|
|
57
|
-
// topo,
|
|
58
|
-
// alarmPanelIsOpen,
|
|
59
|
-
// alarmIsOpened,
|
|
60
|
-
// alarmData,
|
|
61
|
-
// alarmList
|
|
62
|
-
// );
|
|
63
53
|
if (alarmData) {
|
|
64
54
|
var _alarmData$slice;
|
|
65
55
|
|
|
66
|
-
topo.alarm.switchAlarmPopPanel(alarmIsOpened &&
|
|
67
|
-
|
|
56
|
+
_rlog["default"].debug("AlarmListPanel-useEffect", alarmIsOpened); // topo.alarm.switchAlarmPopPanel(alarmIsOpened && alarmData?.length > 0);
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
setAlarmList((_alarmData$slice = alarmData === null || alarmData === void 0 ? void 0 : alarmData.slice(0, 10)) !== null && _alarmData$slice !== void 0 ? _alarmData$slice : []);
|
|
68
60
|
} else {
|
|
69
61
|
setAlarmList([]);
|
|
70
62
|
}
|
|
71
63
|
}, [alarmData]);
|
|
72
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
64
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
73
65
|
className: _indexModule["default"].AlarmListPanel,
|
|
74
|
-
id: "AlarmListPanel"
|
|
75
|
-
align: false,
|
|
76
|
-
top: 100,
|
|
77
|
-
overlayProps: {
|
|
78
|
-
style: {
|
|
79
|
-
right: 15,
|
|
80
|
-
top: 100
|
|
81
|
-
},
|
|
82
|
-
target: {
|
|
83
|
-
target: target
|
|
84
|
-
}
|
|
85
|
-
},
|
|
86
|
-
onClose: onClose,
|
|
87
|
-
hasMask: false,
|
|
88
|
-
closeMode: "close",
|
|
89
|
-
visible: alarmPanelIsOpen,
|
|
90
|
-
footer: false
|
|
66
|
+
id: "AlarmListPanel"
|
|
91
67
|
}, /*#__PURE__*/_react["default"].createElement(_list["default"], {
|
|
92
68
|
header: /*#__PURE__*/_react["default"].createElement("div", {
|
|
93
69
|
style: {
|
|
@@ -98,7 +74,14 @@ function AlarmListPanel(props, ref) {
|
|
|
98
74
|
}, "\u5173\u8054\u544A\u8B66\u4FE1\u606F"), /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
|
|
99
75
|
className: _indexModule["default"].listTitleLink,
|
|
100
76
|
to: "/default/alarmCenter/alarmList"
|
|
101
|
-
}, "\u67E5\u770B\u6240\u6709\u544A\u8B66")
|
|
77
|
+
}, "\u67E5\u770B\u6240\u6709\u544A\u8B66"), /*#__PURE__*/_react["default"].createElement("a", {
|
|
78
|
+
role: "button",
|
|
79
|
+
"aria-label": "\u5173\u95ED",
|
|
80
|
+
className: "next-dialog-close",
|
|
81
|
+
onClick: onClose
|
|
82
|
+
}, /*#__PURE__*/_react["default"].createElement("i", {
|
|
83
|
+
className: "next-icon next-icon-close next-medium next-dialog-close-icon"
|
|
84
|
+
}))),
|
|
102
85
|
dataSource: alarmList,
|
|
103
86
|
emptyContent: /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], {
|
|
104
87
|
className: _indexModule["default"].emptyContent,
|
|
@@ -93,6 +93,7 @@ var TopoView = function TopoView(props) {
|
|
|
93
93
|
tData = _useState[0],
|
|
94
94
|
setTData = _useState[1];
|
|
95
95
|
|
|
96
|
+
var titleBarRef = (0, _react.useRef)();
|
|
96
97
|
var topoEdit = (0, _useTopoEdit["default"])({
|
|
97
98
|
topo: topo,
|
|
98
99
|
topoId: topoId,
|
|
@@ -300,6 +301,7 @@ var TopoView = function TopoView(props) {
|
|
|
300
301
|
}), isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorPlugin["default"], {
|
|
301
302
|
topo: topo,
|
|
302
303
|
topoEdit: topoEdit,
|
|
304
|
+
titleBarRef: titleBarRef,
|
|
303
305
|
topoContext: {
|
|
304
306
|
urlParams: urlParams
|
|
305
307
|
},
|
|
@@ -30,11 +30,11 @@ function TitleBar(props) {
|
|
|
30
30
|
otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
|
|
31
31
|
var store = topo.store;
|
|
32
32
|
|
|
33
|
-
var _store$useModel = store.useModel(
|
|
33
|
+
var _store$useModel = store.useModel("topoMod"),
|
|
34
34
|
topoState = _store$useModel[0];
|
|
35
35
|
|
|
36
36
|
var viewState = topoState.viewState;
|
|
37
|
-
var isEditMode = viewState ===
|
|
37
|
+
var isEditMode = viewState === "edit";
|
|
38
38
|
|
|
39
39
|
if (render) {
|
|
40
40
|
return render({
|
|
@@ -47,9 +47,7 @@ function CommonEdgePropertyView(props) {
|
|
|
47
47
|
onChange: function onChange(name, value) {
|
|
48
48
|
var newValues = field.getValues();
|
|
49
49
|
|
|
50
|
-
|
|
51
|
-
_onChange(name, value, newValues);
|
|
52
|
-
}
|
|
50
|
+
_onChange(name, value, newValues);
|
|
53
51
|
}
|
|
54
52
|
});
|
|
55
53
|
|
|
@@ -11,12 +11,12 @@ var _react = require("react");
|
|
|
11
11
|
|
|
12
12
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
|
13
13
|
|
|
14
|
+
var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
|
|
15
|
+
|
|
14
16
|
var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
|
|
15
17
|
|
|
16
18
|
var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
|
|
17
19
|
|
|
18
|
-
var _icon = require("../../../../../../../common/icons/icon");
|
|
19
|
-
|
|
20
20
|
function sortResourcesByName(resources) {
|
|
21
21
|
return (0, _sortBy["default"])(resources, 'name');
|
|
22
22
|
}
|
|
@@ -41,7 +41,7 @@ function useGroupRelateResource(props) {
|
|
|
41
41
|
})).map(function (item) {
|
|
42
42
|
return {
|
|
43
43
|
title: item.name,
|
|
44
|
-
img:
|
|
44
|
+
img: _componentTopologyGraph.iconFactory.getIconImageUrl(item.image),
|
|
45
45
|
data: item,
|
|
46
46
|
node: item.node
|
|
47
47
|
};
|
|
@@ -53,9 +53,7 @@ function GroupSetting(props) {
|
|
|
53
53
|
|
|
54
54
|
var newValues = field.getValues();
|
|
55
55
|
|
|
56
|
-
|
|
57
|
-
_onChange(name, value, newValues);
|
|
58
|
-
}
|
|
56
|
+
_onChange(name, value, newValues);
|
|
59
57
|
}
|
|
60
58
|
});
|
|
61
59
|
|
|
@@ -115,7 +113,8 @@ function GroupSetting(props) {
|
|
|
115
113
|
}
|
|
116
114
|
}), /*#__PURE__*/_react["default"].createElement(_input["default"], {
|
|
117
115
|
name: "attrObject.name",
|
|
118
|
-
maxLength: 30
|
|
116
|
+
maxLength: 30,
|
|
117
|
+
placeholder: "\u8BF7\u8F93\u5165"
|
|
119
118
|
})), expanded ? /*#__PURE__*/_react["default"].createElement(_GroupExpandSetting["default"], {
|
|
120
119
|
group: group,
|
|
121
120
|
expanded: expanded,
|
|
@@ -5,18 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports["default"] = LayerResourceList;
|
|
7
7
|
|
|
8
|
-
var _react =
|
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
|
9
|
+
|
|
10
|
+
var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
|
|
9
11
|
|
|
10
12
|
var _ResourceList = _interopRequireDefault(require("../../../common/GroupNodeList/ResourceList"));
|
|
11
13
|
|
|
12
14
|
var _htElementUtils = require("../../../../../../../utils/htElementUtils");
|
|
13
15
|
|
|
14
|
-
var _icon = require("../../../../../../common/icons/icon");
|
|
15
|
-
|
|
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); }
|
|
17
|
-
|
|
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; }
|
|
19
|
-
|
|
20
16
|
/**
|
|
21
17
|
* 分层关联资源列表
|
|
22
18
|
*/
|
|
@@ -30,7 +26,7 @@ function LayerResourceList(props) {
|
|
|
30
26
|
var data = relateDataNodes.map(function (node) {
|
|
31
27
|
return {
|
|
32
28
|
title: node.a('name'),
|
|
33
|
-
img:
|
|
29
|
+
img: _componentTopologyGraph.iconFactory.getIconImageUrl(node.getImage())
|
|
34
30
|
};
|
|
35
31
|
});
|
|
36
32
|
return /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
|
|
@@ -43,11 +43,10 @@ function LayerSettingTab(props) {
|
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
+
console.error(values[name], value);
|
|
46
47
|
var newValues = field.getValues();
|
|
47
48
|
|
|
48
|
-
|
|
49
|
-
_onChange(name, value, newValues);
|
|
50
|
-
}
|
|
49
|
+
_onChange(name, value, newValues);
|
|
51
50
|
}
|
|
52
51
|
});
|
|
53
52
|
|
|
@@ -76,7 +75,8 @@ function LayerSettingTab(props) {
|
|
|
76
75
|
}
|
|
77
76
|
}), /*#__PURE__*/_react["default"].createElement(_input["default"], {
|
|
78
77
|
name: "styleMap.label",
|
|
79
|
-
maxLength: 30
|
|
78
|
+
maxLength: 30,
|
|
79
|
+
placeholder: "\u8BF7\u8F93\u5165"
|
|
80
80
|
})), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
|
|
81
81
|
defaultExpandedKeys: ['图片', '对齐方式', '线形'],
|
|
82
82
|
style: {
|
|
@@ -47,9 +47,7 @@ function MultipleElementPropertyView(props) {
|
|
|
47
47
|
onChange: function onChange(name, value) {
|
|
48
48
|
var newValues = field.getValues();
|
|
49
49
|
|
|
50
|
-
|
|
51
|
-
_onChange(name, value, newValues);
|
|
52
|
-
}
|
|
50
|
+
_onChange(name, value, newValues);
|
|
53
51
|
}
|
|
54
52
|
});
|
|
55
53
|
|
|
@@ -34,6 +34,7 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
|
|
|
34
34
|
|
|
35
35
|
var handleSave = /*#__PURE__*/function () {
|
|
36
36
|
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
|
|
37
|
+
var result;
|
|
37
38
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
38
39
|
while (1) {
|
|
39
40
|
switch (_context.prev = _context.next) {
|
|
@@ -56,6 +57,10 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
|
|
|
56
57
|
});
|
|
57
58
|
|
|
58
59
|
case 5:
|
|
60
|
+
result = _context.sent;
|
|
61
|
+
return _context.abrupt("return", result);
|
|
62
|
+
|
|
63
|
+
case 7:
|
|
59
64
|
case "end":
|
|
60
65
|
return _context.stop();
|
|
61
66
|
}
|
|
@@ -65,15 +65,13 @@ function TextPropertyView(props) {
|
|
|
65
65
|
return;
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
if (
|
|
69
|
-
|
|
70
|
-
_onChange(name, DEFAULT_TEXT_VALUE, newValues);
|
|
68
|
+
if (name === 'styleMap.text' && !value) {
|
|
69
|
+
_onChange(name, DEFAULT_TEXT_VALUE, newValues);
|
|
71
70
|
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
_onChange(name, value, newValues);
|
|
71
|
+
return;
|
|
76
72
|
}
|
|
73
|
+
|
|
74
|
+
_onChange(name, value, newValues);
|
|
77
75
|
}
|
|
78
76
|
});
|
|
79
77
|
|
package/lib/core/models/Alarm.js
CHANGED
|
@@ -237,12 +237,13 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
237
237
|
while (1) {
|
|
238
238
|
switch (_context3.prev = _context3.next) {
|
|
239
239
|
case 0:
|
|
240
|
-
|
|
240
|
+
console.log("switchAlarmPopPanel", flag);
|
|
241
|
+
topoDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
|
|
241
242
|
topoDispatchers.update({
|
|
242
243
|
alarmPanelIsOpen: flag
|
|
243
244
|
});
|
|
244
245
|
|
|
245
|
-
case
|
|
246
|
+
case 3:
|
|
246
247
|
case "end":
|
|
247
248
|
return _context3.stop();
|
|
248
249
|
}
|
|
@@ -385,35 +386,13 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
385
386
|
* 打开\关闭告警列表弹窗
|
|
386
387
|
*
|
|
387
388
|
*/
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
return _regenerator["default"].wrap(function _callee6$(_context6) {
|
|
395
|
-
while (1) {
|
|
396
|
-
switch (_context6.prev = _context6.next) {
|
|
397
|
-
case 0:
|
|
398
|
-
console.log("switchAlarmPopPanel", flag);
|
|
399
|
-
this.updateState({
|
|
400
|
-
alarmPanelIsOpen: flag
|
|
401
|
-
});
|
|
402
|
-
|
|
403
|
-
case 2:
|
|
404
|
-
case "end":
|
|
405
|
-
return _context6.stop();
|
|
406
|
-
}
|
|
407
|
-
}
|
|
408
|
-
}, _callee6, this);
|
|
409
|
-
}));
|
|
389
|
+
// async switchAlarmPopPanel(flag) {
|
|
390
|
+
// console.log("switchAlarmPopPanel", flag);
|
|
391
|
+
// this.updateState({
|
|
392
|
+
// alarmPanelIsOpen: flag,
|
|
393
|
+
// });
|
|
394
|
+
// }
|
|
410
395
|
|
|
411
|
-
function switchAlarmPopPanel(_x5) {
|
|
412
|
-
return _switchAlarmPopPanel2.apply(this, arguments);
|
|
413
|
-
}
|
|
414
|
-
|
|
415
|
-
return switchAlarmPopPanel;
|
|
416
|
-
}()
|
|
417
396
|
/**
|
|
418
397
|
* 当资源变化时,需要刷新。
|
|
419
398
|
*/
|
|
@@ -422,22 +401,22 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
422
401
|
_proto.restart =
|
|
423
402
|
/*#__PURE__*/
|
|
424
403
|
function () {
|
|
425
|
-
var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function
|
|
404
|
+
var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
|
|
426
405
|
var id;
|
|
427
|
-
return _regenerator["default"].wrap(function
|
|
406
|
+
return _regenerator["default"].wrap(function _callee6$(_context6) {
|
|
428
407
|
while (1) {
|
|
429
|
-
switch (
|
|
408
|
+
switch (_context6.prev = _context6.next) {
|
|
430
409
|
case 0:
|
|
431
410
|
id = this.currentTopoId;
|
|
432
|
-
|
|
411
|
+
_context6.next = 3;
|
|
433
412
|
return this.openTopoAlarm(id);
|
|
434
413
|
|
|
435
414
|
case 3:
|
|
436
415
|
case "end":
|
|
437
|
-
return
|
|
416
|
+
return _context6.stop();
|
|
438
417
|
}
|
|
439
418
|
}
|
|
440
|
-
},
|
|
419
|
+
}, _callee6, this);
|
|
441
420
|
}));
|
|
442
421
|
|
|
443
422
|
function restart() {
|
|
@@ -455,12 +434,12 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
455
434
|
_proto.getAlarmByEE =
|
|
456
435
|
/*#__PURE__*/
|
|
457
436
|
function () {
|
|
458
|
-
var _getAlarmByEE = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function
|
|
437
|
+
var _getAlarmByEE = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(alertData) {
|
|
459
438
|
var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist;
|
|
460
439
|
|
|
461
|
-
return _regenerator["default"].wrap(function
|
|
440
|
+
return _regenerator["default"].wrap(function _callee7$(_context7) {
|
|
462
441
|
while (1) {
|
|
463
|
-
switch (
|
|
442
|
+
switch (_context7.prev = _context7.next) {
|
|
464
443
|
case 0:
|
|
465
444
|
_this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
|
|
466
445
|
resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
|
|
@@ -470,7 +449,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
470
449
|
console.log("getAlarmByEE-接收到推送的原始告警信息", alertData);
|
|
471
450
|
|
|
472
451
|
if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
|
|
473
|
-
|
|
452
|
+
_context7.next = 25;
|
|
474
453
|
break;
|
|
475
454
|
}
|
|
476
455
|
|
|
@@ -503,20 +482,20 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
503
482
|
}); // rlog.debug("before-combAlarmData", al, bizState);
|
|
504
483
|
|
|
505
484
|
if (!(sendAl.length > 0)) {
|
|
506
|
-
|
|
485
|
+
_context7.next = 25;
|
|
507
486
|
break;
|
|
508
487
|
}
|
|
509
488
|
|
|
510
489
|
_rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
|
|
511
490
|
|
|
512
|
-
|
|
513
|
-
|
|
491
|
+
_context7.prev = 13;
|
|
492
|
+
_context7.next = 16;
|
|
514
493
|
return alarmDispatchers.combAlarmData({
|
|
515
494
|
alarmdata: sendAl
|
|
516
495
|
});
|
|
517
496
|
|
|
518
497
|
case 16:
|
|
519
|
-
_yield$alarmDispatche =
|
|
498
|
+
_yield$alarmDispatche = _context7.sent;
|
|
520
499
|
eqFlag = _yield$alarmDispatche.eqFlag;
|
|
521
500
|
alarmlist = _yield$alarmDispatche.alarmlist;
|
|
522
501
|
|
|
@@ -525,24 +504,24 @@ var Alarm = /*#__PURE__*/function () {
|
|
|
525
504
|
this.hmGetTopoAlarm();
|
|
526
505
|
}
|
|
527
506
|
|
|
528
|
-
|
|
507
|
+
_context7.next = 25;
|
|
529
508
|
break;
|
|
530
509
|
|
|
531
510
|
case 22:
|
|
532
|
-
|
|
533
|
-
|
|
511
|
+
_context7.prev = 22;
|
|
512
|
+
_context7.t0 = _context7["catch"](13);
|
|
534
513
|
|
|
535
|
-
_rlog["default"].error("告警发送异常",
|
|
514
|
+
_rlog["default"].error("告警发送异常", _context7.t0);
|
|
536
515
|
|
|
537
516
|
case 25:
|
|
538
517
|
case "end":
|
|
539
|
-
return
|
|
518
|
+
return _context7.stop();
|
|
540
519
|
}
|
|
541
520
|
}
|
|
542
|
-
},
|
|
521
|
+
}, _callee7, this, [[13, 22]]);
|
|
543
522
|
}));
|
|
544
523
|
|
|
545
|
-
function getAlarmByEE(
|
|
524
|
+
function getAlarmByEE(_x5) {
|
|
546
525
|
return _getAlarmByEE.apply(this, arguments);
|
|
547
526
|
}
|
|
548
527
|
|
|
@@ -530,20 +530,29 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
530
530
|
attributeMap = ciData.attributeMap;
|
|
531
531
|
ciRefAttributeMap[id] = [];
|
|
532
532
|
|
|
533
|
-
_this5.topo.ciTyeCache.getCiType(ciType)
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
533
|
+
var ciTypeMeta = _this5.topo.ciTyeCache.getCiType(ciType);
|
|
534
|
+
|
|
535
|
+
if (ciTypeMeta) {
|
|
536
|
+
ciTypeMeta.attributes.filter(function (attributeMeta) {
|
|
537
|
+
return !!attributeMeta.refCi;
|
|
538
|
+
}).forEach(function (attributeMeta) {
|
|
539
|
+
var refId = attributeMap[attributeMeta.code];
|
|
540
|
+
|
|
541
|
+
if (refId && !refIdMap[refId]) {
|
|
542
|
+
refIdMap[refId] = true;
|
|
543
|
+
}
|
|
544
|
+
|
|
545
|
+
ciRefAttributeMap[id].push({
|
|
546
|
+
attrCode: attributeMeta.code,
|
|
547
|
+
id: refId
|
|
548
|
+
});
|
|
545
549
|
});
|
|
546
|
-
}
|
|
550
|
+
} else {
|
|
551
|
+
_rlog["default"].warn('推送属性指标数据:未查询到ciType', {
|
|
552
|
+
ciData: ciData,
|
|
553
|
+
ciType: ciType
|
|
554
|
+
});
|
|
555
|
+
}
|
|
547
556
|
});
|
|
548
557
|
refIds = Object.keys(refIdMap);
|
|
549
558
|
|
|
@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
|
|
|
48
48
|
var _topoFactory = _interopRequireDefault(require("./topoFactory"));
|
|
49
49
|
|
|
50
50
|
// eslint-disable-next-line no-undef
|
|
51
|
-
var version = typeof "2.15.
|
|
51
|
+
var version = typeof "2.15.23" === 'string' ? "2.15.23" : null;
|
|
52
52
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
53
53
|
/**
|
|
54
54
|
* 拓扑显示和编辑
|
|
@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports.buildTopoLinkData = buildTopoLinkData;
|
|
7
7
|
exports.getLinksDetail = getLinksDetail;
|
|
8
|
+
exports.isAggLink = isAggLink;
|
|
8
9
|
exports.mergeLinksData = mergeLinksData;
|
|
9
10
|
|
|
10
11
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
@@ -28,6 +29,10 @@ var interfaceTypeMap = {
|
|
|
28
29
|
}
|
|
29
30
|
};
|
|
30
31
|
|
|
32
|
+
function isAggLink(link) {
|
|
33
|
+
return link.attributes['network_link.connect_type'] === 'agg';
|
|
34
|
+
}
|
|
35
|
+
|
|
31
36
|
function mergeLinksData(links, linkCis, nodes, interfaceCis) {
|
|
32
37
|
var linkCiMap = (0, _keyBy["default"])(linkCis, 'id');
|
|
33
38
|
return links.map(function (link) {
|