@riil-frontend/component-topology 12.0.0-dev.9 → 12.0.1
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 +14 -14
- package/es/components/TemplateButton/index.module.scss +1 -1
- package/es/core/components/AlarmListPanel/components/AlarmListItem.js +59 -4
- package/es/core/components/TopoView/topoView.js +5 -1
- package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +5 -12
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +27 -10
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +21 -1
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +9 -0
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +2 -2
- package/es/core/editor/components/Toolbar/widgets/Layout/index.js +17 -3
- package/es/core/editor/hooks/useKeyboardShortcut.js +3 -1
- package/es/core/editor/utils/copyElementUtil.js +12 -0
- package/es/core/editor/utils/edgeTypeStyleUtil.js +8 -7
- package/es/core/hooks/useAlarm.js +131 -81
- package/es/core/hooks/useCmpLinkAlarm.js +153 -0
- package/es/core/hooks/useEventData.js +1 -2
- package/es/core/hooks/useGraphAlarmDisplay.js +91 -56
- package/es/core/hooks/useResourceConfig.js +1 -3
- package/es/core/hooks/useTopoEdit.js +31 -39
- package/es/core/models/Alarm.js +68 -142
- package/es/core/models/AttributeMetricDisplay.js +9 -3
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/cache/CiCache.d.ts +1 -1
- package/es/core/models/cache/CiCache.js +3 -3
- package/es/core/models/topoData.js +0 -1
- package/es/core/services/topo/basic.js +2 -2
- package/es/core/store/models/topoConfig.js +7 -10
- package/es/core/store/models/topoMod.js +81 -134
- package/es/core/utils/edgeUtil.js +8 -0
- package/es/core/utils/metricUtil.js +8 -4
- package/es/core/utils/showGraphManageStatusUtil.js +3 -2
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +51 -13
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +2 -2
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
- package/es/core/viewer/components/plugins/ViewerPlugin.js +3 -1
- package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +1 -5
- package/es/networkTopo/components/TopoView.js +6 -11
- package/es/networkTopo/hooks/useEdgeExpand.js +2 -3
- package/es/networkTopo/services/topo/basic.js +3 -3
- package/es/networkTopo/store/topoCenter.js +260 -223
- package/es/style.js +1 -1
- package/es/utils/ResourceConfigUtil.js +3 -36
- package/es/utils/ciRefAttributeTranslateUtil.d.ts +9 -2
- package/es/utils/ciRefAttributeTranslateUtil.js +8 -9
- package/es/utils/topoData.js +1 -1
- package/lib/components/TemplateButton/index.module.scss +1 -1
- package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +61 -4
- package/lib/core/components/TopoView/topoView.js +5 -1
- package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +6 -12
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +27 -9
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +21 -1
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +8 -0
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
- package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +16 -2
- package/lib/core/editor/hooks/useKeyboardShortcut.js +2 -0
- package/lib/core/editor/utils/copyElementUtil.js +15 -0
- package/lib/core/editor/utils/edgeTypeStyleUtil.js +8 -6
- package/lib/core/hooks/useAlarm.js +130 -79
- package/lib/core/hooks/useCmpLinkAlarm.js +166 -0
- package/lib/core/hooks/useEventData.js +1 -2
- package/lib/core/hooks/useGraphAlarmDisplay.js +91 -55
- package/lib/core/hooks/useResourceConfig.js +1 -3
- package/lib/core/hooks/useTopoEdit.js +30 -38
- package/lib/core/models/Alarm.js +68 -144
- package/lib/core/models/AttributeMetricDisplay.js +10 -2
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/cache/CiCache.d.ts +1 -1
- package/lib/core/models/cache/CiCache.js +3 -3
- package/lib/core/models/topoData.js +0 -1
- package/lib/core/services/topo/basic.js +2 -2
- package/lib/core/store/models/topoConfig.js +7 -10
- package/lib/core/store/models/topoMod.js +81 -134
- package/lib/core/utils/edgeUtil.js +10 -0
- package/lib/core/utils/metricUtil.js +8 -4
- package/lib/core/utils/showGraphManageStatusUtil.js +3 -2
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +52 -13
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +2 -2
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
- package/lib/core/viewer/components/plugins/ViewerPlugin.js +3 -1
- package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +1 -5
- package/lib/networkTopo/components/TopoView.js +5 -14
- package/lib/networkTopo/hooks/useEdgeExpand.js +2 -3
- package/lib/networkTopo/services/topo/basic.js +3 -3
- package/lib/networkTopo/store/topoCenter.js +262 -225
- package/lib/style.js +1 -1
- package/lib/utils/ResourceConfigUtil.js +3 -38
- package/lib/utils/ciRefAttributeTranslateUtil.d.ts +9 -2
- package/lib/utils/ciRefAttributeTranslateUtil.js +8 -9
- package/lib/utils/topoData.js +1 -1
- package/package.json +2 -2
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js
CHANGED
@@ -27,31 +27,70 @@ var _overview = _interopRequireDefault(require("../../../../../../services/overv
|
|
27
27
|
|
28
28
|
var _indexModule = _interopRequireDefault(require("./index.module.scss"));
|
29
29
|
|
30
|
+
var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
|
31
|
+
|
30
32
|
function formatUrl(url) {
|
31
|
-
|
33
|
+
var _window, _window$location;
|
34
|
+
|
35
|
+
console.log(url);
|
36
|
+
var prefix = '/default/pagecenter';
|
37
|
+
|
38
|
+
if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
|
39
|
+
return url.split(prefix)[1];
|
40
|
+
} else {
|
41
|
+
return url;
|
42
|
+
}
|
32
43
|
}
|
33
44
|
|
34
45
|
function EventsCard(props) {
|
35
46
|
var alarmRiskList = props.alarmRiskList,
|
36
47
|
closeDetailDrawer = props.closeDetailDrawer,
|
37
|
-
onHandleAlarm = props.onHandleAlarm;
|
48
|
+
onHandleAlarm = props.onHandleAlarm;
|
49
|
+
|
50
|
+
var jumpTo = function jumpTo(url) {
|
51
|
+
closeDetailDrawer();
|
52
|
+
|
53
|
+
if (topo.viewProps.jumpto) {
|
54
|
+
topo.viewProps.jumpto(url);
|
55
|
+
} else {
|
56
|
+
(0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
|
57
|
+
}
|
58
|
+
}; // 告警table列配置
|
59
|
+
|
38
60
|
|
39
61
|
var columns = [{
|
40
62
|
title: "描述",
|
41
63
|
dataIndex: "title",
|
42
64
|
key: "title",
|
43
65
|
cell: function cell(value, index, record) {
|
44
|
-
return
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
66
|
+
return (
|
67
|
+
/*#__PURE__*/
|
68
|
+
// <div
|
69
|
+
// className={styles["alarm-title"]}
|
70
|
+
// title={value}
|
71
|
+
// onClick={closeDetailDrawer}
|
72
|
+
// >
|
73
|
+
// <Icon
|
74
|
+
// type={record.icon}
|
75
|
+
// size="xs"
|
76
|
+
// className={`${styles["alarm-color-icon"]} ${record.className}`}
|
77
|
+
// />
|
78
|
+
// <Link to={formatUrl(record.link)}>{value}</Link>
|
79
|
+
// </div>
|
80
|
+
_react["default"].createElement("div", {
|
81
|
+
className: _indexModule["default"]['alarm-title'],
|
82
|
+
title: value,
|
83
|
+
onClick: function onClick() {
|
84
|
+
jumpTo(record.link);
|
85
|
+
}
|
86
|
+
}, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
87
|
+
type: record.icon,
|
88
|
+
size: "xs",
|
89
|
+
className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
|
90
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
91
|
+
className: _indexModule["default"].link
|
92
|
+
}, value))
|
93
|
+
);
|
55
94
|
}
|
56
95
|
}, {
|
57
96
|
title: "时间",
|
@@ -41,8 +41,8 @@ function LinkTopoCard(props) {
|
|
41
41
|
openFlow = _useState[0],
|
42
42
|
setOpenFlow = _useState[1];
|
43
43
|
|
44
|
-
var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + data.attributes.
|
45
|
-
var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + data.attributes.
|
44
|
+
var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + encodeURIComponent(data.attributes.display_name) + "&num=0";
|
45
|
+
var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + encodeURIComponent(data.attributes.display_name) + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
|
46
46
|
|
47
47
|
var isOpenFlows = /*#__PURE__*/function () {
|
48
48
|
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
@@ -21,8 +21,10 @@ function ViewerPlugin(props) {
|
|
21
21
|
var topo = props.topo,
|
22
22
|
viewerProps = props.viewerProps;
|
23
23
|
var store = topo.store;
|
24
|
+
var alarmInfoDoc = viewerProps.alarmInfoDoc;
|
24
25
|
(0, _useAlarm["default"])({
|
25
|
-
topo: topo
|
26
|
+
topo: topo,
|
27
|
+
alarmInfoDoc: alarmInfoDoc
|
26
28
|
});
|
27
29
|
(0, _useManageStatus["default"])({
|
28
30
|
topo: topo
|
@@ -15,11 +15,7 @@ var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventDa
|
|
15
15
|
|
16
16
|
function AlarmButton(props) {
|
17
17
|
var topo = props.topo;
|
18
|
-
|
19
|
-
var _topo$store$useModel = topo.store.useModel("topoAlarm"),
|
20
|
-
alarmState = _topo$store$useModel[0],
|
21
|
-
alarmDispatchers = _topo$store$useModel[1];
|
22
|
-
|
18
|
+
var alarmState = topo.store.useModelState("topoAlarm");
|
23
19
|
var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
|
24
20
|
var alarmData = (0, _useEventData["default"])({
|
25
21
|
topo: topo
|
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
11
11
|
|
12
12
|
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
13
13
|
|
14
|
-
var _react =
|
14
|
+
var _react = _interopRequireDefault(require("react"));
|
15
15
|
|
16
16
|
var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/components/NoDataPage/index"));
|
17
17
|
|
@@ -31,13 +31,9 @@ var _useRelateTopo = _interopRequireDefault(require("../hooks/viewer/useRelateTo
|
|
31
31
|
|
32
32
|
var _useEdgeFlow = _interopRequireDefault(require("../hooks/viewer/useEdgeFlow"));
|
33
33
|
|
34
|
-
var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
|
35
|
-
|
36
34
|
var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
|
37
35
|
|
38
|
-
|
39
|
-
|
40
|
-
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; }
|
36
|
+
// import useEdgeExpand from "../hooks/useEdgeExpand";
|
41
37
|
|
42
38
|
/**
|
43
39
|
* 拓扑组件。变化无权限、无数据显示
|
@@ -60,10 +56,8 @@ function NetworkTopologyCore(props) {
|
|
60
56
|
});
|
61
57
|
(0, _useEdgeFlow["default"])({
|
62
58
|
topo: topo
|
63
|
-
});
|
64
|
-
|
65
|
-
topo: topo
|
66
|
-
});
|
59
|
+
}); // useEdgeExpand({ topo })
|
60
|
+
|
67
61
|
var relateTopo = (0, _useRelateTopo["default"])({
|
68
62
|
topo: topo
|
69
63
|
});
|
@@ -92,10 +86,7 @@ function NetworkTopologyCore(props) {
|
|
92
86
|
});
|
93
87
|
} else if (!topoId) {
|
94
88
|
return null;
|
95
|
-
}
|
96
|
-
// return null;
|
97
|
-
// }
|
98
|
-
|
89
|
+
}
|
99
90
|
|
100
91
|
if (!loading) {
|
101
92
|
// 加载完成后
|
@@ -23,9 +23,8 @@ function useEdgeExpand(props) {
|
|
23
23
|
data = e.data;
|
24
24
|
|
25
25
|
if (data instanceof ht.Group && property === 'expanded') {
|
26
|
-
|
27
|
-
setTimeout(function () {
|
28
|
-
(0, _edgeUtil.updateEdgeExpanded)(topo);
|
26
|
+
// updateEdgeExpanded(topo)
|
27
|
+
setTimeout(function () {// updateEdgeExpanded(topo)
|
29
28
|
}, 100);
|
30
29
|
}
|
31
30
|
}
|
@@ -23,7 +23,7 @@ var _model = require("../model");
|
|
23
23
|
|
24
24
|
var _exitLinkUtil = require("../../utils/exitLinkUtil");
|
25
25
|
|
26
|
-
var _excluded = ["groups", "resources"
|
26
|
+
var _excluded = ["groups", "resources"];
|
27
27
|
var API_ROOT = _constants.TOPO_API_ROOT;
|
28
28
|
/**
|
29
29
|
* 拓扑图(看做一个容器)的“父容器”ID
|
@@ -480,11 +480,11 @@ var _default = (0, _extends2["default"])({
|
|
480
480
|
*/
|
481
481
|
bindResourceToTopo: function bindResourceToTopo(id, config) {
|
482
482
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
|
483
|
-
var groups, resources,
|
483
|
+
var groups, resources, otherConfig, newGroups, obj;
|
484
484
|
return _regenerator["default"].wrap(function _callee14$(_context14) {
|
485
485
|
while (1) switch (_context14.prev = _context14.next) {
|
486
486
|
case 0:
|
487
|
-
groups = config.groups, resources = config.resources,
|
487
|
+
groups = config.groups, resources = config.resources, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
|
488
488
|
newGroups = Array.isArray(groups) ? groups : [];
|
489
489
|
|
490
490
|
if (resources) {
|