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

package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -19,8 +19,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
@@ -39,7 +37,7 @@ var _linkUtils = require("../../../../../../core/models/utils/linkUtils");
 
 var _htElementUtils = require("../../../../../../utils/htElementUtils");
 
-var _topoData = require("../../../../../../utils/topoData");
+var _useAddLink2 = _interopRequireDefault(require("./hooks/useAddLink"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -50,18 +48,14 @@ function AddLinkDrawer(props) {
       lineData = props.lineData;
   var store = topo.store;
 
-  var _topo$store$useModel = topo.store.useModel("topoMod"),
+  var _topo$store$useModel = topo.store.useModel('topoMod'),
       topoState = _topo$store$useModel[0],
       topoDispatchers = _topo$store$useModel[1];
 
-  var _store$useModel = store.useModel("topoConfig"),
+  var _store$useModel = store.useModel('topoConfig'),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];
 
-  var _store$useModel2 = store.useModel("topoLinkMod"),
-      linkState = _store$useModel2[0],
-      linkDispatchers = _store$useModel2[1];
-
   var addLinkIsOpen = editState.addLinkIsOpen,
       currentLink = editState.currentLink;
 
@@ -78,28 +72,27 @@ function AddLinkDrawer(props) {
       setLoading = _useState3[1];
 
   var _useState4 = (0, _react.useState)(false),
-      loadingConnectableNodes = _useState4[0],
-      setLoadingConnectableNodes = _useState4[1];
+      loadingFormData = _useState4[0],
+      setLoadingFormData = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(false),
-      loadingFormData = _useState5[0],
-      setLoadingFormData = _useState5[1];
+  var _useState5 = (0, _react.useState)(),
+      sourceIFDoc = _useState5[0],
+      setSourceIFDoc = _useState5[1];
 
   var _useState6 = (0, _react.useState)(),
-      sourceIFDoc = _useState6[0],
-      setSourceIFDoc = _useState6[1];
-
-  var _useState7 = (0, _react.useState)(),
-      targetIFDoc = _useState7[0],
-      setTargetIFDoc = _useState7[1]; // 保存后更新拓扑图状态
-
+      targetIFDoc = _useState6[0],
+      setTargetIFDoc = _useState6[1]; // 保存后更新拓扑图状态
 
-  var _useState8 = (0, _react.useState)([]),
-      ciIdsConnectable = _useState8[0],
-      setCiIdsConnectable = _useState8[1];
 
   var linkNodesRef = (0, _react.useRef)();
 
+  var _useAddLink = (0, _useAddLink2["default"])({
+    topo: topo
+  }),
+      enterAddLinkMode = _useAddLink.enterAddLinkMode,
+      resetConnectableNodes = _useAddLink.resetConnectableNodes,
+      loadingConnectableNodes = _useAddLink.loadingConnectableNodes;
+
   var getPortsById = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id, currentLink) {
       var result, links, ifTypes, ifDoc, usedPorts, portsDoc, ports;
@@ -107,7 +100,7 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              console.log("getPortsById", id, currentLink);
+              console.log('getPortsById', id, currentLink);
 
               if (id) {
                 _context.next = 3;
@@ -159,12 +152,14 @@ function AddLinkDrawer(props) {
                   value: item.id,
                   label: item.name,
                   type: item.type,
-                  typeName: (_ifDoc$item$type$disp = (_ifDoc$item$type = ifDoc[item.type]) === null || _ifDoc$item$type === void 0 ? void 0 : _ifDoc$item$type.displayName) !== null && _ifDoc$item$type$disp !== void 0 ? _ifDoc$item$type$disp : "",
+                  typeName: (_ifDoc$item$type$disp = (_ifDoc$item$type = ifDoc[item.type]) === null || _ifDoc$item$type === void 0 ? void 0 : _ifDoc$item$type.displayName) !== null && _ifDoc$item$type$disp !== void 0 ? _ifDoc$item$type$disp : '',
                   disabled: usedPorts.indexOf(item.id) >= 0,
                   ratedBandwidth: parseInt(item.ratedBandwidth, 10)
                 };
                 portsDoc[item.id] = obj;
                 return obj;
+              }).filter(function (item) {
+                return !item.disabled;
               });
               return _context.abrupt("return", {
                 ports: ports,
@@ -189,98 +184,96 @@ function AddLinkDrawer(props) {
    */
 
 
-  var handleEvent = /*#__PURE__*/function () {
+  var handleSelectTargetNodeEvent = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(e) {
-      var sourcePorts, targetPorts, source, target, targetDisableCreatePhyAggLink, connect_type;
+      var sourcePorts, targetPorts, source, target;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              linkNodesRef.current = e; // const { type, data } = e;
-
-              _rlog["default"].debug("接到打开创建链路抽屉信息", e);
+              resetConnectableNodes();
+              linkNodesRef.current = e;
 
-              setIsAddMode(true); // setTrue();
+              _rlog["default"].debug('接到打开创建链路抽屉信息', e);
 
+              setIsAddMode(true);
               setLoadingFormData(true);
-              _context2.prev = 4;
-              _context2.next = 7;
+              _context2.prev = 5;
+              _context2.next = 8;
               return getPortsById(e.source._attrObject.id);
 
-            case 7:
+            case 8:
               sourcePorts = _context2.sent;
-              _context2.next = 10;
+              _context2.next = 11;
               return getPortsById(e.target._attrObject.id);
 
-            case 10:
+            case 11:
               targetPorts = _context2.sent;
               setSourceIFDoc(sourcePorts.portsDoc);
               setTargetIFDoc(targetPorts.portsDoc);
               source = translationNode(e.source, sourcePorts);
               target = translationNode(e.target, targetPorts);
-              targetDisableCreatePhyAggLink = !target.ciData || !(target.ciData.permission.writeable || target.ciData.permission.deleteable);
               editDispatchers.update({
                 addLinkIsOpen: true,
                 currentLink: null
               });
-              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 && !targetDisableCreatePhyAggLink ? "phy" : "exit";
               setLink({
                 source: source,
                 target: target,
                 attributes: {
-                  "network_link.destination_ipv4 ": target.ipAddress,
-                  destination_id: "",
-                  source_type: "",
-                  display_name: "",
-                  destination_type: "",
-                  "network_link.source_ipv4 ": source.ipAddress,
-                  name: "",
-                  source_id: "",
-                  "network_link.source_device_id": source.id,
-                  "network_link.destination_device_id": target.id,
-                  "network_link.actual_bandwidth": null,
-                  connect_type: connect_type
+                  display_name: '',
+                  name: '',
+                  source_id: '',
+                  source_type: '',
+                  'network_link.source_device_id': source.id,
+                  'network_link.source_device_ipv4': source.ipAddress,
+                  destination_id: '',
+                  destination_type: '',
+                  'network_link.destination_device_id': target.id,
+                  'network_link.destination_device_ipv4': target.ipAddress,
+                  'network_link.actual_bandwidth': null
                 }
               });
-              _context2.next = 24;
+              _context2.next = 23;
               break;
 
-            case 21:
-              _context2.prev = 21;
-              _context2.t0 = _context2["catch"](4);
+            case 20:
+              _context2.prev = 20;
+              _context2.t0 = _context2["catch"](5);
 
-              _rlog["default"].error("出现异常", _context2.t0);
+              _rlog["default"].error('出现异常', _context2.t0);
 
-            case 24:
+            case 23:
               setLoadingFormData(false);
 
-            case 25:
+            case 24:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[4, 21]]);
+      }, _callee2, null, [[5, 20]]);
     }));
 
-    return function handleEvent(_x3) {
+    return function handleSelectTargetNodeEvent(_x3) {
       return _ref2.apply(this, arguments);
     };
   }();
 
-  var selectedSourceNodeHandleEvent = function selectedSourceNodeHandleEvent(e) {
+  var handleSelectSourceNodeEvent = function handleSelectSourceNodeEvent(e) {
     // rlog.debug("设置了起始节点", e);
-    //const allData = topo.getData();
+    topo.historyManager.setDisabled(true);
     var enableNodes = (0, _htElementUtils.getNodes)(topo.getDataModel());
-    topo.view.topoClient.emitEvent("topo_link_set_connectable_nodes", enableNodes.filter(function (ele) {
+    topo.view.topoClient.emitEvent('topo_link_set_connectable_nodes', enableNodes.filter(function (ele) {
       return !((0, _htElementUtils.isGroup)(ele) && !ele.a('ciType'));
     }));
+    topo.historyManager.setDisabled(false);
   };
 
   var initEditLineData = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var _currentLink$attribut, _sourcePorts$ports, _currentLink$attribut2, _targetPorts$ports;
 
-      var sourcePorts, targetPorts, connect_type;
+      var sourcePorts, targetPorts;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -297,14 +290,12 @@ function AddLinkDrawer(props) {
               targetPorts = _context3.sent;
               setSourceIFDoc(sourcePorts.portsDoc);
               setTargetIFDoc(targetPorts.portsDoc);
-              connect_type = currentLink.attributes["network_link.connect_type"] === "exit" ? "exit" : "phy";
               setLink({
                 source: {
                   ciData: topo.dataModel.getDataById(currentLink.source),
                   id: currentLink.source,
-                  name: currentLink.attributes["network_link.source_device_id_object"].displayName,
-                  ciId: currentLink.attributes["network_link.source_device_id"],
-                  ipAddress: currentLink.attributes["network_link.source_ipv4"],
+                  name: currentLink.attributes['network_link.source_device_id_object'].displayName,
+                  ciId: currentLink.attributes['network_link.source_device_id'],
                   ciName: (_currentLink$attribut = currentLink.attributes.source_type_object) === null || _currentLink$attribut === void 0 ? void 0 : _currentLink$attribut.displayName,
                   ciType: currentLink.attributes.source_type,
                   interfaceSource: currentLink.interfaceSource,
@@ -314,22 +305,20 @@ function AddLinkDrawer(props) {
                 target: {
                   ciData: topo.dataModel.getDataById(currentLink.target),
                   id: currentLink.target,
-                  name: currentLink.attributes["network_link.destination_device_id_object"].displayName,
-                  ciId: currentLink.attributes["network_link.destination_device_id"],
-                  ipAddress: currentLink.attributes["network_link.destination_ipv4"],
+                  name: currentLink.attributes['network_link.destination_device_id_object'].displayName,
+                  ciId: currentLink.attributes['network_link.destination_device_id'],
                   ciName: (_currentLink$attribut2 = currentLink.attributes.destination_type_object) === null || _currentLink$attribut2 === void 0 ? void 0 : _currentLink$attribut2.displayName,
-                  ciType: currentLink.target !== "" ? currentLink.attributes.destination_type : "customNode",
+                  ciType: currentLink.target !== '' ? currentLink.attributes.destination_type : 'customNode',
                   interfaceTarget: currentLink.interfaceTarget,
                   ports: (_targetPorts$ports = targetPorts.ports) !== null && _targetPorts$ports !== void 0 ? _targetPorts$ports : [],
                   portsDoc: targetPorts.portsDoc
                 },
                 attributes: (0, _extends2["default"])({}, currentLink.attributes, {
-                  linkId: currentLink.id,
-                  connect_type: connect_type
+                  linkId: currentLink.id
                 })
               });
 
-            case 10:
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -353,90 +342,22 @@ function AddLinkDrawer(props) {
     if (!addLinkIsOpen) {
       setLink(null);
     }
-  }, [addLinkIsOpen]);
-
-  var getCiTypesConnectable = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-      var ciNodes, ciTypes, ciTypesConnectable, nodes, ciIds, isWriteable;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              ciNodes = [];
-              setLoadingConnectableNodes(true);
-              _context4.prev = 2;
-              ciTypes = (0, _topoData.getCiTypes)(topo.dataModel.getData());
-              _context4.next = 6;
-              return _topo["default"].networkLink.getCiTypesConnectable(ciTypes);
-
-            case 6:
-              ciTypesConnectable = _context4.sent;
-              nodes = (0, _htElementUtils.getNodes)(topo.getDataModel());
-              ciIds = [];
-
-              isWriteable = function isWriteable(node) {
-                var _node$a;
-
-                return ["delete", "write"].indexOf(node.a("operation")) >= 0 || ((_node$a = node.a('permission')) === null || _node$a === void 0 ? void 0 : _node$a.writeable);
-              };
-
-              nodes.forEach(function (node) {
-                // rlog.debug("过滤属性", node.a("operation"));
-                if (ciTypesConnectable[node.a("ciType")] && isWriteable(node)) {
-                  ciIds.push(node.id);
-                  ciNodes.push(node);
-                }
-              });
-              linkDispatchers.update({
-                ciConnectable: ciIds
-              });
-              setCiIdsConnectable(ciIds);
-              _context4.next = 18;
-              break;
-
-            case 15:
-              _context4.prev = 15;
-              _context4.t0 = _context4["catch"](2);
-
-              _rlog["default"].error('查询可创建链路节点失败', _context4.t0);
-
-            case 18:
-              setLoadingConnectableNodes(false);
-              return _context4.abrupt("return", ciNodes);
-
-            case 20:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4, null, [[2, 15]]);
-    }));
-
-    return function getCiTypesConnectable() {
-      return _ref4.apply(this, arguments);
-    };
-  }(); // 注册事件
-
+  }, [addLinkIsOpen]); // 注册事件
 
   (0, _react.useEffect)(function () {
     var notifier = topo.view.topoClient.notifier; // rlog.debug("注册事件");
-    // 进入划线模式，置灰不可用的节点
+    // 进入链路模式
 
-    var enterHandleEvent = function enterHandleEvent() {
-      getCiTypesConnectable().then(function (ciNodes) {
-        // rlog.debug("设置可连线节点", ciIdsConnectable, ciNodes);
-        topo.view.topoClient.emitEvent("topo_link_set_connectable_nodes", ciNodes);
-      });
-    };
+    notifier.on(_event["default"].TOPO_LINK_ENTER_CREATE_MODE, enterAddLinkMode); // 选择第一个节点
 
-    notifier.on(_event["default"].TOPO_LINK_ENTER_CREATE_MODE, enterHandleEvent);
-    notifier.on(_event["default"].TOPO_LINK_CREATED, handleEvent);
-    notifier.on(_event["default"].TOPO_LINK_SELECT_SOURCE_NODE, selectedSourceNodeHandleEvent);
+    notifier.on(_event["default"].TOPO_LINK_SELECT_SOURCE_NODE, handleSelectSourceNodeEvent); // 选择第二个节点
+
+    notifier.on(_event["default"].TOPO_LINK_CREATED, handleSelectTargetNodeEvent);
     return function () {
       // 取消注册事件
       // rlog.debug("取消注册事件");
-      notifier.off(_event["default"].TOPO_LINK_ENTER_CREATE_MODE, enterHandleEvent);
-      notifier.off(_event["default"].TOPO_LINK_CREATED, handleEvent);
+      notifier.off(_event["default"].TOPO_LINK_ENTER_CREATE_MODE, enterAddLinkMode);
+      notifier.off(_event["default"].TOPO_LINK_CREATED, handleSelectTargetNodeEvent);
     };
   }, []);
 
@@ -451,7 +372,7 @@ function AddLinkDrawer(props) {
       ciId: attrObject.id,
       ipAddress: attrObject.ipAddress,
       ciName: (_topo$ciTyeCache$getC = (_topo$ciTyeCache$getC2 = topo.ciTyeCache.getCiType(attrObject.ciType)) === null || _topo$ciTyeCache$getC2 === void 0 ? void 0 : _topo$ciTyeCache$getC2.displayName) !== null && _topo$ciTyeCache$getC !== void 0 ? _topo$ciTyeCache$getC : attrObject.customName,
-      ciType: (_attrObject$ciType = attrObject.ciType) !== null && _attrObject$ciType !== void 0 ? _attrObject$ciType : "customNode",
+      ciType: (_attrObject$ciType = attrObject.ciType) !== null && _attrObject$ciType !== void 0 ? _attrObject$ciType : 'customNode',
       ports: (_Ports$ports = Ports.ports) !== null && _Ports$ports !== void 0 ? _Ports$ports : [],
       portsDoc: Ports.portsDoc
     };
@@ -466,10 +387,10 @@ function AddLinkDrawer(props) {
     });
   };
 
-  var addLinkToGraph = function addLinkToGraph(_ref5) {
-    var linkData = _ref5.linkData,
-        linkType = _ref5.linkType,
-        targetName = _ref5.targetName;
+  var addLinkToGraph = function addLinkToGraph(_ref4) {
+    var linkData = _ref4.linkData,
+        isExportLink = _ref4.isExportLink,
+        targetName = _ref4.targetName;
     var htTopo = topo.getHtTopo();
     var _linkNodesRef$current = linkNodesRef.current,
         source = _linkNodesRef$current.source,
@@ -478,8 +399,9 @@ function AddLinkDrawer(props) {
     try {
       // 获取两个节点间的连线数据列表
       var edgesInNodes = (0, _htElementUtils.getEdgesBetweenNodes)(source, target);
+      var _isGroup = false; // linkType === "agg"
 
-      if (linkType === "agg") {
+      if (_isGroup) {
         // 聚合链路
         if (edgesInNodes.length === 0) {
           htTopo.createEdge(source, target, linkData);
@@ -493,9 +415,9 @@ function AddLinkDrawer(props) {
         // 有连线组无子连线时，设置连线数据，切换到连线并选中
         var edge = htTopo.createEdge(source, target, linkData);
 
-        if (linkType === "exit" && target.getTag() === undefined) {
+        if (isExportLink && target.getTag() === undefined) {
           // rlog.debug("addLinkToGraph-export-target", target, target.getTag());
-          target.a("name", targetName);
+          target.a('name', targetName);
         }
 
         htTopo.toggleEdgeGroup(source, target, true);
@@ -503,30 +425,30 @@ function AddLinkDrawer(props) {
 
       topo.getGraphView().dm().sm().ss(topo.getDataModel().getDataByTag(linkData.id));
     } catch (error) {
-      _rlog["default"].error("addLinkToGraph", error);
+      _rlog["default"].error('addLinkToGraph', error);
     }
   };
 
-  var mergeExportLinkData = function mergeExportLinkData(data, attributes) {
+  var mergeExportLinkData = function mergeExportLinkData(data, attributes, linkFormAttributes) {
     var _sourceIFDoc$data$sou, _targetIFDoc$data$des;
 
     // console.log("mergeExportLinkData", data, attributes);
     return (0, _extends2["default"])({}, attributes, {
       id: data.id,
       name: data.name,
-      source: data["network_link.source_device_id"],
-      target: data["network_link.destination_device_id"],
+      source: data['network_link.source_device_id'],
+      target: data['network_link.destination_device_id'],
       operation: data.operation,
-      interfaceSource: data["source_id"],
-      interfaceTarget: data["destination_id"],
+      interfaceSource: data['source_id'],
+      interfaceTarget: data['destination_id'],
       ciType: data.ciType,
-      attributes: (0, _extends2["default"])({}, attributes.attributes, {
+      attributes: (0, _extends2["default"])({}, attributes.attributes, linkFormAttributes, {
         display_name: data.display_name,
         name: data.name,
-        "network_link.actual_bandwidth": data["network_link.actual_bandwidth"],
-        "network_link.connect_type": data["network_link.connect_type"],
-        "network_link.destination_ipv4": data["network_link.destination_ipv4"],
-        "network_link.source_device_id": data["network_link.source_device_id"],
+        'network_link.actual_bandwidth': data['network_link.actual_bandwidth'],
+        'network_link.connect_type': data['network_link.connect_type'],
+        'network_link.destination_ipv4': data['network_link.destination_ipv4'],
+        'network_link.source_device_id': data['network_link.source_device_id'],
         source_id: data.source_id,
         support_templates: data.support_templates,
         use: data.use,
@@ -541,12 +463,12 @@ function AddLinkDrawer(props) {
   };
 
   var onSave = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data) {
-      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData, _config, _yield$editDispatcher2, _elements;
+    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data) {
+      var parm, result, config, isExportLink, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData, _config, _yield$editDispatcher2, _elements;
 
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               //editDispatchers.update({ addLinkIsOpen: false });
               // console.log("保存链路信息", isAddMode, data);
@@ -557,77 +479,80 @@ function AddLinkDrawer(props) {
               result = null;
 
               if (!isAddMode) {
-                _context5.next = 9;
+                _context4.next = 9;
                 break;
               }
 
-              _context5.next = 6;
+              _context4.next = 6;
               return _server["default"].addLink(parm);
 
             case 6:
-              result = _context5.sent;
-              _context5.next = 13;
+              result = _context4.sent;
+              _context4.next = 13;
               break;
 
             case 9:
               parm.id = currentLink.id;
-              _context5.next = 12;
+              _context4.next = 12;
               return _server["default"].editLink(parm);
 
             case 12:
-              result = _context5.sent;
+              result = _context4.sent;
 
             case 13:
-              setLoading(false);
-              linkType = data["network_link.connect_type"];
-              _context5.prev = 15;
+              topo.historyManager.setDisabled(true, '保存链路');
+              _context4.prev = 14;
 
               if (!result) {
-                _context5.next = 55;
+                _context4.next = 59;
                 break;
               }
 
-              config = topo.resourceConfig.getConfigFromHt(); // 新建后显示到图上
+              config = topo.resourceConfig.getConfigFromHt();
+              isExportLink = !data['network_link.destination_device_id']; // 新建后显示到图上
 
               if (!isAddMode) {
-                _context5.next = 31;
+                _context4.next = 33;
                 break;
               }
 
               exportLinkIdList = config.exportLinkIdList;
 
-              if (data["network_link.connect_type"] === "exit") {
+              if (isExportLink) {
                 exportLinkIdList.push(result);
               }
 
-              topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
+              _context4.next = 23;
+              return topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
                 exportLinkIdList: exportLinkIdList
-              })); // const linkType = data["network_link.connect_type"];
+              }));
 
-              _context5.next = 24;
+            case 23:
+              _context4.next = 25;
               return editDispatchers.fetchDataByConfig();
 
-            case 24:
-              _yield$editDispatcher = _context5.sent;
+            case 25:
+              _yield$editDispatcher = _context4.sent;
               elements = _yield$editDispatcher.elements;
               linkData = elements.find(function (element) {
                 return element.id === result;
               }); // console.log("创建成功-parm,linkData", parm, linkData);
 
+              topo.historyManager.setDisabled(true, '保存链路');
               addLinkToGraph({
                 linkData: (0, _copyUtil.clone)(linkData),
-                linkType: linkType,
-                targetName: data["network_link.destination_ipv4"]
+                isExportLink: isExportLink,
+                targetName: data['network_link.destination_ipv4']
               });
 
-              _message["default"].success("创建成功");
+              _message["default"].success('创建成功');
 
-              _context5.next = 53;
+              _context4.next = 56;
               break;
 
-            case 31:
-              if (!(linkType === "exit")) {
-                _context5.next = 46;
+            case 33:
+              if (!isExportLink) {
+                _context4.next = 49;
                 break;
               }
 
@@ -637,65 +562,77 @@ function AddLinkDrawer(props) {
               target = edge.getTarget();
 
               if (target.getTag() === undefined) {
-                target.a("name", data["network_link.destination_ipv4"]);
+                target.a('name', data['network_link.destination_ipv4']);
               }
 
               links = topoState.data.links;
               linkAttrKey = links.findIndex(function (item) {
                 return item.id === aobj.id;
               });
-              newLinkData = mergeExportLinkData(edge.getAttrObject(), links[linkAttrKey]);
+              newLinkData = mergeExportLinkData(edge.getAttrObject(), links[linkAttrKey], data);
               newLinks = (0, _copyUtil.clone)(links);
               newLinks.splice(linkAttrKey, 1, newLinkData);
               newData = (0, _extends2["default"])({}, topoState.data, {
                 links: newLinks
               });
-              topoDispatchers.update({
+              _context4.next = 47;
+              return topoDispatchers.update({
                 data: newData
               });
-              _context5.next = 52;
+
+            case 47:
+              _context4.next = 55;
               break;
 
-            case 46:
+            case 49:
               _config = topo.resourceConfig.getConfigFromHt();
               topo.resourceConfig.updateConfig(_config);
-              _context5.next = 50;
+              _context4.next = 53;
               return editDispatchers.fetchDataByConfig();
 
-            case 50:
-              _yield$editDispatcher2 = _context5.sent;
+            case 53:
+              _yield$editDispatcher2 = _context4.sent;
               _elements = _yield$editDispatcher2.elements;
 
-            case 52:
-              _message["default"].success("保存成功");
+            case 55:
+              _message["default"].success('保存成功');
 
-            case 53:
-              editDispatchers.update({
+            case 56:
+              _context4.next = 58;
+              return editDispatchers.update({
                 addLinkIsOpen: false,
                 currentLink: null
               });
+
+            case 58:
               topo.linkDynamicStyleExecutor.execute();
 
-            case 55:
-              _context5.next = 60;
+            case 59:
+              _context4.next = 65;
               break;
 
-            case 57:
-              _context5.prev = 57;
-              _context5.t0 = _context5["catch"](15);
+            case 61:
+              _context4.prev = 61;
+              _context4.t0 = _context4["catch"](14);
+
+              _message["default"].error('保存失败');
 
-              _rlog["default"].debug("保存链路信息异常", _context5.t0);
+              _rlog["default"].error('保存链路信息异常', _context4.t0);
 
-            case 60:
+            case 65:
+              setLoading(false);
+              topo.historyManager.setDisabled(false, '保存链路');
+
+            case 67:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
         }
-      }, _callee5, null, [[15, 57]]);
+      }, _callee4, null, [[14, 61]]);
     }));
 
     return function onSave(_x4) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -706,10 +643,10 @@ function AddLinkDrawer(props) {
     visible: loadingFormData,
     fullScreen: true
   }), /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
-    closeMode: ["close", "esc"],
+    closeMode: ['close', 'esc'],
     visible: addLinkIsOpen,
     onClose: closeDrawer,
-    title: isAddMode ? "添加链路" : "编辑链路",
+    title: isAddMode ? '添加链路' : '编辑链路',
     className: _indexModule["default"].drawer
   }, addLinkIsOpen && link && /*#__PURE__*/_react["default"].createElement(_editLinkInfo["default"], {
     lineData: link,