@riil-frontend/component-topology 5.0.12 → 5.0.14

package/es/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js

@@ -5,9 +5,9 @@ import _Box from "@alifd/next/es/box";
 import _Radio from "@alifd/next/es/radio";
 import React, { useEffect, useState, useRef } from 'react';
 import styles from "./ResourceDisplay/CommonCheckboxGroup.module.scss";
-import { plurals } from "../../models/utils/linkUtils";
+import { plurals, compatibleWith } from "../../models/utils/linkUtils";
 var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandAllRadioGroup(props, ref) {
-  var _plurals;
+  var _plurals$compatibleWi;
 
   var value = props.value,
       onChange = props.onChange,
@@ -18,7 +18,7 @@ var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandA
       showType = _useState[0],
       setShowType = _useState[1];
 
-  var _useState2 = useState((_plurals = plurals[value === false ? 2 : value]) !== null && _plurals !== void 0 ? _plurals : []),
+  var _useState2 = useState((_plurals$compatibleWi = plurals[compatibleWith(value)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []),
       pluralType = _useState2[0],
       setPluralType = _useState2[1];
 

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "5.0.12" === 'string' ? "5.0.12" : null;
+var version = typeof "5.0.14" === 'string' ? "5.0.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -175,6 +175,15 @@ function _getLinksDetail() {
 }
 
 export function buildTopoLinkData() {}
+export var compatibleWith = function compatibleWith(value) {
+  var pluralType = value !== null && value !== void 0 ? value : 2;
+
+  if (value === false) {
+    pluralType = 2;
+  }
+
+  return pluralType;
+};
 /**
  * 链路显示模式
  */
@@ -187,14 +196,13 @@ export var plurals = {
   4: ["phy", "agg"]
 };
 export var showLinkByConfig = function showLinkByConfig(props) {
-  var _plurals;
+  var _plurals$compatibleWi;
 
   var topo = props.topo,
-      _props$showType = props.showType,
-      showType = _props$showType === void 0 ? 2 : _props$showType;
+      showType = props.showType;
   console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
 
-  var types = (_plurals = plurals[showType === false ? 2 : showType]) !== null && _plurals !== void 0 ? _plurals : []; // 查询所有连线
+  var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
@@ -208,13 +216,13 @@ export var showLinkByConfig = function showLinkByConfig(props) {
     edges.map(function (edge) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
-        console.log("单链路全部显示", edge);
+        // 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); // 判断是否聚合链路
+        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);

package/lib/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js

@@ -26,7 +26,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 
 var LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function LineExpandAllRadioGroup(props, ref) {
-  var _plurals;
+  var _plurals$compatibleWi;
 
   var value = props.value,
       onChange = props.onChange,
@@ -37,7 +37,7 @@ var LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function
       showType = _useState[0],
       setShowType = _useState[1];
 
-  var _useState2 = (0, _react.useState)((_plurals = _linkUtils.plurals[value === false ? 2 : value]) !== null && _plurals !== void 0 ? _plurals : []),
+  var _useState2 = (0, _react.useState)((_plurals$compatibleWi = _linkUtils.plurals[(0, _linkUtils.compatibleWith)(value)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []),
       pluralType = _useState2[0],
       setPluralType = _useState2[1];
 

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "5.0.12" === 'string' ? "5.0.12" : null;
+var version = typeof "5.0.14" === 'string' ? "5.0.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
-exports.getInterfaceObject = void 0;
+exports.getInterfaceObject = exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
@@ -202,11 +202,22 @@ function _getLinksDetail() {
 }
 
 function buildTopoLinkData() {}
+
+var compatibleWith = function compatibleWith(value) {
+  var pluralType = value !== null && value !== void 0 ? value : 2;
+
+  if (value === false) {
+    pluralType = 2;
+  }
+
+  return pluralType;
+};
 /**
  * 链路显示模式
  */
 
 
+exports.compatibleWith = compatibleWith;
 var plurals = {
   0: [],
   1: [],
@@ -217,14 +228,13 @@ var plurals = {
 exports.plurals = plurals;
 
 var showLinkByConfig = function showLinkByConfig(props) {
-  var _plurals;
+  var _plurals$compatibleWi;
 
   var topo = props.topo,
-      _props$showType = props.showType,
-      showType = _props$showType === void 0 ? 2 : _props$showType;
+      showType = props.showType;
   console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
 
-  var types = (_plurals = plurals[showType === false ? 2 : showType]) !== null && _plurals !== void 0 ? _plurals : []; // 查询所有连线
+  var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
@@ -238,13 +248,13 @@ var showLinkByConfig = function showLinkByConfig(props) {
     edges.map(function (edge) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
-        console.log("单链路全部显示", edge);
+        // 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); // 判断是否聚合链路
+        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);

package/package.json

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