@riil-frontend/component-topology 2.14.2-alpha.2 → 2.14.2-alpha.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 (84) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +1 -1
  4. package/build/index.js +22 -22
  5. package/demo/1/345/237/272/346/234/254//350/207/252/345/256/232/344/271/211/345/261/236/346/200/247/345/222/214/346/214/207/346/240/207.md +1 -1
  6. package/demo/API//346/250/241/345/236/213.md +29 -0
  7. package/es/components/BatchAttrMetric/constant.js +4 -0
  8. package/es/components/BatchAttrMetric/index.js +8 -10
  9. package/es/components/BatchAttrMetric/setting.js +6 -4
  10. package/es/components/BatchAttrMetric/utils.js +39 -32
  11. package/es/constants/ResourceTypeLimit.js +1 -1
  12. package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +6 -5
  13. package/es/core/components/DisplaySettingDrawer/LinkTag.js +8 -6
  14. package/es/core/components/DisplaySettingDrawer/LinkTip.js +9 -7
  15. package/es/core/components/DisplaySettingDrawer/NodeTag.js +2 -0
  16. package/es/core/components/DisplaySettingDrawer/NodeTip.js +2 -0
  17. package/es/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js +30 -9
  18. package/es/core/components/ResourceViewAttributeSetting/Setting.js +123 -0
  19. package/es/core/editor/components/EditorPlugin.js +4 -3
  20. package/es/core/editor/components/settings/propertyViews/view/GlobalTootipSetting.js +3 -1
  21. package/es/core/editor/components/settings/propertyViews/view/ViewPropertyView.js +0 -5
  22. package/es/core/models/AttributeMetricDisplay.js +181 -66
  23. package/es/core/models/TopoApp.js +18 -16
  24. package/es/core/models/attributeFormatter/index.js +33 -8
  25. package/es/core/models/common/Alarm.js +45 -31
  26. package/es/core/models/utils/linkUtils.js +14 -2
  27. package/es/core/utils/exportData.js +33 -0
  28. package/es/core/utils/linkPollingAttributesAdapter.js +3 -0
  29. package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +264 -0
  30. package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.module.scss +73 -0
  31. package/es/core/viewer/components/plugins/BaseInfo/index.js +127 -0
  32. package/es/core/viewer/components/plugins/BaseInfo/index.module.scss +24 -0
  33. package/es/core/viewer/components/plugins/ViewerPlugin.js +2 -1
  34. package/es/core/viewer/components/titlebar/widgets/MoreButtonMenu.js +5 -0
  35. package/es/getStoreModels.js +3 -1
  36. package/es/hooks/useAlarm.js +1 -1
  37. package/es/hooks/usePolling.js +2 -1
  38. package/es/models/topoAlarm.js +43 -17
  39. package/es/models/topoBaseInfoOverview.js +43 -0
  40. package/es/models/topoBizMod.js +0 -70
  41. package/es/style.js +8 -7
  42. package/es/utils/topoData.js +266 -155
  43. package/lib/components/BatchAttrMetric/constant.js +4 -0
  44. package/lib/components/BatchAttrMetric/index.js +8 -10
  45. package/lib/components/BatchAttrMetric/setting.js +8 -5
  46. package/lib/components/BatchAttrMetric/utils.js +39 -35
  47. package/lib/constants/ResourceTypeLimit.js +1 -1
  48. package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +6 -5
  49. package/lib/core/components/DisplaySettingDrawer/LinkTag.js +8 -6
  50. package/lib/core/components/DisplaySettingDrawer/LinkTip.js +9 -7
  51. package/lib/core/components/DisplaySettingDrawer/NodeTag.js +2 -0
  52. package/lib/core/components/DisplaySettingDrawer/NodeTip.js +2 -0
  53. package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js +32 -8
  54. package/lib/core/{editor/components → components}/ResourceViewAttributeSetting/Setting.js +77 -71
  55. package/lib/core/editor/components/EditorPlugin.js +3 -3
  56. package/lib/core/editor/components/settings/propertyViews/view/GlobalTootipSetting.js +3 -1
  57. package/lib/core/editor/components/settings/propertyViews/view/ViewPropertyView.js +0 -5
  58. package/lib/core/models/AttributeMetricDisplay.js +181 -66
  59. package/lib/core/models/TopoApp.js +18 -17
  60. package/lib/core/models/attributeFormatter/index.js +34 -8
  61. package/lib/core/models/common/Alarm.js +46 -33
  62. package/lib/core/models/utils/linkUtils.js +12 -2
  63. package/lib/core/utils/exportData.js +44 -0
  64. package/lib/core/utils/linkPollingAttributesAdapter.js +10 -0
  65. package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +284 -0
  66. package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.module.scss +73 -0
  67. package/lib/core/viewer/components/plugins/BaseInfo/index.js +146 -0
  68. package/lib/core/viewer/components/plugins/BaseInfo/index.module.scss +24 -0
  69. package/lib/core/viewer/components/plugins/ViewerPlugin.js +3 -1
  70. package/lib/core/viewer/components/titlebar/widgets/MoreButtonMenu.js +6 -0
  71. package/lib/getStoreModels.js +4 -1
  72. package/lib/hooks/useAlarm.js +1 -1
  73. package/lib/hooks/usePolling.js +2 -1
  74. package/lib/models/topoAlarm.js +43 -17
  75. package/lib/models/topoBaseInfoOverview.js +55 -0
  76. package/lib/models/topoBizMod.js +0 -70
  77. package/lib/style.js +8 -7
  78. package/lib/utils/topoData.js +267 -151
  79. package/package.json +2 -2
  80. package/es/core/editor/components/ResourceViewAttributeSetting/ResourceViewAttributeSettingPlugin.js +0 -57
  81. package/es/core/editor/components/ResourceViewAttributeSetting/Setting.js +0 -114
  82. package/es/core/models/attrAndMetric.js +0 -131
  83. package/lib/core/editor/components/ResourceViewAttributeSetting/ResourceViewAttributeSettingPlugin.js +0 -73
  84. package/lib/core/models/attrAndMetric.js +0 -148
