b24014/ITAM-test
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve all TypeScript build errors after Setting branch merge

Browse Source
This commit is contained in:
주완기
2026-04-23 18:36:33 +09:00
parent 5feaa5f170
commit 4b88ac01a4
11 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Modal/DashboardDetailModal.ts
View File

@@ -98,7 +98,7 @@ export function openSwUsageDetail(title: string, list: SoftwareAsset[]) {
thead.innerHTML = `<tr><th>No</th><th>법인</th><th>제품명</th><th>수량</th><th>사용중</th><th>사용가능</th></tr>`;
tbody.innerHTML = '';
list.forEach((sw, idx) => {
const assigned = state.masterData.swUsers.filter(u => u.swId === sw.id).length;
const assigned = state.masterData.swUsers.filter(u => u.sw_id === sw.id).length;
const tr = document.createElement('tr');
tr.innerHTML = `<td>${idx+1}</td><td>${sw.법인}</td><td>${sw.제품명}</td><td>${sw.수량}</td><td>${assigned}</td><td>${Number(sw.수량) - assigned}</td>`;
tbody.appendChild(tr);

17
src/components/Modal/HWModal.ts
View File

@@ -1,6 +1,6 @@
import { state, saveHardwareAsset, deleteHardwareAsset } from '../../core/state';
import { HardwareAsset } from '../../core/excelHandler';
import { closeModals } from './BaseModal';
import { openModal } from './BaseModal';
import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
import { createIcons, History, Plus, X, Save, Edit2, RotateCcw, Paperclip } from 'lucide';
import { CORP_LIST, ORG_LIST, HW_TYPE_LIST, LOCATION_DATA, TYPE_PREFIX_MAP } from './SharedData';
@@ -383,11 +383,10 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
{ key: ASSET_SCHEMA.MODEL.key, label: ASSET_SCHEMA.MODEL.ui }
];
const isNewAsset = !currentAsset || !currentAsset.자산코드;
if (isNewAsset) {
if (!currentAsset || !currentAsset.자산코드) {
diffLogs.push('자산 신규 등록');
} else {
const asset = currentAsset!;
const newIp = String(getFieldValue('hw-IP주소') || getFieldValue('hw-IP주소-non-server') || '').trim();
const newLocation = String(isOpType ? extracted[ASSET_SCHEMA.STORE_LOC.key] : getCombinedLocation('hw-위치-빌딩', 'hw-위치-상세', 'hw-위치-기타') || '').trim();
@@ -396,19 +395,19 @@ export function initHwModal(onSave: () => void, closeModalsCb: () => void) {
let newVal = '';
if (f.key === ASSET_SCHEMA.IP_ADDR.key) {
oldVal = String(currentAsset[ASSET_SCHEMA.IP_ADDR.key] || '').trim();
oldVal = String(asset[ASSET_SCHEMA.IP_ADDR.key] || '').trim();
newVal = newIp;
} else if (f.key === ASSET_SCHEMA.LOCATION.key) {
oldVal = String(currentAsset[ASSET_SCHEMA.LOCATION.key] || '').trim();
oldVal = String(asset[ASSET_SCHEMA.LOCATION.key] || '').trim();
newVal = newLocation;
} else if (f.key === ASSET_SCHEMA.MANAGER_MAIN.key) {
oldVal = String(currentAsset[ASSET_SCHEMA.MANAGER_MAIN.key] || '').trim();
oldVal = String(asset[ASSET_SCHEMA.MANAGER_MAIN.key] || '').trim();
newVal = String(extracted[ASSET_SCHEMA.MANAGER_MAIN.key] || '').trim();
} else if (f.key === '상세용도') {
oldVal = String(currentAsset.상세용도 || '').trim();
oldVal = String(asset.상세용도 || '').trim();
newVal = String((extracted.type !== 'PC' && extracted.type !== '개인PC') ? extracted.type : (extracted.상세용도 || '')).trim();
} else {
oldVal = String((currentAsset as any)[f.key] || '').trim();
oldVal = String((asset as any)[f.key] || '').trim();
newVal = String(extracted[f.key] || '').trim();
}

2
src/components/Modal/SWModal.ts
View File

@@ -1,6 +1,6 @@
import { state } from '../../core/state';
import { SoftwareAsset } from '../../core/excelHandler';
import { closeModals } from './BaseModal';
import { openModal } from './BaseModal';
import { openSwUserModal } from './SWUserModal';
import { ASSET_SCHEMA, UI_TEXT } from '../../core/schema';
import { createIcons, History, Plus, X, Save, Edit2, RotateCcw } from 'lucide';

2
src/components/Modal/SWUserModal.ts
View File

@@ -100,7 +100,7 @@ export function openSwUserModal(asset: SoftwareAsset) {
// 기존 사용자 데이터 복사 (원본 보호를 위해 temp 사용)
const existingMapping = state.masterData.swUsers.find(u => u.sw_id === asset.id);
tempSwUsers = existingMapping ? JSON.parse(JSON.stringify(existingMapping.userDataList || [])) : [];
tempSwUsers = existingMapping ? JSON.parse(JSON.stringify(existingMapping.userData || [])) : [];
renderUserList();
modal.classList.remove('hidden');