@riil-frontend/component-topology 13.0.0-dev.5 → 13.0.0-dev.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,33 +3,20 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
3
3
 
4
4
  /* eslint-disable jsx-a11y/alt-text */
5
5
  import React, { useState } from 'react';
6
- import DropdownButton from "./components/DropdownButton";
6
+ import FontColorDropdown from "./components/FontColorDropdown";
7
7
  import WidgetBox from "./WidgetBox";
8
- import ColorPanel from "../../../../../components/ColorPanel";
9
- import FontColorRange from "../../../../../components/ColorPanel/components/FontColorRange";
10
- import styles from "./FontColorButton.module.scss";
11
8
  import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
12
9
 
13
- function FontColorDropdown(props) {
14
- var color = props.color,
15
- onChange = props.onChange,
10
+ function FontColorButton(props) {
11
+ var showLabel = props.showLabel,
16
12
  topo = props.topo,
17
- opacity = props.opacity,
18
- background = props.background,
13
+ style = props.style,
19
14
  setStyle = props.setStyle,
20
- _props$fieldDisabled = props.fieldDisabled,
21
- fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
22
-
23
- var _useState = useState(false),
24
- disabled = _useState[0],
25
- setDisabled = _useState[1];
26
-
27
- var backgroundEnabled = fieldDisabled.background !== true;
28
- var opacityEnabled = fieldDisabled.opacity !== true;
15
+ fieldDisabled = props.fieldDisabled;
29
16
 
30
17
  var backOpacityChange = function backOpacityChange(value) {
31
18
  topo.historyManager.beginTransaction();
32
- onChange({
19
+ setStyle({
33
20
  opacity: (value / 100).toFixed(2) * 1
34
21
  });
35
22
  topo.historyManager.endTransaction();
@@ -111,84 +98,16 @@ function FontColorDropdown(props) {
111
98
  };
112
99
  }();
113
100
 
114
- var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
115
- };
116
-
117
- var onBlur = function onBlur() {// topo.historyManager.endTransaction();
118
- };
119
-
120
- var icon = disabled ? /*#__PURE__*/React.createElement("img", {
121
- src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
122
- alt: ""
123
- }) : /*#__PURE__*/React.createElement("img", {
124
- src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
125
- alt: ""
126
- });
127
- return /*#__PURE__*/React.createElement(DropdownButton, {
128
- disabled: disabled,
129
- trigger: icon
130
- }, /*#__PURE__*/React.createElement("div", {
131
- className: styles.content
132
- }, /*#__PURE__*/React.createElement("div", {
133
- className: styles.fontColor
134
- }, /*#__PURE__*/React.createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/React.createElement("div", {
135
- style: {
136
- marginTop: '10px',
137
- marginLeft: '-4px'
138
- }
139
- }, /*#__PURE__*/React.createElement(ColorPanel, {
140
- value: color,
141
- onChange: colorChang,
142
- onPickerFocus: onFocus,
143
- onPickerBlur: onBlur
144
- }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/React.createElement("div", {
145
- className: styles.backgroundColor
146
- }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
147
- className: styles.backOpacity
148
- }, /*#__PURE__*/React.createElement("img", {
149
- src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
150
- }), /*#__PURE__*/React.createElement(FontColorRange, {
151
- max: 100,
152
- min: 0,
153
- unit: "%",
154
- list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
155
- onChange: backOpacityChange,
156
- defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
157
-
158
- })), /*#__PURE__*/React.createElement("div", {
159
- style: {
160
- marginTop: '10px',
161
- marginLeft: '-4px',
162
- marginBottom: '3px'
163
- }
164
- }, /*#__PURE__*/React.createElement(ColorPanel, {
165
- showClear: true,
166
- value: background,
167
- onChange: backgroundChang,
168
- onPickerFocus: onFocus,
169
- onPickerBlur: onBlur
170
- })))));
171
- }
172
-
173
- function FontColorButton(props) {
174
- var showLabel = props.showLabel,
175
- topo = props.topo,
176
- style = props.style,
177
- setStyle = props.setStyle,
178
- fieldDisabled = props.fieldDisabled;
179
101
  return /*#__PURE__*/React.createElement(WidgetBox, {
180
102
  label: "\u6587\u5B57\u989C\u8272",
181
103
  tooltip: "\u6587\u5B57\u989C\u8272",
182
104
  showLabel: showLabel
183
105
  }, /*#__PURE__*/React.createElement(FontColorDropdown, {
184
- color: style.color,
185
- background: style.background,
186
- opacity: style.opacity,
106
+ value: style,
187
107
  fieldDisabled: fieldDisabled,
188
- setStyle: setStyle,
189
- onChange: function onChange(val) {
190
- setStyle(val);
191
- },
108
+ onColorChange: colorChang,
109
+ onBackgroundChange: backgroundChang,
110
+ onOpacityChange: backOpacityChange,
192
111
  topo: topo
193
112
  }));
194
113
  }
@@ -0,0 +1,114 @@
1
+ import _extends from "@babel/runtime/helpers/extends";
2
+ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
3
+ var _excluded = ["topo", "value", "onChange", "fieldDisabled"];
4
+
5
+ /* eslint-disable jsx-a11y/alt-text */
6
+ import React, { useState } from 'react';
7
+ import DropdownButton from "./DropdownButton";
8
+ import ColorPanel from "../../../../../../components/ColorPanel";
9
+ import FontColorRange from "../../../../../../components/ColorPanel/components/FontColorRange";
10
+ import styles from "./FontColorDropdown.module.scss";
11
+
12
+ function FontColorDropdown(props) {
13
+ var color = props.color,
14
+ opacity = props.opacity,
15
+ background = props.background,
16
+ _props$fieldDisabled = props.fieldDisabled,
17
+ fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
18
+ onChange = props.onChange,
19
+ onColorChange = props.onColorChange,
20
+ onBackgroundChange = props.onBackgroundChange,
21
+ onOpacityChange = props.onOpacityChange;
22
+
23
+ var _useState = useState(false),
24
+ disabled = _useState[0],
25
+ setDisabled = _useState[1];
26
+
27
+ var backgroundEnabled = fieldDisabled.background !== true;
28
+ var opacityEnabled = fieldDisabled.opacity !== true;
29
+
30
+ var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
31
+ };
32
+
33
+ var onBlur = function onBlur() {// topo.historyManager.endTransaction();
34
+ };
35
+
36
+ var icon = disabled ? /*#__PURE__*/React.createElement("img", {
37
+ src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
38
+ alt: ""
39
+ }) : /*#__PURE__*/React.createElement("img", {
40
+ src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
41
+ alt: ""
42
+ });
43
+ return /*#__PURE__*/React.createElement(DropdownButton, {
44
+ disabled: disabled,
45
+ trigger: icon
46
+ }, /*#__PURE__*/React.createElement("div", {
47
+ className: styles.content
48
+ }, /*#__PURE__*/React.createElement("div", {
49
+ className: styles.fontColor
50
+ }, /*#__PURE__*/React.createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/React.createElement("div", {
51
+ style: {
52
+ marginTop: '10px',
53
+ marginLeft: '-4px'
54
+ }
55
+ }, /*#__PURE__*/React.createElement(ColorPanel, {
56
+ value: color,
57
+ onChange: onColorChange,
58
+ onPickerFocus: onFocus,
59
+ onPickerBlur: onBlur
60
+ }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/React.createElement("div", {
61
+ className: styles.backgroundColor
62
+ }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
63
+ className: styles.backOpacity
64
+ }, /*#__PURE__*/React.createElement("img", {
65
+ src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
66
+ }), /*#__PURE__*/React.createElement(FontColorRange, {
67
+ max: 100,
68
+ min: 0,
69
+ unit: "%",
70
+ list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
71
+ onChange: onOpacityChange,
72
+ defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
73
+
74
+ })), /*#__PURE__*/React.createElement("div", {
75
+ style: {
76
+ marginTop: '10px',
77
+ marginLeft: '-4px',
78
+ marginBottom: '3px'
79
+ }
80
+ }, /*#__PURE__*/React.createElement(ColorPanel, {
81
+ showClear: true,
82
+ value: background,
83
+ onChange: onBackgroundChange,
84
+ onPickerFocus: onFocus,
85
+ onPickerBlur: onBlur
86
+ })))));
87
+ }
88
+ /**
89
+ *
90
+ * @param {*} props
91
+ * @param {{color, background, opacity}} props.value
92
+ * @returns
93
+ */
94
+
95
+
96
+ function FontColorD(props) {
97
+ var topo = props.topo,
98
+ value = props.value,
99
+ onChange = props.onChange,
100
+ fieldDisabled = props.fieldDisabled,
101
+ otherProps = _objectWithoutPropertiesLoose(props, _excluded);
102
+
103
+ return /*#__PURE__*/React.createElement(FontColorDropdown, _extends({}, otherProps, {
104
+ color: value.color,
105
+ background: value.background,
106
+ opacity: value.opacity,
107
+ fieldDisabled: fieldDisabled,
108
+ setStyle: onChange,
109
+ onChange: onChange,
110
+ topo: topo
111
+ }));
112
+ }
113
+
114
+ export default FontColorD;
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
24
24
  import SelectionModel from "./SelectionModel";
25
25
  import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
26
26
 
27
- var version = typeof "13.0.0-dev.5" === 'string' ? "13.0.0-dev.5" : null;
27
+ var version = typeof "13.0.0-dev.7" === 'string' ? "13.0.0-dev.7" : null;
28
28
  console.info("\u62D3\u6251\u7248\u672C: " + version);
29
29
  /**
30
30
  * 拓扑显示和编辑
@@ -142,7 +142,9 @@ export function getEdgesBetweenNodes(node1, node2) {
142
142
  return edges;
143
143
  }
144
144
 
145
- node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
145
+ node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
146
+ return !isEdgeGroupAgent(edge);
147
+ }).forEach(function (edge) {
146
148
  var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
147
149
 
148
150
  if (isEdgeBetweenNodes) {
@@ -11,16 +11,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
11
11
 
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
 
14
- var _DropdownButton = _interopRequireDefault(require("./components/DropdownButton"));
14
+ var _FontColorDropdown = _interopRequireDefault(require("./components/FontColorDropdown"));
15
15
 
16
16
  var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
17
17
 
18
- var _ColorPanel = _interopRequireDefault(require("../../../../../components/ColorPanel"));
19
-
20
- var _FontColorRange = _interopRequireDefault(require("../../../../../components/ColorPanel/components/FontColorRange"));
21
-
22
- var _FontColorButtonModule = _interopRequireDefault(require("./FontColorButton.module.scss"));
23
-
24
18
  var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
25
19
 
26
20
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -28,26 +22,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
28
22
  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; }
29
23
 
30
24
  /* eslint-disable jsx-a11y/alt-text */
31
- function FontColorDropdown(props) {
32
- var color = props.color,
33
- onChange = props.onChange,
25
+ function FontColorButton(props) {
26
+ var showLabel = props.showLabel,
34
27
  topo = props.topo,
35
- opacity = props.opacity,
36
- background = props.background,
28
+ style = props.style,
37
29
  setStyle = props.setStyle,
38
- _props$fieldDisabled = props.fieldDisabled,
39
- fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
40
-
41
- var _useState = (0, _react.useState)(false),
42
- disabled = _useState[0],
43
- setDisabled = _useState[1];
44
-
45
- var backgroundEnabled = fieldDisabled.background !== true;
46
- var opacityEnabled = fieldDisabled.opacity !== true;
30
+ fieldDisabled = props.fieldDisabled;
47
31
 
48
32
  var backOpacityChange = function backOpacityChange(value) {
49
33
  topo.historyManager.beginTransaction();
50
- onChange({
34
+ setStyle({
51
35
  opacity: (value / 100).toFixed(2) * 1
52
36
  });
53
37
  topo.historyManager.endTransaction();
@@ -129,84 +113,16 @@ function FontColorDropdown(props) {
129
113
  };
130
114
  }();
131
115
 
132
- var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
133
- };
134
-
135
- var onBlur = function onBlur() {// topo.historyManager.endTransaction();
136
- };
137
-
138
- var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
139
- src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
140
- alt: ""
141
- }) : /*#__PURE__*/_react["default"].createElement("img", {
142
- src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
143
- alt: ""
144
- });
145
- return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
146
- disabled: disabled,
147
- trigger: icon
148
- }, /*#__PURE__*/_react["default"].createElement("div", {
149
- className: _FontColorButtonModule["default"].content
150
- }, /*#__PURE__*/_react["default"].createElement("div", {
151
- className: _FontColorButtonModule["default"].fontColor
152
- }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement("div", {
153
- style: {
154
- marginTop: '10px',
155
- marginLeft: '-4px'
156
- }
157
- }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
158
- value: color,
159
- onChange: colorChang,
160
- onPickerFocus: onFocus,
161
- onPickerBlur: onBlur
162
- }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
163
- className: _FontColorButtonModule["default"].backgroundColor
164
- }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
165
- className: _FontColorButtonModule["default"].backOpacity
166
- }, /*#__PURE__*/_react["default"].createElement("img", {
167
- src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
168
- }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
169
- max: 100,
170
- min: 0,
171
- unit: "%",
172
- list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
173
- onChange: backOpacityChange,
174
- defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
175
-
176
- })), /*#__PURE__*/_react["default"].createElement("div", {
177
- style: {
178
- marginTop: '10px',
179
- marginLeft: '-4px',
180
- marginBottom: '3px'
181
- }
182
- }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
183
- showClear: true,
184
- value: background,
185
- onChange: backgroundChang,
186
- onPickerFocus: onFocus,
187
- onPickerBlur: onBlur
188
- })))));
189
- }
190
-
191
- function FontColorButton(props) {
192
- var showLabel = props.showLabel,
193
- topo = props.topo,
194
- style = props.style,
195
- setStyle = props.setStyle,
196
- fieldDisabled = props.fieldDisabled;
197
116
  return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
198
117
  label: "\u6587\u5B57\u989C\u8272",
199
118
  tooltip: "\u6587\u5B57\u989C\u8272",
200
119
  showLabel: showLabel
201
- }, /*#__PURE__*/_react["default"].createElement(FontColorDropdown, {
202
- color: style.color,
203
- background: style.background,
204
- opacity: style.opacity,
120
+ }, /*#__PURE__*/_react["default"].createElement(_FontColorDropdown["default"], {
121
+ value: style,
205
122
  fieldDisabled: fieldDisabled,
206
- setStyle: setStyle,
207
- onChange: function onChange(val) {
208
- setStyle(val);
209
- },
123
+ onColorChange: colorChang,
124
+ onBackgroundChange: backgroundChang,
125
+ onOpacityChange: backOpacityChange,
210
126
  topo: topo
211
127
  }));
