@riil-frontend/component-topology 6.0.0-alpha.62 → 6.0.0-alpha.64
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/index.js +1 -1
- package/es/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +1 -1
- package/es/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -3
- package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +7 -14
- package/es/core/editor/components/Toolbar/widgets/components/DropdownMenu.js +7 -3
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +1 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/box.js +11 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +10 -0
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js +15 -5
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/layerTitle.js +11 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +15 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/text.js +5 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +52 -27
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js +1 -0
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +15 -9
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +24 -19
- package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +1 -1
- package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -3
- package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +7 -15
- package/lib/core/editor/components/Toolbar/widgets/components/DropdownMenu.js +7 -3
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +1 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/box.js +13 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +12 -0
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js +17 -4
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/layerTitle.js +13 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +17 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/text.js +7 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +54 -27
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js +1 -0
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +15 -9
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +24 -19
- package/package.json +2 -2
@@ -6,7 +6,7 @@ import WidgetBox from "./WidgetBox";
|
|
6
6
|
function FontSizeSelect(props) {
|
7
7
|
var value = props.value,
|
8
8
|
disabled = props.disabled,
|
9
|
-
|
9
|
+
onChange = props.onChange;
|
10
10
|
var items = [9, 10, 11, 12, 14, 16, 18, 20, 24, 30, 36];
|
11
11
|
return /*#__PURE__*/React.createElement(DropdownMenu, {
|
12
12
|
value: "" + (value || ''),
|
@@ -18,8 +18,8 @@ function FontSizeSelect(props) {
|
|
18
18
|
}, val || 12);
|
19
19
|
},
|
20
20
|
disabled: disabled,
|
21
|
-
|
22
|
-
return
|
21
|
+
onSelect: function onSelect(val) {
|
22
|
+
return onChange(parseInt(val, 10));
|
23
23
|
}
|
24
24
|
}, items.map(function (item) {
|
25
25
|
return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
|
@@ -1,4 +1,3 @@
|
|
1
|
-
import _extends from "@babel/runtime/helpers/extends";
|
2
1
|
import React, { useState, useEffect } from 'react';
|
3
2
|
import { isText } from "../../../../../utils/htElementUtils";
|
4
3
|
import DropdownMenu from "./components/DropdownMenu";
|
@@ -24,16 +23,6 @@ function buildValue(obj) {
|
|
24
23
|
});
|
25
24
|
}
|
26
25
|
|
27
|
-
function formatStyle(arr) {
|
28
|
-
return items.map(function (item) {
|
29
|
-
return item.key;
|
30
|
-
}).reduce(function (map, name) {
|
31
|
-
var _extends2;
|
32
|
-
|
33
|
-
return _extends({}, map, (_extends2 = {}, _extends2[name] = arr.includes(name), _extends2));
|
34
|
-
}, {});
|
35
|
-
}
|
36
|
-
|
37
26
|
function FontStyleButton(props) {
|
38
27
|
var topo = props.topo,
|
39
28
|
showLabel = props.showLabel,
|
@@ -76,9 +65,13 @@ function FontStyleButton(props) {
|
|
76
65
|
* @param {Array} selectedKeys
|
77
66
|
*/
|
78
67
|
|
79
|
-
var
|
68
|
+
var handleSelect = function handleSelect(selectedKeys, item, extra) {
|
69
|
+
var _setStyle;
|
70
|
+
|
71
|
+
var key = extra.key,
|
72
|
+
select = extra.select;
|
80
73
|
topo.historyManager.beginTransaction();
|
81
|
-
setStyle(
|
74
|
+
setStyle((_setStyle = {}, _setStyle[key] = select, _setStyle));
|
82
75
|
topo.historyManager.endTransaction();
|
83
76
|
};
|
84
77
|
|
@@ -97,7 +90,7 @@ function FontStyleButton(props) {
|
|
97
90
|
},
|
98
91
|
multiple: true,
|
99
92
|
disabled: disabled,
|
100
|
-
|
93
|
+
onSelect: handleSelect
|
101
94
|
}, items.map(function (item) {
|
102
95
|
return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
|
103
96
|
key: item.key
|
@@ -7,15 +7,19 @@ function DropdownMenu(props) {
|
|
7
7
|
var value = props.value,
|
8
8
|
children = props.children,
|
9
9
|
multiple = props.multiple,
|
10
|
-
|
10
|
+
onSelect = props.onSelect,
|
11
11
|
valueRender = props.valueRender,
|
12
12
|
disabled = props.disabled;
|
13
13
|
var selectedKeys = Array.isArray(value) ? value : [value];
|
14
14
|
var valueDisplay = valueRender ? valueRender(value) : value;
|
15
15
|
var selectMode = multiple ? 'multiple' : 'single';
|
16
16
|
|
17
|
-
var handleChange = function handleChange(keys) {
|
18
|
-
|
17
|
+
var handleChange = function handleChange(keys, item, extra) {
|
18
|
+
var selected = multiple ? keys : keys[0];
|
19
|
+
|
20
|
+
if (onSelect) {
|
21
|
+
onSelect(selected, item, extra);
|
22
|
+
}
|
19
23
|
};
|
20
24
|
|
21
25
|
var menu = /*#__PURE__*/React.createElement(_Menu, {
|
@@ -25,7 +25,17 @@ export function setTextStyle(element, style, topo) {
|
|
25
25
|
element.a('rectFont', fontStr);
|
26
26
|
topo.getHtTopo().setRectangleText(element);
|
27
27
|
}
|
28
|
+
/**
|
29
|
+
*
|
30
|
+
* @param {*} element
|
31
|
+
* @returns {Array}
|
32
|
+
*/
|
33
|
+
|
34
|
+
export function getEnabledFields(element) {
|
35
|
+
return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
|
36
|
+
}
|
28
37
|
export default {
|
29
38
|
getTextStyle: getTextStyle,
|
30
|
-
setTextStyle: setTextStyle
|
39
|
+
setTextStyle: setTextStyle,
|
40
|
+
getEnabledFields: getEnabledFields
|
31
41
|
};
|
@@ -43,6 +43,15 @@ export function setTextStyle(element, style, topo) {
|
|
43
43
|
topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
|
44
44
|
}
|
45
45
|
}
|
46
|
+
/**
|
47
|
+
*
|
48
|
+
* @param {*} element
|
49
|
+
* @returns {Array}
|
50
|
+
*/
|
51
|
+
|
52
|
+
export function getEnabledFields(element) {
|
53
|
+
return ['fontFamily', 'color', 'background', 'opacity'];
|
54
|
+
}
|
46
55
|
export function getFieldDisabled(element) {
|
47
56
|
return {
|
48
57
|
fontSize: true
|
@@ -51,5 +60,6 @@ export function getFieldDisabled(element) {
|
|
51
60
|
export default {
|
52
61
|
getTextStyle: getTextStyle,
|
53
62
|
setTextStyle: setTextStyle,
|
63
|
+
getEnabledFields: getEnabledFields,
|
54
64
|
getFieldDisabled: getFieldDisabled
|
55
65
|
};
|
@@ -28,17 +28,26 @@ export function setTextStyle(element, style, topo) {
|
|
28
28
|
|
29
29
|
if ('color' in style) {
|
30
30
|
element.s('group.title.color', style.color.hex);
|
31
|
-
}
|
32
|
-
|
31
|
+
}
|
33
32
|
|
34
|
-
|
35
|
-
|
33
|
+
if ('background' in style || 'opacity' in style) {
|
34
|
+
// 背景颜色
|
35
|
+
var prevStyle = getTextStyle(element);
|
36
|
+
element.s('group.title.background', formatBackgroundRgbaColor(prevStyle, style));
|
37
|
+
}
|
36
38
|
|
37
39
|
var fontStyle = _extends({}, getTextStyle(element), style);
|
38
40
|
|
39
|
-
var fontStr = fontStyleUtil.build(
|
41
|
+
var fontStr = fontStyleUtil.build(fontStyle);
|
40
42
|
element.s('group.title.font', fontStr);
|
41
43
|
}
|
44
|
+
export function getEnabledFields(element) {
|
45
|
+
if (!element.isExpanded()) {
|
46
|
+
return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
|
47
|
+
}
|
48
|
+
|
49
|
+
return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
|
50
|
+
}
|
42
51
|
export function getFieldDisabled(element) {
|
43
52
|
if (!element.isExpanded()) {
|
44
53
|
return {
|
@@ -51,5 +60,6 @@ export function getFieldDisabled(element) {
|
|
51
60
|
export default {
|
52
61
|
getTextStyle: getTextStyle,
|
53
62
|
setTextStyle: setTextStyle,
|
63
|
+
getEnabledFields: getEnabledFields,
|
54
64
|
getFieldDisabled: getFieldDisabled
|
55
65
|
};
|
@@ -57,7 +57,17 @@ export function setTextStyle(element, style) {
|
|
57
57
|
labelStyle.font = fontStr;
|
58
58
|
setLabelStyle(element, labelStyle);
|
59
59
|
}
|
60
|
+
/**
|
61
|
+
*
|
62
|
+
* @param {*} element
|
63
|
+
* @returns {Array}
|
64
|
+
*/
|
65
|
+
|
66
|
+
export function getEnabledFields(element) {
|
67
|
+
return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
|
68
|
+
}
|
60
69
|
export default {
|
61
70
|
getTextStyle: getTextStyle,
|
62
|
-
setTextStyle: setTextStyle
|
71
|
+
setTextStyle: setTextStyle,
|
72
|
+
getEnabledFields: getEnabledFields
|
63
73
|
};
|
@@ -43,13 +43,27 @@ export function setTextStyle(element, style, topo) {
|
|
43
43
|
topo.getHtTopo().setNodeLabelStyle(element, tagStyle);
|
44
44
|
}
|
45
45
|
}
|
46
|
+
export function getEnabledFields(element) {
|
47
|
+
return ['fontFamily', 'color', 'background', 'opacity'];
|
48
|
+
}
|
49
|
+
/**
|
50
|
+
* 获得字段是否禁用
|
51
|
+
*
|
52
|
+
* @param {*} element
|
53
|
+
* @returns
|
54
|
+
*/
|
55
|
+
|
46
56
|
export function getFieldDisabled(element) {
|
47
57
|
return {
|
48
|
-
fontSize: true
|
58
|
+
fontSize: true,
|
59
|
+
bold: true,
|
60
|
+
italic: true,
|
61
|
+
underline: true
|
49
62
|
};
|
50
63
|
}
|
51
64
|
export default {
|
52
65
|
getTextStyle: getTextStyle,
|
53
66
|
setTextStyle: setTextStyle,
|
67
|
+
getEnabledFields: getEnabledFields,
|
54
68
|
getFieldDisabled: getFieldDisabled
|
55
69
|
};
|
@@ -27,7 +27,11 @@ export function setTextStyle(element, style) {
|
|
27
27
|
var fontStr = fontStyleUtil.build(fontStyle);
|
28
28
|
element.s('text.font', fontStr);
|
29
29
|
}
|
30
|
+
export function getEnabledFields(element) {
|
31
|
+
return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color', 'background', 'opacity'];
|
32
|
+
}
|
30
33
|
export default {
|
31
34
|
getTextStyle: getTextStyle,
|
32
|
-
setTextStyle: setTextStyle
|
35
|
+
setTextStyle: setTextStyle,
|
36
|
+
getEnabledFields: getEnabledFields
|
33
37
|
};
|
@@ -44,48 +44,73 @@ export function getElementTextStyleFieldDisabled(element) {
|
|
44
44
|
|
45
45
|
return null;
|
46
46
|
}
|
47
|
+
export function getElementTextStyleEnabledFields(element) {
|
48
|
+
var type = getElementType(element);
|
49
|
+
var handler = typeMap[type];
|
50
|
+
|
51
|
+
if (handler && handler.getEnabledFields) {
|
52
|
+
return handler.getEnabledFields(element);
|
53
|
+
}
|
54
|
+
|
55
|
+
return null;
|
56
|
+
}
|
47
57
|
export function getTextStyle(htSelection, styleNames) {
|
48
|
-
|
49
|
-
var
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
58
|
+
var elementValues = [];
|
59
|
+
var elementEnabledFieldsMap = {};
|
60
|
+
var enabledFields = [];
|
61
|
+
htSelection.forEach(function (element) {
|
62
|
+
var id = element.getId();
|
63
|
+
var elementTextStyle = getElementTextStyle(element);
|
64
|
+
elementValues.push({
|
65
|
+
id: id,
|
66
|
+
values: elementTextStyle
|
67
|
+
});
|
68
|
+
var elementEnabledFields = getElementTextStyleEnabledFields(element) || [];
|
69
|
+
elementEnabledFieldsMap[id] = elementEnabledFields;
|
70
|
+
enabledFields.push.apply(enabledFields, elementEnabledFields);
|
71
|
+
}); // 多选时值相同返回,排除元素禁用的字段值
|
55
72
|
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
73
|
+
var value = {};
|
74
|
+
styleNames.forEach(function (styleName) {
|
75
|
+
// 查询该字段多元素的值列表,排除元素禁用的字段值
|
76
|
+
var fieldValueList = elementValues.reduce(function (result, item) {
|
77
|
+
// 元素字段是否禁用
|
78
|
+
var disabled = !elementEnabledFieldsMap[item.id].includes(styleName);
|
62
79
|
|
63
|
-
if (!
|
64
|
-
|
80
|
+
if (!item.values || disabled) {
|
81
|
+
return result;
|
65
82
|
}
|
66
|
-
});
|
67
|
-
} // 多选时元素都不支持字段时禁用
|
68
83
|
|
84
|
+
return [].concat(result, [item.values[styleName]]);
|
85
|
+
}, []); // 对比是否一样,如果一样则使用
|
86
|
+
|
87
|
+
var val = fieldValueList[0];
|
88
|
+
var different = fieldValueList.filter(function (item) {
|
89
|
+
return item !== val;
|
90
|
+
});
|
69
91
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
return !!item;
|
92
|
+
if (!different.length) {
|
93
|
+
value[styleName] = val;
|
94
|
+
}
|
74
95
|
});
|
96
|
+
var disabled = true; // 字段如果没有元素启用则禁用
|
97
|
+
|
75
98
|
var fieldDisabled = styleNames.reduce(function (result, fieldName) {
|
76
99
|
var _extends2;
|
77
100
|
|
78
|
-
|
79
|
-
|
80
|
-
}
|
81
|
-
|
101
|
+
if (enabledFields.includes(fieldName)) {
|
102
|
+
disabled = false;
|
103
|
+
}
|
104
|
+
|
105
|
+
return _extends({}, result, (_extends2 = {}, _extends2[fieldName] = !enabledFields.includes(fieldName), _extends2));
|
82
106
|
}, {});
|
83
107
|
return {
|
108
|
+
disabled: disabled,
|
84
109
|
style: value,
|
85
110
|
fieldDisabled: fieldDisabled,
|
86
111
|
debugData: {
|
87
|
-
|
88
|
-
|
112
|
+
elementValues: elementValues,
|
113
|
+
elementEnabledFieldsMap: elementEnabledFieldsMap
|
89
114
|
}
|
90
115
|
};
|
91
116
|
}
|
@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
|
|
23
23
|
import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
|
24
24
|
import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
|
25
25
|
|
26
|
-
var version = typeof "6.0.0-alpha.
|
26
|
+
var version = typeof "6.0.0-alpha.64" === 'string' ? "6.0.0-alpha.64" : null;
|
27
27
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
28
28
|
/**
|
29
29
|
* 拓扑显示和编辑
|
@@ -44,18 +44,24 @@ export default function useMetricPolling(_ref) {
|
|
44
44
|
return item;
|
45
45
|
}).sort().join(',');
|
46
46
|
useEffect(function () {
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
47
|
+
if (linkId) {
|
48
|
+
rlog.info('链路拓扑指标轮询 切换', {
|
49
|
+
linkCi: linkCi,
|
50
|
+
linkMetricCodes: linkMetricCodes
|
51
|
+
});
|
52
|
+
queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
|
53
|
+
}
|
54
|
+
|
52
55
|
return function () {};
|
53
56
|
}, [linkId, linkMetricCodesStr]);
|
54
57
|
useEffect(function () {
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
58
|
+
if (linkId) {
|
59
|
+
rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
|
60
|
+
linkCi: linkCi
|
61
|
+
});
|
62
|
+
queryInterfaceMetricsRequest.run(linkCi);
|
63
|
+
}
|
64
|
+
|
59
65
|
return function () {};
|
60
66
|
}, [linkId]);
|
61
67
|
return data;
|
@@ -99,16 +99,16 @@ function _queryLinkLatestMetrics() {
|
|
99
99
|
case 8:
|
100
100
|
// format
|
101
101
|
resultData = linkMetricCodes.map(function (code) {
|
102
|
-
var
|
103
|
-
|
104
|
-
var value = (_linkMetrics$find = linkMetrics.find(function (m) {
|
102
|
+
var metric = linkMetrics.find(function (m) {
|
105
103
|
return m.metricCode === code;
|
106
|
-
})
|
104
|
+
});
|
105
|
+
var value = metric === null || metric === void 0 ? void 0 : metric.metricValue;
|
107
106
|
var metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
|
108
107
|
return {
|
109
108
|
code: code,
|
110
109
|
name: metricDef.name,
|
111
|
-
value: formatMetric(value, metricDef) || ''
|
110
|
+
value: formatMetric(value, metricDef) || '',
|
111
|
+
ts: metric === null || metric === void 0 ? void 0 : metric.ts
|
112
112
|
};
|
113
113
|
});
|
114
114
|
return _context3.abrupt("return", {
|
@@ -132,18 +132,14 @@ export function queryLinkInterfacesLatestMetrics(_x5) {
|
|
132
132
|
|
133
133
|
function _queryLinkInterfacesLatestMetrics() {
|
134
134
|
_queryLinkInterfacesLatestMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(linkCi) {
|
135
|
-
var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, parseInterfaceMetrics;
|
135
|
+
var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, findMetricsBySubCiId, parseInterfaceMetrics;
|
136
136
|
|
137
137
|
return _regeneratorRuntime.wrap(function _callee4$(_context4) {
|
138
138
|
while (1) {
|
139
139
|
switch (_context4.prev = _context4.next) {
|
140
140
|
case 0:
|
141
141
|
parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
|
142
|
-
var
|
143
|
-
|
144
|
-
var metrics = interfaceMetrics.filter(function (metric) {
|
145
|
-
return metric.subCiId === subCiId;
|
146
|
-
});
|
142
|
+
var metrics = findMetricsBySubCiId(subCiId);
|
147
143
|
return INTERFACE_METRIC_CODES.reduce(function (res, code) {
|
148
144
|
var _metrics$find;
|
149
145
|
|
@@ -154,10 +150,14 @@ function _queryLinkInterfacesLatestMetrics() {
|
|
154
150
|
var formatValue = formatMetric(value, metricDef);
|
155
151
|
res[code] = formatValue === 'undefined' ? '-' : formatValue;
|
156
152
|
return res;
|
157
|
-
}, {
|
158
|
-
|
153
|
+
}, {});
|
154
|
+
};
|
159
155
|
|
156
|
+
findMetricsBySubCiId = function _findMetricsBySubCiId(subCiId) {
|
157
|
+
var metrics = interfaceMetrics.filter(function (metric) {
|
158
|
+
return metric.subCiId === subCiId;
|
160
159
|
});
|
160
|
+
return metrics;
|
161
161
|
};
|
162
162
|
|
163
163
|
_linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;
|
@@ -174,24 +174,29 @@ function _queryLinkInterfacesLatestMetrics() {
|
|
174
174
|
typeCodes.push(destinationType);
|
175
175
|
}
|
176
176
|
|
177
|
-
_context4.next =
|
177
|
+
_context4.next = 9;
|
178
178
|
return ciTypeCache.load(typeCodes);
|
179
179
|
|
180
|
-
case
|
181
|
-
_context4.next =
|
180
|
+
case 9:
|
181
|
+
_context4.next = 11;
|
182
182
|
return queryLatestMetrics(queryInterfaceMetricsParam);
|
183
183
|
|
184
|
-
case
|
184
|
+
case 11:
|
185
185
|
interfaceMetrics = _context4.sent;
|
186
186
|
// format
|
187
187
|
resultData = {
|
188
188
|
sourceMetrics: parseInterfaceMetrics(sourceId),
|
189
|
-
destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null
|
189
|
+
destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null,
|
190
|
+
// 源目的接口指标原始数据。支持关键链路详情过滤最近一小时指标
|
191
|
+
originMetricData: {
|
192
|
+
source: findMetricsBySubCiId(sourceId),
|
193
|
+
destination: destinationId ? findMetricsBySubCiId(destinationId) : []
|
194
|
+
}
|
190
195
|
};
|
191
196
|
rlog.debug('查询链路接口指标 结果', linkCi);
|
192
197
|
return _context4.abrupt("return", resultData);
|
193
198
|
|
194
|
-
case
|
199
|
+
case 15:
|
195
200
|
case "end":
|
196
201
|
return _context4.stop();
|
197
202
|
}
|
@@ -20,7 +20,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
20
20
|
function FontSizeSelect(props) {
|
21
21
|
var value = props.value,
|
22
22
|
disabled = props.disabled,
|
23
|
-
|
23
|
+
onChange = props.onChange;
|
24
24
|
var items = [9, 10, 11, 12, 14, 16, 18, 20, 24, 30, 36];
|
25
25
|
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
|
26
26
|
value: "" + (value || ''),
|
@@ -32,8 +32,8 @@ function FontSizeSelect(props) {
|
|
32
32
|
}, val || 12);
|
33
33
|
},
|
34
34
|
disabled: disabled,
|
35
|
-
|
36
|
-
return
|
35
|
+
onSelect: function onSelect(val) {
|
36
|
+
return onChange(parseInt(val, 10));
|
37
37
|
}
|
38
38
|
}, items.map(function (item) {
|
39
39
|
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
|
@@ -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 _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
9
|
-
|
10
8
|
var _react = _interopRequireWildcard(require("react"));
|
11
9
|
|
12
10
|
var _htElementUtils = require("../../../../../utils/htElementUtils");
|
@@ -41,16 +39,6 @@ function buildValue(obj) {
|
|
41
39
|
});
|
42
40
|
}
|
43
41
|
|
44
|
-
function formatStyle(arr) {
|
45
|
-
return items.map(function (item) {
|
46
|
-
return item.key;
|
47
|
-
}).reduce(function (map, name) {
|
48
|
-
var _extends2;
|
49
|
-
|
50
|
-
return (0, _extends3["default"])({}, map, (_extends2 = {}, _extends2[name] = arr.includes(name), _extends2));
|
51
|
-
}, {});
|
52
|
-
}
|
53
|
-
|
54
42
|
function FontStyleButton(props) {
|
55
43
|
var topo = props.topo,
|
56
44
|
showLabel = props.showLabel,
|
@@ -93,9 +81,13 @@ function FontStyleButton(props) {
|
|
93
81
|
* @param {Array} selectedKeys
|
94
82
|
*/
|
95
83
|
|
96
|
-
var
|
84
|
+
var handleSelect = function handleSelect(selectedKeys, item, extra) {
|
85
|
+
var _setStyle;
|
86
|
+
|
87
|
+
var key = extra.key,
|
88
|
+
select = extra.select;
|
97
89
|
topo.historyManager.beginTransaction();
|
98
|
-
setStyle(
|
90
|
+
setStyle((_setStyle = {}, _setStyle[key] = select, _setStyle));
|
99
91
|
topo.historyManager.endTransaction();
|
100
92
|
};
|
101
93
|
|
@@ -114,7 +106,7 @@ function FontStyleButton(props) {
|
|
114
106
|
},
|
115
107
|
multiple: true,
|
116
108
|
disabled: disabled,
|
117
|
-
|
109
|
+
onSelect: handleSelect
|
118
110
|
}, items.map(function (item) {
|
119
111
|
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
|
120
112
|
key: item.key
|
@@ -17,15 +17,19 @@ function DropdownMenu(props) {
|
|
17
17
|
var value = props.value,
|
18
18
|
children = props.children,
|
19
19
|
multiple = props.multiple,
|
20
|
-
|
20
|
+
onSelect = props.onSelect,
|
21
21
|
valueRender = props.valueRender,
|
22
22
|
disabled = props.disabled;
|
23
23
|
var selectedKeys = Array.isArray(value) ? value : [value];
|
24
24
|
var valueDisplay = valueRender ? valueRender(value) : value;
|
25
25
|
var selectMode = multiple ? 'multiple' : 'single';
|
26
26
|
|
27
|
-
var handleChange = function handleChange(keys) {
|
28
|
-
|
27
|
+
var handleChange = function handleChange(keys, item, extra) {
|
28
|
+
var selected = multiple ? keys : keys[0];
|
29
|
+
|
30
|
+
if (onSelect) {
|
31
|
+
onSelect(selected, item, extra);
|
32
|
+
}
|
29
33
|
};
|
30
34
|
|
31
35
|
var menu = /*#__PURE__*/_react["default"].createElement(_menu["default"], {
|
@@ -55,7 +55,7 @@ function ElementTextStyleSetting(props) {
|
|
55
55
|
};
|
56
56
|
}, [htSelection]);
|
57
57
|
return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
|
58
|
-
disabled:
|
58
|
+
disabled: true,
|
59
59
|
htSelection: htSelection
|
60
60
|
}, fieldProps, {
|
61
61
|
setStyle: setStyle
|
@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
4
4
|
|
5
5
|
exports.__esModule = true;
|
6
6
|
exports["default"] = void 0;
|
7
|
+
exports.getEnabledFields = getEnabledFields;
|
7
8
|
exports.getTextStyle = getTextStyle;
|
8
9
|
exports.setTextStyle = setTextStyle;
|
9
10
|
|
@@ -38,9 +39,20 @@ function setTextStyle(element, style, topo) {
|
|
38
39
|
element.a('rectFont', fontStr);
|
39
40
|
topo.getHtTopo().setRectangleText(element);
|
40
41
|
}
|
42
|
+
/**
|
43
|
+
*
|
44
|
+
* @param {*} element
|
45
|
+
* @returns {Array}
|
46
|
+
*/
|
47
|
+
|
48
|
+
|
49
|
+
function getEnabledFields(element) {
|
50
|
+
return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
|
51
|
+
}
|
41
52
|
|
42
53
|
var _default = {
|
43
54
|
getTextStyle: getTextStyle,
|
44
|
-
setTextStyle: setTextStyle
|
55
|
+
setTextStyle: setTextStyle,
|
56
|
+
getEnabledFields: getEnabledFields
|
45
57
|
};
|
46
58
|
exports["default"] = _default;
|