@riil-frontend/component-topology 10.0.28 → 10.0.30

package/es/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -12,13 +12,13 @@ export default function useHtDataPropertyChangeListener(props) {
     var dm = topo.getDataModel();
     var inited = false;
 
-    if (graphLoaded || graphLoaded2) {
+    if (dm) {
       dm.addDataPropertyChangeListener(onChange);
       inited = true;
     }
 
     return function () {
-      if (inited) {
+      if (inited && dm) {
         dm.removeDataPropertyChangeListener(onChange);
       }
     };

package/es/core/models/AttributeMetricDisplay.js

@@ -144,7 +144,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   _proto.filterCiFiledConfigItems = function filterCiFiledConfigItems(data, ciTypeItemConfigs) {
     // 无权限不显示标注、悬浮框
     var filterByPermission = function filterByPermission(resource, items) {
-      return resource.operation ? items : [];
+      return resource.permission.readable ? items : [];
     };
 
     var list = filterByPermission(data, ciTypeItemConfigs); // 未监控不显示指标

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.28" === 'string' ? "10.0.28" : null;
+var version = typeof "10.0.30" === 'string' ? "10.0.30" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/store/models/viewer/resourceDetail.js

@@ -23,6 +23,13 @@ export default {
 
       };
     },
+    open: function open(prevState, id) {
+      return {
+        visible: true,
+        id: id // 资源id
+
+      };
+    },
     close: function close() {
       return {
         visible: false,

package/es/core/utils/linkUtil.js

@@ -0,0 +1,12 @@
+/**
+ * 
+ * @param {Array} links 
+ * @param {Array} ids1 
+ * @param {Array} ids2 
+ * @returns 
+ */
+export function getLinksInNodes(links, ids1, ids2) {
+  return links.filter(function (link) {
+    return ids1.includes(link.source) && ids2.includes(link.target) || ids2.includes(link.source) && ids1.includes(link.target);
+  });
+}

package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -62,8 +62,9 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
+    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: htElement.getTag() || "ht:" + htElement.getId(),
+      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }
@@ -140,10 +141,9 @@ function useElementDetailManager(props) {
     var resourceData = topo.dataModel.getDataById(id); // 如果是资源/链路，没有权限不显示
 
     if (resourceData) {
-      var operation = resourceData.operation,
-          permission = resourceData.permission;
+      var permission = resourceData.permission;
 
-      if (!operation && !(permission !== null && permission !== void 0 && permission.readable)) {
+      if (!(permission !== null && permission !== void 0 && permission.readable)) {
         return;
       }
     } // 自定义显示方法

package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -42,10 +42,11 @@ function ResourceDetailDrawer(props) {
       detailManager: detailManager
     }),
     onClose: detailManager.close
-  }, visible && /*#__PURE__*/React.createElement(Content, _extends({}, props, {
+  }, visible && Content && /*#__PURE__*/React.createElement(Content, _extends({}, props, {
     topo: topo,
     id: id,
     htElement: htElement,
+    detailManager: detailManager,
     viewerProps: viewerProps,
     onClose: detailManager.close
   })));

package/es/core/viewer/components/plugins/ResourceDetail/components/DrawerTitle.js

@@ -46,9 +46,11 @@ function NodeDrawerTitle(_ref) {
       return detailManager.openByDataId(key);
     }
   }, isAvailableArray(filterNodes) && filterNodes.length ? filterNodes.map(function (item) {
+    var _item$permission;
+
     return /*#__PURE__*/React.createElement(_MenuButton.Item, {
       key: item.id,
-      disabled: !item.operation
+      disabled: !((_item$permission = item.permission) !== null && _item$permission !== void 0 && _item$permission.readable)
     }, item.name);
   }) : /*#__PURE__*/React.createElement("div", {
     className: styles['not-data']

package/es/core/viewer/contextmenu/buildLinkContextmenu.js

@@ -6,7 +6,7 @@ export default function buildContextMenu(topoApp) {
       //   id: 'Resource.detail',
       //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
       //   visible: (data) => {
-      //     return !!data.operation;
+      //     return !!data.permission?.readable;
       //   }
       // },
       // { label: '监控策略', id: 'monitoring_strategy' },

package/es/core/viewer/contextmenu/buildNodeContextmenu.js

@@ -10,14 +10,14 @@ export default function buildNodeContextmenu(topoApp) {
       //   id: 'Resource.detail',
       //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
       //   visible: (data) => {
-      //     return isResource(data) && !!data.operation;
+      //     return isResource(data) && !!data.permission?.readable;
       //   }
       // },
       // {
       //   label: 'Web控制台',
       //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
       //   visible: (data) => {
-      //     return isResource(data) && !!data.operation;
+      //     return isResource(data) && !!data.permission?.readable;
       //   },
       //   items: [
       //     {
@@ -47,7 +47,7 @@ export default function buildNodeContextmenu(topoApp) {
       //     const {domain} = ciMeta;
       //     // 是否有该页签，与资源详情保持一致
       //     const hasTab = domain === 'network' || domain === 'server';
-      //     return !!data.operation && hasTab;
+      //     return !!data.permission?.readable && hasTab;
       //   }
       // },
       // {
@@ -66,7 +66,7 @@ export default function buildNodeContextmenu(topoApp) {
       //     const {domain} = ciMeta;
       //     // 是否有该页签，与资源详情保持一致
       //     const hasTab = domain === 'network' || domain === 'server';
-      //     return !!data.operation && hasTab;
+      //     return !!data.permission?.readable && hasTab;
       //   }
       // },
       // { label: '打开属性设置', id: 'openSet' },

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -1,9 +1,38 @@
-// 获得连线组标注配置的链路id。无配置时取默认链路
-export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
-  // const { } = options
+import { getLinksInNodes } from "../../core/utils/linkUtil";
+/**
+ * 查询节点/区域及子节点
+ * @param {*} nodes 
+ * @returns 
+ */
+
+var getChildrenNodes = function getChildrenNodes(nodes) {
+  var allNodes = [].concat(nodes);
+  nodes.forEach(function (node) {
+    if (node instanceof ht.Group) {
+      var children = node.getChildren().toArray();
+      allNodes.push.apply(allNodes, getChildrenNodes(children));
+    }
+  });
+  return allNodes;
+};
+/**
+ * 查询连线两端节点间的链路列表
+ * @param {*} topo 
+ * @param {*} edgeGroup 
+ * @returns 
+ */
+
+
+export function getLinksByEdgeGroup(topo, edgeGroup) {
   var sourceId = edgeGroup.getSource().getTag();
   var targetId = edgeGroup.getTarget().getTag();
-  var links = topo.dataModel.getEdgesBetweenTwoNodes(sourceId, targetId);
+  var links = getLinksInNodes(topo.dataModel.getEdges(), [sourceId], [targetId]);
+  return links;
+} // 获得连线组标注配置的链路id。无配置时取默认链路
+
+export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
+  // const { } = options
+  var links = getLinksByEdgeGroup(topo, edgeGroup);
 
   if (!links.length) {
     return null;

package/es/networkTopo/utils/resourcePermissionUtil.js

@@ -12,6 +12,7 @@ export function parseBasicPermission(operation) {
 }
 /**
  * 获得链路权限
+ * 关键链路使用权限中心配置，普通链路根据两端权限计算
  *
  * @param {*} link
  * @param {*} source
@@ -20,28 +21,7 @@ export function parseBasicPermission(operation) {
  */
 
 export function getLinkPermission(link, source, target) {
-  // 关键链路使用权限中心配置
-  if (isCrucialLink(link)) {
-    return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
-  }
-
-  var deviceNodes = target ? [source, target] : [source];
-
-  var isWriteable = function isWriteable() {
-    return deviceNodes.filter(function (node) {
-      return ['write', 'delete'].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
-    }).length === deviceNodes.length;
-  };
-
-  return {
-    readable: !!(source !== null && source !== void 0 && source.operation) || !!(target !== null && target !== void 0 && target.operation),
-    // 一端设备有权限可查看
-    writeable: isWriteable(),
-    // 两端设备都有编辑权限可编辑（出口链路仅验证一端）
-    deleteable: deviceNodes.filter(function (node) {
-      return ['write', 'delete'].includes(node === null || node === void 0 ? void 0 : node.operation);
-    }).length >= 1
-  };
+  return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
 }
 /**
  * 适配接口

package/es/utils/clusterUtil.js

@@ -21,13 +21,15 @@ export function processCluster(topoData) {
 }
 export function buildClusterGroups(nodes) {
   return findClusters(nodes).map(function (n) {
+    var _n$permission;
+
     return _extends({
       tag: null,
       parentId: n.groupId,
       parentTag: n.groupTag
     }, n, {
       elementTemplate: 'cluster',
-      expandable: !!n.operation,
+      expandable: !!((_n$permission = n.permission) !== null && _n$permission !== void 0 && _n$permission.readable),
       // 无权限禁用展开折叠
       styles: {
         showExpanded: false // 是否默认展开

package/es/utils/topoData.js

@@ -77,8 +77,10 @@ function updateNodeInfo(topoEngine, topoData) {
 
 
 var tfLink = function tfLink(engine, link) {
+  var _link$permission;
+
   return _extends({}, link, {
-    name: link.operation ? link.name : "未知",
+    name: (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.readable ? link.name : "未知",
     metrics: [],
     attributes: []
   });

package/lib/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -21,13 +21,13 @@ function useHtDataPropertyChangeListener(props) {
     var dm = topo.getDataModel();
     var inited = false;
 
-    if (graphLoaded || graphLoaded2) {
+    if (dm) {
       dm.addDataPropertyChangeListener(onChange);
       inited = true;
     }
 
     return function () {
-      if (inited) {
+      if (inited && dm) {
         dm.removeDataPropertyChangeListener(onChange);
       }
     };

package/lib/core/models/AttributeMetricDisplay.js

@@ -161,7 +161,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   _proto.filterCiFiledConfigItems = function filterCiFiledConfigItems(data, ciTypeItemConfigs) {
     // 无权限不显示标注、悬浮框
     var filterByPermission = function filterByPermission(resource, items) {
-      return resource.operation ? items : [];
+      return resource.permission.readable ? items : [];
     };
 
     var list = filterByPermission(data, ciTypeItemConfigs); // 未监控不显示指标

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.28" === 'string' ? "10.0.28" : null;
+var version = typeof "10.0.30" === 'string' ? "10.0.30" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/viewer/resourceDetail.js

@@ -31,6 +31,13 @@ var _default = {
 
       };
     },
+    open: function open(prevState, id) {
+      return {
+        visible: true,
+        id: id // 资源id
+
+      };
+    },
     close: function close() {
       return {
         visible: false,

package/lib/core/utils/linkUtil.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getLinksInNodes = getLinksInNodes;
+
+/**
+ * 
+ * @param {Array} links 
+ * @param {Array} ids1 
+ * @param {Array} ids2 
+ * @returns 
+ */
+function getLinksInNodes(links, ids1, ids2) {
+  return links.filter(function (link) {
+    return ids1.includes(link.source) && ids2.includes(link.target) || ids2.includes(link.source) && ids1.includes(link.target);
+  });
+}

package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -74,8 +74,9 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
+    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: htElement.getTag() || "ht:" + htElement.getId(),
+      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }
@@ -152,10 +153,9 @@ function useElementDetailManager(props) {
     var resourceData = topo.dataModel.getDataById(id); // 如果是资源/链路，没有权限不显示
 
     if (resourceData) {
-      var operation = resourceData.operation,
-          permission = resourceData.permission;
+      var permission = resourceData.permission;
 
-      if (!operation && !(permission !== null && permission !== void 0 && permission.readable)) {
+      if (!(permission !== null && permission !== void 0 && permission.readable)) {
         return;
       }
     } // 自定义显示方法

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -58,10 +58,11 @@ function ResourceDetailDrawer(props) {
       detailManager: detailManager
     }),
     onClose: detailManager.close
-  }, visible && /*#__PURE__*/_react["default"].createElement(Content, (0, _extends2["default"])({}, props, {
+  }, visible && Content && /*#__PURE__*/_react["default"].createElement(Content, (0, _extends2["default"])({}, props, {
     topo: topo,
     id: id,
     htElement: htElement,
+    detailManager: detailManager,
     viewerProps: viewerProps,
     onClose: detailManager.close
   })));

package/lib/core/viewer/components/plugins/ResourceDetail/components/DrawerTitle.js

@@ -61,9 +61,11 @@ function NodeDrawerTitle(_ref) {
       return detailManager.openByDataId(key);
     }
   }, (0, _utils.isAvailableArray)(filterNodes) && filterNodes.length ? filterNodes.map(function (item) {
+    var _item$permission;
+
     return /*#__PURE__*/_react["default"].createElement(_menuButton["default"].Item, {
       key: item.id,
-      disabled: !item.operation
+      disabled: !((_item$permission = item.permission) !== null && _item$permission !== void 0 && _item$permission.readable)
     }, item.name);
   }) : /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['not-data']

package/lib/core/viewer/contextmenu/buildLinkContextmenu.js

@@ -11,7 +11,7 @@ function buildContextMenu(topoApp) {
       //   id: 'Resource.detail',
       //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
       //   visible: (data) => {
-      //     return !!data.operation;
+      //     return !!data.permission?.readable;
       //   }
       // },
       // { label: '监控策略', id: 'monitoring_strategy' },

package/lib/core/viewer/contextmenu/buildNodeContextmenu.js

@@ -15,14 +15,14 @@ function buildNodeContextmenu(topoApp) {
       //   id: 'Resource.detail',
       //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
       //   visible: (data) => {
-      //     return isResource(data) && !!data.operation;
+      //     return isResource(data) && !!data.permission?.readable;
       //   }
       // },
       // {
       //   label: 'Web控制台',
       //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
       //   visible: (data) => {
-      //     return isResource(data) && !!data.operation;
+      //     return isResource(data) && !!data.permission?.readable;
       //   },
       //   items: [
       //     {
@@ -52,7 +52,7 @@ function buildNodeContextmenu(topoApp) {
       //     const {domain} = ciMeta;
       //     // 是否有该页签，与资源详情保持一致
       //     const hasTab = domain === 'network' || domain === 'server';
-      //     return !!data.operation && hasTab;
+      //     return !!data.permission?.readable && hasTab;
       //   }
       // },
       // {
@@ -71,7 +71,7 @@ function buildNodeContextmenu(topoApp) {
       //     const {domain} = ciMeta;
       //     // 是否有该页签，与资源详情保持一致
       //     const hasTab = domain === 'network' || domain === 'server';
-      //     return !!data.operation && hasTab;
+      //     return !!data.permission?.readable && hasTab;
       //   }
       // },
       // { label: '打开属性设置', id: 'openSet' },

package/lib/networkTopo/utils/edgeGroupTagUtil.js

@@ -4,13 +4,44 @@ exports.__esModule = true;
 exports.getEdgeGroupConfigId = getEdgeGroupConfigId;
 exports.getEdgeGroupLinkConfig = getEdgeGroupLinkConfig;
 exports.getEdgeGroupLinkIdConfig = getEdgeGroupLinkIdConfig;
+exports.getLinksByEdgeGroup = getLinksByEdgeGroup;
 
-// 获得连线组标注配置的链路id。无配置时取默认链路
-function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
-  // const { } = options
+var _linkUtil = require("../../core/utils/linkUtil");
+
+/**
+ * 查询节点/区域及子节点
+ * @param {*} nodes 
+ * @returns 
+ */
+var getChildrenNodes = function getChildrenNodes(nodes) {
+  var allNodes = [].concat(nodes);
+  nodes.forEach(function (node) {
+    if (node instanceof ht.Group) {
+      var children = node.getChildren().toArray();
+      allNodes.push.apply(allNodes, getChildrenNodes(children));
+    }
+  });
+  return allNodes;
+};
+/**
+ * 查询连线两端节点间的链路列表
+ * @param {*} topo 
+ * @param {*} edgeGroup 
+ * @returns 
+ */
+
+
+function getLinksByEdgeGroup(topo, edgeGroup) {
   var sourceId = edgeGroup.getSource().getTag();
   var targetId = edgeGroup.getTarget().getTag();
-  var links = topo.dataModel.getEdgesBetweenTwoNodes(sourceId, targetId);
+  var links = (0, _linkUtil.getLinksInNodes)(topo.dataModel.getEdges(), [sourceId], [targetId]);
+  return links;
+} // 获得连线组标注配置的链路id。无配置时取默认链路
+
+
+function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
+  // const { } = options
+  var links = getLinksByEdgeGroup(topo, edgeGroup);
 
   if (!links.length) {
     return null;

package/lib/networkTopo/utils/resourcePermissionUtil.js

@@ -26,6 +26,7 @@ function parseBasicPermission(operation) {
 }
 /**
  * 获得链路权限
+ * 关键链路使用权限中心配置，普通链路根据两端权限计算
  *
  * @param {*} link
  * @param {*} source
@@ -35,28 +36,7 @@ function parseBasicPermission(operation) {
 
 
 function getLinkPermission(link, source, target) {
-  // 关键链路使用权限中心配置
-  if ((0, _linkUtils.isCrucialLink)(link)) {
-    return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
-  }
-
-  var deviceNodes = target ? [source, target] : [source];
-
-  var isWriteable = function isWriteable() {
-    return deviceNodes.filter(function (node) {
-      return ['write', 'delete'].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
-    }).length === deviceNodes.length;
-  };
-
-  return {
-    readable: !!(source !== null && source !== void 0 && source.operation) || !!(target !== null && target !== void 0 && target.operation),
-    // 一端设备有权限可查看
-    writeable: isWriteable(),
-    // 两端设备都有编辑权限可编辑（出口链路仅验证一端）
-    deleteable: deviceNodes.filter(function (node) {
-      return ['write', 'delete'].includes(node === null || node === void 0 ? void 0 : node.operation);
-    }).length >= 1
-  };
+  return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
 }
 /**
  * 适配接口

package/lib/utils/clusterUtil.js

@@ -43,13 +43,15 @@ function processCluster(topoData) {
 
 function buildClusterGroups(nodes) {
   return findClusters(nodes).map(function (n) {
+    var _n$permission;
+
     return (0, _extends2["default"])({
       tag: null,
       parentId: n.groupId,
       parentTag: n.groupTag
     }, n, {
       elementTemplate: 'cluster',
-      expandable: !!n.operation,
+      expandable: !!((_n$permission = n.permission) !== null && _n$permission !== void 0 && _n$permission.readable),
       // 无权限禁用展开折叠
       styles: {
         showExpanded: false // 是否默认展开

package/lib/utils/topoData.js

@@ -115,8 +115,10 @@ function updateNodeInfo(topoEngine, topoData) {
 
 
 var tfLink = function tfLink(engine, link) {
+  var _link$permission;
+
   return (0, _extends2["default"])({}, link, {
-    name: link.operation ? link.name : "未知",
+    name: (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.readable ? link.name : "未知",
     metrics: [],
     attributes: []
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "10.0.28",
+  "version": "10.0.30",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.28/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@10.0.30/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }