@riil-frontend/component-topology 6.0.0-alpha.4 → 6.0.0-alpha.6
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.
- package/build/1.js +2 -2
- package/build/2.js +1 -1
- package/build/index.css +1 -1
- package/build/index.js +21 -21
- package/es/components/VerticalIconTab/VerticalIconTab.module.scss +5 -1
- package/es/core/editor/components/Sidebar/Sidebar.js +23 -50
- package/es/core/editor/components/Sidebar/panes.js +32 -0
- package/es/core/editor/components/Sidebar/views/CanvasPanel/{ImagePanel.js → CanvasPanel.js} +1 -1
- package/es/core/editor/components/Sidebar/views/CanvasPanel/index.js +1 -1
- package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +2 -5
- package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +2 -4
- package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss +5 -0
- package/es/core/editor/components/Toolbar/EditorToolbar.js +9 -6
- package/es/core/editor/components/Toolbar/Toolbar.js +1 -1
- package/es/core/editor/components/Toolbar/Toolbar.module.scss +14 -3
- package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js +6 -5
- package/es/core/editor/components/Toolbar/widgets/CanvasMoveWidget.js +13 -2
- package/es/core/editor/components/Toolbar/widgets/CanvasSelectWidget.js +11 -2
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +133 -3
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +46 -0
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +46 -0
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +31 -0
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +27 -6
- package/es/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +2 -1
- package/es/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +3 -2
- package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +2 -1
- package/es/core/editor/components/Toolbar/widgets/WidgetBox.js +7 -20
- package/es/core/editor/components/Toolbar/widgets/WidgetBox.module.scss +1 -0
- package/es/core/editor/components/Toolbar/widgets/components/ButtonBox.js +4 -2
- package/es/core/editor/components/Toolbar/widgets/components/DropdownButton.js +8 -5
- package/es/core/editor/components/settings/common/LineType/index.js +3 -19
- package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +3 -0
- package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementLineType.js +2 -37
- package/es/core/{store/models → editor/store}/background.js +0 -0
- package/es/core/{store/models → editor/store}/historyManager.js +0 -0
- package/es/core/{store/models → editor/store}/topoEdit.js +8 -1
- package/es/core/editor/utils/edgeTypeStyleUtil.js +73 -0
- package/es/core/hooks/useTopoEdit.js +21 -54
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/TopoGraphView.js +8 -2
- package/es/core/store/coreModels.js +6 -7
- package/lib/components/VerticalIconTab/VerticalIconTab.module.scss +5 -1
- package/lib/core/editor/components/Sidebar/Sidebar.js +22 -53
- package/lib/core/editor/components/Sidebar/panes.js +45 -0
- package/lib/core/editor/components/Sidebar/views/CanvasPanel/{ImagePanel.js → CanvasPanel.js} +2 -2
- package/lib/core/editor/components/Sidebar/views/CanvasPanel/index.js +2 -2
- package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js +2 -5
- package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js +3 -4
- package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss +5 -0
- package/lib/core/editor/components/Toolbar/EditorToolbar.js +10 -6
- package/lib/core/editor/components/Toolbar/Toolbar.js +1 -1
- package/lib/core/editor/components/Toolbar/Toolbar.module.scss +14 -3
- package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js +6 -5
- package/lib/core/editor/components/Toolbar/widgets/CanvasMoveWidget.js +13 -2
- package/lib/core/editor/components/Toolbar/widgets/CanvasSelectWidget.js +11 -2
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +143 -3
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +46 -0
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +61 -0
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss +31 -0
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +27 -5
- package/lib/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +3 -1
- package/lib/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +3 -1
- package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +2 -1
- package/lib/core/editor/components/Toolbar/widgets/WidgetBox.js +9 -24
- package/lib/core/editor/components/Toolbar/widgets/WidgetBox.module.scss +1 -0
- package/lib/core/editor/components/Toolbar/widgets/components/ButtonBox.js +4 -2
- package/lib/core/editor/components/Toolbar/widgets/components/DropdownButton.js +8 -5
- package/lib/core/editor/components/settings/common/LineType/index.js +3 -18
- package/lib/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +3 -0
- package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementLineType.js +2 -37
- package/lib/core/{store/models → editor/store}/background.js +0 -0
- package/lib/core/{store/models → editor/store}/historyManager.js +0 -0
- package/lib/core/{store/models → editor/store}/topoEdit.js +8 -1
- package/lib/core/editor/utils/edgeTypeStyleUtil.js +82 -0
- package/lib/core/hooks/useTopoEdit.js +21 -56
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/TopoGraphView.js +8 -2
- package/lib/core/store/coreModels.js +5 -7
- package/package.json +2 -2
- package/es/core/store/models/topoView.js +0 -36
- package/lib/core/store/models/topoView.js +0 -47
@@ -9,22 +9,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
9
9
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
11
11
|
|
12
|
-
var
|
13
|
-
|
14
|
-
var _LinkPanel = _interopRequireDefault(require("./views/LinkPanel"));
|
15
|
-
|
16
|
-
var _ComponentPanel = _interopRequireDefault(require("./views/ComponentPanel"));
|
17
|
-
|
18
|
-
var _ImagePanel = _interopRequireDefault(require("./views/ImagePanel"));
|
12
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
19
13
|
|
20
|
-
var
|
14
|
+
var _VerticalIconTab = _interopRequireDefault(require("../../../../components/VerticalIconTab"));
|
21
15
|
|
22
|
-
var
|
16
|
+
var _panes = _interopRequireDefault(require("./panes"));
|
23
17
|
|
24
18
|
var _SidebarModule = _interopRequireDefault(require("./Sidebar.module.scss"));
|
25
19
|
|
26
|
-
var _classnames = _interopRequireDefault(require("classnames"));
|
27
|
-
|
28
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); }
|
29
21
|
|
30
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; }
|
@@ -34,46 +26,19 @@ function Sidebar(props) {
|
|
34
26
|
|
35
27
|
var topo = props.topo;
|
36
28
|
|
37
|
-
var
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
var
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
content: _ComponentPanel["default"]
|
51
|
-
}, {
|
52
|
-
title: '图片',
|
53
|
-
key: '3',
|
54
|
-
icon: '/img/topo/editor/sidebar/icon/图片.svg',
|
55
|
-
content: _ImagePanel["default"]
|
56
|
-
}, {
|
57
|
-
title: '背景',
|
58
|
-
key: '4',
|
59
|
-
icon: '/img/topo/editor/sidebar/icon/背景.svg',
|
60
|
-
content: _BackgroundPanel["default"]
|
61
|
-
}, {
|
62
|
-
title: '画布',
|
63
|
-
key: '5',
|
64
|
-
icon: '/img/topo/editor/sidebar/icon/画布.svg',
|
65
|
-
content: _CanvasPanel["default"]
|
66
|
-
}].map(function (item) {
|
67
|
-
var View = item.content;
|
68
|
-
return (0, _extends2["default"])({}, item, {
|
69
|
-
content: function content() {
|
70
|
-
return /*#__PURE__*/_react["default"].createElement(View, (0, _extends2["default"])({}, props, {
|
71
|
-
topo: topo,
|
72
|
-
active: activeKey === item.key
|
73
|
-
}));
|
74
|
-
}
|
75
|
-
});
|
76
|
-
});
|
29
|
+
var _topo$store$useModel = topo.store.useModel('topoEdit'),
|
30
|
+
topoEditState = _topo$store$useModel[0],
|
31
|
+
topoEditDispatchers = _topo$store$useModel[1];
|
32
|
+
|
33
|
+
var activeKey = topoEditState.resourceTabactiveKey;
|
34
|
+
(0, _react.useEffect)(function () {
|
35
|
+
return function () {
|
36
|
+
// 退出编辑模式,关闭资源面板状态
|
37
|
+
topoEditDispatchers.update({
|
38
|
+
resourceTabactiveKey: null
|
39
|
+
});
|
40
|
+
};
|
41
|
+
}, []);
|
77
42
|
|
78
43
|
var renderTabItem = function renderTabItem(pane) {
|
79
44
|
var View = pane.content;
|
@@ -91,8 +56,12 @@ function Sidebar(props) {
|
|
91
56
|
className: (0, _classnames["default"])(_SidebarModule["default"].tabsContainer, (_classNames = {}, _classNames[_SidebarModule["default"].expanded] = !!activeKey, _classNames))
|
92
57
|
}, /*#__PURE__*/_react["default"].createElement(_VerticalIconTab["default"], {
|
93
58
|
activeKey: activeKey,
|
94
|
-
onChange:
|
95
|
-
|
59
|
+
onChange: function onChange(key) {
|
60
|
+
return topoEditDispatchers.update({
|
61
|
+
resourceTabactiveKey: key
|
62
|
+
});
|
63
|
+
}
|
64
|
+
}, _panes["default"].map(renderTabItem))));
|
96
65
|
}
|
97
66
|
|
98
67
|
var _default = Sidebar;
|
@@ -0,0 +1,45 @@
|
|
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 _BackgroundPanel = _interopRequireDefault(require("./views/BackgroundPanel"));
|
9
|
+
|
10
|
+
var _CanvasPanel = _interopRequireDefault(require("./views/CanvasPanel"));
|
11
|
+
|
12
|
+
var _ComponentPanel = _interopRequireDefault(require("./views/ComponentPanel"));
|
13
|
+
|
14
|
+
var _ImagePanel = _interopRequireDefault(require("./views/ImagePanel"));
|
15
|
+
|
16
|
+
var _LinkPanel = _interopRequireDefault(require("./views/LinkPanel"));
|
17
|
+
|
18
|
+
var panes = [{
|
19
|
+
title: '链路',
|
20
|
+
key: '1',
|
21
|
+
icon: '/img/topo/editor/sidebar/icon/链路.svg',
|
22
|
+
content: _LinkPanel["default"]
|
23
|
+
}, {
|
24
|
+
title: '组件',
|
25
|
+
key: '2',
|
26
|
+
icon: '/img/topo/editor/sidebar/icon/组件.svg',
|
27
|
+
content: _ComponentPanel["default"]
|
28
|
+
}, {
|
29
|
+
title: '图片',
|
30
|
+
key: '3',
|
31
|
+
icon: '/img/topo/editor/sidebar/icon/图片.svg',
|
32
|
+
content: _ImagePanel["default"]
|
33
|
+
}, {
|
34
|
+
title: '背景',
|
35
|
+
key: '4',
|
36
|
+
icon: '/img/topo/editor/sidebar/icon/背景.svg',
|
37
|
+
content: _BackgroundPanel["default"]
|
38
|
+
}, {
|
39
|
+
title: '画布',
|
40
|
+
key: '5',
|
41
|
+
icon: '/img/topo/editor/sidebar/icon/画布.svg',
|
42
|
+
content: _CanvasPanel["default"]
|
43
|
+
}];
|
44
|
+
var _default = panes;
|
45
|
+
exports["default"] = _default;
|
package/lib/core/editor/components/Sidebar/views/CanvasPanel/{ImagePanel.js → CanvasPanel.js}
RENAMED
@@ -3,10 +3,10 @@
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
4
|
|
5
5
|
exports.__esModule = true;
|
6
|
-
exports["default"] =
|
6
|
+
exports["default"] = CanvasPanel;
|
7
7
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
9
9
|
|
10
|
-
function
|
10
|
+
function CanvasPanel(props) {
|
11
11
|
return /*#__PURE__*/_react["default"].createElement("div", null, "ImagePanel");
|
12
12
|
}
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
5
5
|
exports.__esModule = true;
|
6
6
|
exports["default"] = void 0;
|
7
7
|
|
8
|
-
var
|
8
|
+
var _CanvasPanel = _interopRequireDefault(require("./CanvasPanel"));
|
9
9
|
|
10
|
-
var _default =
|
10
|
+
var _default = _CanvasPanel["default"];
|
11
11
|
exports["default"] = _default;
|
@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
|
10
10
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
11
11
|
|
12
|
-
var
|
12
|
+
var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
|
13
13
|
|
14
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
15
|
|
@@ -50,9 +50,6 @@ function HtCustomImagePanel(props) {
|
|
50
50
|
}, []);
|
51
51
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
52
52
|
ref: divRef,
|
53
|
-
|
54
|
-
width: '100%' // height: '100%',
|
55
|
-
|
56
|
-
}
|
53
|
+
className: _HtImagePaletteModule["default"].container
|
57
54
|
});
|
58
55
|
}
|
@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
|
10
10
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
11
11
|
|
12
|
+
var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
|
13
|
+
|
12
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); }
|
13
15
|
|
14
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; }
|
@@ -48,9 +50,6 @@ function HtImagePalette(props) {
|
|
48
50
|
}, []);
|
49
51
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
50
52
|
ref: divRef,
|
51
|
-
|
52
|
-
width: '100%' // height: '100%',
|
53
|
-
|
54
|
-
}
|
53
|
+
className: _HtImagePaletteModule["default"].container
|
55
54
|
});
|
56
55
|
}
|
@@ -9,6 +9,8 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
|
9
9
|
|
10
10
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
11
11
|
|
12
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
13
|
+
|
12
14
|
var _react = _interopRequireWildcard(require("react"));
|
13
15
|
|
14
16
|
var _buttons = _interopRequireDefault(require("./buttons"));
|
@@ -22,19 +24,21 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
22
24
|
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
25
|
|
24
26
|
function EditorToolbar(props) {
|
27
|
+
var _classNames;
|
28
|
+
|
25
29
|
var _useState = (0, _react.useState)(true),
|
26
|
-
|
27
|
-
|
30
|
+
expanded = _useState[0],
|
31
|
+
setExpanded = _useState[1];
|
28
32
|
|
29
33
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
30
|
-
className: _ToolbarModule["default"].
|
34
|
+
className: (0, _classnames["default"])(_ToolbarModule["default"].toolbarWrap, (_classNames = {}, _classNames[_ToolbarModule["default"].normal] = expanded, _classNames[_ToolbarModule["default"].expanded] = !expanded, _classNames))
|
31
35
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
32
36
|
className: _ToolbarModule["default"].content
|
33
37
|
}, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, _buttons["default"].map(function (ToolbarButton, index) {
|
34
38
|
return /*#__PURE__*/_react["default"].createElement(ToolbarButton, (0, _extends2["default"])({
|
35
39
|
key: index
|
36
40
|
}, props, {
|
37
|
-
showLabel:
|
41
|
+
showLabel: expanded
|
38
42
|
}));
|
39
43
|
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
40
44
|
className: _ToolbarModule["default"].right
|
@@ -42,10 +46,10 @@ function EditorToolbar(props) {
|
|
42
46
|
type: "normal",
|
43
47
|
text: true,
|
44
48
|
onClick: function onClick() {
|
45
|
-
|
49
|
+
setExpanded(!expanded);
|
46
50
|
}
|
47
51
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
48
|
-
src:
|
52
|
+
src: expanded ? '/img/topo/editor/toolbar/ToolbarNarrowed/Normal.svg' : '/img/topo/editor/toolbar/ToolbbbarExpand/Normal.svg',
|
49
53
|
alt: "",
|
50
54
|
style: {
|
51
55
|
verticalAlign: 'middle'
|
@@ -11,7 +11,7 @@ var _ToolbarModule = _interopRequireDefault(require("./Toolbar.module.scss"));
|
|
11
11
|
|
12
12
|
function Toolbar(props) {
|
13
13
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
14
|
-
className: _ToolbarModule["default"].
|
14
|
+
className: _ToolbarModule["default"].toolbarContainer
|
15
15
|
}, props.children);
|
16
16
|
}
|
17
17
|
|
@@ -1,19 +1,30 @@
|
|
1
|
-
.
|
2
|
-
height: 54px;
|
1
|
+
.toolbarWrap {
|
3
2
|
display: flex;
|
4
3
|
align-items: center;
|
5
4
|
justify-content: center;
|
5
|
+
transition: all .1s linear;
|
6
|
+
|
7
|
+
&.normal {
|
8
|
+
height: 54px;
|
9
|
+
}
|
10
|
+
|
11
|
+
&.expanded {
|
12
|
+
height: 40px;
|
13
|
+
}
|
6
14
|
}
|
7
15
|
|
8
16
|
.content {
|
17
|
+
height: 100%;
|
9
18
|
flex: 1;
|
10
19
|
display: flex;
|
11
20
|
align-items: center;
|
12
21
|
justify-content: center;
|
22
|
+
overflow-x: auto;
|
13
23
|
}
|
14
24
|
|
15
|
-
.
|
25
|
+
.toolbarContainer {
|
16
26
|
display: flex;
|
27
|
+
min-width: 1060px;
|
17
28
|
}
|
18
29
|
|
19
30
|
.right {
|
@@ -43,16 +43,16 @@ function AddResourceButton(props) {
|
|
43
43
|
|
44
44
|
var _useState = (0, _react.useState)(getAddType(selection)),
|
45
45
|
addType = _useState[0],
|
46
|
-
setAddType = _useState[1];
|
46
|
+
setAddType = _useState[1];
|
47
47
|
|
48
|
+
(0, _react.useEffect)(function () {
|
49
|
+
setAddType(getAddType(selection));
|
50
|
+
}, [selection]); // 选中分层添加
|
48
51
|
|
49
52
|
var layerAddResource = (0, _useLayerAddResource["default"])({
|
50
53
|
topo: topo,
|
51
54
|
topoEdit: topoEdit
|
52
55
|
});
|
53
|
-
(0, _react.useEffect)(function () {
|
54
|
-
setAddType(getAddType(selection));
|
55
|
-
}, [selection]);
|
56
56
|
|
57
57
|
var handleClick = function handleClick() {
|
58
58
|
if (!addType) {
|
@@ -64,7 +64,8 @@ function AddResourceButton(props) {
|
|
64
64
|
} else if (addType === 'group') {
|
65
65
|
// 选中区域添加资源
|
66
66
|
var group = selection[0];
|
67
|
-
|
67
|
+
var htGroup = topo.getHtTopo().getGraphView().getDataModel().getDataById(group.id);
|
68
|
+
topoEdit.groupAddResource.open(htGroup);
|
68
69
|
}
|
69
70
|
};
|
70
71
|
|
@@ -12,12 +12,23 @@ var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
|
|
12
12
|
var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
|
13
13
|
|
14
14
|
function CanvasMoveWidget(props) {
|
15
|
-
var
|
15
|
+
var topo = props.topo,
|
16
|
+
showLabel = props.showLabel,
|
17
|
+
topoEdit = props.topoEdit;
|
18
|
+
|
19
|
+
var _topo$store$useModelS = topo.store.useModelState('topoEdit'),
|
20
|
+
viewMouseMode = _topo$store$useModelS.viewMouseMode;
|
21
|
+
|
16
22
|
return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
|
17
23
|
label: "\u79FB\u52A8",
|
18
24
|
tooltip: "\u79FB\u52A8",
|
19
25
|
showLabel: showLabel
|
20
|
-
}, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"],
|
26
|
+
}, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
|
27
|
+
active: viewMouseMode === 'move',
|
28
|
+
onClick: function onClick() {
|
29
|
+
topoEdit.setViewMouseMode('move');
|
30
|
+
}
|
31
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
21
32
|
src: "/img/topo/editor/toolbar/drag/Normal.svg",
|
22
33
|
alt: ""
|
23
34
|
})));
|
@@ -12,13 +12,22 @@ var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
|
|
12
12
|
var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
|
13
13
|
|
14
14
|
function CanvasSelectWidget(props) {
|
15
|
-
var
|
15
|
+
var topo = props.topo,
|
16
|
+
showLabel = props.showLabel,
|
17
|
+
topoEdit = props.topoEdit;
|
18
|
+
|
19
|
+
var _topo$store$useModelS = topo.store.useModelState('topoEdit'),
|
20
|
+
viewMouseMode = _topo$store$useModelS.viewMouseMode;
|
21
|
+
|
16
22
|
return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
|
17
23
|
label: "\u9009\u62E9",
|
18
24
|
tooltip: "\u9009\u62E9",
|
19
25
|
showLabel: showLabel
|
20
26
|
}, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
|
21
|
-
active:
|
27
|
+
active: viewMouseMode === 'select',
|
28
|
+
onClick: function onClick() {
|
29
|
+
topoEdit.setViewMouseMode('select');
|
30
|
+
}
|
22
31
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
23
32
|
src: "/img/topo/editor/toolbar/select/Normal.svg",
|
24
33
|
alt: ""
|
@@ -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
|
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
|
-
|
12
|
-
|
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,61 @@
|
|
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 onChange = props.onChange;
|
42
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
43
|
+
className: _LineTypeModule["default"].lineType
|
44
|
+
}, LINE_TYPE_OPTIONS.map(function (item, index, array) {
|
45
|
+
return /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
46
|
+
key: index,
|
47
|
+
title: item.label,
|
48
|
+
className: "" + _LineTypeModule["default"].redioBtn,
|
49
|
+
onClick: function onClick() {
|
50
|
+
onChange(item.value);
|
51
|
+
}
|
52
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
53
|
+
src: "/img/topo/editor/lineType/" + item.icon + ".svg",
|
54
|
+
alt: "",
|
55
|
+
className: _LineTypeModule["default"].iconImg
|
56
|
+
}));
|
57
|
+
}));
|
58
|
+
}
|
59
|
+
|
60
|
+
var _default = LineType;
|
61
|
+
exports["default"] = _default;
|