@@ -44,14 +44,14 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
44
44
  setFalse = _useBoolean$.setFalse; // 选择类型,single/batch
45
45
 
46
46
 
47
- var _useState = (0, _react.useState)(),
47
+ var _useState = (0, _react.useState)('batch'),
48
48
  selectType = _useState[0],
49
49
  setSelectType = _useState[1]; // 数据类型,tip/tag
50
50
 
51
51
 
52
52
  var _useState2 = (0, _react.useState)(),
53
- dataType = _useState2[0],
54
- setDataType = _useState2[1];
53
+ showType = _useState2[0],
54
+ setShowType = _useState2[1];
55
55
 
56
56
  (0, _react.useImperativeHandle)(ref, function () {
57
57
  return {
@@ -66,13 +66,13 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
66
66
  entryConfig = {};
67
67
  }
68
68
 
69
- setSelectType(entryConfig.selectType);
70
- setDataType(entryConfig.dataType);
69
+ // setSelectType(entryConfig.selectType);
70
+ setShowType(entryConfig.showType);
71
71
  setTrue();
72
72
  }
73
73
  };
74
74
  });
75
- var config = (0, _extends2["default"])({}, _constant.SELECT_TYPE[selectType], _constant.DATA_TYPE[dataType]);
75
+ var config = (0, _extends2["default"])({}, _constant.SELECT_TYPE[selectType], _constant.DATA_TYPE[showType]);
76
76
  var drawerTitle = config.drawerTitle,
77
77
  drawerWidth = config.drawerWidth,
78
78
  pageConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded2);
@@ -84,18 +84,16 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
84
84
  className: _indexModule["default"].drawer,
85
85
  width: drawerWidth
86
86
  }, /*#__PURE__*/_react["default"].createElement(_setting["default"], (0, _extends2["default"])({}, pageConfig, props, {
87
- dataType: dataType,
87
+ dataType: showType,
88
88
  cancelCb: setFalse,
89
89
  saveCb: function saveCb(values) {
90
90
  setFalse();
91
91
 
92
- _saveCb(dataType, values, selectType);
92
+ _saveCb(showType, values, selectType);
93
93
  }
94
94
  })));
95
95
  });
96
96
  BatchAttrMetricDrawer.propTypes = {
97
- // 默认选择项,用于执行重置
98
- defaultSet: _propTypes["default"].any.isRequired,
99
97
  // 数据项
100
98
  allCiSet: _propTypes["default"].any.isRequired,
101
99
  // 保存回调
@@ -45,9 +45,9 @@ var Setting = function Setting(_ref) {
45
45
  var defaultSet = _ref.defaultSet,
46
46
  dataType = _ref.dataType,
47
47
  props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
48
- var allCiSet = utils.dsTransform(props.allCiSet);
49
-
50
- _rlog["default"].debug('Setting-allCiSet', allCiSet);
48
+ // const allCiSet = utils.dsTransform(props.allCiSet);
49
+ var allCiSet = props.allCiSet,
50
+ limit = props.limit; // rlog.debug('Setting-allCiSet',props, allCiSet);
51
51
 
52
52
  var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
53
53
  ciType = _useState[0],
@@ -74,6 +74,9 @@ var Setting = function Setting(_ref) {
74
74
 
75
75
  var onTableSelect = function onTableSelect(selectedKeys) {
76
76
  var values = (0, _extends2["default"])({}, selected);
77
+
78
+ _rlog["default"].debug('Setting-allCiSet-onTableSelect', limit, selectedKeys, selected);
79
+
77
80
  values[ciType] = selectedKeys;
78
81
  setSelected(values);
79
82
  };
@@ -89,7 +92,7 @@ var Setting = function Setting(_ref) {
89
92
  className: _indexModule["default"].message
90
93
  }, /*#__PURE__*/_react["default"].createElement(_message["default"], {
91
94
  type: "notice"
92
- }, props.message)), /*#__PURE__*/_react["default"].createElement(_grid["default"].Row, {
95
+ }, props.label + "\u6570\u636E\uFF1A\u9009\u62E9\u7684\u6307\u6807\u548C\u5C5E\u6027\u5C06\u4F1A\u663E\u793A\u5728" + props.poslabel + "\uFF0C\u6700\u591A\u652F\u6301\u52FE\u9009 " + limit + " \u9879\u3002")), /*#__PURE__*/_react["default"].createElement(_grid["default"].Row, {
93
96
  className: _indexModule["default"].content
94
97
  }, props.showTree && /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
95
98
  span: 8,
@@ -117,7 +120,7 @@ var Setting = function Setting(_ref) {
117
120
  getProps: function getProps(_ref3) {
118
121
  var id = _ref3.id;
119
122
  return {
120
- disabled: !selectedRowKeys.includes(id) && selectedRowKeys.length >= props.maxSelect
123
+ disabled: !selectedRowKeys.includes(id) && selectedRowKeys.length >= limit
121
124
  };
122
125
  }
123
126
  }
@@ -5,10 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.treeDs = exports.saveTransform = exports.initSelected = exports.dsTransform = exports.defaultSelected = exports.columns = void 0;
7
7
 
8
- var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
9
-
10
- var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
11
-
12
8
  var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
13
9
 
14
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -134,11 +130,16 @@ var initSelected = function initSelected(allCiSet, dataType) {
134
130
  exports.initSelected = initSelected;
135
131
 
136
132
  var defaultSelected = function defaultSelected(allCiSet, defaultSet, dataType) {
133
+ if (defaultSet === void 0) {
134
+ defaultSet = {};
135
+ }
136
+
137
137
  var values = {};
138
138
  Object.keys(allCiSet).forEach(function (key) {
139
139
  var ciTypeSelected = defaultSet[key] || defaultSet[allCiSet[key].code]; // 没有ci类型对应的默认配置 -> 使用通用的配置项
140
+ // const selected = (ciTypeSelected || defaultSet['common'])[dataType] || [];
140
141
 
141
- var selected = (ciTypeSelected || defaultSet['common'])[dataType] || [];
142
+ var selected = [];
142
143
  var selectedIds = selected.map(function (item) {
143
144
  return toId(item);
144
145
  });
@@ -173,9 +174,9 @@ var typeCell = function typeCell(text) {
173
174
 
174
175
 
175
176
  var columns = function columns(dataType, showCiNum) {
176
- var dataTypeUp = "" + dataType[0].toUpperCase() + dataType.slice(1);
177
- var ciNumKey = "ci" + dataTypeUp + "Num";
178
- var ciArrKey = "ci" + dataTypeUp + "Arr";
177
+ // const dataTypeUp = `${dataType[0].toUpperCase()}${dataType.slice(1)}`;
178
+ // const ciNumKey = `ci${dataTypeUp}Num`;
179
+ // const ciArrKey = `ci${dataTypeUp}Arr`;
179
180
  var values = [{
180
181
  width: '100%',
181
182
  dataIndex: 'name',
@@ -183,30 +184,33 @@ var columns = function columns(dataType, showCiNum) {
183
184
  cellOption: {
184
185
  nowrap: true
185
186
  }
186
- }, {
187
- width: '50%',
188
- dataIndex: ciNumKey,
189
- title: '匹配资源',
190
- cell: function cell(text, index, record) {
191
- var trigger = /*#__PURE__*/_react["default"].createElement(_button["default"], {
192
- text: true,
193
- type: "primary"
194
- }, text || 0);
195
-
196
- return /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
197
- needAdjust: true,
198
- trigger: trigger,
199
- closable: false,
200
- triggerType: text ? 'hover' : []
201
- }, /*#__PURE__*/_react["default"].createElement("div", {
202
- className: _indexModule["default"]['tip-content']
203
- }, record[ciArrKey].map(function (ci, i) {
204
- return /*#__PURE__*/_react["default"].createElement("div", {
205
- key: i
206
- }, ci);
207
- })));
208
- }
209
- }, {
187
+ }, // {
188
+ // width: '50%',
189
+ // dataIndex: ciNumKey,
190
+ // title: '匹配资源',
191
+ // cell: (text, index, record) => {
192
+ // const trigger = (
193
+ // <Button text type="primary">
194
+ // {text || 0}
195
+ // </Button>
196
+ // );
197
+ // return (
198
+ // <Balloon
199
+ // needAdjust
200
+ // trigger={trigger}
201
+ // closable={false}
202
+ // triggerType={text ? 'hover' : []}
203
+ // >
204
+ // <div className={styles['tip-content']}>
205
+ // {record[ciArrKey].map((ci, i) => (
206
+ // <div key={i}>{ci}</div>
207
+ // ))}
208
+ // </div>
209
+ // </Balloon>
210
+ // );
211
+ // },
212
+ // },
213
+ {
210
214
  width: '70px',
211
215
  dataIndex: 'type',
212
216
  title: '类型',
@@ -217,9 +221,9 @@ var columns = function columns(dataType, showCiNum) {
217
221
  }
218
222
  }
219
223
  }];
220
- return showCiNum ? values : values.filter(function (item) {
221
- return item.dataIndex !== ciNumKey;
222
- });
224
+ return values; // return showCiNum
225
+ // ? values
226
+ // : values.filter((item) => item.dataIndex !== ciNumKey);
223
227
  };
224
228
 
225
229
  exports.columns = columns;
@@ -4,7 +4,7 @@ exports.__esModule = true;
4
4
  exports.RESOURCE_LIMIT_TYPES = void 0;
5
5
  // 拓扑中心资源类型限制
6
6
  var RESOURCE_LIMIT_TYPES = [// 网络设备
7
- 'common_network', 'switch', 'switch_cluster', // 操作系统
7
+ 'common_network', 'switch', 'switch_cluster', 'router', // 操作系统
8
8
  'linux', 'windows', // 数据库
9
9
  'oracle', 'asm_disk_group', 'oracle_rac', // 中间件
10
10
  'tomcat', // 业务
@@ -62,28 +62,29 @@ function DisplaySettingDrawer(props) {
62
62
  // 刷新指标配置
63
63
  displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
64
64
  displayConfigDispatchers.update(displayConfig);
65
+ topo.attributeMetricDisplay.updateNodesNameVisible();
65
66
  setLoading(false);
66
67
  onClose();
67
68
 
68
69
  _message["default"].success('保存成功');
69
70
 
70
- _context.next = 19;
71
+ _context.next = 20;
71
72
  break;
72
73
 
73
- case 14:
74
- _context.prev = 14;
74
+ case 15:
75
+ _context.prev = 15;
75
76
  _context.t0 = _context["catch"](1);
76
77
  setLoading(false);
77
78
  console.error('DisplaySettingDrawer.handleOk', _context.t0);
78
79
 
79
80
  _message["default"].success('保存失败');
80
81
 
81
- case 19:
82
+ case 20:
82
83
  case "end":
83
84
  return _context.stop();
84
85
  }
85
86
  }
86
- }, _callee, null, [[1, 14]]);
87
+ }, _callee, null, [[1, 15]]);
87
88
  }));
