@riil-frontend/component-topology 12.0.0-dev.34 → 12.0.0-dev.36

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -32,8 +32,8 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
-      onClick = props.onClick; // console.log("AlarmListPanel", topo, alarmInfo);
-
+      onClick = props.onClick;
+  console.log("AlarmListPanel", topo, alarmInfo);
   return /*#__PURE__*/React.createElement(_List.Item, {
     className: styles.AlarmListItem,
     media: /*#__PURE__*/React.createElement(_Icon, {

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -77,29 +77,6 @@ export function isNodeAllEdges(topo) {
   });
   return inEdges;
 }
-/**
- * 遍历连线及子连线
- * @param {*} topo 
- * @param {*} edges 
- * @param {*} operateEdgeFn 
- */
-
-export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
-  var htTopo = topo.getHtTopo();
-  edges.forEach(function (edge) {
-    operateEdgeFn(edge);
-
-    if (edge.isEdgeGroupAgent()) {
-      // 连线组折叠时同时设置子连线
-      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
-      edgeChildren.forEach(function (edgeChild) {
-        operateEdgeFn(edgeChild);
-      });
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
-    }
-  });
-}
 /**
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 

package/es/core/hooks/useTopoEdit.js

@@ -95,10 +95,6 @@ var useTopoEdit = function useTopoEdit(params) {
             return topoDispatchers.setTopoType(TPL_TREE);
 
           case 7:
-            // 更新配置
-            // resourceConfig.updateConfig(config);
-            // 更新配置对应的资源、链路
-            // editDispatchers.fetchDataByConfig();
             topo.historyManager.endTransaction();
 
           case 8:

package/es/core/models/Alarm.js

@@ -459,14 +459,14 @@ var Alarm = /*#__PURE__*/function () {
             console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-              _context8.next = 25;
+              _context8.next = 27;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
-            operations = []; // console.log('idsList---------', idsList)
-
+            operations = [];
+            console.log('idsList---------', idsList);
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
@@ -492,21 +492,22 @@ var Alarm = /*#__PURE__*/function () {
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
               }
-            }); // console.log("before-combAlarmData", sendAl, idsList);
+            });
+            console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context8.next = 25;
+              _context8.next = 27;
               break;
             }
 
             rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
-            _context8.prev = 13;
-            _context8.next = 16;
+            _context8.prev = 15;
+            _context8.next = 18;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 16:
+          case 18:
             _yield$alarmDispatche2 = _context8.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -527,19 +528,19 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context8.next = 25;
+            _context8.next = 27;
             break;
 
-          case 22:
-            _context8.prev = 22;
-            _context8.t0 = _context8["catch"](13);
+          case 24:
+            _context8.prev = 24;
+            _context8.t0 = _context8["catch"](15);
             rlog.error('告警发送异常', _context8.t0);
 
-          case 25:
+          case 27:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, this, [[13, 22]]);
+      }, _callee8, this, [[15, 24]]);
     }));
 
     function handleAlarmEvent(_x6) {

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

package/es/core/models/utils/linkUtils.js

@@ -2,8 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from "lodash/keyBy";
-import _ from "lodash";
-import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
+import _ from "lodash"; // 查询所有连线
 
 import { getEdges } from "../../../utils/htElementUtils";
 import CiTypeCache from "../cache/CiTypeCache";
@@ -32,7 +31,20 @@ export function isCrucialLink(link) {
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
+  var _link$attributes;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
+}
+/**
+ * 是否聚合链路
+ * @param {*} link 
+ * @returns 
+ */
+
+export function isAggLink(link) {
+  var _link$attributes2, _link$attributes3;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
 export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
   var linkCiMap = keyBy(links, "id");
@@ -83,7 +95,7 @@ function _getLinksDetail() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!links || !links.length)) {
+          if (links !== null && links !== void 0 && links.length) {
             _context.next = 2;
             break;
           }
@@ -91,9 +103,6 @@ function _getLinksDetail() {
           return _context.abrupt("return", []);
 
         case 2:
-          // const linkCis = await topoService.relation.batchQueryRelation(
-          //   links.map((link) => link.id)
-          // );
           linkCis = links;
           interfaceIds = [].concat(linkCis.map(function (item) {
             return item.attributes.source_id;
@@ -171,17 +180,15 @@ export var showLinkByConfig = function showLinkByConfig(props) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
+        edge.s("x.visible", true);
       } else {
-        var _d$attributes, _d$attributes2;
-
         var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
+        if (isAggLink(d)) {
+          edge.s("x.visible", showAgg);
         } else {
           // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
+          edge.s("x.visible", showPhy);
         }
       }
     });

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

@@ -31,11 +31,12 @@ import NetworkBaseInfo from "./NetworkBaseInfo";
 import { formatMetric } from "../../../../../../utils/metricUtil"; // url 处理，UICBB 的地址需截取前缀
 
 function formatUrl(url) {
-  var _window, _window$location;
+  var _window, _window$location, _window2, _window2$location;
 
   var prefix = '/default/pagecenter';
+  console.log('window?.location?.pathname', (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname, url);
 
-  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+  if (((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$location = _window2.location) === null || _window2$location === void 0 ? void 0 : _window2$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
     return url.split(prefix)[1];
   } else {
     return url;
@@ -337,9 +338,9 @@ export default function ResourceOverview(props) {
         type: record.icon,
         size: "xs",
         className: styles['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/React.createElement(Link, {
+      }), /*#__PURE__*/React.createElement("a", {
         className: styles.link,
-        to: formatUrl(record.link)
+        href: formatUrl(record.link)
       }, value));
     }
   }, {

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -50,8 +50,8 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
-      onClick = props.onClick; // console.log("AlarmListPanel", topo, alarmInfo);
-
+      onClick = props.onClick;
+  console.log("AlarmListPanel", topo, alarmInfo);
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
 exports.isNodeAllEdges = isNodeAllEdges;
-exports.loopEdgesAndChildren = loopEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
 exports.updateEdgesData = updateEdgesData;
 
@@ -89,30 +88,6 @@ function isNodeAllEdges(topo) {
   });
   return inEdges;
 }
-/**
- * 遍历连线及子连线
- * @param {*} topo 
- * @param {*} edges 
- * @param {*} operateEdgeFn 
- */
-
-
-function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
-  var htTopo = topo.getHtTopo();
-  edges.forEach(function (edge) {
-    operateEdgeFn(edge);
-
-    if (edge.isEdgeGroupAgent()) {
-      // 连线组折叠时同时设置子连线
-      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
-      edgeChildren.forEach(function (edgeChild) {
-        operateEdgeFn(edgeChild);
-      });
-      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
-    }
-  });
-}
 /**
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 

package/lib/core/hooks/useTopoEdit.js

@@ -127,10 +127,6 @@ var useTopoEdit = function useTopoEdit(params) {
             return topoDispatchers.setTopoType(_template.TPL_TREE);
 
           case 7:
-            // 更新配置
-            // resourceConfig.updateConfig(config);
-            // 更新配置对应的资源、链路
-            // editDispatchers.fetchDataByConfig();
             topo.historyManager.endTransaction();
 
           case 8:

package/lib/core/models/Alarm.js

@@ -481,14 +481,14 @@ var Alarm = /*#__PURE__*/function () {
             console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-              _context8.next = 25;
+              _context8.next = 27;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
-            operations = []; // console.log('idsList---------', idsList)
-
+            operations = [];
+            console.log('idsList---------', idsList);
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
@@ -514,22 +514,23 @@ var Alarm = /*#__PURE__*/function () {
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
               }
-            }); // console.log("before-combAlarmData", sendAl, idsList);
+            });
+            console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context8.next = 25;
+              _context8.next = 27;
               break;
             }
 
             _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
