@riil-frontend/component-topology 6.0.0-alpha.8 → 6.0.1

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

@@ -1,6 +1,8 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useState } from 'react';
+import { getEdgesBySelection } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
 import Content from "./Content";
@@ -17,13 +19,97 @@ function EdgeColorButton(props) {
 
   var _useState = useState(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1];
 
+  var _useState2 = useState(1),
+      lineWidth = _useState2[0],
+      setLineWidth = _useState2[1]; // 拓扑图是否加载
+
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
+
+
+  var selection = topo.selectionModel.useHtSelection();
+
+  var loopEdges = function loopEdges(edges, operateEdgeFn) {
+    edges.forEach(function (edge) {
+      operateEdgeFn(edge);
+    });
+  };
+
+  var getLines = function getLines(list) {
+    // eslint-disable-next-line prefer-const
+    var arr = [];
+    loopEdges(list, function (edge) {
+      // eslint-disable-next-line eqeqeq
+      if (edge.getAttrObject().type == 'line') {
+        arr.push(edge);
+      }
+    });
+    return arr;
+  };
 
-  var selection = topo.selectionManager.useSelection();
   useEffect(function () {
-    setDisabled(false);
-  }, [selection]);
+    if (graphLoaded) {
+      var edges = getEdgesBySelection(topo);
+      var list = getLines(edges);
+      setLineWidth(1); // eslint-disable-next-line eqeqeq
+
+      if (selection.length == 1 && selection[0].a('type') == 'line') {
+        setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);
+      }
+
+      setDisabled(!list.length);
+    }
+  }, [selection, graphLoaded]);
+
+  var colorOnChange = function colorOnChange(colors, type) {
+    // eslint-disable-next-line eqeqeq
+    if (type == 'select') topo.historyManager.beginTransaction();
+    var edges = getEdgesBySelection(topo);
+    loopEdges(edges, function (edge) {
+      // eslint-disable-next-line eqeqeq
+      if (edge.getAttrObject().type == 'line') {
+        var color = colors.hex;
+        edge.s('edge.color', color);
+        edge.s('edge.dash.color', color);
+        var style = edge.a('styles') || {};
+        edge.a('styles', _extends({}, style, {
+          color: color
+        }));
+      }
+    }); // eslint-disable-next-line eqeqeq
+
+    if (type == 'select') topo.historyManager.endTransaction();
+  };
+
+  var onPickerFocus = function onPickerFocus() {
+    // topo.getHtTopo().getGraphView().dm().sm().ld()
+    topo.historyManager.beginTransaction();
+  };
+
+  var onPickerBlur = function onPickerBlur() {
+    topo.historyManager.endTransaction();
+  };
+
+  var lineSizeChange = function lineSizeChange(width) {
+    var edges = getEdgesBySelection(topo);
+    topo.historyManager.beginTransaction();
+    loopEdges(edges, function (edge) {
+      // eslint-disable-next-line eqeqeq
+      if (edge.getAttrObject().type == 'line') {
+        edge.s('edge.dash.width', width);
+        edge.s('edge.width', width);
+        var style = edge.a('styles') || {};
+        edge.a('styles', _extends({}, style, {
+          width: width
+        }));
+      }
+    });
+    topo.historyManager.endTransaction();
+  };
+
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u7EBF\u6761\u586B\u5145/Disable.svg",
     alt: ""
@@ -34,12 +120,18 @@ function EdgeColorButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u7EBF\u6761\u989C\u8272",
     tooltip: "\u7EBF\u6761\u989C\u8272",
-    showLabel: showLabel
+    showLabel: showLabel,
+    disabled: disabled
   }, /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
     trigger: icon
   }, /*#__PURE__*/React.createElement(Content, {
-    topo: topo
+    topo: topo,
+    onChange: colorOnChange,
+    onPickerFocus: onPickerFocus,
+    onPickerBlur: onPickerBlur,
+    lineSizeChange: lineSizeChange,
+    lineWidth: lineWidth
   })));
 }
 

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