88
89
 
89
90
  return function handleOk() {
@@ -15,22 +15,22 @@ var _BasicConfig = _interopRequireDefault(require("./ResourceDisplay/BasicConfig
15
15
 
16
16
  // 默认中可配置内容包括总速率、带宽利用率、发送速率、发送带宽利用率、接收速率、接收带宽利用率
17
17
  var CommonOptions = [{
18
- value: 'metric:agg_link.total_flow_rate',
18
+ value: 'metric:total_flow_rate',
19
19
  label: '总流速'
20
20
  }, {
21
- value: 'metric:agg_link.bandwidth_utilization',
21
+ value: 'metric:bandwidth_utilization',
22
22
  label: '带宽利用率'
23
23
  }, {
24
- value: 'metric:agg_link.out_rate',
24
+ value: 'metric:out_rate',
25
25
  label: '发送速率'
26
26
  }, {
27
- value: 'metric:agg_link.out_bandwidth_utilization',
27
+ value: 'metric:out_bandwidth_utilization',
28
28
  label: '发送带宽利用率'
29
29
  }, {
30
- value: 'metric:physical_link.in_rate',
30
+ value: 'metric:in_rate',
31
31
  label: '接收速率'
32
32
  }, {
33
- value: 'metric:agg_link.in_bandwidth_utilization',
33
+ value: 'metric:in_bandwidth_utilization',
34
34
  label: '接收带宽利用率'
35
35
  }];
36
36
  /**
@@ -44,6 +44,8 @@ function LinkTag(props, ref) {
44
44
  ref: ref
45
45
  }, props, {
46
46
  limit: 2,
47
+ elementType: "link",
48
+ showType: "tag",
47
49
  commonOptions: CommonOptions,
48
50
  defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TAG_COMMON_CONFIG
49
51
  }));
@@ -15,16 +15,16 @@ var _BasicConfig = _interopRequireDefault(require("./ResourceDisplay/BasicConfig
15
15
 
16
16
  // 源端口、目的端口、总流量、带宽利用率
17
17
  var CommonOptions = [{
18
- value: 'attribute:network_link.source_location',
19
- label: '源端口'
18
+ value: 'attribute:source_id',
19
+ label: '源端编号'
20
20
  }, {
21
- value: 'attribute:network_link.destination_Location',
22
- label: '目的端口'
21
+ value: 'attribute:destination_id',
22
+ label: '目的端编号'
23
23
  }, {
24
- value: 'metric:name',
25
- label: '总流量'
24
+ value: 'metric:total_flow_rate',
25
+ label: '总流速'
26
26
  }, {
27
- value: 'metric:name1',
27
+ value: 'metric:bandwidth_utilization',
28
28
  label: '带宽利用率'
29
29
  }];
30
30
  /**
@@ -38,6 +38,8 @@ function LinkTip(props, ref) {
38
38
  ref: ref
39
39
  }, props, {
40
40
  limit: 4,
41
+ elementType: "link",
42
+ showType: "tip",
41
43
  commonOptions: CommonOptions,
42
44
  defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG
43
45
  }));
@@ -34,6 +34,8 @@ function NodeTag(props, ref) {
34
34
  ref: ref
35
35
  }, props, {
36
36
  limit: 3,
37
+ elementType: "node",
38
+ showType: "tag",
37
39
  commonOptions: CommonOptions,
38
40
  defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_NODE_TAG_COMMON_CONFIG,
39
41
  type: "node"
@@ -34,6 +34,8 @@ function NodeTip(props, ref) {
34
34
  ref: ref
35
35
  }, props, {
36
36
  limit: 4,
37
+ elementType: "node",
38
+ showType: "tip",
37
39
  commonOptions: CommonOptions,
38
40
  defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG
39
41
  }));
@@ -19,6 +19,10 @@ var _ResourceInfoDisplay = require("../../../../constants/ResourceInfoDisplay");
19
19
 
20
20
  var _CommonCheckboxGroup = _interopRequireDefault(require("./CommonCheckboxGroup"));
21
21
 
22
+ var _Setting = _interopRequireDefault(require("../../ResourceViewAttributeSetting/Setting"));
23
+
24
+ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
25
+
22
26
  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
27
 
24
28
  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; }
@@ -27,8 +31,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
27
31
  * 配置类型
28
32
  */
29
33
  var ConfigType = {
30
- DEFAULT: '0',
31
- CUSTOM: '1'
34
+ DEFAULT: "0",
35
+ CUSTOM: "1"
32
36
  };
33
37
 
34
38
  function BasicConfig(props, ref) {
@@ -47,7 +51,13 @@ function BasicConfig(props, ref) {
47
51
 
48
52
  (0, _react.useImperativeHandle)(ref, function () {
49
53
  return {};
50
- }); // 切换类型
54
+ });
55
+ var tooltipSettingRef = (0, _react.useRef)(); // 打开指标抽屉
56
+
57
+ var openSetting = function openSetting() {
58
+ tooltipSettingRef.current.openGlobalTootipSetting();
59
+ }; // 切换类型
60
+
51
61
 
52
62
  var handleTypeChange = function handleTypeChange(type) {
53
63
  var newIsCustom = type === ConfigType.CUSTOM;
@@ -56,12 +66,20 @@ function BasicConfig(props, ref) {
56
66
  };
57
67
 
58
68
  var handleCommonCheckboxGroupChange = function handleCommonCheckboxGroupChange(selected) {
69
+ _rlog["default"].debug("handleCommonCheckboxGroupChange", selected);
70
+
59
71
  onChange({
60
72
  isCustom: isCustom,
61
73
  data: selected
62
74
  });
63
75
  };
64
76
 
77
+ var handleCustomChange = function handleCustomChange(parm) {
78
+ _rlog["default"].debug("handleCustomChange", parm);
79
+
80
+ onChange(parm);
81
+ };
82
+
65
83
  return /*#__PURE__*/_react["default"].createElement(_box["default"], {
66
84
  spacing: 8,
67
85
  direction: "column"
@@ -76,10 +94,18 @@ function BasicConfig(props, ref) {
76
94
  value: ConfigType.DEFAULT
77
95
  }, "\u9ED8\u8BA4"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
78
96
  value: ConfigType.CUSTOM
79
- }, "\u81EA\u5B9A\u4E49"))), isCustom && /*#__PURE__*/_react["default"].createElement(_button["default"], {
97
+ }, "\u81EA\u5B9A\u4E49"))), isCustom && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
80
98
  type: "primary",
