@riil-frontend/component-topology 8.0.2 → 8.0.4

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -76,16 +76,21 @@ function getValuesByEdges(topo) {
     })[0] || 'nil';
   }
 
-  var selectionEdges = getEdgesBySelection(topo);
-  var edgeValues = [];
-  loopEdgesAndChildren(topo, selectionEdges, function (edge) {
-    edgeValues.push({
-      lineButton: edge.s('edge.type'),
-      startPoint: getStartPoint(edge),
-      endPoint: getEndPoint(edge),
-      lineMold: edge.a('lineMode') || 'solidLine'
+  function getEdgesValues(edges) {
+    var edgeValues = [];
+    edges.forEach(function (edge) {
+      edgeValues.push({
+        lineButton: edge.s('edge.type'),
+        startPoint: getStartPoint(edge),
+        endPoint: getEndPoint(edge),
+        lineMold: edge.a('lineMode') || 'solidLine'
+      });
     });
-  });
+    return edgeValues;
+  }
+
+  var selectionEdges = getEdgesBySelection(topo);
+  var edgeValues = getEdgesValues(selectionEdges);
   var values = {
     lineButton: undefined,
     startPoint: undefined,

package/es/core/models/TopoApp.js

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

package/es/core/utils/graphLinkUtil.js

@@ -1,6 +1,6 @@
 import { getEdges } from "../../utils/htElementUtils";
 /**
- * 链路另一端变更后更新另一端，另一端不存在删除线
+ * 连线两端节点变更时更新显示。如果两端互相切换，切换两端样式
  * @param {*} topo 
  */
 
@@ -10,13 +10,22 @@ export function fixLink(topo) {
   var edges = getEdges(dm);
   edges.forEach(function (edge) {
     var source = edge.getSource();
+    var target = edge.getTarget();
     var linkData = linkDatas.find(function (data) {
       return data.id === edge.getTag();
-    });
+    }); // TODO 判断两端互相切换
+    // const isChange = 
 
     if (linkData && source.getTag() !== linkData.source) {
       var node = dm.getDataByTag(linkData.source);
       edge.setSource(node);
     }
+
+    if (linkData && linkData.target && target.getTag() !== linkData.target) {
+      var _node = dm.getDataByTag(linkData.target);
+
+      edge.setTarget(_node);
+    } // TODO 两端互相切换，交换两端样式
+
   });
 }

package/es/networkTopo/hooks/useLinkDynamicStyle.js

@@ -16,12 +16,14 @@ export default function useLinkDynamicStyle(props) {
   var topoModState = topo.store.useModelState('topoMod');
   var graphLoaded = topoModState.graphLoaded,
       topoData = topoModState.data;
+  var displayConfig = topo.store.useModelState('displayConfig');
+  var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
   useEffect(function () {
     // 拓扑图加载完成时刷新
     if (graphLoaded && topoData) {
       topo.linkDynamicStyleExecutor.execute();
     }
-  }, [topoData, graphLoaded]);
+  }, [topoData, graphLoaded, autoChangeEdgeWidth]);
 
   var onLoaded = function onLoaded() {};
 

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -165,6 +165,13 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   ;
 
   _proto.calcEdgeGroupEdgeWidth = function calcEdgeGroupEdgeWidth(links) {
+    var displayConfig = this.topo.store.getModelState('displayConfig');
+    var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
+
+    if (!autoChangeEdgeWidth) {
+      return 2;
+    }
+
     if (!links.length) {
       return 2;
     }
@@ -181,6 +188,13 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   };
 
   _proto.calcLinkEdgeWidth = function calcLinkEdgeWidth(link) {
+    var displayConfig = this.topo.store.getModelState('displayConfig');
+    var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
+
+    if (!autoChangeEdgeWidth) {
+      return 2;
+    }
+
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);
   } // network_link.actual_bandwidth
   ;

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -94,16 +94,21 @@ function getValuesByEdges(topo) {
     })[0] || 'nil';
   }
 
-  var selectionEdges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
-  var edgeValues = [];
-  (0, _edgeTypeStyleUtil.loopEdgesAndChildren)(topo, selectionEdges, function (edge) {
-    edgeValues.push({
-      lineButton: edge.s('edge.type'),
-      startPoint: getStartPoint(edge),
-      endPoint: getEndPoint(edge),
-      lineMold: edge.a('lineMode') || 'solidLine'
+  function getEdgesValues(edges) {
+    var edgeValues = [];
+    edges.forEach(function (edge) {
+      edgeValues.push({
+        lineButton: edge.s('edge.type'),
+        startPoint: getStartPoint(edge),
+        endPoint: getEndPoint(edge),
+        lineMold: edge.a('lineMode') || 'solidLine'
+      });
     });
-  });
+    return edgeValues;
+  }
+
+  var selectionEdges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
+  var edgeValues = getEdgesValues(selectionEdges);
   var values = {
     lineButton: undefined,
     startPoint: undefined,

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "8.0.2" === 'string' ? "8.0.2" : null;
+var version = typeof "8.0.4" === 'string' ? "8.0.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/utils/graphLinkUtil.js

@@ -6,7 +6,7 @@ exports.fixLink = fixLink;
 var _htElementUtils = require("../../utils/htElementUtils");
 
 /**
- * 链路另一端变更后更新另一端，另一端不存在删除线
+ * 连线两端节点变更时更新显示。如果两端互相切换，切换两端样式
  * @param {*} topo 
  */
 function fixLink(topo) {
@@ -15,13 +15,22 @@ function fixLink(topo) {
   var edges = (0, _htElementUtils.getEdges)(dm);
   edges.forEach(function (edge) {
     var source = edge.getSource();
+    var target = edge.getTarget();
     var linkData = linkDatas.find(function (data) {
       return data.id === edge.getTag();
-    });
+    }); // TODO 判断两端互相切换
+    // const isChange = 
 
     if (linkData && source.getTag() !== linkData.source) {
       var node = dm.getDataByTag(linkData.source);
       edge.setSource(node);
     }
+
+    if (linkData && linkData.target && target.getTag() !== linkData.target) {
+      var _node = dm.getDataByTag(linkData.target);
+
+      edge.setTarget(_node);
+    } // TODO 两端互相切换，交换两端样式
+
   });
 }

package/lib/networkTopo/hooks/useLinkDynamicStyle.js

@@ -24,12 +24,14 @@ function useLinkDynamicStyle(props) {
   var topoModState = topo.store.useModelState('topoMod');
   var graphLoaded = topoModState.graphLoaded,
       topoData = topoModState.data;
+  var displayConfig = topo.store.useModelState('displayConfig');
+  var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
   (0, _react.useEffect)(function () {
     // 拓扑图加载完成时刷新
     if (graphLoaded && topoData) {
       topo.linkDynamicStyleExecutor.execute();
     }
-  }, [topoData, graphLoaded]);
+  }, [topoData, graphLoaded, autoChangeEdgeWidth]);
 
   var onLoaded = function onLoaded() {};
 

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -176,6 +176,13 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   ;
 
   _proto.calcEdgeGroupEdgeWidth = function calcEdgeGroupEdgeWidth(links) {
+    var displayConfig = this.topo.store.getModelState('displayConfig');
+    var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
+
+    if (!autoChangeEdgeWidth) {
+      return 2;
+    }
+
     if (!links.length) {
       return 2;
     }
@@ -192,6 +199,13 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
   };
 
   _proto.calcLinkEdgeWidth = function calcLinkEdgeWidth(link) {
+    var displayConfig = this.topo.store.getModelState('displayConfig');
+    var autoChangeEdgeWidth = displayConfig.autoChangeEdgeWidth !== false;
+
+    if (!autoChangeEdgeWidth) {
+      return 2;
+    }
+
     return this.calcEdgeWidth(link.attributes['network_link.actual_bandwidth']);
   } // network_link.actual_bandwidth
   ;

package/package.json

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