@@ -1,27 +1,46 @@
 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 React, { useEffect } 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 = [{
+var START_TYPE_OPTIONS = [{
   value: 'nil',
   label: '无',
   icon: 'topo_startEndPoint_icon_nothing'
+}, // {
+//   value: 'sourceNoneCircle',
+//   label: '空心圆',
+//   icon: 'topo_startPoint_icon_hollow_cricle',
+// },
+{
+  value: 'sourceSolidCircle',
+  label: '实心圆',
+  icon: 'topo_startPoint_icon_solid_cricle'
 }, {
-  value: 'hollowCrcial',
-  label: '空心圆',
-  icon: 'topo_startEndPoint_icon_hollow_cricle'
-}, {
-  value: 'solidCricle',
+  value: 'sourceArrow',
+  label: '箭头',
+  icon: 'topo_startPoint_icon_arrow'
+}];
+var END_TYPE_OPTIONS = [{
+  value: 'nil',
+  label: '无',
+  icon: 'topo_startEndPoint_icon_nothing'
+}, // {
+//   value: 'targetNoneCircle',
+//   label: '空心圆',
+//   icon: 'topo_endPoint_icon_hollow_cricle',
+// },
+{
+  value: 'targetSolidCircle',
   label: '实心圆',
-  icon: 'topo_startEndPoint_icon_solid_cricle'
+  icon: 'topo_endPoint_icon_solid_cricle'
 }, {
-  value: 'arrowPoint',
+  value: 'targetArrow',
   label: '箭头',
-  icon: 'topo_startEndPoint_icon_arrow'
+  icon: 'topo_endPoint_icon_arrow'
 }];
 var LINE_MOLD_OPTIONS = [{
   value: 'solidLine',
@@ -41,16 +60,43 @@ var LINE_MOLD_OPTIONS = [{
   icon: 'topo_lineMold_dotted_two'
 }];
 
+function getValuesBySelection(selection) {
+  var values = {
+    startPoint: undefined,
+    endPoint: undefined,
+    lineMold: undefined
+  }; // 仅一条连线选中时回显
+
+  if (selection.length === 1) {
+    var edge = selection[0];
+    values = {
+      startPoint: 'nil',
+      endPoint: 'nil',
+      lineMold: edge.a('lineMode') || 'solidLine'
+    };
+    var icons = edge.s('icons') || {};
+    ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (name) {
+      if (icons[name]) {
+        values.startPoint = name;
+      }
+    });
+    ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (name) {
+      if (icons[name]) {
+        values.endPoint = name;
+      }
+    });
+  }
+
+  return values;
+}
+
 function EdgeType(props) {
-  var _onChange = props.onChange;
+  var selection = props.selection,
+      _onChange = props.onChange;
 
   var field = _Field.useField({
     autoUnmount: false,
-    values: {
-      startPoint: 'nil',
-      endPoint: 'nil',
-      type: null
-    },
+    values: getValuesBySelection(selection),
     onChange: function onChange(name, value) {
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
@@ -60,6 +106,9 @@ function EdgeType(props) {
     }
   });
 
+  useEffect(function () {
+    field.setValues(getValuesBySelection(selection));
+  }, [selection]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.lineBox
   }, /*#__PURE__*/React.createElement(_Form, {
@@ -72,12 +121,13 @@ function EdgeType(props) {
     label: "\u8D77\u70B9"
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "startPoint",
+    placeholder: " ",
     popupProps: {
       container: function container(trigger) {
         return trigger.parentNode;
       }
     }
-  }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
+  }, START_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
       key: index,
@@ -92,12 +142,13 @@ function EdgeType(props) {
     label: "\u7EC8\u70B9"
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "endPoint",
+    placeholder: " ",
     popupProps: {
       container: function container(trigger) {
         return trigger.parentNode;
       }
     }
-  }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
+  }, END_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
       key: index,
@@ -111,18 +162,18 @@ function EdgeType(props) {
   }))), /*#__PURE__*/React.createElement(FormItem, {
     label: "\u7C7B\u578B"
   }, /*#__PURE__*/React.createElement(_Select, {
-    name: "type",
+    name: "lineMold",
     popupProps: {
       container: function container(trigger) {
         return trigger.parentNode;
       }
     },
-    placeholder: ""
-  }, LINE_MOLD_OPTIONS.map(function (item, index, array) {
+    placeholder: " "
+  }, LINE_MOLD_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
-      key: index,
-      title: item.label,
+      key: index // title={item.label}
+      ,
       onchange: _onChange
     }, /*#__PURE__*/React.createElement("img", {
       src: "/img/topo/editor/lineType/" + item.icon + ".svg",

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

@@ -38,9 +38,7 @@
     }
     .#{$css-prefix}input.#{$css-prefix}medium .#{$css-prefix}input-text-field {
       line-height: calc(28px - 10px * 2);
-    }
-    .#{$css-prefix}select-trigger-search {
-      height: 12px;
+      padding: 0 7px;
     }
   }
 }

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

@@ -1,6 +1,8 @@
 import _Button from "@alifd/next/es/button";
+import _Balloon from "@alifd/next/es/balloon";
 import React, { useState } from 'react';
 import styles from "./LineType.module.scss";
+var Tooltip = _Balloon.Tooltip;
 var LINE_TYPE_OPTIONS = [{
   value: 'boundary',
   label: '直线',
@@ -11,7 +13,7 @@ var LINE_TYPE_OPTIONS = [{
   icon: 'topo_linear_icon_narrow_straightline'
 }, {
   value: 'h.v',
-  label: '纵向折线',
+  label: '折线',
   icon: 'topo_linear_icon_vertical_foldline'
 }, {
   value: 'ortho',
@@ -22,15 +24,11 @@ var LINE_TYPE_OPTIONS = [{
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
 }];
-
-function LineType(props) {
+var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onChange = props.onChange;
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles.lineType
-  }, LINE_TYPE_OPTIONS.map(function (item, index, array) {
+
+  function lineButton(item) {
     return /*#__PURE__*/React.createElement(_Button, {
-      key: index,
-      title: item.label,
       className: "" + styles.redioBtn,
       onClick: function onClick() {
         onChange(item.value);
@@ -40,7 +38,16 @@ function LineType(props) {
       alt: "",
       className: styles.iconImg
     }));
-  }));
-}
+  }
 
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.lineType
+  }, LINE_TYPE_OPTIONS.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      trigger: lineButton(item),
+      align: "br",
+      key: index
+    }, item.label);
+  }));
+});
 export default LineType;

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

@@ -0,0 +1,77 @@
+export var EDGE_END_POINT_TYPE_MAP = {
+  // 起点箭头
+  sourceArrow: {
+    names: ['sourceArrow'],
+    position: 15,
+    height: 15,
+    width: 37.5,
+    offsetX: -2,
+    keepOrien: true
+  },
+  // 起点实心圆
+  sourceSolidCircle: {
+    names: ['sourceSolidCircle'],
+    position: 15,
+    height: 12.5,
+    width: 25,
+    offsetX: 3,
+    keepOrien: true
+  },
+  // 起点空心圆
+  sourceNoneCircle: {
+    names: ['sourceNoneCircle'],
+    position: 15,
+    height: 12.5,
+    width: 25,
+    offsetX: 2.5,
+    keepOrien: true
+  },
+  // 终点箭头
+  targetArrow: {
+    names: ['targetArrow'],
+    position: 19,
+    height: 15,
+    width: 37.5,
+    offsetX: 3,
+    keepOrien: true
+  },
+  // 终点实心圆
+  targetSolidCircle: {
+    names: ['targetSolidCircle'],
+    position: 19,
+    height: 12.5,
+    width: 25,
+    offsetX: 0.5,
+    keepOrien: true
+  },
+  // 终点空心圆
+  targetNoneCircle: {
+    names: ['targetNoneCircle'],
+    position: 19,
+    height: 12.5,
+    width: 25,
+    offsetX: -0.5,
+    keepOrien: true
+  }
+};
+export var LINE_MOLD_MAP = {
+  solidLine: {
+    lineType: 'solid',
+    dashPattern: null
+  },
+  dottedLine: {
+    lineType: 'dash',
+    dashPattern: 1 // lineType为dash生效。为空默认为1。值：1/2/3
+
+  },
+  dottedLine1: {
+    lineType: 'dash',
+    dashPattern: 3 // lineType为dash生效。为空默认为1。值：1/2/3
+
+  },
+  dottedLine2: {
+    lineType: 'dash',
+    dashPattern: 2 // lineType为dash生效。为空默认为1。值：1/2/3
+
+  }
+};

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

@@ -1,9 +1,11 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useMemo, useState } from 'react';
-import { getEdgesBySelection, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
+import { getEdgesBySelection, setEdgesAndChildren, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
+import { EDGE_END_POINT_TYPE_MAP, LINE_MOLD_MAP } from "./constants";
 import EdgeType from "./EdgeType";
 /**
  * 线形设置
@@ -16,7 +18,7 @@ function EdgeTypeButton(props) {
       showLabel = props.showLabel,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
-  var _useState = useState(false),
+  var _useState = useState(true),
       disabled = _useState[0],
       setDisabled = _useState[1]; // 拓扑图是否加载
 
@@ -25,21 +27,65 @@ function EdgeTypeButton(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useHtSelection();
   useEffect(function () {
     if (graphLoaded) {
       var edges = getEdgesBySelection(topo);
-      console.info('xxxx', edges, selection);
       setDisabled(!edges.length);
     }
   }, [selection, graphLoaded]);
 
   var handleChange = function handleChange(name, value) {
     var edges = getEdgesBySelection(topo);
+    var htTopo = topo.getHtTopo();
 
     if (name === 'lineButton') {
       setEdgesType(edges, value, topo);
+      return;
     }
+
+    setEdgesAndChildren(topo, edges, function (edge) {
+      if (name === 'startPoint') {
+        // 删除设置
+        ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (iconName) {
+          return edge.removeStyleIcon(iconName);
+        }); // 设置
+
+        var scolor = edge.a('styles') && edge.a('styles').color || edge.getStyleMap()['edge.color'];
+        edge.a('arrow.color', scolor || '#00B779');
+        edge.s('icons', _extends({}, edge.s('icons')));
+        edge.addStyleIcon(value, EDGE_END_POINT_TYPE_MAP[value]);
+      } else if (name === 'endPoint') {
+        // 删除设置
+        ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (iconName) {
+          return edge.removeStyleIcon(iconName);
+        }); // 设置
+
+        var _scolor = edge.a('styles') && edge.a('styles').color || edge.getStyleMap()['edge.color'];
+
+        edge.a('arrow.color', _scolor || '#00B779');
+        edge.s('icons', _extends({}, edge.s('icons')));
+        edge.addStyleIcon(value, EDGE_END_POINT_TYPE_MAP[value]);
+      } else if (name === 'lineMold') {
+        // 修改实线虚线
+        edge.a('lineMode', value);
+        htTopo.setElementStyle(edge, LINE_MOLD_MAP[value]);
+
+        if (value !== 'solid') {
+          var edgeWidth = edge.s('edge.width');
+
+          if (edgeWidth) {
+            edge.s('edge.dash.width', edgeWidth);
+          }
+
+          var color = edge.s('edge.color');
+
+          if (edgeWidth) {
+            edge.s('edge.dash.color', color);
+          }
+        }
+      }
+    });
   };
 
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
@@ -57,7 +103,8 @@ function EdgeTypeButton(props) {
   }, /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
     trigger: icon
-  }, /*#__PURE__*/React.createElement(EdgeType, {
+  }, !disabled && /*#__PURE__*/React.createElement(EdgeType, {
+    selection: selection,
     onChange: handleChange
   })));
 }