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.

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

customizations for arraylist, fix oneOf tab renderer disabled property #2408

Merged
merged 4 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/vue-vuetify/src/complex/AllOfRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
:schema="control.schema"
combinatorKeyword="allOf"
:path="path"
:rootSchema="control.rootSchema"
/>
<dispatch-renderer
v-for="(allOfRenderInfo, allOfIndex) in allOfRenderInfos"
Expand Down
1 change: 1 addition & 0 deletions packages/vue-vuetify/src/complex/AnyOfRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
:schema="control.schema"
combinatorKeyword="anyOf"
:path="path"
:rootSchema="control.rootSchema"
/>

<v-tabs v-model="selectedIndex">
Expand Down
20 changes: 16 additions & 4 deletions packages/vue-vuetify/src/complex/ArrayControlRenderer.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
<template>
<v-card v-if="control.visible" :class="styles.arrayList.root" elevation="0">
<v-card-title>
<v-toolbar flat :class="styles.arrayList.toolbar">
<v-card
v-if="control.visible"
:class="styles.arrayList.root"
elevation="0"
v-bind="vuetifyProps('v-card')"
>
<v-card-title
:class="styles.arrayList.title"
v-bind="vuetifyProps('v-card-title')"
>
<v-toolbar
flat
:class="styles.arrayList.toolbar"
v-bind="vuetifyProps('v-toolbar')"
>
<v-toolbar-title :class="styles.arrayList.label">{{
computedLabel
}}</v-toolbar-title>
Expand Down Expand Up @@ -36,7 +48,7 @@
</v-tooltip>
</v-toolbar>
</v-card-title>
<v-card-text>
<v-card-text v-bind="vuetifyProps('v-card-text')">
<v-container justify-space-around align-content-center>
<v-row justify="center">
<v-table
Expand Down
10 changes: 6 additions & 4 deletions packages/vue-vuetify/src/complex/ObjectRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@
import {
Generate,
findUISchema,
isObjectControl,
rankWith,
type ControlElement,
type GroupLayout,
type JsonFormsRendererRegistryEntry,
type UISchemaElement,
} from '@jsonforms/core';
import {
Expand Down Expand Up @@ -76,7 +73,12 @@ const controlRenderer = defineComponent({
},
detailUiSchema(): UISchemaElement {
const uiSchemaGenerator = () => {
const uiSchema = Generate.uiSchema(this.control.schema, 'Group');
const uiSchema = Generate.uiSchema(
this.control.schema,
'Group',
undefined,
this.control.rootSchema,
);
if (isEmpty(this.control.path)) {
uiSchema.type = 'VerticalLayout';
} else {
Expand Down
1 change: 1 addition & 0 deletions packages/vue-vuetify/src/complex/OneOfRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
:schema="control.schema"
combinatorKeyword="oneOf"
:path="path"
:rootSchema="control.rootSchema"
/>

<v-select
Expand Down
7 changes: 6 additions & 1 deletion packages/vue-vuetify/src/complex/OneOfTabRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
:schema="control.schema"
combinatorKeyword="oneOf"
:path="path"
:rootSchema="control.rootSchema"
/>

<v-tabs v-model="selectIndex" @update:model-value="handleTabChange">
<v-tabs
v-model="selectIndex"
@update:model-value="handleTabChange"
:disabled="!control.enabled"
>
<v-tab
v-for="(oneOfRenderInfo, oneOfIndex) in oneOfRenderInfos"
:key="`${control.path}-${oneOfIndex}`"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,12 @@ export default defineComponent({

if (propSchema) {
if (propSchema.type === 'object' || propSchema.type === 'array') {
propUiSchema = Generate.uiSchema(propSchema, 'Group');
propUiSchema = Generate.uiSchema(
propSchema,
'Group',
undefined,
control.value.rootSchema,
);
(propUiSchema as GroupLayout).label =
propSchema.title ?? startCase(propName);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ interface CombinatorProps {
schema: JsonSchema;
combinatorKeyword: 'oneOf' | 'anyOf' | 'allOf';
path: string;
rootSchema: JsonSchema;
}

export default defineComponent({
Expand All @@ -43,6 +44,10 @@ export default defineComponent({
type: String,
required: true,
},
rootSchema: {
type: Object as PropType<JsonSchema>,
required: true,
},
},
setup(props: CombinatorProps) {
const otherProps: JsonSchema = omit(
Expand All @@ -52,6 +57,8 @@ export default defineComponent({
const foundUISchema: UISchemaElement = Generate.uiSchema(
otherProps,
'VerticalLayout',
undefined,
props.rootSchema,
);

const isLayout = (uischema: UISchemaElement): uischema is Layout =>
Expand Down
25 changes: 20 additions & 5 deletions packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
<template>
<v-card v-if="control.visible" :class="styles.arrayList.root">
<v-card-title>
<v-toolbar flat :class="styles.arrayList.toolbar">
<v-card
v-if="control.visible"
:class="styles.arrayList.root"
v-bind="vuetifyProps('v-card')"
>
<v-card-title
:class="styles.arrayList.title"
v-bind="vuetifyProps('v-card-title')"
>
<v-toolbar
flat
:class="styles.arrayList.toolbar"
v-bind="vuetifyProps('v-toolbar')"
>
<v-toolbar-title :class="styles.arrayList.label">{{
computedLabel
}}</v-toolbar-title>
Expand Down Expand Up @@ -45,7 +56,7 @@
</slot>
</v-toolbar>
</v-card-title>
<v-card-text>
<v-card-text v-bind="vuetifyProps('v-card-text')">
<v-container
justify-space-around
align-content-center
Expand Down Expand Up @@ -196,7 +207,11 @@
{{ control.translations.noDataMessage }}
</v-container>
</v-card-text>
<v-card-actions v-if="$slots.actions" class="pb-8">
<v-card-actions
v-if="$slots.actions"
class="pb-8"
v-bind="vuetifyProps('v-card-actions')"
>
<slot
name="actions"
:addClass="styles.arrayList.addButton"
Expand Down
9 changes: 1 addition & 8 deletions packages/vue-vuetify/src/layouts/CategorizationRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,7 @@
</template>

<script lang="ts">
import {
and,
categorizationHasCategory,
isCategorization,
rankWith,
type JsonFormsRendererRegistryEntry,
type Layout,
} from '@jsonforms/core';
import { type Layout } from '@jsonforms/core';
import {
DispatchRenderer,
rendererProps,
Expand Down
1 change: 1 addition & 0 deletions packages/vue-vuetify/src/styles/defaultStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const defaultStyles: Styles = {
arrayList: {
root: 'array-list',
toolbar: 'array-list-toolbar',
title: 'array-list-title',
validationIcon: 'array-list-validation',
addButton: 'array-list-add',
label: 'array-list-label',
Expand Down
1 change: 1 addition & 0 deletions packages/vue-vuetify/src/styles/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface Styles {
arrayList: {
root?: string;
toolbar?: string;
title?: string;
validationIcon?: string;
container?: string;
addButton?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`ArrayControlRenderer.vue > should render component and match snapshot 1
</div>
<!---->
<!---->
<div data-v-4896f876="" class="v-card-title">
<div data-v-4896f876="" class="v-card-title array-list-title">
<header data-v-4896f876="" class="v-toolbar v-toolbar--flat v-toolbar--density-default v-theme--light v-locale--is-ltr array-list-toolbar">
<!---->
<div class="v-toolbar__content" style="height: 64px;">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`ArrayLayoutRenderer.vue > should render component and match snapshot 1`
</div>
<!---->
<!---->
<div data-v-5f91636e="" class="v-card-title">
<div data-v-5f91636e="" class="v-card-title array-list-title">
<header data-v-5f91636e="" class="v-toolbar v-toolbar--flat v-toolbar--density-default v-theme--light v-locale--is-ltr array-list-toolbar">
<!---->
<div class="v-toolbar__content" style="height: 64px;">
Expand Down
Loading