Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1571] TimePicker > 외부에서의 modelValue 값 변화를 감지하지 못하는 문제 수정 #1572

Merged
merged 2 commits into from
Jan 12, 2024
Merged

[#1571] TimePicker > 외부에서의 modelValue 값 변화를 감지하지 못하는 문제 수정 #1572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b0226d
[#1571] TimePicker > 외부에서의 modelValue 값 변화를 감지하지 못하는 문제 수정 (#1571)
chichoon Jan 9, 2024
ca065e8
[#1571] TimePicker > 외부에서의 modelValue 값 변화를 감지하지 못하는 문제 수정 (#1571)
chichoon Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 44 additions & 50 deletions src/components/timePicker/TimePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="ev-time-picker-wrapper"
>
<input
v-model="startTime"
v-model="time[0]"
class="ev-input"
:disabled="disabled"
:readonly="readonly"
Expand Down Expand Up @@ -45,7 +45,7 @@
class="ev-time-picker-wrapper"
>
<input
v-model="endTime"
v-model="time[1]"
class="ev-input"
:disabled="disabled"
:readonly="readonly"
Expand Down Expand Up @@ -105,7 +105,7 @@
</template>

<script>
import { ref, reactive } from 'vue';
import { ref, reactive, computed } from 'vue';

export default {
name: 'EvTimePicker',
Expand All @@ -115,7 +115,7 @@ export default {
default: '',
validator: (time) => {
const timeRegexExp = /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/;
if (Array.isArray(time) && !timeRegexExp.test(time[0]) && timeRegexExp.test(time[1])) {
if (Array.isArray(time) && (!timeRegexExp.test(time[0]) || !timeRegexExp.test(time[1]))) {
// range mode
console.warn('Please check the time format in the Timepicker.');
return false;
Expand Down Expand Up @@ -152,58 +152,60 @@ export default {
change: null,
},
setup(props, { emit }) {
let startTime = ref('00:00');
let endTime = ref('23:59');
let time = ref('00:00');
const time = computed({
get: () => props.modelValue,
set: (value) => {
if (props.type === 'range') {
if (Array.isArray(value)) {
const startTime = (value[0] > value[1] ? '00:00' : value[0]);
const endTime = (startTime.value > value[1] ? '23:59' : value[1]);

emit('update:modelValue', [startTime, endTime]);
}
} else {
emit('update:modelValue', value);
}
},
}); // <string | string[]>

const previousValue = ref(
Array.isArray(time.value) ? [`${time.value[0]}`, `${time.value[1]}`] : `${time.value}`,
); // <string | string[]>

const isWrongType = reactive({
single: false,
rangeStart: false,
rangeEnd: false,
});

if (props.type === 'range') {
if (Array.isArray(props.modelValue)) {
startTime = ref(props.modelValue[0] > props.modelValue[1] ? '00:00' : props.modelValue[0]);
endTime = ref(startTime.value > props.modelValue[1] ? '23:59' : props.modelValue[1]);
}
emit('update:modelValue', [startTime.value, endTime.value]);
} else {
time = ref(props.modelValue || '00:00');
emit('update:modelValue', time.value);
}

const previousValue = reactive({
singleTime: time.value,
rangeStartTime: startTime.value,
rangeEndTime: endTime.value,
});

const validTimeExp = (timeExp) => {
const timeRegexExp = /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/;
return timeRegexExp.test(timeExp);
};

const setValidStartTime = () => {
if (!validTimeExp(startTime.value)) {
startTime.value = previousValue.rangeStartTime;
if (!Array.isArray(time.value)) return;
if (!validTimeExp(time.value[0])) {
time.value[0] = previousValue.value[0];
}
if (endTime.value && (startTime.value > endTime.value)) {
startTime.value = endTime.value;
if (time.value[1] && (time.value[0] > time.value[1])) {
time.value[0] = time.value[1];
}
previousValue.rangeStartTime = startTime.value;
previousValue.value[0] = time.value[0];
};

const setValidEndTime = () => {
if (!validTimeExp(endTime.value)) {
endTime.value = previousValue.rangeEndTime;
if (!Array.isArray(time.value)) return;
if (!validTimeExp(time.value[1])) {
time.value[1] = previousValue.value[1];
}
if (startTime.value && (startTime.value > endTime.value)) {
endTime.value = previousValue.rangeEndTime;
if (startTime.value > previousValue.rangeEndTime) {
endTime.value = startTime.value;
if (time.value[0] && (time.value[0] > time.value[1])) {
time.value[1] = previousValue.value[1];
if (time.value[0] > previousValue.value[1]) {
time.value[1] = time.value[0];
}
}
previousValue.rangeEndTime = endTime.value;
previousValue.value[1] = time.value[1];
};

// startTime event for range type
Expand All @@ -218,14 +220,12 @@ export default {
const changeStartTime = (e) => {
setValidStartTime();
isWrongType.rangeStart = false;
emit('update:modelValue', [startTime.value, endTime.value]);
emit('change', e, [startTime.value, endTime.value]);
emit('change', e, time.value);
};

const clearStartTime = () => {
startTime.value = '';
time.value[0] = '';
isWrongType.rangeStart = true;
emit('update:modelValue', [startTime.value, endTime.value]);
};

// endTime event for range type
Expand All @@ -240,14 +240,12 @@ export default {
const changeEndTime = (e) => {
setValidEndTime();
isWrongType.rangeEnd = false;
emit('update:modelValue', [startTime.value, endTime.value]);
emit('change', e, [startTime.value, endTime.value]);
emit('change', e, time.value);
};

const clearEndTime = () => {
endTime.value = '';
time.value[1] = '';
isWrongType.rangeEnd = true;
emit('update:modelValue', [startTime.value, endTime.value]);
};

// event for single type
Expand All @@ -261,26 +259,22 @@ export default {

const changeTime = (e) => {
if (!validTimeExp(time.value)) {
time.value = previousValue.singleTime;
time.value = previousValue.value;
} else {
previousValue.singleTime = time.value;
previousValue.value = time.value;
}

isWrongType.single = !validTimeExp(time.value);

emit('update:modelValue', time.value);
emit('change', e, time.value);
};

const clearContents = () => {
time.value = '';
isWrongType.single = true;
emit('update:modelValue', time.value);
};

return {
startTime,
endTime,
time,
isWrongType,
previousValue,
Expand Down