@riil-frontend/component-topology 8.0.0-a.3 → 8.0.0-a.4

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

@@ -60,43 +60,55 @@ var LINE_MOLD_OPTIONS = [{
   icon: 'topo_lineMold_dotted_two'
 }];
 
-function getValuesBySelection(selection) {
+function getValuesByEdges(edges) {
+  function getStartPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  function getEndPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  var edgeValues = edges.map(function (edge) {
+    return {
+      startPoint: getStartPoint(edge),
+      endPoint: getEndPoint(edge),
+      lineMold: edge.a('lineMode') || 'solidLine'
+    };
+  });
   var values = {
     startPoint: undefined,
     endPoint: undefined,
     lineMold: undefined
-  }; // 仅一条连线选中时回显
-
-  if (selection.length === 1) {
-    var edge = selection[0];
-    values = {
-      startPoint: 'nil',
-      endPoint: 'nil',
-      lineMold: edge.a('lineMode') || 'solidLine'
-    };
-    var icons = edge.s('icons') || {};
-    ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.startPoint = name;
-      }
+  };
+  Object.keys(values).forEach(function (name) {
+    var vals = edgeValues.map(function (item) {
+      return item[name];
     });
-    ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.endPoint = name;
-      }
-    });
-  }
+    var isSame = vals.filter(function (val) {
+      return val === vals[0];
+    }).length === vals.length;
 
+    if (isSame) {
+      values[name] = vals[0];
+    }
+  });
   return values;
 }
 
 function EdgeType(props) {
-  var selection = props.selection,
+  var edges = props.edges,
       _onChange = props.onChange;
 
   var field = _Field.useField({
     autoUnmount: false,
-    values: getValuesBySelection(selection),
+    values: getValuesByEdges(edges),
     onChange: function onChange(name, value) {
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
@@ -107,8 +119,8 @@ function EdgeType(props) {
   });
 
   useEffect(function () {
-    field.setValues(getValuesBySelection(selection));
-  }, [selection]);
+    field.setValues(getValuesByEdges(edges));
+  }, [edges]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.lineBox
   }, /*#__PURE__*/React.createElement(_Form, {

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

@@ -109,6 +109,7 @@ function EdgeTypeButton(props) {
     disabled: disabled,
     trigger: icon
   }, !disabled && /*#__PURE__*/React.createElement(EdgeType, {
+    edges: getEdgesBySelection(topo),
     selection: selection,
     onChange: handleChange
   })));

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

@@ -14,8 +14,7 @@ export function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
-  var getSelectedEdges = function getSelectedEdges(topo) {
-    var gv = topo.getGraphView();
+  var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
     var edges = selection.filter(function (element) {
@@ -41,7 +40,7 @@ export function getEdgesBySelection(topo) {
     return edges;
   };
 
-  return getSelectedEdges(topo);
+  return getSelectedEdges(topo.getGraphView());
 }
 /**
  * 遍历连线及子连线

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

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

@@ -77,43 +77,55 @@ var LINE_MOLD_OPTIONS = [{
   icon: 'topo_lineMold_dotted_two'
 }];
 
-function getValuesBySelection(selection) {
+function getValuesByEdges(edges) {
+  function getStartPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  function getEndPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  var edgeValues = edges.map(function (edge) {
+    return {
+      startPoint: getStartPoint(edge),
+      endPoint: getEndPoint(edge),
+      lineMold: edge.a('lineMode') || 'solidLine'
+    };
+  });
   var values = {
     startPoint: undefined,
     endPoint: undefined,
     lineMold: undefined
-  }; // 仅一条连线选中时回显
-
-  if (selection.length === 1) {
-    var edge = selection[0];
-    values = {
-      startPoint: 'nil',
-      endPoint: 'nil',
-      lineMold: edge.a('lineMode') || 'solidLine'
-    };
-    var icons = edge.s('icons') || {};
-    ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.startPoint = name;
-      }
+  };
+  Object.keys(values).forEach(function (name) {
+    var vals = edgeValues.map(function (item) {
+      return item[name];
     });
-    ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.endPoint = name;
-      }
-    });
-  }
+    var isSame = vals.filter(function (val) {
+      return val === vals[0];
+    }).length === vals.length;
 
+    if (isSame) {
+      values[name] = vals[0];
+    }
+  });
   return values;
 }
 
 function EdgeType(props) {
-  var selection = props.selection,
+  var edges = props.edges,
       _onChange = props.onChange;
 
   var field = _field["default"].useField({
     autoUnmount: false,
-    values: getValuesBySelection(selection),
+    values: getValuesByEdges(edges),
     onChange: function onChange(name, value) {
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
@@ -124,8 +136,8 @@ function EdgeType(props) {
   });
 
   (0, _react.useEffect)(function () {
-    field.setValues(getValuesBySelection(selection));
-  }, [selection]);
+    field.setValues(getValuesByEdges(edges));
+  }, [edges]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _EdgeTypeModule["default"].lineBox
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {

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

@@ -128,6 +128,7 @@ function EdgeTypeButton(props) {
     disabled: disabled,
     trigger: icon
   }, !disabled && /*#__PURE__*/_react["default"].createElement(_EdgeType["default"], {
+    edges: (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo),
     selection: selection,
     onChange: handleChange
   })));

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

@@ -24,8 +24,7 @@ function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
-  var getSelectedEdges = function getSelectedEdges(topo) {
-    var gv = topo.getGraphView();
+  var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
     var edges = selection.filter(function (element) {
@@ -51,7 +50,7 @@ function getEdgesBySelection(topo) {
     return edges;
   };
 
-  return getSelectedEdges(topo);
+  return getSelectedEdges(topo.getGraphView());
 }
 /**
  * 遍历连线及子连线

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "8.0.0-a.3",
+  "version": "8.0.0-a.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.0-a.3/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.4/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }