@riil-frontend/component-topology 12.0.0-dev.8 → 12.1.0-dev.1

package/es/utils/ciRefAttributeTranslateUtil.js

@@ -0,0 +1,155 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { rlog } from '@riil-frontend/component-topology-utils';
+import ciTypeCache from "../core/models/cache/CiTypeCache";
+import ciCache from "../core/models/cache/CiCache";
+import { getCiTypesFromCiElements } from "./topoData";
+
+/**
+ * 获取ci列表的引用字段列表
+ */
+function getCiRefAttributesMap(ciDatas, ciTypeMap) {
+  // ci引用字段列表
+  var ciRefAttributeMap = {};
+  ciDatas.forEach(function (ciData) {
+    var id = ciData.id;
+    var attributeMap = ciData.attributeMap || ciData.attributes;
+    ciRefAttributeMap[id] = [];
+    var typeCode = ciData.ciType || ciData.typeCode;
+    var ciTypeMeta = ciTypeMap[typeCode];
+
+    if (ciTypeMeta) {
+      ciTypeMeta.attributes.filter(function (attributeMeta) {
+        return !!attributeMeta.refCi;
+      }).forEach(function (attributeMeta) {
+        var refId = attributeMap[attributeMeta.code];
+
+        if (refId) {
+          var ciRefAttributeData = {
+            attrCode: attributeMeta.code,
+            id: refId
+          };
+          ciRefAttributeMap[ciData.id].push(ciRefAttributeData);
+        }
+      });
+    } else {
+      rlog.warn("\u7FFB\u8BD1\u5F15\u7528\u5B57\u6BB5\u540D\u79F0\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + typeCode, ciData);
+    }
+  });
+  return ciRefAttributeMap;
+}
+
+function getRefIds(ciRefAttributesMap) {
+  var refIds = [];
+  Object.keys(ciRefAttributesMap).forEach(function (ciId) {
+    var ciRefAttributeDatas = ciRefAttributesMap[ciId];
+    ciRefAttributeDatas.forEach(function (ciRefAttributeData) {
+      var refId = ciRefAttributeData.id;
+
+      if (!refIds.includes(refId)) {
+        refIds.push(refId);
+      }
+    });
+  });
+  return refIds;
+}
+
+function addRefCiNameToCiDatas(ciDatas, ciRefAttributesMap, refCiMap) {
+  return ciDatas.map(function (ciData) {
+    var id = ciData.id;
+
+    var attributeMap = _extends({}, ciData.attributeMap || ciData.attributes);
+
+    ciRefAttributesMap[id].forEach(function (refAttrs) {
+      var refCi = refCiMap[refAttrs.id];
+
+      if (refCi) {
+        // 引用ci名称获取规则：如果ci是树形结构（例如区域），取 tree_name_path；非树形，取display_name
+        var displayName = refCi.attributes.tree_name_path || refCi.attributes.display_name;
+        attributeMap[refAttrs.attrCode + "_object"] = {
+          displayName: displayName
+        };
+      }
+    });
+    return _extends({}, ciData, {
+      attributeMap: attributeMap
+    });
+  });
+}
+
+/**
+ * 翻译ci列表引用属性名称
+ * @param ciDatas 
+ * @returns 
+ */
+export function translateCisRefAttributeName(_x, _x2) {
+  return _translateCisRefAttributeName.apply(this, arguments);
+}
+/**
+ * 翻译ci引用属性名称
+ * @param ciData
+ * @returns 
+ */
+
+function _translateCisRefAttributeName() {
+  _translateCisRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ciDatas, options) {
+    var ciTypeMap, ciRefAttributesMap, refIds, refCiMap;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return ciTypeCache.load(getCiTypesFromCiElements(ciDatas));
+
+        case 2:
+          ciTypeMap = _context.sent;
+          // 2. 查找引用字段及值
+          ciRefAttributesMap = getCiRefAttributesMap(ciDatas, ciTypeMap); // 3. 引用id列表
+
+          refIds = getRefIds(ciRefAttributesMap);
+
+          if (refIds.length) {
+            _context.next = 7;
+            break;
+          }
+
+          return _context.abrupt("return", ciDatas);
+
+        case 7:
+          _context.next = 9;
+          return ciCache.load(refIds, options === null || options === void 0 ? void 0 : options.refreshCiCache);
+
+        case 9:
+          refCiMap = _context.sent;
+          return _context.abrupt("return", addRefCiNameToCiDatas(ciDatas, ciRefAttributesMap, refCiMap));
+
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _translateCisRefAttributeName.apply(this, arguments);
+}
+
+export function translateCiRefAttributeName(_x3, _x4) {
+  return _translateCiRefAttributeName.apply(this, arguments);
+}
+
+function _translateCiRefAttributeName() {
+  _translateCiRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ciData, options) {
+    var result;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          result = translateCisRefAttributeName([ciData], options);
+          return _context2.abrupt("return", result[0]);
+
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _translateCiRefAttributeName.apply(this, arguments);
+}

package/es/utils/topoData.js

@@ -97,8 +97,10 @@ var tfLink = function tfLink(engine, link) {
 export function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
-    if (element.ciType && ciTypes.indexOf(element.ciType) < 0) {
-      ciTypes.push(element.ciType);
+    var typeCode = element.ciType || element.typeCode;
+
+    if (typeCode && ciTypes.indexOf(typeCode) < 0) {
+      ciTypes.push(typeCode);
     }
   });
   return ciTypes;

package/lib/components/TemplateButton/index.module.scss

@@ -26,7 +26,7 @@
   line-height: 20px;
   font-size: 18px;
   margin-top: 14px;
-  color: $color-text1-3;
+  color: $color-text1-4;
   outline: none;
 }
 

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -5,6 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _list = _interopRequireDefault(require("@alifd/next/lib/list"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
@@ -47,6 +51,7 @@ function AlarmListItem(props) {
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
       onClick = props.onClick;
+  console.log("AlarmListPanel", topo, alarmInfo);
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {
@@ -101,10 +106,62 @@ function RiskListItem(props) {
   }, "\u67E5\u770B\u8BE6\u60C5"))));
 }
 
+function SubListItem(props) {
+  // 传入参数
+  var topo = props.topo,
+      alarmInfo = props.alarmInfo,
+      onClick = props.onClick;
+  var creatAlarmTips = topo.viewProps.creatAlarmTips;
+  var subNode = topo.getData().nodes.find(function (node) {
+    return node.ciId === alarmInfo.mainCiId;
+  });
+  var plarm = alarmInfo.cmpCode ? "\u3010" + (subNode === null || subNode === void 0 ? void 0 : subNode.sourceName) + "\u3011" : "【本级平台】";
+  return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
+    className: _indexModule["default"].AlarmListItem,
+    media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+      type: "gaojing-3",
+      size: "xs",
+      className: _indexModule["default"]["alarm-color-icon"] + " alarm-color-icon-lv" + alarmInfo.alertLevel
+    })
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: _indexModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].list,
+    onClick: function onClick() {
+      getNode(topo, alarmInfo);
+    }
+  }, "" + plarm + alarmInfo.alertObject + alarmInfo.alertTitle), alarmInfo.cmpCode ? /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
+    trigger: /*#__PURE__*/_react["default"].createElement("span", {
+      className: _indexModule["default"].listLink
+    }, "\u67E5\u770B\u8BE6\u60C5"),
+    closable: true,
+    triggerType: "click",
+    align: "bl",
+    popupClassName: _indexModule["default"]["enjoydata-alarm-table-balloon"],
+    popupStyle: {
+      maxWidth: "700px",
+      width: 530
+    }
+  }, creatAlarmTips((0, _extends2["default"])({}, alarmInfo, {
+    sourceName: plarm
+  }))) : /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].listLink
+  }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+    onClick: onClick,
+    to: alarmLink(alarmInfo)
+  }, "\u67E5\u770B\u8BE6\u60C5"))));
+}
+
 function ListItem(props) {
-  var alarmInfo = props.alarmInfo;
-  var ListItemWidget = alarmInfo.eventType === 'risk' ? RiskListItem : AlarmListItem;
-  return /*#__PURE__*/_react["default"].createElement(ListItemWidget, props);
+  var topo = props.topo,
+      alarmInfo = props.alarmInfo;
+
+  if (topo.isCMPTopo) {
+    return /*#__PURE__*/_react["default"].createElement(SubListItem, props);
+  } else {
+    var ListItemWidget = alarmInfo.eventType === "risk" ? RiskListItem : AlarmListItem;
+    return /*#__PURE__*/_react["default"].createElement(ListItemWidget, props);
+  }
 }
 
 var _default = ListItem;

package/lib/core/components/TopoView/topoView.js

@@ -202,7 +202,11 @@ var Topology = function Topology(props) {
 
     if (initSelectionId) {
       var ele = topo.getHtTopo().getGraphView().dm().getDataByTag(initSelectionId);
-      topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+
+      if (ele) {
+        topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+      }
+
       var selectionDispatchers = topo.store.getModelDispatchers('selection');
       selectionDispatchers.update({
         initSelectionId: null

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
 
+var _edgeUtil = require("../../../../../utils/edgeUtil");
+
 var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -52,15 +54,7 @@ function EdgeColorButton(props) {
   };
 
   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;
+    return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
@@ -69,7 +63,7 @@ function EdgeColorButton(props) {
       var list = getLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
-      if (selection.length == 1 && selection[0].a('type') == 'line') {
+      if (selection.length == 1 && list.length === 1) {
         setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);
       }
 
@@ -83,7 +77,7 @@ function EdgeColorButton(props) {
     var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if ((0, _edgeUtil.isCustomEdge)(edge)) {
         var color = colors.hex;
         edge.s('edge.color', color);
         edge.s('edge.dash.color', color);
@@ -111,7 +105,7 @@ function EdgeColorButton(props) {
     topo.historyManager.beginTransaction();
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if ((0, _edgeUtil.isCustomEdge)(edge)) {
         edge.s('edge.dash.width', width);
         edge.s('edge.width', width);
         var style = edge.a('styles') || {};

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

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
+
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
@@ -160,12 +162,19 @@ function EdgeType(props) {
     className: _EdgeTypeModule["default"].lineBox
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
-    inline: true,
     labelAlign: "top"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
     name: "lineButton"
-  })), /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u8D77\u70B9"
+  })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    direction: "row",
+    style: {
+      gap: 8
+    }
+  }, /*#__PURE__*/_react["default"].createElement(FormItem, {
+    label: "\u8D77\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "startPoint",
     placeholder: " ",
@@ -173,7 +182,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: _EdgeTypeModule["default"].endPointSelect
   }, START_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       value: item.value,
@@ -186,7 +196,10 @@ function EdgeType(props) {
       className: _EdgeTypeModule["default"].iconImg
     }));
   }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u7EC8\u70B9"
+    label: "\u7EC8\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "endPoint",
     placeholder: " ",
@@ -194,7 +207,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: _EdgeTypeModule["default"].endPointSelect
   }, END_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       value: item.value,
@@ -207,7 +221,10 @@ function EdgeType(props) {
       className: _EdgeTypeModule["default"].iconImg
     }));
   }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u7C7B\u578B"
+    label: "\u7C7B\u578B",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "lineMold",
     popupProps: {
@@ -215,7 +232,8 @@ function EdgeType(props) {
         return trigger.parentNode;
       }
     },
-    placeholder: " "
+    placeholder: " ",
+    className: _EdgeTypeModule["default"].lineMoldSelect
   }, LINE_MOLD_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       value: item.value,
@@ -227,7 +245,7 @@ function EdgeType(props) {
       alt: "",
       className: _EdgeTypeModule["default"].iconImg
     }));
