@riil-frontend/component-topology 11.0.30 → 11.0.31

package/lib/core/hooks/useTopoEdit.js

@@ -106,36 +106,38 @@ var useTopoEdit = function useTopoEdit(params) {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
       var target, direction, config;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            target = _ref.target, direction = _ref.direction;
-            topo.historyManager.beginTransaction(); // 从拓扑图获取分层和资源配置
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              target = _ref.target, direction = _ref.direction;
+              topo.historyManager.beginTransaction(); // 从拓扑图获取分层和资源配置
 
-            config = resourceConfig.getConfigFromHt(topo.getDataModel());
+              config = resourceConfig.getConfigFromHt(topo.getDataModel());
 
-            _rlog["default"].info("onLayerAdd", {
-              config: config
-            }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
+              _rlog["default"].info("onLayerAdd", {
+                config: config
+              }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
 
 
-            if (!(!isLayerTopo && config.layers.length)) {
-              _context.next = 7;
-              break;
-            }
-
-            _context.next = 7;
-            return topoDispatchers.setTopoType(_template.TPL_TREE);
-
-          case 7:
-            // 更新配置
-            // resourceConfig.updateConfig(config);
-            // 更新配置对应的资源、链路
-            // editDispatchers.fetchDataByConfig();
-            topo.historyManager.endTransaction();
+              if (!(!isLayerTopo && config.layers.length)) {
+                _context.next = 7;
+                break;
+              }
 
-          case 8:
-          case "end":
-            return _context.stop();
+              _context.next = 7;
+              return topoDispatchers.setTopoType(_template.TPL_TREE);
+
+            case 7:
+              // 更新配置
+              // resourceConfig.updateConfig(config);
+              // 更新配置对应的资源、链路
+              // editDispatchers.fetchDataByConfig();
+              topo.historyManager.endTransaction();
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));
@@ -149,40 +151,42 @@ var useTopoEdit = function useTopoEdit(params) {
     var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(layerElement) {
       var config;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            topo.historyManager.beginTransaction();
-            emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, layerElement); // 获取资源配置
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              topo.historyManager.beginTransaction();
+              emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, layerElement); // 获取资源配置
 
-            config = resourceConfig.getConfigFromHt(topo.getDataModel());
+              config = resourceConfig.getConfigFromHt(topo.getDataModel());
 
-            _rlog["default"].info("deleteLayer", {
-              config: config
-            }); // 如果没有分层，将拓扑类型切换为空白模板
+              _rlog["default"].info("deleteLayer", {
+                config: config
+              }); // 如果没有分层，将拓扑类型切换为空白模板
 
 
-            if (config.layers.length) {
-              _context2.next = 7;
-              break;
-            }
+              if (config.layers.length) {
+                _context2.next = 7;
+                break;
+              }
 
-            _context2.next = 7;
-            return topoDispatchers.setTopoType(_template.TPL_BLANK);
+              _context2.next = 7;
+              return topoDispatchers.setTopoType(_template.TPL_BLANK);
 
-          case 7:
-            _context2.next = 9;
-            return resourceConfig.updateConfig(config);
+            case 7:
+              _context2.next = 9;
+              return resourceConfig.updateConfig(config);
 
-          case 9:
-            _context2.next = 11;
-            return editDispatchers.fetchDataByConfig();
+            case 9:
+              _context2.next = 11;
+              return editDispatchers.fetchDataByConfig();
 
-          case 11:
-            topo.historyManager.endTransaction();
+            case 11:
+              topo.historyManager.endTransaction();
 
-          case 12:
-          case "end":
-            return _context2.stop();
+            case 12:
+            case "end":
+              return _context2.stop();
+          }
         }
       }, _callee2);
     }));
@@ -213,13 +217,15 @@ var useTopoEdit = function useTopoEdit(params) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
           return _regenerator["default"].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);
         }));
@@ -385,33 +391,35 @@ var useTopoEdit = function useTopoEdit(params) {
 
       var config, edges, exportLinkIdList;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
+        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 = [];
+              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;
-            }
+              if (!(edges.length > 0)) {
+                _context4.next = 8;
+                break;
+              }
 
-            exportLinkIdList = [].concat(config.exportLinkIdList); //console.log("删除关联在节点上的出口链路- edges", edges,exportLinkIdList);
+              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();
+              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);
     }));
@@ -503,41 +511,43 @@ var useTopoEdit = function useTopoEdit(params) {
       var id, tag, _yield$editDispatcher2, elements, nodeElements, newLinkElements, updateElements;
 
       return _regenerator["default"].wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            id = group.id, tag = group.tag;
-
-            _rlog["default"].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 = (0, _topoData.findGroupChildren)(elements, group);
-            newLinkElements = findUNExistedLinkElements(elements);
-            updateElements = [].concat(nodeElements, newLinkElements);
-
-            if (updateElements.length) {
-              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_CONTAINER, updateElements); // 临时放这里，仅拓扑中心有
-
-              if (topo.linkDynamicStyleExecutor) {
-                topo.linkDynamicStyleExecutor.execute();
+        while (1) {
+          switch (_context10.prev = _context10.next) {
+            case 0:
+              id = group.id, tag = group.tag;
+
+              _rlog["default"].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 = (0, _topoData.findGroupChildren)(elements, group);
+              newLinkElements = findUNExistedLinkElements(elements);
+              updateElements = [].concat(nodeElements, newLinkElements);
+
+              if (updateElements.length) {
+                saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_CONTAINER, updateElements); // 临时放这里，仅拓扑中心有
+
+                if (topo.linkDynamicStyleExecutor) {
+                  topo.linkDynamicStyleExecutor.execute();
+                }
               }
-            }
 
-            topo.historyManager.endTransaction();
+              topo.historyManager.endTransaction();
 
-          case 14:
-          case "end":
-            return _context10.stop();
+            case 14:
+            case "end":
+              return _context10.stop();
+          }
         }
       }, _callee10);
     }));
@@ -556,22 +566,24 @@ var useTopoEdit = function useTopoEdit(params) {
     _addGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(group, newResourceIds) {
       var groupConfig, resources, groupData;
       return _regenerator["default"].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);
-
-          case 5:
-          case "end":
-            return _context11.stop();
+        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);
+
+            case 5:
+            case "end":
+              return _context11.stop();
+          }
         }
       }, _callee11);
     }));
@@ -591,33 +603,39 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindViewResources() {
     _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(data) {
-      var config, _yield$editDispatcher3, elements;
+      var config, result, _elements;
 
       return _regenerator["default"].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:
-            _yield$editDispatcher3 = _context12.sent;
-            elements = _yield$editDispatcher3.elements;
-            saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
-
-            if (topo.linkDynamicStyleExecutor) {
-              topo.linkDynamicStyleExecutor.execute();
-            }
+        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(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
+
+                if (topo.linkDynamicStyleExecutor) {
+                  topo.linkDynamicStyleExecutor.execute();
+                }
+              }
 
-          case 10:
-          case "end":
-            return _context12.stop();
+            case 9:
+            case "end":
+              return _context12.stop();
+          }
         }
       }, _callee12);
     }));
@@ -630,47 +648,49 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, newElements;
+      var _yield$editDispatcher3, elements, newElements;
 
       return _regenerator["default"].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$editDispatcher4 = _context13.sent;
-            elements = _yield$editDispatcher4.elements;
-            // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
-            newElements = findUNExistedElements(elements);
-
-            _rlog["default"].debug("添加分层资源", {
-              layer: group,
-              newElements: newElements
-            });
+        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["default"].debug("添加分层资源", {
+                layer: group,
+                newElements: newElements
+              });
 
-            topo.getHtTopo().addElements(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 _context13.stop();
+          }
         }
       }, _callee13);
     }));
@@ -685,15 +705,17 @@ var useTopoEdit = function useTopoEdit(params) {
     _addResourceToFirstLayer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(data) {
       var group;
       return _regenerator["default"].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();
+        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();
+          }
         }
       }, _callee14);
     }));
@@ -729,38 +751,40 @@ var useTopoEdit = function useTopoEdit(params) {
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data) {
       return _regenerator["default"].wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            _rlog["default"].debug("关联资源-----onSaveComboRes", data);
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _rlog["default"].debug("关联资源-----onSaveComboRes", data);
 
-            topo.historyManager.beginTransaction();
+              topo.historyManager.beginTransaction();
 
-            if (!(getAddResourceType() === "addToFirstLayer")) {
-              _context5.next = 7;
-              break;
-            }
+              if (!(getAddResourceType() === "addToFirstLayer")) {
+                _context5.next = 7;
+                break;
+              }
 
-            _context5.next = 5;
-            return addResourceToFirstLayer(data);
+              _context5.next = 5;
+              return addResourceToFirstLayer(data);
 
-          case 5:
-            _context5.next = 9;
-            break;
+            case 5:
+              _context5.next = 9;
+              break;
 
-          case 7:
-            _context5.next = 9;
-            return bindViewResources(data);
+            case 7:
+              _context5.next = 9;
+              return bindViewResources(data);
 
-          case 9:
-            topo.historyManager.endTransaction();
-            topo.getHtTopo().fitContent();
-            topoEditDispatchers.update({
-              resourceTabActiveKey: null
-            });
+            case 9:
+              topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
+              topoEditDispatchers.update({
+                resourceTabActiveKey: null
+              });
 
-          case 12:
-          case "end":
-            return _context5.stop();
+            case 12:
+            case "end":
+              return _context5.stop();
+          }
         }
       }, _callee5);
     }));
@@ -775,47 +799,51 @@ var useTopoEdit = function useTopoEdit(params) {
       var id, config, serialize, _config$layout, template, layout, saveConfig;
 
       return _regenerator["default"].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 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-                  return _regenerator["default"].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
-              });
-            }
+        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 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+                    return _regenerator["default"].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
+                });
+              }
 
-          case 3:
-          case "end":
-            return _context7.stop();
+            case 3:
+            case "end":
+              return _context7.stop();
+          }
         }
       }, _callee7);
     }));
@@ -853,181 +881,185 @@ var useTopoEdit = function useTopoEdit(params) {
       var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, doBind, _doBind, replaceOrAddRes;
 
       return _regenerator["default"].wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            replaceOrAddRes = function _replaceOrAddRes(resources, oldResId, newResId) {
-              return (0, _extends2["default"])({}, resources, {
-                "static": [].concat(resources["static"].filter(function (item) {
-                  return item !== oldResId;
-                }), [newResId])
-              });
-            };
-
-            _doBind = function _doBind3() {
-              _doBind = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
-                var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
-                return _regenerator["default"].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 = (0, _topoData.findGroupChildren)(elements, newData);
-                        newGroupChildren = [];
-                        existedGroupChildren = [];
-                        groupChildren.forEach(function (groupChildData) {
-                          var ele = dm.getDataByTag(groupChildData.id);
-
-                          if (ele) {
-                            existedGroupChildren.push(groupChildData);
+        while (1) {
+          switch (_context9.prev = _context9.next) {
+            case 0:
+              replaceOrAddRes = function _replaceOrAddRes(resources, oldResId, newResId) {
+                return (0, _extends2["default"])({}, resources, {
+                  "static": [].concat(resources["static"].filter(function (item) {
+                    return item !== oldResId;
+                  }), [newResId])
+                });
+              };
+
+              _doBind = function _doBind3() {
+                _doBind = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+                  var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
+                  return _regenerator["default"].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 = (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 {
-                            newGroupChildren.push(groupChildData);
+                            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);
                           }
-                        });
-                        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); // 恢复图标、大小、位置
+                          _rlog["default"].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);
+                          _context8.next = 12;
+                          return deleteExLink(node);
 
-                    case 12:
-                      // 临时放这里，仅拓扑中心有
-                      if (topo.linkDynamicStyleExecutor) {
-                        topo.linkDynamicStyleExecutor.execute();
-                      }
+                        case 12:
+                          // 临时放这里，仅拓扑中心有
+                          if (topo.linkDynamicStyleExecutor) {
+                            topo.linkDynamicStyleExecutor.execute();
+                          }
 
-                    case 13:
-                    case "end":
-                      return _context8.stop();
-                  }
-                }, _callee8);
-              }));
-              return _doBind.apply(this, arguments);
-            };
+                        case 13:
+                        case "end":
+                          return _context8.stop();
+                      }
+                    }
+                  }, _callee8);
+                }));
+                return _doBind.apply(this, arguments);
+              };
 
-            doBind = function _doBind2() {
-              return _doBind.apply(this, arguments);
-            };
+              doBind = function _doBind2() {
+                return _doBind.apply(this, arguments);
+              };
 
