Skip to content

Commit d283e70

Browse files
committed
fix(ui): agenda, day, resource and scheduler improvement updates
1 parent 9136075 commit d283e70

File tree

4 files changed

+9
-51
lines changed

4 files changed

+9
-51
lines changed

ui/src/components/QCalendarAgenda.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
// Utility
1818
import {
1919
getDayIdentifier,
20-
// isBetweenDates,
2120
parsed,
2221
parseTimestamp,
2322
today
@@ -153,15 +152,6 @@ export default defineComponent({
153152
focusValue.value = parsedValue.value
154153
focusRef.value = parsedValue.value.date
155154

156-
// const canChangeDate = computed(() => {
157-
// if (maxDaysRendered.value === 0) return true
158-
// if (endDate.value === '0000-00-00') return true
159-
// if (days.value === undefined || days.value.length === 0) return true
160-
// const start = days.value[ 0 ]
161-
// const end = days.value[ days.value.length - 1 ]
162-
// return isBetweenDates(parsedValue.value, start, end) !== true
163-
// })
164-
165155
const { renderValues } = useRenderValues(props, {
166156
parsedView,
167157
parsedValue,

ui/src/components/QCalendarDay.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
getDateTime,
2020
getDayIdentifier,
2121
getDayTimeIdentifier,
22-
isBetweenDates,
2322
parsed,
2423
parseTimestamp,
2524
today
@@ -156,15 +155,6 @@ export default defineComponent({
156155
focusValue.value = parsedValue.value
157156
focusRef.value = parsedValue.value.date
158157

159-
const canChangeDate = computed(() => {
160-
if (maxDaysRendered.value === 0) return true
161-
if (endDate.value === '0000-00-00') return true
162-
if (days.value === undefined || days.value.length === 0) return true
163-
const start = days.value[ 0 ]
164-
const end = days.value[ days.value.length - 1 ]
165-
return isBetweenDates(parsedValue.value, start, end) !== true
166-
})
167-
168158
const { renderValues } = useRenderValues(props, {
169159
parsedView,
170160
parsedValue,
@@ -1049,11 +1039,11 @@ export default defineComponent({
10491039
}
10501040

10511041
function __renderDaily () {
1052-
if (canChangeDate.value) {
1053-
const { start, end, maxDays } = renderValues.value
1042+
const { start, end, maxDays } = renderValues.value
1043+
if (startDate.value !== start.date || endDate.value !== end.date || maxDaysRendered.value !== maxDays) {
10541044
startDate.value = start.date
10551045
endDate.value = end.date
1056-
maxDaysRendered.value = maxDays
1046+
maxDaysRendered.value = maxDays
10571047
}
10581048

10591049
const hasWidth = size.width > 0

ui/src/components/QCalendarResource.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import {
1616

1717
// Utility
1818
import {
19-
// getDateTime,
2019
getDayIdentifier,
21-
// getDayTimeIdentifier,
22-
isBetweenDates,
2320
parsed,
2421
parseTimestamp,
2522
today
@@ -165,15 +162,6 @@ export default defineComponent({
165162
focusValue.value = parsedValue.value
166163
focusRef.value = parsedValue.value.date
167164

168-
const canChangeDate = computed(() => {
169-
if (maxDaysRendered.value === 0) return true
170-
if (endDate.value === '0000-00-00') return true
171-
if (days.value === undefined || days.value.length === 0) return true
172-
const start = days.value[ 0 ]
173-
const end = days.value[ days.value.length - 1 ]
174-
return isBetweenDates(parsedValue.value, start, end) !== true
175-
})
176-
177165
const { renderValues } = useRenderValues(props, {
178166
parsedView,
179167
times,
@@ -812,11 +800,11 @@ export default defineComponent({
812800
}
813801

814802
function __renderResource () {
815-
if (canChangeDate.value) {
816-
const { start, end, maxDays } = renderValues.value
803+
const { start, end, maxDays } = renderValues.value
804+
if (startDate.value !== start.date || endDate.value !== end.date || maxDaysRendered.value !== maxDays) {
817805
startDate.value = start.date
818806
endDate.value = end.date
819-
maxDaysRendered.value = maxDays
807+
maxDaysRendered.value = maxDays
820808
}
821809

822810
const hasWidth = size.width > 0

ui/src/components/QCalendarScheduler.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
// Utility
1818
import {
1919
getDayIdentifier,
20-
isBetweenDates,
2120
parsed,
2221
parseTimestamp,
2322
today
@@ -158,15 +157,6 @@ export default defineComponent({
158157
focusValue.value = parsedValue.value
159158
focusRef.value = parsedValue.value.date
160159

161-
const canChangeDate = computed(() => {
162-
if (maxDaysRendered.value === 0) return true
163-
if (endDate.value === '0000-00-00') return true
164-
if (days.value === undefined || days.value.length === 0) return true
165-
const start = days.value[ 0 ]
166-
const end = days.value[ days.value.length - 1 ]
167-
return isBetweenDates(parsedValue.value, start, end) !== true
168-
})
169-
170160
const { renderValues } = useRenderValues(props, {
171161
parsedView,
172162
parsedValue,
@@ -1196,11 +1186,11 @@ export default defineComponent({
11961186
}
11971187

11981188
function __renderScheduler () {
1199-
if (canChangeDate.value) {
1200-
const { start, end, maxDays } = renderValues.value
1189+
const { start, end, maxDays } = renderValues.value
1190+
if (startDate.value !== start.date || endDate.value !== end.date || maxDaysRendered.value !== maxDays) {
12011191
startDate.value = start.date
12021192
endDate.value = end.date
1203-
maxDaysRendered.value = maxDays
1193+
maxDaysRendered.value = maxDays
12041194
}
12051195

12061196
const hasWidth = size.width > 0

0 commit comments

Comments
 (0)