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

package/es/core/hooks/useCanvasTheme.js

@@ -1,34 +1,48 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect } from 'react';
 var themeMap = [{
-  value: 'white',
+  name: 'white',
   label: '白色',
-  color: '#FFFFFF'
+  color: null,
+  toolsTheme: 'lightgrayblue'
 }, {
-  value: 'lightblue',
+  name: 'lightblue',
   label: '蓝色',
-  color: '#F9FBFF'
+  color: '#F9FBFF',
+  toolsTheme: 'white'
 }, {
-  value: 'yellow',
+  name: 'yellow',
   label: '黄色',
   color: '#FFFDE6'
 }, {
-  value: 'green',
+  name: 'green',
   label: '绿色',
   color: '#EAFFE8'
 }, {
-  value: 'dark',
+  name: 'dark',
   label: '深色',
-  color: '#031425'
+  color: '#031425',
+  toolsTheme: 'black'
 }].reduce(function (map, item) {
   var _extends2;
 
-  return _extends({}, map, (_extends2 = {}, _extends2[item.value] = item, _extends2));
+  return _extends({}, map, (_extends2 = {}, _extends2[item.name] = item, _extends2));
 }, {});
 export default function useCanvasTheme(props) {
-  var canvasTheme = props.canvasTheme;
-  useEffect(function () {// 设置
-  }, [canvasTheme]);
+  var topo = props.topo,
+      canvasTheme = props.canvasTheme; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  useEffect(function () {
+    // 设置
+    var themeConfig = themeMap[canvasTheme];
+
+    if (graphLoaded && themeConfig) {
+      topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+    }
+  }, [canvasTheme, graphLoaded]);
   return {
     canvasColor: themeMap[canvasTheme].color
   };

package/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.35" === 'string' ? "6.0.0-alpha.35" : null;
+var version = typeof "6.0.0-alpha.37" === 'string' ? "6.0.0-alpha.37" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

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

package/lib/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/lib/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/lib/core/components/TopoView/GraphViewPanel.js

@@ -17,6 +17,7 @@ function GraphViewPanel(props) {
   var canvasTheme = displayConfig.canvasTheme || 'white';
 
   var _useCanvasTheme = (0, _useCanvasTheme2["default"])({
+    topo: topo,
     canvasTheme: canvasTheme
   }),
       canvasColor = _useCanvasTheme.canvasColor;

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

@@ -7,84 +7,29 @@ exports["default"] = CanvasPanel;
 
 var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _CanvasPanelModule = _interopRequireDefault(require("./CanvasPanel.module.scss"));
 
+var _useCanvasThemeConfig2 = _interopRequireDefault(require("./useCanvasThemeConfig"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-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'
-}];
-
 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 = (0, _extends2["default"])({}, nodeLabelStyle, {
-      color: themeItem.globalNodeLabelColor
-    });
-    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-    var globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, {
-      color: themeItem.globalEdgeTagColor
-    });
-    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
-    displayConfigDispatchers.update({
-      nodeLabelStyle: globalNodeLabelStyle,
-      defaultEdgeLabelStyle: globalEdgeTagStyle
-    });
-    topo.historyManager.endTransaction();
-  };
+  var _useCanvasThemeConfig = (0, _useCanvasThemeConfig2["default"])({
+    topo: topo
+  }),
+      themes = _useCanvasThemeConfig.themes,
+      canvasThemeName = _useCanvasThemeConfig.canvasThemeName,
+      setCanvasTheme = _useCanvasThemeConfig.setCanvasTheme;
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _CanvasPanelModule["default"].canvasToggle
-  }, CANVAS_TOGGLE.map(function (item, index) {
+  }, themes.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: _CanvasPanelModule["default"].canvas,
       key: index
@@ -93,9 +38,9 @@ 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["default"].createElement("div", {
       className: _CanvasPanelModule["default"].box

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

@@ -0,0 +1,47 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+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'
+  }
+}];
+var _default = THEMES;
+exports["default"] = _default;

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

@@ -0,0 +1,128 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
+
+var _themes = _interopRequireDefault(require("./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 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(themeName) {
+      var themeConfig;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              themeConfig = _themes["default"].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 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(themeConfig) {
+      var _topo$store$getModelS, nodeLabelStyle, defaultEdgeLabelStyle, globalNodeLabelStyle, globalEdgeTagStyle;
+
+      return _regenerator["default"].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 = (0, _extends2["default"])({}, nodeLabelStyle, {
+                color: themeConfig.globalNodeLabelColor
+              });
+              topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+              globalEdgeTagStyle = (0, _extends2["default"])({}, 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 = (0, _htElementUtils.getElements)(dm);
+    elements.forEach(function (element) {
+      if ((0, _htElementUtils.isText)(element)) {
+        element.s('text.color', themeConfig.text.color);
+      } else if ((0, _htElementUtils.isGroup)(element)) {
+        return 'groupTitle';
+      } else if ((0, _htElementUtils.isNode)(element)) {
+        return 'nodeTag';
+      } else if ((0, _htElementUtils.isEdge)(element)) {
+        return 'edgeTag';
+      } else if ((0, _htElementUtils.isLayer)(element)) {
+        return 'layerTitle';
+      }
+    });
+  }
+
+  return {
+    themes: _themes["default"],
+    canvasThemeName: canvasThemeName,
+    setCanvasTheme: setCanvasTheme
+  };
+}
+
+var _default = useCanvasThemeConfig;
+exports["default"] = _default;

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

@@ -21,13 +21,22 @@ function Content(props) {
       onPickerBlur = props.onPickerBlur,
       lineSizeChange = props.lineSizeChange,
       lineWidth = props.lineWidth;
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF"), /*#__PURE__*/_react["default"].createElement("div", {
+  return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      width: 200,
+      marginTop: '6px',
+      marginLeft: '12px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: 183,
       display: 'flex',
       marginTop: '8px'
     }
   }, /*#__PURE__*/_react["default"].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["default"].createElement(_FontColorRange["default"], {
@@ -39,7 +48,7 @@ function Content(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       marginTop: '5px',
-      marginLeft: '-2px'
+      marginLeft: '-5px'
     }
   }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
     onChange: onChange,

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

@@ -39,7 +39,7 @@ function EdgeColorButton(props) {
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  var _useState2 = (0, _react.useState)(),
+  var _useState2 = (0, _react.useState)(1),
       lineWidth = _useState2[0],
       setLineWidth = _useState2[1]; // 拓扑图是否加载
 
@@ -72,7 +72,7 @@ function EdgeColorButton(props) {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.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/lib/core/editor/components/Toolbar/widgets/NodeAlignWidget.js

@@ -45,12 +45,8 @@ function NodeAlignWidget(props) {
       setRightInputVal = _useState3[1];
 
   var _useState4 = (0, _react.useState)(true),
-      leftDisable = _useState4[0],
-      setLeftDisable = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(true),
-      rightDisable = _useState5[0],
-      setRightDisable = _useState5[1]; // 拓扑图是否加载
+      distributionDisabled = _useState4[0],
+      setDistributionDisabled = _useState4[1]; // 拓扑图是否加载
 
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
@@ -60,7 +56,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 !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
@@ -85,31 +82,14 @@ function NodeAlignWidget(props) {
       var nodes = selectionEle.filter(function (ele) {
         return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.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["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Disable.svg",
     alt: ""
@@ -127,9 +107,9 @@ function NodeAlignWidget(props) {
     trigger: icon
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_AlignSetting["default"], {
     topo: topo,
-    getClickType: getClickType
+    distributionDisabled: distributionDisabled
   }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
-    disabled: leftDisable,
+    disabled: disabled,
     size: "small",
     hasTrigger: false,
     placeholder: "\u591A\u4E2A\u503C",
@@ -139,7 +119,7 @@ function NodeAlignWidget(props) {
     max: 10000,
     onChange: leftInputChange
   }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
-    disabled: rightDisable,
+    disabled: disabled,
     size: "small",
     hasTrigger: false,
     placeholder: "\u591A\u4E2A\u503C",

package/lib/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/lib/core/editor/components/settings/common/AlignSetting/AlignSetting.module.scss

@@ -1,12 +1,13 @@
 @import "@alifd/next/variables";
 
 .AlignSetting {
+  margin: 11px 7px 17px 7px;
   :global {
     .#{$css-prefix}divider-ver {
       background: #EBECF0;
       margin-right: 3px;
       height: 16px;
-
+      width:1px;
     }
   }
 
@@ -16,7 +17,7 @@
     border-radius: 4px;
     border: none !important;
     color: #4D6277;
-    padding-left: 6px;
+    padding-left: 2px;
     margin-right: 3px;
 
     &:active {