@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.
Files changed (170) 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 +31 -31
  5. package/es/core/components/TopoView/topoView.js +2 -19
  6. package/es/core/components/titlebar/index.js +2 -1
  7. package/es/core/editor/components/EditorPlugin.js +1 -2
  8. package/es/core/editor/components/Toolbar/buttons.js +2 -2
  9. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +11 -3
  10. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +6 -1
  11. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +5 -0
  12. package/es/core/editor/components/settings/PropertyView.js +11 -10
  13. package/es/core/editor/components/settings/Settings.js +8 -1
  14. package/es/core/editor/components/settings/core/PropertyViewManager.js +4 -3
  15. package/es/core/editor/components/settings/core/edgePropertyViewAdapter.js +1 -7
  16. package/es/core/editor/components/settings/propertyViews/node/data/Data.js +6 -3
  17. package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +4 -2
  18. package/es/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +10 -0
  19. package/es/core/editor/hooks/useKeyboardShortcut.js +1 -1
  20. package/es/core/hooks/usePolling.js +1 -6
  21. package/es/core/hooks/useTopoEdit.js +134 -170
  22. package/es/core/models/Alarm.js +12 -24
  23. package/es/core/models/TopoApp.js +1 -1
  24. package/es/core/models/topoData.js +3 -3
  25. package/es/core/models/utils/linkUtils.js +0 -3
  26. package/es/core/store/models/topoConfig.js +7 -5
  27. package/es/core/store/models/topoMod.js +8 -7
  28. package/es/core/utils/saveSerialize.js +2 -3
  29. package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +13 -2
  30. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +28 -25
  31. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +4 -0
  32. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +17 -17
  33. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +1 -0
  34. package/es/core/viewer/components/titlebar/BasicTools.js +3 -16
  35. package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +25 -0
  36. package/es/networkTopo/getTopoData.js +18 -30
  37. package/es/networkTopo/index.js +1 -2
  38. package/es/networkTopo/services/alert.js +55 -0
  39. package/es/networkTopo/services/authorization.js +135 -0
  40. package/es/networkTopo/services/cmdb.js +897 -0
  41. package/es/networkTopo/services/index.js +2 -26
  42. package/es/networkTopo/services/mdc.js +74 -0
  43. package/es/networkTopo/services/metric.js +68 -0
  44. package/es/networkTopo/services/model.js +1283 -0
  45. package/es/networkTopo/services/risk.js +29 -0
  46. package/es/networkTopo/services/topo/auth.js +67 -0
  47. package/es/networkTopo/services/topo/basic.js +727 -0
  48. package/es/networkTopo/services/topo/blacklist.js +60 -0
  49. package/es/networkTopo/services/topo/ciInfo.js +69 -0
  50. package/es/networkTopo/services/topo/constants.js +1 -0
  51. package/es/networkTopo/services/topo/icon.js +131 -0
  52. package/es/networkTopo/services/topo/index.js +18 -0
  53. package/es/networkTopo/services/topo/networkLink.js +33 -0
  54. package/es/networkTopo/services/topo/relation.js +27 -0
  55. package/es/networkTopo/services/topo/resourceWebUrl.js +84 -0
  56. package/es/networkTopo/store/topoTreeMod.js +5 -1
  57. package/es/networkTopo/utils/storage.js +38 -0
  58. package/es/style.js +21 -21
  59. package/es/utils/tree.js +1 -0
  60. package/lib/core/components/TopoView/topoView.js +2 -20
  61. package/lib/core/components/titlebar/index.js +5 -1
  62. package/lib/core/editor/components/EditorPlugin.js +1 -3
  63. package/lib/core/editor/components/Toolbar/buttons.js +2 -2
  64. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +11 -4
  65. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +6 -1
  66. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +5 -0
  67. package/lib/core/editor/components/settings/PropertyView.js +10 -10
  68. package/lib/core/editor/components/settings/Settings.js +9 -1
  69. package/lib/core/editor/components/settings/core/PropertyViewManager.js +4 -3
  70. package/lib/core/editor/components/settings/core/edgePropertyViewAdapter.js +1 -10
  71. package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +7 -4
  72. package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +4 -2
  73. package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +18 -0
  74. package/lib/core/editor/hooks/useKeyboardShortcut.js +1 -1
  75. package/lib/core/hooks/usePolling.js +1 -6
  76. package/lib/core/hooks/useTopoEdit.js +134 -170
  77. package/lib/core/models/Alarm.js +12 -24
  78. package/lib/core/models/TopoApp.js +1 -1
  79. package/lib/core/models/topoData.js +7 -11
  80. package/lib/core/models/utils/linkUtils.js +0 -5
  81. package/lib/core/store/models/topoConfig.js +7 -5
  82. package/lib/core/store/models/topoMod.js +10 -7
  83. package/lib/core/utils/saveSerialize.js +1 -3
  84. package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +13 -2
  85. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +28 -26
  86. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +4 -0
  87. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +17 -17
  88. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +1 -0
  89. package/lib/core/viewer/components/titlebar/BasicTools.js +3 -17
  90. package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +36 -0
  91. package/lib/networkTopo/getTopoData.js +19 -33
  92. package/lib/networkTopo/index.js +1 -5
  93. package/lib/networkTopo/services/alert.js +66 -0
  94. package/lib/networkTopo/services/authorization.js +145 -0
  95. package/lib/networkTopo/services/cmdb.js +977 -0
  96. package/lib/networkTopo/services/index.js +3 -29
  97. package/lib/networkTopo/services/mdc.js +91 -0
  98. package/lib/networkTopo/services/metric.js +82 -0
  99. package/lib/networkTopo/services/model.js +1387 -0
  100. package/lib/networkTopo/services/risk.js +40 -0
  101. package/lib/networkTopo/services/topo/auth.js +79 -0
  102. package/lib/networkTopo/services/topo/basic.js +753 -0
  103. package/lib/networkTopo/services/topo/blacklist.js +72 -0
  104. package/lib/networkTopo/services/topo/ciInfo.js +82 -0
  105. package/lib/networkTopo/services/topo/constants.js +6 -0
  106. package/lib/networkTopo/services/topo/icon.js +144 -0
  107. package/lib/networkTopo/{components/editor/plugins/LayerConfigPlugin.js → services/topo/index.js} +33 -23
  108. package/lib/networkTopo/services/topo/networkLink.js +45 -0
  109. package/lib/networkTopo/services/topo/relation.js +39 -0
  110. package/lib/networkTopo/services/topo/resourceWebUrl.js +95 -0
  111. package/lib/networkTopo/store/topoTreeMod.js +5 -1
  112. package/lib/networkTopo/utils/storage.js +46 -0
  113. package/lib/style.js +21 -21
  114. package/lib/utils/tree.js +1 -0
  115. package/package.json +3 -3
  116. package/es/core/editor/components/plugins/MultipleResourceSelectPlugin.js +0 -15
  117. package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +0 -10
  118. package/es/networkTopo/components/Topology.js +0 -28
  119. package/es/networkTopo/components/editor/plugins/LayerConfigPlugin.js +0 -22
  120. package/es/networkTopo/components/editor/propertyViews/LayerRelatedResourceList.js +0 -48
  121. package/es/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js +0 -35
  122. package/es/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +0 -43
  123. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +0 -39
  124. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +0 -31
  125. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +0 -37
  126. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +0 -49
  127. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/index.js +0 -2
  128. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +0 -630
  129. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/NetworkLinkForm.js +0 -4
  130. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +0 -458
  131. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/index.module.scss +0 -34
  132. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/hooks/useAddLink.js +0 -104
  133. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss +0 -12
  134. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/mock.js +0 -55
  135. package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +0 -187
  136. package/es/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js +0 -178
  137. package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js +0 -103
  138. package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +0 -65
  139. package/es/networkTopo/components/editor/useEditorProps.js +0 -32
  140. package/es/networkTopo/event/index.js +0 -6
  141. package/es/networkTopo/hooks/editor/useDeleteEdges.js +0 -200
  142. package/es/networkTopo/hooks/editor/useGroupSortResources.js +0 -16
  143. package/es/networkTopo/hooks/useTopoEdit.js +0 -26
  144. package/lib/core/editor/components/plugins/MultipleResourceSelectPlugin.js +0 -25
  145. package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +0 -19
  146. package/lib/networkTopo/components/Topology.js +0 -40
  147. package/lib/networkTopo/components/editor/propertyViews/LayerRelatedResourceList.js +0 -63
  148. package/lib/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js +0 -51
  149. package/lib/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +0 -60
  150. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +0 -54
  151. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +0 -42
  152. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +0 -50
  153. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +0 -66
  154. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/index.js +0 -11
  155. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +0 -661
  156. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/NetworkLinkForm.js +0 -12
  157. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +0 -486
  158. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/index.module.scss +0 -34
  159. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/hooks/useAddLink.js +0 -120
  160. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss +0 -12
  161. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/mock.js +0 -60
  162. package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +0 -207
  163. package/lib/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js +0 -205
  164. package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js +0 -121
  165. package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +0 -65
  166. package/lib/networkTopo/components/editor/useEditorProps.js +0 -46
  167. package/lib/networkTopo/event/index.js +0 -11
  168. package/lib/networkTopo/hooks/editor/useDeleteEdges.js +0 -218
  169. package/lib/networkTopo/hooks/editor/useGroupSortResources.js +0 -21
  170. package/lib/networkTopo/hooks/useTopoEdit.js +0 -40
@@ -7,7 +7,6 @@ import TopoGraph, { TopoEvent } from '@riil-frontend/component-topology-graph';
7
7
  import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 通用
8
8
 
9
9
  import showMessage from "../../utils/showMessage";
10
- import TitleBar from "../titlebar/TitleBar";
11
10
  import { TPL_TREE } from "../../../utils/template";
12
11
  import { updateEdgeExpanded } from "../../utils/edgeUtil";
13
12
  import useRouterAdapter from "../../hooks/useRouterAdapter";
@@ -39,7 +38,6 @@ var Topology = function Topology(props) {
39
38
  onLoad = props.onLoad,
40
39
  onDestroy = props.onDestroy,
41
40
  onRefreshTopo = props.onRefresh,
42
- onEnterEdit = props.onEnterEdit,
43
41
  onSave = props.onSave,
44
42
  nodeDeleteable = props.nodeDeleteable,
45
43
  onNodeDelete = props.onNodeDelete,
@@ -205,10 +203,6 @@ var Topology = function Topology(props) {
205
203
  rightEventHandle(event);
206
204
  break;
207
205
 
208
- case TopoEvent.EVENT_DATA_PICK:
209
- topoEdit.onBindData(event.data);
210
- break;
211
-
212
206
  case TopoEvent.EVENT_DATA_DELETE:
213
207
  topoEdit.onDeleteElement(event.data);
214
208
  break;
@@ -222,10 +216,6 @@ var Topology = function Topology(props) {
222
216
  onRefresh(event.data);
223
217
  break;
224
218
 
225
- case TopoEvent.EVENT_EDIT_EXIT:
226
- topoEdit.onExitEdit(event.data);
227
- break;
228
-
229
219
  case TopoEvent.EVENT_CONTEXT_TOOL:
230
220
  rlog.debug('自定义工具栏事件', event);
231
221
  break;
@@ -264,12 +254,7 @@ var Topology = function Topology(props) {
264
254
  return /*#__PURE__*/React.createElement("div", {
265
255
  className: styles.topoView,
266
256
  "data-version": topo.version
267
- }, titleBar !== false && (titleBar || /*#__PURE__*/React.createElement(TitleBar, {
268
- topo: topo,
269
- viewerProps: viewerProps,
270
- onEnterEdit: onEnterEdit,
271
- topoEditApi: topoEdit
272
- })), isEditMode && /*#__PURE__*/React.createElement(EditorToolbar, {
257
+ }, titleBar !== false && titleBar, isEditMode && /*#__PURE__*/React.createElement(EditorToolbar, {
273
258
  topo: topo,
274
259
  topoEdit: topoEdit,
275
260
  topoContext: {
@@ -311,8 +296,6 @@ Topology.propTypes = {
311
296
  viewerProps: PropTypes.object,
312
297
  editorProps: PropTypes.object,
313
298
  topoContext: PropTypes.object,
314
- // 进入编辑模式
315
- onEnterEdit: PropTypes.func,
316
299
  onRefresh: PropTypes.func,
317
300
  onSave: PropTypes.func,
318
301
  nodeDeleteable: PropTypes.func,
@@ -324,7 +307,7 @@ Topology.propTypes = {
324
307
  /**
325
308
  * @deprecated 工具栏
326
309
  */
327
- titleBar: PropTypes.oneOf([React.ReactNode, false])
310
+ titleBar: PropTypes.any
328
311
  };
329
312
  Topology.defaultProps = {
330
313
  defaultEnterEditMode: false,
@@ -5,4 +5,5 @@ import NodesDragSwitch from "../../viewer/components/titlebar/widgets/NodesDragS
5
5
  import AlarmListShowButton from "../../viewer/components/titlebar/widgets/AlarmListShowButton";
6
6
  import TitleWidget from "./widgets/TitleWidget";
7
7
  import ViewerTools from "../../viewer/components/titlebar/ViewerTools";
8
- export { TitleBar, SearchWidget, NodesDragSwitch, DisplaySettingButton, AlarmListShowButton, TitleWidget, ViewerTools };
8
+ import DebugTools from "../../editor/components/titlebar/widgets/DebugTools";
9
+ export { TitleBar, SearchWidget, NodesDragSwitch, DisplaySettingButton, AlarmListShowButton, TitleWidget, ViewerTools, DebugTools };
@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { useEffect } from 'react';
3
3
  import CustomIconPlugin from "./CustomIconPlugin";
4
4
  import SaveLoading from "./plugins/SaveLoading";
5
- import MultipleResourceSelectPlugin from "./plugins/MultipleResourceSelectPlugin";
6
5
  import GroupAddResourceDrawerPlugin from "./GroupAddResourceDrawerPlugin";
7
6
  import MetricPollingPlugin from "../../viewer/components/plugins/MetricPollingPlugin";
8
7
  import AddElementThemePlugin from "./plugins/AddElementThemePlugin";
@@ -27,7 +26,7 @@ export default function TopoEditorPlugin(props) {
27
26
  return null;
28
27
  }
29
28
 
30
- var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
29
+ var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
31
30
  return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
32
31
  return /*#__PURE__*/React.createElement(Plugin, _extends({
33
32
  key: index,
@@ -32,7 +32,7 @@ export default function getButtons(isNetworkTopo) {
32
32
  Divider, NodeImageButton, // 替换图片
33
33
  NodeSizeButton, // 图片尺寸
34
34
  Divider, Layout, // 布局方式
35
- NodeAlignWidget // 对齐方式
36
- // SearchWidget, // 搜索
35
+ NodeAlignWidget, // 对齐方式
36
+ SearchWidget // 搜索
37
37
  ]);
38
38
  }
@@ -1,15 +1,23 @@
1
1
  import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
3
  var _excluded = ["color", "background", "opacity", "bold", "italic"];
4
- import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
5
4
  import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
6
5
  export function getTextStyle(element) {
6
+ var opacity = element.a('edge.tag.opacity');
7
+
8
+ if (opacity === null || opacity === undefined) {
9
+ opacity = 1;
10
+ }
11
+
7
12
  return _extends({
8
13
  color: parseColor(element.a('edge.tag.color')),
9
14
  fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
15
+ fontSize: element.a('edge.tag.fontSize'),
10
16
  bold: !!element.a('edge.tag.fontBold'),
11
- itatic: !!element.a('edge.tag.fontItalic')
12
- }, parseBackground(element.a('edge.tag.background')));
17
+ italic: !!element.a('edge.tag.fontItalic')
18
+ }, parseBackground(element.a('edge.tag.background')), {
19
+ opacity: opacity
20
+ });
13
21
  }
14
22
  export function setTextStyle(element, style, topo) {
15
23
  var color = style.color,
@@ -1,6 +1,6 @@
1
1
  import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
- var _excluded = ["color", "background", "opacity", "bold", "italic"];
3
+ var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
4
4
  import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
5
5
  import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
6
6
  export function getTextStyle(element) {
@@ -16,6 +16,7 @@ export function setTextStyle(element, style, topo) {
16
16
  opacity = style.opacity,
17
17
  bold = style.bold,
18
18
  italic = style.italic,
19
+ underline = style.underline,
19
20
  otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
20
21
 
21
22
  var tagStyle = _extends({}, otherStyle);
@@ -32,6 +33,10 @@ export function setTextStyle(element, style, topo) {
32
33
  tagStyle.fontItalic = italic;
33
34
  }
34
35
 
36
+ if ('underline' in style) {
37
+ tagStyle.fontUnderline = underline;
38
+ }
39
+
35
40
  if ('background' in style) {
36
41
  // 背景颜色
37
42
  var prevStyle = getTextStyle(element);
@@ -86,6 +86,11 @@ export function getTextStyle(htSelection, styleNames) {
86
86
 
87
87
  var val = fieldValueList[0];
88
88
  var different = fieldValueList.filter(function (item) {
89
+ // 如果是颜色,特殊处理
90
+ if (item && val && item.rgb) {
91
+ 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;
92
+ }
93
+
89
94
  return item !== val;
90
95
  });
91
96
 
@@ -5,8 +5,11 @@ import { adapterGetEdgePropertyViewType, addEdgePropertyViews } from "./core/edg
5
5
  import PropertyViewManager from "./core/PropertyViewManager";
6
6
  import Settings from "./Settings";
7
7
  import styles from "./Settings.module.scss";
8
+
9
+ function PropertyViewProvider(props) {}
10
+
8
11
  export default function PropertyPanel(props) {
9
- var _classNames;
12
+ var _editorProps$property, _editorProps$property2, _classNames;
10
13
 
11
14
  var topo = props.topo,
12
15
  editorProps = props.editorProps;
@@ -18,21 +21,19 @@ export default function PropertyPanel(props) {
18
21
  var _store$useModelState = store.useModelState('selection'),
19
22
  selection = _store$useModelState.selection;
20
23
 
21
- var _topo$store$useModel = topo.store.useModel('topoEdit'),
22
- topoEditState = _topo$store$useModel[0],
23
- topoEditDispatchers = _topo$store$useModel[1];
24
-
24
+ var topoEditState = topo.store.useModelState('topoEdit');
25
25
  var propertyPanelVisible = topoEditState.propertyPanelVisible;
26
26
  var propertyViewManager = useMemo(function () {
27
27
  return new PropertyViewManager(topo);
28
- }, []); // 临时适配连线属性面板类型,后期组件支持自定义适配
29
-
30
- addEdgePropertyViews(propertyViewManager, editorProps);
28
+ }, []);
29
+ propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
31
30
 
32
- propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
31
+ propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
33
32
  return adapterGetEdgePropertyViewType(elements, editorProps);
34
- };
33
+ }; // 临时适配连线属性面板类型,后期组件支持自定义适配
35
34
 
35
+
36
+ addEdgePropertyViews(propertyViewManager, editorProps);
36
37
  var PropertyView = propertyViewManager.getPropertyView();
37
38
  useEffect(function () {
38
39
  if (graphLoaded) {
@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { useEffect, useMemo, useState } from 'react';
3
3
  import useSettingRuntimeState from "./useSettingRuntimeState";
4
4
  import updateElementProperty from "./core/updateElementProperty";
5
+ import { isEdge } from "../../../../utils/htElementUtils";
5
6
 
6
7
  function buildElementValues(selection) {
7
8
  var values = _extends({}, selection[0]);
@@ -33,10 +34,16 @@ export default function PropertyViewContainer(props) {
33
34
  var elementProps = {};
34
35
 
35
36
  if (selection.length === 1) {
37
+ var element = selectionElements[0];
36
38
  elementProps = {
37
- selectionElement: selectionElements[0],
39
+ element: element,
40
+ selectionElement: element,
38
41
  values: singleElementValues
39
42
  };
43
+
44
+ if (isEdge(element)) {
45
+ elementProps.edge = element;
46
+ }
40
47
  }
41
48
 
42
49
  return /*#__PURE__*/React.createElement(PropertyView, _extends({
@@ -4,17 +4,18 @@ import _getPropertyViewType from "./getPropertyViewType";
4
4
 
5
5
  var PropertyViewManager = /*#__PURE__*/function () {
6
6
  function PropertyViewManager(topo) {
7
- this.viewMap = propertyViews;
7
+ this.viewMap = _extends({}, propertyViews);
8
8
  this.topo = void 0;
9
9
  this.customGetViewType = void 0;
10
10
  this.topo = topo;
11
+ this.topo.propertyViewManager = this;
11
12
  this.open = this.open.bind(this);
12
13
  }
13
14
 
14
15
  var _proto = PropertyViewManager.prototype;
15
16
 
16
- _proto.updateViews = function updateViews(viewMap) {
17
- this.viewMap = _extends({}, propertyViews, viewMap);
17
+ _proto.addViews = function addViews(viewMap) {
18
+ Object.assign(this.viewMap, viewMap);
18
19
  };
19
20
 
20
21
  _proto.init = function init() {
@@ -1,5 +1,4 @@
1
1
  import { isEdge } from "../../../../../utils/htElementUtils";
2
- import addEdgeProps from "../propertyViews/edge/addEdgeProps";
3
2
  export function adapterGetEdgePropertyViewType(selection, editorProps) {
4
3
  var fn = editorProps.getEdgePropertyViewType;
5
4
 
@@ -13,10 +12,5 @@ export function adapterGetEdgePropertyViewType(selection, editorProps) {
13
12
  return null;
14
13
  }
15
14
  export function addEdgePropertyViews(propertyViewManager, editorProps) {
16
- var oldMap = editorProps.edgePropertyViews || {};
17
- var map = {};
18
- Object.keys(oldMap).forEach(function (name) {
19
- map[name] = addEdgeProps(oldMap[name]);
20
- });
21
- propertyViewManager.updateViews(map);
15
+ propertyViewManager.addViews(editorProps.edgePropertyViews || {});
22
16
  }
@@ -6,9 +6,9 @@ import _Collapse from "@alifd/next/es/collapse";
6
6
  import _Select from "@alifd/next/es/select";
7
7
  import _regeneratorRuntime from "@babel/runtime/regenerator";
8
8
  import React, { useEffect } from "react";
9
- import useHtElement from "../../../../../../common/hooks/useHtElement";
10
9
  import textStyles from "../../../../../../common/text.module.scss";
11
10
  import NodeRelateResourceButton from "./NodeRelateResourceButton";
11
+ import PlatformDisplay from "./PlatformDisplay";
12
12
  var Option = _Select.Option;
13
13
  var CollapsePanel = _Collapse.Panel;
14
14
 
@@ -142,12 +142,15 @@ export default function Data(props) {
142
142
  nodeElement: node,
143
143
  node: values,
144
144
  topo: topo,
145
- topoEditApi: topoEditApi
145
+ topoEditApi: topoEditApi,
146
+ nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
146
147
  }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
147
148
  label: "\u5173\u8054\u62D3\u6251"
148
149
  }, /*#__PURE__*/React.createElement(RelateTopoTree, {
149
150
  name: "attrObject.bindTopo",
150
151
  topo: topo,
151
152
  onChange: handleBindTopoChange
152
- })))));
153
+ })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/React.createElement(_Form.Item, {
154
+ label: "\u6240\u5C5E\u5E73\u53F0"
155
+ }, /*#__PURE__*/React.createElement(PlatformDisplay, props)))));
153
156
  }
@@ -1,7 +1,7 @@
1
1
  import _Button from "@alifd/next/es/button";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
3
  import React, { useState } from 'react';
4
- import BindResourceDrawer from "./BindResourceDrawer";
4
+ import DefaultBindResourceDrawer from "./BindResourceDrawer";
5
5
  import { isClusterMemberHtElement } from "../../../../../../../utils/clusterUtil";
6
6
  /**
7
7
  * @return {React.ReactNode | null}
@@ -13,7 +13,8 @@ export default function NodeRelateResourceButton(props) {
13
13
  var nodeElement = props.nodeElement,
14
14
  topo = props.topo,
15
15
  topoEditApi = props.topoEditApi,
16
- node = props.node;
16
+ node = props.node,
17
+ nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
17
18
  var hide = isClusterMemberHtElement(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
18
19
  var currentResId = node.tag;
19
20
 
@@ -21,6 +22,7 @@ export default function NodeRelateResourceButton(props) {
21
22
  visible = _useState[0],
22
23
  setVisible = _useState[1];
23
24
 
25
+ var BindResourceDrawer = nodeBindResourceDrawerComponent || DefaultBindResourceDrawer;
24
26
  return !hide ? /*#__PURE__*/React.createElement(_Button, {
25
27
  type: "primary",
26
28
  text: true,
@@ -0,0 +1,10 @@
1
+ import React from 'react';
2
+
3
+ function PlatformDisplay(props) {
4
+ var topo = props.topo,
5
+ node = props.node;
6
+ var data = topo.dataModel.useDataById(node.getTag());
7
+ return data.isSubResource ? data.attributes.platform : '本级平台';
8
+ }
9
+
10
+ export default PlatformDisplay;
@@ -22,7 +22,7 @@ export default function useKeyboardShortcut(props) {
22
22
 
23
23
  }
24
24
 
25
- if (e.keyCode === 32) {
25
+ if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
26
26
  // 空格
27
27
  var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
28
28
  viewMouseMode = _topo$store$getModelS.viewMouseMode;
@@ -13,12 +13,7 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
13
13
  var usePolling = function usePolling(props) {
14
14
  var topo = props.topo;
15
15
  var store = topo.store;
16
- var topoState = store.useModelState('topoMod');
17
-
18
- var _store$useModel = store.useModel('topoBizMod'),
19
- bizState = _store$useModel[0],
20
- bizDispatchers = _store$useModel[1];
21
-
16
+ var bizState = store.useModelState('topoBizMod');
22
17
  var resAndMetrics = bizState.resAndMetrics,
23
18
  pollingSwitch = bizState.pollingSwitch;
24
19
  var displayConfig = topo.store.useModelState('displayConfig');