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

This commit is contained in:
kjs
2025-12-08 15:16:07 +09:00
14 changed files with 3693 additions and 228 deletions

View File

@@ -53,6 +53,7 @@ export function RestApiConnectionModal({ isOpen, onClose, onSave, connection }:
const [retryCount, setRetryCount] = useState(0);
const [retryDelay, setRetryDelay] = useState(1000);
const [isActive, setIsActive] = useState(true);
const [saveToHistory, setSaveToHistory] = useState(false); // 위치 이력 저장 설정
// UI 상태
const [showAdvanced, setShowAdvanced] = useState(false);
@@ -80,6 +81,7 @@ export function RestApiConnectionModal({ isOpen, onClose, onSave, connection }:
setRetryCount(connection.retry_count || 0);
setRetryDelay(connection.retry_delay || 1000);
setIsActive(connection.is_active === "Y");
setSaveToHistory(connection.save_to_history === "Y");
// 테스트 초기값 설정
setTestEndpoint("");
@@ -100,6 +102,7 @@ export function RestApiConnectionModal({ isOpen, onClose, onSave, connection }:
setRetryCount(0);
setRetryDelay(1000);
setIsActive(true);
setSaveToHistory(false);
// 테스트 초기값 설정
setTestEndpoint("");
@@ -234,6 +237,7 @@ export function RestApiConnectionModal({ isOpen, onClose, onSave, connection }:
retry_delay: retryDelay,
// company_code는 백엔드에서 로그인 사용자의 company_code로 자동 설정
is_active: isActive ? "Y" : "N",
save_to_history: saveToHistory ? "Y" : "N",
};
console.log("저장하려는 데이터:", {
@@ -376,6 +380,16 @@ export function RestApiConnectionModal({ isOpen, onClose, onSave, connection }:
</Label>
</div>
<div className="flex items-center space-x-2">
<Switch id="save-to-history" checked={saveToHistory} onCheckedChange={setSaveToHistory} />
<Label htmlFor="save-to-history" className="cursor-pointer">
</Label>
<span className="text-xs text-muted-foreground">
( API vehicle_location_history에 )
</span>
</div>
</div>
{/* 헤더 관리 */}