From 658ffb2a6b8c0435c970abc79c9a050ed565b936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A3=E4=B8=80=E5=B9=B4?= <949210232@qq.com>
Date: Fri, 22 Dec 2023 10:25:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=8C=83=E5=9B=B4=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=202.=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8D=95=E6=AC=A1=E7=82=B9=E5=87=BB=E9=80=89=E6=8B=A9=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4(=E4=B9=8B=E5=89=8D=E7=82=B9=E4=B8=A4=E4=B8=8B?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uni-calendar/uni-calendar.vue  | 82 +++++++++++++------
 .../components/uni-calendar/util.js           | 49 +++++++++--
 2 files changed, 99 insertions(+), 32 deletions(-)

diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
index 9cc64bdc..fd2a6231 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -1,7 +1,9 @@
 <template>
 	<view class="uni-calendar">
-		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
-		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
 			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
 				<view class="uni-calendar__header-btn-box" @click="close">
 					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{cancelText}}</text>
@@ -52,7 +54,8 @@
 				</view>
 				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
 					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
-						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected"
+							:lunar="lunar" @change="choiceDate"></calendar-item>
 					</view>
 				</view>
 			</view>
@@ -64,9 +67,13 @@
 	import Calendar from './util.js';
 	import CalendarItem from './uni-calendar-item.vue'
 
-	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
 	import i18nMessages from './i18n/index.js'
-	const {	t	} = initVueI18n(i18nMessages)
+	const {
+		t
+	} = initVueI18n(i18nMessages)
 
 	/**
 	 * Calendar 日历
@@ -92,7 +99,7 @@
 		components: {
 			CalendarItem
 		},
-		emits:['close','confirm','change','monthSwitch'],
+		emits: ['close', 'confirm', 'change', 'monthSwitch'],
 		props: {
 			date: {
 				type: String,
@@ -131,7 +138,20 @@
 			clearDate: {
 				type: Boolean,
 				default: true
+			},
+			//日期范围初始化 ['2023-12-01','2023-12-15']
+			rangeDate: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			//是否单次点击选择范围
+			isSingleClkSltRange: {
+				type: Boolean,
+				default: false
 			}
+
 		},
 		data() {
 			return {
@@ -142,7 +162,7 @@
 				aniMaskShow: false
 			}
 		},
-		computed:{
+		computed: {
 			/**
 			 * for i18n
 			 */
@@ -183,12 +203,12 @@
 				// this.cale.setDate(newVal)
 				this.init(newVal)
 			},
