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

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

@@ -7,6 +7,8 @@ exports["default"] = HtCustomImagePanel;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
@@ -38,10 +40,20 @@ function HtCustomImagePanel(props) {
       });
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
+
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
 
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
 var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
 
 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); }
@@ -38,10 +40,20 @@ function HtImagePalette(props) {
       });
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
+
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
 
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

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

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

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

@@ -5,39 +5,63 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = ImagePanel;
 
-var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
-
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _Panel = _interopRequireDefault(require("../../../../../../components/collapse/Panel"));
-
-var _CollapseModule = _interopRequireDefault(require("../../../../../../components/collapse/Collapse.module.scss"));
+var _Collapse = _interopRequireDefault(require("../../../../../../components/collapse/Collapse"));
 
 var _CiTypeImagePanel = _interopRequireDefault(require("./CiTypeImagePanel"));
 
 var _CustomImagePanel = _interopRequireDefault(require("./CustomImagePanel"));
 
+var _icon2 = require("../../../../../common/icons/icon");
+
+var _HtImagePalette = _interopRequireDefault(require("./HtImagePalette"));
+
+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 CollapsePanel = _Collapse["default"].Panel;
+
 function ImagePanel(props) {
-  return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-    defaultExpandedKeys: ['资源图片', '自定义图片'],
+  var topo = props.topo;
+  var basicIcons = (0, _react.useMemo)(function () {
+    return (0, _icon2.getBasicIcons)(topo, false);
+  }, []);
+
+  var handleDownloadCustomImages = function handleDownloadCustomImages() {
+    window.open('/topo/v1/api/shape/download/all');
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+    accordion: true,
+    defaultExpandedKeys: ['资源图片'],
     style: {
       border: 'none'
     },
-    className: (0, _classnames["default"])(_CollapseModule["default"].collapse, _CollapseModule["default"].contentNoPadding)
-  }, /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
+    fullheight: true,
+    noContentPadding: true
+  }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u8D44\u6E90\u56FE\u7247",
     title: "\u8D44\u6E90\u56FE\u7247"
-  }, /*#__PURE__*/_react["default"].createElement(_CiTypeImagePanel["default"], props)), /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_CiTypeImagePanel["default"], props)), /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+    key: "\u57FA\u7840\u56FE\u7247",
+    title: "\u57FA\u7840\u56FE\u7247"
+  }, /*#__PURE__*/_react["default"].createElement(_HtImagePalette["default"], {
+    icons: basicIcons,
+    topo: topo
+  })), /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     title: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     extra: /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      title: "\u5BFC\u51FA"
+      title: "\u5BFC\u51FA",
+      onClick: handleDownloadCustomImages
     }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
       type: "topo_button_icon_export"
     }))

package/lib/core/editor/components/Toolbar/EditorToolbar.js

