vxe-pc-ui 3.15.23 → 3.15.24

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.
Files changed (51) hide show
  1. package/es/date-panel/src/date-panel.js +34 -14
  2. package/es/date-panel/src/util.js +30 -3
  3. package/es/date-picker/src/date-picker.js +1 -1
  4. package/es/date-range-picker/src/date-range-picker.js +205 -124
  5. package/es/icon/style.css +1 -1
  6. package/es/style.css +1 -1
  7. package/es/style.min.css +1 -1
  8. package/es/tooltip/src/tooltip.js +34 -21
  9. package/es/ui/index.js +1 -1
  10. package/es/ui/src/log.js +1 -1
  11. package/lib/date-panel/src/date-panel.js +46 -15
  12. package/lib/date-panel/src/date-panel.min.js +1 -1
  13. package/lib/date-panel/src/util.js +31 -5
  14. package/lib/date-panel/src/util.min.js +1 -1
  15. package/lib/date-picker/src/date-picker.js +1 -1
  16. package/lib/date-picker/src/date-picker.min.js +1 -1
  17. package/lib/date-range-picker/src/date-range-picker.js +217 -131
  18. package/lib/date-range-picker/src/date-range-picker.min.js +1 -1
  19. package/lib/icon/style/style.css +1 -1
  20. package/lib/icon/style/style.min.css +1 -1
  21. package/lib/index.umd.js +339 -181
  22. package/lib/index.umd.min.js +1 -1
  23. package/lib/style.css +1 -1
  24. package/lib/style.min.css +1 -1
  25. package/lib/tooltip/src/tooltip.js +36 -21
  26. package/lib/tooltip/src/tooltip.min.js +1 -1
  27. package/lib/ui/index.js +1 -1
  28. package/lib/ui/index.min.js +1 -1
  29. package/lib/ui/src/log.js +1 -1
  30. package/lib/ui/src/log.min.js +1 -1
  31. package/package.json +1 -1
  32. package/packages/date-panel/src/date-panel.ts +38 -15
  33. package/packages/date-panel/src/util.ts +30 -3
  34. package/packages/date-picker/src/date-picker.ts +1 -1
  35. package/packages/date-range-picker/src/date-range-picker.ts +207 -123
  36. package/packages/tooltip/src/tooltip.ts +41 -20
  37. package/types/components/date-panel.d.ts +15 -2
  38. package/types/components/date-range-picker.d.ts +5 -3
  39. package/types/components/tooltip.d.ts +1 -1
  40. /package/es/icon/{iconfont.1783073807010.ttf → iconfont.1783233735491.ttf} +0 -0
  41. /package/es/icon/{iconfont.1783073807010.woff → iconfont.1783233735491.woff} +0 -0
  42. /package/es/icon/{iconfont.1783073807010.woff2 → iconfont.1783233735491.woff2} +0 -0
  43. /package/es/{iconfont.1783073807010.ttf → iconfont.1783233735491.ttf} +0 -0
  44. /package/es/{iconfont.1783073807010.woff → iconfont.1783233735491.woff} +0 -0
  45. /package/es/{iconfont.1783073807010.woff2 → iconfont.1783233735491.woff2} +0 -0
  46. /package/lib/icon/style/{iconfont.1783073807010.ttf → iconfont.1783233735491.ttf} +0 -0
  47. /package/lib/icon/style/{iconfont.1783073807010.woff → iconfont.1783233735491.woff} +0 -0
  48. /package/lib/icon/style/{iconfont.1783073807010.woff2 → iconfont.1783233735491.woff2} +0 -0
  49. /package/lib/{iconfont.1783073807010.ttf → iconfont.1783233735491.ttf} +0 -0
  50. /package/lib/{iconfont.1783073807010.woff → iconfont.1783233735491.woff} +0 -0
  51. /package/lib/{iconfont.1783073807010.woff2 → iconfont.1783233735491.woff2} +0 -0
@@ -28,6 +28,27 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
28
28
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
29
29
  var _createComponentLog = (0, _log.createComponentLog)('date-range-picker'),
30
30
  errLog = _createComponentLog.errLog;
31
+ function createReactData() {
32
+ return {
33
+ initialized: false,
34
+ panelIndex: 0,
35
+ visiblePanel: false,
36
+ isAniVisible: false,
37
+ panelStyle: {},
38
+ panelPlacement: '',
39
+ isActivated: false,
40
+ selectStValue: '',
41
+ selectEdValue: '',
42
+ paneStartVal: '',
43
+ paneEndVal: ''
44
+ };
45
+ }
46
+ function createInternalData() {
47
+ return {
48
+ // selectStatus: false
49
+ // hpTimeout: undefined
50
+ };
51
+ }
31
52
  var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
32
53
  name: 'VxeDateRangePicker',
33
54
  mixins: [_ui.globalMixins.sizeMixin],
@@ -188,26 +209,11 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
188
209
  },
189
210
  data: function data() {
190
211
  var xID = _xeUtils.default.uniqueId();
191
- var reactData = {
192
- initialized: false,
193
- panelIndex: 0,
194
- visiblePanel: false,
195
- isAniVisible: false,
196
- panelStyle: {},
197
- panelPlacement: '',
198
- isActivated: false,
199
- startValue: '',
200
- endValue: ''
201
- };
202
- var internalData = {
203
- // selectStatus: false
204
- // hpTimeout: undefined
205
- };
206
- return {
212
+ var reactData = createReactData();
213
+ return Object.assign(Object.assign({}, {}), {
207
214
  xID: xID,
208
- reactData: reactData,
209
- internalData: internalData
210
- };
215
+ reactData: reactData
216
+ });
211
217
  },
212
218
  computed: Object.assign(Object.assign({}, {}), {
213
219
  computeBtnTransfer: function computeBtnTransfer() {
@@ -381,9 +387,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
381
387
  computePanelLabelObj: function computePanelLabelObj() {
382
388
  var $xeDateRangePicker = this;
383
389
  var reactData = $xeDateRangePicker.reactData;
384
- var startValue = reactData.startValue,
385
- endValue = reactData.endValue;
386
- var vals = startValue || endValue ? [startValue || '', endValue || ''] : [];
390
+ var selectStValue = reactData.selectStValue,
391
+ selectEdValue = reactData.selectEdValue;
392
+ var vals = selectStValue || selectEdValue ? [selectStValue || '', selectEdValue || ''] : [];
387
393
  return $xeDateRangePicker.formatRangeLabel(vals);
388
394
  },
389
395
  computeInputLabel: function computeInputLabel() {
@@ -538,19 +544,19 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
538
544
  restObj = $xeDateRangePicker.paraeUpdateModel();
539
545
  }
540
546
  }
541
- reactData.startValue = restObj.sValue;
542
- reactData.endValue = restObj.eValue;
547
+ reactData.selectStValue = restObj.sValue;
548
+ reactData.selectEdValue = restObj.eValue;
543
549
  },
544
550
  triggerEvent: function triggerEvent(evnt) {
545
551
  var $xeDateRangePicker = this;
546
552
  var reactData = $xeDateRangePicker.reactData;
547
- var startValue = reactData.startValue,
548
- endValue = reactData.endValue;
549
- var value = $xeDateRangePicker.getRangeValue(startValue, endValue);
553
+ var selectStValue = reactData.selectStValue,
554
+ selectEdValue = reactData.selectEdValue;
555
+ var value = $xeDateRangePicker.getRangeValue(selectStValue, selectEdValue);
550
556
  $xeDateRangePicker.dispatchEvent(evnt.type, {
551
557
  value: value,
552
- startValue: startValue,
553
- endValue: endValue
558
+ startValue: selectStValue,
559
+ endValue: selectEdValue
554
560
  }, evnt);
555
561
  },
556
562
  handleChange: function handleChange(sValue, eValue, evnt) {
@@ -590,8 +596,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
590
596
  });
591
597
  }
592
598
  }
593
- reactData.startValue = startRest;
594
- reactData.endValue = endRest;
599
+ reactData.selectStValue = startRest;
600
+ reactData.selectEdValue = endRest;
595
601
  var value = $xeDateRangePicker.getRangeValue(startRest, endRest);
