@riil-frontend/component-topology 10.0.41 → 10.0.42

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

@@ -27,17 +27,8 @@ var _overview = _interopRequireDefault(require("../../../../../../services/overv
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
-// url 处理，UICBB 的地址需截取前缀
 function formatUrl(url) {
-  var _window, _window$location;
-
-  var prefix = '/default/pagecenter';
-
-  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
-    return url.split(prefix)[1];
-  } else {
-    return url;
-  }
+  return url;
 }
 
 function EventsCard(props) {

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 6:
+            case 5:
             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 8:
+          case 7:
           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,13 +156,31 @@ function parseTopoData(result) {
 
   return (0, _extends2["default"])({}, result, {
     groups: result.groups || [],
-    nodes: result.nodes || [],
-    links: result.links || [],
+    nodes: (result.nodes || []).map(parsePermission),
+    links: (result.links || []).map(parsePermission),
     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.41",
+  "version": "10.0.42",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.41/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.42/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }