@riil-frontend/component-topology 11.0.29 → 11.0.30

package/es/utils/ResourceConfigUtil.js

@@ -3,29 +3,26 @@ import sortBy from 'lodash/sortBy';
 import { isExitLink } from "../core/models/utils/linkUtils";
 import { isClusterHtElement } from "./clusterUtil";
 import { getEdges, getGroupChildren, getGroups, getLayerChildren, getLayers, getNodes } from "./htElementUtils";
-
 /**
  * 从拓扑图解析出拓扑资源配置
  *
  * @param {ht.DataModel} dataModel
  * @returns {{layers, groups, resources}}
  */
+
 function getResourceConfigFromHt(topo) {
   var htTopo = topo.getHtTopo();
-  var dataModel = topo.getDataModel();
+  var dataModel = topo.getDataModel(); // 获得分层
 
-  // 获得分层
-  var layers = getLayerDatas(dataModel);
+  var layers = getLayerDatas(dataModel); // 获得容器
+
+  var groupElements = getGroups(dataModel); // 获得视图上的区域配置
 
-  // 获得容器
-  var groupElements = getGroups(dataModel);
-  // 获得视图上的区域配置
   var groups = getGroupDatas({
     groupElements: groupElements,
     layers: layers
-  });
+  }); // 获得视图上的资源列表
 
-  // 获得视图上的资源列表
   var viewNodes = getNodes(dataModel).filter(function (node) {
     return !node.getParent();
   }).filter(function (node) {
@@ -53,36 +50,40 @@ function getResourceConfigFromHt(topo) {
     // 出口链路id列表
     relateTopoIdList: getRelateTopoIdList(dataModel)
   };
-}
+} // 查询关联拓扑id列表
+
 
-// 查询关联拓扑id列表
 function getRelateTopoIdList(dataModel) {
   return getNodes(dataModel).reduce(function (topoIds, node) {
     var bindType = node.a('bindType');
     var bindTopo = node.a('bindTopo');
+
     if (bindType === 'topo' && bindTopo && !topoIds.includes(bindTopo)) {
       return [].concat(topoIds, [bindTopo]);
     }
+
     return topoIds;
   }, []);
-}
+} // 查询出口链路列表
+
 
-// 查询出口链路列表
 function getExportLinkIdList(_ref) {
   var topo = _ref.topo,
-    htTopo = _ref.htTopo,
-    dataModel = _ref.dataModel;
+      htTopo = _ref.htTopo,
+      dataModel = _ref.dataModel;
   var exportLinkIdList = [];
   var edges = getEdges(dataModel);
   rlog.debug(' 查询出口链路列表-edges', edges, dataModel);
   edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge);
-    // 有组无子连线返回null
+    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
+
     if (edgeData) {
       // eslint-disable-next-line no-underscore-dangle
       var id = edgeData._attrObject.id;
+
       if (id) {
         var linkData = topo.dataModel.getDataById(id);
+
         if (isExitLink(linkData) && !exportLinkIdList.includes(id)) {
           exportLinkIdList.push(id);
         }
@@ -91,6 +92,7 @@ function getExportLinkIdList(_ref) {
   });
   return exportLinkIdList;
 }
+
 function getLayerDatas(dataModel) {
   // 获得分层
   var layerElements = getLayers(dataModel);
@@ -111,9 +113,10 @@ function getLayerDatas(dataModel) {
   });
   return layers;
 }
