Merge all feature branches into main and optimize core architecture

src/core/dummyDataGenerator.ts

@@ -196,5 +196,5 @@ export function generateDummyData(): MasterAssetData {
     });
   }
 
-  return { pc, server, storage, equip, mobile, subSw, permSw, swUsers, logs };
+  return { pc, server, storage, equip, mobile, subSw, permSw, cloud: [], swUsers, logs, sw: [], hw: [] };
 }

src/core/excelHandler.ts

@@ -40,8 +40,12 @@ export interface HardwareAsset {
   비고?: string;
   현사용조직?: string;
   이전사용조직?: string;
+<<<<<<< HEAD
   보관위치?: string;
   현재상태?: string;
+=======
+  detail_purpose?: string;
+>>>>>>> origin/SW_Table
 }
 
 export interface SoftwareAsset {
@@ -62,11 +66,13 @@ export interface SoftwareAsset {
   계정명: string;
   납품업체: string;
   비고: string;
+  자산번호?: string;
   플랫폼명?: string;
   결제수단?: string;
   결제일?: string;
   연결카드번호?: string;
   당월청구액?: string;
+  시작일?: string;
 }
 
 export interface SWUser {
@@ -98,8 +104,11 @@ export interface MasterAssetData {
   mobile: HardwareAsset[];
   subSw: SoftwareAsset[];
   permSw: SoftwareAsset[];
-  swUsers: any[]; // { sw_id, userData: [] } 형태로 처리
+  cloud: SoftwareAsset[];
+  swUsers: SWUser[];
   logs: HardwareLog[];
+  sw: SoftwareAsset[];
+  hw: HardwareAsset[];
 }
 
 const HW_TABS = ['개인PC', '서버', '스토리지', '전산비품', '모바일기기'];
@@ -166,7 +175,7 @@ export async function parseExcel(file: File): Promise<MasterAssetData> {
     reader.onload = (e) => {
       try {
         const workbook = XLSX.read(e.target?.result, { type: 'binary' });
-        const data: MasterAssetData = { pc: [], server: [], storage: [], equip: [], mobile: [], subSw: [], permSw: [], swUsers: [], logs: [] };
+        const data: MasterAssetData = { pc: [], server: [], storage: [], equip: [], mobile: [], subSw: [], permSw: [], cloud: [], swUsers: [], logs: [], sw: [], hw: [] };
         workbook.SheetNames.forEach(sheetName => {
           const rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]) as any[];
           if (sheetName === '개인PC') {

src/core/state.ts

@@ -16,12 +16,14 @@ export interface MasterAssetData {
   // 동료 코드 호환용 통합 배열 (프론트엔드 로직용)
   hw: HardwareAsset[];
   sw: SoftwareAsset[];
+  hw: HardwareAsset[];
 }
 
 export interface AppState {
-  activeCategory: 'dashboard' | 'hw' | 'sw';
-  activeSubTab: string; // '대시보드', '개인PC', '서버', '스토리지', '전산비품', '구독SW', '영구SW', '클라우드'
+  activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops';
+  activeSubTab: string; 
   masterData: MasterAssetData;
+  activeCharts: any[];
 }
 
 // 초기 상태
@@ -40,8 +42,10 @@ export const state: AppState = {
     hw: [], // 호환용
     sw: [], // 호환용
     swUsers: [],
-    logs: []
-  }
+    logs: [],
+    hw: []
+  },
+  activeCharts: []
 };
 
 /**
@@ -85,12 +89,19 @@ export async function loadMasterDataFromDB() {
       }
     }
 
-    // 동료 코드 호환을 위한 통합 sw 배열 생성
+    // 동료 코드 호환을 위한 통합 sw/hw 배열 생성
     state.masterData.sw = [
       ...state.masterData.subSw,
       ...state.masterData.permSw,
       ...state.masterData.cloud
     ];
+    state.masterData.hw = [
+      ...state.masterData.pc,
+      ...state.masterData.server,
+      ...state.masterData.storage,
+      ...state.masterData.equip,
+      ...state.masterData.mobile
+    ];
 
     // 하드웨어 통합 배열 생성 (대시보드 등에서 사용)
     state.masterData.hw = [