!444 feat(datePicker): 开启simple/range后点击快捷选项无需确认

jevin98 · jevin98 · commit a6fa2d796084 · 2024-11-12T03:19:19.000Z
* feat(datePicker): 开启simple/range后点击快捷选项无需确认
diff --git a/packages/component/component/datePicker/__tests__/datePicker-range.test.tsx b/packages/component/component/datePicker/__tests__/datePicker-range.test.tsx
@@ -2,11 +2,13 @@ import { mount } from "@vue/test-utils";
 import { afterEach, describe, expect, test } from "vitest";
 import { sleep } from "../../../test-utils";
 
+import LayDropdown from "../../dropdown/index.vue";
 import LayDatePicker from "../index.vue";
 import DateRangeComponent from "../component/DateRange.vue";
-import DateComponent from "../component/common/Date.vue";
-import Year from "../component/common/Year.vue";
-import Footer from "../component/common/Footer.vue";
+import Shortcuts from "../component/common/Shortcuts.vue";
+// import DateComponent from "../component/common/Date.vue";
+// import Year from "../component/common/Year.vue";
+// import Footer from "../component/common/Footer.vue";
 // import Month from "../component/common/Month.vue";
 import { nextTick } from "vue";
 import { dayjsToString } from "../util";
@@ -52,4 +54,36 @@ describe("LayDatePicker date type", () => {
     expect(parseInt(rightYear.text())).toBe(2024);
     expect(parseInt(rightMonth.text())).toBe(11);
   });
+
+  test("simple模式 点击快捷选项下拉关闭", async () => {
+    const shortcuts = [
+      {
+        text: "两年",
+        value: ["2024", "2025"],
+      },
+    ];
+
+    const wrapper = mount(LayDatePicker, {
+      props: {
+        range: true,
+        simple: true,
+        modelValue: [],
+        shortcuts,
+      },
+    });
+
+    await mockInputClick(wrapper);
+
+    const dropdownInstance1 = wrapper.findComponent(LayDropdown);
+    expect((dropdownInstance1.vm as any).open).toBeTruthy();
+
+    const shortcut = wrapper.findComponent(Shortcuts);
+    const lis = shortcut.findAll("li");
+    expect(lis.length).toBe(1);
+
+    await (lis[0] as any).trigger("click");
+    await sleep();
+    const dropdownInstance2 = wrapper.findComponent(LayDropdown);
+    expect((dropdownInstance2.vm as any).open).toBeFalsy();
+  });
 });
diff --git a/packages/component/component/datePicker/component/DateRange.vue b/packages/component/component/datePicker/component/DateRange.vue
@@ -258,6 +258,8 @@ const handleChangeShortcut = (shortcuts: ShortcutsType) => {
   rightDate.value = shortcutsValues[1];
   startDate.value = shortcutsValues[0];
   endDate.value = shortcutsValues[1];
+
+  if (props.simple) handleConfirm();
 };
 
 const handleConfirm = () => {
diff --git a/packages/component/component/datePicker/component/MonthRange.vue b/packages/component/component/datePicker/component/MonthRange.vue
@@ -129,6 +129,8 @@ const handleChangeShortcut = (shortcuts: ShortcutsType) => {
 
   startDate.value = shortcutsValues[0];
   endDate.value = shortcutsValues[1];
+
+  if (props.simple) handleConfirm();
 };
 
 const handleConfirm = () => {
diff --git a/packages/component/component/datePicker/component/TimeRange.vue b/packages/component/component/datePicker/component/TimeRange.vue
@@ -64,6 +64,8 @@ const handleChangeShortcut = (shortcuts: ShortcutsType) => {
 
   startDate.value = shortcutsValues[0];
   endDate.value = shortcutsValues[1];
+
+  if (props.simple) handleConfirm();
 };
 
 const handleConfirm = () => {
diff --git a/packages/component/component/datePicker/component/YearRange.vue b/packages/component/component/datePicker/component/YearRange.vue
@@ -103,6 +103,8 @@ const handleChangeShortcut = (shortcuts: ShortcutsType) => {
 
   startDate.value = shortcutsValues[0];
   endDate.value = shortcutsValues[1];
+
+  if (props.simple) handleConfirm();
 };
 
 const handleConfirm = () => {
