diff --git a/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue b/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue index 94afbfa07e..0bbf51d678 100644 --- a/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue @@ -23,7 +23,7 @@ const yearValue = ref('') diff --git a/examples/sites/demos/pc/app/date-picker/clear.vue b/examples/sites/demos/pc/app/date-picker/clear.vue index 29236fde9a..a13639283a 100644 --- a/examples/sites/demos/pc/app/date-picker/clear.vue +++ b/examples/sites/demos/pc/app/date-picker/clear.vue @@ -41,6 +41,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue index 79ae7d8110..8e89c78684 100644 --- a/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue @@ -15,7 +15,7 @@ const IconMinus = iconMinus() diff --git a/examples/sites/demos/pc/app/date-picker/custom-weeks.vue b/examples/sites/demos/pc/app/date-picker/custom-weeks.vue index b3cea104c8..2f3f276df8 100644 --- a/examples/sites/demos/pc/app/date-picker/custom-weeks.vue +++ b/examples/sites/demos/pc/app/date-picker/custom-weeks.vue @@ -57,6 +57,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue b/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue index 0e26f8d5cc..55ee57366b 100644 --- a/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue @@ -31,12 +31,7 @@ const defaultTimeRange = ref(['09:00:00', '18:00:00']) diff --git a/examples/sites/demos/pc/app/date-picker/step.vue b/examples/sites/demos/pc/app/date-picker/step.vue index 526c475bc6..91d3b5aa4c 100644 --- a/examples/sites/demos/pc/app/date-picker/step.vue +++ b/examples/sites/demos/pc/app/date-picker/step.vue @@ -36,6 +36,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue b/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue index 90aae215fd..ac89908a3c 100644 --- a/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue @@ -45,6 +45,6 @@ function selectChange(tz) { diff --git a/examples/sites/demos/pc/app/date-picker/timezone.vue b/examples/sites/demos/pc/app/date-picker/timezone.vue index e148dc86fe..cc63e9abca 100644 --- a/examples/sites/demos/pc/app/date-picker/timezone.vue +++ b/examples/sites/demos/pc/app/date-picker/timezone.vue @@ -55,6 +55,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue b/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue index 78799e78e7..98c8f99ae8 100644 --- a/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue @@ -24,6 +24,6 @@ const value = ref([]) diff --git a/examples/sites/demos/pc/app/date-picker/unlink-panels.vue b/examples/sites/demos/pc/app/date-picker/unlink-panels.vue index fce19d102c..45443a4c9f 100644 --- a/examples/sites/demos/pc/app/date-picker/unlink-panels.vue +++ b/examples/sites/demos/pc/app/date-picker/unlink-panels.vue @@ -32,6 +32,6 @@ export default { diff --git a/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue b/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue index 73600329e9..514d981e0c 100644 --- a/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue +++ b/examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue @@ -84,7 +84,7 @@ function resetForm() { diff --git a/examples/sites/demos/pc/app/time-picker/is-range.vue b/examples/sites/demos/pc/app/time-picker/is-range.vue index c88c0c18b8..a7c28ee54e 100644 --- a/examples/sites/demos/pc/app/time-picker/is-range.vue +++ b/examples/sites/demos/pc/app/time-picker/is-range.vue @@ -24,6 +24,6 @@ export default { diff --git a/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js b/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js index 8093293f67..a8616d485c 100644 --- a/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js +++ b/examples/sites/demos/pc/app/time-picker/webdoc/time-picker.js @@ -22,7 +22,7 @@ export default { 'en-US': 'Select time range' }, desc: { - 'zh-CN': '

picker-options 设置固定时间范围

', + 'zh-CN': '

通过picker-options 设置固定时间范围

', 'en-US': '

picker-options Setting a fixed time range.

' }, codeFiles: ['picker-options.vue'] @@ -35,7 +35,7 @@ export default { }, desc: { 'zh-CN': - "

is-range 设置是否为范围选择,默认为 false,range-separator,设置范围选择分隔符(为可选值)默认为 '-'。

", + "

通过is-range 设置是否为范围选择,默认为 false,通过range-separator设置范围选择分隔符(为可选值)默认为 '-'。

", 'en-US': "

is-range whether the setting is range selection. Default is false, range-separator , and the range selection delimiter (optional) defaults to'-'.

" }, diff --git a/packages/theme/src/picker/index.less b/packages/theme/src/picker/index.less index 888a7dede8..0719632349 100644 --- a/packages/theme/src/picker/index.less +++ b/packages/theme/src/picker/index.less @@ -114,21 +114,17 @@ width: 12%; } - .@{range-prefix-cls}__close-box { - height: 16px; - z-index: 5; - position: relative; - } - .@{range-prefix-cls}__close-icon { - width: 20px; - height: 18px; + width: 16px; + height: 16px; position: absolute; - right: -20px; + top: 16px; + right: 12px; + transform: translateY(-50%); background-color: #ffffff; - margin-top: -1px; - - &, + fill: var(--tv-Picker-icon-color); + z-index: 5; + &:hover { fill: var(--tv-Picker-icon-color-hover); } @@ -177,7 +173,7 @@ } .@{range-prefix-cls}-separator { - line-height: 28px; + line-height: 20px; font-size: var(--tv-Picker-font-size); } diff --git a/packages/theme/src/time-panel/index.less b/packages/theme/src/time-panel/index.less index 45663d660a..61a26e12a8 100644 --- a/packages/theme/src/time-panel/index.less +++ b/packages/theme/src/time-panel/index.less @@ -36,13 +36,10 @@ display: block; } - &__header-input { - margin: var(--tv-TimePanel-header-margin); - } - &__header-title { display: flex; justify-content: space-around; + margin: var(--tv-TimePanel-header-margin); color: var(--tv-TimePanel-header-text-color); align-items: center; } diff --git a/packages/theme/src/time-panel/vars.less b/packages/theme/src/time-panel/vars.less index e74010011a..fcb84b88c6 100644 --- a/packages/theme/src/time-panel/vars.less +++ b/packages/theme/src/time-panel/vars.less @@ -29,7 +29,7 @@ --tv-TimePanel-border-color-divider: var(--tv-color-border-divider, #f0f0f0); // 头部外间距 - --tv-TimePanel-header-margin: var(--tv-space-xl, 16px) 2px 24px 2px; + --tv-TimePanel-header-margin: var(--tv-space-xl, 16px) 2px 0 2px; // 头部文本色 --tv-TimePanel-header-text-color: var(--tv-color-text-weaken, #808080); // 内容区底部内间距 diff --git a/packages/theme/src/time-spinner/index.less b/packages/theme/src/time-spinner/index.less index 21085ceb06..d21a9901ff 100644 --- a/packages/theme/src/time-spinner/index.less +++ b/packages/theme/src/time-spinner/index.less @@ -54,6 +54,9 @@ } .@{time-spinner-prefix-cls}__list { + display: flex; + flex-direction: column; + align-items: center; transform: translateY(-6px); margin: var(--tv-TimeSpinner-list-margin); } @@ -64,7 +67,12 @@ } } } - + &__wrapper.is-arrow { + height: 220px; + } + &__wrapper.is-arrow .@{time-spinner-prefix-cls}__list{ + height: 200px; + } &__arrow { height: 30px; line-height: 30px; diff --git a/packages/vue/src/picker/src/pc.vue b/packages/vue/src/picker/src/pc.vue index f5407f9ef5..02a3a3ec2b 100644 --- a/packages/vue/src/picker/src/pc.vue +++ b/packages/vue/src/picker/src/pc.vue @@ -120,11 +120,11 @@ /> -
+
diff --git a/packages/vue/src/time/src/pc.vue b/packages/vue/src/time/src/pc.vue index 6a29bd7dee..6b6a1a4fc6 100644 --- a/packages/vue/src/time/src/pc.vue +++ b/packages/vue/src/time/src/pc.vue @@ -13,9 +13,6 @@
-
- -
{{ t('ui.datepicker.hour') }} {{ t('ui.datepicker.minute') }} @@ -58,14 +55,12 @@ import { renderless, api } from '@opentiny/vue-renderless/time/vue' import { props, setup, defineComponent } from '@opentiny/vue-common' import TimeSpinner from '@opentiny/vue-time-spinner' -import Input from '@opentiny/vue-input' import Button from '@opentiny/vue-button' export default defineComponent({ emits: ['dodestroy', 'pick', 'select-range'], components: { TimeSpinner, - TinyInput: Input, TinyButton: Button }, props: [...props, 'show', 'timeArrowControl', 'emitter', 'value', 'step'],