Merge branch 'iipbs/common/main' into iipbs/sn/ii

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

@@ -6,22 +6,13 @@ import {
   Card,
   CardContent
 } from "./lib/card";
-import { ChartContainer, ChartTooltip } from "./lib/chart";
+import { ChartContainer, ChartTooltip, type ChartConfig } from "./lib/chart";
 
 type ChartDataItem = {
   label: string;
   val: number;
 };
 
-type ChartConfigItem = {
-  label: string;
-  fill: string;
-};
-
-type ChartConfig = {
-  [key: string]: ChartConfigItem;
-};
-
 type TooltipPayloadItem = {
   name: string;
   value: number;
@@ -47,20 +38,6 @@ type LegendProps = {
   payload?: LegendEntry[];
 };
 
-/** 차트 기본 스타일 */
-/*
-const customStyles = {
-  legendContainer: {
-    display: "flex",
-    justifyContent: "center",
-    gap: "20px",
-    fontSize: "9px",
-    fontWeight: "bold",
-    marginTop: "10px",
-  } as CSSProperties,
-};
-*/
-
 /** 차트 기본 스타일 (라인차트와 동일하게) */
 const customStyles = {
   legendContainer: {
@@ -99,25 +76,6 @@ const CustomTooltip = ({ active, payload, label }: {
   return null;
 };
 
-// 커스텀 범례
-/*
-const CustomLegend = (props: LegendProps) => {
-  const { payload } = props;
-  if (!payload) return null;
-
-  return (
-    <div style={customStyles.legendContainer}>
-      {payload.map((entry: LegendEntry, index: number) => (
-        <div key={`legend-${index}`} className="flex items-center gap-2">
-          <div className="w-[14px] h-[14px] ml-10" style={{ backgroundColor: entry.fill }}></div>
-          <span className="text-[12px]">{entry.value}</span>
-        </div>
-      ))}
-    </div>
-  );
-};
-*/
-
 const CustomLegend = (props: LegendProps) => {
   const { payload } = props;
   if (!payload) return null;
@@ -154,14 +112,20 @@ const CustomLegend = (props: LegendProps) => {
 };
 
 export default function DoughnutChart(props: { 
-  chartConfig: any; 
+  chartConfig: ChartConfig; 
   chartData: ChartDataItem[] | undefined; 
   chartTitle: string
 }) {
   const legendData = props.chartData?.map(item => ({
     value: item.label,
-    fill: props.chartConfig?.[item.label]?.fill || 'blue',
+    fill: props.chartConfig?.[item.label]?.color || 'blue',
+    payload: {
+      label: item.label,
+      val: item.val,
+      fill: props.chartConfig?.[item.label]?.color || 'blue'
+    }
   })) ?? [];
+  
   return (
     <Card className="flex flex-col">
       <CardContent className="flex-1 pb-0">
@@ -183,7 +147,7 @@ export default function DoughnutChart(props: {
               <Pie
                 data={props.chartData?.map(item => ({
                   ...item,
-                  fill: props.chartConfig[item.label]?.fill || 'blue'
+                  fill: props.chartConfig[item.label]?.color || 'blue'
                 }))}
                 dataKey="val"
                 nameKey="label"

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

@@ -128,7 +128,7 @@ export default function LineBarchart({
               tickCount={6}
               orientation="left" 
               domain={[0, Math.ceil(lineMaxValue * 1)]}
-              label={{ value: yFieldText, angle: -90, position: 'insideLeft' }} 
+              label={{ value: yFieldText, angle: -90, position: 'insideLeft', offset: -8  }} 
             />}
             {/* 오른쪽 Y축: barVal */}
             {yFieldText2 && <YAxis 

packages/common/business_components/src/ui/sdmInsertForm/form.tsx

@@ -54,7 +54,7 @@ interface FormSchema {
   daddr: string;
   telno: string;
   bznmTotNo?: string;
-  rgtr?: string;
+  rgtr?: string | '';
   dmdAplyPswd?: string;
   dmdAplyPswdConfirm?: string;
 }

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

@@ -42,7 +42,7 @@ const createFormSchema = (isBznmTotNoDisabled: boolean, isDuplicate: boolean ,up
     .min(8, "전화번호는 8자 이상 입력해주세요")
     .max(11, "전화번호는 11자 이내로 입력해주세요")
     .regex(/^[0-9]+$/, "전화번호는 숫자만 입력 가능합니다"),
-    rgtr: z.string().nullish(),
+    rgtr: z.string().optional(),
     dmdAplyPswd	: updateList?.dmdInfoPk // 업데이트일경우
     ? z.string().optional() // 패스워드는 선택 사항이며 길이 제한 없음
     : z.string().optional()

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

@@ -9,7 +9,7 @@ interface TabItem {
 interface UITabProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'dir'> {
   defaultValue?: string;
   tabList: TabItem[];
-  children: React.ReactNode;
+  children?: React.ReactNode;
   onValueChange?: (value: string) => void;
 }
 

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

@@ -1,11 +1,10 @@
 "use client"
 
 import { Checkbox, Table, TableBody, TableCell, TableHeader, TableRow } from "@common/components";
-import { useEffect, useState } from "react";
+import { useEffect, useState, useRef } from "react";
 import { HeadMakeColSpan } from "./HeadMakeColSpan";
 import UiPageNations from "./uiPageNations";
-import { AlignVerticalDistributeCenterIcon, Check } from "lucide-react";
-import { boolean } from "zod";
+import { Check } from "lucide-react";
 
 type UiTableProps = {
   headName: React.ReactNode | undefined;
@@ -33,7 +32,8 @@ type UiHeadProps = {
 export function UiTable({ tableData, headlist, pageSize, total, headName, children, cellClick, onPageChange, className = '', resetPageNo = false, boldArray = [], resetSelection = false, index = -1 }: UiTableProps) {
   const [cur, setCur] = useState<number>(1);
   const [idx, setIdx] = useState<number>(index);
-  const [isCheck, seIsCheck] = useState<boolean>(false);
+  const [headerHeight, setHeaderHeight] = useState<number>(0);
+  const headerRef = useRef<HTMLTableSectionElement>(null);
 
 
   useEffect(() => {
@@ -55,6 +55,12 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
     setIdx(-1);
   }, [tableData]);
 
+  useEffect(() => {
+    if (headerRef.current) {
+      setHeaderHeight(headerRef.current.offsetHeight-5);
+    }
+  }, [tableData, headlist]);
+
   const handlePageChange = (page: number) => {
     setCur(page);
     onPageChange(page);
@@ -75,11 +81,11 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
       </div> : <></>}
       <div className={`card !m-[1.2rem] !p-0r ${className}`}>
         <Table variant="secondary">
-          <TableHeader className="font-bold">
+          <TableHeader ref={headerRef} className="font-bold">
             {children ? children : <HeadMakeColSpan upHeadList={headlist} />}
           </TableHeader>
           <TableBody className='text-center'>
-            {tableData.length > 0 ? tableData?.map((el: { [key: string]: any }, index) => (
+            {tableData.length > 0 ? tableData?.map((el: Record<string, unknown>, index) => (
               <TableRow key={`row-${index}`}>
                 {headlist
                   .filter((item) => item.visible != false)
@@ -90,7 +96,8 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
                         <TableCell
                           className={`${head.align === 'right' ? 'text-right' : head.align === 'center' ? 'text-center' : 'text-center'} ${cellClick && idx === index ? '!font-[1000] cursor-pointer' :
                             cellClick ? 'cursor-pointer' : ''
-                            } !font-bold`}
+                            } !font-bold sticky bg-secondary z-40`}
+                          style={{ top: `${headerHeight + (index * 39)}px` }}
                           onClick={() => handleCellClick(index, head.id)}
                           key={`cell-${head.id}-${index}`}
                         >
@@ -104,7 +111,7 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
                         <TableCell
                           className={`${head.align === 'right' ? 'text-right' : head.align === 'center' ? 'text-center' : 'text-center'} ${cellClick && idx === index ? '!font-[1000] cursor-pointer' :
                             cellClick ? 'cursor-pointer' : ''
-                            }`}
+                            } mt-[${boldArray.length * 40}px]`}
                           onClick={() => handleCellClick(index, head.id)}
                           key={`cell-${head.id}-${index}`}
                         >
@@ -130,7 +137,13 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
                     )
                   ))}
               </TableRow>
-            )) : <></>}
+             )) : (
+              <TableRow>
+                <TableCell colSpan={headlist.filter((item) => item.visible != false).length} className="h-24 text-center text-gray-500">
+                  조회된 결과가 없습니다.
+                </TableCell>
+              </TableRow>
+            )}
           </TableBody>
         </Table>
         {total <= 0 ? <></> : <UiPageNations total={total} cur={cur} pageSize={pageSize} onPageChange={handlePageChange} />}