Merge commit '2bf254eb3c9d6e64deb1e9c5d9aeb1402f263dbf' into iipbs/wr/form_fuction

packages/common/business_components/src/ui/excel_download/index.tsx

@@ -50,7 +50,10 @@ export const filePicked=(oFile: File, headerNum:number=0):Promise<JSON | undefin
     reader.readAsBinaryString(oFile);
   });
 }
-export const filePickedBlob=(oFile: ArrayBuffer, data:JSON[], headerNum:number=0):Promise<JSON | undefined> =>{
+
+
+
+export const filePickedBlob=(oFile: ArrayBuffer, data:JSON[],fileNm:string, headerNum:number=0):Promise<JSON | undefined> =>{
   // Create A File Reader HTML5
   return new Promise<JSON | undefined>((resolve) => {
     // Ready The Event For When A File Gets Selected
@@ -62,14 +65,16 @@ export const filePickedBlob=(oFile: ArrayBuffer, data:JSON[], headerNum:number=0
         if(index==0){
           const sheet = wb.Sheets[sheetName];
           if (sheet) {
-            XLSX.utils.sheet_add_json(sheet,data);
+            //오리진 확인 test 필요
+            // XLSX.utils.sheet_add_json(sheet,data ,{origin: 3} );
+            XLSX.utils.sheet_add_json(sheet,data  );
             jsonXls = XLSX.utils.sheet_to_json(sheet, { range: headerNum }) as unknown as JSON;
-            XLSX.writeFile(wb, "test.xlsx");
+            XLSX.writeFile(wb, `${fileNm}.xlsx`);
           } else {
             console.error(`Sheet "${sheetName}" is undefined.`);
           }
         } 
       });
       resolve(jsonXls);
-  });
-}
+    });
+  }

packages/common/business_components/src/ui/search_base_form/index.tsx

@@ -13,6 +13,7 @@ type SearchBaseType = {
     selectMiddleRegionData?: SelectDataType[] | [];
     selectEnvPartData?: EnvPartSelectDataType[] | [];
     queryClick:(returnType:ReturnType) => void;
+    excelName?:string;
     excelClick:(returnType:ReturnType) => void;
     initClick:() => void;
     btnClass:string;
@@ -39,6 +40,7 @@ function SearchBaseForm ({
     selectMiddleRegionData,
     selectEnvPartData,
     btnClass,
+    excelName,
     queryClick,
     excelClick,
     initClick,
@@ -120,7 +122,7 @@ function SearchBaseForm ({
           </SearchFormLeft>
           <SearchFormRight>
             <Button className={btnClass} color="green" onClick={excelDownload}>
-              엑셀다운로드 
+              {excelName?excelName:"엑셀다운로드"}
             </Button>
             <div>
               <Button className={btnClass} onClick={initVal}>