@riil-frontend/component-topology 11.0.29 → 11.0.30

package/es/utils/htElementUtils.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import EdgeGroup from "../core/models/EdgeGroup";
 var ht = window.ht;
+
 function getElementData(element) {
   var className = element.getClassName();
   var commonData = {
@@ -13,13 +14,16 @@ function getElementData(element) {
     attrObject: element.getAttrObject(),
     styleMap: element.getStyleMap()
   };
+
   if (className === "ht.Edge") {
     return _extends({}, commonData);
   }
+
   return _extends({}, commonData, {
     position: element.getPosition()
   });
 }
+
 export function isNode(element) {
   // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
   // eslint-disable-next-line no-underscore-dangle
@@ -32,10 +36,12 @@ export function isValidEdge(element) {
   if (!isEdge(element)) {
     return false;
   }
+
   if (!element.getSource() || !element.getTarget()) {
     rlog.error("isValidEdge 连线异常：源或目的为空", element);
     return false;
   }
+
   return true;
 }
 export function isGroup(element) {
@@ -73,10 +79,12 @@ export function getGroupData(element) {
   if (!element) {
     return null;
   }
+
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
     groupTag: parent.a("tag") // 父容器
+
   } : {};
   return _extends({
     name: element.getStyleMap().label
@@ -97,6 +105,7 @@ export function getNodeData(element) {
   var groupInfo = parent ? {
     groupId: parent.getTag(),
     groupTag: parent.a("tag") // 父容器
+
   } : {};
   return _extends({}, element.getAttrObject(), {
     tag: element.getId(),
@@ -109,41 +118,44 @@ export function getEdges(dataModel) {
 export function isEdgeGroupExpanded(edge) {
   return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
 }
-
 /**
  * 是否连线组代理
  * @param {*} edge
  * @returns
  */
+
 export function isEdgeGroupAgent(edge) {
   return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
 }
-
 /**
  * 获得两个节点间的连线列表
  * @param {*} node1
  * @param {*} node2
  * @returns
  */
+
 export function getEdgesBetweenNodes(node1, node2) {
   var edges = [];
   var node1Edges = node1.getEdges();
+
   if (!node1Edges) {
     return edges;
   }
+
   node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
     var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
+
     if (isEdgeBetweenNodes) {
       edges.push(edge);
     }
   });
   return edges;
 }
-
 /**
  * 获得节点间的连线组，连线<=1时返回null
  * @returns
  */
+
 export function getEdgeGroupByNodes(node1, node2) {
   var htEdgeGroup = null;
   getEdgesBetweenNodes(node1, node2).forEach(function (edge) {
@@ -151,19 +163,22 @@ export function getEdgeGroupByNodes(node1, node2) {
       htEdgeGroup = edge.getEdgeGroup();
     }
   });
+
   if (!htEdgeGroup) {
     return null;
   }
+
   return new EdgeGroup(htEdgeGroup);
 }
-
 /**
  * 获得节点间的连线组，连线<=1时返回null
  * @returns
  */
+
 export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
   var node1 = dataModel.getDataByTag(nodeTag1);
   var node2 = dataModel.getDataByTag(nodeTag2);
+
   if (!node1 || !node2) {
     console.warn("getEdgeGroupByNodes 未找到节点", {
       node1: node1,
@@ -173,12 +188,14 @@ export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
     });
     return null;
   }
+
   return getEdgeGroupByNodes(node1, node2);
 }
 export function getEdgeGroups(dataModel) {
   var edgeGroups = [];
   getEdges(dataModel).forEach(function (edge) {
     var group = edge.getEdgeGroup();
+
     if (group && !edgeGroups.includes(group)) {
       edgeGroups.push(group);
     }
@@ -191,6 +208,7 @@ export function getEdgeGroupAgents(dataModel) {
 export function getEdgeDatas(dataModel) {
   return getEdges(dataModel).map(function (element) {
     var _element$getSource, _element$getTarget;
+
     return _extends({}, element.getAttrObject(), {
       source: (_element$getSource = element.getSource()) === null || _element$getSource === void 0 ? void 0 : _element$getSource.getTag(),
       target: (_element$getTarget = element.getTarget()) === null || _element$getTarget === void 0 ? void 0 : _element$getTarget.getTag(),
@@ -203,125 +221,133 @@ export function getNodesByGroupIdOrTag(dataModel, groupIdOrTag) {
     return element.groupId === groupIdOrTag || element.groupTag === groupIdOrTag;
   });
 }
-
 /**
  * 获取分层里的节点列表
  *
  * @param layer
  * @return {*}
  */
+
 export function getLayerChildrenNodes(layer) {
   if (!layer) {
     return [];
   }
+
   return layer.getChildren().getArray().filter(isNode);
 }
-
 /**
  * 获取分层里的节点列表
  *
  * @param layer
  * @return {*}
  */
+
 export function getLayerChildren(layer) {
   if (!layer) {
     return [];
   }
+
   return layer.getChildren().getArray();
 }
-
 /**
  * 获取容器里的子元素列表
  *
  * @param group
  * @return {*}
  */
+
 export function getGroupChildren(group) {
   if (!group) {
     return [];
-  }
-  // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
+  } // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
   // eslint-disable-next-line no-underscore-dangle
+
+
   return group.getChildren().getArray().filter(function (node) {
     return node._layer !== "container_blank";
   });
 }
-
 /**
  * 获取容器里的节点列表
  *
  * @param group
  * @return {*}
  */
+
 export function getGroupChildrenNodes(group) {
   if (!group) {
     return [];
   }
+
   return getGroupChildren(group).filter(isNode);
 }
-
 /**
  * 获取容器里的节点数据列表
  *
  * @param group
  * @return {*}
  */
+
 export function getGroupChildrenData(group) {
   return getGroupChildren(group).map(getNodeData);
 }
 export function setElementRuntimeStyle(element, name, value) {
   var _extends2;
+
   var prevRuntimeStyle = element.a("runtimeStyles") || {};
-  var runtimeStyle = _extends({}, prevRuntimeStyle, (_extends2 = {}, _extends2[name] = value, _extends2));
 
-  // if (prevRuntimeStyle[name] === undefined && value === undefined) {
+  var runtimeStyle = _extends({}, prevRuntimeStyle, (_extends2 = {}, _extends2[name] = value, _extends2)); // if (prevRuntimeStyle[name] === undefined && value === undefined) {
   //   return
   // }
 
+
   if (value === undefined) {
-    runtimeStyle[name] = undefined;
-    // delete runtimeStyle[name]
+    runtimeStyle[name] = undefined; // delete runtimeStyle[name]
   }
 
   element.a("runtimeStyles", runtimeStyle);
 }
-
 /**
  * 判断拓扑图是否存在元素
  */
+
 export function isExistedElement(htTopo, dataModel, data) {
   if (dataModel.getDataByTag(data.id)) {
     return true;
-  }
+  } // 识别区域
+
 
-  // 识别区域
   var element = getElements(dataModel).find(function (item) {
     return data.tag && item.a("tag") === data.tag;
   });
+
   if (element) {
     return true;
-  }
+  } // 连线/连线组
+
 
-  // 连线/连线组
   var edges = getEdges(dataModel);
+
   for (var i = 0; i < edges.length; i++) {
-    var edge = edges[i];
+    var edge = edges[i]; // 如果连线组折叠，判断子连线
 
-    // 如果连线组折叠，判断子连线
     var edgeData = htTopo.getEdgeData(edge);
+
     if (edgeData) {
       // eslint-disable-next-line no-underscore-dangle
       var id = edgeData._attrObject.id;
+
       if (id === data.id) {
         return true;
       }
-    }
-
-    // 如果连线组展开，判断连线组
+    } // 如果连线组展开，判断连线组
     // eslint-disable-next-line no-underscore-dangle
+
+
     if (edge.__edgeGroup && edge.__edgeGroup._tag === data.id) {
       return true;
     }
   }
+
   return false;
 }

package/es/utils/template.js

@@ -1,20 +1,21 @@
 // 空白模板
-export var TPL_BLANK = 'auto';
-// 树状分层
-export var TPL_TREE = 'layers';
-// 分区
-export var TPL_REGION = 'partition';
-// export const TPL_RING = 'ring';
+export var TPL_BLANK = 'auto'; // 树状分层
+
+export var TPL_TREE = 'layers'; // 分区
+
+export var TPL_REGION = 'partition'; // export const TPL_RING = 'ring';
 
 /**
  * 默认布局
  */
+
 export var DEFAULT_LAYOUT = {
   id: 'hierarchical'
 };
 /**
  * 默认容器数据
  */
+
 export var DEFAULT_GROUP = {
   name: '',
   layout: DEFAULT_LAYOUT,

package/es/utils/topoData.js

@@ -12,7 +12,6 @@ import { isClusterHtElement, processCluster } from "./clusterUtil";
 import { isGroup } from "./htElementUtils";
 import v140UpgradeSerializeNodeImageSize from "../core/upgrade/v140UpgradeSerializeNodeImageSize";
 import { getNodeNameVisible } from "../core/models/utils/nodeNameVisibleUtil";
-
 /**
  * 查找数组中对应key的值为value的元素并返回,只查找第一个符合的元素
  * @param {Array} arr 数组
@@ -20,6 +19,7 @@ import { getNodeNameVisible } from "../core/models/utils/nodeNameVisibleUtil";
  * @param {*} value 值
  * @returns {*}
  */
+
 export var findItem = function findItem(arr, key, value) {
   return (arr || []).find(function (item) {
     return item[key] && item[key] === value;
@@ -29,9 +29,8 @@ export var findItemIndex = function findItemIndex(arr, key, value) {
   return (arr || []).findIndex(function (item) {
     return item[key] && item[key] === value;
   });
-};
+}; // 格式化容器
 
-// 格式化容器
 export function formatGroup(group) {
   return _extends({}, group, {
     styles: _extends({
@@ -44,21 +43,18 @@ export function formatGroup(group) {
       showExpanded: true
     }, typeof group.styles === "string" ? JSON.parse(group.styles) : group.styles || {})
   });
-}
+} // 格式化容器
 
-// 格式化容器
 export function formatGroups(groups) {
   return groups.map(formatGroup);
-}
+} // 格式化节点
 
-// 格式化节点
 var tfNode = function tfNode(topoEngine, node) {
   return _extends({}, node, {
     metrics: [],
     attributes: []
   });
 };
-
 /**
  * ip、是否显示名称
  * 
@@ -66,9 +62,12 @@ var tfNode = function tfNode(topoEngine, node) {
  * @param {*} topoData 
  * @returns 
  */
+
+
 function updateNodeInfo(topo, topoData) {
   var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-    nodeTag = _topo$store$getModelS.nodeTag;
+      nodeTag = _topo$store$getModelS.nodeTag;
+
   return _extends({}, topoData, {
     nodes: topoData.nodes.map(function (node) {
       var attributes = node.attributes;
@@ -82,17 +81,19 @@ function updateNodeInfo(topo, topoData) {
       });
     })
   });
-}
+} // 格式化连线
+
 
-// 格式化连线
 var tfLink = function tfLink(engine, link) {
   var _link$permission;
+
   return _extends({}, link, {
     name: (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.readable ? link.name : "未知",
     metrics: [],
     attributes: []
   });
 };
+
 export function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
@@ -106,19 +107,21 @@ export function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-
 /**
  * 格式化拓扑数据
  *
  * @param {*} result
  * @returns
  */
+
 export function parseTopoData(result) {
   var _result$global;
+
   // 修正数据
   var _ref = result.global || {},
-    extraConfig = _ref.extraConfig,
-    otherGlobal = _objectWithoutPropertiesLoose(_ref, _excluded);
+      extraConfig = _ref.extraConfig,
+      otherGlobal = _objectWithoutPropertiesLoose(_ref, _excluded);
+
   return _extends({}, result, {
     groups: result.groups || [],
     nodes: (result.nodes || []).map(parsePermission),
@@ -127,17 +130,18 @@ export function parseTopoData(result) {
     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,
@@ -146,21 +150,24 @@ export function parseTopoData(result) {
     };
   }
 }
-export function buildTopoGraphData() {
-  // TODO 构造拓扑图数据移到这里
+export function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里
 }
+
 function buildGlobal(_ref2) {
   var _result$config, _engine$viewProps, _result$global2, _result$customGlobal, _result$customGlobal2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
+
   var result = _ref2.data,
-    linkTo = _ref2.linkTo,
-    globalConfig = _ref2.globalConfig,
-    engine = _ref2.engine;
+      linkTo = _ref2.linkTo,
+      globalConfig = _ref2.globalConfig,
+      engine = _ref2.engine;
   var edgeFlow;
+
   if ((_result$config = result.config) !== null && _result$config !== void 0 && _result$config.enableLineFlow) {
     edgeFlow = {
       type: "point",
       // 必填，支持传送带drip、光点point、箭头arrow
       direction: "from" // 流动方向，可为空，默认源到目的
+
     };
   }
 
@@ -169,6 +176,7 @@ function buildGlobal(_ref2) {
       type: globalConfig.edgeFlow,
       // 必填，支持传送带drip、光点point、箭头arrow
       direction: globalConfig.edgeFlowDirection || "from" // 流动方向，可为空，默认源到目的
+
     };
   }
 
@@ -209,6 +217,7 @@ function buildGlobal(_ref2) {
     icons: getEditorIcons(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
     getDefaultNodeIcon: engine.options.getDefaultNodeIcon,
+
     /**
      * 编辑界面左侧面板控制元素是否可拖动到区域中node代表拖动的元素，group代表图上的区域
      * 区域不能拖拽到区域
@@ -217,15 +226,18 @@ function buildGlobal(_ref2) {
     canDragElementToGroup: function canDragElementToGroup(element, group) {
       if (!isGroup(group)) {
         return true;
-      }
-      // 区域不能拖拽到区域
+      } // 区域不能拖拽到区域
+
+
       if (element.dtype === 'container' && isGroup(group)) {
         return false;
-      }
-      // 元素不能拖拽到集群
+      } // 元素不能拖拽到集群
+
+
       if (isClusterHtElement(group)) {
         return false;
       }
+
       rlog.debug(element, group);
       return true;
     },
@@ -234,51 +246,52 @@ function buildGlobal(_ref2) {
       rlog.debug('canDragGraphElementsToGroup', {
         elements: elements,
         targetGroup: targetGroup
-      });
-      // 非集群的区域不能拖拽到区域
+      }); // 非集群的区域不能拖拽到区域
+
       if (elements.filter(function (ele) {
         return isGroup(ele) && !isClusterHtElement(ele);
       }).length && isGroup(targetGroup)) {
         return false;
       }
+
       return true;
     }
   };
 }
-
 /**
  * 将从后端接收的数据转化为topo组件中需要的数据
  * 具体格式内容参考
  * https://shimo.im/docs/yphCqyk9yqXWdp3Q/ 《拓扑数据结构》
  */
+
+
 export var combTopoData = function combTopoData(_ref3) {
   var _result$groups;
+
   var data = _ref3.data,
-    linkTo = _ref3.linkTo,
-    globalConfig = _ref3.globalConfig,
-    engine = _ref3.engine;
-  var result = processCluster(updateNodeInfo(engine, data));
-  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
+      linkTo = _ref3.linkTo,
+      globalConfig = _ref3.globalConfig,
+      engine = _ref3.engine;
+  var result = processCluster(updateNodeInfo(engine, data)); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
 
   var config = _extends({
     type: "auto"
-  }, result.config);
+  }, result.config); // global
+
 
-  // global
   var global = buildGlobal({
     data: result,
     linkTo: linkTo,
     globalConfig: globalConfig,
     engine: engine
-  });
+  }); // group
+
+  var groups = formatGroups((_result$groups = result.groups) !== null && _result$groups !== void 0 ? _result$groups : []); // nodes
 
-  // group
-  var groups = formatGroups((_result$groups = result.groups) !== null && _result$groups !== void 0 ? _result$groups : []);
-  // nodes
   var nodes = result.nodes.map(function (node) {
     return tfNode(engine, node);
-  });
-  // links
+  }); // links
+
   var links = result.links.map(function (link) {
     var linkObj = tfLink(engine, link);
     return linkObj;
@@ -295,9 +308,8 @@ export var combTopoData = function combTopoData(_ref3) {
     linkGroups: linkGroups,
     links: links,
     serialize: v140UpgradeSerializeNodeImageSize(result.serialize)
-  };
+  }; // 所有资源
 
-  // 所有资源
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);
   var resAndMetrics = {
     // topo所有ci的id集合
@@ -316,16 +328,13 @@ export var combTopoData = function combTopoData(_ref3) {
         operation: linkObj.operation
       };
     })
-  };
-
-  // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
+  }; // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
 
   return {
     topoData: topoData,
     resAndMetrics: resAndMetrics
   };
 };
-
 /**
  * 获得两个节点间的连线列表
  * @param {*} links
@@ -333,18 +342,19 @@ export var combTopoData = function combTopoData(_ref3) {
  * @param {*} id2
  * @returns
  */
+
 export function getLinksBetweenTwoNodes(links, id1, id2) {
   return links.filter(function (link) {
     return link.source === id1 && link.target === id2 || link.target === id1 && link.source === id2;
   });
 }
-
 /**
  * 将从topo组件返回的数据（global）转化为后端接收的数据
  * 具体格式内容参考
  * https://shimo.im/docs/VKt3HCKHYgJ9kvGP#anchor-g6Hw
  * @param {} conditions
  */
+
 export var combSaveTopoData = function combSaveTopoData(_ref4) {
   var global = _ref4.global;
   var topoDisplayConfig = global.topoDisplayConfig;
@@ -371,24 +381,26 @@ export function transtormElementsToMap(elements) {
   };
   return data;
 }
-
 /**
  * 从拓扑数据中获取区域的子区域、子节点
  * @param {*} elements 
  * @param {*} group 
  * @returns 
  */
+
 export function findGroupChildren(elements, group) {
   var id = group.id,
-    tag = group.tag;
+      tag = group.tag;
   var children = [];
   elements.forEach(function (element) {
     var type = element.type,
-      groupId = element.groupId,
-      groupTag = element.groupTag;
+        groupId = element.groupId,
+        groupTag = element.groupTag;
     var isChild = groupId === id || tag && groupTag === tag;
+
     if (isChild) {
       children.push(element);
+
       if (type === 'group') {
         children.push.apply(children, findGroupChildren(elements, element));
       }