Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(time-picker): [time-picker] Optimize and modify component style issues #2452

Merged
merged 12 commits into from
Oct 29, 2024
Merged

feat(time-picker): [time-picker] Optimize and modify component style issues #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b8f097c
feat(date-picker): [date-picker]Optimize case display and fix style i…
Youyou-smiles Oct 24, 2024
f78f240
feat(date-picker): [date-picker]Optimize case display and fix style i…
Youyou-smiles Oct 24, 2024
b8b608e
feat(date-picker): [date-picker] Fix style issues
Youyou-smiles Oct 25, 2024
14ff6f6
feat(date-picker): [date-picker] Modify console for a large number of…
Youyou-smiles Oct 25, 2024
3fbc12b
Merge branch 'dev' of github.com:opentiny/tiny-vue into lty/feat-date…
Youyou-smiles Oct 28, 2024
16d1b48
feat(button): [button] Optimize demo style for feature display
Youyou-smiles Oct 28, 2024
ad7ca1d
feat(date-picker): [date-picker] Optimize demo style
Youyou-smiles Oct 28, 2024
1afb3ce
feat(time-picker): [time-picker] Optimize and modify component style …
Youyou-smiles Oct 28, 2024
3f895ff
feat(time-picker): [time-picker] Optimize and modify component style …
Youyou-smiles Oct 29, 2024
ba5b62b
feat(time-picker): [time-picker] Optimize style
Youyou-smiles Oct 29, 2024
ada0e28
feat(time-picker): [time-picker] Optimize style
Youyou-smiles Oct 29, 2024
2e75772
Merge branch 'release-3.19.0' into lty/feat-datePicker
Youyou-smiles Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/basic-usage-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const yearValue = ref('')

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/basic-usage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/clear-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ const IconClose = iconClose()

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/clear.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ export default {

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/custom-suffix-icon-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const IconMinus = iconMinus()

<style>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}

.my-date-picker {
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/custom-suffix-icon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {

<style>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}

.my-date-picker {
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/custom-weeks-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ function formatWeeks(customWeeks, weekFirstDays) {

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/custom-weeks.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ export default {

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
7 changes: 1 addition & 6 deletions examples/sites/demos/pc/app/date-picker/default-value-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ const defaultTimeRange = ref(['09:00:00', '18:00:00'])

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--datetimerange.tiny-input__inner) {
width: 360px;
}

width: 360px;
& > * {
margin-top: 12px;
}
Expand Down
7 changes: 1 addition & 6 deletions examples/sites/demos/pc/app/date-picker/default-value.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--datetimerange.tiny-input__inner) {
width: 360px;
}

width: 360px;
& > * {
margin-top: 12px;
}
Youyou-smiles marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
7 changes: 1 addition & 6 deletions examples/sites/demos/pc/app/date-picker/disabled-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,7 @@ const pickerOptions = {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--daterange.tiny-input__inner) {
width: 360px;
}

width: 360px;
& > * {
margin-top: 12px;
}
Expand Down
7 changes: 1 addition & 6 deletions examples/sites/demos/pc/app/date-picker/disabled.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--daterange.tiny-input__inner) {
width: 360px;
}

width: 360px;
& > * {
margin-top: 12px;
}
Expand Down
13 changes: 7 additions & 6 deletions examples/sites/demos/pc/app/date-picker/events-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<template>
<tiny-layout>
<tiny-row>
<tiny-col :span="4">
<tiny-row class="demo-row">
<tiny-col :span="6">
<label class="demo-date-picker-label">focus:</label>
<tiny-date-picker v-model="valueFocus" @focus="handleFocus"></tiny-date-picker>
</tiny-col>
<tiny-col :span="4">
<tiny-col :span="6">
<label class="demo-date-picker-label">blur:</label>
<tiny-date-picker v-model="valueBlur" @blur="handleBlur"></tiny-date-picker>
</tiny-col>
<tiny-col :span="4">
<tiny-col :span="6">
<label class="demo-date-picker-label">change:</label>
<tiny-date-picker v-model="valueChange" @change="handleChange"></tiny-date-picker>
</tiny-col>
</tiny-row>
<tiny-row>
<tiny-col :span="6">
<label class="demo-date-picker-label">onPick:</label>
<tiny-date-picker v-model="valueOnPick" type="daterange" :picker-options="pickerOptions"></tiny-date-picker>
Expand Down Expand Up @@ -52,6 +50,9 @@ const pickerOptions = {
</script>

<style scoped>
.demo-row {
width: 80%;
}
Youyou-smiles marked this conversation as resolved.
Show resolved Hide resolved
.demo-date-picker-label {
display: inline-block;
margin: 12px 0;
Expand Down
13 changes: 7 additions & 6 deletions examples/sites/demos/pc/app/date-picker/events.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<template>
<tiny-layout>
<tiny-row>
<tiny-col :span="4">
<tiny-row class="demo-row">
<tiny-col :span="6">
Youyou-smiles marked this conversation as resolved.
Show resolved Hide resolved
<label class="demo-date-picker-label">focus:</label>
<tiny-date-picker v-model="valueFocus" @focus="handleFocus"></tiny-date-picker>
</tiny-col>
<tiny-col :span="4">
<tiny-col :span="6">
<label class="demo-date-picker-label">blur:</label>
<tiny-date-picker v-model="valueBlur" @blur="handleBlur"></tiny-date-picker>
</tiny-col>
<tiny-col :span="4">
<tiny-col :span="6">
<label class="demo-date-picker-label">change:</label>
<tiny-date-picker v-model="valueChange" @change="handleChange"></tiny-date-picker>
</tiny-col>
</tiny-row>
<tiny-row>
<tiny-col :span="6">
<label class="demo-date-picker-label">onPick:</label>
<tiny-date-picker v-model="valueOnPick" type="daterange" :picker-options="pickerOptions"></tiny-date-picker>
Expand Down Expand Up @@ -64,6 +62,9 @@ export default {
</script>

<style scoped>
.demo-row {
width: 80%;
}
Youyou-smiles marked this conversation as resolved.
Show resolved Hide resolved
.demo-date-picker-label {
display: inline-block;
margin: 12px 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/filter-mode-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const rangeValue = ref('')

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/filter-mode.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/format-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const selectedValue = ref(1590076800000)

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/format.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
9 changes: 1 addition & 8 deletions examples/sites/demos/pc/app/date-picker/label-inside-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,7 @@ const dateRangeValue = ref([])

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--daterange.tiny-input__inner) {
width: 360px;
}
:deep(.tiny-range__close-icon) {
right: -4px;
}
width: 360px;

& > * {
margin-top: 12px;
Expand Down
9 changes: 1 addition & 8 deletions examples/sites/demos/pc/app/date-picker/label-inside.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--daterange.tiny-input__inner) {
width: 360px;
}
:deep(.tiny-range__close-icon) {
right: -4px;
}
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/multiple-dates-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const yearsValue = ref('')

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/multiple-dates.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;

& > * {
margin-top: 12px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/now-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const now = () => {

<style scoped>
.demo-date-picker {
width: 280px;
width: 360px;
}
.nowclass {
display: inline-flex;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/now.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default {

<style scoped>
.demo-date-picker {
width: 280px;
width: 360px;
}
.nowclass {
display: inline-flex;
Expand Down
7 changes: 1 addition & 6 deletions examples/sites/demos/pc/app/date-picker/size-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,7 @@ const radioValue = ref('default')

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--daterange.tiny-input__inner) {
width: 360px;
}

width: 360px;
& > * {
margin-top: 12px;
}
Expand Down
7 changes: 1 addition & 6 deletions examples/sites/demos/pc/app/date-picker/size.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;

:deep(.tiny-date-editor--daterange.tiny-input__inner) {
width: 360px;
}

width: 360px;
& > * {
margin-top: 12px;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/step-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ const value = ref('')

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/step.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ export default {

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ function selectChange(tz) {

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/timezone.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ export default {

<style scoped>
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
Youyou-smiles marked this conversation as resolved.
Show resolved Hide resolved
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/unlink-panels-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ const value = ref([])

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/unlink-panels.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 280px;
width: 360px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/validate-event-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function resetForm() {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 400px;
width: 360px;

:deep(.tiny-form-item .tiny-form-item) {
margin-bottom: 8px;
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/date-picker/validate-event.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default {

<style scoped lang="less">
.demo-date-picker-wrap {
width: 400px;
width: 360px;

:deep(.tiny-form-item .tiny-form-item) {
margin-bottom: 8px;
Expand Down
Loading
Loading