@riil-frontend/component-topology 11.0.30 → 11.0.31

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

@@ -115,62 +115,64 @@ function _updateLink() {
   _updateLink = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLink, params) {
     var result, src, dst, srcRelation, dstRelation, srcIsCurrentRelation, dstIsCurrentRelation, onlyChangeOneEnd, createResult;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          result = {
-            oldId: oldLink.id
-          };
-          src = params.src, dst = params.dst; // 如果只修改一端，则先删除再新建
-
-          _context.next = 4;
-          return cmdbService.queryRelationByEndpoint(src.sub);
-
-        case 4:
-          srcRelation = _context.sent;
-          _context.next = 7;
-          return cmdbService.queryRelationByEndpoint(dst.sub);
-
-        case 7:
-          dstRelation = _context.sent;
-          srcIsCurrentRelation = srcRelation && srcRelation.id === oldLink.id && !dstRelation;
-          dstIsCurrentRelation = dstRelation && dstRelation.id === oldLink.id && !srcRelation;
-          onlyChangeOneEnd = srcIsCurrentRelation || dstIsCurrentRelation;
-
-          if (!onlyChangeOneEnd) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            result = {
+              oldId: oldLink.id
+            };
+            src = params.src, dst = params.dst; // 如果只修改一端，则先删除再新建
+
+            _context.next = 4;
+            return cmdbService.queryRelationByEndpoint(src.sub);
+
+          case 4:
+            srcRelation = _context.sent;
+            _context.next = 7;
+            return cmdbService.queryRelationByEndpoint(dst.sub);
+
+          case 7:
+            dstRelation = _context.sent;
+            srcIsCurrentRelation = srcRelation && srcRelation.id === oldLink.id && !dstRelation;
+            dstIsCurrentRelation = dstRelation && dstRelation.id === oldLink.id && !srcRelation;
+            onlyChangeOneEnd = srcIsCurrentRelation || dstIsCurrentRelation;
+
+            if (!onlyChangeOneEnd) {
+              _context.next = 14;
+              break;
+            }
+
             _context.next = 14;
-            break;
-          }
+            return cmdbService.forceDeleteRelation(oldLink.id);
 
-          _context.next = 14;
-          return cmdbService.forceDeleteRelation(oldLink.id);
+          case 14:
+            _context.next = 16;
+            return cmdbService.batchCreateRelation([buildCreateLinkParams(params, 0)]);
 
-        case 14:
-          _context.next = 16;
-          return cmdbService.batchCreateRelation([buildCreateLinkParams(params, 0)]);
+          case 16:
+            createResult = _context.sent;
+            Object.assign(result, createResult[0]);
 
-        case 16:
-          createResult = _context.sent;
-          Object.assign(result, createResult[0]);
+            if (!(result.status === 0)) {
+              _context.next = 22;
+              break;
+            }
 
-          if (!(result.status === 0)) {
-            _context.next = 22;
-            break;
-          }
+            if (onlyChangeOneEnd) {
+              _context.next = 22;
+              break;
+            }
 
-          if (onlyChangeOneEnd) {
             _context.next = 22;
-            break;
-          }
-
-          _context.next = 22;
-          return cmdbService.forceDeleteRelation(oldLink.id);
+            return cmdbService.forceDeleteRelation(oldLink.id);
 
-        case 22:
-          return _context.abrupt("return", result);
+          case 22:
+            return _context.abrupt("return", result);
 
-        case 23:
-        case "end":
-          return _context.stop();
+          case 23:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));
@@ -193,32 +195,34 @@ function _saveLink() {
     var link, values, params, result, _params;
 
     return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          link = _ref2.link, values = _ref2.values;
-
-          if (!link) {
-            _context2.next = 9;
-            break;
-          }
-
-          params = values[0];
-          _context2.next = 5;
-          return updateLink(link, params);
-
-        case 5:
-          result = _context2.sent;
-          return _context2.abrupt("return", [result]);
-
-        case 9:
-          _params = values.map(function (item, index) {
-            return buildCreateLinkParams(item, index);
-          });
-          return _context2.abrupt("return", cmdbService.batchCreateRelation(_params));
-
-        case 11:
-        case "end":
-          return _context2.stop();
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            link = _ref2.link, values = _ref2.values;
+
+            if (!link) {
+              _context2.next = 9;
+              break;
+            }
+
+            params = values[0];
+            _context2.next = 5;
+            return updateLink(link, params);
+
+          case 5:
+            result = _context2.sent;
+            return _context2.abrupt("return", [result]);
+
+          case 9:
+            _params = values.map(function (item, index) {
+              return buildCreateLinkParams(item, index);
+            });
+            return _context2.abrupt("return", cmdbService.batchCreateRelation(_params));
+
+          case 11:
+          case "end":
+            return _context2.stop();
+        }
       }
     }, _callee2);
   }));

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

@@ -105,23 +105,25 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _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);
     }));
@@ -135,20 +137,22 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _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);
     }));
@@ -160,48 +164,50 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var updateTopo = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
-      var changed, isAdd, _data$result$2, oldId, id, linkData;
+      var changed, isAdd, _data$result$, 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;
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              changed = data.changed, isAdd = data.isAddMode;
 
-            if (!(changed === false)) {
-              _context3.next = 3;
-              break;
-            }
+              if (!(changed === false)) {
+                _context3.next = 3;
+                break;
+              }
+
+              return _context3.abrupt("return");
+
+            case 3:
+              if (!isAdd) {
+                _context3.next = 8;
+                break;
+              }
 
-            return _context3.abrupt("return");
+              _context3.next = 6;
+              return refreshLink();
 
-          case 3:
-            if (!isAdd) {
-              _context3.next = 8;
+            case 6:
+              _context3.next = 13;
               break;
-            }
-
-            _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();
+
+            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();
+          }
         }
       }, _callee3);
     }));
@@ -214,26 +220,28 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _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);
     }));

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

@@ -136,50 +136,52 @@ var LinkSetting = function LinkSetting(_ref2) {
 
   var onSave = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var values, _values$2, src, dst;
+      var values, _values$, 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$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();
+        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();
+          }
         }
       }, _callee);
     }));

package/lib/networkTopo/getTopoData.js

@@ -83,30 +83,32 @@ function _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);
   }));
@@ -121,18 +123,20 @@ function _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);
   }));
@@ -147,33 +151,35 @@ function _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);
   }));