@riil-frontend/component-topology 12.1.0-dev.1 → 12.1.0-dev.3

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -36,14 +36,14 @@ function EdgeColorButton(props) {
     });
   };
 
-  var getLines = function getLines(list) {
+  var getCustomLines = function getCustomLines(list) {
     return list.filter(isCustomEdge);
   };
 
   useEffect(function () {
     if (graphLoaded) {
       var edges = getEdgesBySelection(topo);
-      var list = getLines(edges);
+      var list = getCustomLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
       if (selection.length == 1 && list.length === 1) {

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

@@ -32,21 +32,11 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-} // {
-//   value: 'points',
-//   label: '自由线形',
-//   icon: 'topo_linear_icon_pointsline',
-// },
-];
-
-if (localStorage.getItem('topo.test.edge.customType') === 'true') {
-  LINE_TYPE_OPTIONS.push({
-    value: 'points',
-    label: '自由线形',
-    icon: 'topo_linear_icon_pointsline'
-  });
-}
-
+}, {
+  value: 'points',
+  label: '自由线形',
+  icon: 'topo_linear_icon_pointsline'
+}];
 var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

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

@@ -1,4 +1,4 @@
-import { getEdges, getEdgesBetweenNodes } from "../../../utils/htElementUtils";
+import { getEdges, getEdgesBetweenNodes, isEdgeVisible } from "../../../utils/htElementUtils";
 var ht = window.ht;
 export function getEdgesBySelection(topo) {
   var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
@@ -14,6 +14,14 @@ export function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
+  function getVisibleEdgesInNodes(gv, nodes) {
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    return getEdges(dm).filter(function (edge) {
+      return nodeIds.includes(edge.getSource().getId()) && nodeIds.includes(edge.getTarget().getId());
+    }).filter(isEdgeVisible);
+  }
+
   var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
@@ -24,14 +32,8 @@ export function getEdgesBySelection(topo) {
     var nodes = selection.filter(function (element) {
       return element instanceof ht.Node;
     });
-    var nodeIds = getChildrenNodeIds(nodes);
-    var dm = gv.getDataModel();
-    getEdges(dm).forEach(function (edge) {
-      if (nodeIds.find(function (nodeId) {
-        return nodeId === edge.getSource().getId();
-      }) && nodeIds.find(function (nodeId) {
-        return nodeId === edge.getTarget().getId();
-      }) && !edges.find(function (item) {
+    getVisibleEdgesInNodes(gv, nodes).forEach(function (edge) {
+      if (!edges.find(function (item) {
         return item === edge;
       })) {
         edges.push(edge);

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

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

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from "lodash/keyBy";
 import _ from "lodash"; // 查询所有连线
 
-import { getEdges } from "../../../utils/htElementUtils";
+import { getEdges, isEdgeGroup } from "../../../utils/htElementUtils";
 import CiTypeCache from "../cache/CiTypeCache";
 import CiCache from "../cache/CiCache"; // const interfaceTypeMap = {
 //   "network.interface": {
@@ -158,7 +158,8 @@ export var plurals = {
   2: ["phy"],
   3: ["agg"],
   4: ["phy", "agg"]
-};
+}; // 待办：移到网络拓扑组件
+
 export var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
@@ -170,29 +171,29 @@ export var showLinkByConfig = function showLinkByConfig(props) {
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
-  var edges = getEdges(dm); // console.log("edges", edges);
+  var edges = getEdges(dm).filter(function (edge) {
+    return !isEdgeGroup(edge);
+  }); // 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.forEach(function (edge) {
-      if (showType === 1 || showType === true) {
-        // 单链路全部显示
-        // console.log("单链路全部显示", edge);
-        edge.s("x.visible", true);
-      } else {
-        var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
+  edges.forEach(function (edge) {
+    if (showType === 1 || showType === true) {
+      // 单链路全部显示
+      // console.log("单链路全部显示", edge);
+      edge.s("x.visible", true);
+    } else {
+      var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if (isAggLink(d)) {
-          edge.s("x.visible", showAgg);
-        } else {
-          // console.log("edge", edge, d, showAgg);
-          edge.s("x.visible", showPhy);
-        }
+      if (isAggLink(d)) {
+        edge.s("x.visible", showAgg);
+      } else {
+        // console.log("edge", edge, d, showAgg);
+        edge.s("x.visible", showPhy);
       }
-    });
-  }
+    }
+  });
 };
 export var mergeExportLinkData = function mergeExportLinkData(props) {
   var source = props.source,

package/es/core/utils/edgeUtil.js

@@ -1,12 +1,13 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { showLinkByConfig } from "../models/utils/linkUtils";
+import { isEdgeGroup } from "../../utils/htElementUtils";
 /**
  * 是否手工连线
  * @param {*} edge 
  */
 
 export function isCustomEdge(edge) {
-  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+  return !isEdgeGroup(edge) && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态

package/es/utils/htElementUtils.js

@@ -115,8 +115,14 @@ export function getNodeData(element) {
 export function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-export function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+/**
+ * 是否连线组
+ * @param {ht.Edge} edge
+ * @returns
+ */
+
+export function isEdgeGroup(edge) {
+  return isEdge(edge) && edge.a('edgegroup.isEdgeGroup');
 }
 /**
  * 是否连线组代理
@@ -125,7 +131,13 @@ export function isEdgeGroupExpanded(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
+  return isEdgeGroup(edge) && isEdgeVisible(edge);
+}
+export function isEdgeGroupExpanded(edge) {
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+}
+export function isEdgeVisible(edge) {
+  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
 }
 /**
  * 获得两个节点间的连线列表

package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -53,14 +53,14 @@ function EdgeColorButton(props) {
     });
   };
 
-  var getLines = function getLines(list) {
+  var getCustomLines = function getCustomLines(list) {
     return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
-      var list = getLines(edges);
+      var list = getCustomLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
       if (selection.length == 1 && list.length === 1) {

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

@@ -48,20 +48,11 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-} // {
-//   value: 'points',
-//   label: '自由线形',
-//   icon: 'topo_linear_icon_pointsline',
-// },
-];
-
-if (localStorage.getItem('topo.test.edge.customType') === 'true') {
-  LINE_TYPE_OPTIONS.push({
-    value: 'points',
-    label: '自由线形',
-    icon: 'topo_linear_icon_pointsline'
-  });
-}
+}, {
+  value: 'points',
+  label: '自由线形',
+  icon: 'topo_linear_icon_pointsline'
+}];
 
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,

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

@@ -24,6 +24,14 @@ function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
+  function getVisibleEdgesInNodes(gv, nodes) {
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    return (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
+      return nodeIds.includes(edge.getSource().getId()) && nodeIds.includes(edge.getTarget().getId());
+    }).filter(_htElementUtils.isEdgeVisible);
+  }
+
   var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
@@ -34,14 +42,8 @@ function getEdgesBySelection(topo) {
     var nodes = selection.filter(function (element) {
       return element instanceof ht.Node;
     });
-    var nodeIds = getChildrenNodeIds(nodes);
-    var dm = gv.getDataModel();
-    (0, _htElementUtils.getEdges)(dm).forEach(function (edge) {
-      if (nodeIds.find(function (nodeId) {
-        return nodeId === edge.getSource().getId();
-      }) && nodeIds.find(function (nodeId) {
-        return nodeId === edge.getTarget().getId();
-      }) && !edges.find(function (item) {
+    getVisibleEdgesInNodes(gv, nodes).forEach(function (edge) {
+      if (!edges.find(function (item) {
         return item === edge;
       })) {
         edges.push(edge);

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

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

@@ -186,7 +186,8 @@ var plurals = {
   2: ["phy"],
   3: ["agg"],
   4: ["phy", "agg"]
-};
+}; // 待办：移到网络拓扑组件
+
 exports.plurals = plurals;
 
 var showLinkByConfig = function showLinkByConfig(props) {
@@ -200,29 +201,29 @@ var showLinkByConfig = function showLinkByConfig(props) {
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
-  var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
+  var edges = (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
+    return !(0, _htElementUtils.isEdgeGroup)(edge);
+  }); // 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.forEach(function (edge) {
-      if (showType === 1 || showType === true) {
-        // 单链路全部显示
-        // console.log("单链路全部显示", edge);
-        edge.s("x.visible", true);
-      } else {
-        var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
+  edges.forEach(function (edge) {
+    if (showType === 1 || showType === true) {
+      // 单链路全部显示
+      // console.log("单链路全部显示", edge);
+      edge.s("x.visible", true);
+    } else {
+      var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if (isAggLink(d)) {
-          edge.s("x.visible", showAgg);
-        } else {
-          // console.log("edge", edge, d, showAgg);
-          edge.s("x.visible", showPhy);
-        }
+      if (isAggLink(d)) {
+        edge.s("x.visible", showAgg);
+      } else {
+        // console.log("edge", edge, d, showAgg);
+        edge.s("x.visible", showPhy);
       }
-    });
-  }
+    }
+  });
 };
 
 exports.showLinkByConfig = showLinkByConfig;

package/lib/core/utils/edgeUtil.js

@@ -10,12 +10,14 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _linkUtils = require("../models/utils/linkUtils");
 
+var _htElementUtils = require("../../utils/htElementUtils");
+
 /**
  * 是否手工连线
  * @param {*} edge 
  */
 function isCustomEdge(edge) {
-  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+  return !(0, _htElementUtils.isEdgeGroup)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态

package/lib/utils/htElementUtils.js

@@ -26,8 +26,10 @@ exports.getNodeDatas = getNodeDatas;
 exports.getNodes = getNodes;
 exports.getNodesByGroupIdOrTag = getNodesByGroupIdOrTag;
 exports.isEdge = isEdge;
+exports.isEdgeGroup = isEdgeGroup;
 exports.isEdgeGroupAgent = isEdgeGroupAgent;
 exports.isEdgeGroupExpanded = isEdgeGroupExpanded;
+exports.isEdgeVisible = isEdgeVisible;
 exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
@@ -172,9 +174,15 @@ function getNodeData(element) {
 function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
+/**
+ * 是否连线组
+ * @param {ht.Edge} edge
+ * @returns
+ */
 
-function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+
+function isEdgeGroup(edge) {
+  return isEdge(edge) && edge.a('edgegroup.isEdgeGroup');
 }
 /**
  * 是否连线组代理
@@ -184,7 +192,15 @@ function isEdgeGroupExpanded(edge) {
 
 
 function isEdgeGroupAgent(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
+  return isEdgeGroup(edge) && isEdgeVisible(edge);
+}
+
+function isEdgeGroupExpanded(edge) {
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
+}
+
+function isEdgeVisible(edge) {
+  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
 }
 /**
  * 获得两个节点间的连线列表

package/package.json

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