@@ -13,6 +13,7 @@ import { useModal } from "../../hooks/common/modal/useModal";
13
13
import { MOUSE_KEY } from "../../constants/event" ;
14
14
import ConfirmModal from "../common/ConfirmModal" ;
15
15
import TrashCan from "../../assets/icons/trash-can.svg?react" ;
16
+ import isIntegerOrOneDecimalPlace from "../../utils/isIntegerOrOneDecimalPlace" ;
16
17
17
18
const TaskBlock = ( {
18
19
id,
@@ -64,7 +65,7 @@ const TaskBlock = ({
64
65
const { open, close } = useModal ( ) ;
65
66
66
67
const assignedMemberName = useMemo ( ( ) => {
67
- if ( assignedMemberId === null ) {
68
+ if ( assignedMemberId === null || myInfo . id === - 1 ) {
68
69
return "" ;
69
70
}
70
71
@@ -89,7 +90,10 @@ const TaskBlock = ({
89
90
emitTaskUpdateEvent ( { id, title : data as string } ) ;
90
91
}
91
92
function updateExpectedTime < T > ( data : T ) {
92
- if ( ! data || data === String ( expectedTime ) ) {
93
+ if (
94
+ data === String ( expectedTime ) ||
95
+ ( data === "" && expectedTime === null )
96
+ ) {
93
97
return ;
94
98
}
95
99
@@ -98,7 +102,12 @@ const TaskBlock = ({
98
102
return ;
99
103
}
100
104
101
- if ( ! isNaN ( Number ( data ) ) && ( Number ( data ) >= 100 || Number ( data ) < 0 ) ) {
105
+ if (
106
+ ! isNaN ( Number ( data ) ) &&
107
+ ( Number ( data ) >= 100 ||
108
+ Number ( data ) < 0 ||
109
+ ! isIntegerOrOneDecimalPlace ( Number ( data ) ) )
110
+ ) {
102
111
alert (
103
112
"예상 시간은 0이상, 100미만의 정수 또는 소수점 한 자릿수여야 합니다."
104
113
) ;
@@ -108,7 +117,7 @@ const TaskBlock = ({
108
117
emitTaskUpdateEvent ( { id, expectedTime : Number ( data ) } ) ;
109
118
}
110
119
function updateActualTime < T > ( data : T ) {
111
- if ( ! data || data === String ( actualTime ) ) {
120
+ if ( data === String ( actualTime ) || ( data === "" && actualTime === null ) ) {
112
121
return ;
113
122
}
114
123
@@ -117,7 +126,12 @@ const TaskBlock = ({
117
126
return ;
118
127
}
119
128
120
- if ( ! isNaN ( Number ( data ) ) && ( Number ( data ) >= 100 || Number ( data ) < 0 ) ) {
129
+ if (
130
+ ! isNaN ( Number ( data ) ) &&
131
+ ( Number ( data ) >= 100 ||
132
+ Number ( data ) < 0 ||
133
+ ! isIntegerOrOneDecimalPlace ( Number ( data ) ) )
134
+ ) {
121
135
alert (
122
136
"실제 시간은 0이상, 100미만의 정수 또는 소수점 한 자릿수여야 합니다."
123
137
) ;
@@ -177,7 +191,7 @@ const TaskBlock = ({
177
191
>
178
192
< p className = "w-[4rem]" > Task-{ displayId } </ p >
179
193
< div
180
- className = "w-[25rem] min-h-[1.5rem] hover:cursor-pointer"
194
+ className = "w-[25rem] min-h-[1.5rem] hover:cursor-pointer truncate "
181
195
ref = { titleRef }
182
196
onClick = { ( ) => handleTitleUpdating ( true ) }
183
197
>
@@ -189,15 +203,19 @@ const TaskBlock = ({
189
203
type = "text"
190
204
/>
191
205
) : (
192
- < span > { title } </ span >
206
+ < span title = { title } > { title } </ span >
193
207
) }
194
208
</ div >
195
209
< div
196
210
className = "w-12 min-h-[1.5rem] hover:cursor-pointer relative"
197
211
onClick = { handleAssignedMemberUpdateOpen }
198
212
>
199
- < div className = "w-full min-h-[1.5rem]" ref = { assignedMemberRef } >
200
- { assignedMemberId && < p > { assignedMemberName } </ p > }
213
+ < div className = "w-full min-h-[1.5rem] " ref = { assignedMemberRef } >
214
+ { assignedMemberId && (
215
+ < p className = "truncate" title = { assignedMemberName } >
216
+ { assignedMemberName }
217
+ </ p >
218
+ ) }
201
219
</ div >
202
220
{ assignedMemberUpdating && (
203
221
< AssignedMemberDropdown onOptionClick = { updateAssignedMember } />
0 commit comments