@riil-frontend/component-topology 10.0.38 → 10.0.41

package/lib/core/store/models/topoConfig.js

@@ -273,8 +273,8 @@ function _default(topoApp) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes; // console.log("editState", editState);
-
+                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                    console.log("editState", editState);
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
@@ -282,10 +282,10 @@ function _default(topoApp) {
                       exportLinkIdList: exportLinkIdList,
                       ipNodes: ipNodes
                     };
-                    _context2.next = 5;
+                    _context2.next = 6;
                     return _this2.getTopoByConditions(query);
 
-                  case 5:
+                  case 6:
                     data = _context2.sent;
 
                     _rlog["default"].debug("按配置查询拓扑数据", {
@@ -298,7 +298,7 @@ function _default(topoApp) {
 
                     return _context2.abrupt("return", data);
 
-                  case 8:
+                  case 9:
                   case "end":
                     return _context2.stop();
                 }
@@ -505,16 +505,17 @@ function _default(topoApp) {
               while (1) {
                 switch (_context8.prev = _context8.next) {
                   case 0:
-                    ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
-                    _context8.next = 3;
+                    ids = data.ids, ip = data.ip;
+                    console.log("queryAllLinkByIp", ids, ip);
+                    _context8.next = 4;
                     return _networkLink["default"].queryLinksByIp(ids, ip);
 
-                  case 3:
+                  case 4:
                     result = _context8.sent;
+                    console.log("queryAllLinkByIp-result", result);
                     return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
 
-                  case 5:
+                  case 7:
                   case "end":
                     return _context8.stop();
                 }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -206,15 +206,15 @@ function ResourceOverview(props) {
 
             case 3:
               power = _context.sent;
+              console.log(power);
 
-              // console.log(power)
               if (power.data.length) {
                 window.open("" + window.location.origin + roomLink);
               } else {
                 _message["default"].error('无访问权限，请联系管理员');
               }
 
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }

package/lib/networkTopo/getTopoData.js

@@ -92,7 +92,7 @@ function _addLinkData() {
 
           case 4:
             networkLinks = _context.sent;
-            // console.log("如果是网络链路，补充详情信息", networkLinks);
+            console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
               return link.ciType !== 'network_link';
             });
@@ -101,7 +101,7 @@ function _addLinkData() {
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -37,8 +37,8 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     });
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var config = topo.attributeMetricDisplay.getConfig(); // console.log("getIpNodeTagsAndTips", config, ipNodes);
-
+    var config = topo.attributeMetricDisplay.getConfig();
+    console.log("getIpNodeTagsAndTips", config, ipNodes);
     var tagDatas = config.nodeTag && !config.nodeTag.isCustom ? config.nodeTag.data : [];
     var tipDatas = config.nodeTip && !config.nodeTip.isCustom ? config.nodeTip.data : [];
     var tagHasIpv4 = tagDatas.filter(function (item) {

package/lib/utils/topoData.js

@@ -156,31 +156,13 @@ function parseTopoData(result) {
 
   return (0, _extends2["default"])({}, result, {
     groups: result.groups || [],
-    nodes: (result.nodes || []).map(parsePermission),
-    links: (result.links || []).map(parsePermission),
+    nodes: result.nodes || [],
+    links: result.links || [],
     linkGroups: result.linkGroups || [],
     global: (0, _extends2["default"])({}, otherGlobal, {
       extraConfig: JSON.parse(((_result$global = result.global) === null || _result$global === void 0 ? void 0 : _result$global.extraConfig) || "{}")
     })
-  }); // 如果没有权限字段，则增加
-
-  function parsePermission(data) {
-    if (data.permission) {
-      return data;
-    }
-
-    return (0, _extends2["default"])({}, data, {
-      permission: parseBasicPermission(data === null || data === void 0 ? void 0 : data.operation)
-    });
-  }
-
-  function parseBasicPermission(operation) {
-    return {
-      readable: !!operation,
-      writeable: ['write', 'delete'].includes(operation),
-      deleteable: ['delete'].includes(operation)
-    };
-  }
+  });
 }
 
 function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "10.0.38",
+  "version": "10.0.41",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.38/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.41/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }