Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into warmflow

2025-01-10 16:39:14 +08:00
parent ca7373cd63 624beb6fa0
commit e57df4e522
3 changed files with 11 additions and 7 deletions
--- 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<string>;
  show?: boolean;
 }