@riil-frontend/component-topology 11.0.29 → 11.0.30

package/lib/utils/topoData.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports.buildTopoGraphData = buildTopoGraphData;
 exports.combTopoData = exports.combSaveTopoData = void 0;
@@ -13,20 +14,35 @@ exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
 exports.parseTopoData = parseTopoData;
 exports.transtormElementsToMap = transtormElementsToMap;
+
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
+
 var _buildContextmenu = _interopRequireDefault(require("../core/viewer/contextmenu/buildContextmenu"));
+
 var _buildContextmenu2 = _interopRequireDefault(require("../core/editor/contextmenu/buildContextmenu"));
+
 var _mergeContextmenu = _interopRequireDefault(require("../core/common/contextmenu/mergeContextmenu"));
+
 var _icon = require("../core/common/icons/icon");
+
 var _backgroundUtil = require("../core/utils/backgroundUtil");
+
 var _clusterUtil = require("./clusterUtil");
+
 var _htElementUtils = require("./htElementUtils");
+
 var _v140UpgradeSerializeNodeImageSize = _interopRequireDefault(require("../core/upgrade/v140UpgradeSerializeNodeImageSize"));
+
 var _nodeNameVisibleUtil = require("../core/models/utils/nodeNameVisibleUtil");
+
 var _excluded = ["extraConfig"];
+
 /**
  * 查找数组中对应key的值为value的元素并返回,只查找第一个符合的元素
  * @param {Array} arr 数组
@@ -39,15 +55,18 @@ var findItem = function findItem(arr, key, value) {
     return item[key] && item[key] === value;
   });
 };
+
 exports.findItem = findItem;
+
 var findItemIndex = function findItemIndex(arr, key, value) {
   return (arr || []).findIndex(function (item) {
     return item[key] && item[key] === value;
   });
-};
+}; // 格式化容器
+
 
-// 格式化容器
 exports.findItemIndex = findItemIndex;
+
 function formatGroup(group) {
   return (0, _extends2["default"])({}, group, {
     styles: (0, _extends2["default"])({
@@ -60,21 +79,20 @@ function formatGroup(group) {
       showExpanded: true
     }, typeof group.styles === "string" ? JSON.parse(group.styles) : group.styles || {})
   });
-}
+} // 格式化容器
+
 
-// 格式化容器
 function formatGroups(groups) {
   return groups.map(formatGroup);
-}
+} // 格式化节点
+
 
-// 格式化节点
 var tfNode = function tfNode(topoEngine, node) {
   return (0, _extends2["default"])({}, node, {
     metrics: [],
     attributes: []
   });
 };
-
 /**
  * ip、是否显示名称
  * 
@@ -82,9 +100,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 (0, _extends2["default"])({}, topoData, {
     nodes: topoData.nodes.map(function (node) {
       var attributes = node.attributes;
@@ -98,17 +119,19 @@ function updateNodeInfo(topo, topoData) {
       });
     })
   });
-}
+} // 格式化连线
+
 
-// 格式化连线
 var tfLink = function tfLink(engine, link) {
   var _link$permission;
+
   return (0, _extends2["default"])({}, link, {
     name: (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.readable ? link.name : "未知",
     metrics: [],
     attributes: []
   });
 };
+
 function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
@@ -118,23 +141,27 @@ function getCiTypesFromCiElements(allCi) {
   });
   return ciTypes;
 }
+
 function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-
 /**
  * 格式化拓扑数据
  *
  * @param {*} result
  * @returns
  */
