@riil-frontend/component-topology 4.0.1 → 4.0.4

package/es/core/models/TopoApp.js

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

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -157,7 +157,7 @@ export default function ResourceOverview(props) {
         window.topo_overview_metric_timer = null;
       }
     };
-  });
+  }, []);
   useEffect(function () {
     if (monitorMetricModels) {
       init();

package/es/hooks/useTopoEdit.js

@@ -864,7 +864,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var bindNodeResource = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(params) {
-      var id, oldResId, newResId, node, groupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, newNodeElements, newLinkElements, newDatas, createElementsData, sm, dm, newElement, replaceOrAddRes;
+      var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm, replaceOrAddRes;
 
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
@@ -882,15 +882,15 @@ var useTopoEdit = function useTopoEdit(params) {
               rlog.debug("bindNodeResource", params);
               node = topo.getDataModel().getDataById(id); // 节点所属容器
 
-              groupElement = node.getParent();
+              parentGroupElement = node.getParent();
               htTopo = topo.getHtTopo();
               config = resourceConfig.getConfig();
 
-              if (groupElement) {
+              if (parentGroupElement) {
                 // 在容器中
-                groupId = groupElement.getTag(); // 容器业务id
+                groupId = parentGroupElement.getTag(); // 容器业务id
 
-                groupTag = groupElement.a("tag"); // 容器临时id
+                groupTag = parentGroupElement.a("tag"); // 容器临时id
 
                 config.groups = config.groups.map(function (g) {
                   // 匹配到容器，替换资源或增加
@@ -922,19 +922,8 @@ var useTopoEdit = function useTopoEdit(params) {
                 return item.id === newResId;
               });
 
-              if (newData.type === 'group') {
-                newNodeElements = [newData].concat(findGroupChildren(elements, newData));
-              } else {
-                newNodeElements = [newData];
-              }
-
-              newLinkElements = findUNExistedLinkElements(elements); // 过滤出关联的节点和连线，通知ht更新
-              // const newDatas = filterElementsByNodeId(elements, newResId);
-
-              newDatas = [].concat(newNodeElements, newLinkElements);
-
-              if (newDatas.length) {
-                _context8.next = 22;
+              if (newData) {
+                _context8.next = 19;
                 break;
               }
 
@@ -943,25 +932,57 @@ var useTopoEdit = function useTopoEdit(params) {
               rlog.warn("关联资源失败");
               return _context8.abrupt("return", false);
 
-            case 22:
-              createElementsData = {
-                groups: newDatas.filter(function (item) {
-                  return item.type === 'group';
-                }),
-                nodes: newDatas.filter(function (item) {
-                  return item.type === 'node';
-                }),
-                links: newDatas.filter(function (item) {
-                  return item.type === 'link';
-                }),
-                linkGroups: newDatas.filter(function (item) {
-                  return item.type === 'linkGroup';
-                })
-              };
-              rlog.debug('批量创建元素', newDatas, createElementsData);
-              htTopo.createElements(createElementsData);
-              sm = htTopo.getGraphView().sm();
-              dm = htTopo.getGraphView().dm(); // 恢复图标、大小、位置
+            case 19:
+              dm = htTopo.getGraphView().dm(); // 创建
+
+              newLinkElements = findUNExistedLinkElements(elements);
+              createElementsData = null;
+
+              if (newData.type === 'group') {
+                groupChildren = findGroupChildren(elements, newData);
+                newGroupChildren = [];
+                existedGroupChildren = [];
+                groupChildren.forEach(function (groupChildData) {
+                  var ele = dm.getDataByTag(groupChildData.id);
+
+                  if (ele) {
+                    existedGroupChildren.push(groupChildData);
+                  } else {
+                    newGroupChildren.push(groupChildData);
+                  }
+                });
+                createElementsData = {
+                  groups: [newData],
+                  nodes: newGroupChildren,
+                  links: newLinkElements.filter(function (item) {
+                    return item.type === 'link';
+                  }),
+                  linkGroups: newLinkElements.filter(function (item) {
+                    return item.type === 'linkGroup';
+                  })
+                };
+                htTopo.createElements(createElementsData); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
+
+                groupElement = dm.getDataByTag(newData.id);
+                existedGroupChildren.forEach(function (groupChildData) {
+                  var nodeElement = dm.getDataByTag(groupChildData.id);
+                  nodeElement.setParent(groupElement);
+                });
+              } else {
+                createElementsData = {
+                  groups: [],
+                  nodes: [newData],
+                  links: newLinkElements.filter(function (item) {
+                    return item.type === 'link';
+                  }),
+                  linkGroups: newLinkElements.filter(function (item) {
+                    return item.type === 'linkGroup';
+                  })
+                };
+                htTopo.createElements(createElementsData);
+              }
+
+              rlog.debug('批量创建元素', createElementsData); // 恢复图标、大小、位置
 
               newElement = dm.getDataByTag(newData.id);
 
@@ -969,24 +990,26 @@ var useTopoEdit = function useTopoEdit(params) {
                 newElement.setSize(node.getSize());
                 newElement.setPosition(node.getPosition());
                 newElement.setImage(node.getImage());
-              }
+              } // 选中
+
 
+              sm = htTopo.getGraphView().sm();
               sm.setSelection([newElement]); // 移除旧节点
 
               dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
               // node.a("customName", null);
               // 删除关联在节点上的出口链路
 
-              _context8.next = 33;
+              _context8.next = 31;
               return deleteExLink(node);
 
-            case 33:
+            case 31:
               // 临时放这里，仅拓扑中心有
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-            case 34:
+            case 32:
             case "end":
               return _context8.stop();
           }

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -1,12 +1,11 @@
 import _Drawer from "@alifd/next/es/drawer";
+import _Loading from "@alifd/next/es/loading";
 import _Message from "@alifd/next/es/message";
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _Collapse from "@alifd/next/es/collapse";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect, useRef } from "react";
 import topoService from "@riil-frontend/component-topology-common/es/services/topo";
-import { RESOURCE_LIMIT_TYPES } from "../../../../../../constants/ResourceTypeLimit";
 import _ from "lodash";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import TopoCenterEvent from "../../../../../event";
@@ -17,7 +16,6 @@ import { clone } from "../../../../../../utils/copyUtil";
 import { getInterfaceObject } from "../../../../../../core/models/utils/linkUtils";
 import { getEdgesBetweenNodes, getNodes, isGroup } from "../../../../../../utils/htElementUtils";
 import { getCiTypes } from "../../../../../../utils/topoData";
-var CollapsePanel = _Collapse.Panel;
 
 function AddLinkDrawer(props) {
   var topo = props.topo,
@@ -51,18 +49,26 @@ function AddLinkDrawer(props) {
       loading = _useState3[0],
       setLoading = _useState3[1];
 
-  var _useState4 = useState(),
-      sourceIFDoc = _useState4[0],
-      setSourceIFDoc = _useState4[1];
+  var _useState4 = useState(false),
+      loadingConnectableNodes = _useState4[0],
+      setLoadingConnectableNodes = _useState4[1];
 
-  var _useState5 = useState(),
-      targetIFDoc = _useState5[0],
-      setTargetIFDoc = _useState5[1]; // 保存后更新拓扑图状态
+  var _useState5 = useState(false),
+      loadingFormData = _useState5[0],
+      setLoadingFormData = _useState5[1];
 
+  var _useState6 = useState(),
+      sourceIFDoc = _useState6[0],
+      setSourceIFDoc = _useState6[1];
 
-  var _useState6 = useState([]),
-      ciIdsConnectable = _useState6[0],
-      setCiIdsConnectable = _useState6[1];
+  var _useState7 = useState(),
+      targetIFDoc = _useState7[0],
+      setTargetIFDoc = _useState7[1]; // 保存后更新拓扑图状态
+
+
+  var _useState8 = useState([]),
+      ciIdsConnectable = _useState8[0],
+      setCiIdsConnectable = _useState8[1];
 
   var linkNodesRef = useRef();
 
@@ -149,10 +155,15 @@ function AddLinkDrawer(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  /**
+   * 连线第二个节点时的处理
+   * @param {*} e 
+   */
+
 
   var handleEvent = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(e) {
-      var sourcePorts, targetPorts, source, target, connect_type;
+      var sourcePorts, targetPorts, source, target, targetDisableCreatePhyAggLink, connect_type;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -162,26 +173,28 @@ function AddLinkDrawer(props) {
               rlog.debug("接到打开创建链路抽屉信息", e);
               setIsAddMode(true); // setTrue();
 
-              _context2.prev = 3;
-              _context2.next = 6;
+              setLoadingFormData(true);
+              _context2.prev = 4;
+              _context2.next = 7;
               return getPortsById(e.source._attrObject.id);
 
-            case 6:
+            case 7:
               sourcePorts = _context2.sent;
-              _context2.next = 9;
+              _context2.next = 10;
               return getPortsById(e.target._attrObject.id);
 
-            case 9:
+            case 10:
               targetPorts = _context2.sent;
               setSourceIFDoc(sourcePorts.portsDoc);
               setTargetIFDoc(targetPorts.portsDoc);
               source = translationNode(e.source, sourcePorts);
               target = translationNode(e.target, targetPorts);
+              targetDisableCreatePhyAggLink = !target.ciData || !(target.ciData.permission.writeable || target.ciData.permission.deleteable);
               editDispatchers.update({
                 addLinkIsOpen: true,
                 currentLink: null
               });
-              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 ? "phy" : "exit";
+              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 && !targetDisableCreatePhyAggLink ? "phy" : "exit";
               setLink({
                 source: source,
                 target: target,
@@ -200,20 +213,23 @@ function AddLinkDrawer(props) {
                   connect_type: connect_type
                 }
               });
-              _context2.next = 22;
+              _context2.next = 24;
               break;
 
-            case 19:
-              _context2.prev = 19;
-              _context2.t0 = _context2["catch"](3);
+            case 21:
+              _context2.prev = 21;
+              _context2.t0 = _context2["catch"](4);
               rlog.error("出现异常", _context2.t0);
 
-            case 22:
+            case 24:
+              setLoadingFormData(false);
+
+            case 25:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[3, 19]]);
+      }, _callee2, null, [[4, 21]]);
     }));
 
     return function handleEvent(_x3) {
@@ -254,6 +270,7 @@ function AddLinkDrawer(props) {
               connect_type = currentLink.attributes["network_link.connect_type"] === "exit" ? "exit" : "phy";
               setLink({
                 source: {
+                  ciData: topo.dataModel.getDataById(currentLink.source),
                   id: currentLink.source,
                   name: currentLink.attributes["network_link.source_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.source_device_id"],
@@ -265,6 +282,7 @@ function AddLinkDrawer(props) {
                   portsDoc: sourcePorts.portsDoc
                 },
                 target: {
+                  ciData: topo.dataModel.getDataById(currentLink.target),
                   id: currentLink.target,
                   name: currentLink.attributes["network_link.destination_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.destination_device_id"],
@@ -309,20 +327,22 @@ function AddLinkDrawer(props) {
 
   var getCiTypesConnectable = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      var ciTypes, ciTypesConnectable, nodes, ciIds, ciNodes, isWriteable;
+      var ciNodes, ciTypes, ciTypesConnectable, nodes, ciIds, isWriteable;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
+              ciNodes = [];
+              setLoadingConnectableNodes(true);
+              _context4.prev = 2;
               ciTypes = getCiTypes(topo.dataModel.getData());
-              _context4.next = 3;
+              _context4.next = 6;
               return topoService.networkLink.getCiTypesConnectable(ciTypes);
 
-            case 3:
+            case 6:
               ciTypesConnectable = _context4.sent;
               nodes = getNodes(topo.getDataModel());
               ciIds = [];
-              ciNodes = [];
 
               isWriteable = function isWriteable(node) {
                 var _node$a;
@@ -330,7 +350,7 @@ function AddLinkDrawer(props) {
                 return ["delete", "write"].indexOf(node.a("operation")) >= 0 || ((_node$a = node.a('permission')) === null || _node$a === void 0 ? void 0 : _node$a.writeable);
               };
 
-              nodes.map(function (node) {
+              nodes.forEach(function (node) {
                 // rlog.debug("过滤属性", node.a("operation"));
                 if (ciTypesConnectable[node.a("ciType")] && isWriteable(node)) {
                   ciIds.push(node.id);
@@ -341,14 +361,24 @@ function AddLinkDrawer(props) {
                 ciConnectable: ciIds
               });
               setCiIdsConnectable(ciIds);
+              _context4.next = 18;
+              break;
+
+            case 15:
+              _context4.prev = 15;
+              _context4.t0 = _context4["catch"](2);
+              rlog.error('查询可创建链路节点失败', _context4.t0);
+
+            case 18:
+              setLoadingConnectableNodes(false);
               return _context4.abrupt("return", ciNodes);
 
-            case 12:
+            case 20:
             case "end":
               return _context4.stop();
           }
         }
-      }, _callee4);
+      }, _callee4, null, [[2, 15]]);
     }));
 
     return function getCiTypesConnectable() {
@@ -384,6 +414,7 @@ function AddLinkDrawer(props) {
 
     var attrObject = node._attrObject;
     return {
+      ciData: topo.dataModel.getDataById(attrObject.id),
       id: attrObject.id,
       name: attrObject.name,
       ciId: attrObject.id,
@@ -636,7 +667,13 @@ function AddLinkDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/React.createElement(_Drawer, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Loading, {
+    visible: loadingConnectableNodes,
+    fullScreen: true
+  }), /*#__PURE__*/React.createElement(_Loading, {
+    visible: loadingFormData,
+    fullScreen: true
+  }), /*#__PURE__*/React.createElement(_Drawer, {
     closeMode: ["close", "esc"],
     visible: addLinkIsOpen,
     onClose: closeDrawer,
@@ -650,7 +687,7 @@ function AddLinkDrawer(props) {
     onSave: onSave,
     loading: loading,
     isAdd: isAddMode
-  }));
+  })));
 }
 
 export default AddLinkDrawer;

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -23,6 +23,13 @@ import styles from "./index.module.scss";
 function parseValues(values) {
   return _extends({}, values);
 }
+/**
+ * 两端都有编辑/删除权限才能创建物理和聚合链路。
+ * 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+ * @param {*} props 
+ * @returns 
+ */
+
 
 export default function EditLinkInfo(props) {
   var _sourceValue$ipAddres2, _sourceValue$portsDoc5, _sourceValue$portsDoc6, _targetValue$portsDoc5, _targetValue$portsDoc6;
@@ -257,8 +264,10 @@ export default function EditLinkInfo(props) {
       name: "network_link.destination_ipv4",
       maxLength: 128
     });
-  };
+  }; // 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+
 
+  var disableCreatePhyAggLink = target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0 || !lineData.target || isAdd && !(lineData.target.ciData.permission.writeable || lineData.target.ciData.permission.deleteable);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.editForm
   }, /*#__PURE__*/React.createElement(_Form, {
@@ -378,7 +387,7 @@ export default function EditLinkInfo(props) {
   }, /*#__PURE__*/React.createElement(_Radio, {
     id: "phy",
     value: "phy",
-    disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
+    disabled: disableCreatePhyAggLink
   }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/React.createElement(_Radio, {
     id: "exit",
     value: "exit"

package/es/utils/clusterUtil.js

@@ -82,7 +82,7 @@ export function handleClusterNoPermission(topo) {
   var dm = topo.getHtTopo().getGraphView().dm();
   var groups = getGroups(dm);
   groups.forEach(function (group) {
-    if (isClusterHtElement(group) && !group.a('operation')) {
+    if (isClusterHtElement(group) && !group.a('operation') && group.isExpanded()) {
       group.setExpanded(false);
     }
   });

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.1" === 'string' ? "4.0.1" : null;
+var version = typeof "4.0.4" === 'string' ? "4.0.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -189,7 +189,7 @@ function ResourceOverview(props) {
         window.topo_overview_metric_timer = null;
       }
     };
-  });
+  }, []);
   (0, _react.useEffect)(function () {
     if (monitorMetricModels) {
       init();

package/lib/hooks/useTopoEdit.js

@@ -901,7 +901,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var bindNodeResource = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(params) {
-      var id, oldResId, newResId, node, groupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, newNodeElements, newLinkElements, newDatas, createElementsData, sm, dm, newElement, replaceOrAddRes;
+      var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm, replaceOrAddRes;
 
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
@@ -921,15 +921,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
               node = topo.getDataModel().getDataById(id); // 节点所属容器
 
-              groupElement = node.getParent();
+              parentGroupElement = node.getParent();
               htTopo = topo.getHtTopo();
               config = resourceConfig.getConfig();
 
-              if (groupElement) {
+              if (parentGroupElement) {
                 // 在容器中
-                groupId = groupElement.getTag(); // 容器业务id
+                groupId = parentGroupElement.getTag(); // 容器业务id
 
-                groupTag = groupElement.a("tag"); // 容器临时id
+                groupTag = parentGroupElement.a("tag"); // 容器临时id
 
                 config.groups = config.groups.map(function (g) {
                   // 匹配到容器，替换资源或增加
@@ -961,19 +961,8 @@ var useTopoEdit = function useTopoEdit(params) {
                 return item.id === newResId;
               });
 
-              if (newData.type === 'group') {
-                newNodeElements = [newData].concat((0, _topoData.findGroupChildren)(elements, newData));
-              } else {
-                newNodeElements = [newData];
-              }
-
-              newLinkElements = findUNExistedLinkElements(elements); // 过滤出关联的节点和连线，通知ht更新
-              // const newDatas = filterElementsByNodeId(elements, newResId);
-
-              newDatas = [].concat(newNodeElements, newLinkElements);
-
-              if (newDatas.length) {
-                _context8.next = 22;
+              if (newData) {
+                _context8.next = 19;
                 break;
               }
 
@@ -983,27 +972,58 @@ var useTopoEdit = function useTopoEdit(params) {
 
               return _context8.abrupt("return", false);
 
-            case 22:
-              createElementsData = {
-                groups: newDatas.filter(function (item) {
-                  return item.type === 'group';
-                }),
-                nodes: newDatas.filter(function (item) {
-                  return item.type === 'node';
-                }),
-                links: newDatas.filter(function (item) {
-                  return item.type === 'link';
-                }),
-                linkGroups: newDatas.filter(function (item) {
-                  return item.type === 'linkGroup';
-                })
-              };
+            case 19:
+              dm = htTopo.getGraphView().dm(); // 创建
 
-              _rlog["default"].debug('批量创建元素', newDatas, createElementsData);
+              newLinkElements = findUNExistedLinkElements(elements);
+              createElementsData = null;
+
+              if (newData.type === 'group') {
+                groupChildren = (0, _topoData.findGroupChildren)(elements, newData);
+                newGroupChildren = [];
+                existedGroupChildren = [];
+                groupChildren.forEach(function (groupChildData) {
+                  var ele = dm.getDataByTag(groupChildData.id);
+
+                  if (ele) {
+                    existedGroupChildren.push(groupChildData);
+                  } else {
+                    newGroupChildren.push(groupChildData);
+                  }
+                });
+                createElementsData = {
+                  groups: [newData],
+                  nodes: newGroupChildren,
+                  links: newLinkElements.filter(function (item) {
+                    return item.type === 'link';
+                  }),
+                  linkGroups: newLinkElements.filter(function (item) {
+                    return item.type === 'linkGroup';
+                  })
+                };
+                htTopo.createElements(createElementsData); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
+
+                groupElement = dm.getDataByTag(newData.id);
+                existedGroupChildren.forEach(function (groupChildData) {
+                  var nodeElement = dm.getDataByTag(groupChildData.id);
+                  nodeElement.setParent(groupElement);
+                });
+              } else {
+                createElementsData = {
+                  groups: [],
+                  nodes: [newData],
+                  links: newLinkElements.filter(function (item) {
+                    return item.type === 'link';
+                  }),
+                  linkGroups: newLinkElements.filter(function (item) {
+                    return item.type === 'linkGroup';
+                  })
+                };
+                htTopo.createElements(createElementsData);
+              }
+
+              _rlog["default"].debug('批量创建元素', createElementsData); // 恢复图标、大小、位置
 
-              htTopo.createElements(createElementsData);
-              sm = htTopo.getGraphView().sm();
-              dm = htTopo.getGraphView().dm(); // 恢复图标、大小、位置
 
               newElement = dm.getDataByTag(newData.id);
 
@@ -1011,24 +1031,26 @@ var useTopoEdit = function useTopoEdit(params) {
                 newElement.setSize(node.getSize());
                 newElement.setPosition(node.getPosition());
                 newElement.setImage(node.getImage());
-              }
+              } // 选中
+
 
+              sm = htTopo.getGraphView().sm();
               sm.setSelection([newElement]); // 移除旧节点
 
               dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
               // node.a("customName", null);
               // 删除关联在节点上的出口链路
 
-              _context8.next = 33;
+              _context8.next = 31;
               return deleteExLink(node);
 
-            case 33:
+            case 31:
               // 临时放这里，仅拓扑中心有
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-            case 34:
+            case 32:
             case "end":
               return _context8.stop();
           }