@riil-frontend/component-topology 5.0.7 → 5.0.10

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

@@ -10,6 +10,7 @@ exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeLinksData = mergeLinksData;
+exports.showLinkByConfig = exports.plurals = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -25,6 +26,9 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _services = require("../../services");
 
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+// 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
@@ -197,4 +201,59 @@ function _getLinksDetail() {
   return _getLinksDetail.apply(this, arguments);
 }
 
-function buildTopoLinkData() {}
+function buildTopoLinkData() {}
+/**
+ * 链路显示模式
+ */
+
+
+var plurals = {
+  0: [],
+  1: [],
+  2: ["phy"],
+  3: ["agg"],
+  4: ["phy", "agg"]
+};
+exports.plurals = plurals;
+
+var showLinkByConfig = function showLinkByConfig(props) {
+  var _plurals$showType;
+
+  var topo = props.topo,
+      _props$showType = props.showType,
+      showType = _props$showType === void 0 ? 2 : _props$showType;
+  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+
+  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _plurals$showType : []; // 查询所有连线
+
+  var gv = topo.getGraphView();
+  var dm = gv.getDataModel();
+  var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
+
+  var showPhy = types.indexOf("phy") >= 0;
+  var showAgg = types.indexOf("agg") >= 0;
+  console.log("edges----types", showType, types, showPhy, showAgg);
+
+  if (Array.isArray(edges) && edges.length > 0) {
+    edges.map(function (edge) {
+      if (showType === 1 || showType === true) {
+        // 单链路全部显示
+        console.log("单链路全部显示", edge);
+        edge.s("2d.visible", true);
+      } else {
+        var _d$attributes, _d$attributes2;
+
+        var d = topo.dataModel.getDataById(edge.getTag());
+        console.log("edge", edge, d); // 判断是否聚合链路
+
+        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);
+        } else {
+          edge.s("2d.visible", showPhy);
+        }
+      }
+    });
+  }
+};
+
+exports.showLinkByConfig = showLinkByConfig;

package/lib/core/utils/edgeUtil.js

@@ -7,29 +7,44 @@ exports.updateEdgeExpanded = void 0;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _linkUtils = require("../models/utils/linkUtils");
+
 /**
  * 根据配置更新连线展开折叠状态
- * 
- * @param {*} topo 
+ *
+ * @param {*} topo
  */
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$store$getModelS = topo.store.getModelState("topoMod"),
+      viewState = _topo$store$getModelS.viewState;
+
+  var isEditMode = viewState === "edit";
   var htTopo = topo.getHtTopo();
 
   if (!htTopo) {
     return;
   }
 
-  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
-      expandAllEdges = _topo$store$getModelS.expandAllEdges;
+  var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
+      expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
+
 
-  if (expandAllEdges === false) {
+  if (expandAllEdges === 1) {
+    (0, _linkUtils.showLinkByConfig)({
+      topo: topo,
+      showType: 1
+    });
     htTopo.collapseAllEdgeGroups();
 
-    _rlog["default"].debug('updateEdgeExpanded 折叠');
+    _rlog["default"].debug("updateEdgeExpanded 折叠");
   } else {
+    (0, _linkUtils.showLinkByConfig)({
+      topo: topo,
+      showType: isEditMode ? 4 : expandAllEdges
+    });
     htTopo.expandAllEdgeGroups();
 
-    _rlog["default"].debug('updateEdgeExpanded 展开');
+    _rlog["default"].debug("updateEdgeExpanded 展开");
   }
 
   if (topo.linkDynamicStyleExecutor) {

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _AlarmListPanel = _interopRequireDefault(require("../../../../components/AlarmListPanel"));
 
+var _AlarmListShowButtonModule = _interopRequireDefault(require("./AlarmListShowButton.module.scss"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -31,8 +33,7 @@ var Popup = _overlay["default"].Popup;
 function AlarmListShowButton(props) {
   var topo = props.topo,
       style = props.style,
-      _props$offSetLeft = props.offSetLeft,
-      offSetLeft = _props$offSetLeft === void 0 ? 112 : _props$offSetLeft,
+      offSetLeft = props.offSetLeft,
       alarmPanelIsOpen = props.alarmPanelIsOpen,
       alarmData = props.alarmData; // const { AlarmListPanel } = viewerProps;
 
@@ -56,6 +57,33 @@ function AlarmListShowButton(props) {
     setVisible(false);
   };
 
+  if (offSetLeft) {
+    // FIXME 临时兼容业务拓扑
+    return /*#__PURE__*/_react["default"].createElement(Popup, {
+      trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        style: style,
+        ref: alarmBtn,
+        title: "\u544A\u8B66"
+      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: "warning"
+      })),
+      cache: true,
+      defaultVisible: true,
+      canCloseByOutSideClick: false,
+      canCloseByTrigger: false,
+      visible: visible,
+      onVisibleChange: onVisibleChange,
+      offset: [offSetLeft, 5],
+      triggerType: "click",
+      safeNode: function safeNode() {
+        return alarmBtn;
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_AlarmListPanel["default"], (0, _extends2["default"])({}, props, {
+      alarmData: alarmData,
+      onClose: onClose
+    })));
+  }
+
   return /*#__PURE__*/_react["default"].createElement(Popup, {
     trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
       style: style,
@@ -69,12 +97,17 @@ function AlarmListShowButton(props) {
     canCloseByOutSideClick: false,
     canCloseByTrigger: false,
     visible: visible,
-    onVisibleChange: onVisibleChange,
-    offset: [offSetLeft, 5],
+    onVisibleChange: onVisibleChange // offset={[0, 5]}
+    ,
     triggerType: "click",
     safeNode: function safeNode() {
       return alarmBtn;
-    }
+    },
+    align: false,
+    container: function container(trigger) {
+      return trigger.parentNode.parentNode.parentNode.parentNode;
+    },
+    className: _AlarmListShowButtonModule["default"].popup
   }, /*#__PURE__*/_react["default"].createElement(_AlarmListPanel["default"], (0, _extends2["default"])({}, props, {
     alarmData: alarmData,
     onClose: onClose

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.module.scss

@@ -0,0 +1,5 @@
+.popup {
+  position: absolute;
+  top: 49px;
+  right: 16px;
+}

package/lib/networkTopo/components/TopoView.js

@@ -43,6 +43,8 @@ var _LinkTagV = _interopRequireDefault(require("./viewer/displaySetting/LinkTagV
 
 var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
 
+var _linkUtils = require("../../core/models/utils/linkUtils");
+
 var _excluded = ["topo", "titleBar", "onEnterEdit", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -86,7 +88,12 @@ function NetworkTopologyCore(props) {
             switch (_context.prev = _context.next) {
               case 0:
                 // 单多链路切换
-                if (config.expandAllEdges !== false) {
+                (0, _linkUtils.showLinkByConfig)({
+                  topo: topo,
+                  showType: config.expandAllEdges
+                });
+
+                if (config.expandAllEdges !== 1) {
                   topo.getHtTopo().expandAllEdgeGroups();
                 } else {
                   topo.getHtTopo().collapseAllEdgeGroups();
@@ -97,7 +104,7 @@ function NetworkTopologyCore(props) {
                   topo.linkDynamicStyleExecutor.execute();
                 }
 
-              case 2:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.7",
+  "version": "5.0.10",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -59,9 +59,9 @@
     "@formily/next-components": "1.3.13",
     "@iceworks/spec": "^1.0.0",
     "@riil-frontend/component-action-tree": "^1.0.13",
-    "@riil-frontend/component-crucial-link-topo": "0.0.1-alpha.2",
     "@riil-frontend/component-common-res-list": "^1.0.13",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
+    "@riil-frontend/component-crucial-link-topo": "0.0.1-alpha.2",
     "@riil-frontend/component-extra-title": "^1.0.3",
     "@riil-frontend/component-more-buttons-menu": "^2.0.1",
     "@riil-frontend/component-no-data-page": "^3.0.4",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.7/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.10/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }