@riil-frontend/component-topology 4.0.21 → 4.0.23

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

@@ -7,7 +7,7 @@ import React, { useEffect, useState, useRef } from "react";
 import styles from "./ResourceDisplay/CommonCheckboxGroup.module.scss";
 import { plurals } from "../../models/utils/linkUtils";
 var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandAllRadioGroup(props, ref) {
-  var _plurals$value;
+  var _plurals;
 
   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$value = plurals[value]) !== null && _plurals$value !== void 0 ? _plurals$value : []),
+  var _useState2 = useState((_plurals = plurals[value !== null && value !== void 0 ? value : 2]) !== null && _plurals !== void 0 ? _plurals : []),
       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 "4.0.21" === 'string' ? "4.0.21" : null;
+var version = typeof "4.0.23" === 'string' ? "4.0.23" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -169,11 +169,14 @@ export var plurals = {
   4: ["phy", "agg"]
 };
 export var showLinkByConfig = function showLinkByConfig(props) {
-  console.log("showLinkByConfig-----------------------------", props);
+  var _plurals$showType;
+
   var topo = props.topo,
-      showType = props.showType; //const displayConfig = topo.store.getModelState("displayConfig");
+      _props$showType = props.showType,
+      showType = _props$showType === void 0 ? 1 : _props$showType;
+  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
 
-  var types = plurals[showType]; // 查询所有连线
+  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _plurals$showType : []; // 查询所有连线
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
@@ -181,28 +184,21 @@ export var showLinkByConfig = function showLinkByConfig(props) {
 
   var showPhy = types.indexOf("phy") >= 0;
   var showAgg = types.indexOf("agg") >= 0;
+  console.log("edges----types", showType, types, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {
-      if (showType === 1) {
+      if (showType === 1 || showType === true) {
         // 单链路全部显示
         edge.s("2d.visible", true);
       } else {
-        var d = topo.dataModel.getDataById(edge.getTag()); //console.log("edge", edge, d);
-        // 判断是否聚合链路
-
-        if (d.destination_type === "network.agg_interface" && d.source_type === "network.agg_interface") {
-          if (showAgg) {
-            edge.s("2d.visible", true);
-          } else {
-            edge.s("2d.visible", false);
-          }
+        var d = topo.dataModel.getDataById(edge.getTag());
+        console.log("edge", edge, d); // 判断是否聚合链路
+
+        if (d.attributes.destination_type === "network.agg_interface" && d.attributes.source_type === "network.agg_interface") {
+          edge.s("2d.visible", showAgg);
         } else {
-          if (showPhy) {
-            edge.s("2d.visible", true);
-          } else {
-            edge.s("2d.visible", false);
-          }
+          edge.s("2d.visible", showPhy);
         }
       }
     });

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$value;
+  var _plurals;
 
   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$value = _linkUtils.plurals[value]) !== null && _plurals$value !== void 0 ? _plurals$value : []),
+  var _useState2 = (0, _react.useState)((_plurals = _linkUtils.plurals[value !== null && value !== void 0 ? value : 2]) !== null && _plurals !== void 0 ? _plurals : []),
       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 "4.0.21" === 'string' ? "4.0.21" : null;
+var version = typeof "4.0.23" === 'string' ? "4.0.23" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -195,11 +195,14 @@ var plurals = {
 exports.plurals = plurals;
 
 var showLinkByConfig = function showLinkByConfig(props) {
-  console.log("showLinkByConfig-----------------------------", props);
+  var _plurals$showType;
+
   var topo = props.topo,
-      showType = props.showType; //const displayConfig = topo.store.getModelState("displayConfig");
+      _props$showType = props.showType,
+      showType = _props$showType === void 0 ? 1 : _props$showType;
+  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
 
-  var types = plurals[showType]; // 查询所有连线
+  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _plurals$showType : []; // 查询所有连线
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
@@ -207,28 +210,21 @@ var showLinkByConfig = function showLinkByConfig(props) {
 
   var showPhy = types.indexOf("phy") >= 0;
   var showAgg = types.indexOf("agg") >= 0;
+  console.log("edges----types", showType, types, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {
-      if (showType === 1) {
+      if (showType === 1 || showType === true) {
         // 单链路全部显示
         edge.s("2d.visible", true);
       } else {
-        var d = topo.dataModel.getDataById(edge.getTag()); //console.log("edge", edge, d);
-        // 判断是否聚合链路
-
-        if (d.destination_type === "network.agg_interface" && d.source_type === "network.agg_interface") {
-          if (showAgg) {
-            edge.s("2d.visible", true);
-          } else {
-            edge.s("2d.visible", false);
-          }
+        var d = topo.dataModel.getDataById(edge.getTag());
+        console.log("edge", edge, d); // 判断是否聚合链路
+
+        if (d.attributes.destination_type === "network.agg_interface" && d.attributes.source_type === "network.agg_interface") {
+          edge.s("2d.visible", showAgg);
         } else {
-          if (showPhy) {
-            edge.s("2d.visible", true);
-          } else {
-            edge.s("2d.visible", false);
-          }
+          edge.s("2d.visible", showPhy);
         }
       }
     });

package/package.json

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