@@ -24,23 +24,30 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 
 function EditorToolbar(props) {
-  var _classNames;
+  var _topo$viewProps, _topo$viewProps$topoC, _classNames;
+
+  var topo = props.topo;
 
   var _useState = (0, _react.useState)(true),
       expanded = _useState[0],
       setExpanded = _useState[1];
 
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(_ToolbarModule["default"].toolbarWrap, (_classNames = {}, _classNames[_ToolbarModule["default"].normal] = expanded, _classNames[_ToolbarModule["default"].expanded] = !expanded, _classNames))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _ToolbarModule["default"].content
-  }, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, _buttons["default"].map(function (ToolbarButton, index) {
+  var isNetworkTopo = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$topoC = _topo$viewProps.topoContext) === null || _topo$viewProps$topoC === void 0 ? void 0 : _topo$viewProps$topoC.isNetworkTopo;
+  var buttons = (0, _react.useMemo)(function () {
+    return (0, _buttons["default"])(isNetworkTopo);
+  }, [isNetworkTopo]);
+  var buttonInstances = buttons.map(function (ToolbarButton, index) {
     return /*#__PURE__*/_react["default"].createElement(ToolbarButton, (0, _extends2["default"])({
       key: index
     }, props, {
       showLabel: expanded
     }));
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+  });
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_ToolbarModule["default"].toolbarWrap, (_classNames = {}, _classNames[_ToolbarModule["default"].normal] = expanded, _classNames[_ToolbarModule["default"].expanded] = !expanded, _classNames))
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _ToolbarModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, buttonInstances)), /*#__PURE__*/_react["default"].createElement("div", {
     className: _ToolbarModule["default"].right
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "normal",

package/lib/core/editor/components/Toolbar/buttons.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = getButtons;
 
 var _AddResourceButton = _interopRequireDefault(require("./widgets/AddResourceButton"));
 
@@ -41,22 +41,23 @@ var _NodeImageButton = _interopRequireDefault(require("./widgets/NodeImageButton
 
 var _NodeSizeButton = _interopRequireDefault(require("./widgets/NodeSizeButton"));
 
-var _default = [_AddResourceButton["default"], // 添加资源
-_Divider["default"], _CanvasSelectWidget["default"], // 选择
-_CanvasMoveWidget["default"], // 移动
-_Divider["default"], _HistoryUndoButton["default"], // 撤销
-_HistoryRedoButton["default"], // 恢复
-_Divider["default"], _FontFamilyWidget["default"], // 字体
-_FontSizeWidget["default"], // 字号
-_FontStyleButton["default"], // 文字样式
-_FontColorButton["default"], // 文字颜色
-_Divider["default"], _BoxBackgroundButton["default"], // 框背景
-_Divider["default"], _EdgeColorButton["default"], // 线条颜色
-_EdgeTypeButton["default"], // 线形
-_Divider["default"], _NodeImageButton["default"], // 替换图片
-_NodeSizeButton["default"], // 图片尺寸
-_Divider["default"], _Layout["default"], // 布局方式
-_NodeAlignWidget["default"], // 对齐方式
-_SearchWidget["default"] // 搜索
-];
-exports["default"] = _default;
+function getButtons(isNetworkTopo) {
+  return [].concat(isNetworkTopo ? [_AddResourceButton["default"], // 添加资源
+  _Divider["default"]] : [], [_CanvasSelectWidget["default"], // 选择
+  _CanvasMoveWidget["default"], // 移动
+  _Divider["default"]], isNetworkTopo ? [_HistoryUndoButton["default"], // 撤销
+  // HistoryRedoButton, // 恢复
+  _Divider["default"]] : [], [_FontFamilyWidget["default"], // 字体
+  _FontSizeWidget["default"], // 字号
+  _FontStyleButton["default"], // 文字样式
+  _FontColorButton["default"], // 文字颜色
+  _Divider["default"], _BoxBackgroundButton["default"], // 框背景
+  _Divider["default"], _EdgeColorButton["default"], // 线条颜色
+  _EdgeTypeButton["default"], // 线形
+  _Divider["default"], _NodeImageButton["default"], // 替换图片
+  _NodeSizeButton["default"], // 图片尺寸
+  _Divider["default"], _Layout["default"], // 布局方式
+  _NodeAlignWidget["default"] // 对齐方式
+  // SearchWidget, // 搜索
+  ]);
+}

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

@@ -39,7 +39,7 @@ function AddResourceButton(props) {
       topoEdit = props.topoEdit,
       editorProps = props.editorProps; // 选中的元素
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useSelection();
 
   var _useState = (0, _react.useState)(getAddType(selection)),
       addType = _useState[0],
@@ -69,7 +69,7 @@ function AddResourceButton(props) {
     }
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6DFB\u52A0\u8D44\u6E90",
     tooltip: "\u6DFB\u52A0\u8D44\u6E90",
     showLabel: showLabel
@@ -78,7 +78,7 @@ function AddResourceButton(props) {
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/add/Normal.svg",
     alt: ""
-  })), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
+  }))), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
     layer: selection[0],
     editorProps: editorProps,
     layerAddResource: layerAddResource

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

@@ -36,9 +36,8 @@ function BoxBackgroundButton(props) {
       setDisabled = _useState[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
-  (0, _react.useEffect)(function () {
-    setDisabled(false);
+  var selection = topo.selectionModel.useSelection();
+  (0, _react.useEffect)(function () {// setDisabled(false)
   }, [selection]);
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/Disable.svg",
@@ -50,6 +49,7 @@ function BoxBackgroundButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6846\u80CC\u666F",
     tooltip: "\u6846\u80CC\u666F",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,

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

@@ -7,9 +7,55 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _ColorPanel = _interopRequireDefault(require("../../../../../../components/ColorPanel"));
+
+var _FontColorRange = _interopRequireDefault(require("../../../../../../components/ColorPanel/components/FontColorRange"));
+
+/* eslint-disable no-undef */
+
+/* eslint-disable jsx-a11y/alt-text */
 function Content(props) {
-  // const {  } = props
-  return /*#__PURE__*/_react["default"].createElement("div", null, "xxx");
+  var topo = props.topo,
+      onChange = props.onChange,
+      onPickerFocus = props.onPickerFocus,
+      onPickerBlur = props.onPickerBlur,
+      lineSizeChange = props.lineSizeChange,
+      lineWidth = props.lineWidth;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '6px',
+      marginLeft: '12px',
+      marginBottom: '6px'
+    }
+  }, /*#__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"], {
+    defaultValue: lineWidth,
+    min: 1,
+    max: 10,
+    list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    onChange: lineSizeChange
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '5px',
+      marginLeft: '-5px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    onChange: onChange,
+    onPickerFocus: onPickerFocus,
+    onPickerBlur: onPickerBlur
+  })));
 }
 
 var _default = Content;

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

@@ -5,10 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
+
 var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -33,13 +37,97 @@ function EdgeColorButton(props) {
 
   var _useState = (0, _react.useState)(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1];
+
+  var _useState2 = (0, _react.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();
   (0, _react.useEffect)(function () {
-    setDisabled(false);
-  }, [selection]);
+    if (graphLoaded) {
+      var edges = (0, _edgeTypeStyleUtil.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 = (0, _edgeTypeStyleUtil.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', (0, _extends2["default"])({}, 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 = (0, _edgeTypeStyleUtil.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', (0, _extends2["default"])({}, style, {
+          width: width
+        }));
+      }
+    });
+    topo.historyManager.endTransaction();
+  };
+
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u7EBF\u6761\u586B\u5145/Disable.svg",
     alt: ""
@@ -50,12 +138,18 @@ function EdgeColorButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u7EBF\u6761\u989C\u8272",
     tooltip: "\u7EBF\u6761\u989C\u8272",
-    showLabel: showLabel
+    showLabel: showLabel,
+    disabled: disabled
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,
     trigger: icon
   }, /*#__PURE__*/_react["default"].createElement(_Content["default"], {
-    topo: topo
+    topo: topo,
+    onChange: colorOnChange,
+    onPickerFocus: onPickerFocus,
+    onPickerBlur: onPickerBlur,
+    lineSizeChange: lineSizeChange,
+    lineWidth: lineWidth
   })));
 }
 

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

@@ -23,22 +23,41 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var FormItem = _form["default"].Item;
 var Option = _select["default"].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',
@@ -58,16 +77,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["default"].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);
@@ -77,6 +123,9 @@ function EdgeType(props) {
     }
   });
 
+  (0, _react.useEffect)(function () {
+    field.setValues(getValuesBySelection(selection));
+  }, [selection]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _EdgeTypeModule["default"].lineBox
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
@@ -89,12 +138,13 @@ function EdgeType(props) {
     label: "\u8D77\u70B9"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     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["default"].createElement(Option, {
       value: item.value,
       key: index,
@@ -109,12 +159,13 @@ function EdgeType(props) {
     label: "\u7EC8\u70B9"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     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["default"].createElement(Option, {
       value: item.value,
       key: index,
@@ -128,18 +179,18 @@ function EdgeType(props) {
   }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
     label: "\u7C7B\u578B"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
-    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["default"].createElement(Option, {
       value: item.value,
-      key: index,
-      title: item.label,
+      key: index // title={item.label}
+      ,
       onchange: _onChange
     }, /*#__PURE__*/_react["default"].createElement("img", {
       src: "/img/topo/editor/lineType/" + item.icon + ".svg",

package/lib/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;
     }
   }
 }