@riil-frontend/component-topology 11.0.29 → 11.0.30

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 (943) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +4 -2
  4. package/build/index.js +50 -35
  5. package/es/common/components/ColorPicker/ColorPicker.js +18 -9
  6. package/es/common/components/ResourceTable/ResourceTable.js +9 -6
  7. package/es/common/plugins/useSelectionPlugin.js +23 -14
  8. package/es/components/BatchAttrMetric/constant.js +2 -2
  9. package/es/components/BatchAttrMetric/index.js +17 -10
  10. package/es/components/BatchAttrMetric/setting.js +52 -30
  11. package/es/components/BatchAttrMetric/utils.js +4 -2
  12. package/es/components/BooleanRadio.js +7 -5
  13. package/es/components/ColorPanel/components/ColorBlock/index.js +4 -3
  14. package/es/components/ColorPanel/components/FontColorRange/index.js +13 -9
  15. package/es/components/ColorPanel/index.js +40 -18
  16. package/es/components/Drawer/Drawer.js +18 -14
  17. package/es/components/FormTable/index.js +18 -13
  18. package/es/components/FullheightTab/FullheightTab.js +2 -0
  19. package/es/components/LayoutDirectionSelect/LayoutDirectionSelect.js +3 -6
  20. package/es/components/LayoutSelect/LayoutSelect.js +3 -6
  21. package/es/components/ModelAttrSelectDrawer/components/ModelAttrSelectDrawer.js +4 -4
  22. package/es/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js +20 -15
  23. package/es/components/MultiResourceDrawer/Content.js +22 -12
  24. package/es/components/MultiResourceDrawer/Dynamic.js +4 -2
  25. package/es/components/MultiResourceDrawer/ResourceCard/index.js +6 -4
  26. package/es/components/MultiResourceDrawer/ResourceSelect.js +4 -2
  27. package/es/components/MultiResourceDrawer/Static.js +4 -2
  28. package/es/components/MultiResourceDrawer/index.js +16 -8
  29. package/es/components/ResourceList/ResourceSelect.js +44 -27
  30. package/es/components/ResourceList/ResourceSelectConnect.js +7 -3
  31. package/es/components/ResourceSelect/ResourceSelectDrawer.js +11 -7
  32. package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +27 -14
  33. package/es/components/ResourceSelectDrawer/ResourceSelectList.js +8 -4
  34. package/es/components/SingleResourceDrawer/SelectDrawer.js +15 -6
  35. package/es/components/SingleResourceDrawer/SingleResourceDrawer.js +14 -7
  36. package/es/components/TagImageSelect/index.js +11 -8
  37. package/es/components/TagSelect/index.js +12 -8
  38. package/es/components/TemplateButton/Icon.js +7 -5
  39. package/es/components/TemplateButton/index.js +9 -6
  40. package/es/components/VerticalIconTab/VerticalIconTab.js +11 -7
  41. package/es/components/collapse/Collapse.js +8 -4
  42. package/es/components/collapse/Panel.js +17 -7
  43. package/es/constants/ResourceInfoDisplay.js +6 -6
  44. package/es/constants/ResourceTypeLimit.js +11 -20
  45. package/es/contextmenu/createMenuCommands.js +8 -7
  46. package/es/core/common/contextmenu/mergeContextmenu.js +2 -2
  47. package/es/core/common/hooks/ht/useDataModelDataPropertyChange.js +2 -0
  48. package/es/core/common/hooks/useHtElement.js +2 -1
  49. package/es/core/common/hooks/useHtElements.js +6 -5
  50. package/es/core/common/icons/icon.js +18 -17
  51. package/es/core/common/icons/useIcons.js +4 -1
  52. package/es/core/components/AlarmListPanel/components/AlarmListItem.js +13 -4
  53. package/es/core/components/AlarmListPanel/hooks/useAlarmList.js +7 -2
  54. package/es/core/components/AlarmListPanel/index.js +4 -2
  55. package/es/core/components/DisplaySettingDrawer/DisplaySetting.js +17 -11
  56. package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +23 -13
  57. package/es/core/components/DisplaySettingDrawer/EdgeFlow.js +3 -1
  58. package/es/core/components/DisplaySettingDrawer/EdgeFlowDirection.js +3 -1
  59. package/es/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js +25 -14
  60. package/es/core/components/DisplaySettingDrawer/LinkTag.js +3 -3
  61. package/es/core/components/DisplaySettingDrawer/NodeTag.js +1 -1
  62. package/es/core/components/DisplaySettingDrawer/NodeTip.js +1 -1
  63. package/es/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js +32 -25
  64. package/es/core/components/DisplaySettingDrawer/ResourceDisplay/CommonCheckboxGroup.js +7 -3
  65. package/es/core/components/DisplaySettingDrawer/components/NodeAttrSettingDrawer.js +9 -6
  66. package/es/core/components/DisplaySettingDrawer/demo/Demo.js +3 -4
  67. package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +33 -10
  68. package/es/core/components/DisplaySettingDrawer/tagtip/CustomSettingDrawer/CustomSetting.js +5 -3
  69. package/es/core/components/DisplaySettingDrawer/tagtip/CustomSettingDrawer/CustomSettingDrawer.js +2 -0
  70. package/es/core/components/ResourceViewAttributeSetting/Setting.js +12 -7
  71. package/es/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js +25 -7
  72. package/es/core/components/TopoView/GraphViewPanel.js +15 -10
  73. package/es/core/components/TopoView/topoView.js +62 -38
  74. package/es/core/components/titlebar/TitleBar.js +12 -4
  75. package/es/core/components/titlebar/widgets/TitleWidget.js +4 -2
  76. package/es/core/createTopoApp.js +1 -1
  77. package/es/core/editor/components/BackgroundView/UploadDialog/index.js +53 -21
  78. package/es/core/editor/components/BackgroundView/index.js +65 -24
  79. package/es/core/editor/components/BottomFloatTool/HelpIcon.js +15 -8
  80. package/es/core/editor/components/CustomIconPlugin/CustomIconPlugin.js +2 -5
  81. package/es/core/editor/components/CustomIconPlugin/RenameDialog.js +19 -7
  82. package/es/core/editor/components/CustomIconPlugin/UploadIconDialog.js +67 -24
  83. package/es/core/editor/components/CustomIconPlugin/UploadIconDialogWrapper.js +5 -3
  84. package/es/core/editor/components/CustomIconPlugin/utils/svgToShape.js +8 -3
  85. package/es/core/editor/components/EditorPlugin.js +8 -4
  86. package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +12 -6
  87. package/es/core/editor/components/GroupAddResourceDrawerPlugin/index.js +6 -6
  88. package/es/core/editor/components/Sidebar/Sidebar.js +17 -8
  89. package/es/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.js +7 -5
  90. package/es/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +30 -14
  91. package/es/core/editor/components/Sidebar/views/ComponentPanel.js +7 -7
  92. package/es/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js +2 -2
  93. package/es/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js +2 -2
  94. package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +10 -7
  95. package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +10 -7
  96. package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePalette.js +7 -7
  97. package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +12 -4
  98. package/es/core/editor/components/Sidebar/views/LinkPanel.js +8 -7
  99. package/es/core/editor/components/Toolbar/EditorToolbar.js +7 -2
  100. package/es/core/editor/components/Toolbar/Toolbar.js +2 -0
  101. package/es/core/editor/components/Toolbar/buttons.js +15 -30
  102. package/es/core/editor/components/Toolbar/components/Tooltip.js +3 -2
  103. package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js +11 -8
  104. package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js +13 -7
  105. package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +42 -19
  106. package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundUtil.js +29 -9
  107. package/es/core/editor/components/Toolbar/widgets/CanvasMoveWidget.js +7 -3
  108. package/es/core/editor/components/Toolbar/widgets/CanvasSelectWidget.js +7 -3
  109. package/es/core/editor/components/Toolbar/widgets/Divider.js +2 -0
  110. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/Content.js +8 -6
  111. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +27 -13
  112. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +17 -10
  113. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +6 -5
  114. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/constants.js +3 -2
  115. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +27 -14
  116. package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +44 -24
  117. package/es/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +7 -4
  118. package/es/core/editor/components/Toolbar/widgets/FontSizeWidget.js +10 -8
  119. package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +27 -16
  120. package/es/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +6 -2
  121. package/es/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +8 -4
  122. package/es/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js +23 -9
  123. package/es/core/editor/components/Toolbar/widgets/IconSelect/index.js +23 -9
  124. package/es/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss +1 -1
  125. package/es/core/editor/components/Toolbar/widgets/IconSelect/popUpContent.js +6 -2
  126. package/es/core/editor/components/Toolbar/widgets/Layout/components/LayoutSettings.js +14 -10
  127. package/es/core/editor/components/Toolbar/widgets/Layout/components/LayoutTagImageSelect/index.js +12 -9
  128. package/es/core/editor/components/Toolbar/widgets/Layout/components/LayoutTagSelect/index.js +16 -12
  129. package/es/core/editor/components/Toolbar/widgets/Layout/components/LayoutTemplateButton/Icon.js +7 -5
  130. package/es/core/editor/components/Toolbar/widgets/Layout/components/LayoutTemplateButton/index.js +9 -6
  131. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +46 -27
  132. package/es/core/editor/components/Toolbar/widgets/NodeAlignWidget.js +33 -20
  133. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/BoxBackgroundSetting.js +4 -2
  134. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +18 -12
  135. package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/BoxBackgroundSetting.js +2 -0
  136. package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +25 -16
  137. package/es/core/editor/components/Toolbar/widgets/SearchWidget.js +5 -1
  138. package/es/core/editor/components/Toolbar/widgets/WidgetBox.js +11 -6
  139. package/es/core/editor/components/Toolbar/widgets/components/ArrowButton.js +4 -2
  140. package/es/core/editor/components/Toolbar/widgets/components/ArrowPopup.js +4 -2
  141. package/es/core/editor/components/Toolbar/widgets/components/ButtonBox.js +9 -5
  142. package/es/core/editor/components/Toolbar/widgets/components/DropdownButton.js +18 -9
  143. package/es/core/editor/components/Toolbar/widgets/components/DropdownMenu.js +10 -5
  144. package/es/core/editor/components/Toolbar/widgets/components/MenuSelect.js +4 -2
  145. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +11 -5
  146. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/colorUtil.js +9 -4
  147. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/box.js +6 -3
  148. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +15 -6
  149. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js +10 -5
  150. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/layerTitle.js +13 -6
  151. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +17 -7
  152. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/text.js +6 -2
  153. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +22 -6
  154. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js +7 -3
  155. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js +32 -13
  156. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js +2 -0
  157. package/es/core/editor/components/plugins/AddElementThemePlugin.js +2 -0
  158. package/es/core/editor/components/plugins/CorePlugin.js +5 -3
  159. package/es/core/editor/components/plugins/SaveLoading.js +4 -2
  160. package/es/core/editor/components/settings/CloseablePanel.js +5 -3
  161. package/es/core/editor/components/settings/PropertyView.js +17 -7
  162. package/es/core/editor/components/settings/Settings.js +13 -7
  163. package/es/core/editor/components/settings/common/AddResourceButton.js +2 -0
  164. package/es/core/editor/components/settings/common/AlignSetting/AlignTypeList.js +14 -11
  165. package/es/core/editor/components/settings/common/AlignSetting/index.js +11 -5
  166. package/es/core/editor/components/settings/common/GroupNodeList/ResourceList.js +10 -2
  167. package/es/core/editor/components/settings/common/LayoutSettings.js +15 -12
  168. package/es/core/editor/components/settings/common/LineType/index.js +2 -0
  169. package/es/core/editor/components/settings/common/NameInput.js +3 -1
  170. package/es/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js +28 -9
  171. package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +20 -12
  172. package/es/core/editor/components/settings/common/SizeInput/NodeSizeNumberPicker.js +21 -10
  173. package/es/core/editor/components/settings/common/tab/TabView.js +2 -0
  174. package/es/core/editor/components/settings/common/text/FontStyleCheckbox.js +5 -1
  175. package/es/core/editor/components/settings/common/text/TextStyle.js +7 -2
  176. package/es/core/editor/components/settings/common/text/fontStyleUtil.js +6 -2
  177. package/es/core/editor/components/settings/core/PropertyViewManager.js +19 -0
  178. package/es/core/editor/components/settings/core/edgePropertyViewAdapter.js +2 -0
  179. package/es/core/editor/components/settings/core/getPropertyViewType.js +4 -0
  180. package/es/core/editor/components/settings/core/updateElementProperty.js +1 -0
  181. package/es/core/editor/components/settings/propertyViews/PropertyViewFactory.js +1 -0
  182. package/es/core/editor/components/settings/propertyViews/box/BoxPropertyView.js +9 -3
  183. package/es/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js +8 -2
  184. package/es/core/editor/components/settings/propertyViews/box/NameInput.js +11 -3
  185. package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +13 -5
  186. package/es/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js +2 -0
  187. package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +10 -4
  188. package/es/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +9 -3
  189. package/es/core/editor/components/settings/propertyViews/group/DataTab/GroupAddResourceButton.js +4 -2
  190. package/es/core/editor/components/settings/propertyViews/group/DataTab/GroupNodeList.js +8 -7
  191. package/es/core/editor/components/settings/propertyViews/group/DataTab/GroupRelateData/GroupRelateData.js +10 -4
  192. package/es/core/editor/components/settings/propertyViews/group/DataTab/RelateData.js +4 -4
  193. package/es/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js +12 -11
  194. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyView.js +3 -3
  195. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js +3 -3
  196. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js +11 -7
  197. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js +19 -17
  198. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandStatus.js +5 -3
  199. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupIconSelect.js +4 -2
  200. package/es/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js +15 -6
  201. package/es/core/editor/components/settings/propertyViews/group/cluster/ClusterGroupRelateData.js +6 -4
  202. package/es/core/editor/components/settings/propertyViews/index.js +2 -0
  203. package/es/core/editor/components/settings/propertyViews/layer/BasicSetting.js +7 -3
  204. package/es/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +13 -7
  205. package/es/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceButton.js +6 -4
  206. package/es/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js +4 -2
  207. package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js +2 -2
  208. package/es/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js +6 -4
  209. package/es/core/editor/components/settings/propertyViews/layer/LayerPropertyView.js +6 -6
  210. package/es/core/editor/components/settings/propertyViews/layer/LayerPropertyViewV1.js +6 -6
  211. package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +16 -9
  212. package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting_bak.js +18 -16
  213. package/es/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeIcon.js +2 -2
  214. package/es/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize.js +35 -13
  215. package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementLineType.js +2 -0
  216. package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +11 -7
  217. package/es/core/editor/components/settings/propertyViews/node/NodeIconSelect.js +6 -4
  218. package/es/core/editor/components/settings/propertyViews/node/NodeIconSelectTest.js +2 -2
  219. package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js +9 -7
  220. package/es/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js +12 -7
  221. package/es/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js +11 -6
  222. package/es/core/editor/components/settings/propertyViews/node/Setting/NameInput.js +11 -3
  223. package/es/core/editor/components/settings/propertyViews/node/Setting/Setting.js +14 -6
  224. package/es/core/editor/components/settings/propertyViews/node/data/BindIpInput.js +23 -18
  225. package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +17 -8
  226. package/es/core/editor/components/settings/propertyViews/node/data/Data.js +29 -19
  227. package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +10 -7
  228. package/es/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +5 -1
  229. package/es/core/editor/components/settings/propertyViews/text/TextPropertyView.js +17 -5
  230. package/es/core/editor/components/settings/propertyViews/view/BackgroundSize.js +10 -5
  231. package/es/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js +3 -5
  232. package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +11 -5
  233. package/es/core/editor/components/settings/propertyViews/view/GlobalLayout.js +7 -6
  234. package/es/core/editor/components/settings/propertyViews/view/GlobalNodeLabelStyle.js +7 -2
  235. package/es/core/editor/components/settings/propertyViews/view/ViewLineTypeSetting.js +3 -0
  236. package/es/core/editor/components/settings/propertyViews/view/ViewPropertyView.js +3 -3
  237. package/es/core/editor/components/settings/propertyViews/view/ViewPropertyViewV2.js +3 -3
  238. package/es/core/editor/components/settings/propertyViews/view/hooks/useBackgroundConfig.js +4 -3
  239. package/es/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js +12 -4
  240. package/es/core/editor/components/settings/useSettingRuntimeState.js +6 -2
  241. package/es/core/editor/components/titlebar/TopoEditorTitleBar.js +26 -12
  242. package/es/core/editor/components/titlebar/widgets/DebugTools.js +4 -1
  243. package/es/core/editor/config/themes.js +7 -8
  244. package/es/core/editor/contextmenu/buildContextmenu.js +1 -2
  245. package/es/core/editor/hooks/useKeyboardShortcut.js +10 -7
  246. package/es/core/editor/hooks/useLayerAddResource.js +6 -4
  247. package/es/core/editor/hooks/useNewElementTheme.js +14 -7
  248. package/es/core/editor/hooks/useUpdateHtTopoDefaultTagStyle.js +3 -2
  249. package/es/core/editor/store/background.js +8 -4
  250. package/es/core/editor/store/historyManager.js +1 -0
  251. package/es/core/editor/store/topoEdit.js +4 -3
  252. package/es/core/editor/utils/edgeTypeStyleUtil.js +15 -9
  253. package/es/core/editor/utils/themeUtil.js +3 -0
  254. package/es/core/event/topoEventListener.js +2 -0
  255. package/es/core/hooks/ht/useHtDataPropertyChangeListener.js +7 -3
  256. package/es/core/hooks/useAlarm.js +24 -12
  257. package/es/core/hooks/useCanvasTheme.js +10 -9
  258. package/es/core/hooks/useCanvasThemeConfig.js +4 -2
  259. package/es/core/hooks/useCiAttributeChange.js +10 -3
  260. package/es/core/hooks/useEventData.js +4 -2
  261. package/es/core/hooks/useGraphAlarmDisplay.js +27 -11
  262. package/es/core/hooks/useGroupAddResource.js +5 -2
  263. package/es/core/hooks/useManageStatus.js +1 -1
  264. package/es/core/hooks/usePolling.js +61 -33
  265. package/es/core/hooks/useResourceConfig.js +57 -22
  266. package/es/core/hooks/useRouterAdapter.js +4 -2
  267. package/es/core/hooks/useSelection.js +4 -1
  268. package/es/core/hooks/useTopoEdit.js +261 -112
  269. package/es/core/hooks/useTopoEventListener.js +1 -1
  270. package/es/core/hooks/useTopoFullscreen.js +8 -7
  271. package/es/core/models/Alarm.js +139 -50
  272. package/es/core/models/AttributeMetricDisplay.js +166 -89
  273. package/es/core/models/DataModel.js +37 -4
  274. package/es/core/models/EdgeGroup.js +7 -2
  275. package/es/core/models/GraphDataModel.js +7 -0
  276. package/es/core/models/HistoryManager.js +52 -21
  277. package/es/core/models/PluginManager.js +9 -0
  278. package/es/core/models/SelectionModel.js +36 -11
  279. package/es/core/models/TopoApp.js +178 -74
  280. package/es/core/models/TopoGraphView.js +30 -8
  281. package/es/core/models/TopoViewer.js +5 -1
  282. package/es/core/models/attributeFormatter/formatter/ciTypeAttrTransform.js +3 -2
  283. package/es/core/models/attributeFormatter/formatter/commonTransform.js +8 -6
  284. package/es/core/models/attributeFormatter/formatter/graphTransform.js +5 -2
  285. package/es/core/models/attributeFormatter/index.js +8 -1
  286. package/es/core/models/cache/CiCache.js +17 -4
  287. package/es/core/models/cache/CiTypeCache.js +35 -8
  288. package/es/core/models/cache/DictCache.js +19 -4
  289. package/es/core/models/common/ContextMenu.js +9 -0
  290. package/es/core/models/graph/Background.js +16 -3
  291. package/es/core/models/plugins/index.js +1 -3
  292. package/es/core/models/plugins/resourceWebControllUrl.js +39 -9
  293. package/es/core/models/tagstips/ElementTagTipConfig.js +55 -16
  294. package/es/core/models/tagstips/utils.js +4 -4
  295. package/es/core/models/topoData.js +24 -8
  296. package/es/core/models/topoFactory.js +6 -0
  297. package/es/core/models/utils/linkUtils.js +35 -24
  298. package/es/core/models/utils/nodeNameVisibleUtil.js +25 -16
  299. package/es/core/services/alarm.js +5 -3
  300. package/es/core/services/background.js +24 -9
  301. package/es/core/services/cmdb/metric.js +5 -3
  302. package/es/core/services/cmdb.js +6 -3
  303. package/es/core/services/index.js +18 -7
  304. package/es/core/services/overview.js +58 -25
  305. package/es/core/services/topo/basic.js +5 -3
  306. package/es/core/services/topo/tagtip.js +6 -3
  307. package/es/core/store/coreModels.js +2 -4
  308. package/es/core/store/createStore.js +3 -0
  309. package/es/core/store/models/ciModel.js +16 -5
  310. package/es/core/store/models/customIcon.js +55 -19
  311. package/es/core/store/models/displayConfig.js +11 -5
  312. package/es/core/store/models/selection.js +5 -4
  313. package/es/core/store/models/topoAlarm.js +42 -10
  314. package/es/core/store/models/topoBaseInfoOverview.js +5 -4
  315. package/es/core/store/models/topoBizMod.js +14 -5
  316. package/es/core/store/models/topoConfig.js +85 -39
  317. package/es/core/store/models/topoGraphView.js +7 -5
  318. package/es/core/store/models/topoMod.js +111 -38
  319. package/es/core/store/models/viewer/lock.js +1 -0
  320. package/es/core/store/models/viewer/resourceDetail.js +5 -2
  321. package/es/core/store/models/viewer/resourceWebControllUrlSetting.js +1 -0
  322. package/es/core/test/Test.js +13 -10
  323. package/es/core/upgrade/v140UpgradeSerializeNodeImageSize.js +5 -0
  324. package/es/core/utils/backgroundUtil.js +7 -5
  325. package/es/core/utils/edgeUtil.js +11 -4
  326. package/es/core/utils/graphLinkUtil.js +8 -5
  327. package/es/core/utils/imageUtil.js +9 -3
  328. package/es/core/utils/metricUtil.js +1 -1
  329. package/es/core/utils/resourceUtil.js +3 -3
  330. package/es/core/utils/saveSerialize.js +6 -3
  331. package/es/core/utils/showGraphManageStatusUtil.js +18 -14
  332. package/es/core/utils/showMessage.js +2 -0
  333. package/es/core/viewer/components/plugins/ElementDetailDrawer/components/DetailDrawer.js +2 -0
  334. package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +59 -32
  335. package/es/core/viewer/components/plugins/ResourceDetail/DefaultDetailContent.js +14 -8
  336. package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js +11 -6
  337. package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +12 -9
  338. package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailPlugin.js +7 -2
  339. package/es/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +22 -10
  340. package/es/core/viewer/components/plugins/ResourceDetail/components/DrawerTitle.js +16 -7
  341. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BaseInfo.js +23 -18
  342. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BaseInfoBlock.js +10 -10
  343. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BlockBox.js +2 -2
  344. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +17 -10
  345. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js +27 -19
  346. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +200 -90
  347. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js +29 -25
  348. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/SingleResourceStrategyLink.js +6 -6
  349. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +70 -33
  350. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.js +4 -2
  351. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +27 -13
  352. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/constants.js +4 -8
  353. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +18 -14
  354. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +62 -23
  355. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +37 -24
  356. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +43 -22
  357. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/useCiAttrAndMetricData.js +4 -2
  358. package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleContainer.js +4 -1
  359. package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js +15 -8
  360. package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +24 -10
  361. package/es/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +12 -5
  362. package/es/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +16 -7
  363. package/es/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +18 -6
  364. package/es/core/viewer/components/plugins/ViewerPlugin.js +1 -1
  365. package/es/core/viewer/components/titlebar/BasicTools.js +3 -3
  366. package/es/core/viewer/components/titlebar/TopoViewerTitleBar.js +4 -4
  367. package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +6 -2
  368. package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.js +16 -14
  369. package/es/core/viewer/components/titlebar/widgets/EditButton.js +8 -4
  370. package/es/core/viewer/components/titlebar/widgets/MoreButtonMenu.js +1 -1
  371. package/es/core/viewer/components/titlebar/widgets/NodesDragSwitch.js +18 -14
  372. package/es/core/viewer/components/titlebar/widgets/NodesDragSwitchWrapper.js +5 -1
  373. package/es/core/viewer/components/titlebar/widgets/SearchWidget.js +17 -9
  374. package/es/core/viewer/components/titlebar/widgets/SettingButton.js +10 -7
  375. package/es/core/viewer/components/titlebar/widgets/SettingButtonWidget.js +5 -5
  376. package/es/core/viewer/contextmenu/buildLinkContextmenu.js +1 -2
  377. package/es/core/viewer/contextmenu/buildNodeContextmenu.js +2 -8
  378. package/es/createTopo.js +1 -2
  379. package/es/mock/mock.js +4 -6
  380. package/es/networkTopo/components/Link/form.js +41 -25
  381. package/es/networkTopo/components/Link/hook.js +86 -48
  382. package/es/networkTopo/components/Link/index.js +63 -33
  383. package/es/networkTopo/components/Link/setting.js +65 -45
  384. package/es/networkTopo/components/TopoView.js +20 -14
  385. package/es/networkTopo/getTopoData.js +37 -21
  386. package/es/networkTopo/hooks/useEdgeExpand.js +3 -2
  387. package/es/networkTopo/hooks/useGroupResources.js +4 -2
  388. package/es/networkTopo/hooks/useLinkDynamicStyle.js +4 -2
  389. package/es/networkTopo/hooks/viewer/useEdgeFlow.js +7 -6
  390. package/es/networkTopo/hooks/viewer/useRelateTopo.js +23 -8
  391. package/es/networkTopo/models/EdgeGroupTagTipBuilder.js +10 -2
  392. package/es/networkTopo/models/ExtElementTagTipBuilder.js +5 -0
  393. package/es/networkTopo/models/IpNodeTagsTipsBuilder.js +11 -2
  394. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +49 -28
  395. package/es/networkTopo/models/LinkTagsTipsBuilder.js +51 -41
  396. package/es/networkTopo/models/TopoCenter.js +26 -8
  397. package/es/networkTopo/services/alert.js +10 -5
  398. package/es/networkTopo/services/authorization.js +25 -11
  399. package/es/networkTopo/services/cmdb.js +165 -80
  400. package/es/networkTopo/services/funcAuth.js +5 -3
  401. package/es/networkTopo/services/link.js +34 -11
  402. package/es/networkTopo/services/mdc.js +17 -10
  403. package/es/networkTopo/services/metric.js +12 -6
  404. package/es/networkTopo/services/model.js +223 -92
  405. package/es/networkTopo/services/risk.js +5 -3
  406. package/es/networkTopo/services/topo/auth.js +13 -7
  407. package/es/networkTopo/services/topo/basic.js +137 -57
  408. package/es/networkTopo/services/topo/blacklist.js +11 -5
  409. package/es/networkTopo/services/topo/ciInfo.js +13 -5
  410. package/es/networkTopo/services/topo/icon.js +24 -11
  411. package/es/networkTopo/services/topo/networkLink.js +11 -5
  412. package/es/networkTopo/services/topo/relation.js +5 -3
  413. package/es/networkTopo/services/topo/resourceWebUrl.js +17 -7
  414. package/es/networkTopo/store/functionAuth.js +16 -7
  415. package/es/networkTopo/store/topoCenter.js +53 -18
  416. package/es/networkTopo/store/topoLinkMod.js +4 -3
  417. package/es/networkTopo/store/topoTreeMod.js +71 -19
  418. package/es/networkTopo/utils/SortResourcesUtil.js +3 -1
  419. package/es/networkTopo/utils/__tests__/resourcePermissionUtil.test.js +7 -4
  420. package/es/networkTopo/utils/edgeGroupTagUtil.js +15 -8
  421. package/es/networkTopo/utils/exitLinkUtil.js +54 -38
  422. package/es/networkTopo/utils/exportData.js +16 -10
  423. package/es/networkTopo/utils/linPermissionUtil.js +2 -4
  424. package/es/networkTopo/utils/resourcePermissionUtil.js +6 -4
  425. package/es/networkTopo/utils/storage.js +3 -2
  426. package/es/networkTopo/viewer/components/TopologyViewer.js +4 -3
  427. package/es/networkTopo/viewer/index.js +1 -2
  428. package/es/utils/ResourceConfigUtil.js +23 -18
  429. package/es/utils/SpecialCharacterValidateUtil.js +1 -0
  430. package/es/utils/ciType.js +5 -1
  431. package/es/utils/clusterUtil.js +20 -15
  432. package/es/utils/format.js +26 -12
  433. package/es/utils/htElementUtils.js +51 -25
  434. package/es/utils/template.js +7 -6
  435. package/es/utils/topoData.js +64 -52
  436. package/es/utils/topoMocks.js +4 -3
  437. package/es/utils/tree.js +33 -14
  438. package/es/utils/treeUtil.js +1 -0
  439. package/lib/common/components/ColorPicker/ColorPicker.js +30 -9
  440. package/lib/common/components/ColorPicker/index.js +3 -0
  441. package/lib/common/components/ResourceTable/ResourceTable.js +18 -6
  442. package/lib/common/plugins/useSelectionPlugin.js +24 -13
  443. package/lib/components/BatchAttrMetric/SelectTable.js +3 -0
  444. package/lib/components/BatchAttrMetric/constant.js +2 -2
  445. package/lib/components/BatchAttrMetric/index.js +27 -9
  446. package/lib/components/BatchAttrMetric/setting.js +72 -30
  447. package/lib/components/BatchAttrMetric/utils.js +9 -1
  448. package/lib/components/BooleanRadio.js +15 -5
  449. package/lib/components/ColorPanel/components/ColorBlock/index.js +8 -2
  450. package/lib/components/ColorPanel/components/FontColorRange/index.js +19 -9
  451. package/lib/components/ColorPanel/index.js +50 -17
  452. package/lib/components/Drawer/Drawer.js +25 -14
  453. package/lib/components/Drawer/index.js +3 -0
  454. package/lib/components/FormTable/index.js +32 -13
  455. package/lib/components/FullheightTab/FullheightTab.js +7 -0
  456. package/lib/components/FullheightTab/index.js +3 -0
  457. package/lib/components/LayoutDirectionSelect/Item.js +9 -0
  458. package/lib/components/LayoutDirectionSelect/LayoutDirectionSelect.js +13 -5
  459. package/lib/components/LayoutDirectionSelect/index.js +3 -0
  460. package/lib/components/LayoutSelect/LayoutSelect.js +12 -5
  461. package/lib/components/LayoutSelect/index.js +3 -0
  462. package/lib/components/Link.js +7 -0
  463. package/lib/components/ModelAttrSelectDrawer/components/ModelAttrSelectDrawer.js +11 -4
  464. package/lib/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js +27 -15
  465. package/lib/components/ModelAttrSelectDrawer/index.js +3 -0
  466. package/lib/components/MultiResourceDrawer/Content.js +31 -11
  467. package/lib/components/MultiResourceDrawer/Dynamic.js +10 -2
  468. package/lib/components/MultiResourceDrawer/ResourceCard/index.js +11 -4
  469. package/lib/components/MultiResourceDrawer/ResourceSelect.js +10 -2
  470. package/lib/components/MultiResourceDrawer/Static.js +10 -2
  471. package/lib/components/MultiResourceDrawer/index.js +23 -8
  472. package/lib/components/NetworkTopoResourceSelectDrawer/NetworkTopoResourceSelectDrawer.js +6 -0
  473. package/lib/components/NetworkTopoResourceSelectDrawer/index.js +3 -0
  474. package/lib/components/ResourceList/ResourceSelect.js +64 -27
  475. package/lib/components/ResourceList/ResourceSelectConnect.js +17 -3
  476. package/lib/components/ResourceList/index.js +3 -0
  477. package/lib/components/ResourceSelect/ResourceSelectDrawer.js +21 -6
  478. package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +39 -13
  479. package/lib/components/ResourceSelectDrawer/ResourceSelectList.js +15 -4
  480. package/lib/components/ResourceSelectDrawer/index.js +3 -0
  481. package/lib/components/SingleResourceDrawer/SelectDrawer.js +23 -6
  482. package/lib/components/SingleResourceDrawer/SingleResourceDrawer.js +22 -6
  483. package/lib/components/SingleResourceDrawer/index.js +3 -0
  484. package/lib/components/TagImageSelect/index.js +18 -8
  485. package/lib/components/TagSelect/index.js +22 -8
  486. package/lib/components/TemplateButton/Icon.js +10 -5
  487. package/lib/components/TemplateButton/assets/index.js +5 -0
  488. package/lib/components/TemplateButton/index.js +16 -6
  489. package/lib/components/VerticalIconTab/VerticalIconTab.js +23 -6
  490. package/lib/components/VerticalIconTab/index.js +3 -0
  491. package/lib/components/collapse/Collapse.js +16 -4
  492. package/lib/components/collapse/Panel.js +33 -7
  493. package/lib/components/collapse/index.js +3 -0
  494. package/lib/constants/ResourceInfoDisplay.js +6 -6
  495. package/lib/constants/ResourceTypeLimit.js +20 -20
  496. package/lib/contextmenu/createMenuCommands.js +11 -6
  497. package/lib/core/common/contextmenu/mergeContextmenu.js +6 -2
  498. package/lib/core/common/hooks/ht/useDataModelDataPropertyChange.js +5 -0
  499. package/lib/core/common/hooks/useHtElement.js +4 -1
  500. package/lib/core/common/hooks/useHtElements.js +8 -5
  501. package/lib/core/common/icons/icon.js +36 -16
  502. package/lib/core/common/icons/useIcons.js +10 -1
  503. package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +22 -4
  504. package/lib/core/components/AlarmListPanel/constants/uicbb.js +1 -0
  505. package/lib/core/components/AlarmListPanel/hooks/useAlarmList.js +9 -2
  506. package/lib/core/components/AlarmListPanel/index.js +18 -2
  507. package/lib/core/components/DisplaySettingDrawer/DisplaySetting.js +34 -10
  508. package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +38 -13
  509. package/lib/core/components/DisplaySettingDrawer/EdgeFlow.js +8 -1
  510. package/lib/core/components/DisplaySettingDrawer/EdgeFlowDirection.js +8 -1
  511. package/lib/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js +38 -14
  512. package/lib/core/components/DisplaySettingDrawer/LinkTag.js +10 -1
  513. package/lib/core/components/DisplaySettingDrawer/NodeTag.js +10 -1
  514. package/lib/core/components/DisplaySettingDrawer/NodeTip.js +10 -1
  515. package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js +46 -24
  516. package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/CommonCheckboxGroup.js +14 -3
  517. package/lib/core/components/DisplaySettingDrawer/components/NodeAttrSettingDrawer.js +21 -5
  518. package/lib/core/components/DisplaySettingDrawer/demo/Demo.js +6 -4
  519. package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +39 -10
  520. package/lib/core/components/DisplaySettingDrawer/index.js +3 -0
  521. package/lib/core/components/DisplaySettingDrawer/tagtip/CustomSettingDrawer/CustomSetting.js +11 -3
  522. package/lib/core/components/DisplaySettingDrawer/tagtip/CustomSettingDrawer/CustomSettingDrawer.js +5 -0
  523. package/lib/core/components/ResourceViewAttributeSetting/Setting.js +22 -6
  524. package/lib/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js +27 -6
  525. package/lib/core/components/TopoAppProvider.js +5 -0
  526. package/lib/core/components/TopoView/GraphViewPanel.js +24 -10
  527. package/lib/core/components/TopoView/index.js +3 -0
  528. package/lib/core/components/TopoView/topoView.js +97 -35
  529. package/lib/core/components/buildProvider.js +5 -0
  530. package/lib/core/components/titlebar/TitleBar.js +21 -4
  531. package/lib/core/components/titlebar/index.js +17 -0
  532. package/lib/core/components/titlebar/widgets/TitleWidget.js +9 -2
  533. package/lib/core/createTopoApp.js +5 -0
  534. package/lib/core/editor/components/BackgroundView/UploadDialog/index.js +69 -21
  535. package/lib/core/editor/components/BackgroundView/index.js +87 -24
  536. package/lib/core/editor/components/BottomFloatTool/HelpIcon.js +25 -8
  537. package/lib/core/editor/components/CustomIconPlugin/CustomIconPlugin.js +10 -5
  538. package/lib/core/editor/components/CustomIconPlugin/RenameDialog.js +35 -7
  539. package/lib/core/editor/components/CustomIconPlugin/UploadIconDialog.js +87 -24
  540. package/lib/core/editor/components/CustomIconPlugin/UploadIconDialogWrapper.js +11 -3
  541. package/lib/core/editor/components/CustomIconPlugin/index.js +3 -0
  542. package/lib/core/editor/components/CustomIconPlugin/utils/svgToShape.js +13 -3
  543. package/lib/core/editor/components/EditorPlugin.js +23 -4
  544. package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +19 -6
  545. package/lib/core/editor/components/GroupAddResourceDrawerPlugin/index.js +11 -5
  546. package/lib/core/editor/components/Sidebar/Sidebar.js +26 -8
  547. package/lib/core/editor/components/Sidebar/panes.js +7 -0
  548. package/lib/core/editor/components/Sidebar/views/BackgroundPanel/BackgroundPanel.js +4 -0
  549. package/lib/core/editor/components/Sidebar/views/BackgroundPanel/index.js +3 -0
  550. package/lib/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.js +15 -5
  551. package/lib/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +38 -14
  552. package/lib/core/editor/components/Sidebar/views/CanvasPanel/index.js +3 -0
  553. package/lib/core/editor/components/Sidebar/views/ComponentPanel.js +12 -6
  554. package/lib/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js +8 -1
  555. package/lib/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js +9 -1
  556. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +17 -6
  557. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +17 -6
  558. package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePalette.js +12 -6
  559. package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +29 -4
  560. package/lib/core/editor/components/Sidebar/views/ImagePanel/index.js +3 -0
  561. package/lib/core/editor/components/Sidebar/views/LinkPanel.js +13 -6
  562. package/lib/core/editor/components/Toolbar/EditorToolbar.js +17 -2
  563. package/lib/core/editor/components/Toolbar/Toolbar.js +5 -0
  564. package/lib/core/editor/components/Toolbar/buttons.js +35 -30
  565. package/lib/core/editor/components/Toolbar/components/Tooltip.js +8 -2
  566. package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js +21 -8
  567. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js +21 -7
  568. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +52 -19
  569. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundUtil.js +37 -9
  570. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/index.js +3 -0
  571. package/lib/core/editor/components/Toolbar/widgets/CanvasMoveWidget.js +13 -3
  572. package/lib/core/editor/components/Toolbar/widgets/CanvasSelectWidget.js +11 -3
  573. package/lib/core/editor/components/Toolbar/widgets/Divider.js +5 -0
  574. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/Content.js +12 -6
  575. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +36 -12
  576. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/index.js +3 -0
  577. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +28 -10
  578. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +16 -4
  579. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/constants.js +3 -2
  580. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +37 -13
  581. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +57 -24
  582. package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +15 -4
  583. package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js +18 -8
  584. package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +39 -16
  585. package/lib/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +10 -2
  586. package/lib/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +10 -3
  587. package/lib/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js +32 -9
  588. package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.js +31 -9
  589. package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss +1 -1
  590. package/lib/core/editor/components/Toolbar/widgets/IconSelect/popUpContent.js +12 -2
  591. package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutSettings.js +23 -10
  592. package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutTagImageSelect/index.js +19 -9
  593. package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutTagSelect/index.js +26 -13
  594. package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutTemplateButton/Icon.js +10 -5
  595. package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutTemplateButton/assets/index.js +6 -0
  596. package/lib/core/editor/components/Toolbar/widgets/Layout/components/LayoutTemplateButton/index.js +16 -6
  597. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +55 -28
  598. package/lib/core/editor/components/Toolbar/widgets/NodeAlignWidget.js +44 -20
  599. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/BoxBackgroundSetting.js +10 -2
  600. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +26 -12
  601. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/index.js +3 -0
  602. package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/BoxBackgroundSetting.js +4 -0
  603. package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +33 -13
  604. package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/index.js +3 -0
  605. package/lib/core/editor/components/Toolbar/widgets/SearchWidget.js +12 -1
  606. package/lib/core/editor/components/Toolbar/widgets/WidgetBox.js +20 -6
  607. package/lib/core/editor/components/Toolbar/widgets/components/ArrowButton.js +11 -2
  608. package/lib/core/editor/components/Toolbar/widgets/components/ArrowPopup.js +11 -1
  609. package/lib/core/editor/components/Toolbar/widgets/components/ButtonBox.js +17 -5
  610. package/lib/core/editor/components/Toolbar/widgets/components/DropdownButton.js +27 -9
  611. package/lib/core/editor/components/Toolbar/widgets/components/DropdownMenu.js +16 -5
  612. package/lib/core/editor/components/Toolbar/widgets/components/MenuSelect.js +8 -2
  613. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +17 -5
  614. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/colorUtil.js +14 -2
  615. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/box.js +14 -3
  616. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +24 -6
  617. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js +24 -5
  618. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/index.js +8 -0
  619. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/layerTitle.js +21 -6
  620. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +26 -7
  621. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/text.js +14 -2
  622. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +30 -6
  623. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js +14 -3
  624. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js +36 -13
  625. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js +7 -0
  626. package/lib/core/editor/components/plugins/AddElementThemePlugin.js +5 -0
  627. package/lib/core/editor/components/plugins/CorePlugin.js +9 -3
  628. package/lib/core/editor/components/plugins/SaveLoading.js +11 -2
  629. package/lib/core/editor/components/settings/CloseablePanel.js +12 -3
  630. package/lib/core/editor/components/settings/PropertyView.js +27 -7
  631. package/lib/core/editor/components/settings/Settings.js +20 -7
  632. package/lib/core/editor/components/settings/common/AddResourceButton.js +7 -0
  633. package/lib/core/editor/components/settings/common/AlignSetting/AlignTypeList.js +25 -11
  634. package/lib/core/editor/components/settings/common/AlignSetting/index.js +18 -5
  635. package/lib/core/editor/components/settings/common/GroupNodeList/ResourceList.js +18 -2
  636. package/lib/core/editor/components/settings/common/LayoutSettings.js +24 -12
  637. package/lib/core/editor/components/settings/common/LineType/index.js +7 -0
  638. package/lib/core/editor/components/settings/common/NameInput.js +11 -1
  639. package/lib/core/editor/components/settings/common/NodeAlignType.js +8 -0
  640. package/lib/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js +42 -9
  641. package/lib/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +32 -12
  642. package/lib/core/editor/components/settings/common/SizeInput/NodeSizeNumberPicker.js +29 -10
  643. package/lib/core/editor/components/settings/common/SizeInput/index.js +3 -0
  644. package/lib/core/editor/components/settings/common/tab/TabView.js +6 -0
  645. package/lib/core/editor/components/settings/common/text/FontStyleCheckbox.js +18 -1
  646. package/lib/core/editor/components/settings/common/text/TextStyle.js +19 -2
  647. package/lib/core/editor/components/settings/common/text/fontStyleUtil.js +8 -2
  648. package/lib/core/editor/components/settings/core/PropertyViewManager.js +23 -0
  649. package/lib/core/editor/components/settings/core/edgePropertyViewAdapter.js +5 -0
  650. package/lib/core/editor/components/settings/core/getPropertyViewType.js +5 -0
  651. package/lib/core/editor/components/settings/core/updateElementProperty.js +3 -0
  652. package/lib/core/editor/components/settings/propertyViews/PropertyViewFactory.js +2 -0
  653. package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyView.js +20 -3
  654. package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js +19 -2
  655. package/lib/core/editor/components/settings/propertyViews/box/NameInput.js +19 -3
  656. package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +29 -5
  657. package/lib/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js +7 -0
  658. package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +16 -4
  659. package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +19 -3
  660. package/lib/core/editor/components/settings/propertyViews/group/DataTab/GroupAddResourceButton.js +9 -2
  661. package/lib/core/editor/components/settings/propertyViews/group/DataTab/GroupNodeList.js +14 -7
  662. package/lib/core/editor/components/settings/propertyViews/group/DataTab/GroupRelateData/GroupRelateData.js +20 -4
  663. package/lib/core/editor/components/settings/propertyViews/group/DataTab/RelateData.js +10 -4
  664. package/lib/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js +17 -11
  665. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.js +11 -3
  666. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js +13 -3
  667. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js +27 -7
  668. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js +29 -15
  669. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandStatus.js +10 -3
  670. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupIconSelect.js +11 -2
  671. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js +31 -6
  672. package/lib/core/editor/components/settings/propertyViews/group/cluster/ClusterGroupRelateData.js +19 -4
  673. package/lib/core/editor/components/settings/propertyViews/group/hooks/useGroup.js +4 -0
  674. package/lib/core/editor/components/settings/propertyViews/index.js +10 -0
  675. package/lib/core/editor/components/settings/propertyViews/layer/BasicSetting.js +18 -3
  676. package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +20 -7
  677. package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceButton.js +13 -4
  678. package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js +8 -2
  679. package/lib/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js +9 -1
  680. package/lib/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js +14 -4
  681. package/lib/core/editor/components/settings/propertyViews/layer/LayerPropertyView.js +13 -6
  682. package/lib/core/editor/components/settings/propertyViews/layer/LayerPropertyViewV1.js +14 -6
  683. package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +31 -7
  684. package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting_bak.js +35 -16
  685. package/lib/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeIcon.js +7 -2
  686. package/lib/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize.js +44 -13
  687. package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementLineType.js +7 -0
  688. package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +25 -7
  689. package/lib/core/editor/components/settings/propertyViews/node/NodeIconSelect.js +11 -3
  690. package/lib/core/editor/components/settings/propertyViews/node/NodeIconSelectTest.js +9 -2
  691. package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js +17 -8
  692. package/lib/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js +22 -7
  693. package/lib/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js +19 -6
  694. package/lib/core/editor/components/settings/propertyViews/node/Setting/NameInput.js +19 -3
  695. package/lib/core/editor/components/settings/propertyViews/node/Setting/Setting.js +26 -6
  696. package/lib/core/editor/components/settings/propertyViews/node/Setting/index.js +3 -0
  697. package/lib/core/editor/components/settings/propertyViews/node/TopoTreeSelect.js +8 -0
  698. package/lib/core/editor/components/settings/propertyViews/node/data/BindIpInput.js +32 -18
  699. package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +25 -7
  700. package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +47 -19
  701. package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +19 -6
  702. package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +7 -1
  703. package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js +29 -5
  704. package/lib/core/editor/components/settings/propertyViews/view/BackgroundSize.js +18 -5
  705. package/lib/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js +9 -3
  706. package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +15 -4
  707. package/lib/core/editor/components/settings/propertyViews/view/GlobalLayout.js +12 -5
  708. package/lib/core/editor/components/settings/propertyViews/view/GlobalNodeLabelStyle.js +17 -2
  709. package/lib/core/editor/components/settings/propertyViews/view/ViewLineTypeSetting.js +8 -0
  710. package/lib/core/editor/components/settings/propertyViews/view/ViewPropertyView.js +19 -3
  711. package/lib/core/editor/components/settings/propertyViews/view/ViewPropertyViewV2.js +11 -3
  712. package/lib/core/editor/components/settings/propertyViews/view/hooks/useBackgroundConfig.js +6 -3
  713. package/lib/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js +19 -4
  714. package/lib/core/editor/components/settings/useSettingRuntimeState.js +10 -2
  715. package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js +42 -12
  716. package/lib/core/editor/components/titlebar/widgets/DebugTools.js +8 -1
  717. package/lib/core/editor/components/titlebar/widgets/SaveButton.js +5 -0
  718. package/lib/core/editor/config/themes.js +10 -8
  719. package/lib/core/editor/contextmenu/buildContextmenu.js +2 -2
  720. package/lib/core/editor/hooks/useKeyboardShortcut.js +14 -7
  721. package/lib/core/editor/hooks/useLayerAddResource.js +8 -4
  722. package/lib/core/editor/hooks/useNewElementTheme.js +20 -7
  723. package/lib/core/editor/hooks/useUpdateHtTopoDefaultTagStyle.js +6 -1
  724. package/lib/core/editor/store/background.js +16 -6
  725. package/lib/core/editor/store/historyManager.js +6 -1
  726. package/lib/core/editor/store/topoEdit.js +13 -5
  727. package/lib/core/editor/utils/edgeTypeStyleUtil.js +22 -9
  728. package/lib/core/editor/utils/themeUtil.js +6 -0
  729. package/lib/core/event/topoEventListener.js +3 -0
  730. package/lib/core/hooks/ht/useHtDataPropertyChangeListener.js +11 -3
  731. package/lib/core/hooks/useAlarm.js +33 -11
  732. package/lib/core/hooks/useCanvasTheme.js +16 -9
  733. package/lib/core/hooks/useCanvasThemeConfig.js +8 -2
  734. package/lib/core/hooks/useCiAttributeChange.js +14 -3
  735. package/lib/core/hooks/useEventData.js +7 -2
  736. package/lib/core/hooks/useGraphAlarmDisplay.js +34 -11
  737. package/lib/core/hooks/useGroupAddResource.js +7 -2
  738. package/lib/core/hooks/useManageStatus.js +6 -1
  739. package/lib/core/hooks/usePolling.js +74 -32
  740. package/lib/core/hooks/useResourceConfig.js +66 -22
  741. package/lib/core/hooks/useRouterAdapter.js +6 -1
  742. package/lib/core/hooks/useSelection.js +5 -1
  743. package/lib/core/hooks/useTopoEdit.js +301 -112
  744. package/lib/core/hooks/useTopoEventListener.js +4 -1
  745. package/lib/core/hooks/useTopoFullscreen.js +12 -7
  746. package/lib/core/index.js +2 -0
  747. package/lib/core/models/Alarm.js +159 -49
  748. package/lib/core/models/AttributeMetricDisplay.js +173 -89
  749. package/lib/core/models/DataModel.js +39 -4
  750. package/lib/core/models/EdgeGroup.js +8 -2
  751. package/lib/core/models/GraphDataModel.js +8 -0
  752. package/lib/core/models/HistoryManager.js +64 -21
  753. package/lib/core/models/PluginManager.js +11 -0
  754. package/lib/core/models/SelectionModel.js +44 -11
  755. package/lib/core/models/TopoApp.js +204 -72
  756. package/lib/core/models/TopoGraphView.js +35 -7
  757. package/lib/core/models/TopoViewer.js +7 -0
  758. package/lib/core/models/attributeFormatter/formatter/attributeTransform.js +3 -0
  759. package/lib/core/models/attributeFormatter/formatter/ciTypeAttrTransform.js +4 -2
  760. package/lib/core/models/attributeFormatter/formatter/commonTransform.js +10 -6
  761. package/lib/core/models/attributeFormatter/formatter/graphTransform.js +8 -2
  762. package/lib/core/models/attributeFormatter/formatter/metricTransform.js +3 -0
  763. package/lib/core/models/attributeFormatter/index.js +14 -0
  764. package/lib/core/models/cache/CiCache.js +22 -3
  765. package/lib/core/models/cache/CiTypeCache.js +43 -7
  766. package/lib/core/models/cache/DictCache.js +29 -3
  767. package/lib/core/models/common/ContextMenu.js +10 -0
  768. package/lib/core/models/graph/Background.js +19 -3
  769. package/lib/core/models/plugins/index.js +1 -2
  770. package/lib/core/models/plugins/resourceWebControllUrl.js +47 -9
  771. package/lib/core/models/tagstips/ElementTagTipConfig.js +64 -15
  772. package/lib/core/models/tagstips/utils.js +9 -3
  773. package/lib/core/models/topoData.js +36 -8
  774. package/lib/core/models/topoFactory.js +6 -0
  775. package/lib/core/models/utils/getRelationDetailByIds.js +1 -0
  776. package/lib/core/models/utils/linkUtils.js +48 -19
  777. package/lib/core/models/utils/nodeNameVisibleUtil.js +30 -15
  778. package/lib/core/services/alarm.js +14 -3
  779. package/lib/core/services/background.js +29 -9
  780. package/lib/core/services/cmdb/metric.js +10 -3
  781. package/lib/core/services/cmdb.js +12 -3
  782. package/lib/core/services/index.js +24 -7
  783. package/lib/core/services/overview.js +63 -23
  784. package/lib/core/services/topo/basic.js +11 -3
  785. package/lib/core/services/topo/index.js +6 -0
  786. package/lib/core/services/topo/tagtip.js +11 -3
  787. package/lib/core/store/coreModels.js +16 -0
  788. package/lib/core/store/createStore.js +7 -0
  789. package/lib/core/store/models/ciModel.js +23 -5
  790. package/lib/core/store/models/customIcon.js +72 -21
  791. package/lib/core/store/models/displayConfig.js +21 -7
  792. package/lib/core/store/models/selection.js +13 -6
  793. package/lib/core/store/models/topoAlarm.js +52 -12
  794. package/lib/core/store/models/topoBaseInfoOverview.js +14 -6
  795. package/lib/core/store/models/topoBizMod.js +22 -5
  796. package/lib/core/store/models/topoConfig.js +109 -41
  797. package/lib/core/store/models/topoGraphView.js +16 -7
  798. package/lib/core/store/models/topoMod.js +131 -36
  799. package/lib/core/store/models/viewer/lock.js +4 -0
  800. package/lib/core/store/models/viewer/resourceDetail.js +8 -2
  801. package/lib/core/store/models/viewer/resourceWebControllUrlSetting.js +5 -0
  802. package/lib/core/test/Test.js +14 -10
  803. package/lib/core/upgrade/v140UpgradeSerializeNodeImageSize.js +6 -0
  804. package/lib/core/utils/backgroundUtil.js +9 -5
  805. package/lib/core/utils/edgeUtil.js +17 -3
  806. package/lib/core/utils/graphLinkUtil.js +9 -4
  807. package/lib/core/utils/imageUtil.js +12 -3
  808. package/lib/core/utils/linkUtil.js +1 -0
  809. package/lib/core/utils/manageStatusUtil.js +1 -0
  810. package/lib/core/utils/metricUtil.js +4 -0
  811. package/lib/core/utils/resourceUtil.js +4 -2
  812. package/lib/core/utils/saveSerialize.js +9 -3
  813. package/lib/core/utils/showGraphManageStatusUtil.js +23 -14
  814. package/lib/core/utils/showMessage.js +9 -0
  815. package/lib/core/viewer/components/plugins/ElementDetailDrawer/components/DetailDrawer.js +7 -0
  816. package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +64 -32
  817. package/lib/core/viewer/components/plugins/MetricPollingPlugin.js +4 -0
  818. package/lib/core/viewer/components/plugins/ResourceDetail/DefaultDetailContent.js +23 -8
  819. package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js +20 -6
  820. package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +21 -9
  821. package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailPlugin.js +11 -2
  822. package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +36 -10
  823. package/lib/core/viewer/components/plugins/ResourceDetail/components/DrawerTitle.js +24 -7
  824. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BaseInfo.js +24 -15
  825. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BaseInfoBlock.js +17 -10
  826. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/BlockBox.js +7 -2
  827. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +29 -10
  828. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js +36 -17
  829. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +229 -88
  830. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js +40 -25
  831. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/SingleResourceStrategyLink.js +8 -5
  832. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +87 -32
  833. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.js +12 -2
  834. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +38 -13
  835. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/constants.js +4 -8
  836. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js +31 -12
  837. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +83 -19
  838. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +44 -23
  839. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +49 -21
  840. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.js +3 -0
  841. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/useCiAttrAndMetricData.js +5 -2
  842. package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleContainer.js +8 -1
  843. package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js +27 -8
  844. package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +33 -10
  845. package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +17 -5
  846. package/lib/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +23 -7
  847. package/lib/core/viewer/components/plugins/ResourceDetail/index.js +3 -0
  848. package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +33 -6
  849. package/lib/core/viewer/components/plugins/ViewerPlugin.js +9 -1
  850. package/lib/core/viewer/components/titlebar/BasicTools.js +12 -3
  851. package/lib/core/viewer/components/titlebar/TopoViewerTitleBar.js +14 -4
  852. package/lib/core/viewer/components/titlebar/ViewerTools.js +5 -0
  853. package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +11 -2
  854. package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js +28 -15
  855. package/lib/core/viewer/components/titlebar/widgets/EditButton.js +14 -3
  856. package/lib/core/viewer/components/titlebar/widgets/MoreButtonMenu.js +10 -1
  857. package/lib/core/viewer/components/titlebar/widgets/NodesDragSwitch.js +26 -13
  858. package/lib/core/viewer/components/titlebar/widgets/NodesDragSwitchWrapper.js +10 -1
  859. package/lib/core/viewer/components/titlebar/widgets/SearchWidget.js +25 -9
  860. package/lib/core/viewer/components/titlebar/widgets/SettingButton.js +18 -6
  861. package/lib/core/viewer/components/titlebar/widgets/SettingButtonWidget.js +9 -4
  862. package/lib/core/viewer/contextmenu/buildContextmenu.js +5 -0
  863. package/lib/core/viewer/contextmenu/buildLinkContextmenu.js +2 -2
  864. package/lib/core/viewer/contextmenu/buildNodeContextmenu.js +3 -8
  865. package/lib/core/viewer/contextmenu/buildViewContextmenu.js +1 -0
  866. package/lib/createTopo.js +8 -2
  867. package/lib/index.js +19 -0
  868. package/lib/mock/mock.js +4 -5
  869. package/lib/networkTopo/components/Link/form.js +57 -25
  870. package/lib/networkTopo/components/Link/hook.js +100 -48
  871. package/lib/networkTopo/components/Link/index.js +77 -32
  872. package/lib/networkTopo/components/Link/setting.js +86 -45
  873. package/lib/networkTopo/components/Topo404.js +9 -0
  874. package/lib/networkTopo/components/TopoNoPermission.js +9 -0
  875. package/lib/networkTopo/components/TopoView.js +37 -13
  876. package/lib/networkTopo/createTopo.js +6 -0
  877. package/lib/networkTopo/getTopoData.js +43 -16
  878. package/lib/networkTopo/hooks/useEdgeExpand.js +6 -1
  879. package/lib/networkTopo/hooks/useGroupResources.js +5 -2
  880. package/lib/networkTopo/hooks/useLinkDynamicStyle.js +7 -1
  881. package/lib/networkTopo/hooks/viewer/useEdgeFlow.js +8 -5
  882. package/lib/networkTopo/hooks/viewer/useRelateTopo.js +31 -7
  883. package/lib/networkTopo/index.js +7 -0
  884. package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js +12 -2
  885. package/lib/networkTopo/models/ExtElementTagTipBuilder.js +8 -0
  886. package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js +15 -2
  887. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +54 -26
  888. package/lib/networkTopo/models/LinkTagsTipsBuilder.js +55 -40
  889. package/lib/networkTopo/models/TopoCenter.js +39 -8
  890. package/lib/networkTopo/services/alert.js +15 -5
  891. package/lib/networkTopo/services/authorization.js +35 -16
  892. package/lib/networkTopo/services/cmdb.js +211 -72
  893. package/lib/networkTopo/services/funcAuth.js +10 -3
  894. package/lib/networkTopo/services/index.js +7 -0
  895. package/lib/networkTopo/services/link.js +47 -11
  896. package/lib/networkTopo/services/mdc.js +26 -9
  897. package/lib/networkTopo/services/metric.js +20 -6
  898. package/lib/networkTopo/services/model.js +291 -89
  899. package/lib/networkTopo/services/risk.js +10 -3
  900. package/lib/networkTopo/services/topo/auth.js +19 -7
  901. package/lib/networkTopo/services/topo/basic.js +154 -57
  902. package/lib/networkTopo/services/topo/blacklist.js +17 -5
  903. package/lib/networkTopo/services/topo/ciInfo.js +20 -5
  904. package/lib/networkTopo/services/topo/icon.js +30 -11
  905. package/lib/networkTopo/services/topo/index.js +15 -0
  906. package/lib/networkTopo/services/topo/networkLink.js +17 -5
  907. package/lib/networkTopo/services/topo/relation.js +11 -3
  908. package/lib/networkTopo/services/topo/resourceWebUrl.js +25 -9
  909. package/lib/networkTopo/store/functionAuth.js +24 -9
  910. package/lib/networkTopo/store/index.js +6 -0
  911. package/lib/networkTopo/store/topoCenter.js +63 -22
  912. package/lib/networkTopo/store/topoLinkMod.js +12 -5
  913. package/lib/networkTopo/store/topoTreeMod.js +83 -19
  914. package/lib/networkTopo/utils/SortResourcesUtil.js +4 -1
  915. package/lib/networkTopo/utils/__tests__/resourcePermissionUtil.test.js +7 -4
  916. package/lib/networkTopo/utils/edgeGroupTagUtil.js +19 -7
  917. package/lib/networkTopo/utils/exitLinkUtil.js +58 -38
  918. package/lib/networkTopo/utils/exportData.js +25 -10
  919. package/lib/networkTopo/utils/linPermissionUtil.js +3 -3
  920. package/lib/networkTopo/utils/linkUtil.js +2 -0
  921. package/lib/networkTopo/utils/resourcePermissionUtil.js +14 -4
  922. package/lib/networkTopo/utils/storage.js +5 -3
  923. package/lib/networkTopo/viewer/components/TitleBar.js +6 -0
  924. package/lib/networkTopo/viewer/components/TopologyViewer.js +12 -3
  925. package/lib/networkTopo/viewer/createTopoViewer.js +5 -0
  926. package/lib/networkTopo/viewer/index.js +9 -0
  927. package/lib/utils/ResourceConfigUtil.js +31 -17
  928. package/lib/utils/SpecialCharacterValidateUtil.js +2 -0
  929. package/lib/utils/ciType.js +7 -1
  930. package/lib/utils/clusterUtil.js +35 -15
  931. package/lib/utils/copyUtil.js +2 -0
  932. package/lib/utils/format.js +38 -12
  933. package/lib/utils/htElementDataUtil.js +12 -0
  934. package/lib/utils/htElementUtils.js +87 -26
  935. package/lib/utils/listToTree.js +3 -0
  936. package/lib/utils/resourceElementUtil.js +2 -0
  937. package/lib/utils/template.js +7 -6
  938. package/lib/utils/topoData.js +97 -51
  939. package/lib/utils/topoMocks.js +4 -3
  940. package/lib/utils/topoPermissionUtil.js +1 -0
  941. package/lib/utils/tree.js +46 -14
  942. package/lib/utils/treeUtil.js +3 -0
  943. package/package.json +3 -3
@@ -1,44 +1,53 @@
1
1
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
- function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
3
+ import _regeneratorRuntime from "@babel/runtime/regenerator";
4
4
  import rlog from '@riil-frontend/component-topology-utils/es/rlog';
5
5
  import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
6
6
  import { isMonitoring } from "../utils/manageStatusUtil";
7
7
  import AttributeFormatter from "./attributeFormatter";
8
8
  import DictCache from "./cache/DictCache";
9
9
  import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
10
+
10
11
  function isGraphField(item) {
11
12
  return item.type === 'graph';
12
13
  }
14
+
13
15
  function filterUnExistedFields(fields, ciTypeMeta) {
14
16
  function isFieldExisted(item, ciTypeMeta) {
15
17
  return item.type === 'attribute' && ciTypeMeta.attributeMap[item.code] || item.type === 'metric' && ciTypeMeta.metricMap[item.code] || item.type !== 'attribute' && item.type !== 'metric';
16
18
  }
19
+
17
20
  return fields.filter(function (item) {
18
21
  return isFieldExisted(item, ciTypeMeta);
19
22
  });
20
23
  }
21
-
22
24
  /**
23
25
  * 资源标注、悬浮框数据
24
26
  */
27
+
28
+
25
29
  var AttributeMetricDisplay = /*#__PURE__*/function () {
26
30
  function AttributeMetricDisplay(topo) {
27
31
  var _this$topo$options$ta;
32
+
28
33
  this.topo = topo;
29
34
  this.formatter = new AttributeFormatter(this.topo);
30
35
  var ExtElementTagTipBuilder = (_this$topo$options$ta = this.topo.options.tagTip) === null || _this$topo$options$ta === void 0 ? void 0 : _this$topo$options$ta.extElementTagTipBuilder;
36
+
31
37
  if (ExtElementTagTipBuilder) {
32
38
  this.extElementTagTipBuilder = new ExtElementTagTipBuilder(this);
33
39
  }
34
40
  }
41
+
35
42
  var _proto = AttributeMetricDisplay.prototype;
43
+
36
44
  _proto.getConfig = function getConfig() {
37
45
  var _this$topo$store$getM = this.topo.store.getModelState('displayConfig'),
38
- nodeTag = _this$topo$store$getM.nodeTag,
39
- nodeTip = _this$topo$store$getM.nodeTip,
40
- linkTag = _this$topo$store$getM.linkTag,
41
- linkTip = _this$topo$store$getM.linkTip;
46
+ nodeTag = _this$topo$store$getM.nodeTag,
47
+ nodeTip = _this$topo$store$getM.nodeTip,
48
+ linkTag = _this$topo$store$getM.linkTag,
49
+ linkTip = _this$topo$store$getM.linkTip;
50
+
42
51
  return {
43
52
  nodeTag: nodeTag,
44
53
  nodeTip: nodeTip,
@@ -46,29 +55,34 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
46
55
  linkTip: linkTip
47
56
  };
48
57
  }
49
-
50
58
  /**
51
59
  * 获得节点资源类型的配置,只包含属性和指标字段
52
60
  *
53
61
  * @param {*} ciType
54
62
  * @param {*} config
55
63
  * @returns
56
- */;
64
+ */
65
+ ;
66
+
57
67
  _proto.getNodeCiTypeConfig = function getNodeCiTypeConfig(ciType, config) {
58
68
  var _this$getConfig = this.getConfig(config),
59
- nodeTag = _this$getConfig.nodeTag,
60
- nodeTip = _this$getConfig.nodeTip;
69
+ nodeTag = _this$getConfig.nodeTag,
70
+ nodeTip = _this$getConfig.nodeTip;
71
+
61
72
  var ciTypeMeta = this.topo.ciTyeCache.getCiType(ciType);
73
+
62
74
  function getItems(cfg) {
63
75
  if (!ciTypeMeta || !cfg) {
64
76
  return [];
65
77
  }
78
+
66
79
  var isCustom = cfg.isCustom,
67
- data = cfg.data;
68
- var items = (isCustom ? data[ciType] : data) || [];
69
- // 过滤类型不存在的属性和指标、图片名称
80
+ data = cfg.data;
81
+ var items = (isCustom ? data[ciType] : data) || []; // 过滤类型不存在的属性和指标、图片名称
82
+
70
83
  return filterUnExistedFields(items, ciTypeMeta);
71
84
  }
85
+
72
86
  return {
73
87
  tags: getItems(nodeTag || DEFAULT_NODE_TAG_COMMON_CONFIG).filter(function (item) {
74
88
  return !isGraphField(item);
@@ -76,34 +90,41 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
76
90
  tips: getItems(nodeTip || DEFAULT_TIP_COMMON_CONFIG)
77
91
  };
78
92
  }
79
-
80
93
  /**
81
94
  * 查询需要查询数据的连线
82
95
  *
83
96
  * @param {*} data
84
97
  * @returns
85
- */;
98
+ */
99
+ ;
100
+
86
101
  _proto.getEdges = function getEdges() {
87
102
  // 获得图上业务连线
88
103
  var _this$topo$dataModel$ = this.topo.dataModel.getData(),
89
- links = _this$topo$dataModel$.links,
90
- linkGroups = _this$topo$dataModel$.linkGroups;
104
+ links = _this$topo$dataModel$.links,
105
+ linkGroups = _this$topo$dataModel$.linkGroups;
106
+
91
107
  return [].concat(links.map(function (link) {
92
108
  return _extends({}, link, {
93
109
  type: 'edge'
94
110
  });
95
111
  }));
96
112
  };
113
+
97
114
  _proto.getNodesTagTipConfig = function getNodesTagTipConfig() {
98
115
  var _this = this;
116
+
99
117
  var _this$topo$dataModel$2 = this.topo.dataModel.getData(),
100
- nodes = _this$topo$dataModel$2.nodes;
101
- // console.log("getNodesTagTipConfig", nodes);
118
+ nodes = _this$topo$dataModel$2.nodes; // console.log("getNodesTagTipConfig", nodes);
119
+
120
+
102
121
  var nodeArr = [];
103
122
  nodes.forEach(function (node) {
104
123
  if (node.ciType) {
105
124
  var ciType = node.ciType;
125
+
106
126
  var ciTypeConfig = _this.getNodeCiTypeConfig(ciType);
127
+
107
128
  nodeArr.push({
108
129
  type: 'node',
109
130
  id: node.id,
@@ -112,55 +133,60 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
112
133
  tips: _this.filterCiFiledConfigItems(node, ciTypeConfig.tips)
113
134
  });
114
135
  }
115
- });
116
- // console.log("nodeArr", nodeArr);
117
- return nodeArr;
118
- }
136
+ }); // console.log("nodeArr", nodeArr);
119
137
 
120
- // eslint-disable-next-line class-methods-use-this
138
+ return nodeArr;
139
+ } // eslint-disable-next-line class-methods-use-this
121
140
  ;
141
+
122
142
  _proto.filterCiFiledConfigItems = function filterCiFiledConfigItems(data, ciTypeItemConfigs) {
123
143
  // 无权限不显示标注、悬浮框
124
144
  var filterByPermission = function filterByPermission(resource, items) {
125
145
  return resource.permission.readable ? items : [];
126
146
  };
127
- var list = filterByPermission(data, ciTypeItemConfigs);
128
- // 未监控不显示指标
147
+
148
+ var list = filterByPermission(data, ciTypeItemConfigs); // 未监控不显示指标
149
+
129
150
  if (!isMonitoring(data)) {
130
151
  list = list.filter(function (item) {
131
152
  return item.type !== 'metric';
132
153
  });
133
154
  }
134
- return list;
135
- }
136
155
 
137
- // eslint-disable-next-line class-methods-use-this
156
+ return list;
157
+ } // eslint-disable-next-line class-methods-use-this
138
158
  ;
159
+
139
160
  _proto.getModelType = function getModelType(ci) {
140
161
  return this.topo.elementTagTipConfig.getModelType(ci);
141
162
  }
142
-
143
163
  /**
144
164
  * 按链路类型获取对应的属性、指标配置
145
165
  * @param {*} link
146
166
  * @returns
147
- */;
167
+ */
168
+ ;
169
+
148
170
  _proto.getLinkTagTipConfig = function getLinkTagTipConfig(link) {
149
171
  var _this$getConfig2 = this.getConfig(),
150
- linkTag = _this$getConfig2.linkTag,
151
- linkTip = _this$getConfig2.linkTip;
172
+ linkTag = _this$getConfig2.linkTag,
173
+ linkTip = _this$getConfig2.linkTip;
174
+
152
175
  var ciTypeMeta = this.topo.ciTyeCache.getCiTypeByCi(link);
153
176
  var modelType = this.getModelType(link);
177
+
154
178
  function getItems(cfg) {
155
179
  if (!ciTypeMeta || !cfg) {
156
180
  return [];
157
181
  }
182
+
158
183
  var isCustom = cfg.isCustom,
159
- data = cfg.data;
160
- var items = (isCustom ? data[modelType] : data) || [];
161
- // 过滤不存在的
184
+ data = cfg.data;
185
+ var items = (isCustom ? data[modelType] : data) || []; // 过滤不存在的
186
+
162
187
  return filterUnExistedFields(items, ciTypeMeta);
163
188
  }
189
+
164
190
  var tagTipOptions = this.topo.options.tagTip;
165
191
  var defaultLinkTagConfig = tagTipOptions !== null && tagTipOptions !== void 0 && tagTipOptions.getDefaultLinkTagConfig ? tagTipOptions === null || tagTipOptions === void 0 ? void 0 : tagTipOptions.getDefaultLinkTagConfig(link) : null;
166
192
  var defaultLinkTipConfig = tagTipOptions !== null && tagTipOptions !== void 0 && tagTipOptions.getDefaultLinkTipConfig ? tagTipOptions === null || tagTipOptions === void 0 ? void 0 : tagTipOptions.getDefaultLinkTipConfig(link) : null;
@@ -175,11 +201,15 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
175
201
  tips: getItems(linkTip || defaultLinkTipConfig)
176
202
  };
177
203
  };
204
+
178
205
  _proto.getLinksTagTipConfig = function getLinksTagTipConfig() {
179
206
  var _this2 = this;
207
+
180
208
  return this.getEdges().map(function (link) {
181
209
  var ciType = link.ciType;
210
+
182
211
  var tagTipConfig = _this2.getLinkTagTipConfig(link);
212
+
183
213
  return _extends({
184
214
  type: link.type,
185
215
  id: link.id,
@@ -190,22 +220,23 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
190
220
  });
191
221
  });
192
222
  }
193
-
194
223
  /**
195
224
  * 获取资源的标注、悬浮框配置,只包含属性和指标字段。无权限的资源无配置
196
225
  *
197
226
  * @param {?*} data 可选参数
198
227
  * @param {?*} config 可选参数
199
228
  * @returns
200
- */;
229
+ */
230
+ ;
231
+
201
232
  _proto.getResourceTagTipConfig = function getResourceTagTipConfig() {
202
233
  return [].concat(this.getNodesTagTipConfig(), this.getLinksTagTipConfig());
203
- }
204
-
205
- // 获取资源属性、指标配置(不包含显示名称)
234
+ } // 获取资源属性、指标配置(不包含显示名称)
206
235
  ;
236
+
207
237
  _proto.getResourceFields = function getResourceFields() {
208
238
  var _this3 = this;
239
+
209
240
  return this.getResourceTagTipConfig().map(function (ciConfig) {
210
241
  // console.log("ciConfig-----------", ciConfig);
211
242
  var fields = {
@@ -217,14 +248,16 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
217
248
  };
218
249
  [].concat(ciConfig.tags, ciConfig.tips).forEach(function (item) {
219
250
  var type = item.type,
220
- code = item.code;
251
+ code = item.code;
221
252
  var arr = fields[type + "s"];
253
+
222
254
  if (Array.isArray(arr) && arr.indexOf(code) === -1) {
223
255
  arr.push(code);
224
256
  }
225
- });
226
- // 增加概览需要的指标字段
257
+ }); // 增加概览需要的指标字段
258
+
227
259
  var overviewState = _this3.topo.store.getModelState('topoBaseInfoOverview');
260
+
228
261
  if (overviewState.id === fields.id) {
229
262
  overviewState.metricCodes.forEach(function (code) {
230
263
  if (fields.metrics.indexOf(code) === -1) {
@@ -232,18 +265,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
232
265
  }
233
266
  });
234
267
  }
268
+
235
269
  return fields;
236
270
  });
237
271
  }
238
-
239
272
  /**
240
273
  * 获得需要查询的资源指标字段列表
241
274
  * @returns {[]}
242
- */;
275
+ */
276
+ ;
277
+
243
278
  _proto.getResourceMetricCodes = function getResourceMetricCodes() {
244
279
  var metricCodes = [];
245
- var resourceFields = this.getResourceFields();
246
- // console.log("getResourceMetricCodes", resourceFields);
280
+ var resourceFields = this.getResourceFields(); // console.log("getResourceMetricCodes", resourceFields);
281
+
247
282
  resourceFields.forEach(function (resource) {
248
283
  resource.metrics.forEach(function (metric) {
249
284
  if (metricCodes.indexOf(metric) === -1) {
@@ -253,35 +288,39 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
253
288
  });
254
289
  return metricCodes;
255
290
  };
291
+
256
292
  _proto.getNodesNameVisible = function getNodesNameVisible() {
257
293
  return _getNodesNameVisible(this.topo);
258
294
  }
259
-
260
295
  /**
261
296
  * 根据配置执行节点名称显示隐藏
262
297
  * 1. 资源根据标注配置显示隐藏
263
298
  * 2. 默认标注配置不勾选图片名称,图片节点名称不显示
264
299
  * 3. 自定义标注配置,图片名称显示
265
- */;
300
+ */
301
+ ;
302
+
266
303
  _proto.updateNodesNameVisible = function updateNodesNameVisible() {
267
304
  _updateNodesNameVisible(this.topo);
268
305
  }
269
-
270
306
  /**
271
307
  * 加载标注、悬浮框数据
272
308
  *
273
309
  * @param {array<{id, attributeMap: {}, metricMap: {}}>} data
274
- */;
310
+ */
311
+ ;
312
+
275
313
  _proto.loadData =
276
314
  /*#__PURE__*/
277
315
  function () {
278
- var _loadData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
316
+ var _loadData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
279
317
  var topo, ciDatas, bizDispatchers;
280
- return _regeneratorRuntime().wrap(function _callee$(_context) {
318
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
281
319
  while (1) switch (_context.prev = _context.next) {
282
320
  case 0:
283
321
  // rlog.debug('AttributeMetricDisplay.loadAttributeAndMetric', data);
284
322
  topo = this.topo; // 设置ciType
323
+
285
324
  ciDatas = data.filter(function (item) {
286
325
  // 过滤不存在的ci,解决编辑模式删除资源后切换到显示模式报错
287
326
  return !!topo.dataModel.getDataById(item.id);
@@ -290,27 +329,34 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
290
329
  ciType: topo.dataModel.getDataById(item.id).ciType
291
330
  }, item);
292
331
  }); // 翻译引用属性
332
+
293
333
  _context.next = 4;
294
334
  return this.translateRefAttribute(ciDatas);
335
+
295
336
  case 4:
296
337
  ciDatas = _context.sent;
297
338
  bizDispatchers = topo.store.getModelDispatchers('topoBizMod');
298
339
  _context.next = 8;
299
340
  return bizDispatchers.setAttrsAndMetrics(ciDatas);
341
+
300
342
  case 8:
301
343
  _context.next = 10;
302
344
  return DictCache.init();
345
+
303
346
  case 10:
304
347
  this.updateTagsTips();
348
+
305
349
  case 11:
306
350
  case "end":
307
351
  return _context.stop();
308
352
  }
309
353
  }, _callee, this);
310
354
  }));
355
+
311
356
  function loadData(_x) {
312
357
  return _loadData.apply(this, arguments);
313
358
  }
359
+
314
360
  return loadData;
315
361
  }()
316
362
  /**
@@ -320,24 +366,28 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
320
366
  * @param {array<{id, attributes: [], attributeMap: {}, metrics: [], metricMap: {}}>} data
321
367
  */
322
368
  ;
369
+
323
370
  _proto.loadAttributeAndMetric =
324
371
  /*#__PURE__*/
325
372
  function () {
326
- var _loadAttributeAndMetric = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
327
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
373
+ var _loadAttributeAndMetric = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
374
+ return _regeneratorRuntime.wrap(function _callee2$(_context2) {
328
375
  while (1) switch (_context2.prev = _context2.next) {
329
376
  case 0:
330
377
  _context2.next = 2;
331
378
  return this.loadData(data);
379
+
332
380
  case 2:
333
381
  case "end":
334
382
  return _context2.stop();
335
383
  }
336
384
  }, _callee2, this);
337
385
  }));
386
+
338
387
  function loadAttributeAndMetric(_x2) {
339
388
  return _loadAttributeAndMetric.apply(this, arguments);
340
389
  }
390
+
341
391
  return loadAttributeAndMetric;
342
392
  }()