596
602
  var isFinish = startRest && endRest || !startRest && !endRest;
597
603
  $xeDateRangePicker.$emit('update:modelValue', value);
@@ -635,13 +641,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
635
641
  var reactData = $xeDateRangePicker.reactData;
636
642
  var isDisabled = $xeDateRangePicker.computeIsDisabled;
637
643
  if (!isDisabled) {
638
- var startValue = reactData.startValue,
639
- endValue = reactData.endValue;
640
- var value = $xeDateRangePicker.getRangeValue(startValue, endValue);
644
+ var selectStValue = reactData.selectStValue,
645
+ selectEdValue = reactData.selectEdValue;
646
+ var value = $xeDateRangePicker.getRangeValue(selectStValue, selectEdValue);
641
647
  $xeDateRangePicker.dispatchEvent('prefix-click', {
642
648
  value: value,
643
- startValue: startValue,
644
- endValue: endValue
649
+ startValue: selectStValue,
650
+ endValue: selectEdValue
645
651
  }, evnt);
646
652
  }
647
653
  },
@@ -690,8 +696,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
690
696
  var date = _ref.date;
691
697
  var $xeDateRangePicker = this;
692
698
  var reactData = $xeDateRangePicker.reactData;
693
- var startValue = reactData.startValue;
694
- var endValue = reactData.endValue;
699
+ var startValue = reactData.selectStValue;
700
+ var endValue = reactData.selectEdValue;
695
701
  if (startValue && endValue) {
696
702
  var currTime = date.getTime();
697
703
  var startTime = _xeUtils.default.toStringDate(startValue).getTime();
@@ -708,18 +714,18 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
708
714
  var reactData = $xeDateRangePicker.reactData;
709
715
  var internalData = $xeDateRangePicker.internalData;
710
716
  var autoClose = props.autoClose;
711
- var startValue = reactData.startValue,
712
- endValue = reactData.endValue;
717
+ var selectStValue = reactData.selectStValue,
718
+ selectEdValue = reactData.selectEdValue;
713
719
  var selectStatus = internalData.selectStatus;
714
720
  var isDatePickerType = $xeDateRangePicker.computeIsDatePickerType;
715
721
  if (autoClose) {
716
722
  if (selectStatus && isDatePickerType) {
717
- if (startValue && endValue) {
723
+ if (selectStValue && selectEdValue) {
718
724
  $xeDateRangePicker.hidePanel();
719
725
  }
720
726
  }
721
727
  } else {
722
- if (startValue && endValue) {
728
+ if (selectStValue && selectEdValue) {
723
729
  internalData.selectStatus = false;
724
730
  }
725
731
  }
@@ -729,13 +735,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
729
735
  var reactData = $xeDateRangePicker.reactData;
730
736
  var isDisabled = $xeDateRangePicker.computeIsDisabled;
731
737
  if (!isDisabled) {
732
- var startValue = reactData.startValue,
733
- endValue = reactData.endValue;
734
- var value = $xeDateRangePicker.getRangeValue(startValue, endValue);
738
+ var selectStValue = reactData.selectStValue,
739
+ selectEdValue = reactData.selectEdValue;
740
+ var value = $xeDateRangePicker.getRangeValue(selectStValue, selectEdValue);
735
741
  $xeDateRangePicker.dispatchEvent('suffix-click', {
736
742
  value: value,
737
- startValue: startValue,
738
- endValue: endValue
743
+ startValue: selectStValue,
744
+ endValue: selectEdValue
739
745
  }, evnt);
740
746
  }
741
747
  },
@@ -744,20 +750,20 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
744
750
  var reactData = $xeDateRangePicker.reactData;
745
751
  var $xeForm = $xeDateRangePicker.$xeForm;
746
752
  var formItemInfo = $xeDateRangePicker.formItemInfo;
747
- var startValue = reactData.startValue,
748
- endValue = reactData.endValue;
753
+ var selectStValue = reactData.selectStValue,
754
+ selectEdValue = reactData.selectEdValue;
749
755
  var inpImmediate = $xeDateRangePicker.computeInpImmediate;
750
756
  var value = '';
751
757
  if (!inpImmediate) {
752
- $xeDateRangePicker.handleChange(startValue, endValue, evnt);
758
+ $xeDateRangePicker.handleChange(selectStValue, selectEdValue, evnt);
753
759
  }
754
760
  if (!reactData.visiblePanel) {
755
761
  reactData.isActivated = false;
756
762
  }
757
763
  $xeDateRangePicker.dispatchEvent('blur', {
758
764
  value: value,
759
- startValue: startValue,
760
- endValue: endValue
765
+ startValue: selectStValue,
766
+ endValue: selectEdValue
761
767
  }, evnt);
762
768
  // 自动更新校验状态
763
769
  if ($xeForm && formItemInfo) {
@@ -800,22 +806,30 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
800
806
  var internalData = $xeDateRangePicker.internalData;
801
807
  var selectStatus = internalData.selectStatus;
802
808
  var value = params.value,
809
+ currValue = params.currValue,
803
810
  $event = params.$event;
804
- var endValue = selectStatus ? reactData.endValue : '';
805
- $xeDateRangePicker.handleChange(value, endValue, $event);
811
+ var paneVals = value ? _xeUtils.default.isString(value) ? value.split(',') : [value] : [];
812
+ var startValue = '';
813
+ var endValue = '';
814
+ if (selectStatus) {
815
+ startValue = paneVals[0];
816
+ if (paneVals[1]) {
817
+ endValue = paneVals[1];
818
+ } else {
819
+ endValue = reactData.selectEdValue;
820
+ }
821
+ } else {
822
+ startValue = currValue || _xeUtils.default.last(paneVals);
823
+ }
824
+ reactData.paneEndVal = [startValue, endValue].join(',');
825
+ reactData.paneStartVal = [startValue, endValue].join(',');
826
+ $xeDateRangePicker.handleChange(startValue, endValue, $event);
806
827
  $xeDateRangePicker.handleSelectClose();
807
828
  if (!selectStatus) {
808
829
  internalData.selectStatus = true;
809
830
  }
810
831
  $xeDateRangePicker.$nextTick(function () {
811
- var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
812
- var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
813
- if ($startDatePanel && $endDatePanel) {
814
- var startValue = $startDatePanel.getModelValue();
815
- if (!endValue && startValue) {
816
- $endDatePanel.setPanelDate(_xeUtils.default.toStringDate(startValue));
817
- }
818
- }
832
+ $xeDateRangePicker.handleUpdateStartPanelDate();
819
833
  });
820
834
  },
821
835
  endPanelChangeEvent: function endPanelChangeEvent(params) {
@@ -824,90 +838,147 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
824
838
  var internalData = $xeDateRangePicker.internalData;
825
839
  var selectStatus = internalData.selectStatus;
826
840
  var value = params.value,
841
+ currValue = params.currValue,
827
842
  $event = params.$event;
828
- var startValue = selectStatus ? reactData.startValue : '';
829
- $xeDateRangePicker.handleChange(startValue, value, $event);
843
+ var paneVals = value ? _xeUtils.default.isString(value) ? value.split(',') : [value] : [];
844
+ var startValue = '';
845
+ var endValue = '';
846
+ if (selectStatus) {
847
+ endValue = paneVals[0];
848
+ if (paneVals[1]) {
849
+ startValue = paneVals[0];
850
+ endValue = paneVals[1];
851
+ } else {
852
+ startValue = reactData.selectStValue;
853
+ }
854
+ } else {
855
+ endValue = currValue || _xeUtils.default.last(paneVals);
856
+ }
857
+ reactData.paneEndVal = [startValue, endValue].join(',');
858
+ reactData.paneStartVal = [startValue, endValue].join(',');
859
+ $xeDateRangePicker.handleChange(startValue, endValue, $event);
830
860
  $xeDateRangePicker.handleSelectClose();
831
861
  if (!selectStatus) {
832
862
  internalData.selectStatus = true;
833
863
  }
834
864
  $xeDateRangePicker.$nextTick(function () {
835
- var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
836
- var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
837
- if ($startDatePanel && $endDatePanel) {
838
- var endValue = $endDatePanel.getModelValue();
839
- if (!startValue && endValue) {
840
- $startDatePanel.setPanelDate(_xeUtils.default.toStringDate(endValue));
841
- }
842
- }
865
+ $xeDateRangePicker.handleUpdateEndPanelDate();
843
866
  });
844
867
  },
845
- startPanelDateBtnChangeEvent: function startPanelDateBtnChangeEvent(params) {
868
+ handleUpdateStartPanelDate: function handleUpdateStartPanelDate() {
869
+ var $xeDateRangePicker = this;
870
+ var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
871
+ var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
872
+ if (!$startDatePanel || !$endDatePanel) {
873
+ return;
874
+ }
875
+ var startPanelDate = $startDatePanel.getPanelDate();
876
+ var endPanelDate = $endDatePanel.getPanelDate();
877
+ if (!startPanelDate || !endPanelDate) {
878
+ return;
879
+ }
880
+ var viewType = $startDatePanel.getViewType();
881
+ var startYear = startPanelDate.getFullYear();
882
+ var startMonth = startPanelDate.getMonth();
883
+ var endYear = endPanelDate.getFullYear();
884
+ var endMonth = endPanelDate.getMonth();
885
+ switch (viewType) {
886
+ case 'day':
887
+ case 'date':
888
+ case 'week':
889
+ {
890
+ if (endYear <= startYear && endMonth <= startMonth) {
891
+ $endDatePanel.setPanelDate((0, _util.getNextMonth)(startPanelDate));
892
+ }
893
+ break;
894
+ }
895
+ }
896
+ },
897
+ startPanelDateBtnChangeEvent: function startPanelDateBtnChangeEvent() {
846
898
  var $xeDateRangePicker = this;
847
899
  var props = $xeDateRangePicker;
848
900
  var linkedPanels = props.linkedPanels;
901
+ var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
902
+ var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
903
+ if (!$startDatePanel || !$endDatePanel) {
904
+ return;
905
+ }
906
+ var startPanelDate = $startDatePanel.getPanelDate();
907
+ var endPanelDate = $endDatePanel.getPanelDate();
908
+ if (!startPanelDate || !endPanelDate) {
909
+ return;
910
+ }
911
+ var viewType = $startDatePanel.getViewType();
849
912
  if (linkedPanels) {
850
- var viewType = params.viewType;
851
- var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
852
- var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
853
- if (!$startDatePanel || !$endDatePanel) {
854
- return;
855
- }
856
- var startPanelDate = $startDatePanel.getPanelDate();
857
- if (!startPanelDate) {
858
- return;
859
- }
860
- var endYear = startPanelDate.getFullYear();
861
- var endMonth = startPanelDate.getMonth();
862
913
  switch (viewType) {
863
914
  case 'day':
864
915
  case 'date':
865
916
  case 'week':
866
917
  {
867
- if (endMonth < 11) {
868
- startPanelDate.setMonth(endMonth + 1);
869
- } else {
870
- startPanelDate.setFullYear(endYear + 1);
871
- startPanelDate.setMonth(0);
872
- }
873
- $endDatePanel.setPanelDate(startPanelDate);
918
+ $endDatePanel.setPanelDate((0, _util.getNextMonth)(startPanelDate));
874
919
  break;
875
920
  }
876
921
  }
922
+ } else {
923
+ $xeDateRangePicker.handleUpdateStartPanelDate();
877
924
  }
878
925
  },
879
- endPanelDateBtnChangeEvent: function endPanelDateBtnChangeEvent(params) {
926
+ handleUpdateEndPanelDate: function handleUpdateEndPanelDate() {
927
+ var $xeDateRangePicker = this;
928
+ var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
929
+ var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
930
+ if (!$startDatePanel || !$endDatePanel) {
931
+ return;
932
+ }
933
+ var startPanelDate = $startDatePanel.getPanelDate();
934
+ var endPanelDate = $endDatePanel.getPanelDate();
935
+ if (!startPanelDate || !endPanelDate) {
936
+ return;
937
+ }
938
+ var viewType = $endDatePanel.getViewType();
939
+ var startYear = startPanelDate.getFullYear();
940
+ var startMonth = startPanelDate.getMonth();
941
+ var endYear = endPanelDate.getFullYear();
942
+ var endMonth = endPanelDate.getMonth();
943
+ switch (viewType) {
944
+ case 'day':
945
+ case 'date':
946
+ case 'week':
947
+ {
948
+ if (startYear >= endYear && startMonth >= endMonth) {
949
+ $startDatePanel.setPanelDate((0, _util.getPrevMonth)(endPanelDate));
950
+ }
951
+ break;
952
+ }
953
+ }
954
+ },
955
+ endPanelDateBtnChangeEvent: function endPanelDateBtnChangeEvent() {
880
956
  var $xeDateRangePicker = this;
881
957
  var props = $xeDateRangePicker;
882
958
  var linkedPanels = props.linkedPanels;
959
+ var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
960
+ var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
961
+ if (!$startDatePanel || !$endDatePanel) {
962
+ return;
963
+ }
964
+ var startPanelDate = $startDatePanel.getPanelDate();
965
+ var endPanelDate = $endDatePanel.getPanelDate();
966
+ if (!startPanelDate || !endPanelDate) {
967
+ return;
968
+ }
969
+ var viewType = $endDatePanel.getViewType();
883
970
  if (linkedPanels) {
884
- var viewType = params.viewType;
885
- var $startDatePanel = $xeDateRangePicker.$refs.refStartDatePanel;
886
- var $endDatePanel = $xeDateRangePicker.$refs.refEndDatePanel;
887
- if (!$startDatePanel || !$endDatePanel) {
888
- return;
889
- }
890
- var endPanelDate = $endDatePanel.getPanelDate();
891
- if (!endPanelDate) {
892
- return;
893
- }
894
- var endYear = endPanelDate.getFullYear();
895
- var endMonth = endPanelDate.getMonth();
896
971
  switch (viewType) {
897
972
  case 'day':
898
973
  case 'date':
899
974
  case 'week':
900
975
  {
901
- if (endMonth) {
902
- endPanelDate.setMonth(endMonth - 1);
903
- } else {
904
- endPanelDate.setFullYear(endYear - 1);
905
- endPanelDate.setMonth(11);
906
- }
907
- $startDatePanel.setPanelDate(endPanelDate);
976
+ $startDatePanel.setPanelDate((0, _util.getPrevMonth)(endPanelDate));
908
977
  break;
909
978
  }
910
979
  }
980
+ } else {
981
+ $xeDateRangePicker.handleUpdateEndPanelDate();
911
982
  }
912
983
  },
913
984
  // 全局事件
@@ -1057,6 +1128,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1057
1128
  reactData.isAniVisible = true;
1058
1129
  setTimeout(function () {
1059
1130
  reactData.visiblePanel = true;
1131
+ $xeDateRangePicker.handleUpdateStartPanelDate();
1060
1132
  $xeDateRangePicker.updatePlacement();
1061
1133
  }, 10);
1062
1134
  $xeDateRangePicker.updateZindex();
@@ -1101,8 +1173,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1101
1173
  var autoClose = shortcutOpts.autoClose;
1102
1174
  var code = option.code,
1103
1175
  clickMethod = option.clickMethod;
1104
- var startValue = reactData.startValue;
1105
- var endValue = reactData.endValue;
1176
+ var startValue = reactData.selectStValue;
1177
+ var endValue = reactData.selectEdValue;
1106
1178
  var value = $xeDateRangePicker.getRangeValue(startValue, endValue);
1107
1179
  var shortcutParams = {
1108
1180
  $dateRangePicker: $xeDateRangePicker,
@@ -1161,8 +1233,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1161
1233
  setModelValue: function setModelValue(startValue, endValue) {
1162
1234
  var $xeDateRangePicker = this;
1163
1235
  var reactData = $xeDateRangePicker.reactData;
1164
- reactData.startValue = startValue || '';
1165
- reactData.endValue = endValue || '';
1236
+ reactData.selectStValue = startValue || '';
1237
+ reactData.selectEdValue = endValue || '';
1166
1238
  var value = $xeDateRangePicker.getRangeValue(startValue, endValue);
1167
1239
  $xeDateRangePicker.emitModel(value);
1168
1240
  },
@@ -1233,6 +1305,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1233
1305
  var type = props.type,
1234
1306
  separator = props.separator,
1235
1307
  autoClose = props.autoClose,
1308
+ valueFormat = props.valueFormat,
1236
1309
  showConfirmButton = props.showConfirmButton,
1237
1310
  showClearButton = props.showClearButton;
1238
1311
  var initialized = reactData.initialized,
@@ -1240,8 +1313,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1240
1313
  visiblePanel = reactData.visiblePanel,
1241
1314
  panelPlacement = reactData.panelPlacement,
1242
1315
  panelStyle = reactData.panelStyle,
1243
- startValue = reactData.startValue,
1244
- endValue = reactData.endValue;
1316
+ selectStValue = reactData.selectStValue,
1317
+ selectEdValue = reactData.selectEdValue,
1318
+ paneStartVal = reactData.paneStartVal,
1319
+ paneEndVal = reactData.paneEndVal;
1245
1320
  var vSize = $xeDateRangePicker.computeSize;
1246
1321
  var btnTransfer = $xeDateRangePicker.computeBtnTransfer;
1247
1322
  var shortcutOpts = $xeDateRangePicker.computeShortcutOpts;
@@ -1298,15 +1373,18 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1298
1373
  }, [h(_datePanel.default, {
1299
1374
  ref: 'refStartDatePanel',
1300
1375
  props: {
1301
- value: startValue,
1376
+ value: paneStartVal,
1377
+ multiple: true,
1378
+ valueSort: true,
1379
+ limitCount: 3,
1380
+ defaultMode: 'first',
1302
1381
  type: props.type,
1303
1382
  className: props.className,
1304
1383
  minDate: props.minDate,
1305
1384
  maxDate: props.maxDate,
1306
- endDate: endValue,
1307
1385
  startDay: props.startDay,
1308
1386
  labelFormat: props.labelFormat,
1309
- valueFormat: props.valueFormat,
1387
+ valueFormat: valueFormat === 'date' || valueFormat === 'timestamp' ? '' : valueFormat,
1310
1388
  timeFormat: props.timeFormat,
1311
1389
  defaultDate: sdDate,
1312
1390
  defaultTime: sdTime,
@@ -1325,15 +1403,18 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1325
1403
  }), h(_datePanel.default, {
1326
1404
  ref: 'refEndDatePanel',
1327
1405
  props: {
1328
- value: endValue,
1406
+ value: paneEndVal,
1407
+ multiple: true,
1408
+ valueSort: true,
1409
+ limitCount: 3,
1410
+ defaultMode: 'last',
1329
1411
  type: props.type,
1330
1412
  className: props.className,
1331
1413
  minDate: props.minDate,
1332
1414
  maxDate: props.maxDate,
1333
- startDate: startValue,
1334
1415
  startDay: props.startDay,
1335
1416
  labelFormat: props.labelFormat,
1336
- valueFormat: props.valueFormat,
1417
+ valueFormat: valueFormat === 'date' || valueFormat === 'timestamp' ? '' : valueFormat,
1337
1418
  timeFormat: props.timeFormat,
1338
1419
  defaultDate: edDate,
1339
1420
  defaultTime: edTime,
@@ -1360,7 +1441,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1360
1441
  }, [showClearBtn ? h(_button.default, {
1361
1442
  props: {
1362
1443
  size: 'mini',
1363
- disabled: !(startValue || endValue),
1444
+ disabled: !(selectStValue || selectEdValue),
1364
1445
  content: (0, _ui.getI18n)('vxe.button.clear')
1365
1446
  },
1366
1447
  on: {
@@ -1404,14 +1485,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1404
1485
  var slots = $xeDateRangePicker.$scopedSlots;
1405
1486
  var reactData = $xeDateRangePicker.reactData;
1406
1487
  var suffixIcon = props.suffixIcon;
1407
- var startValue = reactData.startValue,
1408
- endValue = reactData.endValue;
1488
+ var selectStValue = reactData.selectStValue,
1489
+ selectEdValue = reactData.selectEdValue;
1409
1490
  var suffixSlot = slots.suffix;
1410
1491
  var isDisabled = $xeDateRangePicker.computeIsDisabled;
1411
1492
  var isClearable = $xeDateRangePicker.computeIsClearable;
1412
1493
  return h('div', {
1413
1494
  class: ['vxe-date-range-picker--suffix', {
1414
- 'is--clear': isClearable && !isDisabled && (startValue || endValue)
1495
+ 'is--clear': isClearable && !isDisabled && (selectStValue || selectEdValue)
1415
1496
  }]
1416
1497
  }, [isClearable ? h('div', {
1417
1498
  class: 'vxe-date-range-picker--clear-icon',
@@ -1448,8 +1529,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1448
1529
  type = props.type,
1449
1530
  name = props.name,
1450
1531
  autoComplete = props.autoComplete;
1451
- var startValue = reactData.startValue,
1452
- endValue = reactData.endValue,
1532
+ var selectStValue = reactData.selectStValue,
1533
+ selectEdValue = reactData.selectEdValue,
1453
1534
  visiblePanel = reactData.visiblePanel,
1454
1535
  isActivated = reactData.isActivated;
1455
1536
  var vSize = $xeDateRangePicker.computeSize;
@@ -1468,7 +1549,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1468
1549
  var suffix = $xeDateRangePicker.renderSuffixIcon(h);
1469
1550
  return h('div', {
1470
1551
  ref: 'refElem',
1471
- class: ['vxe-date-range-picker', "type--".concat(type), className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--prefix', !!prefix), 'is--suffix', !!suffix), 'is--visible', visiblePanel), 'is--disabled', isDisabled), 'is--active', isActivated), 'show--clear', isClearable && !isDisabled && (startValue || endValue))],
1552
+ class: ['vxe-date-range-picker', "type--".concat(type), className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--prefix', !!prefix), 'is--suffix', !!suffix), 'is--visible', visiblePanel), 'is--disabled', isDisabled), 'is--active', isActivated), 'show--clear', isClearable && !isDisabled && (selectStValue || selectEdValue))],
1472
1553
  attrs: {
1473
1554
  spellcheck: false
1474
1555
  }
@@ -1513,6 +1594,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1513
1594
  },
1514
1595
  created: function created() {
1515
1596
  var $xeDateRangePicker = this;
1597
+ $xeDateRangePicker.internalData = createInternalData();
1516
1598
  $xeDateRangePicker.updateModelValue(true);
1517
1599
  _ui.globalEvents.on($xeDateRangePicker, 'mousewheel', $xeDateRangePicker.handleGlobalMousewheelEvent);
1518
1600
  _ui.globalEvents.on($xeDateRangePicker, 'mousedown', $xeDateRangePicker.handleGlobalMousedownEvent);
@@ -1526,6 +1608,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1526
1608
  },
1527
1609
  beforeDestroy: function beforeDestroy() {
1528
1610
  var $xeDateRangePicker = this;
1611
+ var reactData = $xeDateRangePicker.reactData;
1612
+ var internalData = $xeDateRangePicker.internalData;
1529
1613
  var panelElem = $xeDateRangePicker.$refs.refInputPanel;
1530
1614
  if (panelElem && panelElem.parentNode) {
1531
1615
  panelElem.parentNode.removeChild(panelElem);
@@ -1535,6 +1619,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1535
1619
  _ui.globalEvents.off($xeDateRangePicker, 'mousedown');
1536
1620
  _ui.globalEvents.off($xeDateRangePicker, 'blur');
1537
1621
  _ui.globalEvents.off($xeDateRangePicker, 'resize');
1622
+ _xeUtils.default.assign(reactData, createReactData());
1623
+ _xeUtils.default.assign(internalData, createInternalData());
1538
1624
  },
1539
1625
  render: function render(h) {
1540
1626
  return this.renderVN(h);