fix: When the clearable property of DateTimePicker is set to false, i…

…t is not possible to hide the clear button in the popup layer.
ElemeFE · Nov 12, 2024 · fd3c188 · fd3c188
1 parent c345bb4
commit fd3c188
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue
@@ -168,6 +168,7 @@
       </div>
       <div class="el-picker-panel__footer" v-if="showTime">
         <el-button
+          v-if="clearable"
           size="mini"
           type="text"
           class="el-picker-panel__link-btn"

diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue
@@ -858,6 +858,7 @@ export default {
       this.picker.selectionMode = this.selectionMode;
       this.picker.unlinkPanels = this.unlinkPanels;
       this.picker.arrowControl = this.arrowControl || this.timeArrowControl || false;
+      this.picker.clearable = this.clearable;
       this.$watch('format', (format) => {
         this.picker.format = format;
       });

diff --git a/packages/date-picker/src/picker/date-picker.js b/packages/date-picker/src/picker/date-picker.js
@@ -22,6 +22,10 @@ export default {
       type: String,
       default: 'date'
     },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
     timeArrowControl: Boolean
   },