@riil-frontend/component-topology 6.0.0-alpha.4 → 6.0.0-alpha.5

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 (61) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +1 -1
  4. package/build/index.js +21 -21
  5. package/es/components/VerticalIconTab/VerticalIconTab.module.scss +1 -1
  6. package/es/core/editor/components/Sidebar/Sidebar.js +14 -49
  7. package/es/core/editor/components/Sidebar/panes.js +32 -0
  8. package/es/core/editor/components/Sidebar/views/CanvasPanel/{ImagePanel.js → CanvasPanel.js} +1 -1
  9. package/es/core/editor/components/Sidebar/views/CanvasPanel/index.js +1 -1
  10. package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +2 -5
  11. package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +2 -4
  12. package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss +5 -0
  13. package/es/core/editor/components/Toolbar/EditorToolbar.js +9 -6
  14. package/es/core/editor/components/Toolbar/Toolbar.js +1 -1
  15. package/es/core/editor/components/Toolbar/Toolbar.module.scss +14 -3
  16. package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js +6 -5
  17. package/es/core/editor/components/Toolbar/widgets/CanvasMoveWidget.js +13 -2
  18. package/es/core/editor/components/Toolbar/widgets/CanvasSelectWidget.js +11 -2
  19. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +133 -3
  20. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +46 -0
  21. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +47 -0
  22. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +31 -0
  23. package/es/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +2 -1
  24. package/es/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +3 -2
  25. package/es/core/editor/components/Toolbar/widgets/WidgetBox.js +2 -19
  26. package/es/core/editor/components/Toolbar/widgets/components/ButtonBox.js +4 -2
  27. package/es/core/{store/models → editor/store}/background.js +0 -0
  28. package/es/core/{store/models → editor/store}/historyManager.js +0 -0
  29. package/es/core/{store/models → editor/store}/topoEdit.js +5 -1
  30. package/es/core/hooks/useTopoEdit.js +21 -54
  31. package/es/core/models/TopoApp.js +1 -1
  32. package/es/core/store/coreModels.js +6 -7
  33. package/lib/components/VerticalIconTab/VerticalIconTab.module.scss +1 -1
  34. package/lib/core/editor/components/Sidebar/Sidebar.js +14 -53
  35. package/lib/core/editor/components/Sidebar/panes.js +45 -0
  36. package/lib/core/editor/components/Sidebar/views/CanvasPanel/{ImagePanel.js → CanvasPanel.js} +2 -2
  37. package/lib/core/editor/components/Sidebar/views/CanvasPanel/index.js +2 -2
  38. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +2 -5
  39. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +3 -4
  40. package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss +5 -0
  41. package/lib/core/editor/components/Toolbar/EditorToolbar.js +10 -6
  42. package/lib/core/editor/components/Toolbar/Toolbar.js +1 -1
  43. package/lib/core/editor/components/Toolbar/Toolbar.module.scss +14 -3
  44. package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js +6 -5
  45. package/lib/core/editor/components/Toolbar/widgets/CanvasMoveWidget.js +13 -2
  46. package/lib/core/editor/components/Toolbar/widgets/CanvasSelectWidget.js +11 -2
  47. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +143 -3
  48. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +46 -0
  49. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +62 -0
  50. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +31 -0
  51. package/lib/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +3 -1
  52. package/lib/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +3 -1
  53. package/lib/core/editor/components/Toolbar/widgets/WidgetBox.js +4 -23
  54. package/lib/core/editor/components/Toolbar/widgets/components/ButtonBox.js +4 -2
  55. package/lib/core/{store/models → editor/store}/background.js +0 -0
  56. package/lib/core/{store/models → editor/store}/historyManager.js +0 -0
  57. package/lib/core/{store/models → editor/store}/topoEdit.js +5 -1
  58. package/lib/core/hooks/useTopoEdit.js +21 -56
  59. package/lib/core/models/TopoApp.js +1 -1
  60. package/lib/core/store/coreModels.js +5 -7
  61. package/package.json +2 -2
@@ -5,12 +5,152 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = void 0;
7
7
 
