@riil-frontend/component-topology 13.0.4 → 13.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 (10) hide show
  1. package/build/index.js +12 -12
  2. package/es/core/hooks/useGraphAlarmDisplay.js +17 -20
  3. package/es/core/hooks/usePolling.js +1 -0
  4. package/es/core/models/TopoApp.js +1 -1
  5. package/es/networkTopo/hooks/viewer/useEdgeFlow.js +12 -8
  6. package/lib/core/hooks/useGraphAlarmDisplay.js +16 -19
  7. package/lib/core/hooks/usePolling.js +1 -0
  8. package/lib/core/models/TopoApp.js +1 -1
  9. package/lib/networkTopo/hooks/viewer/useEdgeFlow.js +11 -7
  10. package/package.json +2 -2
package/es/core/hooks/useGraphAlarmDisplay.js CHANGED
@@ -2,8 +2,8 @@ import { useEffect, useMemo } from "react";
2
2
  import rlog from "@riil-frontend/component-topology-utils/es/rlog";
3
3
  import { getElements } from "../../utils/htElementUtils";
4
4
  import { removeManageStatus, showManageStatus } from "../utils/showGraphManageStatusUtil";
5
- import useCmpLinkAlarm from "./useCmpLinkAlarm";
6
- import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
5
+ import useCmpLinkAlarm from "./useCmpLinkAlarm"; // import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
6
+
7
7
  /**
8
8
  * 获取ci的最高告警级别
9
9
  * @param {Array} alarmList
@@ -102,26 +102,23 @@ export default function useGraphAlarmDisplay(options) {
102
102
 
103
103
  var cmpRes = useMemo(function () {
104
104
  return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
105
- }, [oldResources, cmpLinkRunStatus]); // 拓扑链路特殊处理
106
-
107
- var _useLinkAlarmDisplay = useLinkAlarmDisplay({
108
- topo: topo,
109
- resources: cmpRes,
110
- graphLoaded: graphLoaded,
111
- alarmList: alarmList
112
- }),
113
- linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
114
- getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels; // const resources = useMemo(() => addLinkOfflineStatusForDisplayLineColor(cmpRes, linkRunStatus), [cmpRes, linkRunStatus])
115
-
116
-
117
- var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes); // 排除掉处于断开状态的链路
118
-
119
- var resources = cmpRes.filter(function (item) {
120
- return !item.breakState;
121
- }); // ci告警级别
105
+ }, [oldResources, cmpLinkRunStatus]);
106
+ var resources = [].concat(cmpRes); // 拓扑链路特殊处理 暂时屏蔽这部分处理
107
+ // const {
108
+ // // linkAlarmLevels,
109
+ // linkRunStatus,
110
+ // getlinkAlarmLevels,
111
+ // } = useLinkAlarmDisplay({ topo, resources: cmpRes, graphLoaded, alarmList });
112
+ // const linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
113
+ // 排除掉处于断开状态的链路
114
+ // const resources = cmpRes.filter((item) => {
115
+ // return !item.breakState;
116
+ // });
117
+ /// 屏蔽------------
118
+ // ci告警级别
122
119
 
123
120
  var cisEventLevel = useMemo(function () {
124
- var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
121
+ var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
125
122
  var _item$resourceId;
126
123
 
127
124
  return {
package/es/core/hooks/usePolling.js CHANGED
@@ -124,6 +124,7 @@ var usePolling = function usePolling(props) {
124
124
  position: 17,
125
125
  icon: "resource.link.linkbreak"
126
126
  });
127
+ element === null || element === void 0 ? void 0 : element.a('linkbreak', true);
127
128
  topo.dataModel.updateData([_extends({}, link, {
128
129
  breakState: true
129
130
  })]);
package/es/core/models/TopoApp.js CHANGED
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
24
24
  import SelectionModel from "./SelectionModel";
25
25
  import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
26
26
 
27
- var version = typeof "13.0.4" === 'string' ? "13.0.4" : null;
27
+ var version = typeof "13.0.6" === 'string' ? "13.0.6" : null;
28
28
  console.info("\u62D3\u6251\u7248\u672C: " + version);
29
29
  /**
30
30
  * 拓扑显示和编辑
package/es/networkTopo/hooks/viewer/useEdgeFlow.js CHANGED
@@ -1,17 +1,17 @@
1
- import { useEffect } from 'react';
1
+ import { useEffect } from "react";
2
2
  /**
3
3
  * 默认情况下，拓扑图不存在链路的动态效果
4
4
  * 未监控的链路，不展示动态效果
5
- * @param {*} props
5
+ * @param {*} props
6
6
  */