212
128
  }
@@ -0,0 +1,130 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = void 0;
7
+
8
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
+
10
+ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
11
+
12
+ var _react = _interopRequireWildcard(require("react"));
13
+
14
+ var _DropdownButton = _interopRequireDefault(require("./DropdownButton"));
15
+
16
+ var _ColorPanel = _interopRequireDefault(require("../../../../../../components/ColorPanel"));
17
+
18
+ var _FontColorRange = _interopRequireDefault(require("../../../../../../components/ColorPanel/components/FontColorRange"));
19
+
20
+ var _FontColorDropdownModule = _interopRequireDefault(require("./FontColorDropdown.module.scss"));
21
+
22
+ var _excluded = ["topo", "value", "onChange", "fieldDisabled"];
23
+
24
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
25
+
26
+ 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; }
27
+
28
+ function FontColorDropdown(props) {
29
+ var color = props.color,
30
+ opacity = props.opacity,
31
+ background = props.background,
32
+ _props$fieldDisabled = props.fieldDisabled,
33
+ fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
34
+ onChange = props.onChange,
35
+ onColorChange = props.onColorChange,
36
+ onBackgroundChange = props.onBackgroundChange,
37
+ onOpacityChange = props.onOpacityChange;
38
+
39
+ var _useState = (0, _react.useState)(false),
40
+ disabled = _useState[0],
41
+ setDisabled = _useState[1];
42
+
43
+ var backgroundEnabled = fieldDisabled.background !== true;
44
+ var opacityEnabled = fieldDisabled.opacity !== true;
45
+
46
+ var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
47
+ };
48
+
49
+ var onBlur = function onBlur() {// topo.historyManager.endTransaction();
50
+ };
51
+
52
+ var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
53
+ src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
54
+ alt: ""
55
+ }) : /*#__PURE__*/_react["default"].createElement("img", {
56
+ src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Normal.svg",
57
+ alt: ""
58
+ });
59
+ return /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
60
+ disabled: disabled,
61
+ trigger: icon
62
+ }, /*#__PURE__*/_react["default"].createElement("div", {
63
+ className: _FontColorDropdownModule["default"].content
64
+ }, /*#__PURE__*/_react["default"].createElement("div", {
65
+ className: _FontColorDropdownModule["default"].fontColor
66
+ }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement("div", {
67
+ style: {
68
+ marginTop: '10px',
69
+ marginLeft: '-4px'
70
+ }
71
+ }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
72
+ value: color,
73
+ onChange: onColorChange,
74
+ onPickerFocus: onFocus,
75
+ onPickerBlur: onBlur
76
+ }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
77
+ className: _FontColorDropdownModule["default"].backgroundColor
78
+ }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
79
+ className: _FontColorDropdownModule["default"].backOpacity
80
+ }, /*#__PURE__*/_react["default"].createElement("img", {
81
+ src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
82
+ }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
83
+ max: 100,
84
+ min: 0,
85
+ unit: "%",
86
+ list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
87
+ onChange: onOpacityChange,
88
+ defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
89
+
90
+ })), /*#__PURE__*/_react["default"].createElement("div", {
91
+ style: {
92
+ marginTop: '10px',
93
+ marginLeft: '-4px',
94
+ marginBottom: '3px'
95
+ }
96
+ }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
97
+ showClear: true,
98
+ value: background,
99
+ onChange: onBackgroundChange,
100
+ onPickerFocus: onFocus,
101
+ onPickerBlur: onBlur
102
+ })))));
103
+ }
104
+ /**
105
+ *
106
+ * @param {*} props
107
+ * @param {{color, background, opacity}} props.value
108
+ * @returns
109
+ */
110
+
111
+
112
+ function FontColorD(props) {
113
+ var topo = props.topo,
114
+ value = props.value,
115
+ onChange = props.onChange,
116
+ fieldDisabled = props.fieldDisabled,
117
+ otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
118
+ return /*#__PURE__*/_react["default"].createElement(FontColorDropdown, (0, _extends2["default"])({}, otherProps, {
119
+ color: value.color,
120
+ background: value.background,
121
+ opacity: value.opacity,
122
+ fieldDisabled: fieldDisabled,
123
+ setStyle: onChange,
124
+ onChange: onChange,
125
+ topo: topo
126
+ }));
127
+ }
128
+
129
+ var _default = FontColorD;
130
+ exports["default"] = _default;
@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
54
54
  var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
55
55
 
56
56
  // eslint-disable-next-line no-undef
57
- var version = typeof "13.0.0-dev.5" === 'string' ? "13.0.0-dev.5" : null;
57
+ var version = typeof "13.0.0-dev.7" === 'string' ? "13.0.0-dev.7" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -199,7 +199,9 @@ function getEdgesBetweenNodes(node1, node2) {
199
199
  return edges;
200
200
  }
201
201
 
202
- node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
202
+ node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
203
+ return !isEdgeGroupAgent(edge);
204
+ }).forEach(function (edge) {
203
205
  var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
204
206
 
205
207
  if (isEdgeBetweenNodes) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "13.0.0-dev.5",
3
+ "version": "13.0.0-dev.7",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -123,6 +123,6 @@
123
123
  "access": "public"
124
124
  },
125
125
  "license": "MIT",
126
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.5/build/index.html",
126
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.7/build/index.html",
127
127
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
128
128
  }