@riil-frontend/component-topology 11.0.33 → 11.0.35

package/es/core/hooks/useTopoEdit.js

@@ -19,6 +19,8 @@ import { mergeExportLinkData } from "../models/utils/linkUtils";
 import { isUniqueIp, buildIpNode } from "../../networkTopo/utils/exitLinkUtil";
 
 var useTopoEdit = function useTopoEdit(params) {
+  var _ref2, _ref3, _ref4, _bindGroupResources, _addGroupResources, _bindViewResources, _addLayerResources, _addResourceToFirstLayer, _ref5, _ref6, _ref8, _relateNodeIp;
+
   var topo = params.topo,
       topoId = params.topoId,
       isEditing = params.isEditing,
@@ -72,97 +74,87 @@ var useTopoEdit = function useTopoEdit(params) {
     setShowComboResDrawer(true);
   };
 
-  var onLayerAdded = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+  var onLayerAdded = function onLayerAdded(_x) {
+    return (_ref2 = _ref2 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
       var target, direction, config;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              target = _ref.target, direction = _ref.direction;
-              topo.historyManager.beginTransaction(); // 从拓扑图获取分层和资源配置
-
-              config = resourceConfig.getConfigFromHt(topo.getDataModel());
-              rlog.info("onLayerAdd", {
-                config: config
-              }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
-
-              if (!(!isLayerTopo && config.layers.length)) {
-                _context.next = 7;
-                break;
-              }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            target = _ref.target, direction = _ref.direction;
+            topo.historyManager.beginTransaction(); // 从拓扑图获取分层和资源配置
+
+            config = resourceConfig.getConfigFromHt(topo.getDataModel());
+            rlog.info("onLayerAdd", {
+              config: config
+            }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
 
+            if (!(!isLayerTopo && config.layers.length)) {
               _context.next = 7;
-              return topoDispatchers.setTopoType(TPL_TREE);
-
-            case 7:
-              // 更新配置
-              // resourceConfig.updateConfig(config);
-              // 更新配置对应的资源、链路
-              // editDispatchers.fetchDataByConfig();
-              topo.historyManager.endTransaction();
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+              break;
+            }
+
+            _context.next = 7;
+            return topoDispatchers.setTopoType(TPL_TREE);
+
+          case 7:
+            // 更新配置
+            // resourceConfig.updateConfig(config);
+            // 更新配置对应的资源、链路
+            // editDispatchers.fetchDataByConfig();
+            topo.historyManager.endTransaction();
+
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function onLayerAdded(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var deleteLayer = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layerElement) {
+  var deleteLayer = function deleteLayer(_x2) {
+    return (_ref3 = _ref3 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layerElement) {
       var config;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              topo.historyManager.beginTransaction();
-              emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, layerElement); // 获取资源配置
-
-              config = resourceConfig.getConfigFromHt(topo.getDataModel());
-              rlog.info("deleteLayer", {
-                config: config
-              }); // 如果没有分层，将拓扑类型切换为空白模板
-
-              if (config.layers.length) {
-                _context2.next = 7;
-                break;
-              }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            topo.historyManager.beginTransaction();
+            emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, layerElement); // 获取资源配置
+
+            config = resourceConfig.getConfigFromHt(topo.getDataModel());
+            rlog.info("deleteLayer", {
+              config: config
+            }); // 如果没有分层，将拓扑类型切换为空白模板
 
+            if (config.layers.length) {
               _context2.next = 7;
-              return topoDispatchers.setTopoType(TPL_BLANK);
+              break;
+            }
 
-            case 7:
-              _context2.next = 9;
-              return resourceConfig.updateConfig(config);
+            _context2.next = 7;
+            return topoDispatchers.setTopoType(TPL_BLANK);
 
-            case 9:
-              _context2.next = 11;
-              return editDispatchers.fetchDataByConfig();
+          case 7:
+            _context2.next = 9;
+            return resourceConfig.updateConfig(config);
 
-            case 11:
-              topo.historyManager.endTransaction();
+          case 9:
+            _context2.next = 11;
+            return editDispatchers.fetchDataByConfig();
 
-            case 12:
-            case "end":
-              return _context2.stop();
-          }
+          case 11:
+            topo.historyManager.endTransaction();
+
+          case 12:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-
-    return function deleteLayer(_x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var handleDeleteLayer = function handleDeleteLayer(layerElement) {
+    var _onOk;
+
     var hasChildren = !!layerElement.getChildren().toArray().length;
 
     if (!hasChildren) {
@@ -180,28 +172,20 @@ var useTopoEdit = function useTopoEdit(params) {
       messageProps: {
         type: "warning"
       },
-      onOk: function () {
-        var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      onOk: function onOk() {
+        return (_onOk = _onOk || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
           return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-            while (1) {
-              switch (_context3.prev = _context3.next) {
-                case 0:
-                  deleteLayer(layerElement);
-
-                case 1:
-                case "end":
-                  return _context3.stop();
-              }
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                deleteLayer(layerElement);
+
+              case 1:
+              case "end":
+                return _context3.stop();
             }
           }, _callee3);
-        }));
-
-        function onOk() {
-          return _onOk.apply(this, arguments);
-        }
-
-        return onOk;
-      }()
+        }))).apply(this, arguments);
+      }
     });
   }; // const deleteGroupFooterBtn = () => {
   //   return (
