verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 107 Releases Wiki Activity

#6917 - inputDate_inputTime_improviments #552

Merged
alexm merged 8 commits from 6917-inputDate_inputTime_improviments into test 2024-07-16 11:12:55 +00:00
Conversation 1 Commits 8 Files Changed 8 +20 -4
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ccf515509 - Show all commits

2
src/components/VnTable/VnColumn.vue
View File

@ -78,7 +78,7 @@ const defaultComponents = {
date: {
component: markRaw(VnInputDate),
attrs: {
readonly: true,
readonly: !$props.isEditable,
disable: !$props.isEditable,
style: 'min-width: 125px',
class: 'fit',

22
src/components/common/VnInputTime.vue
View File

@ -41,11 +41,16 @@ const formattedTime = computed({
let time = value;
if (time) {
if (time?.length > 5) time = dateToTime(time);
else {
time = time.padEnd(5, '0');
if (!time.includes(':'))
time = time.substring(0, 2) + ':' + time.substring(3, 4);
}
if (!props.timeOnly) {
alexm marked this conversation as resolved
jsegarra commented 2024-07-16 09:45:33 +00:00
Review
Copy Link

(comentario/sugerncia) Okey, con regExp podria ser asi '1200'.replace(/^(\d{2})(\d{2})/, "$1:$2")

(comentario/sugerncia) Okey, con regExp podria ser asi '1200'.replace(/^(\d{2})(\d{2})/, "$1:$2")
const hours = time.split(':');
const date = new Date(model.value);
date.setHours(hours[0], hours[1], 0);
time = date.toISOString();
date.setHours(hours[0] ?? 0, hours[1] ?? 0, 0);
time = date?.toISOString();
}
}
model.value = time;
@ -74,6 +79,7 @@ watch(
:class="{ required: $attrs.required }"
style="min-width: 100px"
:rules="$attrs.required ? [requiredFieldRule] : null"
@click="isPopupOpen = false"
jsegarra commented 2024-07-16 09:30:34 +00:00
Review
Copy Link

Porque hay 2?

Porque hay 2?
alexm commented 2024-07-16 09:57:17 +00:00
Review
Copy Link

Con 1 no funcionaba entiendo que vue aún no ha actualizado el valor con 1 solo

Con 1 no funcionaba entiendo que vue aún no ha actualizado el valor con 1 solo
>
<template #append>
<QIcon
@ -90,7 +96,12 @@ watch(
isPopupOpen = false;
"
/>
<QIcon name="Schedule" class="cursor-pointer" />
<QIcon
name="Schedule"
class="cursor-pointer"
@click="isPopupOpen = !isPopupOpen"
:title="t('Open time')"
/>
</template>
<QMenu
transition-show="scale"
@ -99,6 +110,7 @@ watch(
anchor="bottom left"
self="top start"
:no-focus="true"
:no-parent-event="true"
>
<QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
</QMenu>
@ -114,3 +126,7 @@ watch(
border-style: solid;
}
</style>
<i18n>
es:
Open time: Abrir tiempo
</i18n>