From 0a4d2d594f889f61530c3a2d20cc6cd5771b64bb Mon Sep 17 00:00:00 2001 From: Netfan Date: Fri, 10 Jan 2025 14:16:33 +0800 Subject: [PATCH] feat: form button content support computed value --- packages/@core/ui-kit/form-ui/src/types.ts | 4 ++-- packages/effects/plugins/src/vxe-table/use-vxe-grid.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@core/ui-kit/form-ui/src/types.ts b/packages/@core/ui-kit/form-ui/src/types.ts index 25b4c7ee251..07a2afd43ec 100644 --- a/packages/@core/ui-kit/form-ui/src/types.ts +++ b/packages/@core/ui-kit/form-ui/src/types.ts @@ -4,7 +4,7 @@ import type { ZodTypeAny } from 'zod'; import type { Component, HtmlHTMLAttributes, Ref } from 'vue'; import type { VbenButtonProps } from '@vben-core/shadcn-ui'; -import type { ClassType, Nullable } from '@vben-core/typings'; +import type { ClassType, MaybeComputedRef, Nullable } from '@vben-core/typings'; import type { FormApi } from './form-api'; @@ -316,7 +316,7 @@ export interface FormRenderProps< export interface ActionButtonOptions extends VbenButtonProps { [key: string]: any; - content?: string; + content?: MaybeComputedRef; show?: boolean; } diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue index e5081421720..ec36fed2aa5 100644 --- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue +++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue @@ -92,7 +92,7 @@ const [Form, formApi] = useTableForm({ }, showCollapseButton: true, submitButtonOptions: { - content: $t('common.query'), + content: computed(() => $t('common.search')), }, wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3', });