111
This commit is contained in:
@@ -586,7 +586,6 @@
|
||||
this.tempSingleDate = this.calendar.fullDate
|
||||
const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
|
||||
const afterDate = new Date(this.cale.multipleStatus.after).getTime()
|
||||
// 如果先选择结束日期,后选择开始日期,需要交换
|
||||
if (beforeDate > afterDate && afterDate) {
|
||||
this.tempRange.before = this.cale.multipleStatus.after
|
||||
this.tempRange.after = this.cale.multipleStatus.before
|
||||
|
||||
@@ -2,22 +2,24 @@
|
||||
<view class="uni-date">
|
||||
<view class="uni-date-editor" @click="show">
|
||||
<slot>
|
||||
<view
|
||||
class="uni-date-editor--x"
|
||||
:class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}"
|
||||
>
|
||||
<view class="uni-date-editor--x"
|
||||
:class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}">
|
||||
<view v-if="!isRange" class="uni-date-x uni-date-single">
|
||||
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
|
||||
<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
|
||||
</view>
|
||||
|
||||
<view v-else class="uni-date-x uni-date-range">
|
||||
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
|
||||
<view class="uni-date__x-input text-center">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
|
||||
<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
|
||||
<view class="uni-date__x-input text-center">
|
||||
{{ displayRangeValue.startDate || startPlaceholderText }}
|
||||
</view>
|
||||
|
||||
<view class="range-separator">{{rangeSeparator}}</view>
|
||||
<view class="range-separator">{{rangeSeparator}}</view>
|
||||
|
||||
<view class="uni-date__x-input text-center">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
|
||||
<view class="uni-date__x-input text-center">
|
||||
{{ displayRangeValue.endDate || endPlaceholderText }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
|
||||
@@ -38,16 +40,16 @@
|
||||
:placeholder="selectDateText" />
|
||||
|
||||
<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
|
||||
:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
|
||||
<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
|
||||
:disabled="!inputDate" />
|
||||
:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond"
|
||||
style="width: 100%;">
|
||||
<input class="uni-date__input text-center" type="text" v-model="pickerTime"
|
||||
:placeholder="selectTimeText" :disabled="!inputDate" />
|
||||
</time-picker>
|
||||
</view>
|
||||
|
||||
<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
|
||||
:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange"
|
||||
:default-value="defaultValue"
|
||||
style="padding: 0 8px;" />
|
||||
:default-value="defaultValue" style="padding: 0 8px;" />
|
||||
|
||||
<view v-if="hasTime" class="popup-x-footer">
|
||||
<text class="confirm-text" @click="confirmSingleChange">{{okText}}</text>
|
||||
@@ -58,18 +60,18 @@
|
||||
<view class="uni-popper__arrow"></view>
|
||||
<view v-if="hasTime" class="popup-x-header uni-date-changed">
|
||||
<view class="popup-x-header--datetime">
|
||||
<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
|
||||
:placeholder="startDateText" />
|
||||
<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
|
||||
:placeholder="startDateText" />
|
||||
|
||||
<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime" :border="false"
|
||||
:disabled="!tempRange.startDate" :hideSecond="hideSecond">
|
||||
<input class="uni-date__input uni-date-range__input" type="text"
|
||||
v-model="tempRange.startTime" :placeholder="startTimeText"
|
||||
:disabled="!tempRange.startDate" />
|
||||
</time-picker>
|
||||
</view>
|
||||
<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime"
|
||||
:border="false" :disabled="!tempRange.startDate" :hideSecond="hideSecond">
|
||||
<input class="uni-date__input uni-date-range__input" type="text"
|
||||
v-model="tempRange.startTime" :placeholder="startTimeText"
|
||||
:disabled="!tempRange.startDate" />
|
||||
</time-picker>
|
||||
</view>
|
||||
|
||||
<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
|
||||
<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
|
||||
|
||||
<view class="popup-x-header--datetime">
|
||||
<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
|
||||
@@ -85,8 +87,8 @@
|
||||
|
||||
<view class="popup-x-body">
|
||||
<Calendar ref="left" :showMonth="false" :start-date="calendarRange.startDate"
|
||||
:end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus"
|
||||
@change="leftChange" @firstEnterCale="updateRightCale" style="padding: 0 8px;" />
|
||||
:end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus"
|
||||
@change="leftChange" @firstEnterCale="updateRightCale" style="padding: 0 8px;" />
|
||||
<Calendar ref="right" :showMonth="false" :start-date="calendarRange.startDate"
|
||||
:end-date="calendarRange.endDate" :range="true" @change="rightChange"
|
||||
:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
|
||||
@@ -102,8 +104,7 @@
|
||||
|
||||
<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
|
||||
:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
|
||||
:startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder"
|
||||
:default-value="defaultValue"
|
||||
:startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder" :default-value="defaultValue"
|
||||
:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
|
||||
:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" />
|
||||
</view>
|
||||
@@ -133,9 +134,19 @@
|
||||
**/
|
||||
import Calendar from './calendar.vue'
|
||||
import TimePicker from './time-picker.vue'
|
||||
import { initVueI18n } from '@dcloudio/uni-i18n'
|
||||
import {
|
||||
initVueI18n
|
||||
} from '@dcloudio/uni-i18n'
|
||||
import i18nMessages from './i18n/index.js'
|
||||
import { getDateTime, getDate, getTime, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat } from './util'
|
||||
import {
|
||||
getDateTime,
|
||||
getDate,
|
||||
getTime,
|
||||
getDefaultSecond,
|
||||
dateCompare,
|
||||
checkDate,
|
||||
fixIosDateFormat
|
||||
} from './util'
|
||||
|
||||
export default {
|
||||
name: 'UniDatetimePicker',
|
||||
@@ -188,7 +199,7 @@
|
||||
isEmitValue: false,
|
||||
isPhone: false,
|
||||
isFirstShow: true,
|
||||
i18nT: () => {}
|
||||
i18nT: () => {}
|
||||
}
|
||||
},
|
||||
props: {
|
||||
@@ -221,7 +232,7 @@
|
||||
default: ''
|
||||
},
|
||||
startPlaceholder: {
|
||||
type: String,
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
endPlaceholder: {
|
||||
@@ -248,16 +259,16 @@
|
||||
type: [Boolean],
|
||||
default: false
|
||||
},
|
||||
defaultValue: {
|
||||
type: [String, Object, Array],
|
||||
default: ''
|
||||
}
|
||||
defaultValue: {
|
||||
type: [String, Object, Array],
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
type: {
|
||||
immediate: true,
|
||||
handler(newVal) {
|
||||
this.hasTime = newVal.indexOf('time') !== -1
|
||||
this.hasTime = newVal.indexOf('time') !== -1
|
||||
this.isRange = newVal.indexOf('range') !== -1
|
||||
}
|
||||
},
|
||||
@@ -348,9 +359,9 @@
|
||||
selectDateText() {
|
||||
return this.i18nT("uni-datetime-picker.selectDate")
|
||||
},
|
||||
selectDateTimeText() {
|
||||
return this.i18nT("uni-datetime-picker.selectDateTime")
|
||||
},
|
||||
selectDateTimeText() {
|
||||
return this.i18nT("uni-datetime-picker.selectDateTime")
|
||||
},
|
||||
selectTimeText() {
|
||||
return this.i18nT("uni-datetime-picker.selectTime")
|
||||
},
|
||||
@@ -373,18 +384,19 @@
|
||||
return this.i18nT("uni-datetime-picker.clear")
|
||||
},
|
||||
showClearIcon() {
|
||||
return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this.displayRangeValue.endDate))
|
||||
return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this
|
||||
.displayRangeValue.endDate))
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.initI18nT()
|
||||
this.platform()
|
||||
this.platform()
|
||||
},
|
||||
methods: {
|
||||
initI18nT() {
|
||||
const vueI18n = initVueI18n(i18nMessages)
|
||||
this.i18nT = vueI18n.t
|
||||
},
|
||||
initI18nT() {
|
||||
const vueI18n = initVueI18n(i18nMessages)
|
||||
this.i18nT = vueI18n.t
|
||||
},
|
||||
initPicker(newVal) {
|
||||
if ((!newVal && !this.defaultValue) || Array.isArray(newVal) && !newVal.length) {
|
||||
this.$nextTick(() => {
|
||||
@@ -394,26 +406,26 @@
|
||||
}
|
||||
|
||||
if (!Array.isArray(newVal) && !this.isRange) {
|
||||
if(newVal){
|
||||
this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
|
||||
if (this.hasTime) {
|
||||
this.pickerTime = getTime(newVal, this.hideSecond)
|
||||
this.displayValue = `${this.displayValue} ${this.pickerTime}`
|
||||
}
|
||||
}else if(this.defaultValue){
|
||||
this.inputDate = this.calendarDate = getDate(this.defaultValue)
|
||||
if(this.hasTime){
|
||||
this.pickerTime = getTime(this.defaultValue, this.hideSecond)
|
||||
}
|
||||
}
|
||||
if (newVal) {
|
||||
this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
|
||||
if (this.hasTime) {
|
||||
this.pickerTime = getTime(newVal, this.hideSecond)
|
||||
this.displayValue = `${this.displayValue} ${this.pickerTime}`
|
||||
}
|
||||
} else if (this.defaultValue) {
|
||||
this.inputDate = this.calendarDate = getDate(this.defaultValue)
|
||||
if (this.hasTime) {
|
||||
this.pickerTime = getTime(this.defaultValue, this.hideSecond)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const [before, after] = newVal
|
||||
if (!before && !after) return
|
||||
const beforeDate = getDate(before)
|
||||
const beforeTime = getTime(before, this.hideSecond)
|
||||
const beforeDate = getDate(before)
|
||||
const beforeTime = getTime(before, this.hideSecond)
|
||||
|
||||
const afterDate = getDate(after)
|
||||
const afterTime = getTime(after, this.hideSecond)
|
||||
const afterDate = getDate(after)
|
||||
const afterTime = getTime(after, this.hideSecond)
|
||||
const startDate = beforeDate
|
||||
const endDate = afterDate
|
||||
this.displayRangeValue.startDate = this.tempRange.startDate = startDate
|
||||
@@ -450,11 +462,13 @@
|
||||
right.setDate(this.$refs.right.nowDate.fullDate)
|
||||
},
|
||||
platform() {
|
||||
if(typeof navigator !== "undefined"){
|
||||
this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
|
||||
return
|
||||
}
|
||||
const { windowWidth } = uni.getSystemInfoSync()
|
||||
if (typeof navigator !== "undefined") {
|
||||
this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
|
||||
return
|
||||
}
|
||||
const {
|
||||
windowWidth
|
||||
} = uni.getSystemInfoSync()
|
||||
this.isPhone = windowWidth <= 500
|
||||
this.windowWidth = windowWidth
|
||||
},
|
||||
@@ -465,8 +479,8 @@
|
||||
this.platform()
|
||||
if (this.isPhone) {
|
||||
setTimeout(() => {
|
||||
this.$refs.mobile.open()
|
||||
}, 0);
|
||||
this.$refs.mobile.open()
|
||||
}, 0);
|
||||
return
|
||||
}
|
||||
this.pickerPositionStyle = {
|
||||
@@ -492,7 +506,9 @@
|
||||
}
|
||||
} else {
|
||||
this.$refs.right.changeMonth('next')
|
||||
this.$refs.right.cale.lastHover = false
|
||||
if (this.isPhone) {
|
||||
this.$refs.right.cale.lastHover = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -544,52 +560,52 @@
|
||||
this.confirmSingleChange()
|
||||
},
|
||||
confirmSingleChange() {
|
||||
if(!checkDate(this.inputDate)){
|
||||
if (!checkDate(this.inputDate)) {
|
||||
const now = new Date()
|
||||
this.calendarDate = this.inputDate = getDate(now)
|
||||
this.calendarDate = this.inputDate = getDate(now)
|
||||
this.pickerTime = getTime(now, this.hideSecond)
|
||||
}
|
||||
}
|
||||
|
||||
let startLaterInputDate = false
|
||||
let startDate, startTime
|
||||
if(this.start) {
|
||||
let startString = this.start
|
||||
if(typeof this.start === 'number'){
|
||||
startString = getDateTime(this.start, this.hideSecond)
|
||||
}
|
||||
[startDate, startTime] = startString.split(' ')
|
||||
if(this.start && !dateCompare(startDate, this.inputDate)) {
|
||||
startLaterInputDate = true
|
||||
this.inputDate = startDate
|
||||
}
|
||||
}
|
||||
let startLaterInputDate = false
|
||||
let startDate, startTime
|
||||
if (this.start) {
|
||||
let startString = this.start
|
||||
if (typeof this.start === 'number') {
|
||||
startString = getDateTime(this.start, this.hideSecond)
|
||||
}
|
||||
[startDate, startTime] = startString.split(' ')
|
||||
if (this.start && !dateCompare(startDate, this.inputDate)) {
|
||||
startLaterInputDate = true
|
||||
this.inputDate = startDate
|
||||
}
|
||||
}
|
||||
|
||||
let endEarlierInputDate = false
|
||||
let endDate, endTime
|
||||
if(this.end) {
|
||||
let endString = this.end
|
||||
if(typeof this.end === 'number'){
|
||||
endString = getDateTime(this.end, this.hideSecond)
|
||||
}
|
||||
[endDate, endTime] = endString.split(' ')
|
||||
if(this.end && !dateCompare(this.inputDate, endDate)) {
|
||||
endEarlierInputDate = true
|
||||
this.inputDate = endDate
|
||||
}
|
||||
}
|
||||
let endEarlierInputDate = false
|
||||
let endDate, endTime
|
||||
if (this.end) {
|
||||
let endString = this.end
|
||||
if (typeof this.end === 'number') {
|
||||
endString = getDateTime(this.end, this.hideSecond)
|
||||
}
|
||||
[endDate, endTime] = endString.split(' ')
|
||||
if (this.end && !dateCompare(this.inputDate, endDate)) {
|
||||
endEarlierInputDate = true
|
||||
this.inputDate = endDate
|
||||
}
|
||||
}
|
||||
if (this.hasTime) {
|
||||
if(startLaterInputDate){
|
||||
this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if(endEarlierInputDate){
|
||||
this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if(!this.pickerTime){
|
||||
this.pickerTime = getTime(Date.now(), this.hideSecond)
|
||||
}
|
||||
if (startLaterInputDate) {
|
||||
this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if (endEarlierInputDate) {
|
||||
this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if (!this.pickerTime) {
|
||||
this.pickerTime = getTime(Date.now(), this.hideSecond)
|
||||
}
|
||||
this.displayValue = `${this.inputDate} ${this.pickerTime}`
|
||||
} else {
|
||||
this.displayValue = this.inputDate
|
||||
this.displayValue = this.inputDate
|
||||
}
|
||||
this.setEmit(this.displayValue)
|
||||
this.pickerVisible = false
|
||||
@@ -624,11 +640,14 @@
|
||||
},
|
||||
mobileChange(e) {
|
||||
if (this.isRange) {
|
||||
const {before, after} = e.range
|
||||
const {
|
||||
before,
|
||||
after
|
||||
} = e.range
|
||||
|
||||
if(!before || !after){
|
||||
return
|
||||
}
|
||||
if (!before || !after) {
|
||||
return
|
||||
}
|
||||
|
||||
this.handleStartAndEnd(before, after, true)
|
||||
if (this.hasTime) {
|
||||
@@ -661,79 +680,79 @@
|
||||
this.pickerVisible = false
|
||||
return
|
||||
}
|
||||
if(!checkDate(this.tempRange.startDate)){
|
||||
this.tempRange.startDate = getDate(Date.now())
|
||||
}
|
||||
if(!checkDate(this.tempRange.endDate)){
|
||||
this.tempRange.endDate = getDate(Date.now())
|
||||
}
|
||||
if (!checkDate(this.tempRange.startDate)) {
|
||||
this.tempRange.startDate = getDate(Date.now())
|
||||
}
|
||||
if (!checkDate(this.tempRange.endDate)) {
|
||||
this.tempRange.endDate = getDate(Date.now())
|
||||
}
|
||||
|
||||
let start, end
|
||||
|
||||
let startDateLaterRangeStartDate = false
|
||||
let startDateLaterRangeEndDate = false
|
||||
let startDate, startTime
|
||||
if(this.start) {
|
||||
let startString = this.start
|
||||
if(typeof this.start === 'number'){
|
||||
startString = getDateTime(this.start, this.hideSecond)
|
||||
}
|
||||
[startDate,startTime] = startString.split(' ')
|
||||
if(this.start && !dateCompare(this.start, this.tempRange.startDate)) {
|
||||
startDateLaterRangeStartDate = true
|
||||
this.tempRange.startDate = startDate
|
||||
}
|
||||
if(this.start && !dateCompare(this.start, this.tempRange.endDate)) {
|
||||
startDateLaterRangeEndDate = true
|
||||
this.tempRange.endDate = startDate
|
||||
}
|
||||
}
|
||||
let endDateEarlierRangeStartDate = false
|
||||
let endDateEarlierRangeEndDate = false
|
||||
let endDate, endTime
|
||||
if(this.end) {
|
||||
let endString = this.end
|
||||
if(typeof this.end === 'number'){
|
||||
endString = getDateTime(this.end, this.hideSecond)
|
||||
}
|
||||
[endDate,endTime] = endString.split(' ')
|
||||
let startDateLaterRangeStartDate = false
|
||||
let startDateLaterRangeEndDate = false
|
||||
let startDate, startTime
|
||||
if (this.start) {
|
||||
let startString = this.start
|
||||
if (typeof this.start === 'number') {
|
||||
startString = getDateTime(this.start, this.hideSecond)
|
||||
}
|
||||
[startDate, startTime] = startString.split(' ')
|
||||
if (this.start && !dateCompare(this.start, this.tempRange.startDate)) {
|
||||
startDateLaterRangeStartDate = true
|
||||
this.tempRange.startDate = startDate
|
||||
}
|
||||
if (this.start && !dateCompare(this.start, this.tempRange.endDate)) {
|
||||
startDateLaterRangeEndDate = true
|
||||
this.tempRange.endDate = startDate
|
||||
}
|
||||
}
|
||||
let endDateEarlierRangeStartDate = false
|
||||
let endDateEarlierRangeEndDate = false
|
||||
let endDate, endTime
|
||||
if (this.end) {
|
||||
let endString = this.end
|
||||
if (typeof this.end === 'number') {
|
||||
endString = getDateTime(this.end, this.hideSecond)
|
||||
}
|
||||
[endDate, endTime] = endString.split(' ')
|
||||
|
||||
if(this.end && !dateCompare(this.tempRange.startDate, this.end)) {
|
||||
endDateEarlierRangeStartDate = true
|
||||
this.tempRange.startDate = endDate
|
||||
}
|
||||
if(this.end && !dateCompare(this.tempRange.endDate, this.end)) {
|
||||
endDateEarlierRangeEndDate = true
|
||||
this.tempRange.endDate = endDate
|
||||
}
|
||||
}
|
||||
if (this.end && !dateCompare(this.tempRange.startDate, this.end)) {
|
||||
endDateEarlierRangeStartDate = true
|
||||
this.tempRange.startDate = endDate
|
||||
}
|
||||
if (this.end && !dateCompare(this.tempRange.endDate, this.end)) {
|
||||
endDateEarlierRangeEndDate = true
|
||||
this.tempRange.endDate = endDate
|
||||
}
|
||||
}
|
||||
if (!this.hasTime) {
|
||||
start = this.displayRangeValue.startDate = this.tempRange.startDate
|
||||
start = this.displayRangeValue.startDate = this.tempRange.startDate
|
||||
end = this.displayRangeValue.endDate = this.tempRange.endDate
|
||||
} else {
|
||||
if(startDateLaterRangeStartDate){
|
||||
this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
|
||||
}else if(endDateEarlierRangeStartDate){
|
||||
this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if(!this.tempRange.startTime){
|
||||
this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
|
||||
}
|
||||
if (startDateLaterRangeStartDate) {
|
||||
this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
|
||||
} else if (endDateEarlierRangeStartDate) {
|
||||
this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if (!this.tempRange.startTime) {
|
||||
this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
|
||||
}
|
||||
|
||||
if(startDateLaterRangeEndDate){
|
||||
this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
|
||||
}else if(endDateEarlierRangeEndDate){
|
||||
this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if(!this.tempRange.endTime){
|
||||
this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
|
||||
}
|
||||
if (startDateLaterRangeEndDate) {
|
||||
this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
|
||||
} else if (endDateEarlierRangeEndDate) {
|
||||
this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
|
||||
}
|
||||
if (!this.tempRange.endTime) {
|
||||
this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
|
||||
}
|
||||
start = this.displayRangeValue.startDate = `${this.tempRange.startDate} ${this.tempRange.startTime}`
|
||||
end = this.displayRangeValue.endDate = `${this.tempRange.endDate} ${this.tempRange.endTime}`
|
||||
}
|
||||
if(!dateCompare(start,end)){
|
||||
[start, end] = [end, start]
|
||||
}
|
||||
if (!dateCompare(start, end)) {
|
||||
[start, end] = [end, start]
|
||||
}
|
||||
this.displayRangeValue.startDate = start
|
||||
this.displayRangeValue.endDate = end
|
||||
const displayRange = [start, end]
|
||||
@@ -744,10 +763,10 @@
|
||||
if (!(before && after)) return
|
||||
|
||||
const type = temp ? 'tempRange' : 'range'
|
||||
const isStartEarlierEnd = dateCompare(before, after)
|
||||
this[type].startDate = isStartEarlierEnd ? before : after
|
||||
this[type].endDate = isStartEarlierEnd ? after : before
|
||||
},
|
||||
const isStartEarlierEnd = dateCompare(before, after)
|
||||
this[type].startDate = isStartEarlierEnd ? before : after
|
||||
this[type].endDate = isStartEarlierEnd ? after : before
|
||||
},
|
||||
/**
|
||||
* 比较时间大小
|
||||
*/
|
||||
@@ -818,6 +837,7 @@
|
||||
width: 100%;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.uni-date-x {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@@ -829,16 +849,17 @@
|
||||
font-size: 14px;
|
||||
flex: 1;
|
||||
|
||||
.icon-calendar{
|
||||
padding-left: 3px;
|
||||
}
|
||||
.range-separator{
|
||||
height: 35px;
|
||||
/* #ifndef MP */
|
||||
padding: 0 2px;
|
||||
/* #endif */
|
||||
.icon-calendar {
|
||||
padding-left: 3px;
|
||||
}
|
||||
|
||||
.range-separator {
|
||||
height: 35px;
|
||||
/* #ifndef MP */
|
||||
padding: 0 2px;
|
||||
/* #endif */
|
||||
line-height: 35px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.uni-date-x--border {
|
||||
@@ -865,13 +886,13 @@
|
||||
.uni-date__x-input {
|
||||
width: auto;
|
||||
height: 35px;
|
||||
/* #ifndef MP */
|
||||
padding-left: 5px;
|
||||
/* #endif */
|
||||
/* #ifndef MP */
|
||||
padding-left: 5px;
|
||||
/* #endif */
|
||||
position: relative;
|
||||
flex: 1;
|
||||
line-height: 35px;
|
||||
font-size: 14px;
|
||||
font-size: 12px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
@@ -1029,4 +1050,4 @@
|
||||
margin-left: -6px;
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@@ -96,36 +96,11 @@ class Calendar {
|
||||
getPreMonthDays(amount, dateObj) {
|
||||
const result = []
|
||||
for (let i = amount - 1; i >= 0; i--) {
|
||||
const month = dateObj.month > 1 ? dateObj.month -1 : 12
|
||||
const year = month === 12 ? dateObj.year - 1 : dateObj.year
|
||||
const date = new Date(year,month,-i).getDate()
|
||||
const fullDate = `${year}-${addZero(month)}-${addZero(date)}`
|
||||
let multiples = this.multipleStatus.data
|
||||
let multiplesStatus = -1
|
||||
if (this.range && multiples) {
|
||||
multiplesStatus = multiples.findIndex((item) => {
|
||||
return this.dateEqual(item, fullDate)
|
||||
})
|
||||
}
|
||||
const checked = multiplesStatus !== -1
|
||||
// 获取打点信息
|
||||
const extraInfo = this.selected && this.selected.find((item) => {
|
||||
if (this.dateEqual(fullDate, item.date)) {
|
||||
return item
|
||||
}
|
||||
})
|
||||
const month = dateObj.month - 1
|
||||
result.push({
|
||||
fullDate,
|
||||
year,
|
||||
date: new Date(dateObj.year, month, -i).getDate(),
|
||||
month,
|
||||
date,
|
||||
multiple: this.range ? checked : false,
|
||||
beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
|
||||
afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
|
||||
disable: (this.startDate && !dateCompare(this.startDate, fullDate)) || (this.endDate && !dateCompare(fullDate,this.endDate)),
|
||||
isToday: fullDate === this.date.fullDate,
|
||||
userChecked: false,
|
||||
extraInfo
|
||||
disable: true
|
||||
})
|
||||
}
|
||||
return result
|
||||
@@ -140,7 +115,7 @@ class Calendar {
|
||||
const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
|
||||
const isToday = fullDate === currentDate
|
||||
// 获取打点信息
|
||||
const extraInfo = this.selected && this.selected.find((item) => {
|
||||
const info = this.selected && this.selected.find((item) => {
|
||||
if (this.dateEqual(currentDate, item.date)) {
|
||||
return item
|
||||
}
|
||||
@@ -169,15 +144,15 @@ class Calendar {
|
||||
result.push({
|
||||
fullDate: currentDate,
|
||||
year: dateObj.year,
|
||||
month: dateObj.month,
|
||||
date: i,
|
||||
multiple: this.range ? checked : false,
|
||||
beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
|
||||
afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
|
||||
month: dateObj.month,
|
||||
disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(currentDate,this.endDate)),
|
||||
isToday,
|
||||
userChecked: false,
|
||||
extraInfo
|
||||
extraInfo: info
|
||||
})
|
||||
}
|
||||
return result
|
||||
@@ -189,35 +164,10 @@ class Calendar {
|
||||
const result = []
|
||||
const month = dateObj.month + 1
|
||||
for (let i = 1; i <= amount; i++) {
|
||||
const month = dateObj.month === 12 ? 1 : dateObj.month*1 + 1
|
||||
const year = month === 1 ? dateObj.year + 1 : dateObj.year
|
||||
const fullDate = `${year}-${addZero(month)}-${addZero(i)}`
|
||||
let multiples = this.multipleStatus.data
|
||||
let multiplesStatus = -1
|
||||
if (this.range && multiples) {
|
||||
multiplesStatus = multiples.findIndex((item) => {
|
||||
return this.dateEqual(item, fullDate)
|
||||
})
|
||||
}
|
||||
const checked = multiplesStatus !== -1
|
||||
// 获取打点信息
|
||||
const extraInfo = this.selected && this.selected.find((item) => {
|
||||
if (this.dateEqual(fullDate, item.date)) {
|
||||
return item
|
||||
}
|
||||
})
|
||||
result.push({
|
||||
fullDate,
|
||||
year,
|
||||
date: i,
|
||||
month,
|
||||
multiple: this.range ? checked : false,
|
||||
beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
|
||||
afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
|
||||
disable: (this.startDate && !dateCompare(this.startDate, fullDate)) || (this.endDate && !dateCompare(fullDate,this.endDate)),
|
||||
isToday: fullDate === this.date.fullDate,
|
||||
userChecked: false,
|
||||
extraInfo
|
||||
disable: true
|
||||
})
|
||||
}
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user