- | {getMessage('join.sub2.fax')} |
+ {getMessage('join.sub2.fax')}* |
{
+ 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
diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index ee2fab4b..9107dde0 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/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;
+ })()}
/>
) : (
|