Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management

frontend/components/screen/ScreenDesigner.tsx

@@ -995,6 +995,17 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
               // console.log("🔧 기본 해상도 적용:", defaultResolution);
             }
 
+            // 🔍 디버깅: 로드된 버튼 컴포넌트의 action 확인
+            const buttonComponents = layoutWithDefaultGrid.components.filter(
+              (c: any) => c.componentType?.startsWith("button")
+            );
+            console.log("🔍 [로드] 버튼 컴포넌트 action 확인:", buttonComponents.map((c: any) => ({
+              id: c.id,
+              type: c.componentType,
+              actionType: c.componentConfig?.action?.type,
+              fullAction: c.componentConfig?.action,
+            })));
+
             setLayout(layoutWithDefaultGrid);
             setHistory([layoutWithDefaultGrid]);
             setHistoryIndex(0);
@@ -1452,7 +1463,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
       };
       // 🔍 버튼 컴포넌트들의 action.type 확인
       const buttonComponents = layoutWithResolution.components.filter(
-        (c: any) => c.type === "button" || c.type === "button-primary" || c.type === "button-secondary",
+        (c: any) => c.componentType?.startsWith("button") || c.type === "button" || c.type === "button-primary",
       );
       console.log("💾 저장 시작:", {
         screenId: selectedScreen.screenId,
@@ -1462,6 +1473,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
         buttonComponents: buttonComponents.map((c: any) => ({
           id: c.id,
           type: c.type,
+          componentType: c.componentType,
           text: c.componentConfig?.text,
           actionType: c.componentConfig?.action?.type,
           fullAction: c.componentConfig?.action,

frontend/components/screen/config-panels/ButtonConfigPanel.tsx

@@ -503,6 +503,8 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
             <SelectItem value="excel_upload">엑셀 업로드</SelectItem>
             <SelectItem value="barcode_scan">바코드 스캔</SelectItem>
             <SelectItem value="code_merge">코드 병합</SelectItem>
+            <SelectItem value="geolocation">위치정보 가져오기</SelectItem>
+            <SelectItem value="update_field">필드 값 변경</SelectItem>
           </SelectContent>
         </Select>
       </div>
@@ -1662,6 +1664,255 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
         </div>
       )}
 
+      {/* 위치정보 가져오기 설정 */}
+      {(component.componentConfig?.action?.type || "save") === "geolocation" && (
+        <div className="mt-4 space-y-4 rounded-lg border bg-muted/50 p-4">
+          <h4 className="text-sm font-medium text-foreground">📍 위치정보 설정</h4>
+
+          {/* 테이블 선택 */}
+          <div>
+            <Label htmlFor="geolocation-table">
+              저장할 테이블 <span className="text-destructive">*</span>
+            </Label>
+            <Select
+              value={config.action?.geolocationTableName || currentTableName || ""}
+              onValueChange={(value) => {
+                onUpdateProperty("componentConfig.action.geolocationTableName", value);
+                onUpdateProperty("componentConfig.action.geolocationLatField", "");
+                onUpdateProperty("componentConfig.action.geolocationLngField", "");
+                onUpdateProperty("componentConfig.action.geolocationAccuracyField", "");
+                onUpdateProperty("componentConfig.action.geolocationTimestampField", "");
+              }}
+            >
+              <SelectTrigger className="h-8 text-xs">
+                <SelectValue placeholder="테이블 선택" />
+              </SelectTrigger>
+              <SelectContent>
+                {availableTables.map((table) => (
+                  <SelectItem key={table.name} value={table.name} className="text-xs">
+                    {table.label || table.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            <p className="mt-1 text-xs text-muted-foreground">
+              위치 정보를 저장할 테이블 (기본: 현재 화면 테이블)
+            </p>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <Label htmlFor="geolocation-lat-field">
+                위도 저장 필드 <span className="text-destructive">*</span>
+              </Label>
+              <Input
+                id="geolocation-lat-field"
+                placeholder="예: latitude"
+                value={config.action?.geolocationLatField || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.geolocationLatField", e.target.value)}
+                className="h-8 text-xs"
+              />
+            </div>
+            <div>
+              <Label htmlFor="geolocation-lng-field">
+                경도 저장 필드 <span className="text-destructive">*</span>
+              </Label>
+              <Input
+                id="geolocation-lng-field"
+                placeholder="예: longitude"
+                value={config.action?.geolocationLngField || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.geolocationLngField", e.target.value)}
+                className="h-8 text-xs"
+              />
+            </div>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <Label htmlFor="geolocation-accuracy-field">정확도 저장 필드 (선택)</Label>
+              <Input
+                id="geolocation-accuracy-field"
+                placeholder="예: accuracy"
+                value={config.action?.geolocationAccuracyField || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.geolocationAccuracyField", e.target.value)}
+                className="h-8 text-xs"
+              />
+            </div>
+            <div>
+              <Label htmlFor="geolocation-timestamp-field">타임스탬프 저장 필드 (선택)</Label>
+              <Input
+                id="geolocation-timestamp-field"
+                placeholder="예: location_time"
+                value={config.action?.geolocationTimestampField || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.geolocationTimestampField", e.target.value)}
+                className="h-8 text-xs"
+              />
+            </div>
+          </div>
+
+          <div className="flex items-center justify-between">
+            <div className="space-y-0.5">
+              <Label htmlFor="geolocation-high-accuracy">고정밀 모드</Label>
+              <p className="text-xs text-muted-foreground">GPS를 사용하여 더 정확한 위치 (배터리 소모 증가)</p>
+            </div>
+            <Switch
+              id="geolocation-high-accuracy"
+              checked={config.action?.geolocationHighAccuracy !== false}
+              onCheckedChange={(checked) => onUpdateProperty("componentConfig.action.geolocationHighAccuracy", checked)}
+            />
+          </div>
+
+          <div className="flex items-center justify-between">
+            <div className="space-y-0.5">
+              <Label htmlFor="geolocation-auto-save">위치 가져온 후 자동 저장</Label>
+              <p className="text-xs text-muted-foreground">위치 정보를 가져온 후 자동으로 폼을 저장합니다</p>
+            </div>
+            <Switch
+              id="geolocation-auto-save"
+              checked={config.action?.geolocationAutoSave === true}
+              onCheckedChange={(checked) => onUpdateProperty("componentConfig.action.geolocationAutoSave", checked)}
+            />
+          </div>
+
+          <div className="rounded-md bg-blue-50 p-3 dark:bg-blue-950">
+            <p className="text-xs text-blue-900 dark:text-blue-100">
+              <strong>사용 방법:</strong>
+              <br />
+              1. 버튼을 클릭하면 브라우저가 위치 권한을 요청합니다
+              <br />
+              2. 사용자가 허용하면 현재 GPS 좌표를 가져옵니다
+              <br />
+              3. 위도/경도가 지정된 필드에 자동으로 입력됩니다
+              <br />
+              <br />
+              <strong>참고:</strong> HTTPS 환경에서만 위치정보가 작동합니다.
+            </p>
+          </div>
+        </div>
+      )}
+
+      {/* 필드 값 변경 설정 */}
+      {(component.componentConfig?.action?.type || "save") === "update_field" && (
+        <div className="mt-4 space-y-4 rounded-lg border bg-muted/50 p-4">
+          <h4 className="text-sm font-medium text-foreground">📝 필드 값 변경 설정</h4>
+
+          <div>
+            <Label htmlFor="update-table">
+              대상 테이블 <span className="text-destructive">*</span>
+            </Label>
+            <Select
+              value={config.action?.updateTableName || currentTableName || ""}
+              onValueChange={(value) => {
+                onUpdateProperty("componentConfig.action.updateTableName", value);
+                onUpdateProperty("componentConfig.action.updateTargetField", "");
+              }}
+            >
+              <SelectTrigger className="h-8 text-xs">
+                <SelectValue placeholder="테이블 선택" />
+              </SelectTrigger>
+              <SelectContent>
+                {availableTables.map((table) => (
+                  <SelectItem key={table.name} value={table.name} className="text-xs">
+                    {table.label || table.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            <p className="mt-1 text-xs text-muted-foreground">
+              필드 값을 변경할 테이블 (기본: 현재 화면 테이블)
+            </p>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <Label htmlFor="update-target-field">
+                변경할 필드명 <span className="text-destructive">*</span>
+              </Label>
+              <Input
+                id="update-target-field"
+                placeholder="예: status"
+                value={config.action?.updateTargetField || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.updateTargetField", e.target.value)}
+                className="h-8 text-xs"
+              />
+              <p className="mt-1 text-xs text-muted-foreground">변경할 DB 컬럼</p>
+            </div>
+            <div>
+              <Label htmlFor="update-target-value">
+                변경할 값 <span className="text-destructive">*</span>
+              </Label>
+              <Input
+                id="update-target-value"
+                placeholder="예: active"
+                value={config.action?.updateTargetValue || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.updateTargetValue", e.target.value)}
+                className="h-8 text-xs"
+              />
+              <p className="mt-1 text-xs text-muted-foreground">변경할 값 (문자열, 숫자)</p>
+            </div>
+          </div>
+
+          <div className="flex items-center justify-between">
+            <div className="space-y-0.5">
+              <Label htmlFor="update-auto-save">변경 후 자동 저장</Label>
+              <p className="text-xs text-muted-foreground">버튼 클릭 시 즉시 DB에 저장</p>
+            </div>
+            <Switch
+              id="update-auto-save"
+              checked={config.action?.updateAutoSave !== false}
+              onCheckedChange={(checked) => onUpdateProperty("componentConfig.action.updateAutoSave", checked)}
+            />
+          </div>
+
+          <div>
+            <Label htmlFor="update-confirm-message">확인 메시지 (선택)</Label>
+            <Input
+              id="update-confirm-message"
+              placeholder="예: 운행을 시작하시겠습니까?"
+              value={config.action?.confirmMessage || ""}
+              onChange={(e) => onUpdateProperty("componentConfig.action.confirmMessage", e.target.value)}
+              className="h-8 text-xs"
+            />
+            <p className="mt-1 text-xs text-muted-foreground">입력하면 변경 전 확인 창이 표시됩니다</p>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <Label htmlFor="update-success-message">성공 메시지 (선택)</Label>
+              <Input
+                id="update-success-message"
+                placeholder="예: 운행이 시작되었습니다."
+                value={config.action?.successMessage || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.successMessage", e.target.value)}
+                className="h-8 text-xs"
+              />
+            </div>
+            <div>
+              <Label htmlFor="update-error-message">오류 메시지 (선택)</Label>
+              <Input
+                id="update-error-message"
+                placeholder="예: 운행 시작에 실패했습니다."
+                value={config.action?.errorMessage || ""}
+                onChange={(e) => onUpdateProperty("componentConfig.action.errorMessage", e.target.value)}
+                className="h-8 text-xs"
+              />
+            </div>
+          </div>
+
+          <div className="rounded-md bg-blue-50 p-3 dark:bg-blue-950">
+            <p className="text-xs text-blue-900 dark:text-blue-100">
+              <strong>사용 예시:</strong>
+              <br />
+              - 운행알림 버튼: status 필드를 &quot;active&quot;로 변경
+              <br />
+              - 승인 버튼: approval_status 필드를 &quot;approved&quot;로 변경
+              <br />
+              - 완료 버튼: is_completed 필드를 &quot;Y&quot;로 변경
+            </p>
+          </div>
+        </div>
+      )}
+
       {/* 데이터 전달 액션 설정 */}
       {(component.componentConfig?.action?.type || "save") === "transferData" && (
         <div className="mt-4 space-y-4 rounded-lg border bg-muted/50 p-4">