@riil-frontend/component-topology 12.1.2 → 13.0.0-dev.10

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.
Files changed (35) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +29 -29
  3. package/es/components/ColorPanel/index.js +68 -58
  4. package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +10 -91
  5. package/es/core/editor/components/Toolbar/widgets/components/FontColorDropdown.js +120 -0
  6. package/es/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +21 -15
  7. package/es/core/hooks/useResourceConfig.js +1 -2
  8. package/es/core/hooks/useTopoEdit.js +2 -1
  9. package/es/core/models/TopoApp.js +1 -1
  10. package/es/core/models/topoData.js +3 -4
  11. package/es/core/models/utils/linkUtils.js +29 -24
  12. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +4 -2
  13. package/es/networkTopo/services/topo/basic.js +27 -17
  14. package/es/networkTopo/utils/__tests__/relateTopoData.js +205 -0
  15. package/es/networkTopo/utils/exitLinkUtil.js +2 -2
  16. package/es/networkTopo/utils/relateTopoDataUtil.js +149 -0
  17. package/es/utils/ResourceConfigUtil.js +1 -16
  18. package/lib/components/ColorPanel/index.js +71 -59
  19. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +11 -95
  20. package/lib/core/editor/components/Toolbar/widgets/components/FontColorDropdown.js +136 -0
  21. package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +21 -15
  22. package/lib/core/hooks/useResourceConfig.js +1 -2
  23. package/lib/core/hooks/useTopoEdit.js +2 -1
  24. package/lib/core/models/TopoApp.js +1 -1
  25. package/lib/core/models/topoData.js +3 -4
  26. package/lib/core/models/utils/linkUtils.js +29 -24
  27. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +6 -2
  28. package/lib/networkTopo/services/topo/basic.js +32 -18
  29. package/lib/networkTopo/utils/__tests__/relateTopoData.js +210 -0
  30. package/lib/networkTopo/utils/exitLinkUtil.js +2 -2
  31. package/lib/networkTopo/utils/relateTopoDataUtil.js +164 -0
  32. package/lib/utils/ResourceConfigUtil.js +1 -16
  33. package/package.json +2 -2
  34. /package/es/core/editor/components/Toolbar/widgets/{FontColorButton.module.scss → components/FontColorDropdown.module.scss} +0 -0
  35. /package/lib/core/editor/components/Toolbar/widgets/{FontColorButton.module.scss → components/FontColorDropdown.module.scss} +0 -0
@@ -7,8 +7,12 @@ exports["default"] = void 0;
7
7
 
8
8
  var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
9
9
 
10
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
+
10
12
  var _react = _interopRequireWildcard(require("react"));
11
13
 
14
+ var _propTypes = _interopRequireDefault(require("prop-types"));
15
+
12
16
  var _classnames4 = _interopRequireDefault(require("classnames"));
13
17
 
14
18
  var _color = _interopRequireDefault(require("color"));
@@ -26,7 +30,58 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
26
30
  /* eslint-disable eqeqeq */
27
31
 
28
32
  /* eslint-disable jsx-a11y/alt-text */
