@riil-frontend/component-topology 6.0.0-alpha.7 → 6.0.0-alpha.9

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 (55) 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/core/common/icons/useIcons.js +7 -1
  6. package/es/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.js +13 -18
  7. package/es/core/editor/components/Toolbar/EditorToolbar.js +16 -9
  8. package/es/core/editor/components/Toolbar/buttons.js +20 -18
  9. package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js +2 -2
  10. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +25 -8
  11. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +1 -3
  12. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +14 -5
  13. package/es/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +1 -1
  14. package/es/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +2 -2
  15. package/es/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js +109 -0
  16. package/es/core/editor/components/Toolbar/widgets/IconSelect/constant.js +64 -0
  17. package/es/core/editor/components/Toolbar/widgets/IconSelect/index.js +101 -0
  18. package/es/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss +151 -0
  19. package/es/core/editor/components/Toolbar/widgets/IconSelect/popUpContent.js +50 -0
  20. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/BoxBackgroundSetting.js +14 -4
  21. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +36 -6
  22. package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +87 -8
  23. package/es/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js +3 -3
  24. package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +10 -6
  25. package/es/core/editor/components/settings/common/SizeInput/NodeSizeNumberPicker.js +7 -6
  26. package/es/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize.js +8 -9
  27. package/es/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js +9 -6
  28. package/es/core/hooks/useTopoEdit.js +19 -8
  29. package/es/core/models/TopoApp.js +1 -1
  30. package/lib/core/common/icons/useIcons.js +7 -1
  31. package/lib/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.js +13 -18
  32. package/lib/core/editor/components/Toolbar/EditorToolbar.js +14 -7
  33. package/lib/core/editor/components/Toolbar/buttons.js +21 -20
  34. package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js +2 -2
  35. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js +25 -8
  36. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss +1 -3
  37. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +15 -5
  38. package/lib/core/editor/components/Toolbar/widgets/HistoryRedoButton.js +1 -1
  39. package/lib/core/editor/components/Toolbar/widgets/HistoryUndoButton.js +2 -2
  40. package/lib/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js +126 -0
  41. package/lib/core/editor/components/Toolbar/widgets/IconSelect/constant.js +69 -0
  42. package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.js +117 -0
  43. package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss +151 -0
  44. package/lib/core/editor/components/Toolbar/widgets/IconSelect/popUpContent.js +62 -0
  45. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/BoxBackgroundSetting.js +20 -4
  46. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +35 -5
  47. package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +87 -7
  48. package/lib/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js +2 -2
  49. package/lib/core/editor/components/settings/common/SizeInput/NodeSizeInput.js +11 -7
  50. package/lib/core/editor/components/settings/common/SizeInput/NodeSizeNumberPicker.js +6 -6
  51. package/lib/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize.js +6 -8
  52. package/lib/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js +7 -5
  53. package/lib/core/hooks/useTopoEdit.js +19 -8
  54. package/lib/core/models/TopoApp.js +1 -1
  55. package/package.json +2 -2
@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
22
22
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
23
23
  import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
24
24
 
25
- var version = typeof "6.0.0-alpha.7" === 'string' ? "6.0.0-alpha.7" : null;
25
+ var version = typeof "6.0.0-alpha.9" === 'string' ? "6.0.0-alpha.9" : null;
26
26
  console.info("\u62D3\u6251\u7248\u672C: " + version);
27
27
  /**
28
28
  * 拓扑显示和编辑
@@ -17,7 +17,10 @@ function useCustomIcons(topo) {
17
17
  function useNodeIcons(topo) {
18
18
  var customIcons = useCustomIcons(topo);
19
19
  var groups = [{
20
- name: '默认',
20
+ name: '资源图片',
21
+ icons: []
22
+ }, {
23
+ name: '基础图片',
21
24
  icons: (0, _icon.getNodeDefaultIcons)(topo)
22
25
  }];
23
26
 
@@ -34,6 +37,9 @@ function useNodeIcons(topo) {
34
37
  function useGroupIcons(topo) {
35
38
  var customIcons = useCustomIcons(topo);
36
39
  var groups = [{
40
+ name: '资源图片',
41
+ icons: []
42
+ }, {
37
43
  name: '默认',
38
44
  icons: (0, _icon.getGroupDefaultIcons)(topo)
39
45
  }];
@@ -16,37 +16,32 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
16
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
17
 
18
18
  var CANVAS_TOGGLE = [{
19
- value: 0,
19
+ value: 'white',
20
20
  label: '白色',
21
- color: '#FFFFFF',
22
- isSystem: 1
21
+ color: '#FFFFFF'
23
22
  }, {
24
- value: 1,
23
+ value: 'blue',
25
24
  label: '蓝色',
26
- color: '#F9FBFF',
27
- isSystem: 0
25
+ color: '#F9FBFF'
28
26
  }, {
29
- value: 2,
27
+ value: 'yellow',
30
28
  label: '黄色',
31
- color: '#FFFDE6',
32
- isSystem: 0
29
+ color: '#FFFDE6'
33
30
  }, {
34
- value: 3,
31
+ value: 'green',
35
32
  label: '绿色',
36
- color: '#EAFFE8',
37
- isSystem: 0
33
+ color: '#EAFFE8'
38
34
  }, {
39
- value: 4,
35
+ value: 'dark',
40
36
  label: '深色',
41
- color: '#031425',
42
- isSystem: 0
37
+ color: '#031425'
43
38
  }];
44
39
 
45
40
  function CanvasPanel(props) {
46
41
  var selected = props.selected,
47
42
  onSelect = props.onSelect;
48
43
 
49
- var _useState = (0, _react.useState)(0),
44
+ var _useState = (0, _react.useState)('white'),
50
45
  selectVal = _useState[0],
51
46
  setSelectVal = _useState[1];
52
47
 
@@ -54,13 +49,13 @@ function CanvasPanel(props) {
54
49
  className: _CanvasPanelModule["default"].canvasToggle
55
50
  }, CANVAS_TOGGLE.map(function (item, index) {
56
51
  return /*#__PURE__*/_react["default"].createElement("div", {
57
- className: _CanvasPanelModule["default"].canvas
52
+ className: _CanvasPanelModule["default"].canvas,
53
+ key: index
58
54
  }, /*#__PURE__*/_react["default"].createElement(_tag["default"].Selectable, {
59
55
  className: _CanvasPanelModule["default"].tag,
60
56
  style: {
61
57
  background: item.color
62
58
  },
63
- key: item.value,
64
59
  checked: selected ? selected === item.value : selectVal === item.value,
65
60
  onChange: function onChange(checked) {
66
61
  setSelectVal(item.value);
@@ -24,23 +24,30 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
24
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; }
25
25
 
26
26
  function EditorToolbar(props) {
27
- var _classNames;
27
+ var _topo$viewProps, _topo$viewProps$topoC, _classNames;
28
+
29
+ var topo = props.topo;
28
30
 
29
31
  var _useState = (0, _react.useState)(true),
30
32
  expanded = _useState[0],
31
33
  setExpanded = _useState[1];
32
34
 
33
- return /*#__PURE__*/_react["default"].createElement("div", {
34
- className: (0, _classnames["default"])(_ToolbarModule["default"].toolbarWrap, (_classNames = {}, _classNames[_ToolbarModule["default"].normal] = expanded, _classNames[_ToolbarModule["default"].expanded] = !expanded, _classNames))
35
- }, /*#__PURE__*/_react["default"].createElement("div", {
36
- className: _ToolbarModule["default"].content
37
- }, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, _buttons["default"].map(function (ToolbarButton, index) {
35
+ var isNetworkTopo = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$topoC = _topo$viewProps.topoContext) === null || _topo$viewProps$topoC === void 0 ? void 0 : _topo$viewProps$topoC.isNetworkTopo;
36
+ var buttons = (0, _react.useMemo)(function () {
37
+ return (0, _buttons["default"])(isNetworkTopo);
38
+ }, [isNetworkTopo]);
39
+ var buttonInstances = buttons.map(function (ToolbarButton, index) {
38
40
  return /*#__PURE__*/_react["default"].createElement(ToolbarButton, (0, _extends2["default"])({
39
41
  key: index
40
42
  }, props, {
41
43
  showLabel: expanded
42
44
  }));
43
- }))), /*#__PURE__*/_react["default"].createElement("div", {
45
+ });
46
+ return /*#__PURE__*/_react["default"].createElement("div", {
47
+ className: (0, _classnames["default"])(_ToolbarModule["default"].toolbarWrap, (_classNames = {}, _classNames[_ToolbarModule["default"].normal] = expanded, _classNames[_ToolbarModule["default"].expanded] = !expanded, _classNames))
48
+ }, /*#__PURE__*/_react["default"].createElement("div", {
49
+ className: _ToolbarModule["default"].content
50
+ }, /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], null, buttonInstances)), /*#__PURE__*/_react["default"].createElement("div", {
44
51
  className: _ToolbarModule["default"].right
45
52
  }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
46
53
  type: "normal",
@@ -3,7 +3,7 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
5
  exports.__esModule = true;
6
- exports["default"] = void 0;
6
+ exports["default"] = getButtons;
7
7
 
8
8
  var _AddResourceButton = _interopRequireDefault(require("./widgets/AddResourceButton"));
9
9
 
@@ -41,22 +41,23 @@ var _NodeImageButton = _interopRequireDefault(require("./widgets/NodeImageButton
41
41
 
42
42
  var _NodeSizeButton = _interopRequireDefault(require("./widgets/NodeSizeButton"));
43
43
 
44
- var _default = [_AddResourceButton["default"], // 添加资源
45
- _Divider["default"], _CanvasSelectWidget["default"], // 选择
46
- _CanvasMoveWidget["default"], // 移动
47
- _Divider["default"], _HistoryUndoButton["default"], // 撤销
48
- _HistoryRedoButton["default"], // 恢复
49
- _Divider["default"], _FontFamilyWidget["default"], // 字体
50
- _FontSizeWidget["default"], // 字号
51
- _FontStyleButton["default"], // 文字样式
52
- _FontColorButton["default"], // 文字颜色
53
- _Divider["default"], _BoxBackgroundButton["default"], // 框背景
54
- _Divider["default"], _EdgeColorButton["default"], // 线条颜色
55
- _EdgeTypeButton["default"], // 线形
56
- _Divider["default"], _NodeImageButton["default"], // 替换图片
57
- _NodeSizeButton["default"], // 图片尺寸
58
- _Divider["default"], _Layout["default"], // 布局方式
59
- _NodeAlignWidget["default"], // 对齐方式
60
- _SearchWidget["default"] // 搜索
61
- ];
62
- exports["default"] = _default;
44
+ function getButtons(isNetworkTopo) {
45
+ return [].concat(isNetworkTopo ? [_AddResourceButton["default"], // 添加资源
46
+ _Divider["default"]] : [], [_CanvasSelectWidget["default"], // 选择
47
+ _CanvasMoveWidget["default"], // 移动
48
+ _Divider["default"]], isNetworkTopo ? [_HistoryUndoButton["default"], // 撤销
49
+ // HistoryRedoButton, // 恢复
50
+ _Divider["default"]] : [], [_FontFamilyWidget["default"], // 字体
51
+ _FontSizeWidget["default"], // 字号
52
+ _FontStyleButton["default"], // 文字样式
53
+ _FontColorButton["default"], // 文字颜色
54
+ _Divider["default"], _BoxBackgroundButton["default"], // 框背景
55
+ _Divider["default"], _EdgeColorButton["default"], // 线条颜色
56
+ _EdgeTypeButton["default"], // 线形
57
+ _Divider["default"], _NodeImageButton["default"], // 替换图片
58
+ _NodeSizeButton["default"], // 图片尺寸
59
+ _Divider["default"], _Layout["default"], // 布局方式
60
+ _NodeAlignWidget["default"], // 对齐方式
61
+ _SearchWidget["default"] // 搜索
62
+ ]);
63
+ }
@@ -69,7 +69,7 @@ function AddResourceButton(props) {
69
69
  }
70
70
  };
71
71
 
72
- return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
72
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
73
73
  label: "\u6DFB\u52A0\u8D44\u6E90",
74
74
  tooltip: "\u6DFB\u52A0\u8D44\u6E90",
75
75
  showLabel: showLabel
@@ -78,7 +78,7 @@ function AddResourceButton(props) {
78
78
  }, /*#__PURE__*/_react["default"].createElement("img", {
79
79
  src: "/img/topo/editor/toolbar/add/Normal.svg",
80
80
  alt: ""
81
- })), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
81
+ }))), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
82
82
  layer: selection[0],
83
83
  editorProps: editorProps,
84
84
  layerAddResource: layerAddResource
@@ -23,22 +23,39 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
23
23
 
24
24
  var FormItem = _form["default"].Item;
25
25
  var Option = _select["default"].Option;
26
- var START_END_TYPE_OPTIONS = [{
26
+ var START_TYPE_OPTIONS = [{
27
27
  value: 'nil',
28
28
  label: '无',
29
29
  icon: 'topo_startEndPoint_icon_nothing'
30
30
  }, {
31
31
  value: 'hollowCrcial',
32
32
  label: '空心圆',
33
- icon: 'topo_startEndPoint_icon_hollow_cricle'
33
+ icon: 'topo_startPoint_icon_hollow_cricle'
34
34
  }, {
35
35
  value: 'solidCricle',
36
36
  label: '实心圆',
37
- icon: 'topo_startEndPoint_icon_solid_cricle'
37
+ icon: 'topo_startPoint_icon_solid_cricle'
38
38
  }, {
39
39
  value: 'arrowPoint',
40
40
  label: '箭头',
41
- icon: 'topo_startEndPoint_icon_arrow'
41
+ icon: 'topo_startPoint_icon_arrow'
42
+ }];
43
+ var END_TYPE_OPTIONS = [{
44
+ value: 'nil',
45
+ label: '无',
46
+ icon: 'topo_startEndPoint_icon_nothing'
47
+ }, {
48
+ value: 'hollowCrcial',
49
+ label: '空心圆',
50
+ icon: 'topo_endPoint_icon_hollow_cricle'
51
+ }, {
52
+ value: 'solidCricle',
53
+ label: '实心圆',
54
+ icon: 'topo_endPoint_icon_solid_cricle'
55
+ }, {
56
+ value: 'arrowPoint',
57
+ label: '箭头',
58
+ icon: 'topo_endPoint_icon_arrow'
42
59
  }];
43
60
  var LINE_MOLD_OPTIONS = [{
44
61
  value: 'solidLine',
@@ -66,7 +83,7 @@ function EdgeType(props) {
66
83
  values: {
67
84
  startPoint: 'nil',
68
85
  endPoint: 'nil',
69
- type: null
86
+ type: 'solidLine'
70
87
  },
71
88
  onChange: function onChange(name, value) {
72
89
  if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
@@ -94,7 +111,7 @@ function EdgeType(props) {
94
111
  return trigger.parentNode;
95
112
  }
96
113
  }
97
- }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
114
+ }, START_TYPE_OPTIONS.map(function (item, index) {
98
115
  return /*#__PURE__*/_react["default"].createElement(Option, {
99
116
  value: item.value,
100
117
  key: index,
@@ -114,7 +131,7 @@ function EdgeType(props) {
114
131
  return trigger.parentNode;
115
132
  }
116
133
  }
117
- }, START_END_TYPE_OPTIONS.map(function (item, index, array) {
134
+ }, END_TYPE_OPTIONS.map(function (item, index) {
118
135
  return /*#__PURE__*/_react["default"].createElement(Option, {
119
136
  value: item.value,
120
137
  key: index,
@@ -135,7 +152,7 @@ function EdgeType(props) {
135
152
  }
136
153
  },
137
154
  placeholder: ""
138
- }, LINE_MOLD_OPTIONS.map(function (item, index, array) {
155
+ }, LINE_MOLD_OPTIONS.map(function (item, index) {
139
156
  return /*#__PURE__*/_react["default"].createElement(Option, {
140
157
  value: item.value,
141
158
  key: index,
@@ -38,9 +38,7 @@
38
38
  }
39
39
  .#{$css-prefix}input.#{$css-prefix}medium .#{$css-prefix}input-text-field {
40
40
  line-height: calc(28px - 10px * 2);
41
- }
42
- .#{$css-prefix}select-trigger-search {
43
- height: 12px;
41
+ padding: 0 7px;
44
42
  }
45
43
  }
46
44
  }
@@ -7,6 +7,8 @@ exports["default"] = void 0;
7
7
 
8
8
  var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
9
9
 
10
+ var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
11
+
10
12
  var _react = _interopRequireWildcard(require("react"));
11
13
 
12
14
  var _LineTypeModule = _interopRequireDefault(require("./LineType.module.scss"));
@@ -15,6 +17,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
15
17
 
16
18
  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
19
 
20
+ var Tooltip = _balloon["default"].Tooltip;
18
21
  var LINE_TYPE_OPTIONS = [{
19
22
  value: 'boundary',
20
23
  label: '直线',
@@ -39,12 +42,9 @@ var LINE_TYPE_OPTIONS = [{
39
42
 
40
43
  function LineType(props) {
41
44
  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
+
46
+ function lineButton(item) {
45
47
  return /*#__PURE__*/_react["default"].createElement(_button["default"], {
46
- key: index,
47
- title: item.label,
48
48
  className: "" + _LineTypeModule["default"].redioBtn,
49
49
  onClick: function onClick() {
50
50
  onChange(item.value);
@@ -54,6 +54,16 @@ function LineType(props) {
54
54
  alt: "",
55
55
  className: _LineTypeModule["default"].iconImg
56
56
  }));
57
+ }
58
+
59
+ return /*#__PURE__*/_react["default"].createElement("div", {
60
+ className: _LineTypeModule["default"].lineType
61
+ }, LINE_TYPE_OPTIONS.map(function (item, index) {
62
+ return /*#__PURE__*/_react["default"].createElement(Tooltip, {
63
+ trigger: lineButton(item),
64
+ align: "br",
65
+ key: index
66
+ }, item.label);
57
67
  }));
58
68
  }
59
69
 
@@ -24,7 +24,7 @@ function HistoryRedoButton(props) {
24
24
  tooltip: "\u6062\u590D",
25
25
  showLabel: showLabel
26
26
  }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], null, /*#__PURE__*/_react["default"].createElement("img", {
27
- src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
27
+ src: "/img/topo/editor/toolbar/undo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
28
28
  alt: ""
29
29
  })));
30
30
  }
@@ -23,7 +23,7 @@ function HistoryUndoButton(props) {
23
23
  return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
24
24
  disabled: disabled,
25
25
  label: "\u64A4\u9500",
26
- tooltip: "\u64A4\u9500",
26
+ tooltip: disabled ? '无法撤销' : '撤销(Ctrl/ ⌘+Z)',
27
27
  showLabel: showLabel
28
28
  }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
29
29
  disabled: disabled,
@@ -31,7 +31,7 @@ function HistoryUndoButton(props) {
31
31
  topo.historyManager.undo();
32
32
  }
33
33
  }, /*#__PURE__*/_react["default"].createElement("img", {
34
- src: "/img/topo/editor/toolbar/undo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
34
+ src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
35
35
  alt: ""
36
36
  })));
37
37
  }
@@ -0,0 +1,126 @@
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 _select = _interopRequireDefault(require("@alifd/next/lib/select"));
9
+
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
13
+
14
+ var _popUpContent = _interopRequireDefault(require("./popUpContent"));
15
+
16
+ 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); }
17
+
18
+ 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; }
19
+
20
+ var TopoIconSelect = function TopoIconSelect(props, ref) {
21
+ // 传入参数
22
+ var value = props.value,
23
+ iconList = props.iconList,
24
+ onChange = props.onChange;
25
+
26
+ var _useState = (0, _react.useState)(value),
27
+ valueData = _useState[0],
28
+ setValue = _useState[1];
29
+
30
+ var _useState2 = (0, _react.useState)(),
31
+ selectItem = _useState2[0],
32
+ setSelect = _useState2[1];
33
+
34
+ var _useState3 = (0, _react.useState)(false),
35
+ visible = _useState3[0],
36
+ setVisible = _useState3[1];
37
+
38
+ (0, _react.useEffect)(function () {
39
+ if (value) {
40
+ for (var i = 0; i < iconList.length; i++) {
41
+ var icons = iconList[i].icons;
42
+ var flag = false;
43
+
44
+ for (var m = 0; m < icons.length; m++) {
45
+ if (value === icons[m].id) {
46
+ flag = true;
47
+ setSelect(icons[m]);
48
+ break;
49
+ }
50
+ }
51
+
52
+ if (flag) {
53
+ break;
54
+ }
55
+ }
56
+ }
57
+ }, [value]);
58
+ (0, _react.useImperativeHandle)(ref, function () {
59
+ return {
60
+ getSelectData: getSelectData
61
+ };
62
+ });
63
+
64
+ var handleChange = function handleChange(v) {
65
+ console.log('handleChange: ', v);
66
+
67
+ if (typeof onChange === 'function') {
68
+ onChange(v.id);
69
+ }
70
+
71
+ setSelect(v);
72
+ setValue(v.id);
73
+ setVisible(false);
74
+ };
75
+
76
+ var getSelectData = function getSelectData() {
77
+ return valueData;
78
+ };
79
+
80
+ var valueRender = function valueRender(v) {
81
+ return selectItem ? /*#__PURE__*/_react["default"].createElement("span", {
82
+ className: _indexModule["default"].selected
83
+ }, /*#__PURE__*/_react["default"].createElement("div", {
84
+ className: _indexModule["default"].iconImgWrapper
85
+ }, /*#__PURE__*/_react["default"].createElement("img", {
86
+ className: _indexModule["default"].iconImg,
87
+ alt: "",
88
+ src: selectItem === null || selectItem === void 0 ? void 0 : selectItem.url
89
+ })), /*#__PURE__*/_react["default"].createElement("span", {
90
+ className: _indexModule["default"].icontitle
91
+ }, selectItem === null || selectItem === void 0 ? void 0 : selectItem.name)) : null;
92
+ };
93
+
94
+ var onVisibleChange = function onVisibleChange(v) {
95
+ setVisible(v);
96
+ };
97
+
98
+ var popupContent = /*#__PURE__*/_react["default"].createElement(_popUpContent["default"], {
99
+ iconList: iconList,
100
+ selectedId: selectItem === null || selectItem === void 0 ? void 0 : selectItem.id,
101
+ onChange: handleChange
102
+ });
103
+
104
+ var popupProps = {
105
+ triggerClickKeycode: [13, 32, 40] // space, enter, down-arrow
106
+
107
+ };
108
+ return /*#__PURE__*/_react["default"].createElement("div", {
109
+ className: _indexModule["default"].TopoIconSelect
110
+ }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
111
+ placeholder: "\u8BF7\u9009\u62E9",
112
+ visible: visible,
113
+ className: _indexModule["default"].iconSelect,
114
+ onVisibleChange: onVisibleChange,
115
+ value: valueData,
116
+ valueRender: valueRender,
117
+ dataSource: iconList,
118
+ onChange: handleChange,
119
+ popupProps: popupProps,
120
+ popupContent: popupContent
121
+ }));
122
+ };
123
+
124
+ var _default = /*#__PURE__*/_react["default"].forwardRef(TopoIconSelect);
125
+
126
+ exports["default"] = _default;
@@ -0,0 +1,69 @@
1
+ "use strict";
2
+
3
+ exports.__esModule = true;
4
+ exports.iconList = void 0;
5
+ var iconList = [{
6
+ id: '1',
7
+ name: '图片库1',
8
+ icons: [{
9
+ id: '001',
10
+ name: '图片一',
11
+ url: '/img/model/switch.svg',
12
+ icon: 'switch'
13
+ }, {
14
+ id: '002',
15
+ name: '图片二',
16
+ url: '/img/model/backupOnError.svg',
17
+ icon: 'res_terminal'
18
+ }, {
19
+ id: '003',
20
+ name: '图片三',
21
+ url: '/img/model/linuxServer.svg',
22
+ icon: 'res_linux'
23
+ }, {
24
+ id: '004',
25
+ name: '图片一',
26
+ url: '/img/model/switch.svg',
27
+ icon: 'switch'
28
+ }, {
29
+ id: '005',
30
+ name: '图片二',
31
+ url: '/img/model/backupOnError.svg',
32
+ icon: 'res_terminal'
33
+ }, {
34
+ id: '005',
35
+ name: '图片三',
36
+ url: '/img/model/linuxServer.svg',
37
+ icon: 'res_linux'
38
+ }, {
39
+ id: '006',
40
+ name: '图片一',
41
+ url: '/img/model/switch.svg',
42
+ icon: 'switch'
43
+ }, {
44
+ id: '007',
45
+ name: '图片二',
46
+ url: '/img/model/backupOnError.svg',
47
+ icon: 'res_terminal'
48
+ }, {
49
+ id: '008',
50
+ name: '图片三',
51
+ url: '/img/model/linuxServer.svg',
52
+ icon: 'res_linux'
53
+ }]
54
+ }, {
55
+ id: '2',
56
+ name: '图片库2',
57
+ icons: [{
58
+ id: '004',
59
+ name: '图片四',
60
+ url: '/img/model/tree_child.svg',
61
+ icon: 'tree_child'
62
+ }, {
63
+ id: '005',
64
+ name: '图片五',
65
+ url: '/img/model/commonNetwork.svg',
66
+ icon: 'res_storage'
67
+ }]
68
+ }];
69
+ exports.iconList = iconList;