@riil-frontend/component-topology 6.0.0-alpha.4 → 6.0.0-alpha.6

package/es/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -37,6 +37,10 @@
       &:hover {
         background-color: rgba(76, 137, 255, 0.1);
       }
+      
+      .tab-title {
+        margin-top: 3px;
+      }
     }
   }
 }
@@ -45,9 +49,9 @@
 .content {
   width: 260px;
   height: 100%;
-  transition: all .1s linear;
   border-left: none !important;
   border-right: 1px solid var(--tab-wrapped-border-line-color);
+  transition: width .1s linear;
 
   :global {
     .#{$css-prefix}tabs-tabpane {

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

@@ -1,63 +1,32 @@
 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 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
-        }));
-      }
-    });
-  });
+  var activeKey = topoEditState.resourceTabactiveKey;
+  useEffect(function () {
+    return function () {
+      // 退出编辑模式，关闭资源面板状态
+      topoEditDispatchers.update({
+        resourceTabactiveKey: null
+      });
+    };
+  }, []);
 
   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 +38,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/{ImagePanel.js → CanvasPanel.js}

@@ -1,4 +1,4 @@
 import React from 'react';
-export default function ImagePanel(props) {
+export default function CanvasPanel(props) {
   return /*#__PURE__*/React.createElement("div", null, "ImagePanel");
 }

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/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 
@@ -36,9 +37,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%';
+  max-height: 400px;
+  overflow: auto;
+}

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

@@ -1,24 +1,27 @@
 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 Toolbar from "./Toolbar";
 import styles from "./Toolbar.module.scss";
 
 function EditorToolbar(props) {
+  var _classNames;
+
   var _useState = useState(true),
-      showLabel = _useState[0],
-      setShowLabel = _useState[1];
+      expanded = _useState[0],
+      setExpanded = _useState[1];
 
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.toolbarContainer
+    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) {
     return /*#__PURE__*/React.createElement(ToolbarButton, _extends({
       key: index
     }, props, {
-      showLabel: showLabel
+      showLabel: expanded
     }));
   }))), /*#__PURE__*/React.createElement("div", {
     className: styles.right
@@ -26,10 +29,10 @@ function EditorToolbar(props) {
     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/widgets/AddResourceButton.js

@@ -27,16 +27,16 @@ function AddResourceButton(props) {
 
   var _useState = useState(getAddType(selection)),
       addType = _useState[0],
-      setAddType = _useState[1]; // 选中分层添加
+      setAddType = _useState[1];
 
+  useEffect(function () {
+    setAddType(getAddType(selection));
+  }, [selection]); // 选中分层添加
 
   var layerAddResource = useLayerAddResource({
     topo: topo,
     topoEdit: topoEdit
   });
-  useEffect(function () {
-    setAddType(getAddType(selection));
-  }, [selection]);
 
   var handleClick = function handleClick() {
     if (!addType) {
@@ -48,7 +48,8 @@ function AddResourceButton(props) {
     } else if (addType === 'group') {
       // 选中区域添加资源
       var group = selection[0];
-      topoEdit.groupAddResource.open(group);
+      var htGroup = topo.getHtTopo().getGraphView().getDataModel().getDataById(group.id);
+      topoEdit.groupAddResource.open(htGroup);
     }
   };
 

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/EdgeTypeButton/EdgeType.js

@@ -1,8 +1,138 @@
-import React from 'react';
+import _Field from "@alifd/next/es/field";
+import _Select from "@alifd/next/es/select";
+import _Form from "@alifd/next/es/form";
+import React, { useState } from 'react';
+import styles from "./EdgeType.module.scss";
+import LineType from "./LineType";
+var FormItem = _Form.Item;
+var Option = _Select.Option;
+var START_END_TYPE_OPTIONS = [{
+  value: 'nil',
+  label: '无',
+  icon: 'topo_startEndPoint_icon_nothing'
+}, {
+  value: 'hollowCrcial',
+  label: '空心圆',
+  icon: 'topo_startEndPoint_icon_hollow_cricle'
+}, {
+  value: 'solidCricle',
+  label: '实心圆',
+  icon: 'topo_startEndPoint_icon_solid_cricle'
+}, {
+  value: 'arrowPoint',
+  label: '箭头',
+  icon: 'topo_startEndPoint_icon_arrow'
+}];
+var LINE_MOLD_OPTIONS = [{
+  value: 'solidLine',
+  label: '实线',
+  icon: 'topo_lineMold_solid'
+}, {
+  value: 'dottedLine',
+  label: '虚线',
+  icon: 'topo_lineMold_dotted'
+}, {
+  value: 'dottedLine1',
+  label: '虚线1',
+  icon: 'topo_lineMold_dotted_one'
+}, {
+  value: 'dottedLine2',
+  label: '虚线2',
+  icon: 'topo_lineMold_dotted_two'
+}];
 
 function EdgeType(props) {
-  // const {  } = props
-  return /*#__PURE__*/React.createElement("div", null, "\u7EBF\u5F62\u8BBE\u7F6E");
+  var _onChange = props.onChange;
+
+  var field = _Field.useField({
+    autoUnmount: false,
+    values: {
+      startPoint: 'nil',
+      endPoint: 'nil',
+      type: null
+    },
+    onChange: function onChange(name, value) {
+      if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
+        _onChange(name, null);
+      } else {
+        _onChange(name, value);
+      }
+    }
+  });
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.lineBox
+  }, /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    inline: true,
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(LineType, {
+    name: "lineButton"
+  })), /*#__PURE__*/React.createElement(FormItem, {
+    label: "\u8D77\u70B9"
+  }, /*#__PURE__*/React.createElement(_Select, {
+    name: "startPoint",
+    popupProps: {
+      container: function container(trigger) {
+        return trigger.parentNode;
+      }
+    }
+  }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
+    return /*#__PURE__*/React.createElement(Option, {
+      value: item.value,
+      key: index,
+      title: item.label,
+      onchange: _onChange
+    }, /*#__PURE__*/React.createElement("img", {
+      src: "/img/topo/editor/lineType/" + item.icon + ".svg",
+      alt: "",
+      className: styles.iconImg
+    }));
+  }))), /*#__PURE__*/React.createElement(FormItem, {
+    label: "\u7EC8\u70B9"
+  }, /*#__PURE__*/React.createElement(_Select, {
+    name: "endPoint",
+    popupProps: {
+      container: function container(trigger) {
+        return trigger.parentNode;
+      }
+    }
+  }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
+    return /*#__PURE__*/React.createElement(Option, {
+      value: item.value,
+      key: index,
+      title: item.label,
+      onchange: _onChange
+    }, /*#__PURE__*/React.createElement("img", {
+      src: "/img/topo/editor/lineType/" + item.icon + ".svg",
+      alt: "",
+      className: styles.iconImg
+    }));
+  }))), /*#__PURE__*/React.createElement(FormItem, {
+    label: "\u7C7B\u578B"
+  }, /*#__PURE__*/React.createElement(_Select, {
+    name: "type",
+    popupProps: {
+      container: function container(trigger) {
+        return trigger.parentNode;
+      }
+    },
+    placeholder: ""
+  }, LINE_MOLD_OPTIONS.map(function (item, index, array) {
+    return /*#__PURE__*/React.createElement(Option, {
+      value: item.value,
+      key: index,
+      title: item.label,
+      onchange: _onChange
+    }, /*#__PURE__*/React.createElement("img", {
+      src: "/img/topo/editor/lineType/" + item.icon + ".svg",
+      alt: "",
+      className: styles.iconImg
+    }));
+  })))));
 }
 