-			startDate(val){
+			startDate(val) {
 				this.cale.resetSatrtDate(val)
 				this.cale.setDate(this.nowDate.fullDate)
 				this.weeks = this.cale.weeks
 			},
-			endDate(val){
+			endDate(val) {
 				this.cale.resetEndDate(val)
 				this.cale.setDate(this.nowDate.fullDate)
 				this.weeks = this.cale.weeks
@@ -196,7 +216,12 @@
 			selected(newVal) {
 				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
 				this.weeks = this.cale.weeks
+			},
+			rangeDate(newVal) {
+				this.cale.setDefaultChoose(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
 			}
+
 		},
 		created() {
 			this.cale = new Calendar({
@@ -204,8 +229,15 @@
 				startDate: this.startDate,
 				endDate: this.endDate,
 				range: this.range,
+				rangeDate: this.rangeDate,
+				isSingleClkSltRange: this.isSingleClkSltRange
 			})
-			this.init(this.date)
+			if (this.rangeDate) {
+				this.init(this.rangeDate[0])
+			} else {
+				this.init(this.date)
+			}
+
 		},
 		methods: {
 			// 取消穿透
@@ -214,11 +246,14 @@
 				const value = e.detail.value + '-1'
 				this.setDate(value)
 
-				const { year,month } = this.cale.getDate(value)
-        this.$emit('monthSwitch', {
-            year,
-            month
-        })
+				const {
+					year,
+					month
+				} = this.cale.getDate(value)
+				this.$emit('monthSwitch', {
+					year,
+					month
+				})
 			},
 			/**
 			 * 初始化日期显示
@@ -326,11 +361,11 @@
 			backToday() {
 				const nowYearMonth = `${this.nowDate.year}-${this.nowDate.month}`
 				const date = this.cale.getDate(new Date())
-        const todayYearMonth = `${date.year}-${date.month}`
+				const todayYearMonth = `${date.year}-${date.month}`
 
-        if(nowYearMonth !== todayYearMonth) {
-          this.monthSwitch()
-        }
+				if (nowYearMonth !== todayYearMonth) {
+					this.monthSwitch()
+				}
 
 				this.init(date.fullDate)
 				this.change()
@@ -369,11 +404,12 @@
 	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
 	$uni-border-color: #EDEDED;
 	$uni-text-color: #333;
-	$uni-bg-color-hover:#f1f1f1;
-	$uni-font-size-base:14px;
+	$uni-bg-color-hover: #f1f1f1;
+	$uni-font-size-base: 14px;
 	$uni-text-color-placeholder: #808080;
 	$uni-color-subtitle: #555555;
-	$uni-text-color-grey:#999;
+	$uni-text-color-grey: #999;
+
 	.uni-calendar {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -563,4 +599,4 @@
 		line-height: 1;
 		/* #endif */
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-calendar/components/uni-calendar/util.js b/uni_modules/uni-calendar/components/uni-calendar/util.js
index 671f61e0..a6e3cde3 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/util.js
+++ b/uni_modules/uni-calendar/components/uni-calendar/util.js
@@ -6,7 +6,9 @@ class Calendar {
 		selected,
 		startDate,
 		endDate,
-		range
+		range,
+		rangeDate,
+		isSingleClkSltRange
 	} = {}) {
 		// 当前日期
 		this.date = this.getDate(new Date()) // 当前初入日期
@@ -20,8 +22,23 @@ class Calendar {
 		// 多选状态
 		this.cleanMultipleStatus()
 		// 每周日期
-		this.weeks = {}
+		this.weeks = {}
+
+		this.rangeDate=rangeDate
+
 		// this._getWeek(this.date.fullDate)
+		// 初始化范围
+		if(this.rangeDate){
+
+			if (this.rangeDate.length > 0 && this.multipleStatus.data.length == 0) {
+				this.multipleStatus.before = this.rangeDate[0]
+				this.multipleStatus.after = this.rangeDate[1]
+				this.multipleStatus.data = this.geDateAll(this.rangeDate[0], this.rangeDate[1])
+			}
+		}
+		//是否单次选择即可选择范围
+		this.isSingleClkSltRange=isSingleClkSltRange
+
 	}
 	/**
 	 * 设置日期
@@ -76,19 +93,19 @@ class Calendar {
 				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
 				break
 			case 'month':
-				if (dd.getDate() === 31 && AddDayCount>0) {
+				if (dd.getDate() === 31 && AddDayCount > 0) {
 					dd.setDate(dd.getDate() + AddDayCount)
 				} else {
 					const preMonth = dd.getMonth()
 					dd.setMonth(preMonth + AddDayCount) // 获取AddDayCount天后的日期
 					const nextMonth = dd.getMonth()
 					// 处理 pre 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
-					if(AddDayCount<0 && preMonth!==0 && nextMonth-preMonth>AddDayCount){
-						dd.setMonth(nextMonth+(nextMonth-preMonth+AddDayCount))
+					if (AddDayCount < 0 && preMonth !== 0 && nextMonth - preMonth > AddDayCount) {
+						dd.setMonth(nextMonth + (nextMonth - preMonth + AddDayCount))
 					}
 					// 处理 next 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
-					if(AddDayCount>0 && nextMonth-preMonth>AddDayCount){
-						dd.setMonth(nextMonth-(nextMonth-preMonth-AddDayCount))
+					if (AddDayCount > 0 && nextMonth - preMonth > AddDayCount) {
+						dd.setMonth(nextMonth - (nextMonth - preMonth - AddDayCount))
 					}
 				}
 				break
@@ -298,7 +315,12 @@ class Calendar {
 		if (before && after) {
 			this.multipleStatus.before = ''
 			this.multipleStatus.after = ''
-			this.multipleStatus.data = []
+			this.multipleStatus.data = []
+			if(this.isSingleClkSltRange){
+				this.multipleStatus.before = fullDate
+			}
+
+
 		} else {
 			if (!before) {
 				this.multipleStatus.before = fullDate
@@ -313,6 +335,15 @@ class Calendar {
 		}
 		this._getWeek(fullDate)
 	}
+	// 设置默认选中
+	setDefaultChoose(data, value) {
+		if (value > 0) {
+			this.multipleStatus.before = value[0]
+			this.multipleStatus.after = value[1]
+			this.multipleStatus.data = this.geDateAll(value[0], value[1])
+		}
+		this._getWeek(data)
+	}
 
 	/**
 	 * 获取每周数据
@@ -357,4 +388,4 @@ class Calendar {
 }
 
 
-export default Calendar
+export default Calendar
-- 
Gitee