7
7
 
8
8
  export default function useEdgeFlow(props) {
9
9
  var topo = props.topo;
10
- var topoState = topo.store.useModelState('topoMod');
11
- var displayConfig = topo.store.useModelState('displayConfig');
10
+ var topoState = topo.store.useModelState("topoMod");
11
+ var displayConfig = topo.store.useModelState("displayConfig");
12
12
  var graphLoaded = topoState.graphLoaded,
13
13
  viewState = topoState.viewState;
14
- var isViewer = viewState !== 'edit';
14
+ var isViewer = viewState !== "edit";
15
15
  var edgeFlow = displayConfig.edgeFlow,
16
16
  edgeFlowDirection = displayConfig.edgeFlowDirection;
17
17
  var resources = topo.dataModel.useCis();
@@ -21,7 +21,7 @@ export default function useEdgeFlow(props) {
21
21
  var edgeFlowConfig = edgeFlow ? {
22
22
  type: edgeFlow,
23
23
  // 必填，支持传送带drip、光点point、箭头arrow
24
- direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向，可为空. 默认上行目的到源
24
+ direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向，可为空. 默认上行目的到源
25
25
 
26
26
  } : null;
27
27
  topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路，不展示动态效果
@@ -34,8 +34,12 @@ export default function useEdgeFlow(props) {
34
34
  var element = topo.getDataModel().getDataByTag(id);
35
35
  if (!element) return;
36
36
 
37
- if (element instanceof ht.Edge && isNotMonite) {
38
- element.s('flow', false);
37
+ if (element instanceof ht.Edge) {
38
+ var isBreak = element.a("linkbreak");
39
+
40
+ if (isNotMonite || isBreak) {
41
+ element.s("flow", false);
42
+ }
39
43
  }
40
44
  });
41
45
  }
package/lib/core/hooks/useGraphAlarmDisplay.js CHANGED
@@ -15,7 +15,7 @@ var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
15
15
 
16
16
  var _useCmpLinkAlarm2 = _interopRequireDefault(require("./useCmpLinkAlarm"));
17
17
 
18
- var _useLinkAlarmDisplay2 = _interopRequireDefault(require("./useLinkAlarmDisplay"));
18
+ // import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
19
19
 
20
20
  /**
21
21
  * 获取ci的最高告警级别
@@ -114,26 +114,23 @@ function useGraphAlarmDisplay(options) {
114
114
 
115
115
  var cmpRes = (0, _react.useMemo)(function () {
116
116
  return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
117
- }, [oldResources, cmpLinkRunStatus]); // 拓扑链路特殊处理
118
-
119
- var _useLinkAlarmDisplay = (0, _useLinkAlarmDisplay2["default"])({
120
- topo: topo,
121
- resources: cmpRes,
122
- graphLoaded: graphLoaded,
123
- alarmList: alarmList
124
- }),
125
- linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
126
- getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels; // const resources = useMemo(() => addLinkOfflineStatusForDisplayLineColor(cmpRes, linkRunStatus), [cmpRes, linkRunStatus])
127
-
128
-
129
- var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes); // 排除掉处于断开状态的链路
130
-
131
- var resources = cmpRes.filter(function (item) {
132
- return !item.breakState;
133
- }); // ci告警级别
117
+ }, [oldResources, cmpLinkRunStatus]);
118
+ var resources = [].concat(cmpRes); // 拓扑链路特殊处理 暂时屏蔽这部分处理
119
+ // const {
120
+ // // linkAlarmLevels,
121
+ // linkRunStatus,
122
+ // getlinkAlarmLevels,
123
+ // } = useLinkAlarmDisplay({ topo, resources: cmpRes, graphLoaded, alarmList });
124
+ // const linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
125
+ // 排除掉处于断开状态的链路
126
+ // const resources = cmpRes.filter((item) => {
127
+ // return !item.breakState;
128
+ // });
129
+ /// 屏蔽------------
130
+ // ci告警级别
134
131
 
135
132
  var cisEventLevel = (0, _react.useMemo)(function () {
136
- var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
133
+ var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
137
134
  var _item$resourceId;
138
135
 
139
136
  return {
package/lib/core/hooks/usePolling.js CHANGED
@@ -143,6 +143,7 @@ var usePolling = function usePolling(props) {
143
143
  position: 17,
144
144
  icon: "resource.link.linkbreak"
145
145
  });
146
+ element === null || element === void 0 ? void 0 : element.a('linkbreak', true);
146
147
  topo.dataModel.updateData([(0, _extends2["default"])({}, link, {
147
148
  breakState: true
148
149
  })]);
package/lib/core/models/TopoApp.js CHANGED
@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
54
54
  var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
55
55
 
56
56
  // eslint-disable-next-line no-undef
57
- var version = typeof "13.0.4" === 'string' ? "13.0.4" : null;
57
+ var version = typeof "13.0.6" === 'string' ? "13.0.6" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
package/lib/networkTopo/hooks/viewer/useEdgeFlow.js CHANGED
@@ -8,15 +8,15 @@ var _react = require("react");
8
8
  /**
9
9
  * 默认情况下，拓扑图不存在链路的动态效果
10
10
  * 未监控的链路，不展示动态效果
11
- * @param {*} props
11
+ * @param {*} props
12
12
  */
13
13
  function useEdgeFlow(props) {
14
14
  var topo = props.topo;
15
- var topoState = topo.store.useModelState('topoMod');
16
- var displayConfig = topo.store.useModelState('displayConfig');
15
+ var topoState = topo.store.useModelState("topoMod");
16
+ var displayConfig = topo.store.useModelState("displayConfig");
17
17
  var graphLoaded = topoState.graphLoaded,
18
18
  viewState = topoState.viewState;
19
- var isViewer = viewState !== 'edit';
19
+ var isViewer = viewState !== "edit";
20
20
  var edgeFlow = displayConfig.edgeFlow,
21
21
  edgeFlowDirection = displayConfig.edgeFlowDirection;
22
22
  var resources = topo.dataModel.useCis();
@@ -26,7 +26,7 @@ function useEdgeFlow(props) {
26
26
  var edgeFlowConfig = edgeFlow ? {
27
27
  type: edgeFlow,
28
28
  // 必填，支持传送带drip、光点point、箭头arrow
29
- direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向，可为空. 默认上行目的到源
29
+ direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向，可为空. 默认上行目的到源
30
30
 
31
31
  } : null;
32
32
  topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路，不展示动态效果
@@ -39,8 +39,12 @@ function useEdgeFlow(props) {
39
39
  var element = topo.getDataModel().getDataByTag(id);
40
40
  if (!element) return;
41
41
 
42
- if (element instanceof ht.Edge && isNotMonite) {
43
- element.s('flow', false);
42
+ if (element instanceof ht.Edge) {
43
+ var isBreak = element.a("linkbreak");
44
+
45
+ if (isNotMonite || isBreak) {
46
+ element.s("flow", false);
47
+ }
44
48
  }
45
49
  });
46
50
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "13.0.4",
3
+ "version": "13.0.6",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -123,6 +123,6 @@
123
123
  "access": "public"
124
124
  },
125
125
  "license": "MIT",
126
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.4/build/index.html",
126
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.6/build/index.html",
127
127
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
128
128
  }