@riil-frontend/component-topology 13.0.0-dev.5 → 13.0.0-dev.7

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

@@ -3,33 +3,20 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 /* eslint-disable jsx-a11y/alt-text */
 import React, { useState } from 'react';
-import DropdownButton from "./components/DropdownButton";
+import FontColorDropdown from "./components/FontColorDropdown";
 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 FontColorDropdown(props) {
-  var color = props.color,
-      onChange = props.onChange,
+function FontColorButton(props) {
+  var showLabel = props.showLabel,
       topo = props.topo,
-      opacity = props.opacity,
-      background = props.background,
+      style = props.style,
       setStyle = props.setStyle,
-      _props$fieldDisabled = props.fieldDisabled,
-      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
-
-  var _useState = useState(false),
-      disabled = _useState[0],
-      setDisabled = _useState[1];
-
-  var backgroundEnabled = fieldDisabled.background !== true;
-  var opacityEnabled = fieldDisabled.opacity !== true;
+      fieldDisabled = props.fieldDisabled;
 
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
-    onChange({
+    setStyle({
       opacity: (value / 100).toFixed(2) * 1
     });
     topo.historyManager.endTransaction();
@@ -111,84 +98,16 @@ function FontColorDropdown(props) {
     };
   }();
 
-  var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
-  };
-
-  var onBlur = function onBlur() {// topo.historyManager.endTransaction();
-  };
-
-  var icon = disabled ? /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
-    alt: ""
-  }) : /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
-    alt: ""
-  });
-  return /*#__PURE__*/React.createElement(DropdownButton, {
-    disabled: disabled,
-    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("div", {
-    style: {
-      marginTop: '10px',
-      marginLeft: '-4px'
-    }
-  }, /*#__PURE__*/React.createElement(ColorPanel, {
-    value: color,
-    onChange: colorChang,
-    onPickerFocus: onFocus,
-    onPickerBlur: onBlur
-  }))), (backgroundEnabled || opacityEnabled) && /*#__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/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\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 === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
-
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginTop: '10px',
-      marginLeft: '-4px',
-      marginBottom: '3px'
-    }
-  }, /*#__PURE__*/React.createElement(ColorPanel, {
-    showClear: true,
-    value: background,
-    onChange: backgroundChang,
-    onPickerFocus: onFocus,
-    onPickerBlur: onBlur
-  })))));
-}
-
-function FontColorButton(props) {
-  var showLabel = props.showLabel,
-      topo = props.topo,
-      style = props.style,
-      setStyle = props.setStyle,
-      fieldDisabled = props.fieldDisabled;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontColorDropdown, {
-    color: style.color,
-    background: style.background,
-    opacity: style.opacity,
+    value: style,
     fieldDisabled: fieldDisabled,
-    setStyle: setStyle,
-    onChange: function onChange(val) {
-      setStyle(val);
-    },
+    onColorChange: colorChang,
+    onBackgroundChange: backgroundChang,
+    onOpacityChange: backOpacityChange,
     topo: topo
   }));
 }

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