@@ -351,49 +335,43 @@ var useTopoEdit = function useTopoEdit(params) {
   }; // 删除关联在节点上的出口链路
 
 
-  var deleteExLink = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(node) {
+  var deleteExLink = function deleteExLink(_x3) {
+    return (_ref4 = _ref4 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(node) {
       var _node$getEdges$toArra, _node$getEdges;
 
       var config, edges, exportLinkIdList;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
-
-              edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : []; // const exLink = [];
-
-              if (!(edges.length > 0)) {
-                _context4.next = 8;
-                break;
-              }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
 
-              exportLinkIdList = [].concat(config.exportLinkIdList); //console.log("删除关联在节点上的出口链路- edges", edges,exportLinkIdList);
+            edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : []; // const exLink = [];
 
-              edges.map(function (edge) {
-                if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
-                  // exLink.push(edge);
-                  topo.getGraphView().dm().remove(edge);
-                  exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
-                }
-              });
-              config.exportLinkIdList = exportLinkIdList;
+            if (!(edges.length > 0)) {
               _context4.next = 8;
-              return resourceConfig.updateConfig(config);
+              break;
+            }
 
-            case 8:
-            case "end":
-              return _context4.stop();
-          }
+            exportLinkIdList = [].concat(config.exportLinkIdList); //console.log("删除关联在节点上的出口链路- edges", edges,exportLinkIdList);
+
+            edges.map(function (edge) {
+              if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
+                // exLink.push(edge);
+                topo.getGraphView().dm().remove(edge);
+                exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
+              }
+            });
+            config.exportLinkIdList = exportLinkIdList;
+            _context4.next = 8;
+            return resourceConfig.updateConfig(config);
+
+          case 8:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
-    }));
-
-    return function deleteExLink(_x3) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var onDeleteElement = function onDeleteElement(data) {
     var dtype = data.dtype;
@@ -468,93 +446,109 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function bindGroupResources(_x4, _x5) {
-    return _bindGroupResources.apply(this, arguments);
-  }
+    return (_bindGroupResources = _bindGroupResources || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(group, resources) {
+      var id, tag, _yield$editDispatcher, elements, nodeElements, newLinkElements, updateElements;
 
-  function _bindGroupResources() {
-    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(group, resources) {
-      var id, tag, _yield$editDispatcher2, elements, nodeElements, newLinkElements, updateElements;
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            id = group.id, tag = group.tag;
+            rlog.debug("bindGroupResources--id, tag", id, tag);
+            topo.historyManager.beginTransaction();
+            _context5.next = 5;
+            return resourceConfig.updateGroupResources(group, resources);
+
+          case 5:
+            _context5.next = 7;
+            return editDispatchers.fetchDataByConfig();
+
+          case 7:
+            _yield$editDispatcher = _context5.sent;
+            elements = _yield$editDispatcher.elements;
+            // 区域里的子区域及子区域的节点、新增的链路
+            nodeElements = findGroupChildren(elements, group);
+            newLinkElements = findUNExistedLinkElements(elements);
+            updateElements = [].concat(nodeElements, newLinkElements);
+
+            if (updateElements.length) {
+              saveBind(TopoEvent.DATA_TYPE_RESOURCE_CONTAINER, updateElements); // 临时放这里，仅拓扑中心有
 
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-        while (1) {
-          switch (_context10.prev = _context10.next) {
-            case 0:
-              id = group.id, tag = group.tag;
-              rlog.debug("bindGroupResources--id, tag", id, tag);
-              topo.historyManager.beginTransaction();
-              _context10.next = 5;
-              return resourceConfig.updateGroupResources(group, resources);
-
-            case 5:
-              _context10.next = 7;
-              return editDispatchers.fetchDataByConfig();
-
-            case 7:
-              _yield$editDispatcher2 = _context10.sent;
-              elements = _yield$editDispatcher2.elements;
-              // 区域里的子区域及子区域的节点、新增的链路
-              nodeElements = findGroupChildren(elements, group);
-              newLinkElements = findUNExistedLinkElements(elements);
-              updateElements = [].concat(nodeElements, newLinkElements);
-
-              if (updateElements.length) {
-                saveBind(TopoEvent.DATA_TYPE_RESOURCE_CONTAINER, updateElements); // 临时放这里，仅拓扑中心有
-
-                if (topo.linkDynamicStyleExecutor) {
-                  topo.linkDynamicStyleExecutor.execute();
-                }
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
               }
+            }
 
-              topo.historyManager.endTransaction();
+            topo.historyManager.endTransaction();
 
-            case 14:
-            case "end":
-              return _context10.stop();
-          }
+          case 14:
+          case "end":
+            return _context5.stop();
         }
-      }, _callee10);
-    }));
-    return _bindGroupResources.apply(this, arguments);
+      }, _callee5);
+    }))).apply(this, arguments);
   }
 
   function addGroupResources(_x6, _x7) {
-    return _addGroupResources.apply(this, arguments);
+    return (_addGroupResources = _addGroupResources || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(group, newResourceIds) {
+      var groupConfig, resources, groupData;
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            groupConfig = resourceConfig.getGroupConfigByElement(group);
+            resources = {
+              "static": [].concat(groupConfig.resources["static"], newResourceIds)
+            };
+            groupData = {
+              id: group.getTag(),
+              tag: group.a("tag")
+            };
+            _context6.next = 5;
+            return bindGroupResources(groupData, resources);
+
+          case 5:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }))).apply(this, arguments);
   }
   /**
    * 关联视图的资源
    */
 
 
-  function _addGroupResources() {
-    _addGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(group, newResourceIds) {
-      var groupConfig, resources, groupData;
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-        while (1) {
-          switch (_context11.prev = _context11.next) {
-            case 0:
-              groupConfig = resourceConfig.getGroupConfigByElement(group);
-              resources = {
-                "static": [].concat(groupConfig.resources["static"], newResourceIds)
-              };
-              groupData = {
-                id: group.getTag(),
-                tag: group.a("tag")
-              };
-              _context11.next = 5;
-              return bindGroupResources(groupData, resources);
+  function bindViewResources(_x8) {
+    return (_bindViewResources = _bindViewResources || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+      var config, _yield$editDispatcher2, elements;
 
-            case 5:
-            case "end":
-              return _context11.stop();
-          }
-        }
-      }, _callee11);
-    }));
-    return _addGroupResources.apply(this, arguments);
-  }
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            // console.log("关联视图的资源", data);
+            config = resourceConfig.getConfig();
+            config.resources = data;
+            _context7.next = 4;
+            return resourceConfig.updateConfig(config);
+
+          case 4:
+            _context7.next = 6;
+            return editDispatchers.fetchDataByConfig();
+
+          case 6:
+            _yield$editDispatcher2 = _context7.sent;
+            elements = _yield$editDispatcher2.elements;
+            saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
+
+            if (topo.linkDynamicStyleExecutor) {
+              topo.linkDynamicStyleExecutor.execute();
+            }
 
-  function bindViewResources(_x8) {
-    return _bindViewResources.apply(this, arguments);
+          case 10:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    }))).apply(this, arguments);
   }
   /**
    * 分层添加资源
@@ -564,123 +558,68 @@ var useTopoEdit = function useTopoEdit(params) {
    */
 
 
-  function _bindViewResources() {
-    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(data) {
-      var config, result, _elements;
-
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-        while (1) {
-          switch (_context12.prev = _context12.next) {
-            case 0:
-              // console.log("关联视图的资源", data);
-              config = resourceConfig.getConfig();
-              config.resources = data;
-              _context12.next = 4;
-              return resourceConfig.updateConfig(config);
-
-            case 4:
-              _context12.next = 6;
-              return editDispatchers.fetchDataByConfig();
-
-            case 6:
-              result = _context12.sent;
-              console.log("fetchDataByConfig", result);
-
-              if (result) {
-                _elements = result.elements;
-                saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
-
-                if (topo.linkDynamicStyleExecutor) {
-                  topo.linkDynamicStyleExecutor.execute();
-                }
-              }
-
-            case 9:
-            case "end":
-              return _context12.stop();
-          }
-        }
-      }, _callee12);
-    }));
-    return _bindViewResources.apply(this, arguments);
-  }
-
   function addLayerResources(_x9, _x10) {
-    return _addLayerResources.apply(this, arguments);
-  }
-
-  function _addLayerResources() {
-    _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
+    return (_addLayerResources = _addLayerResources || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(group, newResourceIds) {
       var _yield$editDispatcher3, elements, newElements;
 
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
-        while (1) {
-          switch (_context13.prev = _context13.next) {
-            case 0:
-              topo.historyManager.beginTransaction(); // 构造新的配置
-
-              _context13.next = 3;
-              return resourceConfig.addLayerStaticResources(group, newResourceIds);
-
-            case 3:
-              _context13.next = 5;
-              return editDispatchers.fetchDataByConfig();
-
-            case 5:
-              _yield$editDispatcher3 = _context13.sent;
-              elements = _yield$editDispatcher3.elements;
-              // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
-              newElements = findUNExistedElements(elements);
-              rlog.debug("添加分层资源", {
-                layer: group,
-                newElements: newElements
-              });
-              topo.getHtTopo().addElements(newElements); // 临时放这里，仅拓扑中心有
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            topo.historyManager.beginTransaction(); // 构造新的配置
+
+            _context8.next = 3;
+            return resourceConfig.addLayerStaticResources(group, newResourceIds);
+
+          case 3:
+            _context8.next = 5;
+            return editDispatchers.fetchDataByConfig();
+
+          case 5:
+            _yield$editDispatcher3 = _context8.sent;
+            elements = _yield$editDispatcher3.elements;
+            // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
+            newElements = findUNExistedElements(elements);
+            rlog.debug("添加分层资源", {
+              layer: group,
+              newElements: newElements
+            });
+            topo.getHtTopo().addElements(newElements); // 临时放这里，仅拓扑中心有
+
+            if (topo.linkDynamicStyleExecutor) {
+              topo.linkDynamicStyleExecutor.execute();
+            }
 
-              if (topo.linkDynamicStyleExecutor) {
-                topo.linkDynamicStyleExecutor.execute();
-              }
+            topo.historyManager.endTransaction();
+            topo.getHtTopo().getGraphView().fitContent(undefined, undefined, true); // 添加资源后隐藏资源面板
 
-              topo.historyManager.endTransaction();
-              topo.getHtTopo().getGraphView().fitContent(undefined, undefined, true); // 添加资源后隐藏资源面板
+            topoEditDispatchers.update({
+              resourceTabActiveKey: null
+            });
 
-              topoEditDispatchers.update({
-                resourceTabActiveKey: null
-              });
-
-            case 14:
-            case "end":
-              return _context13.stop();
-          }
+          case 14:
+          case "end":
+            return _context8.stop();
         }
-      }, _callee13);
-    }));
-    return _addLayerResources.apply(this, arguments);
+      }, _callee8);
+    }))).apply(this, arguments);
   }
 
   function addResourceToFirstLayer(_x11) {
-    return _addResourceToFirstLayer.apply(this, arguments);
-  }
-
-  function _addResourceToFirstLayer() {
-    _addResourceToFirstLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(data) {
+    return (_addResourceToFirstLayer = _addResourceToFirstLayer || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(data) {
       var group;
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-        while (1) {
-          switch (_context14.prev = _context14.next) {
-            case 0:
-              group = resourceConfig.getGroups()[0];
-              _context14.next = 3;
-              return addLayerResources(group, data);
-
-            case 3:
-            case "end":
-              return _context14.stop();
-          }
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            group = resourceConfig.getGroups()[0];
+            _context9.next = 3;
+            return addLayerResources(group, data);
+
+          case 3:
+          case "end":
+            return _context9.stop();
         }
-      }, _callee14);
-    }));
-    return _addResourceToFirstLayer.apply(this, arguments);
+      }, _callee9);
+    }))).apply(this, arguments);
   }
 
   function getAddResourceType() {
@@ -709,109 +648,91 @@ var useTopoEdit = function useTopoEdit(params) {
    */
 
 
-  var onSaveComboRes = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              rlog.debug("关联资源-----onSaveComboRes", data);
-              topo.historyManager.beginTransaction();
-
-              if (!(getAddResourceType() === "addToFirstLayer")) {
-                _context5.next = 7;
-                break;
-              }
-
-              _context5.next = 5;
-              return addResourceToFirstLayer(data);
+  var onSaveComboRes = function onSaveComboRes(_x12) {
+    return (_ref5 = _ref5 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(data) {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
+          case 0:
+            rlog.debug("关联资源-----onSaveComboRes", data);
+            topo.historyManager.beginTransaction();
 
-            case 5:
-              _context5.next = 9;
+            if (!(getAddResourceType() === "addToFirstLayer")) {
+              _context10.next = 7;
               break;
+            }
 
-            case 7:
-              _context5.next = 9;
-              return bindViewResources(data);
+            _context10.next = 5;
+            return addResourceToFirstLayer(data);
 
-            case 9:
-              topo.historyManager.endTransaction();
-              topo.getHtTopo().fitContent();
-              topoEditDispatchers.update({
-                resourceTabActiveKey: null
-              });
+          case 5:
+            _context10.next = 9;
+            break;
 
-            case 12:
-            case "end":
-              return _context5.stop();
-          }
+          case 7:
+            _context10.next = 9;
+            return bindViewResources(data);
+
+          case 9:
+            topo.historyManager.endTransaction();
+            topo.getHtTopo().fitContent();
+            topoEditDispatchers.update({
+              resourceTabActiveKey: null
+            });
+
+          case 12:
+          case "end":
+            return _context10.stop();
         }
-      }, _callee5);
-    }));
+      }, _callee10);
+    }))).apply(this, arguments);
+  };
 