81
- text: true
82
- }, "\u9009\u62E9\u56FE\u6570\u636E")), !isCustom && /*#__PURE__*/_react["default"].createElement(_CommonCheckboxGroup["default"], {
99
+ text: true,
100
+ onClick: openSetting
101
+ }, showType === 'tag' ? '选择图数据' : '选择Tooltip数据'), /*#__PURE__*/_react["default"].createElement(_Setting["default"], {
102
+ ref: tooltipSettingRef,
103
+ topo: topo,
104
+ limit: limit,
105
+ elementType: elementType,
106
+ showType: showType,
107
+ onChange: handleCustomChange
108
+ }))), !isCustom && /*#__PURE__*/_react["default"].createElement(_CommonCheckboxGroup["default"], {
83
109
  value: data,
84
110
  dataSource: commonOptions,
85
111
  limit: limit,
@@ -87,8 +113,6 @@ function BasicConfig(props, ref) {
87
113
  }));
88
114
  }
89
115
 
90
- ;
91
-
92
116
  var _default = /*#__PURE__*/_react["default"].forwardRef(BasicConfig);
93
117
 
94
118
  exports["default"] = _default;
@@ -5,17 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = void 0;
7
7
 
8
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
-
10
8
  var _react = _interopRequireWildcard(require("react"));
11
9
 
12
10
  var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
13
11
 
14
12
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
15
13
 
16
- var _BatchAttrMetric = _interopRequireDefault(require("../../../../components/BatchAttrMetric"));
14
+ var _BatchAttrMetric = _interopRequireDefault(require("../../../components/BatchAttrMetric"));
17
15
 
18
- var _topoData = require("../../../../utils/topoData");
16
+ var _topoData = require("../../../utils/topoData");
19
17
 
20
18
  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); }
21
19
 
@@ -25,108 +23,116 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
25
23
  * 资源显示属性、指标配置
26
24
  */
27
25
  var ResourceDiplayInfoSetting = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
28
- var topo = props.topo;
26
+ var topo = props.topo,
27
+ elementType = props.elementType,
28
+ showType = props.showType,
29
+ limit = props.limit,
30
+ onChange = props.onChange;
29
31
  var batchAttrMetric = (0, _react.useRef)();
30
32
 
31
33
  var _useState = (0, _react.useState)({}),
32
34
  markData = _useState[0],
33
35
  setMarkarkData = _useState[1];
34
36
 
35
- var _topo$store$useModel = topo.store.useModel('topoBizMod'),
37
+ var _topo$store$useModel = topo.store.useModel("topoBizMod"),
36
38
  bizState = _topo$store$useModel[0],
37
39
  bizDispatchers = _topo$store$useModel[1]; // rlog.debug('TopoView---income', topoId, viewState);
38
40
 
39
41
 
40
- var defaultSet = bizState.defaultSet,
41
- allCiSet = bizState.allCiSet,
42
+ var allCiSet = bizState.allCiSet,
42
43
  ciSetDoc = bizState.ciSetDoc,
43
- setConfig = bizState.setConfig;
44
+ setConfig = bizState.setConfig,
45
+ resAndMetrics = bizState.resAndMetrics;
46
+ var allCiModSet = resAndMetrics.allCiModSet,
47
+ allLinkModSet = resAndMetrics.allLinkModSet;
44
48
 
45
49
  var openMarkSetting = function openMarkSetting(parm) {
46
- _rlog["default"].debug('openMarkSetting', parm, allCiSet, ciSetDoc, setConfig);
47
-
48
- if (parm.selectType === 'batch') {
49
- setMarkarkData(setConfig !== null && setConfig !== void 0 ? setConfig : allCiSet);
50
- } else {
51
- var setObj = {};
52
-
53
- if (ciSetDoc !== null && ciSetDoc !== void 0 && ciSetDoc.hasOwnProperty(parm.ciId)) {
54
- setObj[parm.ciId] = (0, _extends2["default"])({}, ciSetDoc[parm.ciId], {
55
- tag: ((ciSetDoc[parm.ciId] || {}).tag || []).map(function (t) {
56
- // return t.split('-')[0];
57
- return t.code;
58
- }),
59
- tip: ((ciSetDoc[parm.ciId] || {}).tip || []).map(function (t) {
60
- return t.code;
61
- })
62
- });
63
- } else {
64
- setObj[parm.ciId] = {
65
- code: '',
66
- list: [],
67
- tag: [],
68
- tip: []
69
- };
70
- }
71
-
72
- _rlog["default"].debug('setMarkarkData', setObj);
73
-
74
- setMarkarkData(setObj);
75
- }
50
+ // rlog.debug('openMarkSetting', parm, allCiSet, ciSetDoc, setConfig,allCiModSet,allLinkModSet);
51
+ _rlog["default"].debug("openMarkSetting", parm, allCiSet, elementType, showType, allCiModSet, allLinkModSet);
52
+
53
+ setMarkarkData(elementType === "node" ? allCiModSet : allLinkModSet);
54
+ /**
55
+ * 已修改,目前只有批量设置
56
+ */
57
+ // if (parm.selectType === 'batch') {
58
+ // setMarkarkData(setConfig ?? allCiModSet);
59
+ // } else {
60
+ // const setObj = {};
61
+ // if (ciSetDoc?.hasOwnProperty(parm.ciId)) {
62
+ // setObj[parm.ciId] = {
63
+ // ...ciSetDoc[parm.ciId],
64
+ // tag: ((ciSetDoc[parm.ciId] || {}).tag || []).map((t) => {
65
+ // // return t.split('-')[0];
66
+ // return t.code;
67
+ // }),
68
+ // tip: ((ciSetDoc[parm.ciId] || {}).tip || []).map((t) => {
69
+ // return t.code;
70
+ // }),
71
+ // };
72
+ // } else {
73
+ // setObj[parm.ciId] = {
74
+ // code: '',
75
+ // list: [],
76
+ // tag: [],
77
+ // tip: [],
78
+ // };
79
+ // }
80
+ // rlog.debug('setMarkarkData', setObj);
81
+ // setMarkarkData(setObj);
82
+ // }
76
83
 
77
84
  batchAttrMetric.current.show({
78
- selectType: parm.selectType,
79
- dataType: parm.dataType
85
+ showType: showType
80
86
  });
81
87
  }; // 保存指标设置
82
88
 
83
89
 
84
90
  var saveMarkSetting = function saveMarkSetting(dataType, parm, selectType) {
85
- _rlog["default"].debug('saveMarkSetting', dataType, parm, allCiSet);
86
-
87
- var doc = ciSetDoc;
88
- var ciDoc = {};
89
- var allCiset = allCiSet;
90
-
91
- if (selectType === 'single') {
92
- var singleResult = (0, _topoData.updateCiDoc)(dataType, parm, doc, allCiSet);
93
- ciDoc = singleResult.cidoc;
94
- allCiset = singleResult.allciset;
95
- } else {
96
- var allResult = (0, _topoData.updateAllCiDoc)(dataType, parm, doc, allCiSet);
97
- ciDoc = allResult.cidoc;
98
- allCiset = allResult.allciset;
91
+ _rlog["default"].debug("saveMarkSetting", dataType, parm, allCiSet);
92
+
93
+ if (elementType === "node") {
94
+ onChange({
95
+ isCustom: true,
96
+ data: parm
97
+ });
99
98
  }
100
99
 
101
- _rlog["default"].debug('saveMarkSetting', {
102
- parm: parm,
103
- allCiSet: allCiSet,
104
- ciDoc: ciDoc,
105
- allCiset: allCiset
106
- });
100
+ if (elementType === "link") {
101
+ onChange({
102
+ isCustom: true,
103
+ data: parm
104
+ });
105
+ } // const doc = ciSetDoc;
106
+ // let ciDoc = {};
107
+ // let allCiset = allCiSet;
108
+ // if (selectType === 'single') {
109
+ // const singleResult = updateCiDoc(dataType, parm, doc, allCiSet);
110
+ // ciDoc = singleResult.cidoc;
111
+ // allCiset = singleResult.allciset;
112
+ // } else {
113
+ // const allResult = updateAllCiDoc(dataType, parm, doc, allCiSet);
114
+ // ciDoc = allResult.cidoc;
115
+ // allCiset = allResult.allciset;
116
+ // }
117
+ // rlog.debug('saveMarkSetting', {parm, allCiSet, ciDoc, allCiset});
118
+ // topo.view.topoClient.setTagAndTipConfig(ciDoc);
119
+ // bizDispatchers.update({ ciSetDoc: ciDoc, setConfig: allCiset });
107
120
 
108
- topo.view.topoClient.setTagAndTipConfig(ciDoc);
109
- bizDispatchers.update({
110
- ciSetDoc: ciDoc,
111
- setConfig: allCiset
112
- });
113
121
  };
114
122
 
115
123
  (0, _react.useImperativeHandle)(ref, function () {
116
124
  return {
117
125
  show: openMarkSetting,
118
126
  openGlobalTootipSetting: function openGlobalTootipSetting() {
119
- openMarkSetting({
120
- selectType: 'batch',
121
- dataType: 'tip'
122
- });
127
+ openMarkSetting();
123
128
  }
124
129
  };
125
130
  });
126
131
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_BatchAttrMetric["default"], {
127
132
  ref: batchAttrMetric,
128
- defaultSet: defaultSet,
129
133
  allCiSet: markData,
134
+ limit: limit,
135
+ showType: showType,
130
136
  saveCb: saveMarkSetting
131
137
  }));
132
138
  });