-            _context8.prev = 13;
-            _context8.next = 16;
+            _context8.prev = 15;
+            _context8.next = 18;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 16:
+          case 18:
             _yield$alarmDispatche2 = _context8.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -550,20 +551,20 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context8.next = 25;
+            _context8.next = 27;
             break;
 
-          case 22:
-            _context8.prev = 22;
-            _context8.t0 = _context8["catch"](13);
+          case 24:
+            _context8.prev = 24;
+            _context8.t0 = _context8["catch"](15);
 
             _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
 
-          case 25:
+          case 27:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, this, [[13, 22]]);
+      }, _callee8, this, [[15, 24]]);
     }));
 
     function handleAlarmEvent(_x6) {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.34" === 'string' ? "12.0.0-dev.34" : null;
+var version = typeof "12.0.0-dev.36" === 'string' ? "12.0.0-dev.36" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/utils/linkUtils.js

@@ -6,6 +6,7 @@ exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
+exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeExportLinkData = void 0;
@@ -22,8 +23,6 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _services = require("../../services");
-
 var _htElementUtils = require("../../../utils/htElementUtils");
 
 var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
@@ -56,7 +55,21 @@ function isCrucialLink(link) {
 
 
 function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
+  var _link$attributes;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
+}
+/**
+ * 是否聚合链路
+ * @param {*} link 
+ * @returns 
+ */
+
+
+function isAggLink(link) {
+  var _link$attributes2, _link$attributes3;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
 
 function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
@@ -107,7 +120,7 @@ function _getLinksDetail() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!links || !links.length)) {
+          if (links !== null && links !== void 0 && links.length) {
             _context.next = 2;
             break;
           }
@@ -115,9 +128,6 @@ function _getLinksDetail() {
           return _context.abrupt("return", []);
 
         case 2:
-          // const linkCis = await topoService.relation.batchQueryRelation(
-          //   links.map((link) => link.id)
-          // );
           linkCis = links;
           interfaceIds = [].concat(linkCis.map(function (item) {
             return item.attributes.source_id;
@@ -200,17 +210,15 @@ var showLinkByConfig = function showLinkByConfig(props) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
+        edge.s("x.visible", true);
       } else {
-        var _d$attributes, _d$attributes2;
-
         var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
+        if (isAggLink(d)) {
+          edge.s("x.visible", showAgg);
         } else {
           // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
+          edge.s("x.visible", showPhy);
         }
       }
     });

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

@@ -65,11 +65,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 // url 处理，UICBB 的地址需截取前缀
 function formatUrl(url) {
-  var _window, _window$location;
+  var _window, _window$location, _window2, _window2$location;
 
   var prefix = '/default/pagecenter';
+  console.log('window?.location?.pathname', (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname, url);
 
-  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+  if (((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$location = _window2.location) === null || _window2$location === void 0 ? void 0 : _window2$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
     return url.split(prefix)[1];
   } else {
     return url;
@@ -371,9 +372,9 @@ function ResourceOverview(props) {
         type: record.icon,
         size: "xs",
         className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+      }), /*#__PURE__*/_react["default"].createElement("a", {
         className: _indexModule["default"].link,
-        to: formatUrl(record.link)
+        href: formatUrl(record.link)
       }, value));
     }
   }, {

package/package.json

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