@riil-frontend/component-topology 11.0.36 → 11.0.39

package/lib/networkTopo/store/topoTreeMod.js

@@ -52,31 +52,33 @@ function _default(topoApp) {
             var id, resTreeData, _formatTree, treeData, defId, selectedTopoId;
 
             return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  id = payload.id;
-                  _context.next = 3;
-                  return _this.getTopoTree();
-
-                case 3:
-                  resTreeData = _context.sent;
-                  // 格式化tree数据
-                  _formatTree = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree[0], defId = _formatTree[1]; // 选中上次选择或指定的，如无则选中默认
-
-                  selectedTopoId = id || (defId === '-1' ? undefined : defId);
-
-                  _this.update({
-                    loaded: true,
-                    treeData: (0, _tree.treeNodeCount)(treeData),
-                    defId: defId,
-                    selectedNode: [selectedTopoId],
-                    expandedKeys: (0, _tree.findParentIdsById)(treeData, selectedTopoId)
-                  }); // console.log('resTreeData', resTreeData, rootState.topoMod.topoId);
-
-
-                case 7:
-                case "end":
-                  return _context.stop();
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    id = payload.id;
+                    _context.next = 3;
+                    return _this.getTopoTree();
+
+                  case 3:
+                    resTreeData = _context.sent;
+                    // 格式化tree数据
+                    _formatTree = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree[0], defId = _formatTree[1]; // 选中上次选择或指定的，如无则选中默认
+
+                    selectedTopoId = id || (defId === '-1' ? undefined : defId);
+
+                    _this.update({
+                      loaded: true,
+                      treeData: (0, _tree.treeNodeCount)(treeData),
+                      defId: defId,
+                      selectedNode: [selectedTopoId],
+                      expandedKeys: (0, _tree.findParentIdsById)(treeData, selectedTopoId)
+                    }); // console.log('resTreeData', resTreeData, rootState.topoMod.topoId);
+
+
+                  case 7:
+                  case "end":
+                    return _context.stop();
+                }
               }
             }, _callee);
           }))();
@@ -85,37 +87,39 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var showAllTree, resTreeData;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
-                case 0:
-                  // 拓扑中心 如果有管理导航树权限，展示完整拓扑树
-                  showAllTree = topoApp.options.full && rootState.functionAuth.permissions.manageNavTree;
-
-                  if (!showAllTree) {
-                    _context2.next = 7;
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    // 拓扑中心 如果有管理导航树权限，展示完整拓扑树
+                    showAllTree = topoApp.options.full && rootState.functionAuth.permissions.manageNavTree;
+
+                    if (!showAllTree) {
+                      _context2.next = 7;
+                      break;
+                    }
+
+                    _context2.next = 4;
+                    return topoApp.serverApi.getTopoTree();
+
+                  case 4:
+                    resTreeData = _context2.sent;
+                    _context2.next = 10;
                     break;
-                  }
-
-                  _context2.next = 4;
-                  return topoApp.serverApi.getTopoTree();
-
-                case 4:
-                  resTreeData = _context2.sent;
-                  _context2.next = 10;
-                  break;
 
-                case 7:
-                  _context2.next = 9;
-                  return topoApp.serverApi.getTopoTreeByLoginUser();
+                  case 7:
+                    _context2.next = 9;
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
-                case 9:
-                  resTreeData = _context2.sent;
+                  case 9:
+                    resTreeData = _context2.sent;
 
-                case 10:
-                  return _context2.abrupt("return", resTreeData);
+                  case 10:
+                    return _context2.abrupt("return", resTreeData);
 
-                case 11:
-                case "end":
-                  return _context2.stop();
+                  case 11:
+                  case "end":
+                    return _context2.stop();
+                }
               }
             }, _callee2);
           }))();