+
+
 function parseTopoData(result) {
   var _result$global;
+
   // 修正数据
   var _ref = result.global || {},
-    extraConfig = _ref.extraConfig,
-    otherGlobal = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
+      extraConfig = _ref.extraConfig,
+      otherGlobal = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
+
   return (0, _extends2["default"])({}, result, {
     groups: result.groups || [],
     nodes: (result.nodes || []).map(parsePermission),
@@ -143,17 +170,18 @@ function parseTopoData(result) {
     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,
@@ -162,21 +190,25 @@ function parseTopoData(result) {
     };
   }
 }
-function buildTopoGraphData() {
-  // TODO 构造拓扑图数据移到这里
+
+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" // 流动方向，可为空，默认源到目的
+
     };
   }
 
@@ -185,6 +217,7 @@ function buildGlobal(_ref2) {
       type: globalConfig.edgeFlow,
       // 必填，支持传送带drip、光点point、箭头arrow
       direction: globalConfig.edgeFlowDirection || "from" // 流动方向，可为空，默认源到目的
+
     };
   }
 
@@ -225,6 +258,7 @@ function buildGlobal(_ref2) {
     icons: (0, _icon.getEditorIcons)(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
     getDefaultNodeIcon: engine.options.getDefaultNodeIcon,
+
     /**
      * 编辑界面左侧面板控制元素是否可拖动到区域中node代表拖动的元素，group代表图上的区域
      * 区域不能拖拽到区域
@@ -233,16 +267,20 @@ function buildGlobal(_ref2) {
     canDragElementToGroup: function canDragElementToGroup(element, group) {
       if (!(0, _htElementUtils.isGroup)(group)) {
         return true;
-      }
-      // 区域不能拖拽到区域
+      } // 区域不能拖拽到区域
+
+
       if (element.dtype === 'container' && (0, _htElementUtils.isGroup)(group)) {
         return false;
-      }
-      // 元素不能拖拽到集群
+      } // 元素不能拖拽到集群
+
+
       if ((0, _clusterUtil.isClusterHtElement)(group)) {
         return false;
       }
+
       _rlog["default"].debug(element, group);
+
       return true;
     },
     // 图上元素能否拖动到区域中
@@ -250,51 +288,52 @@ function buildGlobal(_ref2) {
       _rlog["default"].debug('canDragGraphElementsToGroup', {
         elements: elements,
         targetGroup: targetGroup
-      });
-      // 非集群的区域不能拖拽到区域
+      }); // 非集群的区域不能拖拽到区域
+
+
       if (elements.filter(function (ele) {
         return (0, _htElementUtils.isGroup)(ele) && !(0, _clusterUtil.isClusterHtElement)(ele);
       }).length && (0, _htElementUtils.isGroup)(targetGroup)) {
         return false;
       }
+
       return true;
     }
   };
 }
-
 /**
  * 将从后端接收的数据转化为topo组件中需要的数据
  * 具体格式内容参考
  * https://shimo.im/docs/yphCqyk9yqXWdp3Q/ 《拓扑数据结构》
  */
+
+
 var combTopoData = function combTopoData(_ref3) {
   var _result$groups;
+
   var data = _ref3.data,
-    linkTo = _ref3.linkTo,
-    globalConfig = _ref3.globalConfig,
-    engine = _ref3.engine;
-  var result = (0, _clusterUtil.processCluster)(updateNodeInfo(engine, data));
-  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
+      linkTo = _ref3.linkTo,
+      globalConfig = _ref3.globalConfig,
+      engine = _ref3.engine;
+  var result = (0, _clusterUtil.processCluster)(updateNodeInfo(engine, data)); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
 
   var config = (0, _extends2["default"])({
     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;
@@ -311,9 +350,8 @@ var combTopoData = function combTopoData(_ref3) {
     linkGroups: linkGroups,
     links: links,
     serialize: (0, _v140UpgradeSerializeNodeImageSize["default"])(result.serialize)
-  };
+  }; // 所有资源
 
-  // 所有资源
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);
   var resAndMetrics = {
     // topo所有ci的id集合
@@ -332,16 +370,13 @@ 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
@@ -349,23 +384,29 @@ var combTopoData = function combTopoData(_ref3) {
  * @param {*} id2
  * @returns
  */
+
+
 exports.combTopoData = combTopoData;
+
 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
  */
+
+
 var combSaveTopoData = function combSaveTopoData(_ref4) {
   var global = _ref4.global;
   var topoDisplayConfig = global.topoDisplayConfig;
+
   _rlog["default"].debug("combSaveTopoData", global);
+
   var extraConfig = JSON.stringify({
     topoDisplayConfig: topoDisplayConfig
   });
@@ -374,7 +415,9 @@ var combSaveTopoData = function combSaveTopoData(_ref4) {
     extraConfig: extraConfig
   };
 };
+
 exports.combSaveTopoData = combSaveTopoData;
+
 function transtormElementsToMap(elements) {
   var data = {
     groups: elements.filter(function (ele) {
@@ -389,24 +432,27 @@ function transtormElementsToMap(elements) {
   };
   return data;
 }
-
 /**
  * 从拓扑数据中获取区域的子区域、子节点
  * @param {*} elements 
  * @param {*} group 
  * @returns 
  */
+
+
 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));
       }

package/lib/utils/topoMocks.js

@@ -159,8 +159,8 @@ var getTopoMockData = {
     name: '获取了奇怪的拓扑',
     viewType: 'topocenter',
     layout: 'circular' // 布局方式
-  },
 
+  },
   global: {
     alarmSwitch: true,
     // 告警开关
@@ -172,9 +172,9 @@ var getTopoMockData = {
         tips: true,
         //  是否显示在tips上
         tags: false // 是否在图数据上
+
       }]
     },
-
     metric: {
       ruijieSwitch: [{
         code: 'ifBandWidthRatio',
@@ -182,10 +182,10 @@ var getTopoMockData = {
         tips: true,
         //  是否显示在tips上
         tags: false // 是否在图数据上
+
       }]
     }
   },
-
   // layouts: null,
   nodes: [{
     id: '00000000000123',
@@ -239,5 +239,6 @@ var getTopoMockData = {
     }
   }],
   serialize: '' // HT编辑后生成的数据，无需关心
+
 };
 exports.getTopoMockData = getTopoMockData;

package/lib/utils/topoPermissionUtil.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports["default"] = void 0;
+
 /**
  * 拓扑权限工具类
  */

package/lib/utils/tree.js

@@ -1,42 +1,52 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports.findNodeById = findNodeById;
 exports.findParentIdsById = findParentIdsById;
 exports.formatTree = formatTree;
 exports.treeNodeCount = exports.loopTreeFun = exports.loopTreeByKey = exports.loopTree = exports.iconImg = void 0;
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _treeUtil = require("./treeUtil");
-var iconImg = ['/img/topo/Tree_Icon_Folder1.svg', '/img/topo/Tree_Icon_Topology.svg'];
 
+var iconImg = ['/img/topo/Tree_Icon_Folder1.svg', '/img/topo/Tree_Icon_Topology.svg'];
 /**
  * 递归数组生成树结构
  * @param {array} json
  * @param {object} funcPermissions
  */
+
 exports.iconImg = iconImg;
+
 function formatTree(json, funcPermissions) {
   var def = -1;
   var topoArr = [];
+
   var loop = function loop(data) {
     return data.map(function (node) {
       if (!node) {
         return;
       }
+
       var id = node.id,
-        name = node.name,
-        menuOrder = node.menuOrder,
-        icon = node.icon,
-        parentId = node.parentId,
-        showDefault = node.showDefault,
-        type = node.type;
+          name = node.name,
+          menuOrder = node.menuOrder,
+          icon = node.icon,
+          parentId = node.parentId,
+          showDefault = node.showDefault,
+          type = node.type;
+
       if (showDefault) {
         def = "" + id;
       }
+
       if (node.type === 1) {
         topoArr.push(node);
       }
+
       return {
         data: node,
         id: "" + id,
@@ -51,36 +61,45 @@ function formatTree(json, funcPermissions) {
       };
     });
   };
+
   var result = loop(json);
+
   if (topoArr.length > 0 && def < 0) {
     def = topoArr[0].id;
-  }
-  // rlog.debug('默认拓扑', `${def}`, result);
+  } // rlog.debug('默认拓扑', `${def}`, result);
+
+
   return [loop(json), "" + def];
 }
 /**
  * 递归循环遍历树并匹配ID
  * @param {array} json
  */
+
+
 var loopTree = function loopTree(data, key, callback, pid) {
   if (pid === void 0) {
     pid = -1;
   }
+
   data.forEach(function (item, index, arr) {
     if (item.id === "" + key) {
       // rlog.debug('loopTree:', item, pid);
       return callback(item, index, arr, "" + pid);
     }
+
     if (item !== null && item !== void 0 && item.children) {
       return loopTree(item.children, "" + key, callback, "" + item.id);
     }
   });
 };
-
 /**
  * 按id查找节点
  */
+
+
 exports.loopTree = loopTree;
+
 function findNodeById(tree, id) {
   var node = null;
   loopTree(tree, id, function (item) {
@@ -88,31 +107,38 @@ function findNodeById(tree, id) {
   });
   return node;
 }
-
 /**
  * 按id查找祖先节点id列表
  */
+
+
 function findParentIdsById(tree, id) {
   var node = findNodeById(tree, id);
+
   if (!node) {
     return [];
   }
+
   var parentId = "" + node.parentId;
+
   if (parentId === '-1') {
     return [];
   }
+
   return [parentId].concat(findParentIdsById(tree, parentId));
 }
-
 /**
  * 递归循环遍历树匹配KEY
  * @param {array} json
  */
+
+
 var loopTreeByKey = function loopTreeByKey(data, key, value, callback) {
   data.forEach(function (item, index, arr) {
     if (item[key] === value) {
       return callback(item, index, arr);
     }
+
     if (item !== null && item !== void 0 && item.children) {
       return loopTreeByKey(item.children, key, value, callback);
     }
@@ -122,19 +148,23 @@ var loopTreeByKey = function loopTreeByKey(data, key, value, callback) {
  * 单纯递归循环遍历树
  * @param {array} data
  */
+
+
 exports.loopTreeByKey = loopTreeByKey;
 var loopTreeFun = _treeUtil.loopTreeNode;
-
 /**
  * 更新文件夹下拓扑数量（目前只支持两级文件夹计算）
  * @param {array} data
  */
+
 exports.loopTreeFun = loopTreeFun;
+
 var treeNodeCount = function treeNodeCount(data) {
   return (data || []).map(function (item) {
     var type = item.type,
-      children = item.children;
+        children = item.children;
     var count = 0;
+
     if (children !== null && children !== void 0 && children.length) {
       loopTreeFun(children, function (item) {
         if (item.type === 1) {
@@ -142,10 +172,12 @@ var treeNodeCount = function treeNodeCount(data) {
         }
       });
     }
+
     return (0, _extends2["default"])({}, item, {
       count: count,
       children: treeNodeCount(children)
     });
   });
 };
+
 exports.treeNodeCount = treeNodeCount;

package/lib/utils/treeUtil.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.loopTreeNode = void 0;
+
 /**
  * 单纯递归循环遍历树
  * @param {array} data
@@ -11,7 +12,9 @@ var loopTreeNode = function loopTreeNode(data, callback) {
     if (item !== null && item !== void 0 && item.children) {
       loopTreeNode(item.children, callback);
     }
+
     callback(item, index, arr);
   });
 };
+
 exports.loopTreeNode = loopTreeNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "11.0.29",
+  "version": "11.0.30",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -81,7 +81,7 @@
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
     "@riil-frontend/utils": "^1.0.20",
     "axios": "^0.21.1",
-    "build-plugin-component": "^1.9.2",
+    "build-plugin-component": "^1.12.1",
     "build-plugin-fusion": "^0.1.0",
     "build-plugin-moment-locales": "^0.1.0",
     "build-scripts": "^1.1.1",
@@ -118,6 +118,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.29/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.30/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }