From 60b899d9bcbdb0f22eee27f7e403062903b81574 Mon Sep 17 00:00:00 2001
From: btea <2356281422@qq.com>
Date: Wed, 23 Oct 2024 08:53:48 +0800
Subject: [PATCH] feat(components): [date-picker] add `show-now` prop (#18625)

---
 docs/en-US/component/datetime-picker.md                    | 1 +
 .../date-picker/src/date-picker-com/panel-date-pick.vue    | 2 +-
 packages/components/date-picker/src/props/shared.ts        | 4 ++++
 packages/components/time-picker/src/common/picker.vue      | 1 +
 packages/components/time-picker/src/common/props.ts        | 7 +++++++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/en-US/component/datetime-picker.md b/docs/en-US/component/datetime-picker.md
index 7bac5d77d4..efccab2d50 100644
--- a/docs/en-US/component/datetime-picker.md
+++ b/docs/en-US/component/datetime-picker.md
@@ -111,6 +111,7 @@ datetime-picker/custom-icon
 | teleported              | whether datetime-picker dropdown is teleported to the body                                                     | ^[boolean]                                                                                     | true                |
 | empty-values ^(2.7.0)   | empty values of component, [see config-provider](/en-US/component/config-provider#empty-values-configurations) | ^[array]                                                                                       | —                   |
 | value-on-clear ^(2.7.0) | clear return value, [see config-provider](/en-US/component/config-provider#empty-values-configurations)        | ^[string] / ^[number] / ^[boolean] / ^[Function]                                               | —                   |
+| show-now ^(2.8.7)       | whether to show the now button                                                                                 | ^[boolean]                                                                                     | true                |
 
 ## Events
 
diff --git a/packages/components/date-picker/src/date-picker-com/panel-date-pick.vue b/packages/components/date-picker/src/date-picker-com/panel-date-pick.vue
index 1c92090d77..da45843d3a 100644
--- a/packages/components/date-picker/src/date-picker-com/panel-date-pick.vue
+++ b/packages/components/date-picker/src/date-picker-com/panel-date-pick.vue
@@ -170,7 +170,7 @@
     </div>
     <div v-show="footerVisible" :class="ppNs.e('footer')">
       <el-button
-        v-show="!isMultipleType"
+        v-show="!isMultipleType && showNow"
         text
         size="small"
         :class="ppNs.e('link-btn')"
diff --git a/packages/components/date-picker/src/props/shared.ts b/packages/components/date-picker/src/props/shared.ts
index 86aac5d51c..cfa1f58b8c 100644
--- a/packages/components/date-picker/src/props/shared.ts
+++ b/packages/components/date-picker/src/props/shared.ts
@@ -57,6 +57,10 @@ export const panelSharedProps = buildProps({
   },
   dateFormat: String,
   timeFormat: String,
+  showNow: {
+    type: Boolean,
+    default: true,
+  },
 } as const)
 
 export const panelRangeSharedProps = buildProps({
diff --git a/packages/components/time-picker/src/common/picker.vue b/packages/components/time-picker/src/common/picker.vue
index 5c444e76b4..fcd8e15f72 100644
--- a/packages/components/time-picker/src/common/picker.vue
+++ b/packages/components/time-picker/src/common/picker.vue
@@ -151,6 +151,7 @@
         :unlink-panels="unlinkPanels"
         :type="type"
         :default-value="defaultValue"
+        :show-now="showNow"
         @pick="onPick"
         @select-range="setSelectionRange"
         @set-picker-option="onSetPickerOption"
diff --git a/packages/components/time-picker/src/common/props.ts b/packages/components/time-picker/src/common/props.ts
index 1747e9e57b..3ce5ae20f6 100644
--- a/packages/components/time-picker/src/common/props.ts
+++ b/packages/components/time-picker/src/common/props.ts
@@ -227,6 +227,13 @@ export const timePickerDefaultProps = buildProps({
   },
   ...useEmptyValuesProps,
   ...useAriaProps(['ariaLabel']),
+  /**
+   * @description whether to show the now button
+   */
+  showNow: {
+    type: Boolean,
+    default: true,
+  },
 } as const)
 
 export type TimePickerDefaultProps = ExtractPropTypes<