-  })))));
+  })))))));
 }
 
 EdgeType.defaultProps = {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss

@@ -1,10 +1,30 @@
 @import '~@alifd/next/variables.scss';
 
 .lineBox{
-  width: 236px;
   background: #FFFFFF;
   border-radius: 4px;
   margin-bottom: -7px;
+
+  .endPointSelect {
+    min-width: 0;
+    width: 64px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
+  .lineMoldSelect {
+    min-width: 0;
+    width: 88px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
   :global {
     .#{$css-prefix}form-item:first-child{
       margin-top: 0;

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

@@ -55,6 +55,14 @@ var LINE_TYPE_OPTIONS = [{
 // },
 ];
 
+if (localStorage.getItem('topo.test.edge.customType') === 'true') {
+  LINE_TYPE_OPTIONS.push({
+    value: 'points',
+    label: '自由线形',
+    icon: 'topo_linear_icon_pointsline'
+  });
+}
+
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

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

@@ -69,7 +69,7 @@ function EdgeTypeButton(props) {
       return;
     }
 
-    (0, _edgeTypeStyleUtil.setEdgesAndChildren)(topo, edges, function (edge) {
+    (0, _edgeTypeStyleUtil.updateEdgesData)(topo, edges, function (edge) {
       if (name === 'startPoint') {
         // 删除设置
         ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (iconName) {

package/lib/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -40,6 +40,11 @@ function Layout(props) {
       selection = _topo$store$useModelS.selection;
 
   var setDisabled = function setDisabled(data) {
+    if (topoShowType !== 'layers' && selection.length === 1) {
+      //中心节点布局，选中一个节点非分层情况下，需要星型和树形布局亮起来
+      return data == 'rectangle' || data == 'hierarchical';
+    }
+
     if (topoShowType == 'layers' && selection.length == 1 && !(0, _htElementDataUtil.isGroup)(selection[0])) {
       return data != 'rectangle';
     } else {
@@ -57,7 +62,11 @@ function Layout(props) {
 
 
     if (topoShowType != 'layers' && selection.length == 1) {
-      topo.getHtTopo().layoutInContainer(layouType);
+      if (layouType == 'hierarchical') {
+        topo.getHtTopo().layoutInContainer(layouType);
+      } else {
+        topo.getHtTopo().layoutTopoBySelectNode(layouType, selectionElements[0]);
+      }
     } // eslint-disable-next-line eqeqeq
 
 
@@ -72,7 +81,7 @@ function Layout(props) {
     topo.historyManager.beginTransaction();
     setLayout(v); // eslint-disable-next-line eqeqeq
 
-    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1) {
+    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1 || topoShowType !== 'layers' && selection.length === 1) {
       globalLayout(v);
     }
 
@@ -150,6 +159,11 @@ function isLayoutEnabled(props) {
 
   if (topoShowType !== 'layers' && !selection.length) {
     return true;
+  } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
+
+
+  if (topoShowType !== 'layers' && selection.length === 1) {
+    return true;
   }
 
   return false;

package/lib/core/editor/hooks/useKeyboardShortcut.js

@@ -44,8 +44,10 @@ function unbindKeyboardShortcuts(props) {
 
 function useKeyboardShortcut(props) {
   (0, _react.useEffect)(function () {
+    (0, _copyElementUtil.initPasteEventListener)();
     initKeyboardShortcuts(props);
     return function () {
+      (0, _copyElementUtil.destroyPasteEventListener)();
       unbindKeyboardShortcuts(props);
     };
   }, []);

package/lib/core/editor/utils/copyElementUtil.js

@@ -3,8 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.destroyPasteEventListener = destroyPasteEventListener;
 exports.handleCopyHotkey = handleCopyHotkey;
 exports.handlePasteHotkey = handlePasteHotkey;
+exports.initPasteEventListener = initPasteEventListener;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -21,6 +23,19 @@ function handleCopyHotkey(event, options) {
   }
 }
 
+function initPasteEventListener() {
+  document.addEventListener("paste", handlePasteEventListener);
+}
+
+function destroyPasteEventListener() {
+  document.removeEventListener("paste", handlePasteEventListener);
+}
+
+function handlePasteEventListener(e) {
+  var clipdata = e.clipboardData || window.clipboardData;
+  console.log("主动粘贴", clipdata.getData("text/plain"));
+}
+
 function handlePasteHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -3,9 +3,8 @@
 exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
 exports.isNodeAllEdges = isNodeAllEdges;
-exports.loopEdgesAndChildren = loopEdgesAndChildren;
-exports.setEdgesAndChildren = setEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
+exports.updateEdgesData = updateEdgesData;
 
 var _htElementUtils = require("../../../utils/htElementUtils");
 
@@ -89,45 +88,23 @@ function isNodeAllEdges(topo) {
   });
   return inEdges;
 }
-/**
- * 遍历连线及子连线
- * @param {*} topo 
- * @param {*} edges 
- * @param {*} operateEdgeFn 
- */
-
-
-function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
-  var htTopo = topo.getHtTopo();
-  edges.forEach(function (edge) {
-    operateEdgeFn(edge);
-
-    if (edge.isEdgeGroupAgent()) {
-      // 连线组折叠时同时设置子连线
-      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
-      edgeChildren.forEach(function (edgeChild) {
-        operateEdgeFn(edgeChild);
-      });
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
-    }
-  });
-}
 /**
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 
  * @param {*} edges 
- * @param {*} operateEdgeFn 
+ * @param {*} updateEdgeFn 
  */
 
 
-function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+function updateEdgesData(topo, edges, updateEdgeFn) {
   topo.historyManager.beginTransaction();
-  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  edges.forEach(function (edge) {
+    updateEdgeFn(edge);
+  });
   topo.historyManager.endTransaction();
 }
 /**
- * 批量设置连线线形
+ * 批量设置连线线形。带回退事务控制
  * 
  * @param {*} edges 
  * @param {*} type 
@@ -137,7 +114,7 @@ function setEdgesAndChildren(topo, edges, operateEdgeFn) {
 
 function setEdgesType(edges, type, topo) {
   var htTopo = topo.getHtTopo();
-  setEdgesAndChildren(topo, edges, function (edge) {
+  updateEdgesData(topo, edges, function (edge) {
     htTopo.setGraphLinear(edge, {
       type: type
     });