@riil-frontend/component-topology 12.0.0-dev.4 → 12.0.0-dev.41

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 (228) hide show
  1. package/build/1.js +1 -1
  2. package/build/index.css +1 -1
  3. package/build/index.js +13 -13
  4. package/es/components/BatchAttrMetric/setting.js +1 -1
  5. package/es/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js +1 -1
  6. package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
  7. package/es/components/TemplateButton/index.module.scss +1 -1
  8. package/es/core/components/AlarmListPanel/components/AlarmListItem.js +59 -4
  9. package/es/core/components/AlarmListPanel/index.js +1 -1
  10. package/es/core/components/DisplaySettingDrawer/DisplaySetting.js +1 -1
  11. package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +2 -2
  12. package/es/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js +1 -1
  13. package/es/core/components/DisplaySettingDrawer/components/NodeAttrSettingDrawer.js +1 -1
  14. package/es/core/components/ResourceViewAttributeSetting/Setting.js +1 -1
  15. package/es/core/components/TopoView/topoView.js +6 -2
  16. package/es/core/editor/components/BackgroundView/index.js +1 -1
  17. package/es/core/editor/components/CustomIconPlugin/UploadIconDialog.js +1 -1
  18. package/es/core/editor/components/EditorPlugin.js +1 -1
  19. package/es/core/editor/components/Sidebar/views/ComponentPanel.js +1 -1
  20. package/es/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js +1 -1
  21. package/es/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js +1 -1
  22. package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +1 -1
  23. package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +1 -1
  24. package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePalette.js +1 -1
  25. package/es/core/editor/components/Sidebar/views/LinkPanel.js +1 -1
  26. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +5 -12
  27. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +27 -10
  28. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +21 -1
  29. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +9 -0
  30. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +2 -2
  31. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +17 -3
  32. package/es/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js +1 -1
  33. package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +1 -1
  34. package/es/core/editor/components/settings/propertyViews/layer/BasicSetting.js +1 -1
  35. package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +1 -1
  36. package/es/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js +1 -1
  37. package/es/core/editor/hooks/useKeyboardShortcut.js +3 -1
  38. package/es/core/editor/store/background.js +1 -1
  39. package/es/core/editor/store/historyManager.js +1 -1
  40. package/es/core/editor/store/topoEdit.js +1 -1
  41. package/es/core/editor/utils/copyElementUtil.js +12 -0
  42. package/es/core/editor/utils/edgeTypeStyleUtil.js +8 -7
  43. package/es/core/hooks/ht/useHtDataPropertyChangeListener.js +1 -1
  44. package/es/core/hooks/useAlarm.js +131 -81
  45. package/es/core/hooks/useCiAttributeChange.js +1 -1
  46. package/es/core/hooks/useCmpLinkAlarm.js +153 -0
  47. package/es/core/hooks/useEventData.js +1 -2
  48. package/es/core/hooks/useGraphAlarmDisplay.js +91 -56
  49. package/es/core/hooks/useManageStatus.js +1 -1
  50. package/es/core/hooks/usePolling.js +1 -1
  51. package/es/core/hooks/useResourceConfig.js +1 -3
  52. package/es/core/hooks/useTopoEdit.js +51 -54
  53. package/es/core/models/Alarm.js +69 -143
  54. package/es/core/models/AttributeMetricDisplay.js +15 -6
  55. package/es/core/models/HistoryManager.js +1 -1
  56. package/es/core/models/SelectionModel.js +1 -1
  57. package/es/core/models/TopoApp.js +2 -2
  58. package/es/core/models/attributeFormatter/formatter/graphTransform.js +1 -1
  59. package/es/core/models/attributeFormatter/index.js +1 -1
  60. package/es/core/models/cache/CiCache.d.ts +1 -1
  61. package/es/core/models/cache/CiCache.js +3 -3
  62. package/es/core/models/cache/CiTypeCache.js +5 -1
  63. package/es/core/models/cache/DictCache.js +1 -1
  64. package/es/core/models/plugins/resourceWebControllUrl.js +1 -1
  65. package/es/core/models/tagstips/ElementTagTipConfig.js +1 -1
  66. package/es/core/models/topoData.js +0 -1
  67. package/es/core/services/alarm.js +1 -1
  68. package/es/core/services/index.js +1 -1
  69. package/es/core/services/topo/basic.js +2 -2
  70. package/es/core/store/models/customIcon.js +1 -1
  71. package/es/core/store/models/displayConfig.js +1 -1
  72. package/es/core/store/models/selection.js +1 -1
  73. package/es/core/store/models/topoBaseInfoOverview.js +1 -1
  74. package/es/core/store/models/topoBizMod.js +1 -1
  75. package/es/core/store/models/topoConfig.js +7 -10
  76. package/es/core/store/models/topoGraphView.js +1 -1
  77. package/es/core/store/models/topoMod.js +82 -135
  78. package/es/core/store/models/viewer/lock.js +1 -1
  79. package/es/core/store/models/viewer/resourceDetail.js +1 -1
  80. package/es/core/store/models/viewer/resourceWebControllUrlSetting.js +1 -1
  81. package/es/core/utils/edgeUtil.js +10 -1
  82. package/es/core/utils/metricUtil.js +8 -4
  83. package/es/core/utils/showGraphManageStatusUtil.js +3 -2
  84. package/es/core/utils/showMessage.js +1 -1
  85. package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js +1 -0
  86. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +46 -21
  87. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +3 -1
  88. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +4 -2
  89. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +1 -1
  90. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +1 -1
  91. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +20 -18
  92. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
  93. package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +1 -1
  94. package/es/core/viewer/components/plugins/ViewerPlugin.js +3 -1
  95. package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +1 -5
  96. package/es/networkTopo/components/Link/index.js +1 -1
  97. package/es/networkTopo/components/TopoView.js +6 -11
  98. package/es/networkTopo/hooks/useEdgeExpand.js +2 -3
  99. package/es/networkTopo/hooks/viewer/useRelateTopo.js +1 -1
  100. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +1 -1
  101. package/es/networkTopo/models/LinkTagsTipsBuilder.js +1 -1
  102. package/es/networkTopo/models/TopoCenter.js +1 -1
  103. package/es/networkTopo/services/model.js +1 -1
  104. package/es/networkTopo/services/topo/basic.js +4 -4
  105. package/es/networkTopo/services/topo/ciInfo.js +1 -1
  106. package/es/networkTopo/store/functionAuth.js +1 -1
  107. package/es/networkTopo/store/topoCenter.js +261 -224
  108. package/es/networkTopo/store/topoTreeMod.js +1 -1
  109. package/es/networkTopo/utils/exportData.js +1 -1
  110. package/es/style.js +2 -2
  111. package/es/utils/ResourceConfigUtil.js +4 -37
  112. package/es/utils/ciRefAttributeTranslateUtil.d.ts +19 -0
  113. package/es/utils/ciRefAttributeTranslateUtil.js +155 -0
  114. package/es/utils/format.js +1 -1
  115. package/es/utils/topoData.js +4 -2
  116. package/lib/components/BatchAttrMetric/setting.js +2 -2
  117. package/lib/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js +2 -2
  118. package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +2 -2
  119. package/lib/components/TemplateButton/index.module.scss +1 -1
  120. package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +61 -4
  121. package/lib/core/components/AlarmListPanel/index.js +1 -1
  122. package/lib/core/components/DisplaySettingDrawer/DisplaySetting.js +2 -2
  123. package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +2 -2
  124. package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js +3 -3
  125. package/lib/core/components/DisplaySettingDrawer/components/NodeAttrSettingDrawer.js +2 -2
  126. package/lib/core/components/ResourceViewAttributeSetting/Setting.js +2 -2
  127. package/lib/core/components/TopoView/topoView.js +14 -10
  128. package/lib/core/editor/components/BackgroundView/index.js +3 -3
  129. package/lib/core/editor/components/CustomIconPlugin/UploadIconDialog.js +2 -2
  130. package/lib/core/editor/components/EditorPlugin.js +3 -3
  131. package/lib/core/editor/components/Sidebar/views/ComponentPanel.js +2 -4
  132. package/lib/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js +1 -1
  133. package/lib/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js +1 -1
  134. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +2 -2
  135. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +2 -2
  136. package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePalette.js +2 -4
  137. package/lib/core/editor/components/Sidebar/views/LinkPanel.js +2 -4
  138. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +6 -12
  139. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +27 -9
  140. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +21 -1
  141. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +8 -0
  142. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
  143. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +16 -2
  144. package/lib/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js +5 -5
  145. package/lib/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +1 -1
  146. package/lib/core/editor/components/settings/propertyViews/layer/BasicSetting.js +1 -1
  147. package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +3 -3
  148. package/lib/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js +2 -2
  149. package/lib/core/editor/hooks/useKeyboardShortcut.js +2 -0
  150. package/lib/core/editor/store/background.js +1 -1
  151. package/lib/core/editor/store/historyManager.js +1 -1
  152. package/lib/core/editor/store/topoEdit.js +1 -1
  153. package/lib/core/editor/utils/copyElementUtil.js +15 -0
  154. package/lib/core/editor/utils/edgeTypeStyleUtil.js +8 -6
  155. package/lib/core/hooks/ht/useHtDataPropertyChangeListener.js +1 -3
  156. package/lib/core/hooks/useAlarm.js +130 -79
  157. package/lib/core/hooks/useCiAttributeChange.js +1 -1
  158. package/lib/core/hooks/useCmpLinkAlarm.js +166 -0
  159. package/lib/core/hooks/useEventData.js +1 -2
  160. package/lib/core/hooks/useGraphAlarmDisplay.js +91 -55
  161. package/lib/core/hooks/useManageStatus.js +1 -1
  162. package/lib/core/hooks/usePolling.js +3 -3
  163. package/lib/core/hooks/useResourceConfig.js +1 -3
  164. package/lib/core/hooks/useTopoEdit.js +50 -53
  165. package/lib/core/models/Alarm.js +76 -152
  166. package/lib/core/models/AttributeMetricDisplay.js +18 -6
  167. package/lib/core/models/HistoryManager.js +8 -8
  168. package/lib/core/models/SelectionModel.js +5 -5
  169. package/lib/core/models/TopoApp.js +4 -6
  170. package/lib/core/models/attributeFormatter/formatter/graphTransform.js +2 -4
  171. package/lib/core/models/attributeFormatter/index.js +1 -1
  172. package/lib/core/models/cache/CiCache.d.ts +1 -1
  173. package/lib/core/models/cache/CiCache.js +3 -3
  174. package/lib/core/models/cache/CiTypeCache.js +6 -2
  175. package/lib/core/models/cache/DictCache.js +2 -2
  176. package/lib/core/models/plugins/resourceWebControllUrl.js +2 -2
  177. package/lib/core/models/tagstips/ElementTagTipConfig.js +2 -2
  178. package/lib/core/models/topoData.js +0 -1
  179. package/lib/core/services/alarm.js +2 -2
  180. package/lib/core/services/index.js +1 -1
  181. package/lib/core/services/topo/basic.js +2 -2
  182. package/lib/core/store/models/customIcon.js +3 -3
  183. package/lib/core/store/models/displayConfig.js +1 -1
  184. package/lib/core/store/models/selection.js +1 -1
  185. package/lib/core/store/models/topoBaseInfoOverview.js +1 -1
  186. package/lib/core/store/models/topoBizMod.js +1 -1
  187. package/lib/core/store/models/topoConfig.js +7 -10
  188. package/lib/core/store/models/topoGraphView.js +1 -1
  189. package/lib/core/store/models/topoMod.js +89 -142
  190. package/lib/core/store/models/viewer/lock.js +1 -1
  191. package/lib/core/store/models/viewer/resourceDetail.js +1 -1
  192. package/lib/core/store/models/viewer/resourceWebControllUrlSetting.js +1 -1
  193. package/lib/core/utils/edgeUtil.js +12 -1
  194. package/lib/core/utils/metricUtil.js +8 -4
  195. package/lib/core/utils/showGraphManageStatusUtil.js +3 -2
  196. package/lib/core/utils/showMessage.js +2 -2
  197. package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js +1 -0
  198. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +48 -21
  199. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +3 -1
  200. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +4 -2
  201. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +6 -6
  202. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +3 -5
  203. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +20 -18
  204. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
  205. package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +2 -2
  206. package/lib/core/viewer/components/plugins/ViewerPlugin.js +3 -1
  207. package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +1 -5
  208. package/lib/networkTopo/components/Link/index.js +2 -2
  209. package/lib/networkTopo/components/TopoView.js +5 -14
  210. package/lib/networkTopo/hooks/useEdgeExpand.js +2 -3
  211. package/lib/networkTopo/hooks/viewer/useRelateTopo.js +4 -4
  212. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +3 -5
  213. package/lib/networkTopo/models/LinkTagsTipsBuilder.js +3 -3
  214. package/lib/networkTopo/models/TopoCenter.js +1 -1
  215. package/lib/networkTopo/services/model.js +1 -3
  216. package/lib/networkTopo/services/topo/basic.js +4 -6
  217. package/lib/networkTopo/services/topo/ciInfo.js +0 -2
  218. package/lib/networkTopo/store/functionAuth.js +1 -1
  219. package/lib/networkTopo/store/topoCenter.js +263 -226
  220. package/lib/networkTopo/store/topoTreeMod.js +5 -5
  221. package/lib/networkTopo/utils/exportData.js +1 -3
  222. package/lib/style.js +2 -2
  223. package/lib/utils/ResourceConfigUtil.js +4 -39
  224. package/lib/utils/ciRefAttributeTranslateUtil.d.ts +19 -0
  225. package/lib/utils/ciRefAttributeTranslateUtil.js +168 -0
  226. package/lib/utils/format.js +1 -1
  227. package/lib/utils/topoData.js +4 -2
  228. package/package.json +4 -4
@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
9
9
 
10
10
  var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
11
11
 
12
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
12
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
13
13
 
14
14
  var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
15
15
 
@@ -39,7 +39,7 @@ function HtCustomImagePanel(props) {
39
39
  icons: icons
40
40
  });
41
41
  } catch (error) {
42
- _rlog["default"].error('初始化资源面板失败', error);
42
+ _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
43
43
  }
44
44
 
45
45
  var hanleResize = function hanleResize() {
@@ -7,7 +7,7 @@ exports["default"] = HtImagePalette;
7
7
 
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
 
10
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
10
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
11
11
 
12
12
  var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
13
13
 
@@ -39,7 +39,7 @@ function HtImagePalette(props) {
39
39
  icons: icons
40
40
  });
41
41
  } catch (error) {
42
- _rlog["default"].error('初始化资源面板失败', error);
42
+ _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
43
43
  }
44
44
 
45
45
  var hanleResize = function hanleResize() {
@@ -1,13 +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["default"] = ImagePalette;
7
5
 
8
6
  var _react = _interopRequireWildcard(require("react"));
9
7
 
10
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
8
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
11
9
 
12
10
  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); }
13
11
 
@@ -35,7 +33,7 @@ function ImagePalette(props) {
35
33
  icons: icons
36
34
  });
37
35
  } catch (error) {
38
- _rlog["default"].error('初始化资源面板失败', error);
36
+ _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
39
37
  } // 注销组件
40
38
 
41
39
 
@@ -1,13 +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["default"] = void 0;
7
5
 
8
6
  var _react = _interopRequireWildcard(require("react"));
9
7
 
10
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
8
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
11
9
 
12
10
  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); }
13
11
 
@@ -32,7 +30,7 @@ function LinkPanel(props) {
32
30
  try {
33
31
  viewRef.current = htTopo.createLinkPalette(container);
34
32
  } catch (error) {
35
- _rlog["default"].error('初始化资源面板失败', error);
33
+ _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
36
34
  } // 注销组件
37
35
 
38
36
 
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
13
13
 
14
+ var _edgeUtil = require("../../../../../utils/edgeUtil");
15
+
14
16
  var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
15
17
 
16
18
  var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -52,15 +54,7 @@ function EdgeColorButton(props) {
52
54
  };
53
55
 
54
56
  var getLines = function getLines(list) {
55
- // eslint-disable-next-line prefer-const
56
- var arr = [];
57
- loopEdges(list, function (edge) {
58
- // eslint-disable-next-line eqeqeq
59
- if (edge.getAttrObject().type == 'line') {
60
- arr.push(edge);
61
- }
62
- });
63
- return arr;
57
+ return list.filter(_edgeUtil.isCustomEdge);
64
58
  };
65
59
 
66
60
  (0, _react.useEffect)(function () {
@@ -69,7 +63,7 @@ function EdgeColorButton(props) {
69
63
  var list = getLines(edges);
70
64
  setLineWidth(1); // eslint-disable-next-line eqeqeq
71
65
 
72
- if (selection.length == 1 && selection[0].a('type') == 'line') {
66
+ if (selection.length == 1 && list.length === 1) {
73
67
  setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);
74
68
  }
75
69
 
@@ -83,7 +77,7 @@ function EdgeColorButton(props) {
83
77
  var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
84
78
  loopEdges(edges, function (edge) {
85
79
  // eslint-disable-next-line eqeqeq
86
- if (edge.getAttrObject().type == 'line') {
80
+ if ((0, _edgeUtil.isCustomEdge)(edge)) {
87
81
  var color = colors.hex;
88
82
  edge.s('edge.color', color);
89
83
  edge.s('edge.dash.color', color);
@@ -111,7 +105,7 @@ function EdgeColorButton(props) {
111
105
  topo.historyManager.beginTransaction();
112
106
  loopEdges(edges, function (edge) {
113
107
  // eslint-disable-next-line eqeqeq
114
- if (edge.getAttrObject().type == 'line') {
108
+ if ((0, _edgeUtil.isCustomEdge)(edge)) {
115
109
  edge.s('edge.dash.width', width);
116
110
  edge.s('edge.width', width);
117
111
  var style = edge.a('styles') || {};
@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = void 0;
7
7
 
8
+ var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
9
+
8
10
  var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
9
11
 
10
12
  var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
@@ -160,12 +162,19 @@ function EdgeType(props) {
160
162
  className: _EdgeTypeModule["default"].lineBox
161
163
  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
162
164
  field: field,
163
- inline: true,
164
165
  labelAlign: "top"
165
166
  }, /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
166
167
  name: "lineButton"
167
- })), /*#__PURE__*/_react["default"].createElement(FormItem, {
168
- label: "\u8D77\u70B9"
168
+ })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_box["default"], {
169
+ direction: "row",
170
+ style: {
171
+ gap: 8
172
+ }
173
+ }, /*#__PURE__*/_react["default"].createElement(FormItem, {
174
+ label: "\u8D77\u70B9",
175
+ style: {
176
+ margin: 0
177
+ }
169
178
  }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
170
179
  name: "startPoint",
171
180
  placeholder: " ",
@@ -173,7 +182,8 @@ function EdgeType(props) {
173
182
  container: function container(trigger) {
174
183
  return trigger.parentNode;
175
184
  }
176
- }
185
+ },
186
+ className: _EdgeTypeModule["default"].endPointSelect
177
187
  }, START_TYPE_OPTIONS.map(function (item, index) {
178
188
  return /*#__PURE__*/_react["default"].createElement(Option, {
179
189
  value: item.value,
@@ -186,7 +196,10 @@ function EdgeType(props) {
186
196
  className: _EdgeTypeModule["default"].iconImg
187
197
  }));
188
198
  }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
189
- label: "\u7EC8\u70B9"
199
+ label: "\u7EC8\u70B9",
200
+ style: {
201
+ margin: 0
202
+ }
190
203
  }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
191
204
  name: "endPoint",
192
205
  placeholder: " ",
@@ -194,7 +207,8 @@ function EdgeType(props) {
194
207
  container: function container(trigger) {
195
208
  return trigger.parentNode;
196
209
  }
197
- }
210
+ },
211
+ className: _EdgeTypeModule["default"].endPointSelect
198
212
  }, END_TYPE_OPTIONS.map(function (item, index) {
199
213
  return /*#__PURE__*/_react["default"].createElement(Option, {
200
214
  value: item.value,
@@ -207,7 +221,10 @@ function EdgeType(props) {
207
221
  className: _EdgeTypeModule["default"].iconImg
208
222
  }));
209
223
  }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
210
- label: "\u7C7B\u578B"
224
+ label: "\u7C7B\u578B",
225
+ style: {
226
+ margin: 0
227
+ }
211
228
  }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
212
229
  name: "lineMold",
213
230
  popupProps: {
@@ -215,7 +232,8 @@ function EdgeType(props) {
215
232
  return trigger.parentNode;
216
233
  }
217
234
  },
218
- placeholder: " "
235
+ placeholder: " ",
236
+ className: _EdgeTypeModule["default"].lineMoldSelect
219
237
  }, LINE_MOLD_OPTIONS.map(function (item, index) {
220
238
  return /*#__PURE__*/_react["default"].createElement(Option, {
221
239
  value: item.value,
@@ -227,7 +245,7 @@ function EdgeType(props) {
227
245
  alt: "",
228
246
  className: _EdgeTypeModule["default"].iconImg
229
247
  }));
230
- })))));
248
+ })))))));
231
249
  }
232
250
 
233
251
  EdgeType.defaultProps = {
@@ -1,10 +1,30 @@
1
1
  @import '~@alifd/next/variables.scss';
2
2
 
3
3
  .lineBox{
4
- width: 236px;
5
4
  background: #FFFFFF;
6
5
  border-radius: 4px;
7
6
  margin-bottom: -7px;
7
+
8
+ .endPointSelect {
9
+ min-width: 0;
10
+ width: 64px;
11
+ :global {
12
+ .#{$css-prefix}select-inner {
13
+ min-width:0 !important;
14
+ }
15
+ }
16
+ }
17
+
18
+ .lineMoldSelect {
19
+ min-width: 0;
20
+ width: 88px;
21
+ :global {
22
+ .#{$css-prefix}select-inner {
23
+ min-width:0 !important;
24
+ }
25
+ }
26
+ }
27
+
8
28
  :global {
9
29
  .#{$css-prefix}form-item:first-child{
10
30
  margin-top: 0;
@@ -55,6 +55,14 @@ var LINE_TYPE_OPTIONS = [{
55
55
  // },
56
56
  ];
57
57
 
58
+ if (localStorage.getItem('topo.test.edge.customType') === 'true') {
59
+ LINE_TYPE_OPTIONS.push({
60
+ value: 'points',
61
+ label: '自由线形',
62
+ icon: 'topo_linear_icon_pointsline'
63
+ });
64
+ }
65
+
58
66
  var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
59
67
  var value = props.value,
60
68
  onChange = props.onChange,
@@ -69,7 +69,7 @@ function EdgeTypeButton(props) {
69
69
  return;
70
70
  }
71
71
 
72
- (0, _edgeTypeStyleUtil.setEdgesAndChildren)(topo, edges, function (edge) {
72
+ (0, _edgeTypeStyleUtil.updateEdgesData)(topo, edges, function (edge) {
73
73
  if (name === 'startPoint') {
74
74
  // 删除设置
75
75
  ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (iconName) {
@@ -40,6 +40,11 @@ function Layout(props) {
40
40
  selection = _topo$store$useModelS.selection;
41
41
 
42
42
  var setDisabled = function setDisabled(data) {
43
+ if (topoShowType !== 'layers' && selection.length === 1) {
44
+ //中心节点布局,选中一个节点非分层情况下,需要星型和树形布局亮起来
45
+ return data == 'rectangle' || data == 'hierarchical';
46
+ }
47
+
43
48
  if (topoShowType == 'layers' && selection.length == 1 && !(0, _htElementDataUtil.isGroup)(selection[0])) {
44
49
  return data != 'rectangle';
45
50
  } else {
@@ -57,7 +62,11 @@ function Layout(props) {
57
62
 
58
63
 
59
64
  if (topoShowType != 'layers' && selection.length == 1) {
60
- topo.getHtTopo().layoutInContainer(layouType);
65
+ if (layouType == 'hierarchical') {
66
+ topo.getHtTopo().layoutInContainer(layouType);
67
+ } else {
68
+ topo.getHtTopo().layoutTopoBySelectNode(layouType, selectionElements[0]);
69
+ }
61
70
  } // eslint-disable-next-line eqeqeq
62
71
 
63
72
 
@@ -72,7 +81,7 @@ function Layout(props) {
72
81
  topo.historyManager.beginTransaction();
73
82
  setLayout(v); // eslint-disable-next-line eqeqeq
74
83
 
75
- if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1) {
84
+ if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1 || topoShowType !== 'layers' && selection.length === 1) {
76
85
  globalLayout(v);
77
86
  }
78
87
 
@@ -150,6 +159,11 @@ function isLayoutEnabled(props) {
150
159
 
151
160
  if (topoShowType !== 'layers' && !selection.length) {
152
161
  return true;
162
+ } //中心节点布局,选中一个节点不是分层的情况下,按钮亮起
163
+
164
+
165
+ if (topoShowType !== 'layers' && selection.length === 1 && ((0, _htElementDataUtil.isNode)(selection[0]) || (0, _htElementDataUtil.isGroup)(selection[0]))) {
166
+ return true;
153
167
  }
154
168
 
155
169
  return false;
@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _propTypes = _interopRequireDefault(require("prop-types"));
13
13
 
14
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
14
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
15
15
 
16
16
  var _SizeInput = _interopRequireDefault(require("../SizeInput"));
17
17
 
@@ -58,7 +58,7 @@ function NodeSizeInput(props) {
58
58
  };
59
59
  updateSizeRatioCurrentSize(ratioInfo);
60
60
 
61
- _rlog["default"].debug('initSizeRatio', ratioInfo);
61
+ _componentTopologyUtils.rlog.debug('initSizeRatio', ratioInfo);
62
62
 
63
63
  return ratioInfo;
64
64
  }
@@ -84,7 +84,7 @@ function NodeSizeInput(props) {
84
84
  // 首次没有比例时,初始化当前节点比例
85
85
  ratioInfo = initSizeRatio();
86
86
 
87
- _rlog["default"].debug('首次没有比例时,初始化当前节点比例', ratioInfo);
87
+ _componentTopologyUtils.rlog.debug('首次没有比例时,初始化当前节点比例', ratioInfo);
88
88
  } else {
89
89
  // 修改后,非锁定方式调整比例(画图调整节点大小,未开启锁定修改),重新初始化比例
90
90
  var prevSize = ratioInfo.size;
@@ -92,7 +92,7 @@ function NodeSizeInput(props) {
92
92
  if (value.width !== prevSize.width || value.height !== prevSize.height) {
93
93
  ratioInfo = initSizeRatio();
94
94
 
95
- _rlog["default"].debug('修改后,重新初始化比例', ratioInfo);
95
+ _componentTopologyUtils.rlog.debug('修改后,重新初始化比例', ratioInfo);
96
96
  }
97
97
  }
98
98
 
@@ -109,7 +109,7 @@ function NodeSizeInput(props) {
109
109
  size: newSize
110
110
  });
111
111
 
112
- _rlog["default"].debug('按比例更新', name, attrValue, ratio, value, newSize, ratioInfo);
112
+ _componentTopologyUtils.rlog.debug('按比例更新', name, attrValue, ratio, value, newSize, ratioInfo);
113
113
  }
114
114
 
115
115
  onChange(newSize);
@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
17
17
 
18
18
  var _propTypes = _interopRequireDefault(require("prop-types"));
19
19
 
20
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
20
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
21
21
 
22
22
  var _NodeSizeNumberPicker = _interopRequireDefault(require("./NodeSizeNumberPicker"));
23
23
 
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
13
13
 
14
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
14
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
15
15
 
16
16
  var _react = _interopRequireWildcard(require("react"));
17
17
 
@@ -19,7 +19,7 @@ var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
19
19
 
20
20
  var _react = _interopRequireWildcard(require("react"));
21
21
 
22
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
22
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
23
23
 
24
24
  var _AlignSetting = _interopRequireDefault(require("../../../common/AlignSetting"));
25
25
 
@@ -47,7 +47,7 @@ function LayerSettingTab(props) {
47
47
  return;
48
48
  }
49
49
 
50
- _rlog["default"].debug(values[name], value);
50
+ _componentTopologyUtils.rlog.debug(values[name], value);
51
51
 
52
52
  var newValues = field.getValues();
53
53
 
@@ -62,7 +62,7 @@ function LayerSettingTab(props) {
62
62
  var alignOnChange = function alignOnChange(v) {
63
63
  topo.historyManager.beginTransaction();
64
64
 
65
- _rlog["default"].debug('setAlignmentBySelectionNodes', v);
65
+ _componentTopologyUtils.rlog.debug('setAlignmentBySelectionNodes', v);
66
66
 
67
67
  topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
68
68
 
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = void 0;
7
7
 
8
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
8
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
9
9
 
10
10
  var _react = require("react");
11
11
 
@@ -27,7 +27,7 @@ var _default = function _default(props) {
27
27
  setSize = _useState[1];
28
28
 
29
29
  (0, _react.useEffect)(function () {
30
- _rlog["default"].info('设置背景图:初始化大小', getSizeFromCurrent());
30
+ _componentTopologyUtils.rlog.info('设置背景图:初始化大小', getSizeFromCurrent());
31
31
 
32
32
  setSize(getSizeFromCurrent());
33
33
  }, [current]);
@@ -44,8 +44,10 @@ function unbindKeyboardShortcuts(props) {
44
44
 
45
45
  function useKeyboardShortcut(props) {
46
46
  (0, _react.useEffect)(function () {
47
+ (0, _copyElementUtil.initPasteEventListener)();
47
48
  initKeyboardShortcuts(props);
48
49
  return function () {
50
+ (0, _copyElementUtil.destroyPasteEventListener)();
49
51
  unbindKeyboardShortcuts(props);
50
52
  };
51
53
  }, []);
@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
11
11
 
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
13
 
14
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
14
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
15
15
 
16
16
  /**
17
17
  * 背景图
@@ -7,7 +7,7 @@ exports["default"] = _default;
7
7
 
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
 
10
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
10
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
11
11
 
12
12
  /**
13
13
  * 动态设置链路样式 Model
@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
11
11
 
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
13
 
14
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
14
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
15
15
 
16
16
  /**
17
17
  * 拓扑编辑 Model
@@ -3,8 +3,10 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
5
  exports.__esModule = true;
6
+ exports.destroyPasteEventListener = destroyPasteEventListener;
6
7
  exports.handleCopyHotkey = handleCopyHotkey;
7
8
  exports.handlePasteHotkey = handlePasteHotkey;
9
+ exports.initPasteEventListener = initPasteEventListener;
8
10
 
9
11
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
10
12
 
@@ -21,6 +23,19 @@ function handleCopyHotkey(event, options) {
21
23
  }
22
24
  }
23
25
 
26
+ function initPasteEventListener() {
27
+ document.addEventListener("paste", handlePasteEventListener);
28
+ }
29
+
30
+ function destroyPasteEventListener() {
31
+ document.removeEventListener("paste", handlePasteEventListener);
32
+ }
33
+
34
+ function handlePasteEventListener(e) {
35
+ var clipdata = e.clipboardData || window.clipboardData;
36
+ console.log("主动粘贴", clipdata.getData("text/plain"));
37
+ }
38
+
24
39
  function handlePasteHotkey(event, options) {
25
40
  var target = event.target || event.srcElement;
26
41
  var tagName = target.tagName;
@@ -4,8 +4,8 @@ exports.__esModule = true;
4
4
  exports.getEdgesBySelection = getEdgesBySelection;
5
5
  exports.isNodeAllEdges = isNodeAllEdges;
6
6
  exports.loopEdgesAndChildren = loopEdgesAndChildren;
7
- exports.setEdgesAndChildren = setEdgesAndChildren;
8
7
  exports.setEdgesType = setEdgesType;
8
+ exports.updateEdgesData = updateEdgesData;
9
9
 
10
10
  var _htElementUtils = require("../../../utils/htElementUtils");
11
11
 
@@ -117,17 +117,19 @@ function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
117
117
  * 设置连线及子连线。带回退事务控制
118
118
  * @param {*} topo
119
119
  * @param {*} edges
120
- * @param {*} operateEdgeFn
120
+ * @param {*} updateEdgeFn
121
121
  */
122
122
 
123
123
 
124
- function setEdgesAndChildren(topo, edges, operateEdgeFn) {
124
+ function updateEdgesData(topo, edges, updateEdgeFn) {
125
125
  topo.historyManager.beginTransaction();
126
- loopEdgesAndChildren(topo, edges, operateEdgeFn);
126
+ edges.forEach(function (edge) {
127
+ updateEdgeFn(edge);
128
+ });
127
129
  topo.historyManager.endTransaction();
128
130
  }
129
131
  /**
130
- * 批量设置连线线形
132
+ * 批量设置连线线形。带回退事务控制
131
133
  *
132
134
  * @param {*} edges
133
135
  * @param {*} type
@@ -137,7 +139,7 @@ function setEdgesAndChildren(topo, edges, operateEdgeFn) {
137
139
 
138
140
  function setEdgesType(edges, type, topo) {
139
141
  var htTopo = topo.getHtTopo();
140
- setEdgesAndChildren(topo, edges, function (edge) {
142
+ updateEdgesData(topo, edges, function (edge) {
141
143
  htTopo.setGraphLinear(edge, {
142
144
  type: type
143
145
  });
@@ -1,11 +1,9 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
3
  exports.__esModule = true;
6
4
  exports["default"] = useHtDataPropertyChangeListener;
7
5
 
8
- var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
6
+ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
9
7
 
10
8
  var _react = require("react");
11
9