+
 function getGroupDatas(_ref2) {
   var groupElements = _ref2.groupElements,
-    layers = _ref2.layers;
+      layers = _ref2.layers;
   // 获得视图上的区域配置
   var groups = groupElements.filter(function (node) {
     return !node.getParent();
@@ -123,6 +126,7 @@ function getGroupDatas(_ref2) {
   groups = sortBy([].concat(layers, groups), 'order');
   return groups;
 }
+
 function getGroupConfigByElement(groupElement) {
   return {
     id: groupElement.getTag(),
@@ -138,6 +142,7 @@ function getGroupConfigByElement(groupElement) {
     }
   };
 }
+
 export default {
   getResourceConfigFromHt: getResourceConfigFromHt,
   getGroupConfigByElement: getGroupConfigByElement

package/es/utils/SpecialCharacterValidateUtil.js

@@ -9,5 +9,6 @@ export function validateSpecialCharacter(str) {
   if (!str) {
     return true;
   }
+
   return SPECIAL_CHARACTER_PATTERN.test(str);
 }

package/es/utils/ciType.js

@@ -3,15 +3,19 @@ export function getAllCiTypes(modelTree) {
   if (!isAvailableArray(modelTree)) {
     return [];
   }
+
   var result = [];
   modelTree.forEach(function (item) {
     var type = item.type,
-      childs = item.childs;
+        childs = item.childs;
+
     if (type === 'ci') {
       result.push(item);
     }
+
     if (childs) {
       var children = getAllCiTypes(childs);
+
       if (isAvailableArray(children)) {
         result.push.apply(result, children);
       }

package/es/utils/clusterUtil.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+
 /**
  * 集群处理工具类
  */
@@ -11,6 +12,7 @@ export function isCluster(node) {
 }
 export function processCluster(topoData) {
   var _topoData$groups;
+
   var clusters = buildClusterGroups(topoData.nodes);
   return _extends({}, topoData, {
     groups: [].concat((_topoData$groups = topoData.groups) !== null && _topoData$groups !== void 0 ? _topoData$groups : [], clusters),
@@ -20,6 +22,7 @@ export function processCluster(topoData) {
 export function buildClusterGroups(nodes) {
   return findClusters(nodes).map(function (n) {
     var _n$permission;
+
     return _extends({
       tag: null,
       parentId: n.groupId,
@@ -30,40 +33,40 @@ export function buildClusterGroups(nodes) {
       // 无权限禁用展开折叠
       styles: {
         showExpanded: false // 是否默认展开
+
       }
     });
   });
 }
-
 export function findClusters(nodes) {
   return nodes.filter(isCluster);
 }
 export function processClusterChildrenNodes(nodes, groups) {
-  return nodes
-  // 过滤集群
+  return nodes // 过滤集群
   .filter(function (node) {
     return !isCluster(node);
-  })
-  // 修正集群节点数据
+  }) // 修正集群节点数据
   .map(function (node) {
     return processClusterChildNode(node, groups);
   });
 }
-
 /**
  * 集群的节点 groupId 设置为所在集群id、groupTag设为空。所属集群不存在不处理
  * 
  * @param {*} node 
  * @param {*} groups 
  */
+
 export function processClusterChildNode(node, groups) {
   var ownedCluster = node.ownedCluster;
   var ownerExisted = ownedCluster && groups.find(function (group) {
     return group.id === ownedCluster;
   });
+
   if (!ownedCluster || !ownerExisted) {
     return node;
   }
+
   return _extends({}, node, {
     groupId: ownedCluster,
     groupTag: null
@@ -75,11 +78,11 @@ export function isClusterHtElement(element) {
 export function isClusterMemberHtElement(element) {
   return element && element.getParent() && isClusterHtElement(element.getParent());
 }
-
 /**
  * 集群无权限时收起
  * @param {*} topo 
  */
+
 export function handleClusterNoPermission(topo) {
   var dm = topo.getHtTopo().getGraphView().dm();
   var groups = getGroups(dm);
@@ -89,11 +92,11 @@ export function handleClusterNoPermission(topo) {
     }
   });
 }
-
 /**
  * fix NEWITOM-22562 【1.0.3升级包集成】【网络拓扑】升级前创建的拓扑图，包含VSU集群，升级后不显示VSU集群了
  * @param {*} topo 
  */
+
 export function upgradeV103GraphClusterNode(topo, topoData) {
   // const dm1 = topo.getDataModel()
   // dm1.removeDataByTag('00000000364831f0') // FIXME
@@ -102,6 +105,7 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
   } catch (error) {
     rlog.error('upgradeV103GraphClusterNode', error);
   }
+
   function doUpgrade() {
     // 查找图上未显示的集群、集群成员、关联的链路
     var topoDataTrans = transformTopoElements(topoData);
@@ -109,9 +113,11 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
     var unExistedList = topoDataTrans.filter(function (data) {
       return !isExistedElement(topo.getHtTopo(), dm, data);
     });
+
     if (!unExistedList.length) {
       return;
     }
+
     rlog.info('集群1.0.2升级', unExistedList);
     var groups = unExistedList.filter(function (item) {
       return item.type === 'group';
@@ -131,27 +137,26 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
     var htTopo = topo.getHtTopo();
     htTopo.createElements(createElementsData);
     groups.forEach(function (group) {
-      var groupElement = dm.getDataByTag(group.id);
-      // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
+      var groupElement = dm.getDataByTag(group.id); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
+
       findGroupChildren(topoDataTrans, group).forEach(function (child) {
         var childEle = dm.getDataByTag(child.id);
+
         if (childEle) {
           childEle.setParent(groupElement);
         }
-      });
+      }); // 如果序列化有，恢复区域位置
 
-      // 如果序列化有，恢复区域位置
       var deserializeDm = new ht.DataModel();
       var jsonDeserialize = new ht.JSONSerializer(deserializeDm);
       jsonDeserialize.deserialize(topoData.serialize, null, true);
       var oldNode = deserializeDm.getDataByTag(group.id);
+
       if (oldNode) {
         groupElement.setSize(oldNode.getSize());
         groupElement.setPosition(oldNode.getPosition());
         groupElement.setImage(oldNode.getImage());
       }
-    });
-
-    // 恢复手工画的线
+    }); // 恢复手工画的线
   }
 }

package/es/utils/format.js

@@ -11,9 +11,10 @@ export function formatDataForTable(dataSource, total, currentPage, pageSize) {
         company: '未知'
       });
     }
+
     return item;
-  });
-  // console.log('dataSource', dataSource);
+  }); // console.log('dataSource', dataSource);
+
   return {
     success: true,
     data: {
@@ -24,59 +25,67 @@ export function formatDataForTable(dataSource, total, currentPage, pageSize) {
     }
   };
 }
+
 function compareIgnoreCase(sortBy) {
   // In ascending order
   return function (a, b) {
     var first = a[sortBy];
     var second = b[sortBy];
+
     if (typeof first === 'number' && typeof second === 'number') {
       return first - second;
     }
+
     if (!isNull(first)) {
       return first.localeCompare(second);
     }
+
     return isNull(second) ? 0 : 1;
   };
 }
+
 export function sortData(dataSource, sortBy, sortOrder) {
   if (isAvailableArray(dataSource)) {
     dataSource = dataSource.slice();
     var comparator = compareIgnoreCase(sortBy);
+
     switch (sortOrder) {
       case 'desc':
         dataSource.sort(function (a, b) {
           return -comparator(a, b);
         });
         break;
+
       case 'asc':
       default:
         dataSource.sort(comparator);
         break;
     }
   }
+
   return dataSource;
 }
 export function findNodes(elements, nodeIds) {
   return elements.filter(function (element) {
     var type = element.type,
-      id = element.id;
+        id = element.id;
     return type === 'node' && nodeIds.indexOf(id) !== -1;
   });
 }
 export function findLinks(elements, nodeIds) {
   return elements.filter(function (element) {
     var type = element.type,
-      source = element.source,
-      target = element.target;
+        source = element.source,
+        target = element.target;
     return type === 'link' && (nodeIds.indexOf(source) !== -1 || nodeIds.indexOf(target) !== -1);
   });
 }
 export function filterElementsByNodeId(elements, nodeId) {
   return elements.filter(function (element) {
     var type = element.type,
-      id = element.id,
-      source = element.source,
-      target = element.target;
+        id = element.id,
+        source = element.source,
+        target = element.target;
     return type === 'node' && id === nodeId || (type === 'link' || type === 'linkGroup') && (source === nodeId || target === nodeId);
   });
 }
@@ -84,12 +93,14 @@ export function removeFromArray(arr, index) {
   if (index < 0 || index >= arr.length) {
     return arr;
   }
+
   return arr.slice(0, index).concat(arr.slice(index + 1));
 }
 export function replaceArrayElement(arr, index, element) {
   if (arr && index >= 0 && index < arr.length) {
     return arr.slice(0, index).concat(element, arr.slice(index + 1));
   }
+
   return arr;
 }
 /**
@@ -98,14 +109,16 @@ export function replaceArrayElement(arr, index, element) {
  * @param {string} excludeId 不包含的拓扑id
  * @returns
  */
+
 export function formatTreeDataSelect(data, excludeId) {
   var list = [];
   data.forEach(function (item) {
     if (item.id !== excludeId) {
       var id = item.id,
-        name = item.name,
-        label = item.label,
-        type = item.type;
+          name = item.name,
+          label = item.label,
+          type = item.type;
+
       if (item.children && item.children.length && type === 0) {
         var children = formatTreeDataSelect(item.children, id);
         var obj = {
@@ -126,15 +139,16 @@ export function formatTreeDataSelect(data, excludeId) {
   });
   return list;
 }
-
 /**
  * 处理多ip的情况，按产品展示要求返回第一个值
  * @param {String} ipStr ip串
  * @param {String} separator 分隔符
  */
+
 export function getIp(ipStr, separator) {
   if (separator === void 0) {
     separator = ',';
   }
+
   return ipStr && ipStr.split(separator)[0] || '';
 }