@riil-frontend/component-topology 11.0.33 → 11.0.35

package/lib/networkTopo/components/Link/index.js

@@ -34,6 +34,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * 通过ref调用show方法来打开，编辑场景传入link对象
  */
 var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _ref2, _ref3, _ref4, _ref5;
+
   var topoContext = props.topoContext,
       topo = props.topo;
   var store = topo.store;
@@ -101,155 +103,131 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, [urlParams.showAddLink]); // 链路更新，通过资源重新获取链路信息通知HT来更新
 
-  var refreshLink = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var refreshLink = function refreshLink() {
+    return (_ref2 = _ref2 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var data;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _rlog["default"].debug('useTopoEdit.refreshLink');
-
-              _context.next = 3;
-              return editDispatchers.fetchData();
-
-            case 3:
-              data = _context.sent;
-              topo.view.topoClient.emitEvent(_componentTopologyGraph.TopoEvent.EVENT_DATA_RESULT, {
-                type: _componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO,
-                data: data
-              });
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _rlog["default"].debug('useTopoEdit.refreshLink');
+
+            _context.next = 3;
+            return editDispatchers.fetchData();
+
+          case 3:
+            data = _context.sent;
+            topo.view.topoClient.emitEvent(_componentTopologyGraph.TopoEvent.EVENT_DATA_RESULT, {
+              type: _componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO,
+              data: data
+            });
+
+          case 5:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function refreshLink() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var getLink = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
+  var getLink = function getLink(_x) {
+    return (_ref3 = _ref3 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
       var data;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return editDispatchers.fetchData();
-
-            case 2:
-              data = _context2.sent;
-              return _context2.abrupt("return", data.filter(function (item) {
-                return item.id === id;
-              })[0]);
-
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return editDispatchers.fetchData();
+
+          case 2:
+            data = _context2.sent;
+            return _context2.abrupt("return", data.filter(function (item) {
+              return item.id === id;
+            })[0]);
+
+          case 4:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-
-    return function getLink(_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var updateTopo = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
-      var changed, isAdd, _data$result$, oldId, id, linkData;
+  var updateTopo = (0, _react.useCallback)(function (_x2) {
+    return (_ref4 = _ref4 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
+      var changed, isAdd, _data$result$2, oldId, id, linkData;
 
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              changed = data.changed, isAdd = data.isAddMode;
-
-              if (!(changed === false)) {
-                _context3.next = 3;
-                break;
-              }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            changed = data.changed, isAdd = data.isAddMode;
 
-              return _context3.abrupt("return");
-
-            case 3:
-              if (!isAdd) {
-                _context3.next = 8;
-                break;
-              }
+            if (!(changed === false)) {
+              _context3.next = 3;
+              break;
+            }
 
-              _context3.next = 6;
-              return refreshLink();
+            return _context3.abrupt("return");
 
-            case 6:
-              _context3.next = 13;
+          case 3:
+            if (!isAdd) {
+              _context3.next = 8;
               break;
-
-            case 8:
-              _data$result$ = data.result[0], oldId = _data$result$.oldId, id = _data$result$.id;
-              _context3.next = 11;
-              return getLink(id);
-
-            case 11:
-              linkData = _context3.sent;
-              topo.view.topoClient.emitEvent('topo_link_update', {
-                id: oldId,
-                link: linkData
-              });
-
-            case 13:
-            case "end":
-              return _context3.stop();
-          }
+            }
+
+            _context3.next = 6;
+            return refreshLink();
+
+          case 6:
+            _context3.next = 13;
+            break;
+
+          case 8:
+            _data$result$2 = data.result[0], oldId = _data$result$2.oldId, id = _data$result$2.id;
+            _context3.next = 11;
+            return getLink(id);
+
+          case 11:
+            linkData = _context3.sent;
+            topo.view.topoClient.emitEvent('topo_link_update', {
+              id: oldId,
+              link: linkData
+            });
+
+          case 13:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
-    }));
-
-    return function (_x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }(), []);
-  var handleSaved = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data) {
+    }))).apply(this, arguments);
+  }, []);
+  var handleSaved = (0, _react.useCallback)(function (_x3) {
+    return (_ref5 = _ref5 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data) {
       var errorItems;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              errorItems = data.errorItems;
-
-              if (errorItems.length) {
-                _context4.next = 7;
-                break;
-              }
-
-              setFalse();
-              setUpdateTopoState(true);
-              _context4.next = 6;
-              return updateTopo(data);
-
-            case 6:
-              setUpdateTopoState(false);
-
-            case 7:
-            case "end":
-              return _context4.stop();
-          }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            errorItems = data.errorItems;
+
+            if (errorItems.length) {
+              _context4.next = 7;
+              break;
+            }
+
+            setFalse();
+            setUpdateTopoState(true);
+            _context4.next = 6;
+            return updateTopo(data);
+
+          case 6:
+            setUpdateTopoState(false);
+
+          case 7:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
-    }));
-
-    return function (_x3) {
-      return _ref5.apply(this, arguments);
-    };
-  }(), []);
+    }))).apply(this, arguments);
+  }, []);
   return /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
     closeMode: ['close', 'esc'],
     visible: visible,

package/lib/networkTopo/components/Link/setting.js

@@ -66,6 +66,8 @@ var Title = function Title(_ref) {
 
 
 var LinkSetting = function LinkSetting(_ref2) {
+  var _ref3;
+
   var link = _ref2.link,
       topoElements = _ref2.topoElements,
       topo = _ref2.topo,
@@ -134,62 +136,56 @@ var LinkSetting = function LinkSetting(_ref2) {
     return validatorErrors;
   };
 
-  var onSave = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var values, _values$, src, dst;
+  var onSave = function onSave() {
+    return (_ref3 = _ref3 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var values, _values$2, src, dst;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(0, _utils.isAvailableArray)(getValidatorErrors())) {
-                _context.next = 2;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 2:
-              values = list.map(function (i, index) {
-                return refs[index].field.getValues();
-              });
-
-              if (isAddMode) {
-                _context.next = 8;
-                break;
-              }
-
-              _values$ = values[0], src = _values$.src, dst = _values$.dst;
-
-              if (!(src.sub === link.interfaceSource && dst.sub === link.interfaceTarget)) {
-                _context.next = 8;
-                break;
-              }
-
-              saveCb({
-                changed: false
-              });
-              return _context.abrupt("return");
-
-            case 8:
-              _context.next = 10;
-              return execSave({
-                link: link,
-                values: values
-              });
-
-            case 10:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(0, _utils.isAvailableArray)(getValidatorErrors())) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 2:
+            values = list.map(function (i, index) {
+              return refs[index].field.getValues();
+            });
+
+            if (isAddMode) {
+              _context.next = 8;
+              break;
+            }
+
+            _values$2 = values[0], src = _values$2.src, dst = _values$2.dst;
+
+            if (!(src.sub === link.interfaceSource && dst.sub === link.interfaceTarget)) {
+              _context.next = 8;
+              break;
+            }
+
+            saveCb({
+              changed: false
+            });
+            return _context.abrupt("return");
+
+          case 8:
+            _context.next = 10;
+            return execSave({
+              link: link,
+              values: values
+            });
+
+          case 10:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function onSave() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var formProp = {
     link: link,

package/lib/networkTopo/getTopoData.js

@@ -17,6 +17,8 @@ var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
+var _addLinkData, _buildData, _getTopoData;
+
 // import "./utils/__tests__/resourcePermissionUtil.test";
 // 过滤掉无两端节点数据的链路
 function filterLinkNoSourceTarget(data) {
@@ -75,113 +77,92 @@ function isNetworkLink(link) {
 }
 
 function addLinkData(_x) {
-  return _addLinkData.apply(this, arguments);
-} // FIXME 业务拓扑不需要链路相关逻辑
-
-
-function _addLinkData() {
-  _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
+  return (_addLinkData = _addLinkData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
     var links, nodes, prevNetworkLinks, networkLinks, otherLinks;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            links = data.links || [];
-            nodes = data.nodes || []; // 如果是网络链路，补充详情信息
-
-            prevNetworkLinks = links.filter(function (link) {
-              return isNetworkLink(link);
-            });
-            _context.next = 5;
-            return (0, _linkUtils.getLinksDetail)(prevNetworkLinks, nodes);
-
-          case 5:
-            networkLinks = _context.sent;
-            otherLinks = links.filter(function (link) {
-              return !isNetworkLink(link);
-            });
-            return _context.abrupt("return", (0, _extends2["default"])({}, data, {
-              links: [].concat(networkLinks, otherLinks),
-              linkGroups: []
-            }));
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          links = data.links || [];
+          nodes = data.nodes || []; // 如果是网络链路，补充详情信息
+
+          prevNetworkLinks = links.filter(function (link) {
+            return isNetworkLink(link);
+          });
+          _context.next = 5;
+          return (0, _linkUtils.getLinksDetail)(prevNetworkLinks, nodes);
+
+        case 5:
+          networkLinks = _context.sent;
+          otherLinks = links.filter(function (link) {
+            return !isNetworkLink(link);
+          });
+          return _context.abrupt("return", (0, _extends2["default"])({}, data, {
+            links: [].concat(networkLinks, otherLinks),
+            linkGroups: []
+          }));
+
+        case 8:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _addLinkData.apply(this, arguments);
-}
+  }))).apply(this, arguments);
+} // FIXME 业务拓扑不需要链路相关逻辑
 
-function buildData(_x2) {
-  return _buildData.apply(this, arguments);
-}
 
-function _buildData() {
-  _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(oldData) {
+function buildData(_x2) {
+  return (_buildData = _buildData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(oldData) {
     var data;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            data = oldData;
-            data = fixNodeGroupId(data);
-            data = filterLinkNoSourceTarget(data); // data = await addLinkData(data)
-
-            data = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(data);
-            return _context2.abrupt("return", data);
-
-          case 5:
-          case "end":
-            return _context2.stop();
-        }
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          data = oldData;
+          data = fixNodeGroupId(data);
+          data = filterLinkNoSourceTarget(data); // data = await addLinkData(data)
+
+          data = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(data);
+          return _context2.abrupt("return", data);
+
+        case 5:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
-  }));
-  return _buildData.apply(this, arguments);
+  }))).apply(this, arguments);
 }
 
 function getTopoData(_x3, _x4) {
-  return _getTopoData.apply(this, arguments);
-}
-
-function _getTopoData() {
-  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
+  return (_getTopoData = _getTopoData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
     var data;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return topoService.getTopoData(id);
-
-          case 2:
-            data = _context3.sent;
-
-            if (data) {
-              _context3.next = 5;
-              break;
-            }
-
-            return _context3.abrupt("return", data);
-
-          case 5:
-            data = fixAlarmConfig(data);
-            _context3.next = 8;
-            return buildData(data);
-
-          case 8:
-            data = _context3.sent;
-            return _context3.abrupt("return", data);
-
-          case 10:
-          case "end":
-            return _context3.stop();
-        }
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return topoService.getTopoData(id);
+
+        case 2:
+          data = _context3.sent;
+
+          if (data) {
+            _context3.next = 5;
+            break;
+          }
+
+          return _context3.abrupt("return", data);
+
+        case 5:
+          data = fixAlarmConfig(data);
+          _context3.next = 8;
+          return buildData(data);
+
+        case 8:
+          data = _context3.sent;
+          return _context3.abrupt("return", data);
+
+        case 10:
+        case "end":
+          return _context3.stop();
       }
     }, _callee3);
-  }));
-  return _getTopoData.apply(this, arguments);
+  }))).apply(this, arguments);
 }