@riil-frontend/component-topology 6.0.0-alpha.3 → 6.0.0-alpha.31

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

@@ -1,63 +1,50 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState } from 'react';
-import VerticalIconTab from "../../../../components/VerticalIconTab";
-import LinkPanel from "./views/LinkPanel";
-import ComponentPanel from "./views/ComponentPanel";
-import ImagePanel from "./views/ImagePanel";
-import BackgroundPanel from "./views/BackgroundPanel";
-import CanvasPanel from "./views/CanvasPanel";
-import styles from "./Sidebar.module.scss";
+import React, { useEffect, useState } from 'react';
 import classNames from 'classnames';
+import Tab from "../../../../components/VerticalIconTab";
+import panes from "./panes";
+import styles from "./Sidebar.module.scss";
 
 function Sidebar(props) {
   var _classNames;
 
   var topo = props.topo;
 
-  var _useState = useState(null),
-      activeKey = _useState[0],
-      setActivekey = _useState[1];
+  var _topo$store$useModel = topo.store.useModel('topoEdit'),
+      topoEditState = _topo$store$useModel[0],
+      topoEditDispatchers = _topo$store$useModel[1];
+
+  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;
 
-  var panes = [{
-    title: '链路',
-    key: '1',
-    icon: '/img/topo/editor/sidebar/icon/链路.svg',
-    content: LinkPanel
-  }, {
-    title: '组件',
-    key: '2',
-    icon: '/img/topo/editor/sidebar/icon/组件.svg',
-    content: ComponentPanel
-  }, {
-    title: '图片',
-    key: '3',
-    icon: '/img/topo/editor/sidebar/icon/图片.svg',
-    content: ImagePanel
-  }, {
-    title: '背景',
-    key: '4',
-    icon: '/img/topo/editor/sidebar/icon/背景.svg',
-    content: BackgroundPanel
-  }, {
-    title: '画布',
-    key: '5',
-    icon: '/img/topo/editor/sidebar/icon/画布.svg',
-    content: CanvasPanel
-  }].map(function (item) {
-    var View = item.content;
-    return _extends({}, item, {
-      content: function content() {
-        return /*#__PURE__*/React.createElement(View, _extends({}, props, {
-          topo: topo,
-          active: activeKey === item.key
-        }));
-      }
-    });
-  });
+        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;
-    return /*#__PURE__*/React.createElement(VerticalIconTab.Item, _extends({
+    return /*#__PURE__*/React.createElement(Tab.Item, _extends({
       key: pane.key
     }, pane), /*#__PURE__*/React.createElement(View, {
       topo: topo,
@@ -69,9 +56,13 @@ function Sidebar(props) {
     className: styles.sidebar
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames(styles.tabsContainer, (_classNames = {}, _classNames[styles.expanded] = !!activeKey, _classNames))
-  }, /*#__PURE__*/React.createElement(VerticalIconTab, {
+  }, /*#__PURE__*/React.createElement(Tab, {
     activeKey: activeKey,
-    onChange: setActivekey
+    onChange: function onChange(key) {
+      return topoEditDispatchers.update({
+        resourceTabActiveKey: key
+      });
+    }
   }, panes.map(renderTabItem))));
 }
 

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

@@ -0,0 +1,32 @@
+import BackgroundPanel from "./views/BackgroundPanel";
+import CanvasPanel from "./views/CanvasPanel";
+import ComponentPanel from "./views/ComponentPanel";
+import ImagePanel from "./views/ImagePanel";
+import LinkPanel from "./views/LinkPanel";
+var panes = [{
+  title: '链路',
+  key: '1',
+  icon: '/img/topo/editor/sidebar/icon/链路.svg',
+  content: LinkPanel
+}, {
+  title: '组件',
+  key: '2',
+  icon: '/img/topo/editor/sidebar/icon/组件.svg',
+  content: ComponentPanel
+}, {
+  title: '图片',
+  key: '3',
+  icon: '/img/topo/editor/sidebar/icon/图片.svg',
+  content: ImagePanel
+}, {
+  title: '背景',
+  key: '4',
+  icon: '/img/topo/editor/sidebar/icon/背景.svg',
+  content: BackgroundPanel
+}, {
+  title: '画布',
+  key: '5',
+  icon: '/img/topo/editor/sidebar/icon/画布.svg',
+  content: CanvasPanel
+}];
+export default panes;

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

@@ -0,0 +1,95 @@
+import _Tag from "@alifd/next/es/tag";
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useState } from 'react';
+import styles from "./CanvasPanel.module.scss";
+var CANVAS_TOGGLE = [{
+  value: 'white',
+  label: '白色',
+  color: '#FFFFFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277'
+}, {
+  value: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277'
+}, // {
+//   value: 'yellow',
+//   label: '黄色',
+//   color: '#FFFDE6',
+// },
+// {
+//   value: 'green',
+//   label: '绿色',
+//   color: '#EAFFE8',
+// },
+{
+  value: 'dark',
+  label: '深色',
+  color: '#031425',
+  globalNodeLabelColor: '#ffffff',
+  globalEdgeTagColor: '#ffffff'
+}];
+export default function CanvasPanel(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      canvasTheme = _topo$store$useModel[0].canvasTheme,
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var value = canvasTheme || 'white';
+
+  var setCanvasTheme = function setCanvasTheme(themeItem) {
+    var theme = themeItem.value;
+    topo.historyManager.beginTransaction();
+    displayConfigDispatchers.update({
+      canvasTheme: theme
+    }); // 设置资源/链路标注样式
+
+    var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+        nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle,
+        defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+
+    var globalNodeLabelStyle = _extends({}, nodeLabelStyle, {
+      color: themeItem.globalNodeLabelColor
+    });
+
+    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+
+    var globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, {
+      color: themeItem.globalEdgeTagColor
+    });
+
+    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+    displayConfigDispatchers.update({
+      nodeLabelStyle: globalNodeLabelStyle,
+      defaultEdgeLabelStyle: globalEdgeTagStyle
+    });
+    topo.historyManager.endTransaction();
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.canvasToggle
+  }, CANVAS_TOGGLE.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: value === item.value,
+      onChange: function onChange(checked) {
+        setCanvasTheme(item);
+      }
+    }, /*#__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/index.js

@@ -1,2 +1,2 @@
-import Panel from "./ImagePanel";
+import Panel from "./CanvasPanel";
 export default Panel;

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,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
+import styles from "./HtImagePalette.module.scss";
 /**
  * 组件面板
  * @param {*} props 
@@ -37,9 +37,6 @@ export default function HtCustomImagePanel(props) {
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: divRef,
-    style: {
-      width: '100%' // height: '100%',
-
-    }
+    className: styles.container
   });
 }

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 styles from "./HtImagePalette.module.scss";
 /**
  * 组件面板
  * @param {*} props 
@@ -22,6 +23,7 @@ export default function HtImagePalette(props) {
       viewRef.current = htTopo.createImagePalette(container, {
         icons: icons
       });
+      console.error(viewRef.current);
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
     } // 注销组件
@@ -36,9 +38,6 @@ export default function HtImagePalette(props) {
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: divRef,
-    style: {
-      width: '100%' // height: '100%',
-
-    }
+    className: styles.container
   });
 }

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

@@ -0,0 +1,5 @@
+.container {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+}

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

@@ -1,23 +1,36 @@
-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);
+  }, []);
+  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, {

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

@@ -1,35 +1,45 @@
 import _Button from "@alifd/next/es/button";
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState } from 'react';
-import buttons from "./buttons";
+import classNames from 'classnames';
+import React, { useMemo, useState } from 'react';
+import getButtons from "./buttons";
 import Toolbar from "./Toolbar";
 import styles from "./Toolbar.module.scss";
 
 function EditorToolbar(props) {
+  var _topo$viewProps, _topo$viewProps$topoC, _classNames;
+
+  var topo = props.topo;
+
   var _useState = useState(true),
-      showLabel = _useState[0],
-      setShowLabel = _useState[1];
+      expanded = _useState[0],
+      setExpanded = _useState[1];
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles.toolbarContainer
-  }, /*#__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: showLabel
+      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",
     text: true,
     onClick: function onClick() {
-      setShowLabel(!showLabel);
+      setExpanded(!expanded);
     }
   }, /*#__PURE__*/React.createElement("img", {
-    src: showLabel ? '/img/topo/editor/toolbar/ToolbarNarrowed/Normal.svg' : '/img/topo/editor/toolbar/ToolbbbarExpand/Normal.svg',
+    src: expanded ? '/img/topo/editor/toolbar/ToolbarNarrowed/Normal.svg' : '/img/topo/editor/toolbar/ToolbbbarExpand/Normal.svg',
     alt: "",
     style: {
       verticalAlign: 'middle'

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

@@ -3,7 +3,7 @@ import styles from "./Toolbar.module.scss";
 
 function Toolbar(props) {
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.widgets
+    className: styles.toolbarContainer
   }, props.children);
 }
 

package/es/core/editor/components/Toolbar/Toolbar.module.scss

@@ -1,19 +1,30 @@
-.toolbarContainer {
-  height: 54px;
+.toolbarWrap {
   display: flex;
   align-items: center;
   justify-content: center;
+  transition: all .1s linear;
+
+  &.normal {
+    height: 54px;
+  }
+
+  &.expanded {
+    height: 40px;
+  }
 }
 
 .content {
+  height: 100%;
   flex: 1;
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow-x: auto;
 }
 
-.widgets {
+.toolbarContainer {
   display: flex;
+  min-width: 1060px;
 }
 
 .right {

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

@@ -16,21 +16,24 @@ import BoxBackgroundButton from "./widgets/BoxBackgroundButton";
 import EdgeColorButton from "./widgets/EdgeColorButton";
 import NodeImageButton from "./widgets/NodeImageButton";
 import NodeSizeButton from "./widgets/NodeSizeButton";
-export default [AddResourceButton, // 添加资源
-Divider, CanvasSelectWidget, // 选择
-CanvasMoveWidget, // 移动
-Divider, HistoryUndoButton, // 撤销
-HistoryRedoButton, // 恢复
-Divider, FontFamilyWidget, // 字体
-FontSizeWidget, // 字号
-FontStyleButton, // 文字样式
-FontColorButton, // 文字颜色
-Divider, BoxBackgroundButton, // 框背景
-Divider, EdgeColorButton, // 线条颜色
-EdgeTypeButton, // 线形
-Divider, NodeImageButton, // 替换图片
-NodeSizeButton, // 图片尺寸
-Divider, Layout, // 布局方式
-NodeAlignWidget, // 对齐方式
-SearchWidget // 搜索
-];
+export default function getButtons(isNetworkTopo) {
+  return [].concat(isNetworkTopo ? [AddResourceButton, // 添加资源
+  Divider] : [], [CanvasSelectWidget, // 选择
+  CanvasMoveWidget, // 移动
+  Divider], isNetworkTopo ? [HistoryUndoButton, // 撤销
+  // HistoryRedoButton, // 恢复
+  Divider] : [], [FontFamilyWidget, // 字体
+  FontSizeWidget, // 字号
+  FontStyleButton, // 文字样式
+  FontColorButton, // 文字颜色
+  Divider, // BoxBackgroundButton, // 框背景
+  // Divider,
+  EdgeColorButton, // 线条颜色
+  EdgeTypeButton, // 线形
+  Divider, NodeImageButton, // 替换图片
+  NodeSizeButton, // 图片尺寸
+  Divider, Layout, // 布局方式
+  NodeAlignWidget // 对齐方式
+  // SearchWidget, // 搜索
+  ]);
+}

package/es/core/editor/components/Toolbar/hooks/useFontStyleSetting.js

@@ -0,0 +1,52 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useMemo } from 'react';
+import { isText } from "../../../../../utils/htElementDataUtil";
+import { isGroup, isLayer, isNode } from "../../../../../utils/htElementUtils";
+
+function useFontStyleSetting(props) {
+  var topo = props.topo;
+  var selectionElements = topo.selectionManager.useHtSelection();
+  var buttonEnabled = true; // 全局配置
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      displayConfigState = _topo$store$useModel[0],
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
+      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
+
+  var setGlobalTagStyle = function setGlobalTagStyle(styleData) {
+    var globalNodeLabelStyle = _extends({}, nodeLabelStyle, styleData);
+
+    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+
+    var globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, styleData);
+
+    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+    displayConfigDispatchers.update({
+      nodeLabelStyle: globalNodeLabelStyle,
+      defaultEdgeLabelStyle: globalEdgeTagStyle
+    });
+  };
+
+  var setStyle = function setStyle(styleData) {
+    topo.historyManager.beginTransaction(); // 全局调整（资源和链路）：无选择时，按钮亮起，即可修改全局资源和链路的标注，不影响“文本”、框名称、区域名称、分层名称的格式。
+
+    if (!selectionElements.length) {
+      setGlobalTagStyle(styleData);
+    } else {
+      selectionElements.forEach(function (element) {
+        if (isNode(element)) {} else if (isGroup(element)) {} else if (isText(element)) {} else if (isLayer(element)) {}
+      });
+    }
+
+    topo.historyManager.endTransaction();
+  };
+
+  return {
+    buttonEnabled: buttonEnabled,
+    setStyle: setStyle
+  };
+}
+
+export default useFontStyleSetting;