@@ -0,0 +1,114 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["topo", "value", "onChange", "fieldDisabled"];
+
+/* eslint-disable jsx-a11y/alt-text */
+import React, { useState } from 'react';
+import DropdownButton from "./DropdownButton";
+import ColorPanel from "../../../../../../components/ColorPanel";
+import FontColorRange from "../../../../../../components/ColorPanel/components/FontColorRange";
+import styles from "./FontColorDropdown.module.scss";
+
+function FontColorDropdown(props) {
+  var color = props.color,
+      opacity = props.opacity,
+      background = props.background,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
+      onChange = props.onChange,
+      onColorChange = props.onColorChange,
+      onBackgroundChange = props.onBackgroundChange,
+      onOpacityChange = props.onOpacityChange;
+
+  var _useState = useState(false),
+      disabled = _useState[0],
+      setDisabled = _useState[1];
+
+  var backgroundEnabled = fieldDisabled.background !== true;
+  var opacityEnabled = fieldDisabled.opacity !== true;
+
+  var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
+  };
+
+  var onBlur = function onBlur() {// topo.historyManager.endTransaction();
+  };
+
+  var icon = disabled ? /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
+    alt: ""
+  }) : /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
+    alt: ""
+  });
+  return /*#__PURE__*/React.createElement(DropdownButton, {
+    disabled: disabled,
+    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("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px'
+    }
+  }, /*#__PURE__*/React.createElement(ColorPanel, {
+    value: color,
+    onChange: onColorChange,
+    onPickerFocus: onFocus,
+    onPickerBlur: onBlur
+  }))), (backgroundEnabled || opacityEnabled) && /*#__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/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\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: onOpacityChange,
+    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
+
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px',
+      marginBottom: '3px'
+    }
+  }, /*#__PURE__*/React.createElement(ColorPanel, {
+    showClear: true,
+    value: background,
+    onChange: onBackgroundChange,
+    onPickerFocus: onFocus,
+    onPickerBlur: onBlur
+  })))));
+}
+/**
+ * 
+ * @param {*} props 
+ * @param {{color, background, opacity}} props.value
+ * @returns 
+ */
+
+
+function FontColorD(props) {
+  var topo = props.topo,
+      value = props.value,
+      onChange = props.onChange,
+      fieldDisabled = props.fieldDisabled,
+      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  return /*#__PURE__*/React.createElement(FontColorDropdown, _extends({}, otherProps, {
+    color: value.color,
+    background: value.background,
+    opacity: value.opacity,
+    fieldDisabled: fieldDisabled,
+    setStyle: onChange,
+    onChange: onChange,
+    topo: topo
+  }));
+}
+
+export default FontColorD;

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "13.0.0-dev.5" === 'string' ? "13.0.0-dev.5" : null;
+var version = typeof "13.0.0-dev.7" === 'string' ? "13.0.0-dev.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/utils/htElementUtils.js

@@ -142,7 +142,9 @@ export function getEdgesBetweenNodes(node1, node2) {
     return edges;
   }
 
-  node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
+  node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).forEach(function (edge) {
     var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
 
     if (isEdgeBetweenNodes) {

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

@@ -11,16 +11,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _DropdownButton = _interopRequireDefault(require("./components/DropdownButton"));
+var _FontColorDropdown = _interopRequireDefault(require("./components/FontColorDropdown"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
-var _ColorPanel = _interopRequireDefault(require("../../../../../components/ColorPanel"));
-
-var _FontColorRange = _interopRequireDefault(require("../../../../../components/ColorPanel/components/FontColorRange"));
-
-var _FontColorButtonModule = _interopRequireDefault(require("./FontColorButton.module.scss"));
-
 var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
 
 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); }
@@ -28,26 +22,16 @@ 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; }
 
 /* eslint-disable jsx-a11y/alt-text */
-function FontColorDropdown(props) {
-  var color = props.color,
-      onChange = props.onChange,
+function FontColorButton(props) {
+  var showLabel = props.showLabel,
       topo = props.topo,
-      opacity = props.opacity,
-      background = props.background,
+      style = props.style,
       setStyle = props.setStyle,
-      _props$fieldDisabled = props.fieldDisabled,
-      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
-
-  var _useState = (0, _react.useState)(false),
-      disabled = _useState[0],
-      setDisabled = _useState[1];
-
-  var backgroundEnabled = fieldDisabled.background !== true;
-  var opacityEnabled = fieldDisabled.opacity !== true;
+      fieldDisabled = props.fieldDisabled;
 
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
-    onChange({
+    setStyle({
       opacity: (value / 100).toFixed(2) * 1
     });
     topo.historyManager.endTransaction();
@@ -129,84 +113,16 @@ function FontColorDropdown(props) {
     };
   }();
 
-  var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
-  };
-
-  var onBlur = function onBlur() {// topo.historyManager.endTransaction();
-  };
-
-  var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
-    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
-    alt: ""
-  }) : /*#__PURE__*/_react["default"].createElement("img", {
-    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
-    alt: ""
-  });
-  return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
-    disabled: disabled,
-    trigger: icon
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _FontColorButtonModule["default"].content
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _FontColorButtonModule["default"].fontColor
-  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      marginTop: '10px',
-      marginLeft: '-4px'
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
-    value: color,
-    onChange: colorChang,
-    onPickerFocus: onFocus,
-    onPickerBlur: onBlur
-  }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
-    className: _FontColorButtonModule["default"].backgroundColor
-  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _FontColorButtonModule["default"].backOpacity
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
-  }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
-    max: 100,
-    min: 0,
-    unit: "%",
-    list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
-    onChange: backOpacityChange,
-    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
-
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      marginTop: '10px',
-      marginLeft: '-4px',
-      marginBottom: '3px'
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
-    showClear: true,
-    value: background,
-    onChange: backgroundChang,
-    onPickerFocus: onFocus,
-    onPickerBlur: onBlur
-  })))));
-}
-
-function FontColorButton(props) {
-  var showLabel = props.showLabel,
-      topo = props.topo,
-      style = props.style,
-      setStyle = props.setStyle,
-      fieldDisabled = props.fieldDisabled;
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(FontColorDropdown, {
-    color: style.color,
-    background: style.background,
-    opacity: style.opacity,
+  }, /*#__PURE__*/_react["default"].createElement(_FontColorDropdown["default"], {
+    value: style,
     fieldDisabled: fieldDisabled,
-    setStyle: setStyle,
-    onChange: function onChange(val) {
-      setStyle(val);
-    },
+    onColorChange: colorChang,
+    onBackgroundChange: backgroundChang,
+    onOpacityChange: backOpacityChange,
     topo: topo
   }));
 }

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

