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

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;
+}

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,8 +1,11 @@
+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 React, { useEffect, useMemo, useState } from 'react';
+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";
 /**
  * 线形设置
@@ -17,13 +20,74 @@ function EdgeTypeButton(props) {
 
   var _useState = useState(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1]; // 拓扑图是否加载
 
 
-  var selection = topo.selectionManager.useSelection();
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
+
+
+  var selection = topo.selectionManager.useHtSelection();
   useEffect(function () {
-    setDisabled(false);
-  }, [selection]);
+    if (graphLoaded) {
+      var edges = getEdgesBySelection(topo);
+      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", {
     src: "/img/topo/editor/toolbar/\u7EBF\u5F62/Disable.svg",
     alt: ""
@@ -34,11 +98,15 @@ function EdgeTypeButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u7EBF\u5F62",
     tooltip: "\u7EBF\u5F62",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
     trigger: icon
-  }, /*#__PURE__*/React.createElement(EdgeType, null)));
+  }, !disabled && /*#__PURE__*/React.createElement(EdgeType, {
+    selection: selection,
+    onChange: handleChange
+  })));
 }
 
 export default EdgeTypeButton;

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

@@ -1,15 +1,41 @@
+/* eslint-disable jsx-a11y/alt-text */
 import React, { useState } from 'react';
 import DropdownButton from "./components/DropdownButton";
 import WidgetBox from "./WidgetBox";
+import ColorPanel from "../../../../../components/ColorPanel";
+import FontColorRange from "../../../../../components/ColorPanel/components/FontColorRange";
+import styles from "./FontColorButton.module.scss";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
+function FontColorDropdown(props) {
+  var onChange = props.onChange,
+      topo = props.topo,
+      color = props.color,
+      background = props.background,
+      opacity = props.opacity;
 
   var _useState = useState(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
+  var backOpacityChange = function backOpacityChange(value) {
+    onChange({
+      opacity: value / 100
+    });
+  };
+
+  var colorChang = function colorChang(value) {
+    onChange({
+      color: value
+    });
+  };
+
+  var backgroundChang = function backgroundChang(value) {
+    onChange({
+      background: value
+    });
+  };
+
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
     alt: ""
@@ -19,26 +45,54 @@ function FontFamilySelect(props) {
   });
   return /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
-    trigger: icon,
-    onChange: onChange
-  }, "xxxx");
+    trigger: icon
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.fontColor
+  }, /*#__PURE__*/React.createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/React.createElement(ColorPanel, {
+    onChange: colorChang
+  })), /*#__PURE__*/React.createElement("div", {
+    className: styles.backgroundColor
+  }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
+    className: styles.backOpacity
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/\u80CC\u666F\u586B\u5145.svg"
+  }), /*#__PURE__*/React.createElement(FontColorRange, {
+    max: 100,
+    min: 0,
+    unit: "%",
+    list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
+    onChange: backOpacityChange,
+    defaultValue: opacity
+  })), /*#__PURE__*/React.createElement(ColorPanel, {
+    showClear: true,
+    onChange: backgroundChang
+  }))));
 }
 
 function FontColorButton(props) {
-  var showLabel = props.showLabel;
-
-  var _useState2 = useState('微软雅黑'),
-      value = _useState2[0],
-      setValue = _useState2[1];
-
+  var showLabel = props.showLabel,
+      topo = props.topo,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(FontFamilySelect, {
-    value: value,
-    onChange: setValue
+  }, /*#__PURE__*/React.createElement(FontColorDropdown, {
+    color: style.color,
+    background: style.background,
+    opacity: style.opacity,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle(val);
+      topo.historyManager.endTransaction();
+    },
+    topo: topo
   }));
 }
 
-export default FontColorButton;
+export default textStyleSettingRouter(FontColorButton, {
+  names: ['color', 'background', 'opacity']
+});

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

@@ -0,0 +1,43 @@
+.content {
+  height: 296px;
+ .fontColor{
+  width: 100%;
+  height: 143px;//159px
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 8px;
+  }
+  &>span{
+    font-size: 12px;
+    color: black;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #4D6277;
+    line-height: 17px;
+   }
+ }
+ .backgroundColor{
+  width: 100%;
+  height: 159px;
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 0px;
+  }
+  &>span{
+    font-size: 12px;
+    color: black;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #4D6277;
+    line-height: 17px;
+   }
+   .backOpacity{
+    margin-top: 2px;
+    margin-bottom: 5px;
+    margin-left: 11px;
+    line-height: 8px;
+    display: flex;
+    flex-direction: row;
+   }
+ }
+}

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

@@ -1,5 +1,6 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import DropdownMenu from "./components/DropdownMenu";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
 
 function FontFamilySelect(props) {
@@ -7,7 +8,14 @@ function FontFamilySelect(props) {
       onChange = props.onChange;
   var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
   return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
+    value: (items.includes(value) ? value : null) || '',
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 48
+        }
+      }, val || '微软雅黑');
+    },
     onChange: onChange
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
@@ -21,20 +29,26 @@ function FontFamilySelect(props) {
 }
 
 function FontFamilyWidget(props) {
-  var showLabel = props.showLabel;
-
-  var _useState = useState('微软雅黑'),
-      value = _useState[0],
-      setValue = _useState[1];
-
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u5B57\u4F53",
     tooltip: "\u5B57\u4F53",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontFamilySelect, {
-    value: value,
-    onChange: setValue
+    value: style.fontFamily,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle({
+        fontFamily: val
+      });
+      topo.historyManager.endTransaction();
+    }
   }));
 }
 