+EdgeType.defaultProps = {
+  onChange: function onChange(v) {}
+};
 export default EdgeType;

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss

@@ -0,0 +1,46 @@
+@import '~@alifd/next/variables.scss';
+
+.lineBox{
+  width: 236px;
+  background: #FFFFFF;
+  border-radius: 4px;
+  margin-bottom: -7px;
+
+  :global {
+    .#{$css-prefix}form-item:first-child{
+      margin-top: 0;
+      margin-bottom: 0;
+    }
+    .#{$css-prefix}form-item {
+      margin-top: 7px;
+      margin-bottom: 7px;
+    }
+    .#{$css-prefix}form.#{$css-prefix}inline .#{$css-prefix}form-item:not(:last-child) {
+      margin-right: 8px;
+      .#{$css-prefix}select-trigger {
+        min-width: 0;
+        width: 64px;
+        height: 28px;
+        .#{$css-prefix}select-inner {
+          min-width:0 !important;
+        }
+      }
+    }
+    .#{$css-prefix}form.#{$css-prefix}inline .#{$css-prefix}form-item:last-child{
+    .#{$css-prefix}select-trigger {
+      min-width: 0;
+      width: 88px;
+      height: 28px;
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+    }
+    .#{$css-prefix}input.#{$css-prefix}medium .#{$css-prefix}input-text-field {
+      line-height: calc(28px - 10px * 2);
+    }
+    .#{$css-prefix}select-trigger-search {
+      height: 12px;
+    }
+  }
+}

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -0,0 +1,46 @@
+import _Button from "@alifd/next/es/button";
+import React, { useState } from 'react';
+import styles from "./LineType.module.scss";
+var LINE_TYPE_OPTIONS = [{
+  value: 'boundary',
+  label: '直线',
+  icon: 'topo_linear_icon_straightline'
+}, {
+  value: 'oposite',
+  label: '内向双向箭头',
+  icon: 'topo_linear_icon_narrow_straightline'
+}, {
+  value: 'h.v',
+  label: '纵向折线',
+  icon: 'topo_linear_icon_vertical_foldline'
+}, {
+  value: 'ortho',
+  label: '双折线',
+  icon: 'topo_linear_icon_bilinear'
+}, {
+  value: 'flex',
+  label: '双弧线',
+  icon: 'topo_linear_icon_arcline'
+}];
+
+function LineType(props) {
+  var onChange = props.onChange;
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.lineType
+  }, LINE_TYPE_OPTIONS.map(function (item, index, array) {
+    return /*#__PURE__*/React.createElement(_Button, {
+      key: index,
+      title: item.label,
+      className: "" + styles.redioBtn,
+      onClick: function onClick() {
+        onChange(item.value);
+      }
+    }, /*#__PURE__*/React.createElement("img", {
+      src: "/img/topo/editor/lineType/" + item.icon + ".svg",
+      alt: "",
+      className: styles.iconImg
+    }));
+  }));
+}
+
+export default LineType;

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss

@@ -0,0 +1,31 @@
+.lineType{
+  display:flex;
+  .redioBtn {
+    width: 24px;
+    height: 24px;
+    border-radius: 4px;
+    border: none !important;
+    color: #4D6277;
+    padding: 0;
+    margin-right: 16px;
+    text-align: center;
+
+    .iconImg {
+      vertical-align: middle;
+    }
+
+    &:active {
+      background: #F2F7FD !important;
+    }
+
+    &:hover {
+      background: #F2F7FD !important;
+    }
+  }
+  .redioBtn:last-child{
+    margin-right: 0;
+  }
+}
+.iconImg {
+  vertical-align: middle;
+}