8
- var _react = _interopRequireDefault(require("react"));
8
+ var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
9
+
10
+ var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
11
+
12
+ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
13
+
14
+ var _react = _interopRequireWildcard(require("react"));
15
+
16
+ var _EdgeTypeModule = _interopRequireDefault(require("./EdgeType.module.scss"));
17
+
18
+ var _LineType = _interopRequireDefault(require("./LineType"));
19
+
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); }
21
+
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; }
23
+
24
+ var FormItem = _form["default"].Item;
25
+ var Option = _select["default"].Option;
26
+ var START_END_TYPE_OPTIONS = [{
27
+ value: 'nil',
28
+ label: '无',
29
+ icon: 'topo_startEndPoint_icon_nothing'
30
+ }, {
31
+ value: 'hollowCrcial',
32
+ label: '空心圆',
33
+ icon: 'topo_startEndPoint_icon_hollow_cricle'
34
+ }, {
35
+ value: 'solidCricle',
36
+ label: '实心圆',
37
+ icon: 'topo_startEndPoint_icon_solid_cricle'
38
+ }, {
39
+ value: 'arrowPoint',
40
+ label: '箭头',
41
+ icon: 'topo_startEndPoint_icon_arrow'
42
+ }];
43
+ var LINE_MOLD_OPTIONS = [{
44
+ value: 'solidLine',
45
+ label: '实线',
46
+ icon: 'topo_lineMold_solid'
47
+ }, {
48
+ value: 'dottedLine',
49
+ label: '虚线',
50
+ icon: 'topo_lineMold_dotted'
51
+ }, {
52
+ value: 'dottedLine1',
53
+ label: '虚线1',
54
+ icon: 'topo_lineMold_dotted_one'
55
+ }, {
56
+ value: 'dottedLine2',
57
+ label: '虚线2',
58
+ icon: 'topo_lineMold_dotted_two'
59
+ }];
9
60
 
10
61
  function EdgeType(props) {
11
- // const { } = props
12
- return /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF\u5F62\u8BBE\u7F6E");
62
+ var _onChange = props.onChange;
63
+
64
+ var field = _field["default"].useField({
65
+ autoUnmount: false,
66
+ values: {
67
+ startPoint: 'nil',
68
+ endPoint: 'nil',
69
+ type: null
70
+ },
71
+ onChange: function onChange(name, value) {
72
+ if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
73
+ _onChange(name, null);
74
+ } else {
75
+ _onChange(name, value);
76
+ }
77
+ }
78
+ });
79
+
80
+ return /*#__PURE__*/_react["default"].createElement("div", {
81
+ className: _EdgeTypeModule["default"].lineBox
82
+ }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
83
+ field: field,
84
+ inline: true,
85
+ labelAlign: "top"
86
+ }, /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
87
+ name: "lineButton"
88
+ })), /*#__PURE__*/_react["default"].createElement(FormItem, {
89
+ label: "\u8D77\u70B9"
90
+ }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
91
+ name: "startPoint",
92
+ popupProps: {
93
+ container: function container(trigger) {
94
+ return trigger.parentNode;
95
+ }
96
+ }
97
+ }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
98
+ return /*#__PURE__*/_react["default"].createElement(Option, {
99
+ value: item.value,
100
+ key: index,
101
+ title: item.label,
102
+ onchange: _onChange
103
+ }, /*#__PURE__*/_react["default"].createElement("img", {
104
+ src: "/img/topo/editor/lineType/" + item.icon + ".svg",
105
+ alt: "",
106
+ className: _EdgeTypeModule["default"].iconImg
107
+ }));
108
+ }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
109
+ label: "\u7EC8\u70B9"
110
+ }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
111
+ name: "endPoint",
112
+ popupProps: {
113
+ container: function container(trigger) {
114
+ return trigger.parentNode;
115
+ }
116
+ }
117
+ }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
118
+ return /*#__PURE__*/_react["default"].createElement(Option, {
119
+ value: item.value,
120
+ key: index,
121
+ title: item.label,
122
+ onchange: _onChange
123
+ }, /*#__PURE__*/_react["default"].createElement("img", {
124
+ src: "/img/topo/editor/lineType/" + item.icon + ".svg",
125
+ alt: "",
126
+ className: _EdgeTypeModule["default"].iconImg
127
+ }));
128
+ }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
129
+ label: "\u7C7B\u578B"
130
+ }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
131
+ name: "type",
132
+ popupProps: {
133
+ container: function container(trigger) {
134
+ return trigger.parentNode;
135
+ }
136
+ },
137
+ placeholder: ""
138
+ }, LINE_MOLD_OPTIONS.map(function (item, index, array) {
139
+ return /*#__PURE__*/_react["default"].createElement(Option, {
140
+ value: item.value,
141
+ key: index,
142
+ title: item.label,
143
+ onchange: _onChange
144
+ }, /*#__PURE__*/_react["default"].createElement("img", {
145
+ src: "/img/topo/editor/lineType/" + item.icon + ".svg",
146
+ alt: "",
147
+ className: _EdgeTypeModule["default"].iconImg
148
+ }));
149
+ })))));
13
150
  }
14
151
 
152
+ EdgeType.defaultProps = {
153
+ onChange: function onChange(v) {}
154
+ };
15
155
  var _default = EdgeType;
16
156
  exports["default"] = _default;
@@ -0,0 +1,46 @@
1
+ @import '~@alifd/next/variables.scss';
2
+
3
+ .lineBox{
4
+ width: 236px;
5
+ background: #FFFFFF;
6
+ border-radius: 4px;
7
+ margin-bottom: -7px;
8
+
9
+ :global {
10
+ .#{$css-prefix}form-item:first-child{
11
+ margin-top: 0;
12
+ margin-bottom: 0;
13
+ }
14
+ .#{$css-prefix}form-item {
15
+ margin-top: 7px;
16
+ margin-bottom: 7px;
17
+ }
18
+ .#{$css-prefix}form.#{$css-prefix}inline .#{$css-prefix}form-item:not(:last-child) {
19
+ margin-right: 8px;
20
+ .#{$css-prefix}select-trigger {
21
+ min-width: 0;
22
+ width: 64px;
23
+ height: 28px;
24
+ .#{$css-prefix}select-inner {
25
+ min-width:0 !important;
26
+ }
27
+ }
28
+ }
29
+ .#{$css-prefix}form.#{$css-prefix}inline .#{$css-prefix}form-item:last-child{
30
+ .#{$css-prefix}select-trigger {
31
+ min-width: 0;
32
+ width: 88px;
33
+ height: 28px;
34
+ .#{$css-prefix}select-inner {
35
+ min-width:0 !important;
36
+ }
37
+ }
38
+ }
39
+ .#{$css-prefix}input.#{$css-prefix}medium .#{$css-prefix}input-text-field {
40
+ line-height: calc(28px - 10px * 2);
41
+ }
42
+ .#{$css-prefix}select-trigger-search {
43
+ height: 12px;
44
+ }
45
+ }
46
+ }
@@ -0,0 +1,62 @@
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 _button = _interopRequireDefault(require("@alifd/next/lib/button"));
9
+
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _LineTypeModule = _interopRequireDefault(require("./LineType.module.scss"));
13
+
14
+ 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); }
15
+
16
+ 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; }
17
+
18
+ var LINE_TYPE_OPTIONS = [{
19
+ value: 'boundary',
20
+ label: '直线',
21
+ icon: 'topo_linear_icon_straightline'
22
+ }, {
23
+ value: 'oposite',
24
+ label: '内向双向箭头',
25
+ icon: 'topo_linear_icon_narrow_straightline'
26
+ }, {
27
+ value: 'h.v',
28
+ label: '纵向折线',
29
+ icon: 'topo_linear_icon_vertical_foldline'
30
+ }, {
31
+ value: 'ortho',
32
+ label: '双折线',
33
+ icon: 'topo_linear_icon_bilinear'
34
+ }, {
35
+ value: 'flex',
36
+ label: '双弧线',
37
+ icon: 'topo_linear_icon_arcline'
38
+ }];
39
+
40
+ function LineType(props) {
41
+ var handleChange = function handleChange(node) {};
42
+
43
+ return /*#__PURE__*/_react["default"].createElement("div", {
44
+ className: _LineTypeModule["default"].lineType
45
+ }, LINE_TYPE_OPTIONS.map(function (item, index, array) {
46
+ return /*#__PURE__*/_react["default"].createElement(_button["default"], {
47
+ key: index,
48
+ title: item.label,
49
+ className: "" + _LineTypeModule["default"].redioBtn,
50
+ onClick: function onClick() {
51
+ handleChange(item);
52
+ }
53
+ }, /*#__PURE__*/_react["default"].createElement("img", {
54
+ src: "/img/topo/editor/lineType/" + item.icon + ".svg",
55
+ alt: "",
56
+ className: _LineTypeModule["default"].iconImg
57
+ }));
58
+ }));
59
+ }
60
+
61
+ var _default = LineType;
62
+ exports["default"] = _default;
@@ -0,0 +1,31 @@
1
+ .lineType{
2
+ display:flex;
3
+ .redioBtn {
4
+ width: 24px;
5
+ height: 24px;
6
+ border-radius: 4px;
7
+ border: none !important;
8
+ color: #4D6277;
9
+ padding: 0;
10
+ margin-right: 16px;
11
+ text-align: center;
12
+
13
+ .iconImg {
14
+ vertical-align: middle;
15
+ }
16
+
17
+ &:active {
18
+ background: #F2F7FD !important;
19
+ }
20
+
21
+ &:hover {
22
+ background: #F2F7FD !important;
23
+ }
24
+ }
25
+ .redioBtn:last-child{
26
+ margin-right: 0;
27
+ }
28
+ }
29
+ .iconImg {
30
+ vertical-align: middle;
31
+ }
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
11
11
 