343
393
  /**
@@ -346,13 +396,15 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
346
396
  * @returns
347
397
  */
348
398
  ;
399
+
349
400
  _proto.translateRefAttribute =
350
401
  /*#__PURE__*/
351
402
  function () {
352
- var _translateRefAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(ciDatas) {
403
+ var _translateRefAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(ciDatas) {
353
404
  var _this4 = this;
405
+
354
406
  var refIdMap, ciRefAttributeMap, refIds, refCiMap;
355
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
407
+ return _regeneratorRuntime.wrap(function _callee3$(_context3) {
356
408
  while (1) switch (_context3.prev = _context3.next) {
357
409
  case 0:
358
410
  // 查找引用字段及值
@@ -360,18 +412,22 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
360
412
  ciRefAttributeMap = {};
361
413
  ciDatas.forEach(function (ciData) {
362
414
  var id = ciData.id,
363
- ciType = ciData.ciType,
364
- attributeMap = ciData.attributeMap;
415
+ ciType = ciData.ciType,
416
+ attributeMap = ciData.attributeMap;
365
417
  ciRefAttributeMap[id] = [];
418
+
366
419
  var ciTypeMeta = _this4.topo.ciTyeCache.getCiType(ciType);
420
+
367
421
  if (ciTypeMeta) {
368
422
  ciTypeMeta.attributes.filter(function (attributeMeta) {
369
423
  return !!attributeMeta.refCi;
370
424
  }).forEach(function (attributeMeta) {
371
425
  var refId = attributeMap[attributeMeta.code];
426
+
372
427
  if (refId && !refIdMap[refId]) {
373
428
  refIdMap[refId] = true;
374
429
  }
430
+
375
431
  ciRefAttributeMap[id].push({
376
432
  attrCode: attributeMeta.code,
377
433
  id: refId
@@ -382,21 +438,28 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
382
438
  }
383
439
  });
384
440
  refIds = Object.keys(refIdMap);
441
+
385
442
  if (refIds.length) {
386
443
  _context3.next = 6;
387
444
  break;
388
445
  }
446
+
389
447
  return _context3.abrupt("return", ciDatas);
448
+
390
449
  case 6:
391
450
  _context3.next = 8;
392
451
  return this.topo.ciCache.load(refIds);
452
+
393
453
  case 8:
394
454
  refCiMap = _context3.sent;
395
455
  return _context3.abrupt("return", ciDatas.map(function (ciData) {
396
456
  var id = ciData.id;
457
+
397
458
  var attributeMap = _extends({}, ciData.attributeMap);
459
+
398
460
  ciRefAttributeMap[id].forEach(function (refAttrs) {
399
461
  var refCi = refCiMap[refAttrs.id];
462
+
400
463
  if (refCi) {
401
464
  attributeMap[refAttrs.attrCode + "_object"] = {
402
465
  displayName: refCi.attributes.display_name
@@ -407,15 +470,18 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
407
470
  attributeMap: attributeMap
408
471
  });
409
472
  }));
473
+
410
474
  case 10:
411
475
  case "end":
412
476
  return _context3.stop();
413
477
  }
414
478
  }, _callee3, this);
415
479
  }));
480
+
416
481
  function translateRefAttribute(_x3) {
417
482
  return _translateRefAttribute.apply(this, arguments);
418
483
  }
484
+
419
485
  return translateRefAttribute;
420
486
  }()
421
487
  /**
@@ -423,53 +489,61 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
423
489
  * @returns
424
490
  */
425
491
  ;
492
+
426
493
  _proto.updateTagsTips = function updateTagsTips() {
427
494
  var topo = this.topo;
495
+
428
496
  if (!topo.isViewMode() && !topo.isGraphLoaded()) {
429
497
  return;
430
498
  }
431
- var elementTagsAndTips = this.buildTagsTips()
432
- // 开锁状态下禁用悬停展示悬浮框
499
+
500
+ var elementTagsAndTips = this.buildTagsTips() // 开锁状态下禁用悬停展示悬浮框
433
501
  .map(function (item) {
434
502
  var _topo$store$getModelS = topo.store.getModelState('lock'),
435
- lock = _topo$store$getModelS.lock;
503
+ lock = _topo$store$getModelS.lock;
504
+
436
505
  return lock ? item : _extends({}, item, {
437
506
  tips: []
438
507
  });
439
- })
440
- // 链路指标都没值时不显示
508
+ }) // 链路指标都没值时不显示
441
509
  .map(function (item) {
442
510
  var tags = item.tags;
511
+
443
512
  if (item.type === 'edge') {
444
513
  var allNoValue = tags.data.filter(function (tItem) {
445
514
  return tItem.value === '- ';
446
515
  }).length === tags.data.length;
516
+
447
517
  if (allNoValue) {
448
518
  tags.data = [];
449
519
  }
450
520
  }
521
+
451
522
  return _extends({}, item, {
452
523
  tags: tags
453
524
  });
454
- });
525
+ }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
455
526
 
456
- // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
457
527
  var htTopo = topo.getHtTopo();
528
+
458
529
  if (htTopo) {
459
530
  var _topo$historyManager, _topo$historyManager2;
531
+
460
532
  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
461
533
  htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
462
534
  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
463
535
  }
464
536
  }
465
-
466
537
  /**
467
538
  * 从store获取属性、指标数据
468
539
  * @returns
469
- */;
540
+ */
541
+ ;
542
+
470
543
  _proto.getData = function getData() {
471
544
  return this.topo.store.getModelState('topoBizMod').attrsAndMetrics;
472
545
  };
546
+
473
547
  _proto.buildElementTagsTips = function buildElementTagsTips(id) {
474
548
  var ciConfigs = this.getResourceTagTipConfig();
475
549
  var ciConfig = ciConfigs.find(function (item) {
@@ -477,36 +551,36 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
477
551
  });
478
552
  var ciDataItem = this.getData().find(function (item) {
479
553
  return item.id === id;
480
- });
481
- // console.log("buildTagsTips-ciDataItem", ciDataItem);
554
+ }); // console.log("buildTagsTips-ciDataItem", ciDataItem);
555
+
482
556
  if (!ciDataItem) {
483
557
  return {
484
558
  id: ciConfig.id,
485
559
  tags: [],
486
560
  tips: []
487
561
  };
488
- }
562
+ } // 获取ci数据
563
+
489
564
 