@@ -0,0 +1,130 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+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 _DropdownButton = _interopRequireDefault(require("./DropdownButton"));
+
+var _ColorPanel = _interopRequireDefault(require("../../../../../../components/ColorPanel"));
+
+var _FontColorRange = _interopRequireDefault(require("../../../../../../components/ColorPanel/components/FontColorRange"));
+
+var _FontColorDropdownModule = _interopRequireDefault(require("./FontColorDropdown.module.scss"));
+
+var _excluded = ["topo", "value", "onChange", "fieldDisabled"];
+
+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; }
+
+function FontColorDropdown(props) {
+  var color = props.color,
+      opacity = props.opacity,
+      background = props.background,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
+      onChange = props.onChange,
+      onColorChange = props.onColorChange,
+      onBackgroundChange = props.onBackgroundChange,
+      onOpacityChange = props.onOpacityChange;
+
+  var _useState = (0, _react.useState)(false),
+      disabled = _useState[0],
+      setDisabled = _useState[1];
+
+  var backgroundEnabled = fieldDisabled.background !== true;
+  var opacityEnabled = fieldDisabled.opacity !== true;
+
+  var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
+  };
+
+  var onBlur = function onBlur() {// topo.historyManager.endTransaction();
+  };
+
+  var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
+    alt: ""
+  }) : /*#__PURE__*/_react["default"].createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
+    alt: ""
+  });
+  return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
+    disabled: disabled,
+    trigger: icon
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _FontColorDropdownModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _FontColorDropdownModule["default"].fontColor
+  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    value: color,
+    onChange: onColorChange,
+    onPickerFocus: onFocus,
+    onPickerBlur: onBlur
+  }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
+    className: _FontColorDropdownModule["default"].backgroundColor
+  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
+    className: _FontColorDropdownModule["default"].backOpacity
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
+  }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
+    max: 100,
+    min: 0,
+    unit: "%",
+    list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
+    onChange: onOpacityChange,
+    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
+
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px',
+      marginBottom: '3px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    showClear: true,
+    value: background,
+    onChange: onBackgroundChange,
+    onPickerFocus: onFocus,
+    onPickerBlur: onBlur
+  })))));
+}
+/**
+ * 
+ * @param {*} props 
+ * @param {{color, background, opacity}} props.value
+ * @returns 
+ */
+
+
+function FontColorD(props) {
+  var topo = props.topo,
+      value = props.value,
+      onChange = props.onChange,
+      fieldDisabled = props.fieldDisabled,
+      otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+  return /*#__PURE__*/_react["default"].createElement(FontColorDropdown, (0, _extends2["default"])({}, otherProps, {
+    color: value.color,
+    background: value.background,
+    opacity: value.opacity,
+    fieldDisabled: fieldDisabled,
+    setStyle: onChange,
+    onChange: onChange,
+    topo: topo
+  }));
+}
+
+var _default = FontColorD;
+exports["default"] = _default;

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "13.0.0-dev.5" === 'string' ? "13.0.0-dev.5" : null;
+var version = typeof "13.0.0-dev.7" === 'string' ? "13.0.0-dev.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/utils/htElementUtils.js

@@ -199,7 +199,9 @@ function getEdgesBetweenNodes(node1, node2) {
     return edges;
   }
 
-  node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
+  node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).forEach(function (edge) {
     var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
 
     if (isEdgeBetweenNodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "13.0.0-dev.5",
+  "version": "13.0.0-dev.7",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.5/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.7/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }