sadais-piui 1.2.7-beta172 → 1.2.7-beta174

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.
@@ -224,6 +224,16 @@ export default {
224
224
  // 参照popup
225
225
  return datePicker.popup
226
226
  }
227
+ },
228
+ // 最小可选日期
229
+ minDate: {
230
+ type: [Date, Number, String],
231
+ default: datePicker.minDate
232
+ },
233
+ // 最大可选日期
234
+ maxDate: {
235
+ type: [Date, Number, String],
236
+ default: datePicker.maxDate
227
237
  }
228
238
  },
229
239
  data() {
@@ -274,8 +284,26 @@ export default {
274
284
  )
275
285
  return this.$pi.lang.mergeDeep(datePickerPopup, this.popup)
276
286
  },
287
+ // 解析后的最小日期
288
+ parsedMinDate() {
289
+ if (!this.minDate) return null
290
+ return this.$pi.date.parseDate(this.minDate)
291
+ },
292
+ // 解析后的最大日期
293
+ parsedMaxDate() {
294
+ if (!this.maxDate) return null
295
+ return this.$pi.date.parseDate(this.maxDate)
296
+ },
277
297
  options() {
278
- const watchs = ['val', 'startYear', 'endYear', 'field', 'defaultValue']
298
+ const watchs = [
299
+ 'val',
300
+ 'startYear',
301
+ 'endYear',
302
+ 'field',
303
+ 'defaultValue',
304
+ 'minDate',
305
+ 'maxDate'
306
+ ]
279
307
  const options = watchs
280
308
  .filter(d => this[d])
281
309
  .map(d => this[d].toString())
@@ -303,32 +331,115 @@ export default {
303
331
  if (this.yearOptions && this.yearOptions.length > 0) {
304
332
  return this.yearOptions
305
333
  }
306
- return this.$pi.common.generateArray(this.startYear, this.endYear)
334
+ let start = parseInt(this.startYear, 10)
335
+ let end = parseInt(this.endYear, 10)
336
+ // 根据 minDate/maxDate 限制年份范围
337
+ if (this.parsedMinDate) {
338
+ start = Math.max(start, this.parsedMinDate.year)
339
+ }
340
+ if (this.parsedMaxDate) {
341
+ end = Math.min(end, this.parsedMaxDate.year)
342
+ }
343
+ return this.$pi.common.generateArray(start, end)
307
344
  },
308
345
  getMonthOptions() {
309
346
  if (this.monthOptions && this.monthOptions.length > 0) {
310
347
  return this.monthOptions
311
348
  }
312
- return this.$pi.common.generateArray(1, 12)
349
+ let start = 1
350
+ let end = 12
351
+ const currentYear = this.date.year
352
+ // 当前年份等于最小年份时,限制起始月份
353
+ if (this.parsedMinDate && currentYear === this.parsedMinDate.year) {
354
+ start = this.parsedMinDate.month
355
+ }
356
+ // 当前年份等于最大年份时,限制结束月份
357
+ if (this.parsedMaxDate && currentYear === this.parsedMaxDate.year) {
358
+ end = this.parsedMaxDate.month
359
+ }
360
+ return this.$pi.common.generateArray(start, end)
313
361
  },
314
362
  getDayOptions() {
315
363
  if (this.dayOptions && this.dayOptions.length > 0) {
316
364
  return this.dayOptions
317
365
  }
318
- const monthDays = new Date(this.date.year, this.date.month, 0).getDate()
319
- return this.$pi.common.generateArray(1, monthDays)
366
+ const currentYear = this.date.year
367
+ const currentMonth = this.date.month
368
+ let start = 1
369
+ let end = new Date(currentYear, currentMonth, 0).getDate()
370
+ // 当前年月等于最小年月时,限制起始日期
371
+ if (
372
+ this.parsedMinDate &&
373
+ currentYear === this.parsedMinDate.year &&
374
+ currentMonth === this.parsedMinDate.month
375
+ ) {
376
+ start = this.parsedMinDate.date
377
+ }
378
+ // 当前年月等于最大年月时,限制结束日期
379
+ if (
380
+ this.parsedMaxDate &&
381
+ currentYear === this.parsedMaxDate.year &&
382
+ currentMonth === this.parsedMaxDate.month
383
+ ) {
384
+ end = this.parsedMaxDate.date
385
+ }
386
+ return this.$pi.common.generateArray(start, end)
320
387
  },
321
388
  getHourOptions() {
322
389
  if (this.hourOptions && this.hourOptions.length > 0) {
323
390
  return this.hourOptions
324
391
  }
325
- return this.$pi.common.generateArray(0, 23)
392
+ let start = 0
393
+ let end = 23
394
+ const { year, month, date } = this.date
395
+ // 当前年月日等于最小年月日时,限制起始小时
396
+ if (
397
+ this.parsedMinDate &&
398
+ year === this.parsedMinDate.year &&
399
+ month === this.parsedMinDate.month &&
400
+ date === this.parsedMinDate.date
401
+ ) {
402
+ start = this.parsedMinDate.hour
403
+ }
404
+ // 当前年月日等于最大年月日时,限制结束小时
405
+ if (
406
+ this.parsedMaxDate &&
407
+ year === this.parsedMaxDate.year &&
408
+ month === this.parsedMaxDate.month &&
409
+ date === this.parsedMaxDate.date
410
+ ) {
411
+ end = this.parsedMaxDate.hour
412
+ }
413
+ return this.$pi.common.generateArray(start, end)
326
414
  },
327
415
  getMinuteOptions() {
328
416
  if (this.minuteOptions && this.minuteOptions.length > 0) {
329
417
  return this.minuteOptions
330
418
  }
331
- return this.$pi.common.generateArray(0, 59)
419
+ let start = 0
420
+ let end = 59
421
+ const { year, month, date, hour } = this.date
422
+ // 当前年月日时等于最小年月日时时,限制起始分钟
423
+ if (
424
+ this.parsedMinDate &&
425
+ year === this.parsedMinDate.year &&
426
+ month === this.parsedMinDate.month &&
427
+ date === this.parsedMinDate.date &&
428
+ hour === this.parsedMinDate.hour
429
+ ) {
430
+ start = this.parsedMinDate.minute
431
+ }
432
+ // 当前年月日时等于最大年月日时时,限制结束分钟
433
+ if (
434
+ this.parsedMaxDate &&
435
+ year === this.parsedMaxDate.year &&
436
+ month === this.parsedMaxDate.month &&
437
+ date === this.parsedMaxDate.date &&
438
+ hour === this.parsedMaxDate.hour
439
+ ) {
440
+ end = this.parsedMaxDate.minute
441
+ }
442
+ return this.$pi.common.generateArray(start, end)
332
443
  },
333
444
  columns() {
334
445
  let columns = [
@@ -439,6 +550,10 @@ export default {
439
550
  }
440
551
  this.date = this.$pi.date.parseDate(time)
441
552
  }
553
+ // 校正初始日期边界
554
+ this.$nextTick(() => {
555
+ this.correctDateBoundary()
556
+ })
442
557
  },
443
558
  handlePickstart() {
444
559
  this.scrolling = true
@@ -468,9 +583,29 @@ export default {
468
583
  })
469
584
  // 重新解析
470
585
  this.date = this.$pi.date.parseDate(time)
586
+ // 校正日期边界
587
+ this.correctDateBoundary()
471
588
 
472
589
  this.$emit('scrollend', this.date)
473
590
  },
