@riil-frontend/component-topology 6.0.0-alpha.34 → 6.0.0-alpha.37

package/es/components/ColorPanel/components/ColorBlock/index.module.scss

@@ -5,4 +5,5 @@
     height: 25px;
     border-radius: 50%;
     border: 1px solid;
+    cursor: pointer;
 }

package/es/components/ColorPanel/components/FontColorRange/index.module.scss

@@ -4,15 +4,14 @@
 .content {
   display: flex;
   flex-direction: row;
-  width: 84%;
-  margin-left: 6%;
-  overflow: hidden;
+  flex:1;
+  margin-left: 22px;
   .range {
     flex: 1;
   }
 
   .unit {
-    margin-left: 10px;
+    margin-left: 14px;
   }
 
   :global {

package/es/components/ColorPanel/index.module.scss

@@ -1,13 +1,13 @@
 @import '~@alifd/next/variables.scss';
 
 .content{
-  width: 210px;
+  width: 201px;
   .ul{
     width: 100%;
     .li{
       display: inline-block;
-      width: 34.6px;
-      line-height: 40px;
+      width: 33px;
+      line-height: 38px;
       .liBox{
         width: 31px;
         height: 31px;
@@ -31,4 +31,5 @@
   height: 25px;
   border-radius: 50%;
   overflow: hidden;
+  cursor: pointer;
 }

package/es/components/collapse/Collapse.module.scss

@@ -37,20 +37,21 @@
     flex-direction: column;
 
     :global {
-      .#{$css-prefix}collapse-panel-content {
-        flex: 1;
-        overflow: auto;
-      }
       .#{$css-prefix}collapse-panel.#{$css-prefix}collapse-panel-expanded {
         flex: 1;
         display: flex;
         flex-direction: column;
+        overflow: auto;
         
         .#{$css-prefix}collapse-panel-content {
           flex: 1;
           overflow: auto;
         }
       }
+      .#{$css-prefix}collapse-panel-content {
+        flex: 1;
+        overflow: auto;
+      }
     }
   }
 

package/es/core/components/TopoView/GraphViewPanel.js

@@ -7,6 +7,7 @@ export default function GraphViewPanel(props) {
   var canvasTheme = displayConfig.canvasTheme || 'white';
 
   var _useCanvasTheme = useCanvasTheme({
+    topo: topo,
     canvasTheme: canvasTheme
   }),
       canvasColor = _useCanvasTheme.canvasColor;

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

@@ -1,77 +1,20 @@
 import _Tag from "@alifd/next/es/tag";
-import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import styles from "./CanvasPanel.module.scss";
-var CANVAS_TOGGLE = [{
-  value: 'white',
-  label: '白色',
-  color: '#FFFFFF',
-  globalNodeLabelColor: '#4d6277',
-  globalEdgeTagColor: '#4d6277'
-}, {
-  value: 'lightblue',
-  label: '蓝色',
-  color: '#F9FBFF',
-  globalNodeLabelColor: '#4d6277',
-  globalEdgeTagColor: '#4d6277'
-}, // {
-//   value: 'yellow',
-//   label: '黄色',
-//   color: '#FFFDE6',
-// },
-// {
-//   value: 'green',
-//   label: '绿色',
-//   color: '#EAFFE8',
-// },
-{
-  value: 'dark',
-  label: '深色',
-  color: '#031425',
-  globalNodeLabelColor: '#ffffff',
-  globalEdgeTagColor: '#ffffff'
-}];
+import useCanvasThemeConfig from "./useCanvasThemeConfig";
 export default function CanvasPanel(props) {
   var topo = props.topo;
 
-  var _topo$store$useModel = topo.store.useModel('displayConfig'),
-      canvasTheme = _topo$store$useModel[0].canvasTheme,
-      displayConfigDispatchers = _topo$store$useModel[1];
-
-  var value = canvasTheme || 'white';
-
-  var setCanvasTheme = function setCanvasTheme(themeItem) {
-    var theme = themeItem.value;
-    topo.historyManager.beginTransaction();
-    displayConfigDispatchers.update({
-      canvasTheme: theme
-    }); // 设置资源/链路标注样式
-
-    var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-        nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle,
-        defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
-
-    var globalNodeLabelStyle = _extends({}, nodeLabelStyle, {
-      color: themeItem.globalNodeLabelColor
-    });
-
-    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-
-    var globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, {
-      color: themeItem.globalEdgeTagColor
-    });
-
-    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
-    displayConfigDispatchers.update({
-      nodeLabelStyle: globalNodeLabelStyle,
-      defaultEdgeLabelStyle: globalEdgeTagStyle
-    });
-    topo.historyManager.endTransaction();
-  };
+  var _useCanvasThemeConfig = useCanvasThemeConfig({
+    topo: topo
+  }),
+      themes = _useCanvasThemeConfig.themes,
+      canvasThemeName = _useCanvasThemeConfig.canvasThemeName,
+      setCanvasTheme = _useCanvasThemeConfig.setCanvasTheme;
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles.canvasToggle
-  }, CANVAS_TOGGLE.map(function (item, index) {
+  }, themes.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       className: styles.canvas,
       key: index
@@ -80,9 +23,9 @@ export default function CanvasPanel(props) {
       style: {
         background: item.color
       },
-      checked: value === item.value,
+      checked: item.name === canvasThemeName,
       onChange: function onChange(checked) {
-        setCanvasTheme(item);
+        setCanvasTheme(item.name);
       }
     }, /*#__PURE__*/React.createElement("div", {
       className: styles.box

package/es/core/editor/components/Sidebar/views/CanvasPanel/themes.js

@@ -0,0 +1,42 @@
+var THEMES = [{
+  name: 'white',
+  label: '白色',
+  color: '#FFFFFF',
+  toolsTheme: 'lightgrayblue',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277',
+  text: {
+    color: '#4d6277'
+  }
+}, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277',
+  text: {
+    color: '#4d6277'
+  }
+}, // {
+//   name: 'yellow',
+//   label: '黄色',
+//   color: '#FFFDE6',
+// },
+// {
+//   name: 'green',
+//   label: '绿色',
+//   color: '#EAFFE8',
+// },
+{
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black',
+  globalNodeLabelColor: '#ffffff',
+  globalEdgeTagColor: '#ffffff',
+  text: {
+    color: '#ffffff'
+  }
+}];
+export default THEMES;

package/es/core/editor/components/Sidebar/views/CanvasPanel/useCanvasThemeConfig.js

@@ -0,0 +1,116 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { getElements, isEdge, isGroup, isLayer, isNode, isText } from "../../../../../../utils/htElementUtils";
+import THEMES from "./themes";
+
+function useCanvasThemeConfig(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      displayConfig = _topo$store$useModel[0],
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var canvasThemeName = displayConfig.canvasTheme || 'white';
+
+  var setCanvasTheme = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(themeName) {
+      var themeConfig;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              themeConfig = THEMES.find(function (item) {
+                return item.name === themeName;
+              });
+              topo.historyManager.beginTransaction();
+              _context.next = 4;
+              return displayConfigDispatchers.update({
+                canvasTheme: themeName
+              });
+
+            case 4:
+              _context.next = 6;
+              return setGlobalTagTheme(themeConfig);
+
+            case 6:
+              setElementsTheme(themeConfig);
+              topo.historyManager.endTransaction();
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function setCanvasTheme(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  function setGlobalTagTheme(_x2) {
+    return _setGlobalTagTheme.apply(this, arguments);
+  }
+
+  function _setGlobalTagTheme() {
+    _setGlobalTagTheme = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(themeConfig) {
+      var _topo$store$getModelS, nodeLabelStyle, defaultEdgeLabelStyle, globalNodeLabelStyle, globalEdgeTagStyle;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              // 设置资源/链路标注样式
+              _topo$store$getModelS = topo.store.getModelState('displayConfig'), nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle, defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+              globalNodeLabelStyle = _extends({}, nodeLabelStyle, {
+                color: themeConfig.globalNodeLabelColor
+              });
+              topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+              globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, {
+                color: themeConfig.globalEdgeTagColor
+              });
+              topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+              _context2.next = 7;
+              return displayConfigDispatchers.update({
+                nodeLabelStyle: globalNodeLabelStyle,
+                defaultEdgeLabelStyle: globalEdgeTagStyle
+              });
+
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+    return _setGlobalTagTheme.apply(this, arguments);
+  }
+
+  function setElementsTheme(themeConfig) {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var elements = getElements(dm);
+    elements.forEach(function (element) {
+      if (isText(element)) {
+        element.s('text.color', themeConfig.text.color);
+      } else if (isGroup(element)) {
+        return 'groupTitle';
+      } else if (isNode(element)) {
+        return 'nodeTag';
+      } else if (isEdge(element)) {
+        return 'edgeTag';
+      } else if (isLayer(element)) {
+        return 'layerTitle';
+      }
+    });
+  }
+
+  return {
+    themes: THEMES,
+    canvasThemeName: canvasThemeName,
+    setCanvasTheme: setCanvasTheme
+  };
+}
+
+export default useCanvasThemeConfig;

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

@@ -1,4 +1,5 @@
 import React, { useEffect, useRef } from 'react';
+import ResizeObserver from 'resize-observer-polyfill';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import styles from "./HtImagePalette.module.scss";
 /**
@@ -25,10 +26,20 @@ export default function HtCustomImagePanel(props) {
       });
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new ResizeObserver(hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

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 ResizeObserver from 'resize-observer-polyfill';
 import styles from "./HtImagePalette.module.scss";
 /**
  * 组件面板
@@ -23,13 +24,22 @@ export default function HtImagePalette(props) {
       viewRef.current = htTopo.createImagePalette(container, {
         icons: icons
       });
-      console.error(viewRef.current);
     } catch (error) {
       rlog.error('初始化资源面板失败', error);
-    } // 注销组件
+    }
 
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
+
+    var resizeObserver = new ResizeObserver(hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

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

@@ -1,5 +1,5 @@
 .container {
   width: 100%;
   height: 100%;
-  overflow: auto;
+  overflow: hidden;
 }

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

@@ -12,13 +12,22 @@ function Content(props) {
       onPickerBlur = props.onPickerBlur,
       lineSizeChange = props.lineSizeChange,
       lineWidth = props.lineWidth;
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u7EBF"), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     style: {
-      width: 200,
+      marginTop: '6px',
+      marginLeft: '12px'
+    }
+  }, /*#__PURE__*/React.createElement("div", null, "\u7EBF"), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: 183,
       display: 'flex',
       marginTop: '8px'
     }
   }, /*#__PURE__*/React.createElement("img", {
+    style: {
+      width: 14,
+      height: 14
+    },
     src: "/img/topo/editor/toolbar/\u7EBF\u6761\u586B\u5145/\u8FB9\u6846.svg",
     title: "\u7EBF\u6761\u5BBD\u5EA6"
   }), /*#__PURE__*/React.createElement(FontColorRange, {
@@ -30,7 +39,7 @@ function Content(props) {
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '5px',
-      marginLeft: '-2px'
+      marginLeft: '-5px'
     }
   }, /*#__PURE__*/React.createElement(ColorPanel, {
     onChange: onChange,

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

@@ -21,7 +21,7 @@ function EdgeColorButton(props) {
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  var _useState2 = useState(),
+  var _useState2 = useState(1),
       lineWidth = _useState2[0],
       setLineWidth = _useState2[1]; // 拓扑图是否加载
 
@@ -54,7 +54,7 @@ function EdgeColorButton(props) {
     if (graphLoaded) {
       var edges = getEdgesBySelection(topo);
       var list = getLines(edges);
-      setLineWidth(0); // eslint-disable-next-line eqeqeq
+      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);

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

@@ -26,12 +26,8 @@ function NodeAlignWidget(props) {
       setRightInputVal = _useState3[1];
 
   var _useState4 = useState(true),
-      leftDisable = _useState4[0],
-      setLeftDisable = _useState4[1];
-
-  var _useState5 = useState(true),
-      rightDisable = _useState5[0],
-      setRightDisable = _useState5[1]; // 拓扑图是否加载
+      distributionDisabled = _useState4[0],
+      setDistributionDisabled = _useState4[1]; // 拓扑图是否加载
 
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
@@ -41,7 +37,8 @@ function NodeAlignWidget(props) {
   var selection = topo.selectionManager.useSelection();
 
   var setSpace = function setSpace(type, num) {
-    topo.historyManager.beginTransaction();
+    topo.historyManager.beginTransaction(); // eslint-disable-next-line no-shadow
+
     var selection = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (ele) {
       return !isLayer(ele) && !isEdge(ele);
@@ -66,31 +63,14 @@ function NodeAlignWidget(props) {
       var nodes = selectionEle.filter(function (ele) {
         return !isLayer(ele) && !isEdge(ele);
       });
-      setDisabled(nodes.length <= 1);
-      getClickType('none');
-      setLeftInputVal();
-      setRightInputVal();
-    }
-  }, [graphLoaded, selection]);
+      setDisabled(nodes.length <= 1); // eslint-disable-next-line no-use-before-define
 
-  var getClickType = function getClickType(type) {
-    if (leftInputVal || rightInputVal) {
       setLeftInputVal();
       setRightInputVal();
-    }
-
-    setLeftDisable(true);
-    setRightDisable(true);
-
-    if (type === 'top' || type === 'middle' || type === 'bottom') {
-      setLeftDisable(false);
-    }
-
-    if (type === 'left' || type === 'center' || type === 'right') {
-      setRightDisable(false);
-    }
-  };
+      setDistributionDisabled(nodes.length <= 2);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
 
+  }, [graphLoaded, selection]);
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Disable.svg",
     alt: ""
@@ -108,9 +88,9 @@ function NodeAlignWidget(props) {
     trigger: icon
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AlignSetting, {
     topo: topo,
-    getClickType: getClickType
+    distributionDisabled: distributionDisabled
   }), /*#__PURE__*/React.createElement(_NumberPicker, {
-    disabled: leftDisable,
+    disabled: disabled,
     size: "small",
     hasTrigger: false,
     placeholder: "\u591A\u4E2A\u503C",
@@ -120,7 +100,7 @@ function NodeAlignWidget(props) {
     max: 10000,
     onChange: leftInputChange
   }), /*#__PURE__*/React.createElement(_NumberPicker, {
-    disabled: rightDisable,
+    disabled: disabled,
     size: "small",
     hasTrigger: false,
     placeholder: "\u591A\u4E2A\u503C",

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

@@ -1,15 +1,17 @@
 .leftInput{
   width: 100px !important;
-  margin-right: 10px;
-  margin-left: 5px;
+  margin: 0px 10px 18px 9px;
   :global{
     input{
       background: url('/img/topo/editor/toolbar/对齐/水平间距_normal.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 81px center !important;
     }
     .next-disabled input{
       background: url('/img/topo/editor/toolbar/对齐/水平间距_disable.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 81px center !important;
+    }
+    .next-input.next-small input{
+      height: calc(30px - 1px * 2);
     }
   }
 }
@@ -18,11 +20,14 @@
   :global{
     input{
       background: url('/img/topo/editor/toolbar/对齐/垂直间距 _normal.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 82px center !important;
     }
     .next-disabled input{
       background: url('/img/topo/editor/toolbar/对齐/垂直间距_disable.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 82px center !important;
+    }
+    .next-input.next-small input{
+      height: calc(30px - 1px * 2);
     }
   }
 }

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/colorUtil.js

@@ -0,0 +1,50 @@
+import Color from 'color';
+/**
+ * 解析颜色字符串为对象
+ * 
+ * @param {string} colorStr 
+ * @returns {null|{hex, rgb:{r,g,b,a}}}
+ */
+
+export function parseColor(colorStr) {
+  if (!colorStr) {
+    return null;
+  }
+
+  var color = Color(colorStr);
+  var rgb = color.rgb();
+  return {
+    hex: color.hex(),
+    rgb: {
+      r: rgb.color[0],
+      g: rgb.color[1],
+      b: rgb.color[2],
+      a: rgb.valpha
+    }
+  };
+}
+export function formatHexColor(color) {
+  return color ? color.hex : null;
+}
+/**
+ * 格式化背景rgba颜色
+ * @param {{background, opacity}} prevColor
+ * @param {{background, opacity}} currentColor
+ */
+
+export function formatBackgroundRgbaColor(prevColor, currentColor) {
+  if (!('background' in currentColor) && !('opacity' in currentColor)) {
+    return null;
+  }
+
+  var colorObj = Object.assign(prevColor, currentColor);
+  var background = colorObj.background,
+      opacity = colorObj.opacity;
+
+  if (!background) {
+    return null;
+  }
+
+  var rgb = background.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + opacity + ")";
+}

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -1,9 +1,14 @@
 export function getTextStyle(element) {
   return {
     color: null,
+    // 文字颜色
     fontFamily: null,
-    fontSize: null,
-    fontStyle: []
+    fontSize: null // fontBold: false, // 文字样式加粗 @V1.2
+    // fontItalic: false, // 文字样式斜体 @V1.2
+    // fontUnderline: false, // 文字样式下划线 @V1.2
+    // background: {rgb: {}, hex: ''}, // 背景颜色，rgba格式。null表示无
+    // opacity: 1, // 背景透明度。值范围 0-1, null，null表示无
+
   };
 }
 export function setTextStyle(element, style) {}