From 29db04c54a6de3e8f8fb6188cf6b9ce3013bc3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?= <37316281+yanhao98@users.noreply.github.com> Date: Sun, 24 Nov 2024 23:24:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- formkit.config.ts | 1 + src/__fk-inputs__/inputs/form.ts | 5 ++--- src/__fk-inputs__/inputs/input-text.ts | 9 ++------- src/__fk-inputs__/sections/messages.ts | 9 +++------ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/formkit.config.ts b/formkit.config.ts index 7e84577..9f035d9 100644 --- a/formkit.config.ts +++ b/formkit.config.ts @@ -35,6 +35,7 @@ export default { // 'headlessuiSwitch': createInput(HeadlessuiToggle), // } // ), + (node) => { }, createThemePlugin(theme, icons/* , iconLoaderUrl, iconLoader */), bindings, createI18nPlugin({ zh }), diff --git a/src/__fk-inputs__/inputs/form.ts b/src/__fk-inputs__/inputs/form.ts index 1c99305..60da488 100644 --- a/src/__fk-inputs__/inputs/form.ts +++ b/src/__fk-inputs__/inputs/form.ts @@ -1,13 +1,12 @@ import { FormKitTypeDefinition } from '@formkit/core' import { - messages, - message, actions, submitInput, forms, disablesChildren, createSection, } from '@formkit/inputs' +import { messages } from '../sections/messages' const formInput = createSection('form', () => ({ $el: 'form', @@ -33,7 +32,7 @@ export const form: FormKitTypeDefinition = { */ schema: formInput( '$slots.default', - messages(message('$message.value')), + messages(), actions(submitInput()) ), /** diff --git a/src/__fk-inputs__/inputs/input-text.ts b/src/__fk-inputs__/inputs/input-text.ts index 8768f5c..9c4ab7d 100644 --- a/src/__fk-inputs__/inputs/input-text.ts +++ b/src/__fk-inputs__/inputs/input-text.ts @@ -1,4 +1,3 @@ -import MessagesCmp from '@/__fk-inputs__/components/messages.vue'; import { FormKitTypeDefinition, type FormKitFrameworkContext } from '@formkit/core'; import { casts, @@ -8,6 +7,7 @@ import { } from '@formkit/inputs'; import PInputText from 'primevue/inputtext'; import { h, markRaw } from 'vue'; +import { messages } from '../sections/messages'; export const InputText: FormKitTypeDefinition = { type: 'input', @@ -29,16 +29,11 @@ export const InputText: FormKitTypeDefinition = { 'aria-required': '$state.required || undefined', }, }))(), - createSection('messages', () => ({ - $cmp: 'MessagesCmp', - props: { context: '$node.context', }, - if: '$defaultMessagePlacement && $fns.length($messages)', - }))(), + messages(), ), library: { // 'FComponent': custom_FComponent.library, 'PInputText': markRaw(PInputText), - 'MessagesCmp': markRaw(MessagesCmp) }, features: [casts], // family: 'text', diff --git a/src/__fk-inputs__/sections/messages.ts b/src/__fk-inputs__/sections/messages.ts index 99ee37a..9cba508 100644 --- a/src/__fk-inputs__/sections/messages.ts +++ b/src/__fk-inputs__/sections/messages.ts @@ -1,11 +1,8 @@ +import MessagesCmp from '@/__fk-inputs__/components/messages.vue'; import { createSection } from '@formkit/inputs'; -/** - * Messages section where all messages will be displayed. - * - * @public - */ export const messages = createSection('messages', () => ({ - $el: 'ul', + $cmp: MessagesCmp as any, + props: { context: '$node.context', }, if: '$defaultMessagePlacement && $fns.length($messages)', }))