Skip to content

Commit eb42f4d

Browse files
KaelWDKaelWD
committed
Merge branch 'master' into dev
2 parents af74f62 + aeb0077 commit eb42f4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+545
-676
lines changed

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
}
1414
},
1515
"npmClient": "pnpm",
16-
"version": "3.9.3"
16+
"version": "3.9.4"
1717
}

‎packages/api-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vuetify/api-generator",
33
"type": "module",
4-
"version": "3.9.3",
4+
"version": "3.9.4",
55
"private": true,
66
"description": "",
77
"scripts": {

‎packages/api-generator/src/locale/en/VVideo.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"props": {
3+
"aspectRatio": "Sets the aspect ratio for the playback, calculated as width/height.",
34
"src": "Media file URL",
45
"type": "Media file type (optional)",
56
"image": "Apply a specific image as cover before the video is loaded.",

‎packages/docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "A Vue.js project",
55
"private": true,
66
"author": "John Leider <[email protected]>",
7-
"version": "3.9.3",
7+
"version": "3.9.4",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/vuetifyjs/vuetify.git",

‎packages/docs/src/examples/v-data-table/misc-expand.vue‎

Lines changed: 88 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
color="medium-emphasis"
1515
size="small"
1616
variant="text"
17+
width="105"
1718
border
1819
slim
1920
@click="toggleExpand(internalItem)"
@@ -35,18 +36,18 @@
3536

3637
<tbody>
3738
<tr>
38-
<td>
39+
<td class="py-2">
3940
<v-rating
4041
:model-value="item.details.rating"
4142
color="orange-darken-2"
4243
density="comfortable"
43-
size="x-small"
44+
size="small"
4445
half-increments
4546
readonly
4647
></v-rating>
4748
</td>
48-
<td>{{ item.details.synopsis }}</td>
49-
<td>{{ item.details.cast.join(', ') }}</td>
49+
<td class="py-2">{{ item.details.synopsis }}</td>
50+
<td class="py-2">{{ item.details.cast.join(', ') }}</td>
5051
</tr>
5152
</tbody>
5253
</v-table>
@@ -59,11 +60,12 @@
5960

6061
<script setup>
6162
const headers = [
62-
{ title: 'Title', key: 'title', align: 'start', sortable: true },
63-
{ title: 'Director', key: 'director' },
64-
{ title: 'Genre', key: 'genre' },
65-
{ title: 'Year', key: 'year', align: 'end' },
66-
{ title: 'Runtime(min)', key: 'runtime', align: 'end' },
63+
{ width: 300, title: 'Title', key: 'title', align: 'start', sortable: true },
64+
{ width: 250, title: 'Director', key: 'director' },
65+
{ width: 150, title: 'Genre', key: 'genre' },
66+
{ width: 100, title: 'Year', key: 'year', align: 'end' },
67+
{ width: 140, title: 'Runtime(min)', key: 'runtime', align: 'end' },
68+
{ width: 1, key: 'data-table-expand', align: 'end' }, // optional, to keep it as short as possible
6769
]
6870
6971
const movies = [
@@ -129,3 +131,80 @@
129131
},
130132
]
131133
</script>
134+
135+
<script>
136+
export default {
137+
data: () => ({
138+
headers: [
139+
{ width: 300, title: 'Title', key: 'title', align: 'start', sortable: true },
140+
{ width: 250, title: 'Director', key: 'director' },
141+
{ width: 150, title: 'Genre', key: 'genre' },
142+
{ width: 100, title: 'Year', key: 'year', align: 'end' },
143+
{ width: 140, title: 'Runtime(min)', key: 'runtime', align: 'end' },
144+
{ width: 1, key: 'data-table-expand', align: 'end' }, // optional, to keep it as short as possible
145+
],
146+
movies: [
147+
{
148+
title: 'The Shawshank Redemption',
149+
director: 'Frank Darabont',
150+
genre: 'Drama',
151+
year: 1994,
152+
runtime: 142,
153+
details: {
154+
synopsis: 'Two imprisoned men bond over years, finding solace and redemption through acts of decency.',
155+
cast: ['Tim Robbins', 'Morgan Freeman'],
156+
rating: 3.5,
157+
},
158+
},
159+
{
160+
title: 'Inception',
161+
director: 'Christopher Nolan',
162+
genre: 'Sci-Fi',
163+
year: 2010,
164+
runtime: 148,
165+
details: {
166+
synopsis: 'A thief with the ability to enter dreams is tasked with stealing a secret from the subconscious.',
167+
cast: ['Leonardo DiCaprio', 'Joseph Gordon-Levitt'],
168+
rating: 5,
169+
},
170+
},
171+
{
172+
title: 'The Godfather',
173+
director: 'Francis Ford Coppola',
174+
genre: 'Crime',
175+
year: 1972,
176+
runtime: 175,
177+
details: {
178+
synopsis: 'The aging patriarch of a crime dynasty transfers control to his reluctant son.',
179+
cast: ['Marlon Brando', 'Al Pacino'],
180+
rating: 4.5,
181+
},
182+
},
183+
{
184+
title: 'Pulp Fiction',
185+
director: 'Quentin Tarantino',
186+
genre: 'Crime',
187+
year: 1994,
188+
runtime: 154,
189+
details: {
190+
synopsis: 'Interwoven stories of criminals, violence, and redemption in Los Angeles.',
191+
cast: ['John Travolta', 'Samuel L. Jackson'],
192+
rating: 4.5,
193+
},
194+
},
195+
{
196+
title: 'The Dark Knight',
197+
director: 'Christopher Nolan',
198+
genre: 'Action',
199+
year: 2008,
200+
runtime: 152,
201+
details: {
202+
synopsis: 'When the menace known as the Joker wreaks havoc and chaos on the people of Gotham, Batman must accept one of the greatest psychological and physical tests of his ability to fight injustice.',
203+
cast: ['Christian Bale', 'Heath Ledger'],
204+
rating: 4,
205+
},
206+
},
207+
],
208+
}),
209+
}
210+
</script>

‎packages/docs/src/examples/v-data-table/slot-group-header.vue‎

Lines changed: 27 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,25 @@
33
:group-by="groupBy"
44
:headers="headers"
55
:items="tools"
6+
:items-per-page="-1"
67
item-value="name"
78
hide-default-footer
89
>
910
<template v-slot:group-header="{ item, columns, toggleGroup, isGroupOpen }">
1011
<tr>
11-
<td :colspan="columns.length">
12+
<td
13+
:colspan="columns.length"
14+
class="cursor-pointer"
15+
v-ripple
16+
@click="toggleGroup(item)"
17+
>
1218
<div class="d-flex align-center">
1319
<v-btn
1420
:icon="isGroupOpen(item) ? '$expand' : '$next'"
1521
color="medium-emphasis"
1622
density="comfortable"
1723
size="small"
1824
variant="outlined"
19-
@click="toggleGroup(item)"
2025
></v-btn>
2126

2227
<span class="ms-4">Tool Type: {{ item.value }}</span>
@@ -43,76 +48,16 @@
4348
]
4449
4550
const tools = [
46-
{
47-
name: 'Hammer',
48-
weight: 0.5,
49-
length: 30,
50-
price: 10,
51-
type: 'hand',
52-
},
53-
{
54-
name: 'Screwdriver',
55-
weight: 0.2,
56-
length: 20,
57-
price: 5,
58-
type: 'hand',
59-
},
60-
{
61-
name: 'Drill',
62-
weight: 1.5,
63-
length: 25,
64-
price: 50,
65-
type: 'power',
66-
},
67-
{
68-
name: 'Saw',
69-
weight: 0.7,
70-
length: 50,
71-
price: 15,
72-
type: 'hand',
73-
},
74-
{
75-
name: 'Tape Measure',
76-
weight: 0.3,
77-
length: 10,
78-
price: 8,
79-
type: 'measuring',
80-
},
81-
{
82-
name: 'Level',
83-
weight: 0.4,
84-
length: 60,
85-
price: 12,
86-
type: 'measuring',
87-
},
88-
{
89-
name: 'Wrench',
90-
weight: 0.6,
91-
length: 25,
92-
price: 10,
93-
type: 'hand',
94-
},
95-
{
96-
name: 'Pliers',
97-
weight: 0.3,
98-
length: 15,
99-
price: 7,
100-
type: 'hand',
101-
},
102-
{
103-
name: 'Sander',
104-
weight: 2.0,
105-
length: 30,
106-
price: 60,
107-
type: 'power',
108-
},
109-
{
110-
name: 'Multimeter',
111-
weight: 0.5,
112-
length: 15,
113-
price: 30,
114-
type: 'measuring',
115-
},
51+
{ name: 'Hammer', weight: 0.5, length: 30, price: 10, type: 'hand' },
52+
{ name: 'Screwdriver', weight: 0.2, length: 20, price: 5, type: 'hand' },
53+
{ name: 'Drill', weight: 1.5, length: 25, price: 50, type: 'power' },
54+
{ name: 'Saw', weight: 0.7, length: 50, price: 15, type: 'hand' },
55+
{ name: 'Tape Measure', weight: 0.3, length: 10, price: 8, type: 'measuring' },
56+
{ name: 'Level', weight: 0.4, length: 60, price: 12, type: 'measuring' },
57+
{ name: 'Wrench', weight: 0.6, length: 25, price: 10, type: 'hand' },
58+
{ name: 'Pliers', weight: 0.3, length: 15, price: 7, type: 'hand' },
59+
{ name: 'Sander', weight: 2.0, length: 30, price: 60, type: 'power' },
60+
{ name: 'Multimeter', weight: 0.5, length: 15, price: 30, type: 'measuring' },
11661
]
11762
</script>
11863

@@ -138,76 +83,16 @@
13883
{ title: 'Price ($)', key: 'price' },
13984
],
14085
tools: [
141-
{
142-
name: 'Hammer',
143-
weight: 0.5,
144-
length: 30,
145-
price: 10,
146-
type: 'hand',
147-
},
148-
{
149-
name: 'Screwdriver',
150-
weight: 0.2,
151-
length: 20,
152-
price: 5,
153-
type: 'hand',
154-
},
155-
{
156-
name: 'Drill',
157-
weight: 1.5,
158-
length: 25,
159-
price: 50,
160-
type: 'power',
161-
},
162-
{
163-
name: 'Saw',
164-
weight: 0.7,
165-
length: 50,
166-
price: 15,
167-
type: 'hand',
168-
},
169-
{
170-
name: 'Tape Measure',
171-
weight: 0.3,
172-
length: 10,
173-
price: 8,
174-
type: 'measuring',
175-
},
176-
{
177-
name: 'Level',
178-
weight: 0.4,
179-
length: 60,
180-
price: 12,
181-
type: 'measuring',
182-
},
183-
{
184-
name: 'Wrench',
185-
weight: 0.6,
186-
length: 25,
187-
price: 10,
188-
type: 'hand',
189-
},
190-
{
191-
name: 'Pliers',
192-
weight: 0.3,
193-
length: 15,
194-
price: 7,
195-
type: 'hand',
196-
},
197-
{
198-
name: 'Sander',
199-
weight: 2.0,
200-
length: 30,
201-
price: 60,
202-
type: 'power',
203-
},
204-
{
205-
name: 'Multimeter',
206-
weight: 0.5,
207-
length: 15,
208-
price: 30,
209-
type: 'measuring',
210-
},
86+
{ name: 'Hammer', weight: 0.5, length: 30, price: 10, type: 'hand' },
87+
{ name: 'Screwdriver', weight: 0.2, length: 20, price: 5, type: 'hand' },
88+
{ name: 'Drill', weight: 1.5, length: 25, price: 50, type: 'power' },
89+
{ name: 'Saw', weight: 0.7, length: 50, price: 15, type: 'hand' },
90+
{ name: 'Tape Measure', weight: 0.3, length: 10, price: 8, type: 'measuring' },
91+
{ name: 'Level', weight: 0.4, length: 60, price: 12, type: 'measuring' },
92+
{ name: 'Wrench', weight: 0.6, length: 25, price: 10, type: 'hand' },
93+
{ name: 'Pliers', weight: 0.3, length: 15, price: 7, type: 'hand' },
94+
{ name: 'Sander', weight: 2.0, length: 30, price: 60, type: 'power' },
95+
{ name: 'Multimeter', weight: 0.5, length: 15, price: 30, type: 'measuring' },
21196
],
21297
}
21398
},

‎packages/docs/src/examples/v-video/misc-in-card.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<template>
22
<div class="d-flex justify-center">
3-
<v-card elevation="4" rounded="xl">
3+
<v-card elevation="4" rounded="xl" width="400">
44
<v-card-item class="py-4">
55
<v-skeleton-loader type="list-item-avatar-two-line"></v-skeleton-loader>
66
</v-card-item>
77
<v-card-text class="pb-4 px-6">
88
<v-video
99
:volume="50"
10+
aspect-ratio="4 / 3"
1011
background-color="transparent"
1112
color="orange"
1213
controls-transition="slide-y-transition"
1314
elevation="0"
1415
image="https://jsek.work/vt-video-poster.jpg"
1516
rounded="xl"
1617
src="https://jsek.work/vt-video.mp4"
18+
width="100%"
1719
detached
1820
eager
1921
floating

0 commit comments

Comments
 (0)