@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/lib/utils/topoData.js

@@ -9,11 +9,11 @@ exports.findGroupChildren = findGroupChildren;
 exports.findItemIndex = exports.findItem = void 0;
 exports.formatGroup = formatGroup;
 exports.formatGroups = formatGroups;
-exports.getAlarmSwitch = getAlarmSwitch;
 exports.getCiModSet = getCiModSet;
 exports.getCiTypes = getCiTypes;
 exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
+exports.getMonitorTemplateCodes = getMonitorTemplateCodes;
 exports.parseTopoData = parseTopoData;
 exports.updateCiDoc = exports.updateAllCiDoc = exports.sortList = void 0;
 
@@ -182,21 +182,26 @@ function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
+/**
+ * 获得监控模板code列表
+ * @param {*} cis 
+ * @returns 
+ */
 
-function getAlarmSwitch(topoData) {
-  var _topoData$global;
-
-  var alarmSwitch = true;
 
-  if (topoData !== null && topoData !== void 0 && topoData.global) {
-    alarmSwitch = topoData.global.alarmSwitch;
-  }
+function getMonitorTemplateCodes(cis) {
+  var codes = [];
+  cis.forEach(function (element) {
+    var _element$attributes;
 
-  if (topoData !== null && topoData !== void 0 && (_topoData$global = topoData.global) !== null && _topoData$global !== void 0 && _topoData$global.topoDisplayConfig) {
-    alarmSwitch = topoData.global.topoDisplayConfig.alarmSwitch;
-  }
+    // eslint-disable-next-line camelcase
+    var code = (_element$attributes = element.attributes) === null || _element$attributes === void 0 ? void 0 : _element$attributes.support_templates;
 
-  return alarmSwitch;
+    if (code && codes.indexOf(code) < 0) {
+      codes.push(code);
+    }
+  });
+  return codes;
 }
 /**
  * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
@@ -519,21 +524,13 @@ function getCiModSet(params) {
       globalConfig = params.globalConfig; // 当前拓扑资源字典
 
   var ciDoc = {};
-  var ciTypesDoc = {}; //
-
-  var bindingCiSet = {};
+  var ciTypesDoc = {};
   var allCiModSet = getNodeModSet();
-  var allLinkModSet = getLinkModSet();
 
   function getNodeModSet() {
     var ciTypes = getCiTypesFromCiElements(data.nodes);
     return getModSet(ciTypes);
   }
-
-  function getLinkModSet() {
-    var ciTypes = getCiTypesFromCiElements([].concat(data.links, data.linkGroups));
-    return getModSet(ciTypes);
-  }
   /**
    *
    * @param {array} ciTypeCodes
@@ -547,43 +544,12 @@ function getCiModSet(params) {
       return ciTypeCodes.includes(item);
     }).forEach(function (key) {
       var ciTypeObj = ciTypeMap[key];
-
-      if (key === "network_link") {
-        var linkKeyArr = [{
-          code: "phy",
-          key: "phy",
-          name: "物理链路"
-        }, {
-          code: "agg",
-          key: "agg",
-          name: "聚合链路"
-        }, {
-          code: "exit",
-          key: "exit",
-          name: "出口链路"
-        }];
-        linkKeyArr.map(function (link, index) {
-          ciTypeObj = engine.ciTyeCache.getNetworkLinkCiType(link.key);
-
-          if (ciTypeObj) {
-            modSet[link.code] = {
-              name: link.name,
-              code: link.code,
-              icon: ciTypeObj.icon,
-              list: ciModfilter(ciTypeObj, globalConfig, "link", link.code)
-            };
-          }
-
-          return link.code;
-        });
-      } else {
-        modSet[key] = {
-          name: ciTypeObj.displayName,
-          code: ciTypeObj.code,
-          icon: ciTypeObj.icon,
-          list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
-        };
-      }
+      modSet[key] = {
+        name: ciTypeObj.displayName,
+        code: ciTypeObj.code,
+        icon: ciTypeObj.icon,
+        list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
+      };
     });
     console.log("modSet--------------------", modSet);
     return modSet;
@@ -598,7 +564,6 @@ function getCiModSet(params) {
         tag: [],
         tip: []
       };
-      bindingCiSet[ciType] = bindingCiSet[ciType] || {};
       ciTypesDoc[ciType] = ciTypesDoc[ciType] || [];
       ciTypesDoc[element.ciType].push({
         ciId: element.id
@@ -611,11 +576,7 @@ function getCiModSet(params) {
     // ci信息集合
     ciTypesDoc: ciTypesDoc,
     // 每种ci含有的ci
-    bindingCiSet: bindingCiSet,
-    // 可能没用了
-    allCiModSet: allCiModSet,
-    // 资源类型含有属性和指标集合
-    allLinkModSet: allLinkModSet // 链路类型含有属性和指标集合
+    allCiModSet: allCiModSet // 资源类型含有属性和指标集合
 
   };
 }

package/lib/utils/tree.js

@@ -53,9 +53,7 @@ function formatTree(json, funcPermissions) {
         type: type,
         name: name,
         showDefault: showDefault,
-        // permission: node.operation,
-        // FIXME 拓扑数据权限临时方案，待移除
-        permission: funcPermissions.createTopo ? 'delete' : 'read',
+        permission: node.operation,
         children: node !== null && node !== void 0 && node.children ? loop(node.children) : []
       };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.0-alpha.9",
+  "version": "5.0.2",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -59,6 +59,7 @@
     "@formily/next-components": "1.3.13",
     "@iceworks/spec": "^1.0.0",
     "@riil-frontend/component-action-tree": "^1.0.13",
+    "@riil-frontend/component-crucial-link-topo": "0.0.1-alpha.2",
     "@riil-frontend/component-common-res-list": "^1.0.13",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
     "@riil-frontend/component-extra-title": "^1.0.3",
@@ -114,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.0-alpha.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }