fix(calendar-card): 选择范围时支持仅选择单个日期 (#2963)

close #2950
jdf2e · Mar 13, 2024 · 5be4aec · 5be4aec
1 parent 2933216
commit 5be4aec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/packages/__VUE/calendarcard/__tests__/calendarcard.spec.tsx b/src/packages/__VUE/calendarcard/__tests__/calendarcard.spec.tsx
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils';
 import CalendarCard from '..';
-import { nextTick } from 'vue';
+import { nextTick, ref } from 'vue';
 import { CalendarCardDay } from '../types';
 
 test('CalendarCard: test defaultValue mount(() => ', async () => {
@@ -72,11 +72,19 @@ test('CalendarCard: test type multiple', async () => {
 });
 
 test('CalendarCard: test type range', async () => {
-  const wrapper = mount(() => <CalendarCard modelValue={[new Date('2023-01-25')]} type="range" />);
+  const val = ref([new Date('2023-01-25')]);
+  const wrapper = mount(() => <CalendarCard v-model={val.value} type="range" />);
 
   // current
   const currentDays = wrapper.findAll('.nut-calendarcard-day.current');
-  currentDays[1].trigger('click'); // 0102
+  const active = wrapper.findAll('.nut-calendarcard-day.active');
+  expect(active.length).toBe(1);
+
+  currentDays[24].trigger('click'); // 0125
+  await nextTick();
+  const startAndEnd = wrapper.findAll('.nut-calendarcard-day.start.end');
+  expect(startAndEnd.length).toBe(1);
+
   currentDays[3].trigger('click'); // 0104
   currentDays[8].trigger('click'); // 0109
   await nextTick();

diff --git a/src/packages/__VUE/calendarcard/calendar-card.taro.vue b/src/packages/__VUE/calendarcard/calendar-card.taro.vue
@@ -318,7 +318,7 @@ const handleDayClick = (day: CalendarCardDay) => {
         change([day]);
       } else if (len === 1) {
         const t = compareDay(innerValue.value[0], day);
-        if (t === 0 || t === null || t === undefined) {
+        if (t === null || t === undefined) {
           change([]);
         } else if (t < 0) {
           change([innerValue.value[0], day]);

diff --git a/src/packages/__VUE/calendarcard/calendar-card.vue b/src/packages/__VUE/calendarcard/calendar-card.vue
@@ -318,7 +318,7 @@ const handleDayClick = (day: CalendarCardDay) => {
         change([day]);
       } else if (len === 1) {
         const t = compareDay(innerValue.value[0], day);
-        if (t === 0 || t === null || t === undefined) {
+        if (t === null || t === undefined) {
           change([]);
         } else if (t < 0) {
           change([innerValue.value[0], day]);