@zscreate/zhxy-app-component 1.0.359 → 1.0.360

package/components/evan-form-item/evan-form-item.vue

@@ -226,7 +226,8 @@
           <view class="evan-form-item-container__main--body" v-else>
             <uni-datetime-picker ref="datetime_picker" @change="dateChange" :hide-second="!(widget.options.format&&widget.options.format.includes(':ss'))" @click.native="isClickByUser = true" :type="widget.options.type"
               :format="formatTime()" :clearIcon="!widget.options.disabled && widget.options.clearable"
-              :value="dataModel" @maskClick="maskClick" :border="false" :disabled="widget.options.disabled">
+              :value="dataModel" @maskClick="maskClick" :border="false" :disabled="widget.options.disabled"  :disabledMinTime="widget.options.disabledMinTime"
+              :disabledMaxTime="widget.options.disabledMaxTime">
               <view class="option-font-size">
                 {{ dataModel | filterDataModel(widget) }}
               </view>

package/components/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="uni-calendar-item__weeks-box" :class="{
-		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--disable':weeks.disable || isDateDisabled(weeks),
 		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
 		'uni-calendar-item--multiple': weeks.multiple,
 		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
@@ -12,7 +12,7 @@
 				'uni-calendar-item--before-checked':weeks.beforeMultiple,
 				'uni-calendar-item--multiple': weeks.multiple,
 				'uni-calendar-item--after-checked':weeks.afterMultiple,
-				'uni-calendar-item--disable':weeks.disable,
+				'uni-calendar-item--disable':weeks.disable || isDateDisabled(weeks),
 				}">
 			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
 			<text class="uni-calendar-item__weeks-box-text">{{weeks.date}}</text>
@@ -23,7 +23,16 @@
 <script>
 	export default {
 		props: {
-			type:{
+    // 添加禁用时间参数
+    disabledMinTime: {
+      type: String,
+      default: ''
+    },
+    disabledMaxTime: {
+      type: String,
+      default: ''
+    },
+    type:{
 				type: String,
 				default: ''
 			},
@@ -55,12 +64,62 @@
 			}
 		},
 		methods: {
+			// 检查日期是否禁用
+			isDateDisabled(dateObj) {
+				const { disabledMinTime, disabledMaxTime } = this;
+				console.log('disabledMaxTime',this.disabledMaxTime)
+				if (!disabledMinTime && !disabledMaxTime) return false;
+				
+				const currentDate = dateObj.fullDate; // 格式: YYYY-MM-DD
+				const currentDateTime = currentDate + ' 00:00:00';
+				
+				// 比较日期
+				if (disabledMinTime) {
+					const minDate = this.formatDateToCompare(disabledMinTime);
+					if (this.compareDateTime(currentDateTime, minDate) < 0) {
+						return true;
+					}
+				}
+				
+				if (disabledMaxTime) {
+					const maxDate = this.formatDateToCompare(disabledMaxTime);
+					if (this.compareDateTime(currentDateTime, maxDate) > 0) {
+						return true;
+					}
+				}
+				
+				return false;
+			},
+			
+			// 格式化日期为统一格式进行比较
+			formatDateToCompare(dateTimeStr) {
+				if (!dateTimeStr) return '';
+				
+				let dateStr = dateTimeStr;
+				
+				// 处理不同的日期时间格式
+				if (dateStr.length === 10) { // YYYY-MM-DD
+					dateStr += ' 00:00:00';
+				} else if (dateStr.length === 16) { // YYYY-MM-DD HH:mm
+					dateStr += ':00';
+				}
+				
+				return dateStr;
+			},
+			
+			// 比较两个日期时间
+			compareDateTime(dateTimeA, dateTimeB) {
+				const timestampA = new Date(dateTimeA.replace(/-/g, '/')).getTime();
+				const timestampB = new Date(dateTimeB.replace(/-/g, '/')).getTime();
+				return timestampA - timestampB;
+			},
 			choiceDate(weeks) {
-				console.log(weeks)
-				this.$emit('change', weeks)
+				if (weeks.disable || this.isDateDisabled(weeks)) return;
+				this.$emit('change', weeks);
 			},
 			handleMousemove(weeks) {
-				this.$emit('handleMouse', weeks)
+				if (weeks.disable || this.isDateDisabled(weeks)) return;
+				this.$emit('handleMouse', weeks);
 			}
 		}
 	}

package/components/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -70,8 +70,8 @@
 				<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 :type="type" class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
-							:selected="selected" :lunar="lunar" :checkHover="range" @change="choiceDate"
-							@handleMouse="handleMouse">
+							:selected="selected" :lunar="lunar" :checkHover="range" @change="choiceDate" :disabledMinTime="disabledMinTime"
+							:disabledMaxTime="disabledMaxTime" @handleMouse="handleMouse">
 						</calendar-item>
 					</view>
 				</view>
@@ -255,7 +255,16 @@
 						fulldate: ''
 					}
 				}
-			}
+			},
+			// 添加禁用时间参数
+			disabledMinTime: {
+				type: String,
+				default: ''
+			},
+			disabledMaxTime: {
+				type: String,
+				default: ''
+			},
 		},
 		data() {
 			return {
@@ -475,7 +484,7 @@
 				this.firstEnter = true
 			},
 			handleMouse(weeks) {
-				if (weeks.disable) return
+				if (weeks.disable || this.isDateDisabled(weeks)) return;
 				if (this.cale.lastHover) return
 				let {
 					before,
@@ -669,12 +678,63 @@
 				})
 				
 			},
+			// 检查日期是否禁用
+			isDateDisabled(dateObj) {
+				const { disabledMinTime, disabledMaxTime } = this;
+				
+				if (!disabledMinTime && !disabledMaxTime) return false;
+				
+				const currentDate = dateObj.fullDate; // 格式: YYYY-MM-DD
+				const currentDateTime = dateObj.fullDate + ' 00:00:00'; // 转换为完整日期时间
+				
+				// 比较日期
+				if (disabledMinTime) {
+					const minDate = this.formatDateToCompare(disabledMinTime);
+					if (this.compareDateTime(currentDateTime, minDate) < 0) {
+						return true;
+					}
+				}
+				
+				if (disabledMaxTime) {
+					const maxDate = this.formatDateToCompare(disabledMaxTime);
+					if (this.compareDateTime(currentDateTime, maxDate) > 0) {
+						return true;
+					}
+				}
+				
+				return false;
+			},
+			
+			// 格式化日期为统一格式进行比较
+			formatDateToCompare(dateTimeStr) {
+				if (!dateTimeStr) return '';
+				
+				// 处理不同的日期时间格式
+				let dateStr = dateTimeStr;
+				
+				// 如果只有日期，添加默认时间
+				if (dateStr.length === 10) { // YYYY-MM-DD
+					dateStr += ' 00:00:00';
+				} else if (dateStr.length === 16) { // YYYY-MM-DD HH:mm
+					dateStr += ':00';
+				}
+				// YYYY-MM-DD HH:mm:ss 格式保持不变
+				
+				return dateStr;
+			},
+			
+			// 比较两个日期时间
+			compareDateTime(dateTimeA, dateTimeB) {
+				const timestampA = new Date(dateTimeA.replace(/-/g, '/')).getTime();
+				const timestampB = new Date(dateTimeB.replace(/-/g, '/')).getTime();
+				return timestampA - timestampB;
+			},
 			/**
 			 * 选择天触发
 			 * @param {Object} weeks
 			 */
 			choiceDate(weeks) {
-				if (weeks.disable) return
+				if (weeks.disable || this.isDateDisabled(weeks)) return;
 				this.calendar = weeks
 				this.calendar.userChecked = true
 				// 设置多选

package/components/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -16,14 +16,17 @@
 					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
 						:placeholder="selectDateText" />
 					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
-						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;" :disabledMinTime="disabledMinTime"
+						:disabledMaxTime="disabledMaxTime"
+						:currentDate="tempSingleDate">
 						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
 							:disabled="!tempSingleDate" />
 					</time-picker>
 				</view>
 				<calendar ref="pcSingle" class="uni-date_calendar-pc" :showMonth="false" :type="type"
 					:start-date="caleRange.startDate" :end-date="caleRange.endDate" :date="defSingleDate"
-					@change="singleChange" />
+					@change="singleChange" :disabledMinTime="disabledMinTime"
+					:disabledMaxTime="disabledMaxTime"/>
 				<view v-if="hasTime" class="popup-x-footer">
 					<!-- <text class="">此刻</text> -->
 					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
@@ -37,7 +40,9 @@
 						<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="reactStartTime" :border="false"
-							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond" :disabledMinTime="disabledMinTime"
+							:disabledMaxTime="disabledMaxTime"
+							:currentDate="tempSingleDate">
 							<input class="uni-date__input uni-date-range__input" type="text"
 								v-model="tempRange.startTime" :placeholder="startTimeText"
 								:disabled="!tempRange.startDate" />
@@ -48,7 +53,9 @@
 						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
 							:placeholder="endDateText" />
 						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
-							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond" :disabledMinTime="disabledMinTime"
+							:disabledMaxTime="disabledMaxTime"
+							:currentDate="tempSingleDate">
 							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
 								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
 						</time-picker>
@@ -58,11 +65,13 @@
 					<calendar ref="left" class="uni-date_calendar-pc" :showMonth="false"
 						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
 						@change="leftChange" :pleStatus="endMultipleStatus" @firstEnterCale="updateRightCale"
-						@monthSwitch="leftMonthSwitch" />
+						@monthSwitch="leftMonthSwitch" :disabledMinTime="disabledMinTime"
+						:disabledMaxTime="disabledMaxTime"/>
 					<calendar ref="right" class="uni-date_calendar-pc" :showMonth="false"
 						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
 						@change="rightChange" :pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
-						@monthSwitch="rightMonthSwitch" style="border-left: 1px solid #F1F1F1;" />
+						@monthSwitch="rightMonthSwitch" style="border-left: 1px solid #F1F1F1;" :disabledMinTime="disabledMinTime"
+						:disabledMaxTime="disabledMaxTime"/>
 				</view>
 				<view v-if="hasTime" class="popup-x-footer">
 					<text class="" @click="clear">{{clearText}}</text>
@@ -73,7 +82,8 @@
 		<calendar v-if="isPhone" :type="type" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
 			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
 			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
-			:hideSecond="hideSecond" @confirm="mobileChange" @maskClick="close" />
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClick="close" :disabledMinTime="disabledMinTime"
+			:disabledMaxTime="disabledMaxTime"/>
 	</view>
 </template>
 <script>
@@ -225,6 +235,15 @@
 				type: String,
 				default: 'YYYY-MM-DD HH:mm:ss'
 			},
+			// 添加禁用时间参数
+			disabledMinTime: {
+				type: String,
+				default: ''
+			},
+			disabledMaxTime: {
+				type: String,
+				default: ''
+   	 },
 		},
 		watch: {
 			format: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.359",
+	"version": "1.0.360",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",