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

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,30 @@
+/* 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 useFontStyleSetting from "../hooks/useFontStyleSetting";
 
 function FontFamilySelect(props) {
   var value = props.value,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      topo = props.topo;
 
   var _useState = useState(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
+  var fontStyleSetting = useFontStyleSetting({
+    topo: topo
+  });
+  console.log(topo, 'topo这里需要处理颜色改变的事情');
+
+  var backOpacityChange = function backOpacityChange(value) {
+    console.log(value);
+  };
+
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
     alt: ""
@@ -21,11 +36,31 @@ function FontFamilySelect(props) {
     disabled: disabled,
     trigger: icon,
     onChange: onChange
-  }, "xxxx");
+  }, /*#__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, null)), /*#__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: 0
+  })), /*#__PURE__*/React.createElement(ColorPanel, {
+    showClear: true
+  }))));
 }
 
 function FontColorButton(props) {
-  var showLabel = props.showLabel;
+  var showLabel = props.showLabel,
+      topo = props.topo;
 
   var _useState2 = useState('微软雅黑'),
       value = _useState2[0],
@@ -37,7 +72,8 @@ function FontColorButton(props) {
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontFamilySelect, {
     value: value,
-    onChange: setValue
+    onChange: setValue,
+    topo: topo
   }));
 }
 

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

@@ -0,0 +1,35 @@
+.content {
+  height: 296px;
+ .fontColor{
+  width: 100%;
+  height: 143px;//159px
+  &>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;
+  &>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,4 +1,5 @@
 import React, { useState } from 'react';
+import useFontStyleSetting from "../hooks/useFontStyleSetting";
 import DropdownMenu from "./components/DropdownMenu";
 import WidgetBox from "./WidgetBox";
 
@@ -21,19 +22,28 @@ function FontFamilySelect(props) {
 }
 
 function FontFamilyWidget(props) {
-  var showLabel = props.showLabel;
+  var topo = props.topo,
+      showLabel = props.showLabel;
 
   var _useState = useState('微软雅黑'),
       value = _useState[0],
       setValue = _useState[1];
 
+  var fontStyleSetting = useFontStyleSetting({
+    topo: topo
+  });
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u5B57\u4F53",
     tooltip: "\u5B57\u4F53",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontFamilySelect, {
     value: value,
-    onChange: setValue
+    onChange: function onChange(val) {
+      setValue(val);
+      fontStyleSetting.setStyle({
+        fontFamily: val
+      });
+    }
   }));
 }
 

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

@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import useFontStyleSetting from "../hooks/useFontStyleSetting";
 import DropdownMenu from "./components/DropdownMenu";
 import WidgetBox from "./WidgetBox";
 
@@ -17,7 +18,11 @@ function FontSizeSelect(props) {
 }
 
 function FontSizeWidget(props) {
-  var showLabel = props.showLabel;
+  var topo = props.topo,
+      showLabel = props.showLabel;
+  var fontStyleSetting = useFontStyleSetting({
+    topo: topo
+  });
 
   var _useState = useState(12),
       fontSize = _useState[0],
@@ -28,7 +33,12 @@ function FontSizeWidget(props) {
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontSizeSelect, {
     value: fontSize,
-    onChange: setFontSize
+    onChange: function onChange(val) {
+      setFontSize(val);
+      fontStyleSetting.setStyle({
+        fontSize: val
+      });
+    }
   }));
 }
 

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

@@ -1,41 +1,38 @@
 import React, { useState, useEffect } from 'react';
+import { isText } from "../../../../../utils/htElementUtils";
+import fontStyleUtil from "../../settings/common/text/fontStyleUtil";
+import useFontStyleSetting from "../hooks/useFontStyleSetting";
 import DropdownMenu from "./components/DropdownMenu";
 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: ""