-    return function onSaveComboRes(_x12) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
+  var onSaveTopo = function onSaveTopo(_x13) {
+    return (_ref6 = _ref6 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(data) {
+      var id, config, serialize, _config$layout, template, layout, _ref7, saveConfig;
 
-  var onSaveTopo = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
-      var id, config, serialize, _config$layout, template, layout, saveConfig;
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
+          case 0:
+            id = data.id, config = data.config, serialize = data.serialize;
+            _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
+
+            if (onSave) {
+              // 自定义保存
+              saveConfig = function saveConfig() {
+                return (_ref7 = _ref7 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+                  return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+                    while (1) switch (_context11.prev = _context11.next) {
+                      case 0:
+                        _context11.next = 2;
+                        return editDispatchers.saveTopo({
+                          id: id,
+                          layout: layout,
+                          serialize: serialize
+                        });
+
+                      case 2:
+                      case "end":
+                        return _context11.stop();
+                    }
+                  }, _callee11);
+                }))).apply(this, arguments);
+              };
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) {
-          switch (_context7.prev = _context7.next) {
-            case 0:
-              id = data.id, config = data.config, serialize = data.serialize;
-              _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
-
-              if (onSave) {
-                // 自定义保存
-                saveConfig = /*#__PURE__*/function () {
-                  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-                    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-                      while (1) {
-                        switch (_context6.prev = _context6.next) {
-                          case 0:
-                            _context6.next = 2;
-                            return editDispatchers.saveTopo({
-                              id: id,
-                              layout: layout,
-                              serialize: serialize
-                            });
-
-                          case 2:
-                          case "end":
-                            return _context6.stop();
-                        }
-                      }
-                    }, _callee6);
-                  }));
-
-                  return function saveConfig() {
-                    return _ref7.apply(this, arguments);
-                  };
-                }();
-
-                onSave({
-                  topo: topo,
-                  data: data,
-                  saveConfig: saveConfig
-                });
-              }
+              onSave({
+                topo: topo,
+                data: data,
+                saveConfig: saveConfig
+              });
+            }
 
-            case 3:
-            case "end":
-              return _context7.stop();
-          }
+          case 3:
+          case "end":
+            return _context12.stop();
         }
-      }, _callee7);
-    }));
-
-    return function onSaveTopo(_x13) {
-      return _ref6.apply(this, arguments);
-    };
-  }();
+      }, _callee12);
+    }))).apply(this, arguments);
+  };
 
   var saveBind = function saveBind(type, data) {
     var eventData = {
@@ -834,285 +755,266 @@ var useTopoEdit = function useTopoEdit(params) {
    */
 
 
-  var bindNodeResource = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(params) {
-      var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, doBind, _doBind, replaceOrAddRes;
+  var bindNodeResource = function bindNodeResource(_x14) {
+    return (_ref8 = _ref8 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(params) {
+      var _doBind;
 
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-        while (1) {
-          switch (_context9.prev = _context9.next) {
-            case 0:
-              replaceOrAddRes = function _replaceOrAddRes(resources, oldResId, newResId) {
-                return _extends({}, resources, {
-                  "static": [].concat(resources["static"].filter(function (item) {
-                    return item !== oldResId;
-                  }), [newResId])
-                });
-              };
+      var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher4, elements, newData, doBind, replaceOrAddRes;
 
-              _doBind = function _doBind3() {
-                _doBind = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
-                  var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
-                  return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-                    while (1) {
-                      switch (_context8.prev = _context8.next) {
-                        case 0:
-                          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);
-                            });
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
+          case 0:
+            replaceOrAddRes = function _replaceOrAddRes(resources, oldResId, newResId) {
+              return _extends({}, resources, {
+                "static": [].concat(resources["static"].filter(function (item) {
+                  return item !== oldResId;
+                }), [newResId])
+              });
+            };
+
+            doBind = function _doBind2() {
+              return (_doBind = _doBind || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+                var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
+                return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+                  while (1) switch (_context13.prev = _context13.next) {
+                    case 0:
+                      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 {
-                            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);
+                            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); // 恢复图标、大小、位置
+                      rlog.debug("批量创建元素", createElementsData); // 恢复图标、大小、位置
 
-                          newElement = dm.getDataByTag(newData.id);
+                      newElement = dm.getDataByTag(newData.id);
 
-                          if (newElement) {
-                            newElement.setSize(node.getSize());
-                            newElement.setPosition(node.getPosition());
-                            newElement.setImage(node.getImage());
-                          } // 选中
+                      if (newElement) {
+                        newElement.setSize(node.getSize());
+                        newElement.setPosition(node.getPosition());
+                        newElement.setImage(node.getImage());
+                      } // 选中
 
 
-                          sm = htTopo.getGraphView().sm();
-                          sm.setSelection([newElement]); // 移除旧节点
+                      sm = htTopo.getGraphView().sm();
+                      sm.setSelection([newElement]); // 移除旧节点
 
-                          dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
-                          // node.a("customName", null);
-                          // 删除关联在节点上的出口链路
+                      dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
+                      // node.a("customName", null);
+                      // 删除关联在节点上的出口链路
 
-                          _context8.next = 12;
-                          return deleteExLink(node);
+                      _context13.next = 12;
+                      return deleteExLink(node);
 
-                        case 12:
-                          // 临时放这里，仅拓扑中心有
-                          if (topo.linkDynamicStyleExecutor) {
-                            topo.linkDynamicStyleExecutor.execute();
-                          }
-
-                        case 13:
-                        case "end":
-                          return _context8.stop();
+                    case 12:
+                      // 临时放这里，仅拓扑中心有
+                      if (topo.linkDynamicStyleExecutor) {
+                        topo.linkDynamicStyleExecutor.execute();
                       }
-                    }
-                  }, _callee8);
-                }));
-                return _doBind.apply(this, arguments);
-              };
 
-              doBind = function _doBind2() {
-                return _doBind.apply(this, arguments);
-              };
+                    case 13:
+                    case "end":
+                      return _context13.stop();
+                  }
+                }, _callee13);
+              }))).apply(this, arguments);
+            };
 
-              topo.historyManager.beginTransaction();
-              id = params.id, oldResId = params.oldResId, newResId = params.newResId;
-              rlog.debug("bindNodeResource", params);
-              node = topo.getDataModel().getDataById(id); // 节点所属容器
+            topo.historyManager.beginTransaction();
+            id = params.id, oldResId = params.oldResId, newResId = params.newResId;
+            rlog.debug("bindNodeResource", params);
+            node = topo.getDataModel().getDataById(id); // 节点所属容器
 
-              parentGroupElement = node.getParent();
-              htTopo = topo.getHtTopo();
-              config = resourceConfig.getConfig();
+            parentGroupElement = node.getParent();
+            htTopo = topo.getHtTopo();
+            config = resourceConfig.getConfig();
 
-              if (parentGroupElement) {
-                // 在容器中
-                groupId = parentGroupElement.getTag(); // 容器业务id
+            if (parentGroupElement) {
+              // 在容器中
+              groupId = parentGroupElement.getTag(); // 容器业务id
 
-                groupTag = parentGroupElement.a("tag"); // 容器临时id
+              groupTag = parentGroupElement.a("tag"); // 容器临时id
 
-                config.groups = config.groups.map(function (g) {
-                  // 匹配到容器，替换资源或增加
-                  if (g.id === groupId || g.tag === groupTag) {
-                    return _extends({}, g, {
-                      resources: replaceOrAddRes(g.resources, oldResId, newResId)
-                    });
-                  } // 未匹配到容器
+              config.groups = config.groups.map(function (g) {
+                // 匹配到容器，替换资源或增加
+                if (g.id === groupId || g.tag === groupTag) {
+                  return _extends({}, g, {
+                    resources: replaceOrAddRes(g.resources, oldResId, newResId)
+                  });
+                } // 未匹配到容器
 
 
-                  return g;
-                });
-              } else {
-                // 在画布上
-                config.resources = replaceOrAddRes(config.resources, oldResId, newResId);
-              }
+                return g;
+              });
+            } else {
+              // 在画布上
+              config.resources = replaceOrAddRes(config.resources, oldResId, newResId);
+            }
 
-              _context9.next = 13;
-              return resourceConfig.updateConfig(config);
+            _context14.next = 12;
+            return resourceConfig.updateConfig(config);
 
-            case 13:
-              _context9.next = 15;
-              return editDispatchers.fetchDataByConfig();
+          case 12:
+            _context14.next = 14;
+            return editDispatchers.fetchDataByConfig();
 
-            case 15:
-              _yield$editDispatcher = _context9.sent;
-              elements = _yield$editDispatcher.elements;
-              newData = elements.find(function (item) {
-                return item.id === newResId;
-              });
+          case 14:
+            _yield$editDispatcher4 = _context14.sent;
+            elements = _yield$editDispatcher4.elements;
+            newData = elements.find(function (item) {
+              return item.id === newResId;
+            });
 
-              if (newData) {
-                _context9.next = 23;
-                break;
-              }
+            if (newData) {
+              _context14.next = 22;
+              break;
+            }
 
-              _Message.error("关联资源失败");
+            _Message.error("关联资源失败");
 
-              rlog.warn("关联资源失败");
-              topo.historyManager.endTransaction();
-              return _context9.abrupt("return", false);
+            rlog.warn("关联资源失败");
+            topo.historyManager.endTransaction();
+            return _context14.abrupt("return", false);
 
-            case 23:
-              _context9.next = 25;
-              return doBind();
+          case 22:
+            _context14.next = 24;
+            return doBind();
 
-            case 25:
-              topo.historyManager.endTransaction();
+          case 24:
+            topo.historyManager.endTransaction();
 
-            case 26:
-            case "end":
-              return _context9.stop();
-          }
+          case 25:
+          case "end":
+            return _context14.stop();
         }
-      }, _callee9);
-    }));
-
-    return function bindNodeResource(_x14) {
-      return _ref8.apply(this, arguments);
-    };
-  }();
+      }, _callee14);
+    }))).apply(this, arguments);
+  };
   /**
    * 关联IP的图片节点
    */
 
 
   function relateNodeIp(_x15, _x16) {
-    return _relateNodeIp.apply(this, arguments);
-  }
-
-  function _relateNodeIp() {
-    _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(txtValue, nodeElement) {
-      var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
+    return (_relateNodeIp = _relateNodeIp || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(txtValue, nodeElement) {
+      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-        while (1) {
-          switch (_context15.prev = _context15.next) {
-            case 0:
-              if (txtValue) {
-                _context15.next = 2;
-                break;
-              }
-
-              return _context15.abrupt("return");
-
-            case 2:
-              // if (txtValue === nodeElement.a('bindIp')) {
-              //   return;
-              // }
-              // 根据配置查询拓扑数据
-              dm = topo.getDataModel(); // 执行唯一性验证
-
-              isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
-
-              if (!isUnique) {
-                _context15.next = 24;
-                break;
-              }
-
-              ip = buildIpNode(txtValue);
-              _context15.next = 8;
-              return deleteExLink(nodeElement);
-
-            case 8:
-              nodeElement.a(ip);
-              nodeElement.setName(txtValue);
-              nodeElement.setTag("ip:" + txtValue); // 获取配置
-
-              configObj = topo.resourceConfig.getConfig();
-              _context15.next = 14;
-              return resourceConfig.updateConfig(configObj);
+        while (1) switch (_context15.prev = _context15.next) {
+          case 0:
+            if (txtValue) {
+              _context15.next = 2;
+              break;
+            }
 
-            case 14:
-              _context15.next = 16;
-              return editDispatchers.fetchDataByConfig();
+            return _context15.abrupt("return");
 
-            case 16:
-              configData = _context15.sent;
-              // console.log("configData",configObj, configData);
-              _elements2 = configData.elements;
-              newLinkElements = findUNExistedLinkElements(_elements2); // console.log("configData", configData, newLinkElements);
+          case 2:
+            // if (txtValue === nodeElement.a('bindIp')) {
+            //   return;
+            // }
+            // 根据配置查询拓扑数据
+            dm = topo.getDataModel(); // 执行唯一性验证
 
-              newLink = newLinkElements.filter(function (item) {
-                return item.type === "link";
-              });
-              newLinkGroup = newLinkElements.filter(function (item) {
-                return item.type === "linkGroup";
-              }); // const newData = elements.find((item) => item.id === `ip:${txtValue}`);
-              // console.log("newData",newLinkElements, newLink);
-
-              createElementsData = {
-                groups: [],
-                nodes: [],
-                links: newLink,
-                linkGroups: newLinkGroup
-              };
-              console.log("createElementsData", createElementsData);
+            isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
-              if ([].concat(newLink, newLinkGroup).length > 0) {
-                _htTopo = topo.getHtTopo();
+            if (!isUnique) {
+              _context15.next = 23;
+              break;
+            }
 
-                _htTopo.createElements(createElementsData);
-              }
+            ip = buildIpNode(txtValue);
+            _context15.next = 8;
+            return deleteExLink(nodeElement);
+
+          case 8:
+            nodeElement.a(ip);
+            nodeElement.setName(txtValue);
+            nodeElement.setTag("ip:" + txtValue); // 获取配置
+
+            configObj = topo.resourceConfig.getConfig();
+            _context15.next = 14;
+            return resourceConfig.updateConfig(configObj);
+
+          case 14:
+            _context15.next = 16;
+            return editDispatchers.fetchDataByConfig();
+
+          case 16:
+            configData = _context15.sent;
+            // console.log("configData",configObj, configData);
+            _elements = configData.elements;
+            newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
+
+            newLink = newLinkElements.filter(function (item) {
+              return item.type === "link";
+            });
+            newLinkGroup = newLinkElements.filter(function (item) {
+              return item.type === "linkGroup";
+            }); // const newData = elements.find((item) => item.id === `ip:${txtValue}`);
+            // console.log("newData",newLinkElements, newLink);
+
+            createElementsData = {
+              groups: [],
+              nodes: [],
+              links: newLink,
+              linkGroups: newLinkGroup
+            }; // console.log("createElementsData", createElementsData);
+
+            if ([].concat(newLink, newLinkGroup).length > 0) {
+              _htTopo = topo.getHtTopo();
+
+              _htTopo.createElements(createElementsData);
+            }
 
-            case 24:
-            case "end":
-              return _context15.stop();
-          }
+          case 23:
+          case "end":
+            return _context15.stop();
         }
       }, _callee15);
-    }));
-    return _relateNodeIp.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   var onEvent = function onEvent(e) {