From 59bccfe1d68e3bcbe1e7b3ec4f20838063855de0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 25 Jul 2025 14:03:52 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B5=B5=EC=9D=80=EC=98=81=EC=97=AD=20=EB=92=B7=EC=AA=BD?= =?UTF-8?q?=EC=97=90=20=EA=B8=80=EC=9E=90=EB=B3=B4=EC=9D=B4=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/business_components/src/ui/table/index.tsx | 4 ++-- packages/common/components/src/ui/table/index.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index de6fed944..4f369dc59 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -122,8 +122,8 @@ export function UiTable({ : cellClick ? "cursor-pointer" : "" - } sticky z-40 bg-secondary !font-bold`} - style={{ top: `${headerHeight + index * 39}px` }} + } sticky top-20 z-40 bg-secondary !font-bold`} + style={{ top: `${headerHeight + index * 32-4}px` }} onClick={() => handleCellClick(index, head.id)} key={`cell-${head.id}-${index}`} > diff --git a/packages/common/components/src/ui/table/index.tsx b/packages/common/components/src/ui/table/index.tsx index 3d4e2251d..fc536bb6f 100644 --- a/packages/common/components/src/ui/table/index.tsx +++ b/packages/common/components/src/ui/table/index.tsx @@ -31,7 +31,7 @@ const TableHeader = React.forwardRef< >(({ className, ...props }, ref) => ( )); From 190adb6bc121be6c0222778555b9730054ddaddf Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 25 Jul 2025 14:30:59 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=97=A4?= =?UTF-8?q?=EB=8D=94=20=EC=9C=84=EC=B9=98=20=EC=A2=80=EB=8D=94=20=EC=9C=84?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/components/src/ui/table/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/components/src/ui/table/index.tsx b/packages/common/components/src/ui/table/index.tsx index fc536bb6f..83be366fd 100644 --- a/packages/common/components/src/ui/table/index.tsx +++ b/packages/common/components/src/ui/table/index.tsx @@ -31,7 +31,7 @@ const TableHeader = React.forwardRef< >(({ className, ...props }, ref) => ( )); From c4f2af0bfe9e161d99e3c7bd55fd5dcf5c9a89cd Mon Sep 17 00:00:00 2001 From: leedj312 Date: Fri, 25 Jul 2025 16:58:52 +0900 Subject: [PATCH 3/6] =?UTF-8?q?rgtr=20nullish=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/sdmInsertForm/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx b/packages/common/business_components/src/ui/sdmInsertForm/index.tsx index 4091139b9..1629c78ed 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx +++ b/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().optional(), + rgtr: z.string().nullish(), dmdAplyPswd : updateList?.dmdInfoId // 업데이트일경우 ? z.string().optional() // 패스워드는 선택 사항이며 길이 제한 없음 : z.string().optional() From 4920b4c1a26d81c9078e22c49bff1adda3eb834f Mon Sep 17 00:00:00 2001 From: JIeunhuh Date: Fri, 25 Jul 2025 18:35:57 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=88=98=EC=9A=94=EC=B2=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/business_components/src/ui/map/Gis.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js index 90bd50fa4..229e3f629 100644 --- a/packages/common/business_components/src/ui/map/Gis.js +++ b/packages/common/business_components/src/ui/map/Gis.js @@ -163,7 +163,10 @@ function Gis({ featureId = data.bscFctCd; } else if (layerName === '온배수시설') { featureId = data.bdstRuseFcltSn; - } else { + } else if(layerName == '수요처'){ + featureId = data.dmdInfoId.replaceAll('-','') + } + else { console.warn('해당 레이어에 대한 featureId 매핑 없음', layerNm); featureId = data.fid || data.id || data.ftrIdn; } From 711adc2e170ddc84dc81638ff6b85e8aa416df43 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Fri, 25 Jul 2025 18:45:31 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=ED=8F=BC=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/sdmInsertForm/form.tsx | 2 ++ .../common/business_components/src/ui/sdmInsertForm/index.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx index 1bcae2cfd..09dd10525 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx @@ -215,6 +215,8 @@ export function SdmRegForm({ form, onCheckboxChange, selectSidoData, selectSigun useEffect(() => { + form.setValue('rgtr', '2d4b151d-1828-41e0-91d9-4cd28ea1cc7e'); + if(updateList?.dmdInfoId){ form.reset(updateList) if(updateList?.dmdInfoId.slice(10,14) !== '0000') { diff --git a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx b/packages/common/business_components/src/ui/sdmInsertForm/index.tsx index 1629c78ed..4091139b9 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx +++ b/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?.dmdInfoId // 업데이트일경우 ? z.string().optional() // 패스워드는 선택 사항이며 길이 제한 없음 : z.string().optional() From 8fbecc41a5d9a2354c2a0c1d41d1f13b491356d9 Mon Sep 17 00:00:00 2001 From: ljpark Date: Sat, 26 Jul 2025 15:03:09 +0900 Subject: [PATCH 6/6] =?UTF-8?q?LineBarChart2=20=EB=B9=84=EC=9C=A8=EB=8C=80?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/chart/LineBarChart2.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/business_components/src/ui/chart/LineBarChart2.tsx b/packages/common/business_components/src/ui/chart/LineBarChart2.tsx index e91c41728..ff8e6b5cb 100644 --- a/packages/common/business_components/src/ui/chart/LineBarChart2.tsx +++ b/packages/common/business_components/src/ui/chart/LineBarChart2.tsx @@ -127,7 +127,7 @@ export default function LineBarchart2({ className="text-[12px] font-bold" tickCount={6} orientation="left" - domain={[0, Math.ceil(lineMaxValue * 1)+170]} + domain={[0, Math.ceil(lineMaxValue * 1)*2]} label={{ value: yFieldText, angle: -90, position: 'insideLeft', offset: -8 }} />} {/* 오른쪽 Y축: barVal */} @@ -136,7 +136,7 @@ export default function LineBarchart2({ className="text-[12px] font-bold" tickCount={6} orientation="right" - domain={[0, Math.ceil(barMaxValue * 1)+20]} + domain={[0, Math.ceil(barMaxValue * 1)*2]} label={{ value: yFieldText2, angle: -90, position: 'insideRight' }} reversed={true} />}