-export default FontFamilyWidget;
+export default textStyleSettingRouter(FontFamilyWidget, {
+  names: ['fontFamily']
+});

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

@@ -1,14 +1,24 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import DropdownMenu from "./components/DropdownMenu";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
 
 function FontSizeSelect(props) {
   var value = props.value,
-      onChange = props.onChange;
+      _onChange = props.onChange;
   var items = [9, 10, 11, 12, 14, 16, 18, 20, 24, 30, 36];
   return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
-    onChange: onChange
+    value: "" + (value || ''),
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 18
+        }
+      }, val || 12);
+    },
+    onChange: function onChange(val) {
+      return _onChange(parseInt(val, 10));
+    }
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
       key: item
@@ -17,19 +27,25 @@ function FontSizeSelect(props) {
 }
 
 function FontSizeWidget(props) {
-  var showLabel = props.showLabel;
-
-  var _useState = useState(12),
-      fontSize = _useState[0],
-      setFontSize = _useState[1];
-
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u5B57\u53F7",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontSizeSelect, {
-    value: fontSize,
-    onChange: setFontSize
+    value: style.fontSize,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle({
+        fontSize: val
+      });
+      topo.historyManager.endTransaction();
+    }
   }));
 }
 
-export default FontSizeWidget;
+export default textStyleSettingRouter(FontSizeWidget, {
+  names: ['fontSize']
+});

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

@@ -1,62 +1,123 @@
+import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useEffect } from 'react';
+import { isText } from "../../../../../utils/htElementUtils";
 import DropdownMenu from "./components/DropdownMenu";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
+var items = [{
+  key: 'bold',
+  label: '加粗',
+  icon: 'bold'
+}, {
+  key: 'italic',
+  label: '斜体',
+  icon: 'Italics'
+}, {
+  key: 'underline',
+  label: '下划线',
+  icon: 'Underline'
+}];
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  var icon = disabled ? /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/bold/Disable.svg",
-    alt: ""
-  }) : /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/bold/Normal.svg",
-    alt: ""
+function buildValue(obj) {
+  return Object.keys(obj).filter(function (key) {
+    return !!obj[key];
   });
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
-    valueRender: function valueRender() {
-      return icon;
-    },
-    onChange: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
+}
+
+function formatStyle(arr) {
+  return items.map(function (item) {
+    return item.key;
+  }).reduce(function (map, name) {
+    var _extends2;
+
+    return _extends({}, map, (_extends2 = {}, _extends2[name] = arr.includes(name), _extends2));
+  }, {});
 }
 
 function FontStyleButton(props) {
   var topo = props.topo,
-      showLabel = props.showLabel;
+      showLabel = props.showLabel,
+      style = props.style,
+      setStyle = props.setStyle;
+
+  var _useState = useState(true),
+      disabled = _useState[0],
+      setDisabled = _useState[1];
 
-  var _useState = useState('微软雅黑'),
-      value = _useState[0],
-      setValue = _useState[1];
+  var bold = style.bold,
+      italic = style.italic,
+      underline = style.underline;
 
-  var _useState2 = useState(true),
-      disabled = _useState2[0],
-      setDisabled = _useState2[1]; // 选中的元素
+  var _useState2 = useState(buildValue({
+    bold: bold,
+    italic: italic,
+    underline: underline
+  })),
+      value = _useState2[0],
+      setValue = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionManager.useHtSelection();
   useEffect(function () {
-    setDisabled(false);
+    var isAllText = !selection.filter(function (ele) {
+      return !isText(ele);
+    }).length;
+
+    if (selection.length && isAllText) {
+      setDisabled(false);
+    } else {
+      setDisabled(true);
+    }
   }, [selection]);
+  useEffect(function () {
+    setValue(buildValue({
+      bold: bold,
+      italic: italic,
+      underline: underline
+    }));
+  }, [bold, italic, underline]);
+  /**
+   * 
+   * @param {Array} selectedKeys 
+   */
+
+  var handleChange = function handleChange(selectedKeys) {
+    topo.historyManager.beginTransaction();
+    setStyle(formatStyle(selectedKeys));
+    topo.historyManager.endTransaction();
+  };
+
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u6837\u5F0F",
     tooltip: "\u6587\u5B57\u6837\u5F0F",
+    disabled: disabled,
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(FontFamilySelect, {
+  }, /*#__PURE__*/React.createElement(DropdownMenu, {
     value: value,
+    valueRender: function valueRender() {
+      return /*#__PURE__*/React.createElement("img", {
+        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      });
+    },
+    multiple: true,
     disabled: disabled,
-    onChange: setValue
-  }));
+    onChange: handleChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
+      key: item.key
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement("img", {
+      src: "/img/topo/editor/toolbar/" + item.icon + "/Normal.svg",
+      alt: ""
+    }), /*#__PURE__*/React.createElement("span", null, item.label)));
+  })));
 }
 
-export default FontStyleButton;
+export default textStyleSettingRouter(FontStyleButton, {
+  names: ['bold', 'italic', 'underline']
+});

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import WidgetBox from "./WidgetBox";
+import ButtonBox from "./components/ButtonBox";
 
 function HistoryRedoButton(props) {
   var topo = props.topo,
@@ -13,8 +14,8 @@ function HistoryRedoButton(props) {
     label: "\u6062\u590D",
     tooltip: "\u6062\u590D",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(WidgetBox.ButtonBox, null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+  }, /*#__PURE__*/React.createElement(ButtonBox, null, /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/undo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
     alt: ""
   })));
 }