Merge branch 'Tencent:develop' into develop

Tencent · Sep 4, 2022 · 7213502 · 7213502
2 parents 2ebdbb3 + 2383bc4
commit 7213502
Show file tree

Hide file tree

Showing 21 changed files with 1,150 additions and 885 deletions.
diff --git a/package.json b/package.json
@@ -146,7 +146,7 @@
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-vue": "^8.1.1",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^10.1.0",
     "glob": "^8.0.3",
     "gray-matter": "^4.0.3",
     "husky": "^7.0.4",

diff --git a/src/date-picker/DateRangePickerPanel.tsx b/src/date-picker/DateRangePickerPanel.tsx
@@ -70,9 +70,17 @@ export default defineComponent({
     }
 
     // 日期点击
-    function onCellClick(date: Date, { e, partial }: { e: MouseEvent; partial: DateRangePickerPartial }) {
-      props.onCellClick?.({ e, partial, date: value.value.map((v: string) => dayjs(v).toDate()) });
-      emit('cell-click', { e, partial, date: value.value.map((v: string) => dayjs(v).toDate()) });
+    function onCellClick(date: Date, { e }: { e: MouseEvent }) {
+      props.onCellClick?.({
+        e,
+        partial: activeIndex.value ? 'end' : 'start',
+        date: value.value.map((v: string) => dayjs(v).toDate()),
+      });
+      emit('cell-click', {
+        e,
+        partial: activeIndex.value ? 'end' : 'start',
+        date: value.value.map((v: string) => dayjs(v).toDate()),
+      });
 
       isHoverCell.value = false;
       isSelected.value = true;