Merge branch 'iipbs/common/main' into iipbs/fo/dev

packages/common/business_components/src/ui/chart/BarChart.tsx

@@ -87,7 +87,7 @@ const getGlobalMax = (data: Record<string, number>[]) => {
 };
 
 export default function Chart({chartConfig=undefined, chartData=[], chartTitle='차트', chartClassName='w-full h-full', graphSize=40, yFieldText='', showLegend=false} : BarChartProps) {
-  const colors = ["#FF6B6B", "#4ECDC4", "#45B7D1", "#FED16A", "#FFEEAD", "#D4A5A5"];
+  const colors = ["#FF6B6B", "#4ECDC4", "#44ad57", "#FED16A", "#FFEEAD", "#D4A5A5"];
   const globalMax = getGlobalMax(chartData);
   const tickCount = 5;
   // interval을 globalMax / tickCount로 계산

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

@@ -21,6 +21,9 @@ type SearchBaseType = {
     btnClass:string;
     ref:React.RefObject<ReturnType>;
     isAdmin:boolean;
+    rightClassName?: string;
+    leftClassName?: string;
+    leftSelectClassName?: string;
 }
 export type ReturnType = {
     partValue: string;
@@ -49,7 +52,10 @@ function SearchBaseForm ({
     excelClick,
     initClick,
     ref,
-    isAdmin=false
+    isAdmin=false,
+    rightClassName,
+    leftClassName,
+    leftSelectClassName
     }: SearchBaseType) {
         const [partValue, setPartValue] = useState<string>("A");
         const [sidoValue, setSidoValue] = useState<string>("0");
@@ -133,10 +139,12 @@ function SearchBaseForm ({
             setRtnSigunText={setSigunText}
             resetTrigger={resetTrigger}
             isAdmin={isAdmin}
+            leftClassName={leftClassName}
+            leftSelectClassName={leftSelectClassName}
           >
             {leftChildren}
           </SearchFormLeft>
-          <SearchFormRight>
+          <SearchFormRight className={rightClassName}>
             <Button className={btnClass} color="green" onClick={excelDownload}>
               {excelName?excelName:"엑셀다운로드"}
             </Button>

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

@@ -44,6 +44,8 @@ type SearchFormLeftProps = {
   setRtnSigunText?: (value: string) => void;
   resetTrigger?: boolean;
   isAdmin?: boolean;
+  leftClassName?: string;
+  leftSelectClassName?: string;
 }
 
 export type EnvPartSelectDataType = SelectDataType & {
@@ -56,7 +58,7 @@ const selectPartData:SelectDataType[] = [
   { text: "환경청별", val: 'G' },
 ];
 
-function SearchFormLeft({ isShowPart = false, children, selectSidoData = [], selectSigunData = [], selectRegionData = [], selectUnitWaterShedData = [], selectMiddleRegionData = [], selectEnvPartData = [], setRtnPartValue, setRtnSidoValue, setRtnSidoText, setRtnSigunValue, setRtnSigunText, setRtnRegionValue, setRtnUnitWaterShedValue, setRtnMiddleRegionValue, setRtnEnvPartValue, setRtnEnvPartSidoValue, setRtnEnvPartSigunValue, resetTrigger = false, isAdmin = false }: SearchFormLeftProps) {
+function SearchFormLeft({ isShowPart = false, children, selectSidoData = [], selectSigunData = [], selectRegionData = [], selectUnitWaterShedData = [], selectMiddleRegionData = [], selectEnvPartData = [], setRtnPartValue, setRtnSidoValue, setRtnSidoText, setRtnSigunValue, setRtnSigunText, setRtnRegionValue, setRtnUnitWaterShedValue, setRtnMiddleRegionValue, setRtnEnvPartValue, setRtnEnvPartSidoValue, setRtnEnvPartSigunValue, resetTrigger = false, isAdmin = false, leftClassName, leftSelectClassName }: SearchFormLeftProps) {
   /******************선택된 데이터******************/
   const [partValue, setPartValue] = useState<string>('A');
   //행정별 시도 시군구
@@ -308,24 +310,24 @@ function SearchFormLeft({ isShowPart = false, children, selectSidoData = [], sel
 
   return (
     isShowPart ? (
-    <div className="grid grid-cols-12 gap-5 w-11/12 m-4">
-      <SelectBox className="col-span-3" label={'구분'} selectArray={isAdmin ? selectPartData.slice(0, 1) : selectPartData} onSelectValue={(val) => onSelectValue(val.toString(), 'part')} value={partValue} selectClass={undefined}/>
+    <div className={leftClassName?leftClassName:`grid grid-cols-12 gap-5 w-11/12 m-4`}>
+      <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'구분'} selectArray={isAdmin ? selectPartData.slice(0, 1) : selectPartData} onSelectValue={(val) => onSelectValue(val.toString(), 'part')} value={partValue} selectClass={undefined}/>
       {partValue === 'R' ? (
         <>
-          <SelectBox className="col-span-3" label={'유역'} selectArray={selectRegionData} onSelectValue={(val) => onSelectValue(val.toString(), 'region')} value={regionValue} selectClass={undefined}/>
-          <SelectBox className="col-span-3" label={'단위유역'} selectArray={filteredUnitWaterShedData} onSelectValue={(val) => onSelectValue(val.toString(), 'unitWaterShed')} value={unitWaterShedValue} selectClass={undefined}/>
-          <SelectBox className="col-span-3" label={'중권역'} selectArray={filteredMiddleRegionData} onSelectValue={(val) => onSelectValue(val.toString(), 'middleRegion')} value={middleRegionValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'유역'} selectArray={selectRegionData} onSelectValue={(val) => onSelectValue(val.toString(), 'region')} value={regionValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'단위유역'} selectArray={filteredUnitWaterShedData} onSelectValue={(val) => onSelectValue(val.toString(), 'unitWaterShed')} value={unitWaterShedValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'중권역'} selectArray={filteredMiddleRegionData} onSelectValue={(val) => onSelectValue(val.toString(), 'middleRegion')} value={middleRegionValue} selectClass={undefined}/>
         </>
       ) : partValue === 'G' ? (
         <>
-          <SelectBox className="col-span-3" label={'환경청'} selectArray={filteredEnvPartData} onSelectValue={(val) => onSelectValue(val.toString(), 'envPart')} value={envPartValue} selectClass={undefined}/>
-          <SelectBox className="col-span-3" label={'시도'} selectArray={filteredEnvPartSidoData} onSelectValue={(val) => onSelectValue(val.toString(), 'envPartSido')} value={sidoValue} selectClass={undefined}/>
-          <SelectBox className="col-span-3" label={'시군구'} selectArray={filteredEnvPartSigunData} onSelectValue={(val) => onSelectValue(val.toString(), 'envPartSigun')} value={sigunValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'환경청'} selectArray={filteredEnvPartData} onSelectValue={(val) => onSelectValue(val.toString(), 'envPart')} value={envPartValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'시도'} selectArray={filteredEnvPartSidoData} onSelectValue={(val) => onSelectValue(val.toString(), 'envPartSido')} value={sidoValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'시군구'} selectArray={filteredEnvPartSigunData} onSelectValue={(val) => onSelectValue(val.toString(), 'envPartSigun')} value={sigunValue} selectClass={undefined}/>
         </>
       ) : (
         <>
-          <SelectBox className="col-span-3" label={'시도'} selectArray={selectSidoData} onSelectValue={(val) => onSelectValue(val.toString(), 'sido')} value={sidoValue} selectClass={undefined}/>
-          <SelectBox className="col-span-3" label={'시군구'} selectArray={filteredSigunData} onSelectValue={(val) => onSelectValue(val.toString(), 'sigun')} value={sigunValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'시도'} selectArray={selectSidoData} onSelectValue={(val) => onSelectValue(val.toString(), 'sido')} value={sidoValue} selectClass={undefined}/>
+          <SelectBox className={leftSelectClassName?leftSelectClassName:`col-span-3`} label={'시군구'} selectArray={filteredSigunData} onSelectValue={(val) => onSelectValue(val.toString(), 'sigun')} value={sigunValue} selectClass={undefined}/>
         </>
       )}
       {children}

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

@@ -49,12 +49,6 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
     }
   }, [resetSelection]);
 
-  // 테이블 데이터가 변경될 때마다 선택된 행 초기화하는 useEffect 추가
-  useEffect(() => {
-    // 새로운 데이터가 로드되면 선택 상태 초기화
-    setIdx(-1);
-  }, [tableData]);
-
   useEffect(() => {
     if (headerRef.current) {
       setHeaderHeight(headerRef.current.offsetHeight-5);