Skip to content

Commit c765c3e

Browse files
committed
add arrayList.title missed from the migration, add additional customizations for array renderers, fix one tab disable property
1 parent 9c1c7da commit c765c3e

File tree

6 files changed

+44
-18
lines changed

6 files changed

+44
-18
lines changed

packages/vue-vuetify/src/complex/ArrayControlRenderer.vue

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
<template>
2-
<v-card v-if="control.visible" :class="styles.arrayList.root" elevation="0">
3-
<v-card-title>
4-
<v-toolbar flat :class="styles.arrayList.toolbar">
2+
<v-card
3+
v-if="control.visible"
4+
:class="styles.arrayList.root"
5+
elevation="0"
6+
v-bind="vuetifyProps('v-card')"
7+
>
8+
<v-card-title
9+
:class="styles.arrayList.title"
10+
v-bind="vuetifyProps('v-card-title')"
11+
>
12+
<v-toolbar
13+
flat
14+
:class="styles.arrayList.toolbar"
15+
v-bind="vuetifyProps('v-toolbar')"
16+
>
517
<v-toolbar-title :class="styles.arrayList.label">{{
618
computedLabel
719
}}</v-toolbar-title>
@@ -36,7 +48,7 @@
3648
</v-tooltip>
3749
</v-toolbar>
3850
</v-card-title>
39-
<v-card-text>
51+
<v-card-text v-bind="vuetifyProps('v-card-text')">
4052
<v-container justify-space-around align-content-center>
4153
<v-row justify="center">
4254
<v-table

packages/vue-vuetify/src/complex/OneOfTabRenderer.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
:path="path"
77
/>
88

9-
<v-tabs v-model="selectIndex" @update:model-value="handleTabChange">
9+
<v-tabs
10+
v-model="selectIndex"
11+
@update:model-value="handleTabChange"
12+
:disabled="!control.enabled"
13+
>
1014
<v-tab
1115
v-for="(oneOfRenderInfo, oneOfIndex) in oneOfRenderInfos"
1216
:key="`${control.path}-${oneOfIndex}`"

packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
<template>
2-
<v-card v-if="control.visible" :class="styles.arrayList.root">
3-
<v-card-title>
4-
<v-toolbar flat :class="styles.arrayList.toolbar">
2+
<v-card
3+
v-if="control.visible"
4+
:class="styles.arrayList.root"
5+
v-bind="vuetifyProps('v-card')"
6+
>
7+
<v-card-title
8+
:class="styles.arrayList.title"
9+
v-bind="vuetifyProps('v-card-title')"
10+
>
11+
<v-toolbar
12+
flat
13+
:class="styles.arrayList.toolbar"
14+
v-bind="vuetifyProps('v-toolbar')"
15+
>
516
<v-toolbar-title :class="styles.arrayList.label">{{
617
computedLabel
718
}}</v-toolbar-title>
@@ -45,7 +56,7 @@
4556
</slot>
4657
</v-toolbar>
4758
</v-card-title>
48-
<v-card-text>
59+
<v-card-text v-bind="vuetifyProps('v-card-text')">
4960
<v-container
5061
justify-space-around
5162
align-content-center
@@ -196,7 +207,11 @@
196207
{{ control.translations.noDataMessage }}
197208
</v-container>
198209
</v-card-text>
199-
<v-card-actions v-if="$slots.actions" class="pb-8">
210+
<v-card-actions
211+
v-if="$slots.actions"
212+
class="pb-8"
213+
v-bind="vuetifyProps('v-card-actions')"
214+
>
200215
<slot
201216
name="actions"
202217
:addClass="styles.arrayList.addButton"

packages/vue-vuetify/src/layouts/CategorizationRenderer.vue

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,7 @@
7373
</template>
7474

7575
<script lang="ts">
76-
import {
77-
and,
78-
categorizationHasCategory,
79-
isCategorization,
80-
rankWith,
81-
type JsonFormsRendererRegistryEntry,
82-
type Layout,
83-
} from '@jsonforms/core';
76+
import { type Layout } from '@jsonforms/core';
8477
import {
8578
DispatchRenderer,
8679
rendererProps,

packages/vue-vuetify/src/styles/defaultStyles.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export const defaultStyles: Styles = {
2323
arrayList: {
2424
root: 'array-list',
2525
toolbar: 'array-list-toolbar',
26+
title: 'array-list-title',
2627
validationIcon: 'array-list-validation',
2728
addButton: 'array-list-add',
2829
label: 'array-list-label',

packages/vue-vuetify/src/styles/styles.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export interface Styles {
3737
arrayList: {
3838
root?: string;
3939
toolbar?: string;
40+
title?: string;
4041
validationIcon?: string;
4142
container?: string;
4243
addButton?: string;

0 commit comments

Comments
 (0)