-            topo.historyManager.beginTransaction();
-            id = params.id, oldResId = params.oldResId, newResId = params.newResId;
+              topo.historyManager.beginTransaction();
+              id = params.id, oldResId = params.oldResId, newResId = params.newResId;
 
-            _rlog["default"].debug("bindNodeResource", params);
+              _rlog["default"].debug("bindNodeResource", params);
 
-            node = topo.getDataModel().getDataById(id); // 节点所属容器
+              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 (0, _extends2["default"])({}, g, {
-                    resources: replaceOrAddRes(g.resources, oldResId, newResId)
-                  });
-                } // 未匹配到容器
+                config.groups = config.groups.map(function (g) {
+                  // 匹配到容器，替换资源或增加
+                  if (g.id === groupId || g.tag === groupTag) {
+                    return (0, _extends2["default"])({}, 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);
+              _context9.next = 13;
+              return resourceConfig.updateConfig(config);
 
-          case 13:
-            _context9.next = 15;
-            return editDispatchers.fetchDataByConfig();
+            case 13:
+              _context9.next = 15;
+              return editDispatchers.fetchDataByConfig();
 
-          case 15:
-            _yield$editDispatcher = _context9.sent;
-            elements = _yield$editDispatcher.elements;
-            newData = elements.find(function (item) {
-              return item.id === newResId;
-            });
+            case 15:
+              _yield$editDispatcher = _context9.sent;
+              elements = _yield$editDispatcher.elements;
+              newData = elements.find(function (item) {
+                return item.id === newResId;
+              });
 
-            if (newData) {
-              _context9.next = 23;
-              break;
-            }
+              if (newData) {
+                _context9.next = 23;
+                break;
+              }
 
-            _message["default"].error("关联资源失败");
+              _message["default"].error("关联资源失败");
 
-            _rlog["default"].warn("关联资源失败");
+              _rlog["default"].warn("关联资源失败");
 
-            topo.historyManager.endTransaction();
-            return _context9.abrupt("return", false);
+              topo.historyManager.endTransaction();
+              return _context9.abrupt("return", false);
 
-          case 23:
-            _context9.next = 25;
-            return doBind();
+            case 23:
+              _context9.next = 25;
+              return doBind();
 
-          case 25:
-            topo.historyManager.endTransaction();
+            case 25:
+              topo.historyManager.endTransaction();
 
-          case 26:
-          case "end":
-            return _context9.stop();
+            case 26:
+            case "end":
+              return _context9.stop();
+          }
         }
       }, _callee9);
     }));
@@ -1047,79 +1079,82 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(txtValue, nodeElement) {
-      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
+      var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regenerator["default"].wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
-          case 0:
-            if (txtValue) {
-              _context15.next = 2;
-              break;
-            }
+        while (1) {
+          switch (_context15.prev = _context15.next) {
+            case 0:
+              if (txtValue) {
+                _context15.next = 2;
+                break;
+              }
 
-            return _context15.abrupt("return");
+              return _context15.abrupt("return");
 
-          case 2:
-            // if (txtValue === nodeElement.a('bindIp')) {
-            //   return;
-            // }
-            // 根据配置查询拓扑数据
-            dm = topo.getDataModel(); // 执行唯一性验证
+            case 2:
+              // if (txtValue === nodeElement.a('bindIp')) {
+              //   return;
+              // }
+              // 根据配置查询拓扑数据
+              dm = topo.getDataModel(); // 执行唯一性验证
 
-            isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
+              isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
 
-            if (!isUnique) {
-              _context15.next = 23;
-              break;
-            }
+              if (!isUnique) {
+                _context15.next = 24;
+                break;
+              }
 
-            ip = (0, _exitLinkUtil.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);
-            }
+              ip = (0, _exitLinkUtil.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 23:
-          case "end":
-            return _context15.stop();
+            case 14:
+              _context15.next = 16;
+              return editDispatchers.fetchDataByConfig();
+
+            case 16:
+              configData = _context15.sent;
+              // console.log("configData",configObj, configData);
+              _elements2 = configData.elements;
+              newLinkElements = findUNExistedLinkElements(_elements2); // 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();
+          }
         }
       }, _callee15);
     }));