490
- // 获取ci数据
491
565
  var ciData = _extends({}, ciDataItem, {
492
566
  ciType: ciConfig.ciType
493
- });
567
+ }); // console.log("AttributeFormatter-----", ciData, ciConfig);
568
+
494
569
 
495
- // console.log("AttributeFormatter-----", ciData, ciConfig);
496
- var tags = this.formatter.formatAttrs(ciConfig.tags, ciData)
497
- // 展示的所有标注不带对应的名字(包括属性和指标)
570
+ var tags = this.formatter.formatAttrs(ciConfig.tags, ciData) // 展示的所有标注不带对应的名字(包括属性和指标)
498
571
  .map(function (item) {
499
572
  return _extends({}, item, {
500
573
  name: ''
501
574
  });
502
- });
503
- // 链路标注箭头
575
+ }); // 链路标注箭头
576
+
504
577
  if (ciConfig.type === 'edge') {
505
578
  tags = {
506
579
  data: tags,
507
580
  linkArrow: ciConfig.tagLinkArrow
508
581
  };
509
582
  }
583
+
510
584
  return {
511
585
  type: ciConfig.type,
512
586
  id: ciConfig.id,
@@ -514,28 +588,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
514
588
  tips: this.formatter.formatAttrs(ciConfig.tips, ciData)
515
589
  };
516
590
  }
517
-
518
591
  /**
519
592
  * 构造标注、悬浮框数据
520
593
  * @returns
521
- */;
594
+ */
595
+ ;
596
+
522
597
  _proto.buildTagsTips = function buildTagsTips() {
523
598
  var _this5 = this,
524
- _this$extElementTagTi;
599
+ _this$extElementTagTi;
600
+
525
601
  // 获取标注、悬浮框配置
526
- var ciConfigs = this.getResourceTagTipConfig();
527
- // console.log("buildTagsTips---ciConfigs", ciConfigs);
602
+ var ciConfigs = this.getResourceTagTipConfig(); // console.log("buildTagsTips---ciConfigs", ciConfigs);
603
+
528
604
  var ciTagsAndTips = ciConfigs.map(function (ciConfig) {
529
605
  return _this5.buildElementTagsTips(ciConfig.id);
530
- });
531
- // console.log("ciTagsAndTips", ciTagsAndTips);
532
- var extTagsAndTips = ((_this$extElementTagTi = this.extElementTagTipBuilder) === null || _this$extElementTagTi === void 0 ? void 0 : _this$extElementTagTi.getExtElementTagsAndTips()) || [];
533
- var elementTagsAndTips = [].concat(ciTagsAndTips, extTagsAndTips);
606
+ }); // console.log("ciTagsAndTips", ciTagsAndTips);
534
607
 
535
- // 刷新标注、浮层
608
+ var extTagsAndTips = ((_this$extElementTagTi = this.extElementTagTipBuilder) === null || _this$extElementTagTi === void 0 ? void 0 : _this$extElementTagTi.getExtElementTagsAndTips()) || [];
609
+ var elementTagsAndTips = [].concat(ciTagsAndTips, extTagsAndTips); // 刷新标注、浮层
536
610
  // rlog.debug('AttributeMetricDisplay.buildTagsTips', {tagsAndTips: elementTagsAndTips, ciConfigs});
611
+
537
612
  return elementTagsAndTips;
538
613
  };
614
+
539
615
  return AttributeMetricDisplay;
540
616
  }();
617
+
541
618
  export { AttributeMetricDisplay as default };