29
-
33
+ var defaultColorList = [{
34
+ color: 'rgba(255, 255, 255, 1)',
35
+ borderColor: 'rgba(219, 219, 219, 1)'
36
+ }, {
37
+ color: 'rgba(245, 245, 245, 1)',
38
+ borderColor: 'rgba(208, 208, 208, 1)'
39
+ }, {
40
+ color: 'rgba(230, 230, 230, 1)',
41
+ borderColor: 'rgba(196, 196, 196, 1)'
42
+ }, {
43
+ color: 'rgba(168, 168, 168, 1)',
44
+ borderColor: 'rgba(146, 146, 146, 1)'
45
+ }, {
46
+ color: 'rgba(97, 97, 97, 1)',
47
+ borderColor: 'rgba(85, 85, 85, 1)'
48
+ }, {
49
+ color: 'rgba(49, 49, 49, 1)',
50
+ borderColor: 'rgba(43, 43, 43, 1)'
51
+ }, {
52
+ color: 'rgba(251, 115, 80, 1)',
53
+ borderColor: 'rgba(213, 98, 69, 1)'
54
+ }, {
55
+ color: 'rgba(255, 166, 41, 1)',
56
+ borderColor: 'rgba(219, 144, 45, 1)'
57
+ }, {
58
+ color: 'rgba(255, 205, 42, 1)',
59
+ borderColor: 'rgba(216, 175, 37, 1)'
60
+ }, {
61
+ color: 'rgba(18, 174, 92, 1)',
62
+ borderColor: 'rgba(23, 148, 79, 1)'
63
+ }, {
64
+ color: 'rgba(83, 184, 255, 1)',
65
+ borderColor: 'rgba(74, 156, 217, 1)'
66
+ }, {
67
+ color: 'rgba(183, 128, 255, 1)',
68
+ borderColor: 'rgba(155, 109, 216, 1)'
69
+ }, {
70
+ color: 'rgba(254, 192, 174, 1)',
71
+ borderColor: 'rgba(217, 163, 148, 1)'
72
+ }, {
73
+ color: 'rgba(252, 209, 156, 1)',
74
+ borderColor: 'rgba(215, 178, 133, 1)'
75
+ }, {
76
+ color: 'rgba(255, 232, 163, 1)',
77
+ borderColor: 'rgba(217, 198, 139, 1)'
78
+ }, {
79
+ color: 'rgba(176, 244, 197, 1)',
80
+ borderColor: 'rgba(153, 209, 171, 1)'
81
+ }, {
82
+ color: 'rgba(189, 227, 255, 1)',
83
+ borderColor: 'rgba(161, 193, 217, 1)'
84
+ }];
30
85
  /**
31
86
  * 颜色选择
32
87
  *
@@ -34,12 +89,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
34
89
  * @return {*}
35
90
  * @constructor
36
91
  */
92
+
37
93
  function ColorPanel(props) {
38
94
  var _classnames2, _classnames3;
39
95
 
40
96
  var value = props.value,
41
97
  showClear = props.showClear,
42
- dataSource = props.dataSource,
98
+ _props$dataSource = props.dataSource,
99
+ dataSource = _props$dataSource === void 0 ? defaultColorList : _props$dataSource,
100
+ colorPickerBalloonProps = props.colorPickerBalloonProps,
43
101
  onChange = props.onChange,
44
102
  onPickerFocus = props.onPickerFocus,
45
103
  onPickerBlur = props.onPickerBlur;
@@ -187,9 +245,7 @@ function ColorPanel(props) {
187
245
  onClick: function onClick() {
188
246
  changClick('17');
189
247
  }
190
- }, /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
191
- visible: visible,
192
- trigger: defaultTrigger,
248
+ }, /*#__PURE__*/_react["default"].createElement(_balloon["default"], (0, _extends2["default"])({
193
249
  closable: false,
194
250
  triggerType: "click",
195
251
  animation: false,
@@ -198,9 +254,12 @@ function ColorPanel(props) {
198
254
  alignEdge: true,
199
255
  style: {
200
256
  paddingBottom: 0
201
- },
257
+ }
258
+ }, colorPickerBalloonProps, {
259
+ visible: visible,
260
+ trigger: defaultTrigger,
202
261
  onClose: close
203
- }, /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
262
+ }), /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
204
263
  color: data !== null && data !== void 0 ? data : undefined // width={230}
205
264
  ,
206
265
  disableAlpha: true,
@@ -216,61 +275,14 @@ function ColorPanel(props) {
216
275
  }))))));
217
276
  }
218
277
 
278
+ ColorPanel.propTypes = {
279
+ dataSource: _propTypes["default"].array
280
+ };
219
281
  ColorPanel.defaultProps = {
220
282
  value: undefined,
221
283
  showClear: false,
222
- dataSource: [{
223
- color: 'rgba(255, 255, 255, 1)',
224
- borderColor: 'rgba(219, 219, 219, 1)'
225
- }, {
226
- color: 'rgba(245, 245, 245, 1)',
227
- borderColor: 'rgba(208, 208, 208, 1)'
228
- }, {
229
- color: 'rgba(230, 230, 230, 1)',
230
- borderColor: 'rgba(196, 196, 196, 1)'
231
- }, {
232
- color: 'rgba(168, 168, 168, 1)',
233
- borderColor: 'rgba(146, 146, 146, 1)'
234
- }, {
235
- color: 'rgba(97, 97, 97, 1)',
236
- borderColor: 'rgba(85, 85, 85, 1)'
237
- }, {
238
- color: 'rgba(49, 49, 49, 1)',
239
- borderColor: 'rgba(43, 43, 43, 1)'
240
- }, {
241
- color: 'rgba(251, 115, 80, 1)',
242
- borderColor: 'rgba(213, 98, 69, 1)'
243
- }, {
244
- color: 'rgba(255, 166, 41, 1)',
245
- borderColor: 'rgba(219, 144, 45, 1)'
246
- }, {
247
- color: 'rgba(255, 205, 42, 1)',
248
- borderColor: 'rgba(216, 175, 37, 1)'
249
- }, {
250
- color: 'rgba(18, 174, 92, 1)',
251
- borderColor: 'rgba(23, 148, 79, 1)'
252
- }, {
253
- color: 'rgba(83, 184, 255, 1)',
254
- borderColor: 'rgba(74, 156, 217, 1)'
255
- }, {
256
- color: 'rgba(183, 128, 255, 1)',
257
- borderColor: 'rgba(155, 109, 216, 1)'
258
- }, {
259
- color: 'rgba(254, 192, 174, 1)',
260
- borderColor: 'rgba(217, 163, 148, 1)'
261
- }, {
262
- color: 'rgba(252, 209, 156, 1)',
263
- borderColor: 'rgba(215, 178, 133, 1)'
264
- }, {
265
- color: 'rgba(255, 232, 163, 1)',
266
- borderColor: 'rgba(217, 198, 139, 1)'
267
- }, {
268
- color: 'rgba(176, 244, 197, 1)',
269
- borderColor: 'rgba(153, 209, 171, 1)'
270
- }, {
271
- color: 'rgba(189, 227, 255, 1)',
272
- borderColor: 'rgba(161, 193, 217, 1)'
273
- }],
284
+ dataSource: defaultColorList,
285
+ colorPickerBalloonProps: {},
274
286
  onChange: function onChange() {},
275
287
  onPickerFocus: function onPickerFocus() {},
276
288
  onPickerBlur: function onPickerBlur() {}
@@ -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,136 @@
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
+ colorPickerBalloonProps = props.colorPickerBalloonProps,
35
+ backgroundPickerBalloonProps = props.backgroundPickerBalloonProps,
36
+ onChange = props.onChange,
37
+ onColorChange = props.onColorChange,
38
+ onBackgroundChange = props.onBackgroundChange,
39
+ onOpacityChange = props.onOpacityChange;
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;
47
+
48
+ var onFocus = function onFocus() {};
49
+
50
+ var onBlur = function onBlur() {};
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
+ colorPickerBalloonProps: colorPickerBalloonProps,
74
+ onChange: onColorChange,
75
+ onPickerFocus: onFocus,
76
+ onPickerBlur: onBlur
77
+ }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
78
+ className: _FontColorDropdownModule["default"].backgroundColor
79
+ }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
80
+ className: _FontColorDropdownModule["default"].backOpacity
81
+ }, /*#__PURE__*/_react["default"].createElement("img", {
82
+ src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/\u80CC\u666F\u586B\u5145.svg"
83
+ }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
84
+ max: 100,
85
+ min: 0,
86
+ unit: "%",
87
+ list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
88
+ onChange: onOpacityChange,
89
+ defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
90
+
91
+ })), /*#__PURE__*/_react["default"].createElement("div", {
92
+ style: {
93
+ marginTop: '10px',
94
+ marginLeft: '-4px',
95
+ marginBottom: '3px'
96
+ }
97
+ }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
98
+ showClear: true,
99
+ value: background,
100
+ colorPickerBalloonProps: backgroundPickerBalloonProps,
101
+ onChange: onBackgroundChange,
102
+ onPickerFocus: onFocus,
103
+ onPickerBlur: onBlur
104
+ })))));
105
+ }
106
+ /**
107
+ *
108
+ * @param {*} props
109
+ * @param {{color, background, opacity}} props.value
110
+ * @returns
111
+ */
112
+
113
+
114
+ function FontColorD(props) {
115
+ var topo = props.topo,
116
+ value = props.value,
117
+ onChange = props.onChange,
118
+ fieldDisabled = props.fieldDisabled,
119
+ otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
120
+ return /*#__PURE__*/_react["default"].createElement(FontColorDropdown, (0, _extends2["default"])({}, otherProps, {
121
+ color: value.color,
122
+ background: value.background,
123
+ opacity: value.opacity,
124
+ fieldDisabled: fieldDisabled,
125
+ setStyle: onChange,
126
+ onChange: onChange,
127
+ topo: topo
128
+ }));
129
+ }
130
+
131
+ _ColorPanel["default"].defaultProps = {
132
+ colorPickerBalloonProps: {},
133
+ backgroundPickerBalloonProps: {}
134
+ };
135
+ var _default = FontColorD;
136
+ exports["default"] = _default;
@@ -43,7 +43,25 @@ function FontStyleSelect(props) {
43
43
  disabled = props.disabled,
44
44
  onChange = props.onChange,
45
45
  _props$fieldDisabled = props.fieldDisabled,
46
- fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
46
+ fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
47
+ hideItemTootip = props.hideItemTootip;
48
+
49
+ var renderMenuItemContent = function renderMenuItemContent(item) {
50
+ return /*#__PURE__*/_react["default"].createElement("div", {
51
+ style: {
52
+ display: 'flex',
53
+ alignItems: 'center'
54
+ }
55
+ }, /*#__PURE__*/_react["default"].createElement("img", {
56
+ src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
57
+ alt: ""
58
+ }), /*#__PURE__*/_react["default"].createElement("span", {
59
+ style: fieldDisabled[item.key] ? {} : {
60
+ color: _variables["default"]['$color-text1-4']
61
+ }
62
+ }, item.label));
63
+ };
64
+
47
65
  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
48
66
  value: value,
49
67
  valueRender: function valueRender() {
@@ -59,20 +77,8 @@ function FontStyleSelect(props) {
59
77
  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
60
78
  key: item.key,
61
79
  disabled: !!fieldDisabled[item.key]
62
- }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
63
- trigger: /*#__PURE__*/_react["default"].createElement("div", {
64
- style: {
65
- display: 'flex',
66
- alignItems: 'center'
67
- }
68
- }, /*#__PURE__*/_react["default"].createElement("img", {
69
- src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
70
- alt: ""
71
- }), /*#__PURE__*/_react["default"].createElement("span", {
72
- style: fieldDisabled[item.key] ? {} : {
73
- color: _variables["default"]['$color-text1-4']
74
- }
75
- }, item.label)),
80
+ }, hideItemTootip ? renderMenuItemContent(item) : /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
81
+ trigger: renderMenuItemContent(item),
76
82
  align: "r",
77
83
  popupStyle: {}
78
84
  }, item.tooltip));
