@riil-frontend/component-topology 10.0.37 → 10.0.38

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -116,9 +116,9 @@ export default function useGraphAlarmDisplay(options) {
       }).filter(function (item) {
         return !!item;
       });
-      rlog.debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u63A8\u9001ht " + Object.keys(relateTopoAlarms).length, {
+      rlog.debug('关联拓扑告警：推送ht', {
         all: relateTopoAlarm,
-        graphAlarm: relateTopoAlarms
+        relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
       topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "10.0.37" === 'string' ? "10.0.37" : null;
+var version = typeof "10.0.38" === 'string' ? "10.0.38" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/getTopoData.js

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

package/es/utils/topoData.js

@@ -116,13 +116,31 @@ export function parseTopoData(result) {
 
   return _extends({}, result, {
     groups: result.groups || [],
-    nodes: result.nodes || [],
-    links: result.links || [],
+    nodes: (result.nodes || []).map(parsePermission),
+    links: (result.links || []).map(parsePermission),
     linkGroups: result.linkGroups || [],
     global: _extends({}, 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 _extends({}, 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)
+    };
+  }
 }
 export function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里
 }

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -127,9 +127,9 @@ function useGraphAlarmDisplay(options) {
         return !!item;
       });
 
-      _rlog["default"].debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u63A8\u9001ht " + Object.keys(relateTopoAlarms).length, {
+      _rlog["default"].debug('关联拓扑告警：推送ht', {
         all: relateTopoAlarm,
-        graphAlarm: relateTopoAlarms
+        relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
 

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "10.0.37" === 'string' ? "10.0.37" : null;
+var version = typeof "10.0.38" === 'string' ? "10.0.38" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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/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.37",
+  "version": "10.0.38",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.37/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.38/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }