jskim/vexplor_dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj

Browse Source 
; Conflicts:
;	frontend/components/admin/CreateTableModal.tsx
;	frontend/components/screen/CopyScreenModal.tsx
;	frontend/components/screen/MenuAssignmentModal.tsx
;	frontend/components/screen/ScreenList.tsx
;	frontend/components/screen/widgets/FlowWidget.tsx
;	frontend/lib/registry/components/table-list/TableListComponent.tsx
This commit is contained in:
leeheejin
2025-11-06 12:14:07 +09:00
parent 0839f7f603 4b2514d9da
commit 3f890cdbfa
66 changed files with 10684 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/components/screen/InteractiveScreenViewerDynamic.tsx
View File

@@ -677,7 +677,7 @@ export const InteractiveScreenViewerDynamic: React.FC<InteractiveScreenViewerPro
left: position?.x || 0,
top: position?.y || 0,
width: size?.width || 200,
height: size?.height || 40,
height: size?.height || 10,
zIndex: position?.z || 1,
...style,
};