mirror/element-plus
2
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2025-01-24 11:05:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow clearable to control both of the clear button (#2072)

Browse Source 
fix #2035
This commit is contained in:
0song 2021-05-26 16:31:04 +08:00 committed by GitHub
parent 0d29cc444c
commit 35ae8f4a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/date-picker/src/date-picker-com/panel-date-range.vue
View File

@ -181,6 +181,7 @@
</div> </div>
<div v-if="showTime" class="el-picker-panel__footer"> <div v-if="showTime" class="el-picker-panel__footer">
<el-button <el-button
v-if="clearable"
size="mini" size="mini"
type="text" type="text"
class="el-picker-panel__link-btn" class="el-picker-panel__link-btn"
@ -578,7 +579,7 @@ export default defineComponent({
ctx.emit('set-picker-option', ['handleClear', handleClear]) ctx.emit('set-picker-option', ['handleClear', handleClear])
const pickerBase = inject('EP_PICKER_BASE') as any const pickerBase = inject('EP_PICKER_BASE') as any
const { shortcuts, disabledDate, cellClassName, format, defaultTime, defaultValue, arrowControl } = pickerBase.props const { shortcuts, disabledDate, cellClassName, format, defaultTime, defaultValue, arrowControl, clearable } = pickerBase.props
watch(() => props.parsedValue, newVal => { watch(() => props.parsedValue, newVal => {
if (newVal && newVal.length === 2) { if (newVal && newVal.length === 2) {
@ -652,6 +653,7 @@ export default defineComponent({
handleClear, handleClear,
handleConfirm, handleConfirm,
timeFormat, timeFormat,
clearable,
} }
}, },
}) })