12
+ var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
13
+
12
14
  function HistoryRedoButton(props) {
13
15
  var topo = props.topo,
14
16
  showLabel = props.showLabel;
@@ -21,7 +23,7 @@ function HistoryRedoButton(props) {
21
23
  label: "\u6062\u590D",
22
24
  tooltip: "\u6062\u590D",
23
25
  showLabel: showLabel
24
- }, /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"].ButtonBox, null, /*#__PURE__*/_react["default"].createElement("img", {
26
+ }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], null, /*#__PURE__*/_react["default"].createElement("img", {
25
27
  src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
26
28
  alt: ""
27
29
  })));
@@ -7,6 +7,8 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
+ var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
11
+
10
12
  var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
11
13
 
12
14
  // import { Icon, Button } from '@alifd/next';
@@ -23,7 +25,7 @@ function HistoryUndoButton(props) {
23
25
  label: "\u64A4\u9500",
24
26
  tooltip: "\u64A4\u9500",
25
27
  showLabel: showLabel
26
- }, /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"].ButtonBox, {
28
+ }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
27
29
  disabled: disabled,
28
30
  onClick: function onClick() {
29
31
  topo.historyManager.undo();
@@ -5,19 +5,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = void 0;
7
7
 
8
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
-
10
- var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
11
-
12
8
  var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
13
9
 
14
- var _classnames = _interopRequireDefault(require("classnames"));
15
-
16
10
  var _react = _interopRequireDefault(require("react"));
17
11
 
18
- var _WidgetBoxModule = _interopRequireDefault(require("./WidgetBox.module.scss"));
12
+ var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
19
13
 
20
- var _excluded = ["active", "disabled", "children"];
14
+ var _WidgetBoxModule = _interopRequireDefault(require("./WidgetBox.module.scss"));
21
15
 
22
16
  function WidgetBox(props) {
23
17
  var label = props.label,
@@ -26,9 +20,8 @@ function WidgetBox(props) {
26
20
  disabled = props.disabled,
27
21
  children = props.children;
28
22
 
29
- var button = /*#__PURE__*/_react["default"].createElement("button", {
23
+ var button = /*#__PURE__*/_react["default"].createElement("div", {
30
24
  disabled: disabled,
31
- type: "button",
32
25
  className: _WidgetBoxModule["default"].container
33
26
  }, /*#__PURE__*/_react["default"].createElement("div", {
34
27
  className: _WidgetBoxModule["default"].content
@@ -46,18 +39,6 @@ function WidgetBox(props) {
46
39
  }, tooltip);
47
40
  }
48
41
 
49
- function ButtonBox(props) {
50
- var _classNames;
51
-
52
- var active = props.active,
53
- disabled = props.disabled,
54
- children = props.children,
55
- otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
56
- return /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({
57
- className: (0, _classnames["default"])(_WidgetBoxModule["default"].ButtonBox, (_classNames = {}, _classNames[_WidgetBoxModule["default"].ButtonBoxActive] = active, _classNames[_WidgetBoxModule["default"].ButtonBoxDisabled] = disabled, _classNames))
58
- }, otherProps), children);
59
- }
60
-
61
- WidgetBox.ButtonBox = ButtonBox;
42
+ WidgetBox.ButtonBox = _ButtonBox["default"];
62
43
  var _default = WidgetBox;
63
44
  exports["default"] = _default;
@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
19
19
 
20
20
  var _ButtonBoxModule = _interopRequireDefault(require("./ButtonBox.module.scss"));
21
21
 
22
- var _excluded = ["active", "disabled", "showArrow", "children"];
22
+ var _excluded = ["active", "disabled", "showArrow", "children", "onClick"];
23
23
 
24
24
  function ButtonBox(props) {
25
25
  var _classNames, _classNames2;
@@ -28,9 +28,11 @@ function ButtonBox(props) {
28
28
  disabled = props.disabled,
29
29
  showArrow = props.showArrow,
30
30
  children = props.children,
31
+ onClick = props.onClick,
31
32
  otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
32
33
  return /*#__PURE__*/_react["default"].createElement("div", (0, _extends2["default"])({
33
- className: (0, _classnames["default"])(_ButtonBoxModule["default"].ButtonBox, (_classNames = {}, _classNames[_ButtonBoxModule["default"].ButtonBoxActive] = active, _classNames[_ButtonBoxModule["default"].ButtonBoxDisabled] = disabled, _classNames))
34
+ className: (0, _classnames["default"])(_ButtonBoxModule["default"].ButtonBox, (_classNames = {}, _classNames[_ButtonBoxModule["default"].ButtonBoxActive] = active, _classNames[_ButtonBoxModule["default"].ButtonBoxDisabled] = disabled, _classNames)),
35
+ onClick: disabled ? undefined : onClick
34
36
  }, otherProps), children, showArrow && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "\xA0", /*#__PURE__*/_react["default"].createElement(_icon["default"], {
35
37
  type: "tree_fold_arrow",
36
38
  size: "xxs",
@@ -21,7 +21,11 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
21
21
  var _default = {
22
22
  // 定义 model 的初始 state
23
23
  state: {
24
- saving: false
24
+ saving: false,
25
+ // 选择/拖动模式模式。默认选择模式 select|move
26
+ viewMouseMode: 'select',
27
+ // 资源面板展开项
28
+ resourceTabactiveKey: null
25
29
  },
26
30
  // 定义改变该模型状态的纯函数
27
31
  reducers: {
@@ -65,8 +65,6 @@ var useTopoEdit = function useTopoEdit(params) {
65
65
  editDispatchers = _store$useModel[1];
66
66
 
67
67
  var topoDispatchers = store.useModelDispatchers("topoMod");
68
- var _editState$groups = editState.groups,
69
- groups = _editState$groups === void 0 ? [] : _editState$groups;
70
68
 
71
69
  var _useState = (0, _react.useState)(false),
72
70
  showComboResDrawer = _useState[0],
@@ -315,57 +313,6 @@ var useTopoEdit = function useTopoEdit(params) {
315
313
  var deleteNode = function deleteNode(node) {
316
314
  emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, node);
317
315
  };
318
- /**
319
- * 删除视图内的资源
320
- */
321
-
322
-
323
- var deleteViewNode = function deleteViewNode(node) {
324
- var nodeId = node.id;
325
- var viewResources = resourceConfig.getViewResources();
326
- var index = viewResources["static"].indexOf(nodeId);
327
-
328
- if (index > -1) {
329
- editDispatchers.updateResources({
330
- "static": viewResources["static"].filter(function (item) {
331
- return item !== nodeId;
332
- })
333
- });
334
- }
335
- };
336
- /**
337
- * 删除容器内的单个资源
338
- *
339
- * @param allGroups
340
- * @param node 资源
341
- */
342
-
343
-
344
- var deleteGroupNode = function deleteGroupNode(allGroups, node) {
345
- var nodeId = node.id; // 更新容器内的资源
346
-
347
- var newGroups = allGroups.map(function (g) {
348
- var newGroup = g;
349
-
350
- if (resourceConfig.isGroupContainsNode(g, node)) {
351
- newGroup = (0, _extends2["default"])({}, g, {
352
- resources: resourceConfig.removeStaticResource(g.resources, nodeId)
353
- });
354
- }
355
-
356
- return newGroup;
357
- });
358
-
359
- _rlog["default"].info("删除容器内的单个资源", {
360
- groups: groups,
361
- node: node,
362
- newGroups: newGroups
363
- });
364
-
365
- editDispatchers.update({
366
- groups: newGroups
367
- });
368
- };
369
316
 
370
317
  var handleDeleteNode = function handleDeleteNode(element) {
371
318
  var _topo$options$editor;
@@ -677,9 +624,13 @@ var useTopoEdit = function useTopoEdit(params) {
677
624
  topo.linkDynamicStyleExecutor.execute();
678
625
  }
679
626
 
680
- topo.historyManager.endTransaction();
627
+ topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
681
628
 
682
- case 12:
629
+ topoEditDispatchers.update({
630
+ resourceTabactiveKey: null
631
+ });
632
+
633
+ case 13:
683
634
  case "end":
684
635
  return _context15.stop();
685
636
  }
@@ -762,8 +713,11 @@ var useTopoEdit = function useTopoEdit(params) {
762
713
 
763
714
  case 9:
764
715
  topo.historyManager.endTransaction();
716
+ topoEditDispatchers.update({
717
+ resourceTabactiveKey: null
718
+ });
765
719
 
766
- case 10:
720
+ case 11:
767
721
  case "end":
768
722
  return _context7.stop();
769
723
  }
@@ -1156,6 +1110,16 @@ var useTopoEdit = function useTopoEdit(params) {
1156
1110
 
1157
1111
  var effectsState = store.useModelEffectsState("topoConfig");
1158
1112
  var topoLoading = effectsState.getTopoByConditions.isLoading;
1113
+ /**
1114
+ * 设置视图鼠标模式
1115
+ */
1116
+
1117
+ var setViewMouseMode = (0, _react.useCallback)(function (mode) {
1118
+ topo.getHtTopo().setViewMouseMode(mode);
1119
+ topoEditDispatchers.update({
1120
+ viewMouseMode: mode
1121
+ });
1122
+ }, []);
1159
1123
  return {
1160
1124
  resourceConfig: resourceConfig,
1161
1125
 
@@ -1163,6 +1127,7 @@ var useTopoEdit = function useTopoEdit(params) {
1163
1127
  * 拓扑结构加载中状态
1164
1128
  */
1165
1129
  topoLoading: topoLoading,
1130
+ setViewMouseMode: setViewMouseMode,
1166
1131
 
1167
1132
  /**
1168
1133
  * 资源绑定(多选)抽屉显示状态
@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
52
52
  var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
53
53
 
54
54
  // eslint-disable-next-line no-undef
55
- var version = typeof "6.0.0-alpha.4" === 'string' ? "6.0.0-alpha.4" : null;
55
+ var version = typeof "6.0.0-alpha.5" === 'string' ? "6.0.0-alpha.5" : null;
56
56
  console.info("\u62D3\u6251\u7248\u672C: " + version);
57
57
  /**
58
58
  * 拓扑显示和编辑
@@ -15,15 +15,13 @@ var _topoBizMod = _interopRequireDefault(require("./models/topoBizMod"));
15
15
 
16
16
  var _topoConfig = _interopRequireDefault(require("./models/topoConfig"));
17
17
 
18
- var _topoEdit = _interopRequireDefault(require("./models/topoEdit"));
18
+ var _topoEdit = _interopRequireDefault(require("../editor/store/topoEdit"));
19
19
 
20
- var _background = _interopRequireDefault(require("./models/background"));
20
+ var _background = _interopRequireDefault(require("../editor/store/background"));
21
21
 
22
- var _selection = _interopRequireDefault(require("./models/selection"));
23
-
24
- var _historyManager = _interopRequireDefault(require("./models/historyManager"));
22
+ var _historyManager = _interopRequireDefault(require("../editor/store/historyManager"));
25
23
 
26
- var _topoGraphView = _interopRequireDefault(require("./models/topoGraphView"));
24
+ var _selection = _interopRequireDefault(require("./models/selection"));
27
25
 
28
26
  var _topoAlarm = _interopRequireDefault(require("./models/topoAlarm"));
29
27
 
@@ -33,6 +31,7 @@ var _topoBaseInfoOverview = _interopRequireDefault(require("./models/topoBaseInf
33
31
 
34
32
  var _lock = _interopRequireDefault(require("./models/viewer/lock"));
35
33
 
34
+ // 编辑模式
36
35
  // 显示模式
37
36
  var _default = {
38
37
  topoMod: _topoMod["default"],
@@ -42,7 +41,6 @@ var _default = {
42
41
  topoConfig: _topoConfig["default"],
43
42
  historyManager: _historyManager["default"],
44
43
  background: _background["default"],
45
- topoGraphView: _topoGraphView["default"],
46
44
  ciModel: _ciModel["default"],
47
45
  topoEdit: _topoEdit["default"],
48
46
  // 显示模式
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "6.0.0-alpha.4",
3
+ "version": "6.0.0-alpha.5",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -115,6 +115,6 @@
115
115
  "access": "public"
116
116
  },
117
117
  "license": "MIT",
118
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.4/build/index.html",
118
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.5/build/index.html",
119
119
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
120
120
  }