-  });
-  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 getTextFontStyle(textElement) {
+  var underline = textElement.s('text.decoration') === 'underline';
+  var fontStyle = fontStyleUtil.toMap(textElement.s('text.font'));
+  return {
+    underline: underline,
+    bold: fontStyle.bold,
+    italic: fontStyle.italic
+  };
 }
 
 function FontStyleButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel;
 
-  var _useState = useState('微软雅黑'),
+  var _useState = useState(['bold']),
       value = _useState[0],
       setValue = _useState[1];
 
@@ -44,19 +41,71 @@ function FontStyleButton(props) {
       setDisabled = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionManager.useHtSelection();
+  var fontStyleSetting = useFontStyleSetting({
+    topo: topo
+  });
   useEffect(function () {
     setDisabled(false);
+    var fontObj = {};
+
+    if (selection.length === 1) {
+      var element = selection[0];
+
+      if (isText(element)) {
+        fontObj = getTextFontStyle(element);
+      }
+    }
+
+    var newValue = Object.keys(fontObj).reduce(function (result, key) {
+      if (fontObj[key]) {
+        return [].concat(result, [key]);
+      }
+
+      return result;
+    }, []);
+    setValue(newValue);
   }, [selection]);
+  /**
+   * 
+   * @param {Array} selectedKeys 
+   */
+
+  var handleChange = function handleChange(selectedKeys) {
+    setValue(selectedKeys);
+    var style = {
+      fontBold: selectedKeys.includes('bold')
+    };
+    fontStyleSetting.setStyle(style);
+  };
+
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u6837\u5F0F",
     tooltip: "\u6587\u5B57\u6837\u5F0F",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(FontFamilySelect, {
+  }, /*#__PURE__*/React.createElement(DropdownMenu, {
     value: value,
-    disabled: disabled,
-    onChange: setValue
-  }));
+    valueRender: function valueRender() {
+      return /*#__PURE__*/React.createElement("img", {
+        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      });
+    },
+    multiple: true,
+    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;

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: ""
   })));
 }

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

@@ -1,4 +1,5 @@
-import React from 'react'; // import { Icon, Button } from '@alifd/next';
+import React from 'react';
+import ButtonBox from "./components/ButtonBox"; // import { Icon, Button } from '@alifd/next';
 
 import WidgetBox from "./WidgetBox";
 
@@ -13,15 +14,15 @@ function HistoryUndoButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     disabled: disabled,
     label: "\u64A4\u9500",
-    tooltip: "\u64A4\u9500",
+    tooltip: disabled ? '无法撤销' : '撤销（Ctrl/ ⌘+Z）',
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(WidgetBox.ButtonBox, {
+  }, /*#__PURE__*/React.createElement(ButtonBox, {
     disabled: disabled,
     onClick: function onClick() {
       topo.historyManager.undo();
     }
   }, /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/undo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+    src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
     alt: ""
   })));
 }

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

@@ -0,0 +1,109 @@
+import _Select from "@alifd/next/es/select";
+import React, { useState, useEffect, useImperativeHandle } from 'react';
+import styles from "./index.module.scss";
+import PopUpContent from "./popUpContent";
+
+var TopoIconSelect = function TopoIconSelect(props, ref) {
+  // 传入参数
+  var value = props.value,
+      iconList = props.iconList,
+      onChange = props.onChange;
+
+  var _useState = useState(value),
+      valueData = _useState[0],
+      setValue = _useState[1];
+
+  var _useState2 = useState(),
+      selectItem = _useState2[0],
+      setSelect = _useState2[1];
+
+  var _useState3 = useState(false),
+      visible = _useState3[0],
+      setVisible = _useState3[1];
+
+  useEffect(function () {
+    if (value) {
+      for (var i = 0; i < iconList.length; i++) {
+        var icons = iconList[i].icons;
+        var flag = false;
+
+        for (var m = 0; m < icons.length; m++) {
+          if (value === icons[m].id) {
+            flag = true;
+            setSelect(icons[m]);
+            break;
+          }
+        }
+
+        if (flag) {
+          break;
+        }
+      }
+    }
+  }, [value]);
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectData: getSelectData
+    };
+  });
+
+  var handleChange = function handleChange(v) {
+    console.log('handleChange: ', v);
+
+    if (typeof onChange === 'function') {
+      onChange(v.id);
+    }
+
+    setSelect(v);
+    setValue(v.id);
+    setVisible(false);
+  };
+
+  var getSelectData = function getSelectData() {
+    return valueData;
+  };
+
+  var valueRender = function valueRender(v) {
+    return selectItem ? /*#__PURE__*/React.createElement("span", {
+      className: styles.selected
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.iconImgWrapper
+    }, /*#__PURE__*/React.createElement("img", {
+      className: styles.iconImg,
+      alt: "",
+      src: selectItem === null || selectItem === void 0 ? void 0 : selectItem.url
+    })), /*#__PURE__*/React.createElement("span", {
+      className: styles.icontitle
+    }, selectItem === null || selectItem === void 0 ? void 0 : selectItem.name)) : null;
+  };
+
+  var onVisibleChange = function onVisibleChange(v) {
+    setVisible(v);
+  };
+
+  var popupContent = /*#__PURE__*/React.createElement(PopUpContent, {
+    iconList: iconList,
+    selectedId: selectItem === null || selectItem === void 0 ? void 0 : selectItem.id,
+    onChange: handleChange
+  });
+  var popupProps = {
+    triggerClickKeycode: [13, 32, 40] // space, enter, down-arrow
+
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.TopoIconSelect
+  }, /*#__PURE__*/React.createElement(_Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    visible: visible,
+    className: styles.iconSelect,
+    onVisibleChange: onVisibleChange,
+    value: valueData,
+    valueRender: valueRender,
+    dataSource: iconList,
+    onChange: handleChange,
+    popupProps: popupProps,
+    popupContent: popupContent
+  }));
+};
+
+export default /*#__PURE__*/React.forwardRef(TopoIconSelect);

package/es/core/editor/components/Toolbar/widgets/IconSelect/constant.js

@@ -0,0 +1,64 @@
+export var iconList = [{
+  id: '1',
+  name: '图片库1',
+  icons: [{
+    id: '001',
+    name: '图片一',
+    url: '/img/model/switch.svg',
+    icon: 'switch'
+  }, {
+    id: '002',
+    name: '图片二',
+    url: '/img/model/backupOnError.svg',
+    icon: 'res_terminal'
+  }, {
+    id: '003',
+    name: '图片三',
+    url: '/img/model/linuxServer.svg',
+    icon: 'res_linux'
+  }, {
+    id: '004',
+    name: '图片一',
+    url: '/img/model/switch.svg',
+    icon: 'switch'
+  }, {
+    id: '005',
+    name: '图片二',
+    url: '/img/model/backupOnError.svg',
+    icon: 'res_terminal'
+  }, {
+    id: '005',
+    name: '图片三',
+    url: '/img/model/linuxServer.svg',
+    icon: 'res_linux'
+  }, {
+    id: '006',
+    name: '图片一',
+    url: '/img/model/switch.svg',
+    icon: 'switch'
+  }, {
+    id: '007',
+    name: '图片二',
+    url: '/img/model/backupOnError.svg',
+    icon: 'res_terminal'
+  }, {
+    id: '008',
+    name: '图片三',
+    url: '/img/model/linuxServer.svg',
+    icon: 'res_linux'
+  }]
+}, {
+  id: '2',
+  name: '图片库2',
+  icons: [{
+    id: '004',
+    name: '图片四',
+    url: '/img/model/tree_child.svg',
+    icon: 'tree_child'
+  }, {
+    id: '005',
+    name: '图片五',
+    url: '/img/model/commonNetwork.svg',
+    icon: 'res_storage'
+  }]
+}];