@zscreate/zhxy-app-component 1.0.333 → 1.0.334-test.2

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

@@ -2464,7 +2464,7 @@ export default {
             this.widget.key = v
             this.$emit('upDateWidget', this.widget)
           } else if (this.widget.type === 'date') {
-            if (this.widget.options.type !== 'range' && v) {
+            if (this.widget.options.type !== 'range' && this.widget.options.type !== 'week' && v) {
               try {
                 this.dataModel = v = moment(v).format(this.widget.options.format)
               } catch (e) {

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

@@ -169,6 +169,10 @@
 			timePicker,
 		},
 		props: {
+			type:{
+				type: String,
+				default: ''
+			},
 			date: {
 				type: String,
 				default: ''
@@ -429,6 +433,7 @@
 				startDate: this.startDate,
 				endDate: this.endDate,
 				range: this.range,
+				type: this.type
 				// multipleStatus: this.pleStatus
 			})
 			

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

@@ -21,7 +21,7 @@
 							:disabled="!tempSingleDate" />
 					</time-picker>
 				</view>
-				<calendar ref="pcSingle" class="uni-date_calendar-pc" :showMonth="false"
+				<calendar ref="pcSingle" class="uni-date_calendar-pc" :showMonth="false" :type="type"
 					:start-date="caleRange.startDate" :end-date="caleRange.endDate" :date="defSingleDate"
 					@change="singleChange" />
 				<view v-if="hasTime" class="popup-x-footer">
@@ -77,6 +77,7 @@
 	</view>
 </template>
 <script>
+		import moment from '../../../../utils/moment'
 	/**
 	 * DatetimePicker 时间选择器
 	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
@@ -399,10 +400,15 @@
 					return
 				}
 				if (!Array.isArray(newVal) && !this.isRange) {
-					const {
+					let {
 						defDate,
 						defTime
 					} = this.parseDate(newVal)
+					if(this.type == 'week'){
+						defDate = this.getFirstDayOfWeekByWeekStr(newVal).fullDate
+						this.caleRange.startDate = defDate
+						this.caleRange.endDate = moment(defDate).add(6,'d').format('YYYY-MM-DD')
+					}
 					this.singleVal = defDate
 					this.tempSingleDate = defDate
 					this.defSingleDate = defDate
@@ -721,7 +727,39 @@
 					}
 				}
 			},
+			getDate(date) {
+				const y = date.getFullYear();
+				const m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+				const d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+				return {
+						fullDate: `${y}-${m}-${d}`,
+						year: y,
+						month: m,
+						day: d,
+						date
+				};
+			},
 
+			/**
+			 * 获取指定年份和第几周的第一天
+			 * @param {String} weekStr 格式为 'YYYY-MM周'，其中 MM 表示第几周
+			 * @returns {String} 返回该周的第一天，格式为 'YYYY-MM-DD'
+			 */
+			getFirstDayOfWeekByWeekStr(weekStr) {
+					if (!weekStr) return '';
+					// 解析输入的年份和周数
+					const [year, week] = weekStr.split('-');
+					const parsedYear = parseInt(year, 10);
+					const parsedWeek = parseInt(week.replace('周', ''), 10);
+					// 计算该年的第一天是周几（0 表示周日，1 表示周一，以此类推）
+					const firstDayOfYear = new Date(parsedYear, 0, 1).getDay();
+					// 计算第 1 周的第一天（周日为第一天）
+					const firstDayOfFirstWeek = new Date(parsedYear, 0, 1 - firstDayOfYear);
+					// 计算目标周的第一天
+					const daysToAdd = (parsedWeek - 1) * 7;
+					const firstDayOfTargetWeek = new Date(firstDayOfFirstWeek.getTime() + daysToAdd * 24 * 60 * 60 * 1000);
+					return this.getDate(firstDayOfTargetWeek);
+			},
 			parseDate(date) {
 				date = this.fixIosDateFormat(date)
 				const defVal = new Date(date)

package/components/uni-datetime-picker/components/uni-datetime-picker/util.js

@@ -1,5 +1,5 @@
 import CALENDAR from './calendar.js'
-
+import moment from '../../../../utils/moment'
 class Calendar {
 	constructor({
 		date,
@@ -7,7 +7,8 @@ class Calendar {
 		startDate,
 		endDate,
 		range,
-		months
+		months,
+		type//值:month.year,week,range
 		// multipleStatus
 	} = {}) {
 		// 当前日期
@@ -19,6 +20,7 @@ class Calendar {
 		// 范围结束
 		this.endDate = endDate
 		this.range = range
+		this.type = type
 		// 多选状态
 		this.cleanMultipleStatus()
 		// 每周日期
@@ -169,7 +171,12 @@ class Calendar {
 			let multiples = this.multipleStatus.data
 			let checked = false
 			let multiplesStatus = -1
-			if (this.range) {
+			if (this.range||this.type == 'week') {
+				if(this.type == 'week') multiples = [
+					this.startDate,moment(this.startDate).add(1,'d').format('YYYY-MM-DD'),
+					moment(this.startDate).add(2,'d').format('YYYY-MM-DD'),moment(this.startDate).add(3,'d').format('YYYY-MM-DD'),moment(this.startDate).add(4,'d').format('YYYY-MM-DD'),
+					moment(this.startDate).add(5,'d').format('YYYY-MM-DD'),moment(this.startDate).add(6,'d').format('YYYY-MM-DD')
+				]
 				if (multiples) {
 					multiplesStatus = multiples.findIndex((item) => {
 						return this.dateEqual(item, nowDate)
@@ -179,16 +186,19 @@ class Calendar {
 					checked = true
 				}
 			}
+			console.log('this.type',this.type)
+			// 更改multiple为true,则颜色是选中
+			// 更改beforeMultiple
 			let data = {
 				fullDate: nowDate,
 				year: full.year,
 				date: i,
-				multiple: this.range ? checked : false,
+				multiple: this.range ? checked : (this.type == 'week'?checked:false),
 				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
 				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
 				month: full.month,
 				lunar: this.getlunar(full.year, full.month, i),
-				disable: !(disableBefore && disableAfter),
+				disable: this.type != 'week'&&!(disableBefore && disableAfter),
 				isDay,
 				userChecked: false
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.333",
+	"version": "1.0.334-test.2",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",