@riil-frontend/component-topology 6.0.0-alpha.2 → 6.0.0-alpha.21

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

@@ -1,6 +1,7 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useMemo } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
+import HtCustomImagePanel from "./HtCustomImagePanel";
 /**
  * 组件面板
  * @param {*} props 
@@ -8,38 +9,12 @@ import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
  */
 
 export default function CustomImagePanel(props) {
-  var topo = props.topo; // 组件
-
-  var viewRef = useRef(null); // div容器
-
-  var divRef = useRef();
-  useEffect(function () {
-    // 初始化
-    var icons = getUserCustomIconsForHt(topo);
-    var htTopo = topo.getHtTopo();
-    var container = divRef.current;
-
-    try {
-      viewRef.current = htTopo.createUploadImagePalette(container, {
-        icons: icons
-      });
-    } catch (error) {
-      rlog.error('初始化资源面板失败', error);
-    } // 注销组件
-
-
-    return function () {
-      if (viewRef.current) {
-        viewRef.current.destroy();
-        viewRef.current = null;
-      }
-    };
+  var topo = props.topo;
+  var icons = useMemo(function () {
+    return getUserCustomIconsForHt(topo);
   }, []);
-  return /*#__PURE__*/React.createElement("div", {
-    ref: divRef,
-    style: {
-      width: '100%',
-      height: '100%'
-    }
+  return /*#__PURE__*/React.createElement(HtCustomImagePanel, {
+    icons: icons,
+    topo: topo
   });
 }

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

@@ -0,0 +1,42 @@
+import React, { useEffect, useRef } from 'react';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import styles from "./HtImagePalette.module.scss";
+/**
+ * 组件面板
+ * @param {*} props 
+ * @returns 
+ */
+
+export default function HtCustomImagePanel(props) {
+  var topo = props.topo,
+      icons = props.icons; // 组件
+
+  var viewRef = useRef(null); // div容器
+
+  var divRef = useRef();
+  useEffect(function () {
+    // 初始化
+    var htTopo = topo.getHtTopo();
+    var container = divRef.current;
+
+    try {
+      viewRef.current = htTopo.createUploadImagePalette(container, {
+        icons: icons
+      });
+    } catch (error) {
+      rlog.error('初始化资源面板失败', error);
+    } // 注销组件
+
+
+    return function () {
+      if (viewRef.current) {
+        viewRef.current.destroy();
+        viewRef.current = null;
+      }
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: divRef,
+    className: styles.container
+  });
+}

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

@@ -0,0 +1,42 @@
+import React, { useEffect, useRef } from 'react';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import styles from "./HtImagePalette.module.scss";
+/**
+ * 组件面板
+ * @param {*} props 
+ * @returns 
+ */
+
+export default function HtImagePalette(props) {
+  var topo = props.topo,
+      icons = props.icons; // 组件
+
+  var viewRef = useRef(null); // div容器
+
+  var divRef = useRef();
+  useEffect(function () {
+    // 初始化
+    var htTopo = topo.getHtTopo();
+    var container = divRef.current;
+
+    try {
+      viewRef.current = htTopo.createImagePalette(container, {
+        icons: icons
+      });
+    } catch (error) {
+      rlog.error('初始化资源面板失败', error);
+    } // 注销组件
+
+
+    return function () {
+      if (viewRef.current) {
+        viewRef.current.destroy();
+        viewRef.current = null;
+      }
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: divRef,
+    className: styles.container
+  });
+}

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

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

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

@@ -2,6 +2,7 @@ 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 classNames from 'classnames';
 import CollapsePanel from "../../../../../../components/collapse/Panel";
 import CollapseStyles from "../../../../../../components/collapse/Collapse.module.scss";
 import CiTypeImagePanel from "./CiTypeImagePanel";
@@ -12,7 +13,7 @@ export default function ImagePanel(props) {
     style: {
       border: 'none'
     },
-    className: CollapseStyles.collapse
+    className: classNames(CollapseStyles.collapse, CollapseStyles.contentNoPadding)
   }, /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u8D44\u6E90\u56FE\u7247",
     title: "\u8D44\u6E90\u56FE\u7247"

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,23 @@ 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,35 @@
+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'),
+      nodeLabelStyle = _topo$store$useModel[0].nodeLabelStyle,
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var setStyle = function setStyle(styleData) {
+    // 全局调整（资源和链路）：无选择时，按钮亮起，即可修改全局资源和链路的标注，不影响“文本”、框名称、区域名称、分层名称的格式。
+    if (!selectionElements.length) {
+      topo.getHtTopo().setGlobalNodeLabelStyle(styleData);
+      displayConfigDispatchers.update({
+        nodeLabelStyle: _extends({}, nodeLabelStyle, styleData)
+      });
+    } else {
+      selectionElements.forEach(function (element) {
+        if (isNode(element)) {} else if (isGroup(element)) {} else if (isText(element)) {} else if (isLayer(element)) {}
+      });
+    }
+  };
+
+  return {
+    buttonEnabled: buttonEnabled,
+    setStyle: setStyle
+  };
+}
+
+export default useFontStyleSetting;

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

@@ -1,23 +1,72 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import { isGroup, isLayer } from "../../../../../utils/htElementDataUtil";
+import useLayerAddResource from "../../../hooks/useLayerAddResource";
+import LayerAddResourceDrawer from "../../settings/propertyViews/layer/DataTab/LayerAddResourceDrawer";
 import ButtonBox from "./components/ButtonBox";
 import WidgetBox from "./WidgetBox";
 
+function getAddType(selection) {
+  if (selection.length === 1) {
+    var data = selection[0];
+
+    if (isLayer(data)) {
+      return 'layer';
+    } else if (isGroup(data)) {
+      return 'group';
+    }
+  }
+}
+
 function AddResourceButton(props) {
   var showLabel = props.showLabel,
       topo = props.topo,
-      topoEdit = props.topoEdit;
-  return /*#__PURE__*/React.createElement(WidgetBox, {
+      topoEdit = props.topoEdit,
+      editorProps = props.editorProps; // 选中的元素
+
+  var selection = topo.selectionManager.useSelection();
+
+  var _useState = useState(getAddType(selection)),
+      addType = _useState[0],
+      setAddType = _useState[1];
+
+  useEffect(function () {
+    setAddType(getAddType(selection));
+  }, [selection]); // 选中分层添加
+
+  var layerAddResource = useLayerAddResource({
+    topo: topo,
+    topoEdit: topoEdit
+  });
+
+  var handleClick = function handleClick() {
+    if (!addType) {
+      // 未选中分层、分区添加资源
+      topoEdit.showGlobalAddResourceDrawer();
+    } else if (addType === 'layer') {
+      // 选中分层添加资源
+      layerAddResource.open();
+    } else if (addType === 'group') {
+      // 选中区域添加资源
+      var group = selection[0];
+      var htGroup = topo.getHtTopo().getGraphView().getDataModel().getDataById(group.id);
+      topoEdit.groupAddResource.open(htGroup);
+    }
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6DFB\u52A0\u8D44\u6E90",
     tooltip: "\u6DFB\u52A0\u8D44\u6E90",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(ButtonBox, {
-    onClick: function onClick() {
-      topoEdit.showGlobalAddResourceDrawer();
-    }
+    onClick: handleClick
   }, /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/add/Normal.svg",
     alt: ""
-  })));
+  }))), addType === 'layer' && /*#__PURE__*/React.createElement(LayerAddResourceDrawer, {
+    layer: selection[0],
+    editorProps: editorProps,
+    layerAddResource: layerAddResource
+  }));
 }
 
 export default AddResourceButton;

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

@@ -3,12 +3,23 @@ import WidgetBox from "./WidgetBox";
 import ButtonBox from "./components/ButtonBox";
 
 function CanvasMoveWidget(props) {
-  var showLabel = props.showLabel;
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      topoEdit = props.topoEdit;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoEdit'),
+      viewMouseMode = _topo$store$useModelS.viewMouseMode;
+
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u79FB\u52A8",
     tooltip: "\u79FB\u52A8",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(ButtonBox, null, /*#__PURE__*/React.createElement("img", {
+  }, /*#__PURE__*/React.createElement(ButtonBox, {
+    active: viewMouseMode === 'move',
+    onClick: function onClick() {
+      topoEdit.setViewMouseMode('move');
+    }
+  }, /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/drag/Normal.svg",
     alt: ""
   })));

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

@@ -3,13 +3,22 @@ import WidgetBox from "./WidgetBox";
 import ButtonBox from "./components/ButtonBox";
 
 function CanvasSelectWidget(props) {
-  var showLabel = props.showLabel;
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      topoEdit = props.topoEdit;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoEdit'),
+      viewMouseMode = _topo$store$useModelS.viewMouseMode;
+
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u9009\u62E9",
     tooltip: "\u9009\u62E9",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(ButtonBox, {
-    active: true
+    active: viewMouseMode === 'select',
+    onClick: function onClick() {
+      topoEdit.setViewMouseMode('select');
+    }
   }, /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/select/Normal.svg",
     alt: ""

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/Content.js

@@ -1,8 +1,17 @@
 import React from 'react';
+import EdgeWidthRange from "./EdgeWidthRange";
 
 function Content(props) {
   // const {  } = props
-  return /*#__PURE__*/React.createElement("div", null, "xxx");
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u7EBF"), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: 200
+    }
+  }, /*#__PURE__*/React.createElement(EdgeWidthRange, {
+    defaultValue: 2,
+    min: 1,
+    max: 10
+  })), /*#__PURE__*/React.createElement("div", null));
 }
 
 export default Content;

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeWidthRange.js

@@ -0,0 +1,33 @@
+import _Range from "@alifd/next/es/range";
+import React, { useState } from 'react';
+import styles from "./EdgeWidthRange.module.scss";
+
+function EdgeWidthRange(props) {
+  var onChange = props.onChange,
+      _props$unit = props.unit,
+      unit = _props$unit === void 0 ? 'px' : _props$unit;
+
+  var _useState = useState(2),
+      value = _useState[0],
+      setValue = _useState[1];
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.rangeWrapper
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.range
+  }, /*#__PURE__*/React.createElement(_Range, {
+    defaultValue: value,
+    min: 1,
+    max: 10,
+    marks: [2, 3, 4, 5, 6, 7, 8, 9],
+    hasTip: false,
+    onChange: onChange,
+    onProcess: setValue
+  })), /*#__PURE__*/React.createElement("div", {
+    className: styles.value
+  }, value), /*#__PURE__*/React.createElement("div", {
+    className: styles.unit
+  }, unit));
+}
+
+export default EdgeWidthRange;

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeWidthRange.module.scss

@@ -0,0 +1,26 @@
+@import '~@alifd/next/variables.scss';
+
+
+.rangeWrapper {
+  display: flex;
+  flex-direction: row;
+
+  .range {
+    flex: 1;
+  }
+
+  .value {
+    margin-left: 8px;
+    width: 20px;
+  }
+
+  .unit {
+    margin-left: 4px;
+  }
+
+  :global {
+    .#{$css-prefix}range .#{$css-prefix}range-mark {
+      display: none;
+    }
+  }
+}