@riil-frontend/component-topology 6.0.0-alpha.5 → 6.0.0-alpha.50

package/es/core/editor/components/Sidebar/Sidebar.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import Tab from "../../../../components/VerticalIconTab";
 import panes from "./panes";
@@ -14,7 +14,33 @@ function Sidebar(props) {
       topoEditState = _topo$store$useModel[0],
       topoEditDispatchers = _topo$store$useModel[1];
 
-  var activeKey = topoEditState.resourceTabactiveKey;
+  var activeKey = topoEditState.resourceTabActiveKey; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  useEffect(function () {
+    return function () {
+      // 退出编辑模式，关闭资源面板状态
+      topoEditDispatchers.update({
+        resourceTabActiveKey: null
+      });
+    };
+  }, []); // 通过url参数打开对应面板
+
+  useEffect(function () {
+    var _topo$viewProps$urlPa;
+
+    if (graphLoaded && (_topo$viewProps$urlPa = topo.viewProps.urlParams) !== null && _topo$viewProps$urlPa !== void 0 && _topo$viewProps$urlPa.resourceTabActiveKey) {
+      setTimeout(function () {
+        var _topo$viewProps$urlPa2;
+
+        topoEditDispatchers.update({
+          resourceTabActiveKey: ((_topo$viewProps$urlPa2 = topo.viewProps.urlParams) === null || _topo$viewProps$urlPa2 === void 0 ? void 0 : _topo$viewProps$urlPa2.resourceTabActiveKey) || null
+        });
+      }, 2000);
+    }
+  }, [graphLoaded]);
 
   var renderTabItem = function renderTabItem(pane) {
     var View = pane.content;
@@ -34,7 +60,7 @@ function Sidebar(props) {
     activeKey: activeKey,
     onChange: function onChange(key) {
       return topoEditDispatchers.update({
-        resourceTabactiveKey: key
+        resourceTabActiveKey: key
       });
     }
   }, panes.map(renderTabItem))));

package/es/core/editor/components/Sidebar/panes.js

@@ -4,28 +4,33 @@ import ComponentPanel from "./views/ComponentPanel";
 import ImagePanel from "./views/ImagePanel";
 import LinkPanel from "./views/LinkPanel";
 var panes = [{
-  title: '链路',
   key: '1',
+  title: '链路',
+  titleTootip: '在两个节点之间添加链路&线',
   icon: '/img/topo/editor/sidebar/icon/链路.svg',
   content: LinkPanel
 }, {
   title: '组件',
   key: '2',
+  titleTootip: '基础组件',
   icon: '/img/topo/editor/sidebar/icon/组件.svg',
   content: ComponentPanel
 }, {
   title: '图片',
   key: '3',
+  titleTootip: '图片素材',
   icon: '/img/topo/editor/sidebar/icon/图片.svg',
   content: ImagePanel
 }, {
   title: '背景',
   key: '4',
+  titleTootip: '背景素材',
   icon: '/img/topo/editor/sidebar/icon/背景.svg',
   content: BackgroundPanel
 }, {
   title: '画布',
   key: '5',
+  titleTootip: '拓扑图画布底图',
   icon: '/img/topo/editor/sidebar/icon/画布.svg',
   content: CanvasPanel
 }];

package/es/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.js

@@ -1,4 +1,38 @@
-import React from 'react';
+import _Tag from "@alifd/next/es/tag";
+import React, { useState } from 'react';
+import styles from "./CanvasPanel.module.scss";
+import useCanvasThemeConfig from "./hooks/useCanvasThemeConfig";
 export default function CanvasPanel(props) {
-  return /*#__PURE__*/React.createElement("div", null, "ImagePanel");
+  var topo = props.topo;
+
+  var _useCanvasThemeConfig = useCanvasThemeConfig({
+    topo: topo
+  }),
+      themes = _useCanvasThemeConfig.themes,
+      canvasThemeName = _useCanvasThemeConfig.canvasThemeName,
+      setCanvasTheme = _useCanvasThemeConfig.setCanvasTheme;
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.canvasToggle
+  }, themes.map(function (item, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: styles.canvas,
+      key: index
+    }, /*#__PURE__*/React.createElement(_Tag.Selectable, {
+      className: styles.tag,
+      style: {
+        background: item.color
+      },
+      checked: item.name === canvasThemeName,
+      onChange: function onChange(checked) {
+        setCanvasTheme(item.name);
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.box
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.bgColor
+    }))), /*#__PURE__*/React.createElement("div", {
+      className: styles.canvasText
+    }, item.label));
+  }));
 }

package/es/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.module.scss

@@ -0,0 +1,74 @@
+@import "~@alifd/next/variables.scss";
+
+  .canvasToggle {
+    display: flex;
+    flex-wrap: wrap;
+    .canvas {
+      .tag {
+        border: 1px solid #E4E9EE;
+        width: 110px;
+        height: 62px;
+        border-radius: 2px;
+        margin: 16px 0 0 16px;
+      :global {
+        .#{$css-prefix}tag-body {
+          width: 100%;
+          padding: 0;
+          cursor: pointer;
+        }
+      }
+      .box {
+        position: relative;
+        height: 100%;
+        user-select: none;
+        .bgColor {
+          max-width: 100%;
+          max-height: 100%;
+          display: block;
+          margin: auto;
+          position: absolute;
+          left: 0;
+          top: 0;
+          bottom: 0;
+          right: 0;
+        }
+      }
+      &::before,
+      &::after {
+        z-index: 1;
+      }
+      &:hover {
+        .operation {
+          display: block;
+        }
+      }
+      .operation {
+        display: none;
+        // z-index: -1;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        height: 22px;
+        text-align: center;
+        background: rgba(0, 0, 0, 0.4);
+        button {
+          height: 100%;
+          color: #fff;
+          vertical-align: text-bottom;
+        }
+      }
+     }
+      .canvasText{
+        width: 49px;
+        height: 12px;
+        margin: 8px 0 0 46px;
+        text-align: center;
+      }
+    }
+    .canvas:nth-child(2n){
+      margin-left: -7px;
+    }
+  }
+
+

package/es/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js

@@ -0,0 +1,128 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { isClusterHtElement } from "../../../../../../../utils/clusterUtil";
+import { getElements, isEdge, isGroup, isLayer, isNode, isText } from "../../../../../../../utils/htElementUtils";
+import THEMES from "../themes";
+import useNewElementTheme from "./useNewElementTheme";
+
+function useCanvasThemeConfig(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      displayConfig = _topo$store$useModel[0],
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var canvasThemeName = displayConfig.canvasTheme || 'white';
+  useNewElementTheme({
+    topo: topo,
+    theme: canvasThemeName,
+    themes: THEMES,
+    setElementTheme: setElementTheme
+  });
+
+  var setCanvasTheme = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(themeName) {
+      var themeConfig;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              themeConfig = THEMES.find(function (item) {
+                return item.name === themeName;
+              });
+              topo.historyManager.beginTransaction();
+              _context.next = 4;
+              return displayConfigDispatchers.update({
+                canvasTheme: themeName
+              });
+
+            case 4:
+              _context.next = 6;
+              return setGlobalTagTheme(themeConfig);
+
+            case 6:
+              setElementsTheme(themeConfig);
+              topo.historyManager.endTransaction();
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function setCanvasTheme(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  function setGlobalTagTheme(_x2) {
+    return _setGlobalTagTheme.apply(this, arguments);
+  }
+
+  function _setGlobalTagTheme() {
+    _setGlobalTagTheme = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(themeConfig) {
+      var _topo$store$getModelS, nodeLabelStyle, defaultEdgeLabelStyle, globalNodeLabelStyle, globalEdgeTagStyle;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              // 设置资源/链路标注样式
+              _topo$store$getModelS = topo.store.getModelState('displayConfig'), nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle, defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+              globalNodeLabelStyle = _extends({}, nodeLabelStyle, {
+                color: themeConfig.globalNodeLabelColor
+              });
+              topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+              globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, {
+                color: themeConfig.globalEdgeTagColor
+              });
+              topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+              _context2.next = 7;
+              return displayConfigDispatchers.update({
+                nodeLabelStyle: globalNodeLabelStyle,
+                defaultEdgeLabelStyle: globalEdgeTagStyle
+              });
+
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+    return _setGlobalTagTheme.apply(this, arguments);
+  }
+
+  function setElementsTheme(themeConfig) {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var elements = getElements(dm);
+    elements.forEach(function (element) {
+      setElementTheme(element, themeConfig);
+    });
+  }
+
+  function setElementTheme(element, themeConfig) {
+    if (isText(element)) {
+      element.s('text.color', themeConfig.text.color);
+    } else if (isGroup(element)) {
+      if (isClusterHtElement(element)) {
+        // 集群
+        element.s(themeConfig.cluster.style);
+      } else {
+        // 区域（非集群）
+        element.s(themeConfig.group.style);
+      }
+    } else if (isEdge(element)) {}
+  }
+
+  return {
+    themes: THEMES,
+    canvasThemeName: canvasThemeName,
+    setCanvasTheme: setCanvasTheme
+  };
+}
+
+export default useCanvasThemeConfig;

package/es/core/editor/components/Sidebar/views/CanvasPanel/hooks/useNewElementTheme.js

@@ -0,0 +1,32 @@
+import React, { useEffect } from 'react';
+import { isClusterHtElement } from "../../../../../../../utils/clusterUtil";
+import { getElements, isEdge, isGroup, isLayer, isNode, isText } from "../../../../../../../utils/htElementUtils";
+import THEMES from "../themes";
+
+function useNewElementTheme(props) {
+  var topo = props.topo,
+      theme = props.theme,
+      setElementTheme = props.setElementTheme;
+  useEffect(function () {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    dm.addDataModelChangeListener(handleDataModelChangeListener);
+
+    function handleDataModelChangeListener(e) {
+      var kind = e.kind,
+          data = e.data;
+
+      if (kind === 'add') {
+        var themeConfig = THEMES.find(function (item) {
+          return item.name === theme;
+        });
+        setElementTheme(data, themeConfig);
+      }
+    }
+
+    return function () {
+      dm.removeDataModelChangeListener(handleDataModelChangeListener);
+    };
+  }, [theme]);
+}
+
+export default useNewElementTheme;

package/es/core/editor/components/Sidebar/views/CanvasPanel/themes.js

@@ -0,0 +1,87 @@
+import _extends from "@babel/runtime/helpers/extends";
+var baseLightTheme = {
+  color: '#FFFFFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277',
+  text: {
+    color: '#4d6277'
+  },
+  group: {
+    style: {
+      'group.title.background': '#E4E9EE',
+      // 标题背景颜色
+      'group.title.color': '#4D6277',
+      // 标题文字颜色
+      'group.background': 'rgba(76, 137, 255, 0.1)',
+      'group.border.color': '#E4E9EE' // 边框颜色
+
+    }
+  },
+  cluster: {
+    style: {
+      'group.title.color': '#4D6277',
+      // 标题文字颜色
+      'group.title.background': 'rgba(229,245,253,0.6)',
+      // 标题背景颜色
+      'group.background': 'rgba(229,245,253,0.6)',
+      'group.border.color': '#C7E4F3',
+      // 边框颜色
+      'group.border.radius': 3
+    }
+  }
+};
+var THEMES = [_extends({}, baseLightTheme, {
+  name: 'white',
+  label: '白色',
+  color: '#FFFFFF',
+  toolsTheme: 'lightgrayblue'
+}), _extends({}, baseLightTheme, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white'
+}), // {
+//   name: 'yellow',
+//   label: '黄色',
+//   color: '#FFFDE6',
+// },
+// {
+//   name: 'green',
+//   label: '绿色',
+//   color: '#EAFFE8',
+// },
+{
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black',
+  globalNodeLabelColor: '#ffffff',
+  globalEdgeTagColor: '#ffffff',
+  text: {
+    color: '#ffffff'
+  },
+  group: {
+    style: {
+      'group.title.background': '#08A5F4',
+      // 标题背景颜色
+      'group.title.color': '#FFFFFF',
+      // 标题文字颜色
+      'group.background': 'rgba(29,55,113,0.6)',
+      'group.border.color': 'rgba(8,165,244,0.8)' // 边框颜色
+
+    }
+  },
+  cluster: {
+    style: {
+      'group.title.color': '#FFFFFF',
+      // 标题文字颜色
+      'group.title.background': '#0E2C45',
+      // 标题背景颜色
+      'group.background': '#0E2C45',
+      'group.border.color': '#08A5F4',
+      // 边框颜色
+      'group.border.radius': 3
+    }
+  }
+}];
+export default THEMES;

package/es/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -1,7 +1,7 @@
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useMemo } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import ImagePalette from "./HtImagePalette";
-import { getNodeDefaultIcons } from "../../../../../common/icons/icon";
+import { getResourceIcons } from "../../../../../common/icons/icon";
 /**
  * 组件面板
  * @param {*} props 
@@ -11,7 +11,7 @@ import { getNodeDefaultIcons } from "../../../../../common/icons/icon";
 export default function CiTypeImagePanel(props) {
   var topo = props.topo;
   var icons = useMemo(function () {
-    return getNodeDefaultIcons(topo);
+    return getResourceIcons(topo);
   }, []);
   return /*#__PURE__*/React.createElement(ImagePalette, {
     icons: icons,

package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -1,4 +1,5 @@
 import React, { useEffect, useRef } from 'react';
+import ResizeObserver from 'resize-observer-polyfill';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import styles from "./HtImagePalette.module.scss";
 /**
@@ -25,10 +26,20 @@ export default function HtCustomImagePanel(props) {
       });
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new ResizeObserver(hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -1,5 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import ResizeObserver from 'resize-observer-polyfill';
 import styles from "./HtImagePalette.module.scss";
 /**
  * 组件面板
@@ -25,10 +26,20 @@ export default function HtImagePalette(props) {
       });
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new ResizeObserver(hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss

@@ -1,5 +1,5 @@
 .container {
-  width: '100%';
-  max-height: 400px;
-  overflow: auto;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }

package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -1,27 +1,46 @@
-import _Collapse from "@alifd/next/es/collapse";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
-import React from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import CollapsePanel from "../../../../../../components/collapse/Panel";
-import CollapseStyles from "../../../../../../components/collapse/Collapse.module.scss";
+import Collapse from "../../../../../../components/collapse/Collapse";
 import CiTypeImagePanel from "./CiTypeImagePanel";
 import CustomImagePanel from "./CustomImagePanel";
+import { getBasicIcons } from "../../../../../common/icons/icon";
+import ImagePalette from "./HtImagePalette";
+var CollapsePanel = Collapse.Panel;
 export default function ImagePanel(props) {
-  return /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ['资源图片', '自定义图片'],
+  var topo = props.topo;
+  var basicIcons = useMemo(function () {
+    return getBasicIcons(topo, false);
+  }, []);
+
+  var handleDownloadCustomImages = function handleDownloadCustomImages() {
+    window.open('/topo/v1/api/shape/download/all');
+  };
+
+  return /*#__PURE__*/React.createElement(Collapse, {
+    accordion: true,
+    defaultExpandedKeys: ['资源图片'],
     style: {
       border: 'none'
     },
-    className: classNames(CollapseStyles.collapse, CollapseStyles.contentNoPadding)
+    fullheight: true,
+    noContentPadding: true
   }, /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u8D44\u6E90\u56FE\u7247",
     title: "\u8D44\u6E90\u56FE\u7247"
   }, /*#__PURE__*/React.createElement(CiTypeImagePanel, props)), /*#__PURE__*/React.createElement(CollapsePanel, {
+    key: "\u57FA\u7840\u56FE\u7247",
+    title: "\u57FA\u7840\u56FE\u7247"
+  }, /*#__PURE__*/React.createElement(ImagePalette, {
+    icons: basicIcons,
+    topo: topo
+  })), /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     title: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     extra: /*#__PURE__*/React.createElement(_Button, {
-      title: "\u5BFC\u51FA"
+      title: "\u5BFC\u51FA",
+      onClick: handleDownloadCustomImages
     }, /*#__PURE__*/React.createElement(_Icon, {
       type: "topo_button_icon_export"
     }))

package/es/core/editor/components/Toolbar/EditorToolbar.js

@@ -1,29 +1,36 @@
 import _Button from "@alifd/next/es/button";
 import _extends from "@babel/runtime/helpers/extends";
 import classNames from 'classnames';
-import React, { useState } from 'react';
-import buttons from "./buttons";
+import React, { useMemo, useState } from 'react';
+import getButtons from "./buttons";
 import Toolbar from "./Toolbar";
 import styles from "./Toolbar.module.scss";
 
 function EditorToolbar(props) {
-  var _classNames;
+  var _topo$viewProps, _topo$viewProps$topoC, _classNames;
+
+  var topo = props.topo;
 
   var _useState = useState(true),
       expanded = _useState[0],
       setExpanded = _useState[1];
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames(styles.toolbarWrap, (_classNames = {}, _classNames[styles.normal] = expanded, _classNames[styles.expanded] = !expanded, _classNames))
-  }, /*#__PURE__*/React.createElement("div", {
-    className: styles.content
-  }, /*#__PURE__*/React.createElement(Toolbar, null, buttons.map(function (ToolbarButton, index) {
+  var isNetworkTopo = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$topoC = _topo$viewProps.topoContext) === null || _topo$viewProps$topoC === void 0 ? void 0 : _topo$viewProps$topoC.isNetworkTopo;
+  var buttons = useMemo(function () {
+    return getButtons(isNetworkTopo);
+  }, [isNetworkTopo]);
+  var buttonInstances = buttons.map(function (ToolbarButton, index) {
     return /*#__PURE__*/React.createElement(ToolbarButton, _extends({
       key: index
     }, props, {
       showLabel: expanded
     }));
-  }))), /*#__PURE__*/React.createElement("div", {
+  });
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.toolbarWrap, (_classNames = {}, _classNames[styles.normal] = expanded, _classNames[styles.expanded] = !expanded, _classNames))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement(Toolbar, null, buttonInstances)), /*#__PURE__*/React.createElement("div", {
     className: styles.right
   }, /*#__PURE__*/React.createElement(_Button, {
     type: "normal",