Skip to content

Commit

Permalink
Merge branch 'master' into fix-19441
Browse files Browse the repository at this point in the history
  • Loading branch information
yuwu9145 committed May 23, 2024
2 parents ff1e855 + c3b2d29 commit 0709cb7
Show file tree
Hide file tree
Showing 27 changed files with 350 additions and 121 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.6.6",
"version": "3.6.7",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
"version": "3.6.6",
"version": "3.6.7",
"private": true,
"description": "",
"scripts": {
Expand All @@ -17,7 +17,7 @@
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.27",
"vuetify": "^3.6.6"
"vuetify": "^3.6.7"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
Expand Down
5 changes: 3 additions & 2 deletions packages/api-generator/src/locale/en/VDataTable.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"headers": "An array of objects that each describe a header column. See the example below for a definition of all properties.",
"headersLength": "Can be used in combination with `hide-default-header` to specify the number of columns in the table to allow expansion rows and loading bar to function properly.",
"height": "Set an explicit height of table.",
"hideDefaultBody": "Hides the default body.",
"hideDefaultHeader": "Hides the default header.",
"hideDefaultFooter": "Hides the default footer. This has no effect on `v-data-table-virtual`.",
"hover": "Adds a hover effects to a table rows.",
Expand Down Expand Up @@ -53,9 +54,9 @@
"group.summary": "Slot to customize the default rendering of group summaries.",
"heading": "Slot to add a custom header.",
"header.<name>": "Slot to customize a specific header column.",
"header.data-table-select": "Slot to replace the default `v-simple-checkbox` in header.",
"header.data-table-select": "Slot to replace the default `v-checkbox-btn` in header.",
"item": "Slot to replace the default rendering of a row.",
"item.data-table-select": "Slot to replace the default `v-simple-checkbox` used when selecting rows.",
"item.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
"item.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
"item.<name>": "Slot to customize a specific column.",
"loading": "Defines content for when `loading` is true and no items are provided.",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-generator/src/locale/en/VDataTableServer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"bottom": "Slot to add content below the table.",
"colgroup": "Slot to replace the default rendering of the `<colgroup>` element.",
"column.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
"column.data-table-select": "Slot to replace the default `v-simple-checkbox` used when selecting rows.",
"column.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
"dataTableGroup": "Slot for custom rendering of a group.",
"data-table-select": "Slot for custom rendering of a header cell with the select checkbox.",
"disableSort": "Disables sorting completely.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bottom": "Slot to add content below the table.",
"colgroup": "Slot to replace the default rendering of the `<colgroup>` element.",
"column.data-table-expand": "Slot to replace the default `v-icon` used when expanding rows.",
"column.data-table-select": "Slot to replace the default `v-simple-checkbox` used when selecting rows.",
"column.data-table-select": "Slot to replace the default `v-checkbox-btn` used when selecting rows.",
"data-table-group": "Slot for custom rendering of a group.",
"data-table-select": "Slot for custom rendering of a header cell with the select checkbox.",
"disableSort": "Disables sorting completely.",
Expand Down
6 changes: 3 additions & 3 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <john@vuetifyjs.com>",
"version": "3.6.6",
"version": "3.6.7",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
Expand Down Expand Up @@ -38,7 +38,7 @@
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.16.1",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.6.6"
"vuetify": "^3.6.7"
},
"devDependencies": {
"@emailjs/browser": "^4.3.3",
Expand All @@ -50,7 +50,7 @@
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.27",
"@vuetify/api-generator": "^3.6.6",
"@vuetify/api-generator": "^3.6.7",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
Expand Down
32 changes: 16 additions & 16 deletions packages/docs/src/data/team.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,6 @@
"work": "COO @ Vuetify",
"joined": "Nov 2019"
},
"alexandriajackson": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/alexandria.jpg",
"discord": "alexandriajackson_",
"focus": [
"[vuetifyjs/*](https://github.com/vuetifyjs)"
],
"languages": [
"English"
],
"location": "Dallas, TX, USA",
"name": "Alexandria Jackson",
"team": "company",
"twitter": "AlexxJackson96",
"work": "Marketing Coordinator @ Vuetify",
"joined": "Sept 2023"
},
"KaelWD": {
"discord": "kaelwd",
"focus": [
Expand Down Expand Up @@ -267,5 +251,21 @@
"name": "Yoones Khoshghadam",
"team": "legends",
"joined": "January 2023"
},
"alexandriajackson": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/alexandria.jpg",
"discord": "alexandriajackson_",
"focus": [
"[vuetifyjs/*](https://github.com/vuetifyjs)"
],
"languages": [
"English"
],
"location": "Dallas, TX, USA",
"name": "Alexandria Jackson",
"team": "company",
"twitter": "AlexxJackson96",
"work": "Marketing Coordinator @ Vuetify",
"joined": "Sept 2023"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<template>
<v-data-table
:items="desserts"
item-value="name"
show-select
>
<template v-slot:header.data-table-select="{ allSelected, selectAll, someSelected }">
<v-checkbox-btn
:indeterminate="someSelected && !allSelected"
:model-value="allSelected"
color="primary"
@update:model-value="selectAll(!allSelected)"
></v-checkbox-btn>
</template>

<template v-slot:item.data-table-select="{ internalItem, isSelected, toggleSelect }">
<v-checkbox-btn
:model-value="isSelected(internalItem)"
color="primary"
@update:model-value="toggleSelect(internalItem)"
></v-checkbox-btn>
</template>
</v-data-table>
</template>

<script setup>
const desserts = [
{
name: 'Frozen Yogurt',
calories: 159,
fat: 6,
carbs: 24,
protein: 4,
iron: 1,
},
{
name: 'Ice cream sandwich',
calories: 237,
fat: 9,
carbs: 37,
protein: 4.3,
iron: 1,
},
{
name: 'Eclair',
calories: 262,
fat: 16,
carbs: 23,
protein: 6,
iron: 7,
},
{
name: 'Cupcake',
calories: 305,
fat: 3.7,
carbs: 67,
protein: 4.3,
iron: 8,
},
{
name: 'Gingerbread',
calories: 356,
fat: 16,
carbs: 49,
protein: 3.9,
iron: 16,
},
{
name: 'Jelly bean',
calories: 375,
fat: 0,
carbs: 94,
protein: 0,
iron: 0,
},
{
name: 'Lollipop',
calories: 392,
fat: 0.2,
carbs: 98,
protein: 0,
iron: 2,
},
{
name: 'Honeycomb',
calories: 408,
fat: 3.2,
carbs: 87,
protein: 6.5,
iron: 45,
},
{
name: 'Donut',
calories: 452,
fat: 25,
carbs: 51,
protein: 4.9,
iron: 22,
},
{
name: 'KitKat',
calories: 518,
fat: 26,
carbs: 65,
protein: 7,
iron: 6,
},
]
</script>

<script>
export default {
data () {
return {
desserts: [
{
name: 'Frozen Yogurt',
calories: 159,
fat: 6.0,
carbs: 24,
protein: 4.0,
iron: 1,
},
{
name: 'Ice cream sandwich',
calories: 237,
fat: 9.0,
carbs: 37,
protein: 4.3,
iron: 1,
},
{
name: 'Eclair',
calories: 262,
fat: 16.0,
carbs: 23,
protein: 6.0,
iron: 7,
},
{
name: 'Cupcake',
calories: 305,
fat: 3.7,
carbs: 67,
protein: 4.3,
iron: 8,
},
{
name: 'Gingerbread',
calories: 356,
fat: 16.0,
carbs: 49,
protein: 3.9,
iron: 16,
},
{
name: 'Jelly bean',
calories: 375,
fat: 0.0,
carbs: 94,
protein: 0.0,
iron: 0,
},
{
name: 'Lollipop',
calories: 392,
fat: 0.2,
carbs: 98,
protein: 0,
iron: 2,
},
{
name: 'Honeycomb',
calories: 408,
fat: 3.2,
carbs: 87,
protein: 6.5,
iron: 45,
},
{
name: 'Donut',
calories: 452,
fat: 25.0,
carbs: 51,
protein: 4.9,
iron: 22,
},
{
name: 'KitKat',
calories: 518,
fat: 26.0,
carbs: 65,
protein: 7,
iron: 6,
},
],
}
},
}
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
<script>
export default {
data: () => ({
text: 'Tooltip',
scrollStrategy: 'block',
tooltip: {
text: 'Tooltip',
scrollStrategy: 'block',
},
}),
}
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ Use the **item-selectable** prop to designate a property on your items that cont

<ExamplesExample file="v-data-table/prop-item-selectable" />

### Custom select column

Use the **item.data-table-select** slot alongside `v-checkbox-btn` to customize the checkbox used for row selection. You can also use the **header.data-table-select** slot to customize the select-all checkbox in the header of the column.

<ExamplesExample file="v-data-table/slot-item-data-table-select" />

### Select strategies

Data-tables support three different select strategies.
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vuetify",
"description": "Vue Material Component Framework",
"version": "3.6.6",
"version": "3.6.7",
"author": {
"name": "John Leider",
"email": "john@vuetifyjs.com"
Expand Down
Loading

0 comments on commit 0709cb7

Please sign in to comment.