@riil-frontend/component-topology 3.1.7 → 3.1.10
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/CHANGELOG.md +9 -15
- package/build/index.css +1 -1
- package/build/index.js +8 -8
- package/demo/1/345/237/272/346/234/254//345/256/232/345/210/266/345/214/226/350/265/204/346/272/220/346/246/202/350/247/210.md +11 -0
- package/demo/1/345/237/272/346/234/254//350/207/252/345/256/232/344/271/211/346/240/207/346/263/250/345/222/214/346/202/254/346/265/256/346/241/206.md +11 -0
- package/demo/2/347/274/226/350/276/221/346/250/241/345/274/217//345/261/236/346/200/247/351/235/242/346/235/277.md +11 -0
- package/demo//346/240/207/346/263/250/345/222/214/346/202/254/346/265/256/346/241/206//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
- package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +1 -3
- package/es/core/editor/components/settings/propertyViews/group/DataTab/RelateData.js +19 -6
- package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js +25 -160
- package/es/core/editor/components/settings/propertyViews/node/Setting/Setting.js +76 -0
- package/es/core/editor/components/settings/propertyViews/node/Setting/index.js +2 -0
- package/es/core/editor/components/settings/propertyViews/node/data/Data.js +125 -0
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/ResourceDetail.js +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/ResourceDetailPlugin.js +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/BaseInfo.js +10 -8
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BaseInfoBlock.js +31 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/BlockBox.js +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/BlockBox.module.scss +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/ResourceOverviewMetric.js +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/SingleResourceStrategyLink.js +4 -2
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/index.js +15 -17
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/index.module.scss +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/useCiAttrAndMetricData.js +0 -0
- package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/index.js +0 -0
- package/es/core/viewer/components/plugins/ResourceDetail/index.module.scss +39 -30
- package/es/core/viewer/components/plugins/ViewerPlugin.js +2 -2
- package/es/models/customIcon.js +16 -11
- package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/group/DataTab/RelateData.js +20 -7
- package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js +25 -171
- package/lib/core/editor/components/settings/propertyViews/node/Setting/Setting.js +95 -0
- package/lib/core/editor/components/settings/propertyViews/node/Setting/index.js +11 -0
- package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +145 -0
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/ResourceDetail.js +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/ResourceDetailPlugin.js +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/BaseInfo.js +10 -8
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BaseInfoBlock.js +42 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/BlockBox.js +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/BlockBox.module.scss +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/ResourceOverviewMetric.js +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/SingleResourceStrategyLink.js +4 -2
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/index.js +16 -17
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/index.module.scss +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/useCiAttrAndMetricData.js +0 -0
- package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/index.js +0 -0
- package/lib/core/viewer/components/plugins/ResourceDetail/index.module.scss +39 -30
- package/lib/core/viewer/components/plugins/ViewerPlugin.js +2 -2
- package/lib/models/customIcon.js +16 -11
- package/package.json +2 -2
- 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 +0 -11
- package/es/core/viewer/components/plugins/BaseInfo/index.module.scss +0 -49
- package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawerPlugin.js +0 -37
- package/es/core/viewer/components/plugins/ResourceDetail/topoDrawer.js +0 -147
- package/lib/core/viewer/components/plugins/BaseInfo/index.module.scss +0 -49
- package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawerPlugin.js +0 -50
- package/lib/core/viewer/components/plugins/ResourceDetail/topoDrawer.js +0 -167
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
exports.__esModule = true;
|
|
6
|
+
exports["default"] = Data;
|
|
7
|
+
|
|
8
|
+
var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
|
|
9
|
+
|
|
10
|
+
var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
|
|
11
|
+
|
|
12
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
13
|
+
|
|
14
|
+
var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
|
|
15
|
+
|
|
16
|
+
var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
|
|
17
|
+
|
|
18
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
19
|
+
|
|
20
|
+
var _useHtElement = _interopRequireDefault(require("../../../../../../common/hooks/useHtElement"));
|
|
21
|
+
|
|
22
|
+
var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
|
|
23
|
+
|
|
24
|
+
var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
|
|
25
|
+
|
|
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); }
|
|
27
|
+
|
|
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; }
|
|
29
|
+
|
|
30
|
+
var Option = _select["default"].Option;
|
|
31
|
+
var CollapsePanel = _collapse["default"].Panel;
|
|
32
|
+
|
|
33
|
+
function parseValues(values) {
|
|
34
|
+
return (0, _extends2["default"])({}, values, {
|
|
35
|
+
'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
|
|
36
|
+
'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
|
|
37
|
+
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function getBindType(values) {
|
|
42
|
+
if (values.tag) {
|
|
43
|
+
return 'resource';
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
if (values.attrObject.bindType) {
|
|
47
|
+
return values.attrObject.bindType;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
return 'none';
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function Data(props) {
|
|
54
|
+
var topo = props.topo,
|
|
55
|
+
topoEditApi = props.topoEditApi,
|
|
56
|
+
values = props.values,
|
|
57
|
+
_onChange = props.onChange,
|
|
58
|
+
editorProps = props.editorProps;
|
|
59
|
+
var bindType = getBindType(values);
|
|
60
|
+
var node = (0, _useHtElement["default"])({
|
|
61
|
+
topo: topo,
|
|
62
|
+
id: values.id
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
var field = _field["default"].useField({
|
|
66
|
+
autoUnmount: false,
|
|
67
|
+
values: parseValues(values),
|
|
68
|
+
onChange: function onChange(name, value) {
|
|
69
|
+
var newValues = field.getValues();
|
|
70
|
+
|
|
71
|
+
_onChange(name, value, newValues);
|
|
72
|
+
}
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
(0, _react.useEffect)(function () {
|
|
76
|
+
field.setValues(parseValues(values));
|
|
77
|
+
}, [values]);
|
|
78
|
+
|
|
79
|
+
var setBindType = function setBindType(newBindType) {
|
|
80
|
+
_onChange('attrObject.bindType', newBindType);
|
|
81
|
+
|
|
82
|
+
if (newBindType === 'topo') {//
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
var handleBindTopoChange = function handleBindTopoChange(value, data) {
|
|
87
|
+
// 设置名称为拓扑名称,清空自定义名称
|
|
88
|
+
node.a('name', data.label);
|
|
89
|
+
node.a('customName', null);
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
|
|
93
|
+
return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
|
|
94
|
+
defaultExpandedKeys: ['相关资源'],
|
|
95
|
+
style: {
|
|
96
|
+
border: 'none'
|
|
97
|
+
}
|
|
98
|
+
}, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
|
|
99
|
+
key: "\u76F8\u5173\u8D44\u6E90",
|
|
100
|
+
title: "\u76F8\u5173\u8D44\u6E90"
|
|
101
|
+
}, /*#__PURE__*/_react["default"].createElement(_form["default"], {
|
|
102
|
+
field: field,
|
|
103
|
+
labelAlign: "top"
|
|
104
|
+
}, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
|
|
105
|
+
label: "\u5173\u8054\u7C7B\u578B"
|
|
106
|
+
}, /*#__PURE__*/_react["default"].createElement(_select["default"], {
|
|
107
|
+
name: "bindType",
|
|
108
|
+
value: bindType,
|
|
109
|
+
style: {
|
|
110
|
+
width: '100%',
|
|
111
|
+
marginRight: 8
|
|
112
|
+
},
|
|
113
|
+
onChange: setBindType
|
|
114
|
+
}, /*#__PURE__*/_react["default"].createElement(Option, {
|
|
115
|
+
value: "none"
|
|
116
|
+
}, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
|
|
117
|
+
value: "resource"
|
|
118
|
+
}, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
|
|
119
|
+
value: "topo"
|
|
120
|
+
}, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
|
|
121
|
+
label: "\u5173\u8054\u8D44\u6E90"
|
|
122
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
123
|
+
style: {
|
|
124
|
+
display: 'flex'
|
|
125
|
+
}
|
|
126
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
127
|
+
className: _textModule["default"].textEllipsis,
|
|
128
|
+
style: {
|
|
129
|
+
flex: 1,
|
|
130
|
+
paddingRight: 16,
|
|
131
|
+
color: '#4D6277'
|
|
132
|
+
},
|
|
133
|
+
title: values.tag ? values.name : null
|
|
134
|
+
}, values.tag ? values.name : '—'), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
|
|
135
|
+
node: values,
|
|
136
|
+
topo: topo,
|
|
137
|
+
topoEditApi: topoEditApi
|
|
138
|
+
}))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
|
|
139
|
+
label: "\u5173\u8054\u62D3\u6251"
|
|
140
|
+
}, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
|
|
141
|
+
name: "attrObject.bindTopo",
|
|
142
|
+
topo: topo,
|
|
143
|
+
onChange: handleBindTopoChange
|
|
144
|
+
})))));
|
|
145
|
+
}
|
|
@@ -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 "3.1.
|
|
51
|
+
var version = typeof "3.1.10" === 'string' ? "3.1.10" : null;
|
|
52
52
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
53
53
|
/**
|
|
54
54
|
* 拓扑显示和编辑
|
|
File without changes
|
package/lib/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/ResourceDetailPlugin.js
RENAMED
|
File without changes
|
|
@@ -120,17 +120,19 @@ function BaseInfo(props) {
|
|
|
120
120
|
var topo = props.topo,
|
|
121
121
|
type = props.type,
|
|
122
122
|
data = props.data,
|
|
123
|
-
|
|
124
|
-
|
|
123
|
+
baseInfo = props.baseInfo,
|
|
124
|
+
renderContent = props.renderContent;
|
|
125
|
+
var content = renderContent ? renderContent({
|
|
126
|
+
type: type,
|
|
127
|
+
data: data,
|
|
128
|
+
AttributeItem: AttributeItem
|
|
129
|
+
}) : null;
|
|
125
130
|
|
|
126
|
-
if (
|
|
127
|
-
content =
|
|
131
|
+
if (!content) {
|
|
132
|
+
content = /*#__PURE__*/_react["default"].createElement(BaseInfoContent, {
|
|
128
133
|
type: type,
|
|
129
|
-
|
|
130
|
-
AttributeItem: AttributeItem
|
|
134
|
+
data: baseInfo
|
|
131
135
|
});
|
|
132
|
-
} else {
|
|
133
|
-
content = /*#__PURE__*/_react["default"].createElement(BaseInfoContent, props);
|
|
134
136
|
}
|
|
135
137
|
|
|
136
138
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
exports.__esModule = true;
|
|
6
|
+
exports["default"] = BaseInfoBlock;
|
|
7
|
+
|
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
|
9
|
+
|
|
10
|
+
var _BaseInfo = _interopRequireDefault(require("./BaseInfo"));
|
|
11
|
+
|
|
12
|
+
var _BlockBox = _interopRequireDefault(require("./BlockBox"));
|
|
13
|
+
|
|
14
|
+
var _SingleResourceStrategyLink = _interopRequireDefault(require("./SingleResourceStrategyLink"));
|
|
15
|
+
|
|
16
|
+
function BaseInfoBlock(props) {
|
|
17
|
+
var topo = props.topo,
|
|
18
|
+
data = props.data,
|
|
19
|
+
ciTypeMeta = props.ciTypeMeta,
|
|
20
|
+
headerExtra = props.headerExtra,
|
|
21
|
+
renderContent = props.renderContent,
|
|
22
|
+
baseInfo = props.baseInfo;
|
|
23
|
+
var id = data.id,
|
|
24
|
+
ciType = data.ciType,
|
|
25
|
+
type = data.type,
|
|
26
|
+
name = data.name;
|
|
27
|
+
return /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
|
|
28
|
+
headerTitle: "\u57FA\u672C\u4FE1\u606F",
|
|
29
|
+
headerExtra: headerExtra ? headerExtra(props) : ciType === 'network_link' && /*#__PURE__*/_react["default"].createElement(_SingleResourceStrategyLink["default"], {
|
|
30
|
+
id: id,
|
|
31
|
+
ciType: ciType,
|
|
32
|
+
name: name
|
|
33
|
+
})
|
|
34
|
+
}, /*#__PURE__*/_react["default"].createElement(_BaseInfo["default"], {
|
|
35
|
+
topo: topo,
|
|
36
|
+
type: type,
|
|
37
|
+
data: data,
|
|
38
|
+
ciTypeMeta: ciTypeMeta,
|
|
39
|
+
renderContent: renderContent,
|
|
40
|
+
baseInfo: baseInfo
|
|
41
|
+
}));
|
|
42
|
+
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -12,9 +12,11 @@ var _reactRouterDom = require("react-router-dom");
|
|
|
12
12
|
function SingleResourceStrategyLink(props) {
|
|
13
13
|
var id = props.id,
|
|
14
14
|
ciType = props.ciType,
|
|
15
|
-
name = props.name
|
|
15
|
+
name = props.name,
|
|
16
|
+
_props$label = props.label,
|
|
17
|
+
label = _props$label === void 0 ? '监控策略' : _props$label;
|
|
16
18
|
var url = "/default/singleResourceStrategy/" + id + "?title=" + encodeURIComponent(name) + "-\u76D1\u63A7\u914D\u7F6E&ciId=" + id + "&ciType=" + ciType + "&ciName=" + encodeURIComponent(name);
|
|
17
19
|
return /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
|
|
18
20
|
to: url
|
|
19
|
-
},
|
|
21
|
+
}, label);
|
|
20
22
|
}
|
|
@@ -9,10 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
9
9
|
|
|
10
10
|
var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
|
|
11
11
|
|
|
12
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
13
|
-
|
|
14
12
|
var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
|
|
15
13
|
|
|
14
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
15
|
+
|
|
16
16
|
var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
|
17
17
|
|
|
18
18
|
var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
|
|
@@ -47,6 +47,8 @@ var _ResourceOverviewMetric = _interopRequireDefault(require("./ResourceOverview
|
|
|
47
47
|
|
|
48
48
|
var _BaseInfo = _interopRequireDefault(require("./BaseInfo"));
|
|
49
49
|
|
|
50
|
+
var _BaseInfoBlock = _interopRequireDefault(require("./BaseInfoBlock"));
|
|
51
|
+
|
|
50
52
|
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); }
|
|
51
53
|
|
|
52
54
|
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; }
|
|
@@ -69,7 +71,7 @@ function formatUrl(url) {
|
|
|
69
71
|
|
|
70
72
|
|
|
71
73
|
function ResourceOverview(props) {
|
|
72
|
-
var _viewerProps$resource;
|
|
74
|
+
var _viewerProps$resource, _baseInfo$resource;
|
|
73
75
|
|
|
74
76
|
var topo = props.topo,
|
|
75
77
|
id = props.id,
|
|
@@ -77,7 +79,7 @@ function ResourceOverview(props) {
|
|
|
77
79
|
ciType = props.ciType,
|
|
78
80
|
userId = props.userId,
|
|
79
81
|
viewerProps = props.viewerProps;
|
|
80
|
-
var resourceOverviewProps = viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.resourceOverviewProps;
|
|
82
|
+
var resourceOverviewProps = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.resourceOverviewProps) || {};
|
|
81
83
|
var ciAttrAndMetricData = (0, _useCiAttrAndMetricData["default"])({
|
|
82
84
|
topo: topo,
|
|
83
85
|
id: id
|
|
@@ -633,22 +635,19 @@ function ResourceOverview(props) {
|
|
|
633
635
|
return _alarmRiskOperation.apply(this, arguments);
|
|
634
636
|
}
|
|
635
637
|
|
|
638
|
+
var elementData = {
|
|
639
|
+
id: id,
|
|
640
|
+
ciType: ciType,
|
|
641
|
+
type: type,
|
|
642
|
+
name: baseInfo === null || baseInfo === void 0 ? void 0 : (_baseInfo$resource = baseInfo.resource) === null || _baseInfo$resource === void 0 ? void 0 : _baseInfo$resource.display_name
|
|
643
|
+
};
|
|
636
644
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
637
645
|
className: _indexModule["default"]['resource-overview']
|
|
638
|
-
}, /*#__PURE__*/_react["default"].createElement(
|
|
639
|
-
|
|
640
|
-
headerExtra: ciType === 'network_link' && /*#__PURE__*/_react["default"].createElement(_SingleResourceStrategyLink["default"], {
|
|
641
|
-
id: id,
|
|
642
|
-
ciType: ciType,
|
|
643
|
-
name: baseInfo.resource.display_name
|
|
644
|
-
})
|
|
645
|
-
}, /*#__PURE__*/_react["default"].createElement(_BaseInfo["default"], {
|
|
646
|
-
topo: topo,
|
|
647
|
-
type: type,
|
|
648
|
-
data: baseInfo,
|
|
646
|
+
}, /*#__PURE__*/_react["default"].createElement(_BaseInfoBlock["default"], (0, _extends2["default"])({
|
|
647
|
+
data: elementData,
|
|
649
648
|
ciTypeMeta: ciTypeMeta,
|
|
650
|
-
|
|
651
|
-
})), /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
|
|
649
|
+
baseInfo: baseInfo
|
|
650
|
+
}, resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.baseInfoProps)), /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
|
|
652
651
|
headerTitle: "\u5173\u952E\u6307\u6807"
|
|
653
652
|
}, /*#__PURE__*/_react["default"].createElement(_ResourceOverviewMetric["default"], {
|
|
654
653
|
topo: topo,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1,40 +1,49 @@
|
|
|
1
|
-
.
|
|
2
|
-
width: 832px;
|
|
1
|
+
@import '~@alifd/next/variables.scss';
|
|
3
2
|
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
.title-popup{
|
|
4
|
+
width: 240px;
|
|
5
|
+
.search{
|
|
6
|
+
width: 100%;
|
|
7
|
+
padding: 4px 16px 12px;
|
|
6
8
|
}
|
|
9
|
+
.not-data{
|
|
10
|
+
color: var(--color-text1-4);
|
|
11
|
+
font-size: 14px;
|
|
12
|
+
line-height: 200px;
|
|
13
|
+
text-align: center;
|
|
14
|
+
}
|
|
15
|
+
:global {
|
|
16
|
+
.#{$css-prefix}menu-content{
|
|
17
|
+
height: 200px;
|
|
18
|
+
overflow-y: auto;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
7
22
|
|
|
8
|
-
|
|
23
|
+
.baseInfo {
|
|
24
|
+
box-shadow: 0px 0px 6px 1px #F2F7FD;
|
|
25
|
+
.drawer-title{
|
|
9
26
|
font-size: 16px;
|
|
10
|
-
color: #333333;
|
|
11
|
-
line-height: 22px;
|
|
12
27
|
font-weight: 500;
|
|
28
|
+
color: #4D6277;
|
|
13
29
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
.topo-drawer-alarm-banner {
|
|
24
|
-
padding-bottom: 8px;
|
|
25
|
-
margin-top: -10px;
|
|
26
|
-
|
|
27
|
-
.topo-drawer-alarm-txt {
|
|
28
|
-
font-size: 12px;
|
|
29
|
-
color: #333333;
|
|
30
|
-
line-height: 20px;
|
|
30
|
+
:global {
|
|
31
|
+
.#{$css-prefix}drawer-body {
|
|
32
|
+
height: calc(100% - 49px);
|
|
33
|
+
padding: 16px 24px;
|
|
34
|
+
.#{$css-prefix}tabs-content{
|
|
35
|
+
height: calc(100% - 31px);
|
|
36
|
+
overflow: auto;
|
|
37
|
+
}
|
|
31
38
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
39
|
+
}
|
|
40
|
+
.tab{
|
|
41
|
+
height: 100%;
|
|
42
|
+
:global {
|
|
43
|
+
.#{$css-prefix}tabs-content{
|
|
44
|
+
height: calc(100% - 31px);
|
|
45
|
+
overflow: auto;
|
|
46
|
+
}
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
}
|
|
@@ -13,13 +13,13 @@ var _ResourceWebControllUrlSettingDialog = _interopRequireDefault(require("./Res
|
|
|
13
13
|
|
|
14
14
|
var _MetricPollingPlugin = _interopRequireDefault(require("./MetricPollingPlugin"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _ResourceDetail = _interopRequireDefault(require("./ResourceDetail"));
|
|
17
17
|
|
|
18
18
|
function ViewerPlugin(props) {
|
|
19
19
|
var topo = props.topo,
|
|
20
20
|
viewerProps = props.viewerProps;
|
|
21
21
|
var store = topo.store;
|
|
22
|
-
var plugins = [_MetricPollingPlugin["default"], _ResourceWebControllUrlSettingDialog["default"],
|
|
22
|
+
var plugins = [_MetricPollingPlugin["default"], _ResourceWebControllUrlSettingDialog["default"], _ResourceDetail["default"]].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
|
|
23
23
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, plugins.map(function (Plugin, index) {
|
|
24
24
|
return /*#__PURE__*/_react["default"].createElement(Plugin, (0, _extends2["default"])({
|
|
25
25
|
key: index,
|
package/lib/models/customIcon.js
CHANGED
|
@@ -167,7 +167,7 @@ function _default(engine) {
|
|
|
167
167
|
var _this3 = this;
|
|
168
168
|
|
|
169
169
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
|
170
|
-
var data;
|
|
170
|
+
var data, allIcons, newIcons;
|
|
171
171
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
|
172
172
|
while (1) {
|
|
173
173
|
switch (_context4.prev = _context4.next) {
|
|
@@ -175,26 +175,31 @@ function _default(engine) {
|
|
|
175
175
|
data = payload.data;
|
|
176
176
|
|
|
177
177
|
_this3.update({
|
|
178
|
-
visible: false
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
container: []
|
|
182
|
-
}
|
|
183
|
-
});
|
|
178
|
+
visible: false
|
|
179
|
+
}); // 注册
|
|
180
|
+
|
|
184
181
|
|
|
185
182
|
data.forEach(function (icon) {
|
|
186
183
|
var iconUrl = _topo["default"].icon.getIconImageUrl(icon.id);
|
|
187
184
|
|
|
188
185
|
window.ht.Default.setImage((0, _icon.getCustomIconHtId)(icon.id), iconUrl);
|
|
186
|
+
});
|
|
187
|
+
_context4.next = 5;
|
|
188
|
+
return _this3.loadCustomIcons();
|
|
189
|
+
|
|
190
|
+
case 5:
|
|
191
|
+
allIcons = _context4.sent;
|
|
192
|
+
newIcons = allIcons.node.filter(function (icon) {
|
|
193
|
+
return !!data.find(function (item) {
|
|
194
|
+
return item.id === icon.id;
|
|
195
|
+
});
|
|
189
196
|
}); // 通知ht
|
|
190
197
|
|
|
191
198
|
engine.view.topoClient.emitEvent('topo_shape_upload_finish', (0, _extends2["default"])({}, payload, {
|
|
192
|
-
data: (0, _icon.transformCustomIcons2HtIcons)(
|
|
199
|
+
data: (0, _icon.transformCustomIcons2HtIcons)(newIcons)
|
|
193
200
|
}));
|
|
194
|
-
_context4.next = 6;
|
|
195
|
-
return _this3.loadCustomIcons();
|
|
196
201
|
|
|
197
|
-
case
|
|
202
|
+
case 8:
|
|
198
203
|
case "end":
|
|
199
204
|
return _context4.stop();
|
|
200
205
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riil-frontend/component-topology",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.10",
|
|
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@3.1.
|
|
113
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@3.1.10/build/index.html",
|
|
114
114
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
|
115
115
|
}
|
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
@import '~@alifd/next/variables.scss';
|
|
2
|
-
|
|
3
|
-
.title-popup{
|
|
4
|
-
width: 240px;
|
|
5
|
-
.search{
|
|
6
|
-
width: 100%;
|
|
7
|
-
padding: 4px 16px 12px;
|
|
8
|
-
}
|
|
9
|
-
.not-data{
|
|
10
|
-
color: var(--color-text1-4);
|
|
11
|
-
font-size: 14px;
|
|
12
|
-
line-height: 200px;
|
|
13
|
-
text-align: center;
|
|
14
|
-
}
|
|
15
|
-
:global {
|
|
16
|
-
.#{$css-prefix}menu-content{
|
|
17
|
-
height: 200px;
|
|
18
|
-
overflow-y: auto;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
.baseInfo {
|
|
24
|
-
box-shadow: 0px 0px 6px 1px #F2F7FD;
|
|
25
|
-
.drawer-title{
|
|
26
|
-
font-size: 16px;
|
|
27
|
-
font-weight: 500;
|
|
28
|
-
color: #4D6277;
|
|
29
|
-
}
|
|
30
|
-
:global {
|
|
31
|
-
.#{$css-prefix}drawer-body {
|
|
32
|
-
height: calc(100% - 49px);
|
|
33
|
-
padding: 16px 24px;
|
|
34
|
-
.#{$css-prefix}tabs-content{
|
|
35
|
-
height: calc(100% - 31px);
|
|
36
|
-
overflow: auto;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
.tab{
|
|
41
|
-
height: 100%;
|
|
42
|
-
:global {
|
|
43
|
-
.#{$css-prefix}tabs-content{
|
|
44
|
-
height: calc(100% - 31px);
|
|
45
|
-
overflow: auto;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
}
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import React, { useState, useEffect, useRef, useCallback } from 'react';
|
|
2
|
-
import TopoDrawer from "./topoDrawer";
|
|
3
|
-
/**
|
|
4
|
-
* 旧版资源概览,已废弃
|
|
5
|
-
*
|
|
6
|
-
* @param {*} props
|
|
7
|
-
* @returns
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
export default function ResourceDetailDrawerPlugin(props) {
|
|
11
|
-
var topo = props.topo,
|
|
12
|
-
store = props.store;
|
|
13
|
-
|
|
14
|
-
var _store$useModel = store.useModel('topoMod'),
|
|
15
|
-
topoState = _store$useModel[0],
|
|
16
|
-
topoDispatchers = _store$useModel[1];
|
|
17
|
-
|
|
18
|
-
var drawVisible = topoState.drawVisible;
|
|
19
|
-
useEffect(function () {
|
|
20
|
-
// 注册菜单点击处理
|
|
21
|
-
topo.view.contextMenu.registerCommands({
|
|
22
|
-
'Resource.detail': function ResourceDetail(e) {
|
|
23
|
-
var data = e.bussiInformation;
|
|
24
|
-
topoDispatchers.update({
|
|
25
|
-
drawVisible: true,
|
|
26
|
-
currentNode: data,
|
|
27
|
-
selectNodeId: data.id
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
}, []);
|
|
32
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, drawVisible ? /*#__PURE__*/React.createElement(TopoDrawer, {
|
|
33
|
-
store: store,
|
|
34
|
-
drawVisible: drawVisible
|
|
35
|
-
}) : null);
|
|
36
|
-
}
|
|
37
|
-
;
|