@finema/core 1.4.210 → 1.4.212
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/module.json
CHANGED
package/dist/module.mjs
CHANGED
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
import { computed, type PropType } from 'vue'
|
|
53
53
|
import { useElementVisibility } from '@vueuse/core'
|
|
54
54
|
import { StringHelper } from '#core/utils/StringHelper'
|
|
55
|
-
import { ref, useWatchTrue, watch } from '#imports'
|
|
55
|
+
import { ref, useWatchChange, useWatchTrue, watch } from '#imports'
|
|
56
56
|
import type { IFlexDeckOptions } from '#core/components/FlexDeck/types'
|
|
57
57
|
import Empty from '#core/components/Empty.vue'
|
|
58
58
|
|
|
@@ -125,6 +125,13 @@ const totalInnerRawData = computed((): number => {
|
|
|
125
125
|
return innerRawData.value?.length || 0
|
|
126
126
|
})
|
|
127
127
|
|
|
128
|
+
useWatchChange(
|
|
129
|
+
() => props.pageOptions?.currentPage,
|
|
130
|
+
(value: number) => {
|
|
131
|
+
page.value = value
|
|
132
|
+
}
|
|
133
|
+
)
|
|
134
|
+
|
|
128
135
|
useWatchTrue(
|
|
129
136
|
() => props.status.isSuccess,
|
|
130
137
|
() => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<FieldWrapper v-bind="wrapperProps">
|
|
3
3
|
<Datepicker
|
|
4
|
+
ref="datepicker"
|
|
4
5
|
v-model="innerValueRef"
|
|
5
6
|
:disabled="wrapperProps.isDisabled"
|
|
6
7
|
cancel-text="ยกเลิก"
|
|
@@ -52,12 +53,12 @@ const innerValueRef = ref<Date[]>([])
|
|
|
52
53
|
const format = (date: Date[]) => {
|
|
53
54
|
if (props.disabledTime) {
|
|
54
55
|
return date.length > 0
|
|
55
|
-
? TimeHelper.displayDate(date[0]) + ' - ' + TimeHelper.displayDate(date[1] ??
|
|
56
|
+
? TimeHelper.displayDate(date[0]) + ' - ' + TimeHelper.displayDate(date[1] ?? date[0])
|
|
56
57
|
: ''
|
|
57
58
|
}
|
|
58
59
|
|
|
59
60
|
return date.length > 0
|
|
60
|
-
? TimeHelper.displayDateTime(date[0]) + ' - ' + TimeHelper.displayDateTime(date[1] ??
|
|
61
|
+
? TimeHelper.displayDateTime(date[0]) + ' - ' + TimeHelper.displayDateTime(date[1] ?? date[0])
|
|
61
62
|
: ''
|
|
62
63
|
}
|
|
63
64
|
|
|
@@ -71,12 +72,12 @@ const onInput = (_value: Date[]) => {
|
|
|
71
72
|
if (props.disabledTime && !props.isReturnISO) {
|
|
72
73
|
value.value = <IDateTimeRangeResponse>{
|
|
73
74
|
start: TimeHelper.getDateFormTime(_value[0]),
|
|
74
|
-
end: TimeHelper.getDateFormTime(_value[1]),
|
|
75
|
+
end: TimeHelper.getDateFormTime(_value[1] || _value[0]),
|
|
75
76
|
}
|
|
76
77
|
} else {
|
|
77
78
|
value.value = <IDateTimeRangeResponse>{
|
|
78
79
|
start: _value[0],
|
|
79
|
-
end: _value[1],
|
|
80
|
+
end: _value[1] || _value[0],
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
83
|
}
|