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

fix: 443 update vjsf #1172

Merged
merged 4 commits into from
Jan 8, 2024
Merged

fix: 443 update vjsf #1172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3feebe5
fix: add spring boot starter
dominikhorn93 Jan 8, 2024
70f2ff3
fix: update vjsf version
dominikhorn93 Jan 8, 2024
7eee65a
fix: remove log
dominikhorn93 Jan 8, 2024
9c8dbf5
Merge branch 'dev' into fix/443_update_vjsf
dominikhorn93 Jan 8, 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
1 change: 1 addition & 0 deletions digiwf-apps/packages/apps/digiwf-forms-example/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ declare module '@vue/runtime-core' {
VTab: typeof import('vuetify/lib')['VTab']
VTabItem: typeof import('vuetify/lib')['VTabItem']
VTabs: typeof import('vuetify/lib')['VTabs']
VTextField: typeof import('vuetify/lib')['VTextField']
}
}
14 changes: 7 additions & 7 deletions digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion digiwf-apps/packages/apps/digiwf-forms-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@muenchen/digiwf-form-builder-settings": "^1.5.0",
"@muenchen/digiwf-form-renderer": "^1.5.0",
"@muenchen/digiwf-multi-file-input": "^1.5.0",
"@muenchen/vjsf": "^2.21.7",
"@muenchen/vjsf": "^2.21.8",
"vue": "^2.7.10",
"vuetify": "^2.6.9"
},
Expand Down
30 changes: 20 additions & 10 deletions digiwf-apps/packages/apps/digiwf-forms-example/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@
schema value
</v-tab>
<v-tab-item>
<dwf-form-builder :value="schema" @input="changed" :builderSettings="settings"></dwf-form-builder>
<dwf-form-builder :builderSettings="settings" :value="schema" @input="changed"></dwf-form-builder>
</v-tab-item>
<v-tab-item>
<div style="padding: 30px">
<v-text-field label="Change"
@beforeinput="evt => (!evt.data || /[\d,+-]/.test(evt.data)) || evt.preventDefault()"></v-text-field>
<v-text-field label="Keydown" type="number"
@keydown="obj => (obj.key.length > 1 || /[\d,+-]/.test(obj.key)) || obj.preventDefault()"></v-text-field>
<v-form ref="form">
<dwf-form-renderer :options="{locale : 'de', readOnly: false, markdownit: { breaks: true } }"
:schema="schema" :key="componentKey"
@input="valueChanged" :value="value">
<dwf-form-renderer :key="componentKey"
:options="{locale : 'de', readOnly: false, markdownit: { breaks: true } }"
:schema="schema"
:value="value" @input="valueChanged">
<template #custom-date-input="context">
<dwf-date-input v-bind="context"/>
</template>
Expand All @@ -45,7 +50,7 @@
</v-tab-item>
<v-tab-item>
<div style="padding: 30px">
<pre class="codeblock">{{JSON.stringify(value, undefined, 4)}}</pre>
<pre class="codeblock">{{ JSON.stringify(value, undefined, 4) }}</pre>
</div>
</v-tab-item>
</v-tabs>
Expand All @@ -64,11 +69,11 @@ html, body {
</style>

<script lang="ts">
import { DwfFormRenderer } from "@muenchen/digiwf-form-renderer";
import { DwfFormBuilder } from "@muenchen/digiwf-form-builder";
import { DwfDateInput, DwfTimeInput } from "@muenchen/digiwf-date-input";
import { SettingsEN } from "@muenchen/digiwf-form-builder-settings";
import { defineComponent, provide, ref } from "vue";
import {DwfFormRenderer} from "@muenchen/digiwf-form-renderer";
import {DwfFormBuilder} from "@muenchen/digiwf-form-builder";
import {DwfDateInput, DwfTimeInput} from "@muenchen/digiwf-date-input";
import {SettingsEN} from "@muenchen/digiwf-form-builder-settings";
import {defineComponent, provide, ref} from "vue";

export default defineComponent({
components: {DwfFormRenderer, DwfFormBuilder, DwfDateInput, DwfTimeInput},
Expand Down Expand Up @@ -134,7 +139,12 @@ export default defineComponent({

initSchema();

const log = (obj: any) => {
console.log(obj);
}

return {
log,
dominikhorn93 marked this conversation as resolved.
Show resolved Hide resolved
initSchema,
componentKey,
changed,
Expand Down
2 changes: 0 additions & 2 deletions digiwf-apps/packages/apps/digiwf-tasklist/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ declare module '@vue/runtime-core' {
ImageOutput: typeof import('./src/components/form/ImageOutput.vue')['default']
KeyBindingLine: typeof import('./src/components/UI/help/KeyBindingLine.vue')['default']
KeyboardAccessibilityIcon: typeof import('./src/components/UI/icons/KeyboardAccessibilityIcon.vue')['default']
KeyboardIcon: typeof import('./src/components/UI/icons/KeyboardAccessibilityIcon.vue')['default']
LoadingFab: typeof import('./src/components/UI/LoadingFab.vue')['default']
PdfOutput: typeof import('./src/components/form/PdfOutput.vue')['default']
ProcessDefinitionItem: typeof import('./src/components/process/ProcessDefinitionItem.vue')['default']
Expand Down Expand Up @@ -81,7 +80,6 @@ declare module '@vue/runtime-core' {
VListItem: typeof import('vuetify/lib')['VListItem']
VListItemAvatar: typeof import('vuetify/lib')['VListItemAvatar']
VListItemContent: typeof import('vuetify/lib')['VListItemContent']
VListItemGroup: typeof import('vuetify/lib')['VListItemGroup']
VListItemSubtitle: typeof import('vuetify/lib')['VListItemSubtitle']
VListItemTitle: typeof import('vuetify/lib')['VListItemTitle']
VMain: typeof import('vuetify/lib')['VMain']
Expand Down
19 changes: 7 additions & 12 deletions digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion digiwf-apps/packages/apps/digiwf-tasklist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@muenchen/digiwf-form-renderer": "^1.5.0",
"@muenchen/digiwf-multi-file-input": "^1.5.0",
"@muenchen/digiwf-task-api-internal": "^1.5.0",
"@muenchen/vjsf": "^2.21.7",
"@muenchen/vjsf": "^2.21.8",
"@tanstack/vue-query": "^4.19.1",
"core-js": "^3.8.3",
"debounce": "^1.2.1",
Expand Down
14 changes: 7 additions & 7 deletions digiwf-apps/packages/components/digiwf-form-renderer/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion digiwf-apps/packages/components/digiwf-form-renderer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"watch": "vite build --watch"
},
"peerDependencies": {
"@muenchen/vjsf": "^2.21.7",
"@muenchen/vjsf": "^2.21.8",
"vue": "^2.7.0",
"vuetify": "^2.6.0"
},
Expand Down
Loading