@rytass/wms-map-react-components 0.1.8 → 0.1.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.
- package/components/breadcrumb/breadcrumb.d.ts +3 -0
- package/components/breadcrumb/breadcrumb.js +3 -2
- package/components/canvas/react-flow-canvas.d.ts +1 -0
- package/components/canvas/react-flow-canvas.js +3 -2
- package/components/modal/wms-map-content.js +60 -8
- package/components/modal/wms-map-modal-container.d.ts +1 -1
- package/components/modal/wms-map-modal-container.js +6 -2
- package/index.cjs.js +71 -14
- package/package.json +1 -1
- package/types/component-props.types.d.ts +4 -0
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { FC } from 'react';
|
|
2
|
+
import { ViewMode } from '../../typings';
|
|
2
3
|
interface BreadcrumbProps {
|
|
3
4
|
warehouseIds: string[];
|
|
5
|
+
viewMode: ViewMode;
|
|
6
|
+
showBreadcrumbEditButton?: (warehouseIds: string[]) => boolean;
|
|
4
7
|
onWarehouseClick?: (warehouseId: string, index: number) => void;
|
|
5
8
|
onNameChange?: (name: string) => Promise<void>;
|
|
6
9
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
|
|
2
2
|
import React, { useState, useRef, useEffect } from 'react';
|
|
3
3
|
import BreadcrumbEditModal from './breadcrumb-edit-modal.js';
|
|
4
|
+
import { ViewMode } from '../../typings.js';
|
|
4
5
|
import styles from './breadcrumb.module.scss.js';
|
|
5
6
|
|
|
6
|
-
const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
|
|
7
|
+
const Breadcrumb = ({ warehouseIds, viewMode, showBreadcrumbEditButton = ()=>true, onWarehouseClick, onNameChange })=>{
|
|
7
8
|
const [showDropdown, setShowDropdown] = useState(false);
|
|
8
9
|
const [showEditModal, setShowEditModal] = useState(false);
|
|
9
10
|
const [editingIndex, setEditingIndex] = useState(-1);
|
|
@@ -133,7 +134,7 @@ const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
|
|
|
133
134
|
className: styles.warehouseIdSection,
|
|
134
135
|
children: [
|
|
135
136
|
shouldCollapse ? renderCollapsedBreadcrumb() : renderFullBreadcrumb(),
|
|
136
|
-
/*#__PURE__*/ jsx("button", {
|
|
137
|
+
viewMode === ViewMode.EDIT && showBreadcrumbEditButton(warehouseIds) && /*#__PURE__*/ jsx("button", {
|
|
137
138
|
className: styles.editButton,
|
|
138
139
|
onClick: handleEditClick,
|
|
139
140
|
title: "編輯當前區域名稱",
|
|
@@ -31,6 +31,7 @@ interface ReactFlowCanvasProps {
|
|
|
31
31
|
onNodeMouseEnter?: (event: React.MouseEvent, node: ReactFlowNode) => void;
|
|
32
32
|
onNodeMouseLeave?: (event: React.MouseEvent, node: ReactFlowNode) => void;
|
|
33
33
|
onNodeClick?: (event: React.MouseEvent, node: ReactFlowNode) => void;
|
|
34
|
+
onNodeDoubleClick?: (event: React.MouseEvent, node: ReactFlowNode) => void;
|
|
34
35
|
showBackground?: boolean;
|
|
35
36
|
}
|
|
36
37
|
declare const ReactFlowCanvas: FC<ReactFlowCanvasProps>;
|
|
@@ -62,7 +62,7 @@ const CustomControls = ()=>{
|
|
|
62
62
|
})
|
|
63
63
|
});
|
|
64
64
|
};
|
|
65
|
-
const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, showBackground = true })=>{
|
|
65
|
+
const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, onNodeDoubleClick, showBackground = true })=>{
|
|
66
66
|
// console.log('🖼️ ReactFlowCanvas 接收到 showBackground:', showBackground);
|
|
67
67
|
const { containerRef: rectContainerRef, previewRect } = useRectangleDrawing({
|
|
68
68
|
editMode,
|
|
@@ -171,6 +171,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
|
|
|
171
171
|
onNodeMouseEnter: onNodeMouseEnter,
|
|
172
172
|
onNodeMouseLeave: onNodeMouseLeave,
|
|
173
173
|
onNodeClick: onNodeClick,
|
|
174
|
+
onNodeDoubleClick: onNodeDoubleClick,
|
|
174
175
|
nodeTypes: nodeTypes,
|
|
175
176
|
className: styles.reactFlowCanvas,
|
|
176
177
|
style: {
|
|
@@ -190,7 +191,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
|
|
|
190
191
|
panOnDrag: viewMode === ViewMode.VIEW || viewMode === ViewMode.EDIT && drawingMode === DrawingMode.NONE,
|
|
191
192
|
panOnScroll: false,
|
|
192
193
|
zoomOnScroll: true,
|
|
193
|
-
zoomOnDoubleClick:
|
|
194
|
+
zoomOnDoubleClick: false,
|
|
194
195
|
nodeOrigin: [
|
|
195
196
|
0,
|
|
196
197
|
0
|
|
@@ -14,7 +14,7 @@ import ReactFlowCanvas from '../canvas/react-flow-canvas.js';
|
|
|
14
14
|
import ViewModeToolbar from '../ui/view-mode-toolbar.js';
|
|
15
15
|
import { TEXT_MAPPINGS } from '../../constants/text-mappings.js';
|
|
16
16
|
|
|
17
|
-
const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
|
|
17
|
+
const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
|
|
18
18
|
...DEFAULT_WAREHOUSE_IDS
|
|
19
19
|
] })=>{
|
|
20
20
|
const renderCount = useRef(0);
|
|
@@ -579,26 +579,75 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
579
579
|
}, [
|
|
580
580
|
viewMode
|
|
581
581
|
]);
|
|
582
|
+
const clickTimerRef = useRef(null);
|
|
583
|
+
useEffect(()=>()=>{
|
|
584
|
+
if (clickTimerRef.current) {
|
|
585
|
+
clearTimeout(clickTimerRef.current);
|
|
586
|
+
clickTimerRef.current = null;
|
|
587
|
+
}
|
|
588
|
+
}, []);
|
|
582
589
|
const handleNodeClick = useCallback((_event, node)=>{
|
|
583
590
|
const flowNode = node;
|
|
584
|
-
|
|
591
|
+
const fireClick = ()=>{
|
|
592
|
+
debugLog('events', 'Node clicked (React Flow)', {
|
|
593
|
+
id: flowNode.id.slice(-4),
|
|
594
|
+
type: flowNode.type,
|
|
595
|
+
viewMode,
|
|
596
|
+
editMode
|
|
597
|
+
});
|
|
598
|
+
logNodeData(flowNode);
|
|
599
|
+
if (onNodeClick) {
|
|
600
|
+
const nodeClickInfo = transformNodeToClickInfo(flowNode);
|
|
601
|
+
if (nodeClickInfo) {
|
|
602
|
+
debugLog('events', '將點擊資訊傳遞給父組件:', nodeClickInfo);
|
|
603
|
+
onNodeClick(nodeClickInfo);
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
};
|
|
607
|
+
// 沒有訂閱雙擊事件時,單擊直接觸發避免引入無謂的 350ms 延遲
|
|
608
|
+
if (!onNodeDoubleClick) {
|
|
609
|
+
fireClick();
|
|
610
|
+
return;
|
|
611
|
+
}
|
|
612
|
+
// 延遲觸發 click,讓 double click 有機會取消
|
|
613
|
+
if (clickTimerRef.current) {
|
|
614
|
+
clearTimeout(clickTimerRef.current);
|
|
615
|
+
}
|
|
616
|
+
clickTimerRef.current = setTimeout(()=>{
|
|
617
|
+
clickTimerRef.current = null;
|
|
618
|
+
fireClick();
|
|
619
|
+
}, 350);
|
|
620
|
+
}, [
|
|
621
|
+
viewMode,
|
|
622
|
+
editMode,
|
|
623
|
+
onNodeClick,
|
|
624
|
+
onNodeDoubleClick
|
|
625
|
+
]);
|
|
626
|
+
const handleNodeDoubleClick = useCallback((_event, node)=>{
|
|
627
|
+
// 取消待執行的 click,避免 double click 同時觸發 click
|
|
628
|
+
if (clickTimerRef.current) {
|
|
629
|
+
clearTimeout(clickTimerRef.current);
|
|
630
|
+
clickTimerRef.current = null;
|
|
631
|
+
}
|
|
632
|
+
const flowNode = node;
|
|
633
|
+
debugLog('events', 'Node double clicked (React Flow)', {
|
|
585
634
|
id: flowNode.id.slice(-4),
|
|
586
635
|
type: flowNode.type,
|
|
587
636
|
viewMode,
|
|
588
637
|
editMode
|
|
589
638
|
});
|
|
590
639
|
logNodeData(flowNode);
|
|
591
|
-
if (
|
|
592
|
-
const
|
|
593
|
-
if (
|
|
594
|
-
debugLog('events', '
|
|
595
|
-
|
|
640
|
+
if (onNodeDoubleClick) {
|
|
641
|
+
const nodeDoubleClickInfo = transformNodeToClickInfo(flowNode);
|
|
642
|
+
if (nodeDoubleClickInfo) {
|
|
643
|
+
debugLog('events', '將雙擊資訊傳遞給父組件:', nodeDoubleClickInfo);
|
|
644
|
+
onNodeDoubleClick(nodeDoubleClickInfo);
|
|
596
645
|
}
|
|
597
646
|
}
|
|
598
647
|
}, [
|
|
599
648
|
viewMode,
|
|
600
649
|
editMode,
|
|
601
|
-
|
|
650
|
+
onNodeDoubleClick
|
|
602
651
|
]);
|
|
603
652
|
const handleToggleBackground = useCallback((show)=>{
|
|
604
653
|
debugLog('ui', '切換底圖顯示:', {
|
|
@@ -696,6 +745,8 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
696
745
|
children: [
|
|
697
746
|
/*#__PURE__*/ jsx(Breadcrumb, {
|
|
698
747
|
warehouseIds: warehouseIds,
|
|
748
|
+
viewMode: viewMode,
|
|
749
|
+
showBreadcrumbEditButton: showBreadcrumbEditButton,
|
|
699
750
|
onWarehouseClick: onBreadcrumbClick,
|
|
700
751
|
onNameChange: onNameChange
|
|
701
752
|
}),
|
|
@@ -739,6 +790,7 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
739
790
|
onNodeMouseEnter: handleNodeMouseEnter,
|
|
740
791
|
onNodeMouseLeave: handleNodeMouseLeave,
|
|
741
792
|
onNodeClick: handleNodeClick,
|
|
793
|
+
onNodeDoubleClick: handleNodeDoubleClick,
|
|
742
794
|
showBackground: showBackground
|
|
743
795
|
}),
|
|
744
796
|
/*#__PURE__*/ jsx(ViewModeToolbar, {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { FC } from 'react';
|
|
2
2
|
import { WMSMapContentProps, WMSMapModalProps } from '../../types';
|
|
3
|
-
export declare const WMSMapModalContent: ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds, }: WMSMapContentProps) => React.JSX.Element;
|
|
3
|
+
export declare const WMSMapModalContent: ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds, }: WMSMapContentProps) => React.JSX.Element;
|
|
4
4
|
declare const WMSMapModalContainer: FC<WMSMapModalProps>;
|
|
5
5
|
export default WMSMapModalContainer;
|
|
@@ -8,7 +8,7 @@ import WMSMapContent from './wms-map-content.js';
|
|
|
8
8
|
import { setDebugMode } from '../../utils/debug-logger.js';
|
|
9
9
|
import styles from './wms-map-modal-container.module.scss.js';
|
|
10
10
|
|
|
11
|
-
const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
11
|
+
const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
12
12
|
return /*#__PURE__*/ jsx("div", {
|
|
13
13
|
className: styles.content,
|
|
14
14
|
children: /*#__PURE__*/ jsx(ReactFlowProvider, {
|
|
@@ -18,11 +18,13 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
|
|
|
18
18
|
selectedColor: selectedColor,
|
|
19
19
|
viewMode: viewMode,
|
|
20
20
|
colorPalette: colorPalette,
|
|
21
|
+
showBreadcrumbEditButton: showBreadcrumbEditButton,
|
|
21
22
|
onEditModeChange: onEditModeChange,
|
|
22
23
|
onToggleRectangleTool: onToggleRectangleTool,
|
|
23
24
|
onTogglePenTool: onTogglePenTool,
|
|
24
25
|
onColorChange: onColorChange,
|
|
25
26
|
onNodeClick: onNodeClick,
|
|
27
|
+
onNodeDoubleClick: onNodeDoubleClick,
|
|
26
28
|
onSave: onSave,
|
|
27
29
|
onBreadcrumbClick: onBreadcrumbClick,
|
|
28
30
|
onNameChange: onNameChange,
|
|
@@ -36,7 +38,7 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
|
|
|
36
38
|
})
|
|
37
39
|
});
|
|
38
40
|
};
|
|
39
|
-
const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
41
|
+
const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, showBreadcrumbEditButton, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
40
42
|
const [editMode, setEditMode] = useState(EditMode.BACKGROUND);
|
|
41
43
|
const [drawingMode, setDrawingMode] = useState(DrawingMode.NONE);
|
|
42
44
|
const [selectedColor, setSelectedColor] = useState(()=>{
|
|
@@ -99,11 +101,13 @@ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPa
|
|
|
99
101
|
selectedColor: selectedColor,
|
|
100
102
|
viewMode: viewMode,
|
|
101
103
|
colorPalette: colorPalette,
|
|
104
|
+
showBreadcrumbEditButton: showBreadcrumbEditButton,
|
|
102
105
|
onEditModeChange: handleEditModeChange,
|
|
103
106
|
onToggleRectangleTool: handleToggleRectangleTool,
|
|
104
107
|
onTogglePenTool: handleTogglePenTool,
|
|
105
108
|
onColorChange: handleColorChange,
|
|
106
109
|
onNodeClick: onNodeClick,
|
|
110
|
+
onNodeDoubleClick: onNodeDoubleClick,
|
|
107
111
|
onSave: onSave,
|
|
108
112
|
onBreadcrumbClick: onBreadcrumbClick,
|
|
109
113
|
onNameChange: onNameChange,
|
package/index.cjs.js
CHANGED
|
@@ -1424,7 +1424,7 @@ const BreadcrumbEditModal = ({ open, warehouseId, onClose, onConfirm })=>{
|
|
|
1424
1424
|
|
|
1425
1425
|
var styles$7 = {"breadcrumbSection":"breadcrumb-module_breadcrumbSection__Qn8A3","warehouseIdSection":"breadcrumb-module_warehouseIdSection__7CzsY","separator":"breadcrumb-module_separator__uLhtn","warehouseIdText":"breadcrumb-module_warehouseIdText__QOxRw","lastItem":"breadcrumb-module_lastItem__OGKzD","clickable":"breadcrumb-module_clickable__YD5aj","ellipsisContainer":"breadcrumb-module_ellipsisContainer__4hIiu","ellipsis":"breadcrumb-module_ellipsis__NYd8X","dropdown":"breadcrumb-module_dropdown__BqvP8","dropdownItem":"breadcrumb-module_dropdownItem__YdggW","editButton":"breadcrumb-module_editButton__Wuk8T"};
|
|
1426
1426
|
|
|
1427
|
-
const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
|
|
1427
|
+
const Breadcrumb = ({ warehouseIds, viewMode, showBreadcrumbEditButton = ()=>true, onWarehouseClick, onNameChange })=>{
|
|
1428
1428
|
const [showDropdown, setShowDropdown] = React.useState(false);
|
|
1429
1429
|
const [showEditModal, setShowEditModal] = React.useState(false);
|
|
1430
1430
|
const [editingIndex, setEditingIndex] = React.useState(-1);
|
|
@@ -1554,7 +1554,7 @@ const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
|
|
|
1554
1554
|
className: styles$7.warehouseIdSection,
|
|
1555
1555
|
children: [
|
|
1556
1556
|
shouldCollapse ? renderCollapsedBreadcrumb() : renderFullBreadcrumb(),
|
|
1557
|
-
/*#__PURE__*/ jsxRuntime.jsx("button", {
|
|
1557
|
+
viewMode === ViewMode.EDIT && showBreadcrumbEditButton(warehouseIds) && /*#__PURE__*/ jsxRuntime.jsx("button", {
|
|
1558
1558
|
className: styles$7.editButton,
|
|
1559
1559
|
onClick: handleEditClick,
|
|
1560
1560
|
title: "編輯當前區域名稱",
|
|
@@ -3705,7 +3705,7 @@ const CustomControls = ()=>{
|
|
|
3705
3705
|
})
|
|
3706
3706
|
});
|
|
3707
3707
|
};
|
|
3708
|
-
const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, showBackground = true })=>{
|
|
3708
|
+
const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, onNodeDoubleClick, showBackground = true })=>{
|
|
3709
3709
|
// console.log('🖼️ ReactFlowCanvas 接收到 showBackground:', showBackground);
|
|
3710
3710
|
const { containerRef: rectContainerRef, previewRect } = useRectangleDrawing({
|
|
3711
3711
|
editMode,
|
|
@@ -3814,6 +3814,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
|
|
|
3814
3814
|
onNodeMouseEnter: onNodeMouseEnter,
|
|
3815
3815
|
onNodeMouseLeave: onNodeMouseLeave,
|
|
3816
3816
|
onNodeClick: onNodeClick,
|
|
3817
|
+
onNodeDoubleClick: onNodeDoubleClick,
|
|
3817
3818
|
nodeTypes: nodeTypes,
|
|
3818
3819
|
className: styles$2.reactFlowCanvas,
|
|
3819
3820
|
style: {
|
|
@@ -3833,7 +3834,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
|
|
|
3833
3834
|
panOnDrag: viewMode === ViewMode.VIEW || viewMode === ViewMode.EDIT && drawingMode === DrawingMode.NONE,
|
|
3834
3835
|
panOnScroll: false,
|
|
3835
3836
|
zoomOnScroll: true,
|
|
3836
|
-
zoomOnDoubleClick:
|
|
3837
|
+
zoomOnDoubleClick: false,
|
|
3837
3838
|
nodeOrigin: [
|
|
3838
3839
|
0,
|
|
3839
3840
|
0
|
|
@@ -3993,7 +3994,7 @@ const ViewModeToolbar = ({ viewMode, showBackground, onToggleBackground })=>{
|
|
|
3993
3994
|
});
|
|
3994
3995
|
};
|
|
3995
3996
|
|
|
3996
|
-
const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
|
|
3997
|
+
const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
|
|
3997
3998
|
...DEFAULT_WAREHOUSE_IDS
|
|
3998
3999
|
] })=>{
|
|
3999
4000
|
const renderCount = React.useRef(0);
|
|
@@ -4558,26 +4559,75 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
4558
4559
|
}, [
|
|
4559
4560
|
viewMode
|
|
4560
4561
|
]);
|
|
4562
|
+
const clickTimerRef = React.useRef(null);
|
|
4563
|
+
React.useEffect(()=>()=>{
|
|
4564
|
+
if (clickTimerRef.current) {
|
|
4565
|
+
clearTimeout(clickTimerRef.current);
|
|
4566
|
+
clickTimerRef.current = null;
|
|
4567
|
+
}
|
|
4568
|
+
}, []);
|
|
4561
4569
|
const handleNodeClick = React.useCallback((_event, node)=>{
|
|
4562
4570
|
const flowNode = node;
|
|
4563
|
-
|
|
4571
|
+
const fireClick = ()=>{
|
|
4572
|
+
debugLog('events', 'Node clicked (React Flow)', {
|
|
4573
|
+
id: flowNode.id.slice(-4),
|
|
4574
|
+
type: flowNode.type,
|
|
4575
|
+
viewMode,
|
|
4576
|
+
editMode
|
|
4577
|
+
});
|
|
4578
|
+
logNodeData(flowNode);
|
|
4579
|
+
if (onNodeClick) {
|
|
4580
|
+
const nodeClickInfo = transformNodeToClickInfo(flowNode);
|
|
4581
|
+
if (nodeClickInfo) {
|
|
4582
|
+
debugLog('events', '將點擊資訊傳遞給父組件:', nodeClickInfo);
|
|
4583
|
+
onNodeClick(nodeClickInfo);
|
|
4584
|
+
}
|
|
4585
|
+
}
|
|
4586
|
+
};
|
|
4587
|
+
// 沒有訂閱雙擊事件時,單擊直接觸發避免引入無謂的 350ms 延遲
|
|
4588
|
+
if (!onNodeDoubleClick) {
|
|
4589
|
+
fireClick();
|
|
4590
|
+
return;
|
|
4591
|
+
}
|
|
4592
|
+
// 延遲觸發 click,讓 double click 有機會取消
|
|
4593
|
+
if (clickTimerRef.current) {
|
|
4594
|
+
clearTimeout(clickTimerRef.current);
|
|
4595
|
+
}
|
|
4596
|
+
clickTimerRef.current = setTimeout(()=>{
|
|
4597
|
+
clickTimerRef.current = null;
|
|
4598
|
+
fireClick();
|
|
4599
|
+
}, 350);
|
|
4600
|
+
}, [
|
|
4601
|
+
viewMode,
|
|
4602
|
+
editMode,
|
|
4603
|
+
onNodeClick,
|
|
4604
|
+
onNodeDoubleClick
|
|
4605
|
+
]);
|
|
4606
|
+
const handleNodeDoubleClick = React.useCallback((_event, node)=>{
|
|
4607
|
+
// 取消待執行的 click,避免 double click 同時觸發 click
|
|
4608
|
+
if (clickTimerRef.current) {
|
|
4609
|
+
clearTimeout(clickTimerRef.current);
|
|
4610
|
+
clickTimerRef.current = null;
|
|
4611
|
+
}
|
|
4612
|
+
const flowNode = node;
|
|
4613
|
+
debugLog('events', 'Node double clicked (React Flow)', {
|
|
4564
4614
|
id: flowNode.id.slice(-4),
|
|
4565
4615
|
type: flowNode.type,
|
|
4566
4616
|
viewMode,
|
|
4567
4617
|
editMode
|
|
4568
4618
|
});
|
|
4569
4619
|
logNodeData(flowNode);
|
|
4570
|
-
if (
|
|
4571
|
-
const
|
|
4572
|
-
if (
|
|
4573
|
-
debugLog('events', '
|
|
4574
|
-
|
|
4620
|
+
if (onNodeDoubleClick) {
|
|
4621
|
+
const nodeDoubleClickInfo = transformNodeToClickInfo(flowNode);
|
|
4622
|
+
if (nodeDoubleClickInfo) {
|
|
4623
|
+
debugLog('events', '將雙擊資訊傳遞給父組件:', nodeDoubleClickInfo);
|
|
4624
|
+
onNodeDoubleClick(nodeDoubleClickInfo);
|
|
4575
4625
|
}
|
|
4576
4626
|
}
|
|
4577
4627
|
}, [
|
|
4578
4628
|
viewMode,
|
|
4579
4629
|
editMode,
|
|
4580
|
-
|
|
4630
|
+
onNodeDoubleClick
|
|
4581
4631
|
]);
|
|
4582
4632
|
const handleToggleBackground = React.useCallback((show)=>{
|
|
4583
4633
|
debugLog('ui', '切換底圖顯示:', {
|
|
@@ -4675,6 +4725,8 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
4675
4725
|
children: [
|
|
4676
4726
|
/*#__PURE__*/ jsxRuntime.jsx(Breadcrumb, {
|
|
4677
4727
|
warehouseIds: warehouseIds,
|
|
4728
|
+
viewMode: viewMode,
|
|
4729
|
+
showBreadcrumbEditButton: showBreadcrumbEditButton,
|
|
4678
4730
|
onWarehouseClick: onBreadcrumbClick,
|
|
4679
4731
|
onNameChange: onNameChange
|
|
4680
4732
|
}),
|
|
@@ -4718,6 +4770,7 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
4718
4770
|
onNodeMouseEnter: handleNodeMouseEnter,
|
|
4719
4771
|
onNodeMouseLeave: handleNodeMouseLeave,
|
|
4720
4772
|
onNodeClick: handleNodeClick,
|
|
4773
|
+
onNodeDoubleClick: handleNodeDoubleClick,
|
|
4721
4774
|
showBackground: showBackground
|
|
4722
4775
|
}),
|
|
4723
4776
|
/*#__PURE__*/ jsxRuntime.jsx(ViewModeToolbar, {
|
|
@@ -4731,7 +4784,7 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
|
|
|
4731
4784
|
|
|
4732
4785
|
var styles = {"modal":"wms-map-modal-container-module_modal__PKmT7","content":"wms-map-modal-container-module_content__9p84R"};
|
|
4733
4786
|
|
|
4734
|
-
const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
4787
|
+
const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
4735
4788
|
return /*#__PURE__*/ jsxRuntime.jsx("div", {
|
|
4736
4789
|
className: styles.content,
|
|
4737
4790
|
children: /*#__PURE__*/ jsxRuntime.jsx(react$1.ReactFlowProvider, {
|
|
@@ -4741,11 +4794,13 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
|
|
|
4741
4794
|
selectedColor: selectedColor,
|
|
4742
4795
|
viewMode: viewMode,
|
|
4743
4796
|
colorPalette: colorPalette,
|
|
4797
|
+
showBreadcrumbEditButton: showBreadcrumbEditButton,
|
|
4744
4798
|
onEditModeChange: onEditModeChange,
|
|
4745
4799
|
onToggleRectangleTool: onToggleRectangleTool,
|
|
4746
4800
|
onTogglePenTool: onTogglePenTool,
|
|
4747
4801
|
onColorChange: onColorChange,
|
|
4748
4802
|
onNodeClick: onNodeClick,
|
|
4803
|
+
onNodeDoubleClick: onNodeDoubleClick,
|
|
4749
4804
|
onSave: onSave,
|
|
4750
4805
|
onBreadcrumbClick: onBreadcrumbClick,
|
|
4751
4806
|
onNameChange: onNameChange,
|
|
@@ -4759,7 +4814,7 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
|
|
|
4759
4814
|
})
|
|
4760
4815
|
});
|
|
4761
4816
|
};
|
|
4762
|
-
const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
4817
|
+
const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, showBreadcrumbEditButton, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
|
|
4763
4818
|
const [editMode, setEditMode] = React.useState(EditMode.BACKGROUND);
|
|
4764
4819
|
const [drawingMode, setDrawingMode] = React.useState(DrawingMode.NONE);
|
|
4765
4820
|
const [selectedColor, setSelectedColor] = React.useState(()=>{
|
|
@@ -4822,11 +4877,13 @@ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPa
|
|
|
4822
4877
|
selectedColor: selectedColor,
|
|
4823
4878
|
viewMode: viewMode,
|
|
4824
4879
|
colorPalette: colorPalette,
|
|
4880
|
+
showBreadcrumbEditButton: showBreadcrumbEditButton,
|
|
4825
4881
|
onEditModeChange: handleEditModeChange,
|
|
4826
4882
|
onToggleRectangleTool: handleToggleRectangleTool,
|
|
4827
4883
|
onTogglePenTool: handleTogglePenTool,
|
|
4828
4884
|
onColorChange: handleColorChange,
|
|
4829
4885
|
onNodeClick: onNodeClick,
|
|
4886
|
+
onNodeDoubleClick: onNodeDoubleClick,
|
|
4830
4887
|
onSave: onSave,
|
|
4831
4888
|
onBreadcrumbClick: onBreadcrumbClick,
|
|
4832
4889
|
onNameChange: onNameChange,
|
package/package.json
CHANGED
|
@@ -5,7 +5,9 @@ export interface WMSMapModalProps {
|
|
|
5
5
|
open: boolean;
|
|
6
6
|
viewMode?: ViewMode;
|
|
7
7
|
colorPalette?: string[];
|
|
8
|
+
showBreadcrumbEditButton?: (warehouseIds: string[]) => boolean;
|
|
8
9
|
onNodeClick?: (nodeInfo: WMSNodeClickInfo) => void;
|
|
10
|
+
onNodeDoubleClick?: (nodeInfo: WMSNodeClickInfo) => void;
|
|
9
11
|
onSave?: (mapData: Map) => void;
|
|
10
12
|
onBreadcrumbClick?: (warehouseId: string, index: number) => void;
|
|
11
13
|
onNameChange?: (name: string) => Promise<void>;
|
|
@@ -24,11 +26,13 @@ export interface WMSMapContentProps {
|
|
|
24
26
|
selectedColor: string;
|
|
25
27
|
viewMode: ViewMode;
|
|
26
28
|
colorPalette?: string[];
|
|
29
|
+
showBreadcrumbEditButton?: (warehouseIds: string[]) => boolean;
|
|
27
30
|
onEditModeChange: (mode: EditMode) => void;
|
|
28
31
|
onToggleRectangleTool: () => void;
|
|
29
32
|
onTogglePenTool: () => void;
|
|
30
33
|
onColorChange: (color: string) => void;
|
|
31
34
|
onNodeClick?: (nodeInfo: WMSNodeClickInfo) => void;
|
|
35
|
+
onNodeDoubleClick?: (nodeInfo: WMSNodeClickInfo) => void;
|
|
32
36
|
onSave?: (mapData: Map) => void;
|
|
33
37
|
onBreadcrumbClick?: (warehouseId: string, index: number) => void;
|
|
34
38
|
onNameChange?: (name: string) => Promise<void>;
|