591
+ /**
592
+ * 校正日期边界,确保选中的日期在 minDate 和 maxDate 范围内
593
+ */
594
+ correctDateBoundary() {
595
+ const time = this.date.time
596
+ let needUpdate = false
597
+ // 校正最小日期
598
+ if (this.parsedMinDate && time < this.parsedMinDate.time) {
599
+ this.date = this.$pi.date.parseDate(this.parsedMinDate.time)
600
+ needUpdate = true
601
+ }
602
+ // 校正最大日期
603
+ if (this.parsedMaxDate && time > this.parsedMaxDate.time) {
604
+ this.date = this.$pi.date.parseDate(this.parsedMaxDate.time)
605
+ needUpdate = true
606
+ }
607
+ return needUpdate
608
+ },
474
609
  /**
475
610
  * @vuese
476
611
  * 取消选择
@@ -73,6 +73,8 @@
73
73
  :popup-select="getDatePicker.popupSelect"
74
74
  :confirm-btn="getDatePicker.confirmBtn"
75
75
  :cancel-btn="getDatePicker.cancelBtn"
76
+ :min-date="getDatePicker.minDate"
77
+ :max-date="getDatePicker.maxDate"
76
78
  @confirm="handleDatePickerConfirm"
77
79
  @close="$emit('close', $event)"
78
80
  @closed="$emit('closed', $event)"
@@ -17,6 +17,8 @@ export default {
17
17
  hourOptions: [], // 小时选项(默认值:[])
18
18
  minuteOptions: [], // 分钟选项(默认值:[])
19
19
  defaultValue: '', // 日期默认值
20
+ minDate: null, // 最小可选日期,支持 Date 对象、时间戳、日期字符串(默认值:null)
21
+ maxDate: null, // 最大可选日期,支持 Date 对象、时间戳、日期字符串(默认值:null)
20
22
  units: ['年', '月', '日', '时', '分', '秒'], // 单位数组,默认值:['年', '月', '日', '时', '分', '秒']
21
23
  format: '', // 返回的日期格式,为空的时候,返回的是日期对象
22
24
  itemHeight: 110, // 行高(默认:'110rpx')
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sadais-piui",
3
- "version": "1.2.7-beta172",
3
+ "version": "1.2.7-beta174",
4
4
  "description": "piui组件库",
5
5
  "main": "index.js",
6
6
  "scripts": {