diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue index d13cada7..d1a5cbc8 100644 --- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue @@ -89,6 +89,7 @@ v-model="config.customize.formatType" class="bs-el-select" popper-class="bs-el-select" + clearable @change="selectFormatType" > - +
+ + + + +
@@ -175,13 +188,15 @@ export default { watch: {}, mounted () {}, methods: { - selectFormatType (val) { - if (val === 'default') { + selectFormatType (type) { + if (type === 'default') { this.config.customize.value = '' this.config.customize.valueFormat = '' - } else if (val === 'timestamp') { + } else if (type === 'timestamp') { this.config.customize.value = 0 this.config.customize.valueFormat = 'timestamp' + } else if (type === 'custom') { + this.config.customize.valueFormat = 'HH:mm:ss' } } } @@ -193,4 +208,11 @@ export default { width: 97%; padding: 16px; } + .time-format-description{ + display: flex; + align-items: center; + .el-tooltip{ + margin-left: 5px; + } + } diff --git a/data-room-ui/packages/SettingTitle/index.vue b/data-room-ui/packages/SettingTitle/index.vue index 02b80ee4..2fc184cc 100644 --- a/data-room-ui/packages/SettingTitle/index.vue +++ b/data-room-ui/packages/SettingTitle/index.vue @@ -9,8 +9,6 @@