Merge remote-tracking branch 'origin/iipbs/dm/dev'

apps/dm/components/ui/sdmInfoInsertForm/component.tsx

@@ -1,5 +1,4 @@
 import ModalSimilarPage from "@/app/(base-layout)/pages/sdmMng/sdmInfoInsert/modalSimilar/page";
-import type { FormData } from "@/app/(base-layout)/pages/sdmMng/sdmInfoInsert/page";
 import { useDmStore } from "@/app/store";
 import {
   CANDIDATE,
@@ -25,15 +24,16 @@ import SearchInputText from "../common/searhDemandInput/component";
 import React from "react";
 import { sanitizeInput } from "../common/utils/utils";
 import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
+import type { SdmInfoFormData } from "@/app/store/sdmMng";
 
 export interface SdmInfoRegFormProps {
-  form: UseFormReturn<FormData>;
+  form: UseFormReturn<SdmInfoFormData>;
   onCheckboxChange?: (checked: boolean) => void;
   facilityName?: string;
 }
 
 type FieldComponent = (
-  field: ControllerRenderProps<FormData, keyof FormData>
+  field: ControllerRenderProps<SdmInfoFormData, keyof SdmInfoFormData>
 ) => JSX.Element;
 
 export function SdmInfoRegForm({
@@ -159,11 +159,9 @@ export function SdmInfoRegForm({
     // Apply default values
     const defaults = defaultRules[usePurpose];
 
-    console.log("usePurpose", usePurpose);
-    console.log("defaults", defaults);
     if (defaults) {
       Object.entries(defaults).forEach(([field, value]) => {
-        form.setValue(field as keyof FormData, value, { shouldDirty: true });
+        form.setValue(field as keyof SdmInfoFormData, value, { shouldDirty: true });
       });
     }
   }, [form.getValues("usePurpose")]);
@@ -178,7 +176,7 @@ export function SdmInfoRegForm({
   );
 
   const formFields: Array<{
-    name: keyof FormData;
+    name: keyof SdmInfoFormData;
     label: string;
     component: FieldComponent | undefined;
     formIndex: number;
@@ -348,9 +346,7 @@ export function SdmInfoRegForm({
   const normalFields = formFields.filter(
     (f) => f.formIndex === 0 && f.component
   );
-  // const groupFields = formFields.filter(
-  //   (f) => f.formIndex === 1 && f.component
-  // );
+
   const candidateFields = formFields.filter(
     (f) => f.formIndex === 2 && f.component
   );
@@ -365,8 +361,13 @@ export function SdmInfoRegForm({
             name={name}
             render={({ field }) =>
               name === "money" ? (
-                // component(field)
-                <FormUi label={label + "*"}>{component(field)}</FormUi>
+                <div>
+                  <Label className="text-black"  >
+                    희망단가*
+                  </Label>
+                     { component(field)}
+                </div>
+                // <FormUi label={label + "*"}>{component(field)}</FormUi>
               ) : (
                 <AccessibleFormField
                   field={field}
@@ -771,7 +772,7 @@ export function SdmInfoRegForm({
                     onSelectValue={(val: string | number) => {
                       field.onChange(val.toString());
                     }}
-                    value={field.value || "불쾌하지않을것"}
+                    value={field.value }
                     readOnly={isDisabled}
                     onBlur={field.onBlur}
                     ref={field.ref}

apps/dm/components/ui/sdmLoginForm/component.tsx

@@ -4,8 +4,9 @@ import type { DemandCompType } from "@common/business_components/ui/sdmInsertFor
 import { Button, Input } from "@common/components";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { sha512 } from 'js-sha512';
-import { useEffect, useState, useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { FormProvider, useForm, type ControllerRenderProps } from "react-hook-form";
+import toast from "react-hot-toast";
 import * as z from "zod";
 
 export function SdmLoginForm() {
@@ -15,10 +16,10 @@ export function SdmLoginForm() {
   const formatBusinessNumber = (value: string) => {
     // 숫자만 추출
     const digitsOnly = value.replace(/\D/g, "");
-    
+
     // 10자리까지만 처리
     const limitedDigits = digitsOnly.slice(0, 10);
-    
+
     // 3-2-5 형식으로 포맷팅
     if (limitedDigits.length <= 3) {
       return limitedDigits;
@@ -28,33 +29,33 @@ export function SdmLoginForm() {
       return `${limitedDigits.slice(0, 3)}-${limitedDigits.slice(3, 5)}-${limitedDigits.slice(5)}`;
     }
   };
-  
+
   // 스키마를 useMemo로 최적화
   const sdmLoginFormSchema = useMemo(() => z.object({
     dmdInfoId: z.string()
       .min(1, "사업자등록번호를 입력해주세요")
       .regex(/^\d{10}$/, "사업자등록번호는 10자리 숫자만 입력 가능합니다"),
-    bznmTotNo: isBznmTotNoDisabled 
+    bznmTotNo: isBznmTotNoDisabled
       ? z.string().optional()
       : z.string().length(4, "종사업자등록번호는 4자리 숫자만 입력 가능합니다"),
     password: z.string()
       .min(1, "비밀번호를 입력해주세요")
-      .min(8, "비밀번호는 8자 이상 입력해주세요") 
+      .min(8, "비밀번호는 8자 이상 입력해주세요")
       .max(16, "비밀번호는 16자 이내로 입력해주세요"),
     rgtr: z.string().optional(),
     dmdAplyPswd: z.string().optional(),
   }), [isBznmTotNoDisabled]);
 
-  type FormData = z.infer<typeof sdmLoginFormSchema>;
-  type FieldComponent = (field: ControllerRenderProps<FormData, keyof FormData>) => JSX.Element;
-  
+  type SdmLoginForm = z.infer<typeof sdmLoginFormSchema>;
+  type FieldComponent = (field: ControllerRenderProps<SdmLoginForm, keyof SdmLoginForm>) => JSX.Element;
+
   const formSchema = sdmLoginFormSchema;
 
   useEffect(() => {
     initializeCommonData();
   }, [initializeCommonData]);
 
-  const defaultValues: FormData = {
+  const defaultValues: SdmLoginForm = {
     dmdInfoId: '',
     bznmTotNo: '',
     password: '',
@@ -62,7 +63,7 @@ export function SdmLoginForm() {
     dmdAplyPswd: '',
   };
 
-  const form = useForm<FormData>({
+  const form = useForm<SdmLoginForm>({
     resolver: zodResolver(formSchema),
     defaultValues,
     mode: "onChange",
@@ -72,6 +73,26 @@ export function SdmLoginForm() {
     setIsBznmTotNoDisabled(checked);
   };
 
+  const initPassword = () => {
+    toast(
+      (t) => (
+        <div className="flex flex-col items-center">
+          <div className="text-2xl mb-2">
+            관리자(031-0000-0000)에게 비밀번호 초기화 요청을 유선으로 하시기 바랍니다.
+          </div>
+          <Button size={"sm"} onClick={() => toast.dismiss(t.id)}>
+            확인
+          </Button>
+        </div>
+      ),
+      {
+        id: "pwd-reset",
+        duration: Infinity,
+        position: "top-center",
+      }
+    );
+  }
+
   const handleLogin = () => {
     const data = form.getValues();
     const passwordStr = sha512.hex(data.password)
@@ -82,61 +103,61 @@ export function SdmLoginForm() {
     }
     actionLogin(param as unknown as DemandCompType);
   };
-  
+
   const formFields: Array<{
-    name: keyof FormData;
+    name: keyof SdmLoginForm;
     label: string;
     component: FieldComponent | undefined;
   }> = [
-    {
-      name: "dmdInfoId",
-      label: "사업자등록번호",
-      component: (field) => (
-        <Input 
-          placeholder="사업자등록번호를 입력하세요"
-          type="text"
-          className="!mt-5 !mb-5 !text-xl text-gray-600"
-          {...field}
-          value={formatBusinessNumber(field.value as string)}
-          onChange={(e) => {
-            const dmdId = e.target.value.replace(/\D/g, "").slice(0, 10);
-            field.onChange(dmdId);
-          }}
-        />
-      )
-    },
-    {
-      name: "bznmTotNo",
-      label: BZNM_TOT_NO || "종사업자등록번호",
-      component: (field) => (
-        <FormUi 
-          label="종사업자등록번호"
-          onCheckboxChange={handleCheckboxChange}
-          isDisabled={isBznmTotNoDisabled}
-        >
-          <Input 
-            placeholder="여러사업장이 있을 경우 입력해주세요" 
+      {
+        name: "dmdInfoId",
+        label: "사업자등록번호",
+        component: (field) => (
+          <Input
+            placeholder="사업자등록번호를 입력하세요"
             type="text"
-            className="!mt-5 !text-xl text-gray-600"
-            disabled={isBznmTotNoDisabled}
+            className="!mt-5 !mb-5 !text-xl text-gray-600"
+            {...field}
+            value={formatBusinessNumber(field.value as string)}
+            onChange={(e) => {
+              const dmdId = e.target.value.replace(/\D/g, "").slice(0, 10);
+              field.onChange(dmdId);
+            }}
+          />
+        )
+      },
+      {
+        name: "bznmTotNo",
+        label: BZNM_TOT_NO || "종사업자등록번호",
+        component: (field) => (
+          <FormUi
+            label="종사업자등록번호"
+            onCheckboxChange={handleCheckboxChange}
+            isDisabled={isBznmTotNoDisabled}
+          >
+            <Input
+              placeholder="여러사업장이 있을 경우 입력해주세요"
+              type="text"
+              className="!mt-5 !text-xl text-gray-600"
+              disabled={isBznmTotNoDisabled}
+              {...field}
+            />
+          </FormUi>
+        )
+      },
+      {
+        name: "password",
+        label: "비밀번호",
+        component: (field) => (
+          <Input
+            placeholder="비밀번호를 입력하세요"
+            type="password"
+            className="!mt-5 !mb-5 !text-xl text-gray-600"
             {...field}
           />
-        </FormUi>
-      )
-    },
-    {
-      name: "password",
-      label: "비밀번호",
-      component: (field) => (
-        <Input 
-          placeholder="비밀번호를 입력하세요" 
-          type="password"
-          className="!mt-5 !mb-5 !text-xl text-gray-600"
-          {...field} 
-        />
-      )
-    }
-  ];
+        )
+      }
+    ];
 
   return (
     <>
@@ -148,11 +169,11 @@ export function SdmLoginForm() {
               control={form.control}
               name={name}
               render={({ field }) => (
-                label==='종사업자등록번호' ? 
-                  <> 
+                label === '종사업자등록번호' ?
+                  <>
                     {component && component(field)}
                   </>
-                : <FormUi label={label}>
+                  : <FormUi label={label}>
                     {component && component(field)}
                   </FormUi>
               )}
@@ -160,12 +181,15 @@ export function SdmLoginForm() {
           ))}
         </FormProvider>
         <div className="flex justify-center pt-4">
-          <Button 
-            onClick={handleLogin} 
-            className="w-32 bg-blue-600 hover:bg-blue-700 text-white font-semibold py-2 px-4 rounded-md transition-colors duration-200"
-          >
-            로그인
-          </Button>
+          <div className="flex flex-col items-center">
+            <Button
+              onClick={handleLogin}
+              className="w-32 bg-blue-600 hover:bg-blue-700 text-white font-semibold py-2 px-4 rounded-md transition-colors duration-200"
+            >
+              로그인
+            </Button>
+            <div className="text-xl mt-2 text-gray-400 cursor-pointer" onClick={initPassword}>비밀번호 초기화 요청</div>
+          </div>
         </div>
       </div>
     </>