@@ -130,25 +134,27 @@ function _default(topoApp) {
             var resTreeData, _formatTree2, treeData, defId;
 
             return _regenerator["default"].wrap(function _callee3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
-                case 0:
-                  _context3.next = 2;
-                  return _this2.getTopoTree();
-
-                case 2:
-                  resTreeData = _context3.sent;
-                  // 格式化tree数据
-                  _formatTree2 = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree2[0], defId = _formatTree2[1];
-
-                  _this2.update({
-                    loaded: true,
-                    treeData: (0, _tree.treeNodeCount)(treeData),
-                    defId: defId
-                  });
-
-                case 5:
-                case "end":
-                  return _context3.stop();
+              while (1) {
+                switch (_context3.prev = _context3.next) {
+                  case 0:
+                    _context3.next = 2;
+                    return _this2.getTopoTree();
+
+                  case 2:
+                    resTreeData = _context3.sent;
+                    // 格式化tree数据
+                    _formatTree2 = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree2[0], defId = _formatTree2[1];
+
+                    _this2.update({
+                      loaded: true,
+                      treeData: (0, _tree.treeNodeCount)(treeData),
+                      defId: defId
+                    });
+
+                  case 5:
+                  case "end":
+                    return _context3.stop();
+                }
               }
             }, _callee3);
           }))();
@@ -159,45 +165,47 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
             var resTreeData, treeData;
             return _regenerator["default"].wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
-                case 0:
-                  if (conditions === void 0) {
-                    conditions = {};
-                  }
-
-                  _rlog["default"].debug('editTopoOnTree', conditions);
-
-                  _context4.next = 4;
-                  return topoApp.serverApi.editTopo({
-                    id: parseInt(conditions.id, 10),
-                    name: conditions.name,
-                    type: conditions.type
-                  });
-
-                case 4:
-                  resTreeData = _context4.sent;
-                  treeData = clone(state.topoTreeMod.treeData);
-
-                  if (resTreeData) {
-                    (0, _tree.loopTree)(treeData, conditions.id, function (parent, index, arr) {
-                      arr[index].label = conditions.name;
+              while (1) {
+                switch (_context4.prev = _context4.next) {
+                  case 0:
+                    if (conditions === void 0) {
+                      conditions = {};
+                    }
+
+                    _rlog["default"].debug('editTopoOnTree', conditions);
+
+                    _context4.next = 4;
+                    return topoApp.serverApi.editTopo({
+                      id: parseInt(conditions.id, 10),
+                      name: conditions.name,
+                      type: conditions.type
                     });
 
-                    _this3.update({
-                      treeData: treeData
-                    });
+                  case 4:
+                    resTreeData = _context4.sent;
+                    treeData = clone(state.topoTreeMod.treeData);
 
-                    dispatch.topoMod.operationTopoPage({
-                      type: 'rename',
-                      name: conditions.name,
-                      id: conditions.id
-                    });
-                  } // const resTree = formatTreeData(resTreeData);
+                    if (resTreeData) {
+                      (0, _tree.loopTree)(treeData, conditions.id, function (parent, index, arr) {
+                        arr[index].label = conditions.name;
+                      });
+
+                      _this3.update({
+                        treeData: treeData
+                      });
 
+                      dispatch.topoMod.operationTopoPage({
+                        type: 'rename',
+                        name: conditions.name,
+                        id: conditions.id
+                      });
+                    } // const resTree = formatTreeData(resTreeData);
 
-                case 7:
-                case "end":
-                  return _context4.stop();
+
+                  case 7:
+                  case "end":
+                    return _context4.stop();
+                }
               }
             }, _callee4);
           }))();
@@ -234,60 +242,62 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var currentTopoId, isDeleteCurrentP;
             return _regenerator["default"].wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
-                case 0:
-                  _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
+              while (1) {
+                switch (_context5.prev = _context5.next) {
+                  case 0:
+                    _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
 
-                  currentTopoId = state.topoMod.topoId;
+                    currentTopoId = state.topoMod.topoId;
 
-                  if (!("" + conditions === "" + currentTopoId)) {
-                    _context5.next = 13;
-                    break;
-                  }
+                    if (!("" + conditions === "" + currentTopoId)) {
+                      _context5.next = 13;
+                      break;
+                    }
 
-                  _rlog["default"].debug('deleteTopo-currentTopo', conditions);
+                    _rlog["default"].debug('deleteTopo-currentTopo', conditions);
 
-                  _context5.next = 6;
-                  return dispatch.topoMod.updateDelId("" + conditions);
+                    _context5.next = 6;
+                    return dispatch.topoMod.updateDelId("" + conditions);
 
-                case 6:
-                  _context5.next = 8;
-                  return topoApp.alarm.close();
+                  case 6:
+                    _context5.next = 8;
+                    return topoApp.alarm.close();
 
-                case 8:
-                  _context5.next = 10;
-                  return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
+                  case 8:
+                    _context5.next = 10;
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
-                case 10:
-                  return _context5.abrupt("return", _context5.sent);
+                  case 10:
+                    return _context5.abrupt("return", _context5.sent);
 
-                case 13:
-                  // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
-                  isDeleteCurrentP = false;
-                  (0, _tree.loopTree)(state.topoTreeMod.treeData, conditions, function (item, index, arr, pid) {
-                    (0, _tree.loopTree)([item], currentTopoId, function (i) {
-                      isDeleteCurrentP = true;
+                  case 13:
+                    // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
+                    isDeleteCurrentP = false;
+                    (0, _tree.loopTree)(state.topoTreeMod.treeData, conditions, function (item, index, arr, pid) {
+                      (0, _tree.loopTree)([item], currentTopoId, function (i) {
+                        isDeleteCurrentP = true;
+                      });
                     });
-                  });
 
-                  if (!isDeleteCurrentP) {
-                    _context5.next = 18;
-                    break;
-                  }
+                    if (!isDeleteCurrentP) {
+                      _context5.next = 18;
+                      break;
+                    }
 
-                  _context5.next = 18;
-                  return topoApp.alarm.close();
+                    _context5.next = 18;
+                    return topoApp.alarm.close();
 
-                case 18:
-                  _context5.next = 20;
-                  return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
+                  case 18:
+                    _context5.next = 20;
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
-                case 20:
-                  return _context5.abrupt("return", _context5.sent);
+                  case 20:
+                    return _context5.abrupt("return", _context5.sent);
 
-                case 21:
-                case "end":
-                  return _context5.stop();
+                  case 21:
+                  case "end":
+                    return _context5.stop();
+                }
               }
             }, _callee5);
           }))();
@@ -298,28 +308,30 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var resTreeData;
             return _regenerator["default"].wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
-                case 0:
-                  if (conditions === void 0) {
-                    conditions = {};
-                  }
-
-                  _rlog["default"].debug('setDefTopoOnTree', conditions);
-
-                  _context6.next = 4;
-                  return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
-
-                case 4:
-                  resTreeData = _context6.sent;
-                  _context6.next = 7;
-                  return _this4.refreshTree();
-
-                case 7:
-                  _message["default"].success('设置成功');
-
-                case 8:
-                case "end":
-                  return _context6.stop();
+              while (1) {
+                switch (_context6.prev = _context6.next) {
+                  case 0:
+                    if (conditions === void 0) {
+                      conditions = {};
+                    }
+
+                    _rlog["default"].debug('setDefTopoOnTree', conditions);
+
+                    _context6.next = 4;
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
+
+                  case 4:
+                    resTreeData = _context6.sent;
+                    _context6.next = 7;
+                    return _this4.refreshTree();
+
+                  case 7:
+                    _message["default"].success('设置成功');
+
+                  case 8:
+                  case "end":
+                    return _context6.stop();
+                }
               }
             }, _callee6);
           }))();

package/lib/networkTopo/utils/exportData.js

@@ -24,65 +24,67 @@ function _ref() {
     var _topo$store$getModelS, nodes, links, linkGroups, clusters, params, fileData, fileName, blob, elink;
 
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _topo$store$getModelS = topo.store.getModelState('topoMod').data, nodes = _topo$store$getModelS.nodes, links = _topo$store$getModelS.links, linkGroups = _topo$store$getModelS.linkGroups;
-          clusters = (0, _clusterUtil.findClusters)(nodes);
-          params = {
-            id: topo.id,
-            'nodes': nodes.filter(function (node) {
-              return !clusters.find(function (c) {
-                return c.id === node.ownedCluster;
-              });
-            }).map(function (node) {
-              var element = topo.getDataModel().getDataByTag(node.id);
-              return {
-                'id': node.id,
-                'imageName': element.a('customName') || element.a('name') || element.getName()
-              };
-            }),
-            'links': [].concat(links, linkGroups).map(function (link) {
-              var id = link.id,
-                  source = link.source,
-                  target = link.target,
-                  interfaceSource = link.interfaceSource,
-                  interfaceTarget = link.interfaceTarget;
-              return {
-                id: id,
-                source: source,
-                target: target,
-                interfaceSource: interfaceSource,
-                interfaceTarget: interfaceTarget
-              };
-            })
-          };
-
-          _rlog["default"].error('导出数据', params);
-
-          _context.next = 6;
-          return _componentTopologyUtils.request.post('/topo/v1/api/structure/excel', params, {
-            responseType: 'blob' // responseType: 'arraybuffer',
-
-          });
-
-        case 6:
-          fileData = _context.sent;
-          fileName = topo.store.getModelState('topoMod').topoData.config.name + ".xls";
-          blob = new Blob([fileData]); // 处理文档流
-
-          elink = document.createElement('a');
-          elink.download = fileName;
-          elink.style.display = 'none';
-          elink.href = URL.createObjectURL(blob);
-          document.body.appendChild(elink);
-          elink.click();
-          URL.revokeObjectURL(elink.href); // 释放URL 对象
-
-          document.body.removeChild(elink);
-
-        case 17:
-        case "end":
-          return _context.stop();
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _topo$store$getModelS = topo.store.getModelState('topoMod').data, nodes = _topo$store$getModelS.nodes, links = _topo$store$getModelS.links, linkGroups = _topo$store$getModelS.linkGroups;
+            clusters = (0, _clusterUtil.findClusters)(nodes);
+            params = {
+              id: topo.id,
+              'nodes': nodes.filter(function (node) {
+                return !clusters.find(function (c) {
+                  return c.id === node.ownedCluster;
+                });
+              }).map(function (node) {
+                var element = topo.getDataModel().getDataByTag(node.id);
+                return {
+                  'id': node.id,
+                  'imageName': element.a('customName') || element.a('name') || element.getName()
+                };
+              }),
+              'links': [].concat(links, linkGroups).map(function (link) {
+                var id = link.id,
+                    source = link.source,
+                    target = link.target,
+                    interfaceSource = link.interfaceSource,
+                    interfaceTarget = link.interfaceTarget;
+                return {
+                  id: id,
+                  source: source,
+                  target: target,
+                  interfaceSource: interfaceSource,
+                  interfaceTarget: interfaceTarget
+                };
+              })
+            };
+
+            _rlog["default"].error('导出数据', params);
+
+            _context.next = 6;
+            return _componentTopologyUtils.request.post('/topo/v1/api/structure/excel', params, {
+              responseType: 'blob' // responseType: 'arraybuffer',
+
+            });
+
+          case 6:
+            fileData = _context.sent;
+            fileName = topo.store.getModelState('topoMod').topoData.config.name + ".xls";
+            blob = new Blob([fileData]); // 处理文档流
+
+            elink = document.createElement('a');
+            elink.download = fileName;
+            elink.style.display = 'none';
+            elink.href = URL.createObjectURL(blob);
+            document.body.appendChild(elink);
+            elink.click();
+            URL.revokeObjectURL(elink.href); // 释放URL 对象
+
+            document.body.removeChild(elink);
+
+          case 17:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));

package/lib/utils/htElementDataUtil.js

@@ -10,9 +10,7 @@ exports.isResourceElement = isResourceElement;
 exports.isResourceNodeElement = isResourceNodeElement;
 exports.isText = isText;
 
-var _htElementUtils = _interopRequireWildcard(require("./htElementUtils"));
-
-var htElementUtils = _htElementUtils;
+var htElementUtils = _interopRequireWildcard(require("./htElementUtils"));
 
 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); }
 
@@ -47,7 +45,7 @@ function isResourceNodeElement(element) {
 }
 
 var getAllEdgeResourceIds = function getAllEdgeResourceIds(dm) {
-  return (0, _htElementUtils.getEdges)(dm).filter(function (node) {
+  return (0, htElementUtils.getEdges)(dm).filter(function (node) {
     return !!node.getTag();
   }).map(function (node) {
     return node.getTag();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "11.0.36",
+  "version": "11.0.39",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -79,7 +79,7 @@
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
-    "@riil-frontend/utils": "^1.0.44",
+    "@riil-frontend/utils": "^1.0.45",
     "@types/jest": "^29.5.4",
     "axios": "^0.21.1",
     "build-plugin-component": "^1.12.1",
@@ -122,6 +122,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.36/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.39/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }