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

2024-10-07 20:23:55 +08:00
parent 3e32d920b4 518b869f9d
commit 037b118301
13 changed files with 44 additions and 37 deletions
--- a/apps/web-naive/src/adapter/form.ts
+++ b/apps/web-naive/src/adapter/form.ts
@@ -62,15 +62,11 @@ setupVbenForm<FormComponentType>({
    DatePicker: NDatePicker,
    // 自定义默认的重置按钮
    DefaultResetActionButton: (props, { attrs, slots }) => {
-      return h(NButton, { ...props, attrs, text: false, type: 'info' }, slots);
+      return h(NButton, { ...props, attrs, type: 'info' }, slots);
    },
    // 自定义默认的提交按钮
    DefaultSubmitActionButton: (props, { attrs, slots }) => {
-      return h(
-        NButton,
-        { ...props, attrs, text: false, type: 'primary' },
-        slots,
-      );
+      return h(NButton, { ...props, attrs, type: 'primary' }, slots);
    },
    Divider: NDivider,
    Input: withDefaultPlaceholder(NInput, 'input'),