@riil-frontend/component-topology 7.0.0-dev.2 → 7.0.0-dev.21
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/1.js +2 -2
- package/build/2.js +1 -1
- package/build/index.css +1 -1
- package/build/index.js +31 -31
- package/es/core/components/TopoView/topoView.js +2 -19
- package/es/core/components/titlebar/index.js +2 -1
- package/es/core/editor/components/EditorPlugin.js +1 -2
- package/es/core/editor/components/Toolbar/buttons.js +2 -2
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +11 -3
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +6 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +5 -0
- package/es/core/editor/components/settings/PropertyView.js +11 -10
- package/es/core/editor/components/settings/Settings.js +8 -1
- package/es/core/editor/components/settings/core/PropertyViewManager.js +4 -3
- package/es/core/editor/components/settings/core/edgePropertyViewAdapter.js +1 -7
- package/es/core/editor/components/settings/propertyViews/node/data/Data.js +6 -3
- package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +4 -2
- package/es/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +10 -0
- package/es/core/editor/hooks/useKeyboardShortcut.js +1 -1
- package/es/core/hooks/usePolling.js +1 -6
- package/es/core/hooks/useTopoEdit.js +134 -170
- package/es/core/models/Alarm.js +12 -24
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/topoData.js +3 -3
- package/es/core/models/utils/linkUtils.js +0 -3
- package/es/core/store/models/topoConfig.js +7 -5
- package/es/core/store/models/topoMod.js +8 -7
- package/es/core/utils/saveSerialize.js +2 -3
- package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +13 -2
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +28 -25
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +4 -0
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +17 -17
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +1 -0
- package/es/core/viewer/components/titlebar/BasicTools.js +3 -16
- package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +25 -0
- package/es/networkTopo/getTopoData.js +18 -30
- package/es/networkTopo/index.js +1 -2
- package/es/networkTopo/services/alert.js +55 -0
- package/es/networkTopo/services/authorization.js +135 -0
- package/es/networkTopo/services/cmdb.js +897 -0
- package/es/networkTopo/services/index.js +2 -26
- package/es/networkTopo/services/mdc.js +74 -0
- package/es/networkTopo/services/metric.js +68 -0
- package/es/networkTopo/services/model.js +1283 -0
- package/es/networkTopo/services/risk.js +29 -0
- package/es/networkTopo/services/topo/auth.js +67 -0
- package/es/networkTopo/services/topo/basic.js +727 -0
- package/es/networkTopo/services/topo/blacklist.js +60 -0
- package/es/networkTopo/services/topo/ciInfo.js +69 -0
- package/es/networkTopo/services/topo/constants.js +1 -0
- package/es/networkTopo/services/topo/icon.js +131 -0
- package/es/networkTopo/services/topo/index.js +18 -0
- package/es/networkTopo/services/topo/networkLink.js +33 -0
- package/es/networkTopo/services/topo/relation.js +27 -0
- package/es/networkTopo/services/topo/resourceWebUrl.js +84 -0
- package/es/networkTopo/store/topoTreeMod.js +5 -1
- package/es/networkTopo/utils/storage.js +38 -0
- package/es/style.js +21 -21
- package/es/utils/tree.js +1 -0
- package/lib/core/components/TopoView/topoView.js +2 -20
- package/lib/core/components/titlebar/index.js +5 -1
- package/lib/core/editor/components/EditorPlugin.js +1 -3
- package/lib/core/editor/components/Toolbar/buttons.js +2 -2
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +11 -4
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +6 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +5 -0
- package/lib/core/editor/components/settings/PropertyView.js +10 -10
- package/lib/core/editor/components/settings/Settings.js +9 -1
- package/lib/core/editor/components/settings/core/PropertyViewManager.js +4 -3
- package/lib/core/editor/components/settings/core/edgePropertyViewAdapter.js +1 -10
- package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +7 -4
- package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +4 -2
- package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +18 -0
- package/lib/core/editor/hooks/useKeyboardShortcut.js +1 -1
- package/lib/core/hooks/usePolling.js +1 -6
- package/lib/core/hooks/useTopoEdit.js +134 -170
- package/lib/core/models/Alarm.js +12 -24
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/topoData.js +7 -11
- package/lib/core/models/utils/linkUtils.js +0 -5
- package/lib/core/store/models/topoConfig.js +7 -5
- package/lib/core/store/models/topoMod.js +10 -7
- package/lib/core/utils/saveSerialize.js +1 -3
- package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +13 -2
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +28 -26
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +4 -0
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +17 -17
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +1 -0
- package/lib/core/viewer/components/titlebar/BasicTools.js +3 -17
- package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +36 -0
- package/lib/networkTopo/getTopoData.js +19 -33
- package/lib/networkTopo/index.js +1 -5
- package/lib/networkTopo/services/alert.js +66 -0
- package/lib/networkTopo/services/authorization.js +145 -0
- package/lib/networkTopo/services/cmdb.js +977 -0
- package/lib/networkTopo/services/index.js +3 -29
- package/lib/networkTopo/services/mdc.js +91 -0
- package/lib/networkTopo/services/metric.js +82 -0
- package/lib/networkTopo/services/model.js +1387 -0
- package/lib/networkTopo/services/risk.js +40 -0
- package/lib/networkTopo/services/topo/auth.js +79 -0
- package/lib/networkTopo/services/topo/basic.js +753 -0
- package/lib/networkTopo/services/topo/blacklist.js +72 -0
- package/lib/networkTopo/services/topo/ciInfo.js +82 -0
- package/lib/networkTopo/services/topo/constants.js +6 -0
- package/lib/networkTopo/services/topo/icon.js +144 -0
- package/lib/networkTopo/{components/editor/plugins/LayerConfigPlugin.js → services/topo/index.js} +33 -23
- package/lib/networkTopo/services/topo/networkLink.js +45 -0
- package/lib/networkTopo/services/topo/relation.js +39 -0
- package/lib/networkTopo/services/topo/resourceWebUrl.js +95 -0
- package/lib/networkTopo/store/topoTreeMod.js +5 -1
- package/lib/networkTopo/utils/storage.js +46 -0
- package/lib/style.js +21 -21
- package/lib/utils/tree.js +1 -0
- package/package.json +3 -3
- package/es/core/editor/components/plugins/MultipleResourceSelectPlugin.js +0 -15
- package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +0 -10
- package/es/networkTopo/components/Topology.js +0 -28
- package/es/networkTopo/components/editor/plugins/LayerConfigPlugin.js +0 -22
- package/es/networkTopo/components/editor/propertyViews/LayerRelatedResourceList.js +0 -48
- package/es/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js +0 -35
- package/es/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +0 -43
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +0 -39
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +0 -31
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +0 -37
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +0 -49
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/index.js +0 -2
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +0 -630
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/NetworkLinkForm.js +0 -4
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +0 -458
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/index.module.scss +0 -34
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/hooks/useAddLink.js +0 -104
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss +0 -12
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/mock.js +0 -55
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +0 -187
- package/es/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js +0 -178
- package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js +0 -103
- package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +0 -65
- package/es/networkTopo/components/editor/useEditorProps.js +0 -32
- package/es/networkTopo/event/index.js +0 -6
- package/es/networkTopo/hooks/editor/useDeleteEdges.js +0 -200
- package/es/networkTopo/hooks/editor/useGroupSortResources.js +0 -16
- package/es/networkTopo/hooks/useTopoEdit.js +0 -26
- package/lib/core/editor/components/plugins/MultipleResourceSelectPlugin.js +0 -25
- package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +0 -19
- package/lib/networkTopo/components/Topology.js +0 -40
- package/lib/networkTopo/components/editor/propertyViews/LayerRelatedResourceList.js +0 -63
- package/lib/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js +0 -51
- package/lib/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +0 -60
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +0 -54
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +0 -42
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +0 -50
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +0 -66
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/index.js +0 -11
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +0 -661
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/NetworkLinkForm.js +0 -12
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +0 -486
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/index.module.scss +0 -34
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/hooks/useAddLink.js +0 -120
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss +0 -12
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/mock.js +0 -60
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +0 -207
- package/lib/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js +0 -205
- package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js +0 -121
- package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +0 -65
- package/lib/networkTopo/components/editor/useEditorProps.js +0 -46
- package/lib/networkTopo/event/index.js +0 -11
- package/lib/networkTopo/hooks/editor/useDeleteEdges.js +0 -218
- package/lib/networkTopo/hooks/editor/useGroupSortResources.js +0 -21
- package/lib/networkTopo/hooks/useTopoEdit.js +0 -40
@@ -13,19 +13,26 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
|
|
13
13
|
|
14
14
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
15
15
|
|
16
|
-
var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
|
17
|
-
|
18
16
|
var _colorUtil = require("../colorUtil");
|
19
17
|
|
20
18
|
var _excluded = ["color", "background", "opacity", "bold", "italic"];
|
21
19
|
|
22
20
|
function getTextStyle(element) {
|
21
|
+
var opacity = element.a('edge.tag.opacity');
|
22
|
+
|
23
|
+
if (opacity === null || opacity === undefined) {
|
24
|
+
opacity = 1;
|
25
|
+
}
|
26
|
+
|
23
27
|
return (0, _extends2["default"])({
|
24
28
|
color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
|
25
29
|
fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
|
30
|
+
fontSize: element.a('edge.tag.fontSize'),
|
26
31
|
bold: !!element.a('edge.tag.fontBold'),
|
27
|
-
|
28
|
-
}, (0, _colorUtil.parseBackground)(element.a('edge.tag.background'))
|
32
|
+
italic: !!element.a('edge.tag.fontItalic')
|
33
|
+
}, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')), {
|
34
|
+
opacity: opacity
|
35
|
+
});
|
29
36
|
}
|
30
37
|
|
31
38
|
function setTextStyle(element, style, topo) {
|
@@ -17,7 +17,7 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/
|
|
17
17
|
|
18
18
|
var _colorUtil = require("../colorUtil");
|
19
19
|
|
20
|
-
var _excluded = ["color", "background", "opacity", "bold", "italic"];
|
20
|
+
var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
|
21
21
|
|
22
22
|
function getTextStyle(element) {
|
23
23
|
var underline = !!element.a('node.tag.fontUnderline');
|
@@ -33,6 +33,7 @@ function setTextStyle(element, style, topo) {
|
|
33
33
|
opacity = style.opacity,
|
34
34
|
bold = style.bold,
|
35
35
|
italic = style.italic,
|
36
|
+
underline = style.underline,
|
36
37
|
otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
|
37
38
|
var tagStyle = (0, _extends2["default"])({}, otherStyle);
|
38
39
|
|
@@ -48,6 +49,10 @@ function setTextStyle(element, style, topo) {
|
|
48
49
|
tagStyle.fontItalic = italic;
|
49
50
|
}
|
50
51
|
|
52
|
+
if ('underline' in style) {
|
53
|
+
tagStyle.fontUnderline = underline;
|
54
|
+
}
|
55
|
+
|
51
56
|
if ('background' in style) {
|
52
57
|
// 背景颜色
|
53
58
|
var prevStyle = getTextStyle(element);
|
@@ -102,6 +102,11 @@ function getTextStyle(htSelection, styleNames) {
|
|
102
102
|
|
103
103
|
var val = fieldValueList[0];
|
104
104
|
var different = fieldValueList.filter(function (item) {
|
105
|
+
// 如果是颜色,特殊处理
|
106
|
+
if (item && val && item.rgb) {
|
107
|
+
return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
|
108
|
+
}
|
109
|
+
|
105
110
|
return item !== val;
|
106
111
|
});
|
107
112
|
|
@@ -23,8 +23,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
23
23
|
|
24
24
|
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; }
|
25
25
|
|
26
|
+
function PropertyViewProvider(props) {}
|
27
|
+
|
26
28
|
function PropertyPanel(props) {
|
27
|
-
var _classNames;
|
29
|
+
var _editorProps$property, _editorProps$property2, _classNames;
|
28
30
|
|
29
31
|
var topo = props.topo,
|
30
32
|
editorProps = props.editorProps;
|
@@ -36,21 +38,19 @@ function PropertyPanel(props) {
|
|
36
38
|
var _store$useModelState = store.useModelState('selection'),
|
37
39
|
selection = _store$useModelState.selection;
|
38
40
|
|
39
|
-
var
|
40
|
-
topoEditState = _topo$store$useModel[0],
|
41
|
-
topoEditDispatchers = _topo$store$useModel[1];
|
42
|
-
|
41
|
+
var topoEditState = topo.store.useModelState('topoEdit');
|
43
42
|
var propertyPanelVisible = topoEditState.propertyPanelVisible;
|
44
43
|
var propertyViewManager = (0, _react.useMemo)(function () {
|
45
44
|
return new _PropertyViewManager["default"](topo);
|
46
|
-
}, []);
|
47
|
-
|
48
|
-
(0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
|
45
|
+
}, []);
|
46
|
+
propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
|
49
47
|
|
50
|
-
propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
|
48
|
+
propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
|
51
49
|
return (0, _edgePropertyViewAdapter.adapterGetEdgePropertyViewType)(elements, editorProps);
|
52
|
-
};
|
50
|
+
}; // 临时适配连线属性面板类型,后期组件支持自定义适配
|
51
|
+
|
53
52
|
|
53
|
+
(0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
|
54
54
|
var PropertyView = propertyViewManager.getPropertyView();
|
55
55
|
(0, _react.useEffect)(function () {
|
56
56
|
if (graphLoaded) {
|
@@ -13,6 +13,8 @@ var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntim
|
|
13
13
|
|
14
14
|
var _updateElementProperty = _interopRequireDefault(require("./core/updateElementProperty"));
|
15
15
|
|
16
|
+
var _htElementUtils = require("../../../../utils/htElementUtils");
|
17
|
+
|
16
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); }
|
17
19
|
|
18
20
|
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; }
|
@@ -46,10 +48,16 @@ function PropertyViewContainer(props) {
|
|
46
48
|
var elementProps = {};
|
47
49
|
|
48
50
|
if (selection.length === 1) {
|
51
|
+
var element = selectionElements[0];
|
49
52
|
elementProps = {
|
50
|
-
|
53
|
+
element: element,
|
54
|
+
selectionElement: element,
|
51
55
|
values: singleElementValues
|
52
56
|
};
|
57
|
+
|
58
|
+
if ((0, _htElementUtils.isEdge)(element)) {
|
59
|
+
elementProps.edge = element;
|
60
|
+
}
|
53
61
|
}
|
54
62
|
|
55
63
|
return /*#__PURE__*/_react["default"].createElement(PropertyView, (0, _extends2["default"])({
|
@@ -13,17 +13,18 @@ var _getPropertyViewType2 = _interopRequireDefault(require("./getPropertyViewTyp
|
|
13
13
|
|
14
14
|
var PropertyViewManager = /*#__PURE__*/function () {
|
15
15
|
function PropertyViewManager(topo) {
|
16
|
-
this.viewMap = _propertyViews["default"];
|
16
|
+
this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"]);
|
17
17
|
this.topo = void 0;
|
18
18
|
this.customGetViewType = void 0;
|
19
19
|
this.topo = topo;
|
20
|
+
this.topo.propertyViewManager = this;
|
20
21
|
this.open = this.open.bind(this);
|
21
22
|
}
|
22
23
|
|
23
24
|
var _proto = PropertyViewManager.prototype;
|
24
25
|
|
25
|
-
_proto.
|
26
|
-
this.viewMap
|
26
|
+
_proto.addViews = function addViews(viewMap) {
|
27
|
+
Object.assign(this.viewMap, viewMap);
|
27
28
|
};
|
28
29
|
|
29
30
|
_proto.init = function init() {
|
@@ -1,15 +1,11 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
-
|
5
3
|
exports.__esModule = true;
|
6
4
|
exports.adapterGetEdgePropertyViewType = adapterGetEdgePropertyViewType;
|
7
5
|
exports.addEdgePropertyViews = addEdgePropertyViews;
|
8
6
|
|
9
7
|
var _htElementUtils = require("../../../../../utils/htElementUtils");
|
10
8
|
|
11
|
-
var _addEdgeProps = _interopRequireDefault(require("../propertyViews/edge/addEdgeProps"));
|
12
|
-
|
13
9
|
function adapterGetEdgePropertyViewType(selection, editorProps) {
|
14
10
|
var fn = editorProps.getEdgePropertyViewType;
|
15
11
|
|
@@ -24,10 +20,5 @@ function adapterGetEdgePropertyViewType(selection, editorProps) {
|
|
24
20
|
}
|
25
21
|
|
26
22
|
function addEdgePropertyViews(propertyViewManager, editorProps) {
|
27
|
-
|
28
|
-
var map = {};
|
29
|
-
Object.keys(oldMap).forEach(function (name) {
|
30
|
-
map[name] = (0, _addEdgeProps["default"])(oldMap[name]);
|
31
|
-
});
|
32
|
-
propertyViewManager.updateViews(map);
|
23
|
+
propertyViewManager.addViews(editorProps.edgePropertyViews || {});
|
33
24
|
}
|
@@ -21,12 +21,12 @@ var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
|
|
21
21
|
|
22
22
|
var _react = _interopRequireWildcard(require("react"));
|
23
23
|
|
24
|
-
var _useHtElement = _interopRequireDefault(require("../../../../../../common/hooks/useHtElement"));
|
25
|
-
|
26
24
|
var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
|
27
25
|
|
28
26
|
var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
|
29
27
|
|
28
|
+
var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
|
29
|
+
|
30
30
|
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); }
|
31
31
|
|
32
32
|
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; }
|
@@ -164,12 +164,15 @@ function Data(props) {
|
|
164
164
|
nodeElement: node,
|
165
165
|
node: values,
|
166
166
|
topo: topo,
|
167
|
-
topoEditApi: topoEditApi
|
167
|
+
topoEditApi: topoEditApi,
|
168
|
+
nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
|
168
169
|
}))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
|
169
170
|
label: "\u5173\u8054\u62D3\u6251"
|
170
171
|
}, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
|
171
172
|
name: "attrObject.bindTopo",
|
172
173
|
topo: topo,
|
173
174
|
onChange: handleBindTopoChange
|
174
|
-
}))))
|
175
|
+
})), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
|
176
|
+
label: "\u6240\u5C5E\u5E73\u53F0"
|
177
|
+
}, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
|
175
178
|
}
|
package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js
CHANGED
@@ -28,7 +28,8 @@ function NodeRelateResourceButton(props) {
|
|
28
28
|
var nodeElement = props.nodeElement,
|
29
29
|
topo = props.topo,
|
30
30
|
topoEditApi = props.topoEditApi,
|
31
|
-
node = props.node
|
31
|
+
node = props.node,
|
32
|
+
nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
|
32
33
|
var hide = (0, _clusterUtil.isClusterMemberHtElement)(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
|
33
34
|
var currentResId = node.tag;
|
34
35
|
|
@@ -36,6 +37,7 @@ function NodeRelateResourceButton(props) {
|
|
36
37
|
visible = _useState[0],
|
37
38
|
setVisible = _useState[1];
|
38
39
|
|
40
|
+
var BindResourceDrawer = nodeBindResourceDrawerComponent || _BindResourceDrawer["default"];
|
39
41
|
return !hide ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
40
42
|
type: "primary",
|
41
43
|
text: true,
|
@@ -43,7 +45,7 @@ function NodeRelateResourceButton(props) {
|
|
43
45
|
onClick: function onClick() {
|
44
46
|
setVisible(true);
|
45
47
|
}
|
46
|
-
}, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(
|
48
|
+
}, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(BindResourceDrawer, (0, _extends2["default"])({
|
47
49
|
visible: visible,
|
48
50
|
currentResId: currentResId
|
49
51
|
}, props, {
|
@@ -0,0 +1,18 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
+
|
5
|
+
exports.__esModule = true;
|
6
|
+
exports["default"] = void 0;
|
7
|
+
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
9
|
+
|
10
|
+
function PlatformDisplay(props) {
|
11
|
+
var topo = props.topo,
|
12
|
+
node = props.node;
|
13
|
+
var data = topo.dataModel.useDataById(node.getTag());
|
14
|
+
return data.isSubResource ? data.attributes.platform : '本级平台';
|
15
|
+
}
|
16
|
+
|
17
|
+
var _default = PlatformDisplay;
|
18
|
+
exports["default"] = _default;
|
@@ -32,7 +32,7 @@ function useKeyboardShortcut(props) {
|
|
32
32
|
|
33
33
|
}
|
34
34
|
|
35
|
-
if (e.keyCode === 32) {
|
35
|
+
if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
|
36
36
|
// 空格
|
37
37
|
var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
|
38
38
|
viewMouseMode = _topo$store$getModelS.viewMouseMode;
|
@@ -26,12 +26,7 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
|
|
26
26
|
var usePolling = function usePolling(props) {
|
27
27
|
var topo = props.topo;
|
28
28
|
var store = topo.store;
|
29
|
-
var
|
30
|
-
|
31
|
-
var _store$useModel = store.useModel('topoBizMod'),
|
32
|
-
bizState = _store$useModel[0],
|
33
|
-
bizDispatchers = _store$useModel[1];
|
34
|
-
|
29
|
+
var bizState = store.useModelState('topoBizMod');
|
35
30
|
var resAndMetrics = bizState.resAndMetrics,
|
36
31
|
pollingSwitch = bizState.pollingSwitch;
|
37
32
|
var displayConfig = topo.store.useModelState('displayConfig');
|