@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/es/core/hooks/useTopoEdit.js

@@ -87,43 +87,95 @@ var useTopoEdit = function useTopoEdit(params) {
     setShowComboResDrawer(true);
   };
 
-  var onLayerAdded = function onLayerAdded(_ref2) {
-    var target = _ref2.target,
-        direction = _ref2.direction;
-    // 从拓扑图获取分层和资源配置
-    var config = resourceConfig.getConfigFromHt(topo.getDataModel());
-    rlog.info("onLayerAdd", {
-      config: config
-    }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
-
-    if (!isLayerTopo && config.layers.length) {
-      topoDispatchers.setTopoType(TPL_TREE);
-    } // 更新配置
-    // resourceConfig.updateConfig(config);
-    // 更新配置对应的资源、链路
-    // editDispatchers.fetchDataByConfig();
+  var onLayerAdded = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
+      var target, direction, config;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              target = _ref2.target, direction = _ref2.direction;
+              topo.historyManager.beginTransaction(); // 从拓扑图获取分层和资源配置
 
-  };
+              config = resourceConfig.getConfigFromHt(topo.getDataModel());
+              rlog.info("onLayerAdd", {
+                config: config
+              }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
 
-  var deleteLayer = function deleteLayer(layerElement) {
-    topo.historyManager.beginTransaction();
-    emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, layerElement); // 获取资源配置
+              if (!(!isLayerTopo && config.layers.length)) {
+                _context2.next = 7;
+                break;
+              }
 
-    var config = resourceConfig.getConfigFromHt(topo.getDataModel());
-    rlog.info("deleteLayer", {
-      config: config
-    }); // 如果没有分层，将拓扑类型切换为空白模板
+              _context2.next = 7;
+              return topoDispatchers.setTopoType(TPL_TREE);
 
-    if (!config.layers.length) {
-      topoDispatchers.setTopoType(TPL_BLANK);
-    } // 更新配置
+            case 7:
+              // 更新配置
+              // resourceConfig.updateConfig(config);
+              // 更新配置对应的资源、链路
+              // editDispatchers.fetchDataByConfig();
+              topo.historyManager.endTransaction();
 
+            case 8:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
 
-    resourceConfig.updateConfig(config); // 更新配置对应的资源、链路
+    return function onLayerAdded(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
 
-    editDispatchers.fetchDataByConfig();
-    topo.historyManager.endTransaction();
-  };
+  var deleteLayer = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(layerElement) {
+      var config;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.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) {
+                _context3.next = 7;
+                break;
+              }
+
+              _context3.next = 7;
+              return topoDispatchers.setTopoType(TPL_BLANK);
+
+            case 7:
+              _context3.next = 9;
+              return resourceConfig.updateConfig(config);
+
+            case 9:
+              _context3.next = 11;
+              return editDispatchers.fetchDataByConfig();
+
+            case 11:
+              topo.historyManager.endTransaction();
+
+            case 12:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function deleteLayer(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
 
   var handleDeleteLayer = function handleDeleteLayer(layerElement) {
     var hasChildren = !!layerElement.getChildren().toArray().length;
@@ -144,19 +196,19 @@ var useTopoEdit = function useTopoEdit(params) {
         type: "warning"
       },
       onOk: function () {
-        var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+          return _regeneratorRuntime.wrap(function _callee4$(_context4) {
             while (1) {
-              switch (_context2.prev = _context2.next) {
+              switch (_context4.prev = _context4.next) {
                 case 0:
                   deleteLayer(layerElement);
 
                 case 1:
                 case "end":
-                  return _context2.stop();
+                  return _context4.stop();
               }
             }
-          }, _callee2);
+          }, _callee4);
         }));
 
         function onOk() {
@@ -202,19 +254,19 @@ var useTopoEdit = function useTopoEdit(params) {
         type: "warning"
       },
       onOk: function () {
-        var _onOk2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        var _onOk2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
             while (1) {
-              switch (_context3.prev = _context3.next) {
+              switch (_context5.prev = _context5.next) {
                 case 0:
                   doDelete();
 
                 case 1:
                 case "end":
-                  return _context3.stop();
+                  return _context5.stop();
               }
             }
-          }, _callee3);
+          }, _callee5);
         }));
 
         function onOk() {
@@ -309,20 +361,20 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   var deleteExLink = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(node) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(node) {
       var _node$getEdges$toArra, _node$getEdges;
 
       var config, edges, exportLinkIdList;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context6.prev = _context6.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;
+                _context6.next = 8;
                 break;
               }
 
@@ -336,19 +388,19 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               });
               config.exportLinkIdList = exportLinkIdList;
-              _context4.next = 8;
+              _context6.next = 8;
               return resourceConfig.updateConfig(config);
 
             case 8:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
         }
-      }, _callee4);
+      }, _callee6);
     }));
 
-    return function deleteExLink(_x) {
-      return _ref3.apply(this, arguments);
+    return function deleteExLink(_x3) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -410,29 +462,29 @@ var useTopoEdit = function useTopoEdit(params) {
    */
 
 
-  function bindGroupResources(_x2, _x3) {
+  function bindGroupResources(_x4, _x5) {
     return _bindGroupResources.apply(this, arguments);
   }
 
   function _bindGroupResources() {
-    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(group, resources) {
+    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(group, resources) {
       var id, tag, _yield$editDispatcher2, elements, nodeElements, newLinkElements, updateElements;
 
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
               id = group.id, tag = group.tag;
               rlog.debug("bindGroupResources--id, tag", id, tag);
-              _context10.next = 4;
+              _context12.next = 4;
               return resourceConfig.updateGroupResources(group, resources);
 
             case 4:
-              _context10.next = 6;
+              _context12.next = 6;
               return editDispatchers.fetchDataByConfig();
 
             case 6:
-              _yield$editDispatcher2 = _context10.sent;
+              _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
               nodeElements = findGroupChildren(elements, group);
@@ -449,15 +501,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 12:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
         }
-      }, _callee10);
+      }, _callee12);
     }));
     return _bindGroupResources.apply(this, arguments);
   }
 
-  function addGroupResources(_x4, _x5) {
+  function addGroupResources(_x6, _x7) {
     return _addGroupResources.apply(this, arguments);
   }
   /**
@@ -466,11 +518,11 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _addGroupResources() {
-    _addGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(group, newResourceIds) {
+    _addGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
       var groupConfig, resources, groupData;
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
               groupConfig = resourceConfig.getGroupConfigByElement(group);
               resources = {
@@ -480,20 +532,20 @@ var useTopoEdit = function useTopoEdit(params) {
                 id: group.getTag(),
                 tag: group.a("tag")
               };
-              _context11.next = 5;
+              _context13.next = 5;
               return bindGroupResources(groupData, resources, newResourceIds);
 
             case 5:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
         }
-      }, _callee11);
+      }, _callee13);
     }));
     return _addGroupResources.apply(this, arguments);
   }
 
-  function bindViewResources(_x6) {
+  function bindViewResources(_x8) {
     return _bindViewResources.apply(this, arguments);
   }
   /**
@@ -505,25 +557,25 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _bindViewResources() {
-    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(data) {
+    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(data) {
       var config, _yield$editDispatcher3, elements;
 
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
               console.log("关联视图的资源", data);
               config = resourceConfig.getConfig();
               config.resources = data;
-              _context12.next = 5;
+              _context14.next = 5;
               return resourceConfig.updateConfig(config);
 
             case 5:
-              _context12.next = 7;
+              _context14.next = 7;
               return editDispatchers.fetchDataByConfig();
 
             case 7:
-              _yield$editDispatcher3 = _context12.sent;
+              _yield$editDispatcher3 = _context14.sent;
               elements = _yield$editDispatcher3.elements;
               saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
 
@@ -533,35 +585,37 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 11:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
         }
-      }, _callee12);
+      }, _callee14);
     }));
     return _bindViewResources.apply(this, arguments);
   }
 
-  function addLayerResources(_x7, _x8) {
+  function addLayerResources(_x9, _x10) {
     return _addLayerResources.apply(this, arguments);
   }
 
   function _addLayerResources() {
-    _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
+    _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(group, newResourceIds) {
       var _yield$editDispatcher4, elements, data;
 
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) {
-          switch (_context13.prev = _context13.next) {
+          switch (_context15.prev = _context15.next) {
             case 0:
-              _context13.next = 2;
+              topo.historyManager.beginTransaction(); // 构造新的配置
+
+              _context15.next = 3;
               return resourceConfig.addLayerStaticResources(group, newResourceIds);
 
-            case 2:
-              _context13.next = 4;
+            case 3:
+              _context15.next = 5;
               return editDispatchers.fetchDataByConfig();
 
-            case 4:
-              _yield$editDispatcher4 = _context13.sent;
+            case 5:
+              _yield$editDispatcher4 = _context15.sent;
               elements = _yield$editDispatcher4.elements;
               // 过滤出新增的资源和链路
               data = {
@@ -576,46 +630,48 @@ var useTopoEdit = function useTopoEdit(params) {
                 })
               }; // 添加到分层
 
-              _context13.next = 9;
+              _context15.next = 10;
               return topo.updateElements(data);
 
-            case 9:
+            case 10:
               // 临时放这里，仅拓扑中心有
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-            case 10:
+              topo.historyManager.endTransaction();
+
+            case 12:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
         }
-      }, _callee13);
+      }, _callee15);
     }));
     return _addLayerResources.apply(this, arguments);
   }
 
-  function addResourceToFirstLayer(_x9) {
+  function addResourceToFirstLayer(_x11) {
     return _addResourceToFirstLayer.apply(this, arguments);
   }
 
   function _addResourceToFirstLayer() {
-    _addResourceToFirstLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(data) {
+    _addResourceToFirstLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(data) {
       var group;
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
         while (1) {
-          switch (_context14.prev = _context14.next) {
+          switch (_context16.prev = _context16.next) {
             case 0:
               group = resourceConfig.getGroups()[0];
-              _context14.next = 3;
+              _context16.next = 3;
               return addLayerResources(group, data);
 
             case 3:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
         }
-      }, _callee14);
+      }, _callee16);
     }));
     return _addResourceToFirstLayer.apply(this, arguments);
   }
@@ -641,28 +697,28 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   var onSaveComboRes = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               rlog.debug("关联资源-----onSaveComboRes", data);
               topo.historyManager.beginTransaction();
 
               if (!(getAddResourceType() === "addToFirstLayer")) {
-                _context5.next = 7;
+                _context7.next = 7;
                 break;
               }
 
-              _context5.next = 5;
+              _context7.next = 5;
               return addResourceToFirstLayer(data);
 
             case 5:
-              _context5.next = 9;
+              _context7.next = 9;
               break;
 
             case 7:
-              _context5.next = 9;
+              _context7.next = 9;
               return bindViewResources(data);
 
             case 9:
@@ -670,43 +726,43 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 10:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
         }
-      }, _callee5);
+      }, _callee7);
     }));
 
-    return function onSaveComboRes(_x10) {
-      return _ref4.apply(this, arguments);
+    return function onSaveComboRes(_x12) {
+      return _ref6.apply(this, arguments);
     };
   }();
 
-  function checkSavePermission(_x11) {
+  function checkSavePermission(_x13) {
     return _checkSavePermission.apply(this, arguments);
   }
 
   function _checkSavePermission() {
-    _checkSavePermission = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(id) {
+    _checkSavePermission = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(id) {
       var permission;
-      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+      return _regeneratorRuntime.wrap(function _callee17$(_context17) {
         while (1) {
-          switch (_context15.prev = _context15.next) {
+          switch (_context17.prev = _context17.next) {
             case 0:
-              _context15.next = 2;
+              _context17.next = 2;
               return topoDispatchers.getTopoPermission({
                 id: id,
                 update: false
               });
 
             case 2:
-              permission = _context15.sent;
+              permission = _context17.sent;
 
               if (!topoPermissonUtil.isEditable(permission)) {
-                _context15.next = 5;
+                _context17.next = 5;
                 break;
               }
 
-              return _context15.abrupt("return", true);
+              return _context17.abrupt("return", true);
 
             case 5:
               _Dialog.alert({
@@ -718,42 +774,42 @@ var useTopoEdit = function useTopoEdit(params) {
                 onOk: function onOk() {}
               });
 
-              return _context15.abrupt("return", false);
+              return _context17.abrupt("return", false);
 
             case 7:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
         }
-      }, _callee15);
+      }, _callee17);
     }));
     return _checkSavePermission.apply(this, arguments);
   }
 
   var onSaveTopo = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(data) {
       var id, config, serialize, _config$layout, template, layout, saveConfig, valid, saveData;
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context9.prev = _context9.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) {
-                _context7.next = 6;
+                _context9.next = 6;
                 break;
               }
 
               // 自定义保存
               saveConfig = /*#__PURE__*/function () {
-                var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-                  return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+                var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+                  return _regeneratorRuntime.wrap(function _callee8$(_context8) {
                     while (1) {
-                      switch (_context6.prev = _context6.next) {
+                      switch (_context8.prev = _context8.next) {
                         case 0:
-                          _context6.next = 2;
+                          _context8.next = 2;
                           return editDispatchers.saveTopo({
                             id: id,
                             layout: layout,
@@ -762,14 +818,14 @@ var useTopoEdit = function useTopoEdit(params) {
 
                         case 2:
                         case "end":
-                          return _context6.stop();
+                          return _context8.stop();
                       }
                     }
-                  }, _callee6);
+                  }, _callee8);
                 }));
 
                 return function saveConfig() {
-                  return _ref6.apply(this, arguments);
+                  return _ref8.apply(this, arguments);
                 };
               }();
 
@@ -777,7 +833,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 data: data,
                 saveConfig: saveConfig
               });
-              return _context7.abrupt("return");
+              return _context9.abrupt("return");
 
             case 6:
               // TODO 以下逻辑移到拓扑中心
@@ -785,21 +841,21 @@ var useTopoEdit = function useTopoEdit(params) {
                 saving: true
               }); // 检查权限
 
-              _context7.next = 9;
+              _context9.next = 9;
               return checkSavePermission(id);
 
             case 9:
-              valid = _context7.sent;
+              valid = _context9.sent;
 
               if (valid) {
-                _context7.next = 13;
+                _context9.next = 13;
                 break;
               }
 
               topoEditDispatchers.update({
                 saving: false
               });
-              return _context7.abrupt("return");
+              return _context9.abrupt("return");
 
             case 13:
               // 保存
@@ -809,7 +865,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 serialize: serialize
               }, resourceConfig.getConfig());
               rlog.info("保存", saveData);
-              _context7.next = 17;
+              _context9.next = 17;
               return editDispatchers.saveTopo(saveData);
 
             case 17:
@@ -821,14 +877,14 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 19:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
         }
-      }, _callee7);
+      }, _callee9);
     }));
 
-    return function onSaveTopo(_x12) {
-      return _ref5.apply(this, arguments);
+    return function onSaveTopo(_x14) {
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -854,12 +910,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   var bindNodeResource = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(params) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(params) {
       var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, doBind, _doBind, replaceOrAddRes;
 
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
               replaceOrAddRes = function _replaceOrAddRes(resources, oldResId, newResId) {
                 return _extends({}, resources, {
@@ -870,11 +926,11 @@ var useTopoEdit = function useTopoEdit(params) {
               };
 
               _doBind = function _doBind3() {
-                _doBind = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+                _doBind = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
                   var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
-                  return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+                  return _regeneratorRuntime.wrap(function _callee10$(_context10) {
                     while (1) {
-                      switch (_context8.prev = _context8.next) {
+                      switch (_context10.prev = _context10.next) {
                         case 0:
                           dm = htTopo.getGraphView().dm(); // 创建
 
@@ -943,7 +999,7 @@ var useTopoEdit = function useTopoEdit(params) {
                           // node.a("customName", null);
                           // 删除关联在节点上的出口链路
 
-                          _context8.next = 12;
+                          _context10.next = 12;
                           return deleteExLink(node);
 
                         case 12:
@@ -954,10 +1010,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
                         case 13:
                         case "end":
-                          return _context8.stop();
+                          return _context10.stop();
                       }
                     }
-                  }, _callee8);
+                  }, _callee10);
                 }));
                 return _doBind.apply(this, arguments);
               };
@@ -966,6 +1022,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 return _doBind.apply(this, arguments);
               };
 
+              topo.historyManager.beginTransaction();
               id = params.id, oldResId = params.oldResId, newResId = params.newResId;
               rlog.debug("bindNodeResource", params);
               node = topo.getDataModel().getDataById(id); // 节点所属容器
@@ -996,48 +1053,48 @@ var useTopoEdit = function useTopoEdit(params) {
                 config.resources = replaceOrAddRes(config.resources, oldResId, newResId);
               }
 
-              _context9.next = 12;
+              _context11.next = 13;
               return resourceConfig.updateConfig(config);
 
-            case 12:
-              _context9.next = 14;
+            case 13:
+              _context11.next = 15;
               return editDispatchers.fetchDataByConfig();
 
-            case 14:
-              _yield$editDispatcher = _context9.sent;
+            case 15:
+              _yield$editDispatcher = _context11.sent;
               elements = _yield$editDispatcher.elements;
               newData = elements.find(function (item) {
                 return item.id === newResId;
               });
 
               if (newData) {
-                _context9.next = 21;
+                _context11.next = 23;
                 break;
               }
 
               _Message.error("关联资源失败");
 
               rlog.warn("关联资源失败");
-              return _context9.abrupt("return", false);
+              topo.historyManager.endTransaction();
+              return _context11.abrupt("return", false);
 
-            case 21:
-              topo.historyManager.beginTransaction();
-              _context9.next = 24;
+            case 23:
+              _context11.next = 25;
               return doBind();
 
-            case 24:
+            case 25:
               topo.historyManager.endTransaction();
 
-            case 25:
+            case 26:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
         }
-      }, _callee9);
+      }, _callee11);
     }));
 
-    return function bindNodeResource(_x13) {
-      return _ref7.apply(this, arguments);
+    return function bindNodeResource(_x15) {
+      return _ref9.apply(this, arguments);
     };
   }();