Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into dev

src/components/common/input/CalcInput.jsx

@@ -63,6 +63,33 @@ export const CalculatorInput = forwardRef(
       const calculator = calculatorRef.current
       let newDisplayValue = ''
 
+      // 블록 지정(Selection) 확인 및 처리
+      if (inputRef.current) {
+        const { selectionStart, selectionEnd } = inputRef.current
+        // 텍스트 전체 또는 일부가 블록 지정된 경우
+        if (selectionStart !== null && selectionEnd !== null && selectionStart !== selectionEnd) {
+          // 연산 중이 아닐 때만 전체 초기화 후 입력 처리 (계산기 모드 유지를 위해)
+          if (!hasOperation) {
+            calculator.currentOperand = num.toString()
+            calculator.previousOperand = ''
+            calculator.operation = undefined
+            calculator.shouldResetDisplay = false
+
+            newDisplayValue = calculator.currentOperand
+            setDisplayValue(newDisplayValue)
+            onChange(newDisplayValue)
+
+            requestAnimationFrame(() => {
+              if (inputRef.current) {
+                inputRef.current.focus()
+                inputRef.current.setSelectionRange(newDisplayValue.length, newDisplayValue.length)
+              }
+            })
+            return // 블록 처리 로직 완료 후 종료
+          }
+        }
+      }
+
       // maxLength 체크
       if (maxLength > 0) {
         const currentLength = (calculator.currentOperand || '').length + (calculator.previousOperand || '').length + (calculator.operation || '').length

src/components/estimate/Estimate.jsx

@@ -2039,7 +2039,11 @@ export default function Estimate({}) {
                                         }
                                       }}
                                       menuPlacement={'auto'}
-                                      getOptionLabel={(x) => x.itemName + ' (' + x.itemNo + ')'}
+                                      getOptionLabel={(x) => {
+                                        // 메뉴 리스트에 보이는 텍스트 디코딩
+                                        const doc = new DOMParser().parseFromString(x.itemName, 'text/html');
+                                        return (doc.documentElement.textContent || x.itemName) + ' (' + x.itemNo + ')';
+                                      }}
                                       getOptionValue={(x) => x.itemNo}
                                       components={{
                                         SingleValue: ({ children, ...props }) => {
@@ -2048,13 +2052,21 @@ export default function Estimate({}) {
                                       }}
                                       isClearable={false}
                                       isDisabled={!!item?.paDispOrder}
-                                      value={displayItemList.filter(function (option) {
-                                        if (item.itemNo === '') {
-                                          return false
-                                        } else {
-                                          return option.itemId === item.itemId
+                                      value={(() => {
+                                        const selectedOption = displayItemList.find((option) => {
+                                          return item.itemNo !== '' && option.itemId === item.itemId;
+                                        });
+
+                                        if (selectedOption) {
+                                          // 현재 선택된 값의 itemName을 실시간으로 디코딩하여 전달
+                                          const doc = new DOMParser().parseFromString(selectedOption.itemName, 'text/html');
+                                          return {
+                                            ...selectedOption,
+                                            itemName: doc.documentElement.textContent || selectedOption.itemName
+                                          };
                                         }
-                                      })}
+                                        return null;
+                                      })()}
                                     />
                                   ) : (
                                     <Select

src/components/estimate/popup/DocDownOptionPop.jsx

@@ -8,7 +8,7 @@ import { usePathname, useSearchParams } from 'next/navigation'
 import { QcastContext } from '@/app/QcastProvider'
 import { sessionStore } from '@/store/commonAtom'
 
-export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDownPopLockFlg }) {
+export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDownPopLockFlg, createStoreId = '' }) {
   const { setIsGlobalLoading } = useContext(QcastContext)
 
   const { getMessage } = useMessage()
@@ -70,6 +70,8 @@ export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDown
       pwrGnrSimType: 'D', //default 화면에 안보여줌
       userId: sessionState.userId ? sessionState.userId : "",
       saleStoreId: sessionState.storeId ? sessionState.storeId : "",
+      storeLvl: sessionState.storeLvl,
+      createStoreId: createStoreId ? createStoreId : '',
     }
 
     const options = { responseType: 'blob' }

src/components/management/StuffDetail.jsx

@@ -54,6 +54,8 @@ export default function StuffDetail() {
   const globalLocaleState = useRecoilValue(globalLocaleStore)
   const ref = useRef()
   const { get, promiseGet, del, promisePost, promisePut } = useAxios(globalLocaleState)
+  const [createSaleStoreId, setCreateSaleStoreId] = useState('')
+
   //form
   const formInitValue = {
     // 물건번호 T...(임시) S...(진짜)
@@ -350,6 +352,9 @@ export default function StuffDetail() {
       promiseGet({ url: `/api/object/${objectNo}/detail` }).then((res) => {
         setIsGlobalLoading(false)
         if (res.status === 200) {
+
+          setCreateSaleStoreId(res?.data?.createSaleStoreId);
+
           if (res?.data?.createSaleStoreId === 'T01') {
             if (session?.storeId !== 'T01') {
               setShowButton('none')
@@ -2936,7 +2941,7 @@ export default function StuffDetail() {
         <WindSelectPop setShowWindSpeedButtonValid={setShowWindSpeedButtonValid} prefName={form.watch('prefName')} windSpeedInfo={setWindSppedInfo} />
       )}
 
-      {estimatePopupOpen && <DocDownOptionPop planNo={popPlanNo} setEstimatePopupOpen={setEstimatePopupOpen} />}
+      {estimatePopupOpen && <DocDownOptionPop planNo={popPlanNo} setEstimatePopupOpen={setEstimatePopupOpen} createStoreId={createSaleStoreId}/>}
     </>
   )
 }