@riil-frontend/component-topology 2.15.50 → 2.15.53

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 (11) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +31 -31
  3. package/es/components/ResourceSelectDrawer/ResourceSelectList.js +1 -0
  4. package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +6 -6
  5. package/es/core/models/TopoApp.js +1 -1
  6. package/es/models/topoAlarm.js +14 -6
  7. package/lib/components/ResourceSelectDrawer/ResourceSelectList.js +1 -0
  8. package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +6 -6
  9. package/lib/core/models/TopoApp.js +1 -1
  10. package/lib/models/topoAlarm.js +14 -6
  11. package/package.json +2 -2
package/es/components/ResourceSelectDrawer/ResourceSelectList.js CHANGED
@@ -20,6 +20,7 @@ function ResourceSelectList(props, ref) {
20
20
 
21
21
  return /*#__PURE__*/React.createElement(CommonResList, {
22
22
  ref: ref,
23
+ innerTreeFilters: ['monitorable', 'discoverable'],
23
24
  limitTypes: limitTypes || RESOURCE_LIMIT_TYPES,
24
25
  defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
25
26
  request: getRequest(),
package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js CHANGED
@@ -44,23 +44,23 @@ export default (function (props) {
44
44
 
45
45
  var save = /*#__PURE__*/function () {
46
46
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
47
- var values, displayConfig, displayConfigDispatchers;
47
+ var values, prevDisplayConfig, displayConfig, displayConfigDispatchers;
48
48
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
49
49
  while (1) {
50
50
  switch (_context2.prev = _context2.next) {
51
51
  case 0:
52
52
  values = settingRef.current.getValues();
53
53
  console.info('保存显示配置', values); // 保存配置
54
- // const prevDisplayConfig = topo.store.getModelState('displayConfig');
55
54
 
56
- displayConfig = _extends({}, values);
57
- _context2.next = 5;
55
+ prevDisplayConfig = topo.store.getModelState('displayConfig');
56
+ displayConfig = _extends({}, prevDisplayConfig, values);
57
+ _context2.next = 6;
58
58
  return topoService.saveTopoSettings(topo.id, {
59
59
  // alarmSwitch: true,
60
60
  extraConfig: JSON.stringify(_extends({}, displayConfig))
61
61
  });
62
62
 
63
- case 5:
63
+ case 6:
64
64
  // 刷新指标配置
65
65
  displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
66
66
  displayConfigDispatchers.update(displayConfig); // 按配置执行
@@ -68,7 +68,7 @@ export default (function (props) {
68
68
  executeByConfig(displayConfig);
69
69
  (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.onDisplaySettingDrawerOk) && viewerProps.onDisplaySettingDrawerOk();
70
70
 
71
- case 9:
71
+ case 10:
72
72
  case "end":
73
73
  return _context2.stop();
74
74
  }
package/es/core/models/TopoApp.js CHANGED
@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
20
20
  import PluginManager from "./PluginManager";
21
21
  import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
22
22
 
23
- var version = typeof "2.15.50" === 'string' ? "2.15.50" : null;
23
+ var version = typeof "2.15.53" === 'string' ? "2.15.53" : null;
24
24
  console.info("\u62D3\u6251\u7248\u672C: " + version);
25
25
  /**
26
26
  * 拓扑显示和编辑
package/es/models/topoAlarm.js CHANGED
@@ -11,7 +11,7 @@ import { getCiMeta } from "@riil-frontend/component-topology-common/es/services/
11
11
  import rlog from "@riil-frontend/component-topology-utils/es/rlog";
12
12
  import _ from "lodash";
13
13
  import { findItem, findItemIndex, sortList } from "../utils/topoData";
14
- var showAlarmStatus = ["toDeal", "dealing"];
14
+ var showAlarmStatus = ["toDeal", "dealing", "change"];
15
15
  export default {
16
16
  // 定义 model 的初始 state
17
17
  state: {
@@ -127,13 +127,21 @@ export default {
127
127
  // );
128
128
 
129
129
  if (showAlarmStatus.indexOf(item.status) >= 0) {
130
- if (doc[rid][sliceTag].level !== item.level) {
131
- var _newArr = [].concat(doc[rid]);
130
+ if (item.status === "change") {
131
+ var old = doc[rid][sliceTag];
132
132
 
133
- _newArr.splice(sliceTag, 1, item);
133
+ if (old.level !== item.level) {
134
+ var _newArr = [].concat(doc[rid]);
134
135
 
135
- doc[rid] = _newArr.sort(sortList);
136
- rlog.debug("告警变更", doc[rid], item);
136
+ _newArr.splice(sliceTag, 1, _extends({}, item, {
137
+ status: old.status
138
+ }));
139
+
140
+ doc[rid] = _newArr.sort(sortList);
141
+ rlog.debug("告警级别变更", doc[rid], item);
142
+ } else {
143
+ rlog.debug("接收到异常的重复告警", item);
144
+ }
137
145
  } else {// rlog.debug("重复告警", item);
138
146
  }
139
147
  } else {
package/lib/components/ResourceSelectDrawer/ResourceSelectList.js CHANGED
@@ -34,6 +34,7 @@ function ResourceSelectList(props, ref) {
34
34
  });
35
35
  return /*#__PURE__*/_react["default"].createElement(_componentCommonResList["default"], {
36
36
  ref: ref,
37
+ innerTreeFilters: ['monitorable', 'discoverable'],
37
38
  limitTypes: limitTypes || _ResourceTypeLimit.RESOURCE_LIMIT_TYPES,
38
39
  defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
39
40
  request: (0, _componentTopologyCommon.getRequest)(),
package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js CHANGED
@@ -55,23 +55,23 @@ var _default = function _default(props) {
55
55
 
56
56
  var save = /*#__PURE__*/function () {
57
57
  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
58
- var values, displayConfig, displayConfigDispatchers;
58
+ var values, prevDisplayConfig, displayConfig, displayConfigDispatchers;
59
59
  return _regenerator["default"].wrap(function _callee2$(_context2) {
60
60
  while (1) {
61
61
  switch (_context2.prev = _context2.next) {
62
62
  case 0:
63
63
  values = settingRef.current.getValues();
64
64
  console.info('保存显示配置', values); // 保存配置
65
- // const prevDisplayConfig = topo.store.getModelState('displayConfig');
66
65
 
67
- displayConfig = (0, _extends2["default"])({}, values);
68
- _context2.next = 5;
66
+ prevDisplayConfig = topo.store.getModelState('displayConfig');
67
+ displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
68
+ _context2.next = 6;
69
69
  return _topo["default"].saveTopoSettings(topo.id, {
70
70
  // alarmSwitch: true,
71
71
  extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
72
72
  });
73
73
 
74
- case 5:
74
+ case 6:
75
75
  // 刷新指标配置
76
76
  displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
77
77
  displayConfigDispatchers.update(displayConfig); // 按配置执行
@@ -79,7 +79,7 @@ var _default = function _default(props) {
79
79
  executeByConfig(displayConfig);
80
80
  (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.onDisplaySettingDrawerOk) && viewerProps.onDisplaySettingDrawerOk();
81
81
 
82
- case 9:
82
+ case 10:
83
83
  case "end":
84
84
  return _context2.stop();
85
85
  }
package/lib/core/models/TopoApp.js CHANGED
@@ -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.50" === 'string' ? "2.15.50" : null;
51
+ var version = typeof "2.15.53" === 'string' ? "2.15.53" : null;
52
52
  console.info("\u62D3\u6251\u7248\u672C: " + version);
53
53
  /**
54
54
  * 拓扑显示和编辑
package/lib/models/topoAlarm.js CHANGED
@@ -26,7 +26,7 @@ var _topoData = require("../utils/topoData");
26
26
  /**
27
27
  * 告警
28
28
  */
29
- var showAlarmStatus = ["toDeal", "dealing"];
29
+ var showAlarmStatus = ["toDeal", "dealing", "change"];
30
30
  var _default = {
31
31
  // 定义 model 的初始 state
32
32
  state: {
@@ -141,14 +141,22 @@ var _default = {
141
141
  // );
142
142
 
143
143
  if (showAlarmStatus.indexOf(item.status) >= 0) {
144
- if (doc[rid][sliceTag].level !== item.level) {
145
- var _newArr = [].concat(doc[rid]);
144
+ if (item.status === "change") {
145
+ var old = doc[rid][sliceTag];
146
146
 
147
- _newArr.splice(sliceTag, 1, item);
147
+ if (old.level !== item.level) {
148
+ var _newArr = [].concat(doc[rid]);
148
149
 
149
- doc[rid] = _newArr.sort(_topoData.sortList);
150
+ _newArr.splice(sliceTag, 1, (0, _extends2["default"])({}, item, {
151
+ status: old.status
152
+ }));
150
153
 
151
- _rlog["default"].debug("告警变更", doc[rid], item);
154
+ doc[rid] = _newArr.sort(_topoData.sortList);
155
+
156
+ _rlog["default"].debug("告警级别变更", doc[rid], item);
157
+ } else {
158
+ _rlog["default"].debug("接收到异常的重复告警", item);
159
+ }
152
160
  } else {// rlog.debug("重复告警", item);
153
161
  }
154
162
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "2.15.50",
3
+ "version": "2.15.53",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -110,6 +110,6 @@
110
110
  "access": "public"
111
111
  },
112
112
  "license": "MIT",
113
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.50/build/index.html",
113
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.53/build/index.html",
114
114
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
115
115
  }