@@ -55,8 +55,7 @@ function _default(props) {
55
55
  var config = getConfigFromHt();
56
56
  return {
57
57
  resources: config.resources,
58
- groups: config.groups,
59
- relateTopoIdList: config.relateTopoIdList
58
+ groups: config.groups
60
59
  };
61
60
  };
62
61
 
@@ -1171,7 +1171,8 @@ var useTopoEdit = function useTopoEdit(params) {
1171
1171
  */
1172
1172
  onSaveTopo: onSaveTopo,
1173
1173
  getResourceConfigFromHt: resourceConfig.getConfigFromHt,
1174
- onLayerAdded: onLayerAdded
1174
+ onLayerAdded: onLayerAdded,
1175
+ findUNExistedLinkElements: findUNExistedLinkElements
1175
1176
  };
1176
1177
  };
1177
1178
 
@@ -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 "12.1.2" === 'string' ? "12.1.2" : null;
57
+ var version = typeof "13.0.0-dev.10" === 'string' ? "13.0.0-dev.10" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
@@ -57,11 +57,11 @@ function saveTopo(_x) {
57
57
 
58
58
  function _saveTopo() {
59
59
  _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
60
- var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
60
+ var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, viewGroupId, groupInfo, viewResources;
61
61
  return _regenerator["default"].wrap(function _callee$(_context) {
62
62
  while (1) switch (_context.prev = _context.next) {
63
63
  case 0:
64
- topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
64
+ topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, viewGroupId = data.viewGroupId;
65
65
 
66
66
  _rlog["default"].debug("saveTopo", data); // 保存布局
67
67
 
@@ -116,8 +116,7 @@ function _saveTopo() {
116
116
 
117
117
  _context.next = 15;
118
118
  return topoService.bindResourceToTopo(topoId, {
119
- groups: groupInfo,
120
- relateTopoIdList: relateTopoIdList
119
+ groups: groupInfo
121
120
  });
122
121
 
123
122
  case 15: