diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c81a3e45..f4675d57 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -19,7 +19,9 @@ // i18n 插件 "Lokalise.i18n-ally", // CSS 变量提示 - "vunguyentuan.vscode-css-variables" + "vunguyentuan.vscode-css-variables", + // 在 package.json 中显示 PNPM catalog 的版本 + "antfu.pnpm-catalog-lens" ], "unwantedRecommendations": [ // 和 volar 冲突 diff --git a/apps/web-naive/src/adapter/form.ts b/apps/web-naive/src/adapter/form.ts index eb765476..f7142e78 100644 --- a/apps/web-naive/src/adapter/form.ts +++ b/apps/web-naive/src/adapter/form.ts @@ -62,15 +62,11 @@ setupVbenForm({ 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'), diff --git a/docs/src/demos/vben-form/query/index.vue b/docs/src/demos/vben-form/query/index.vue index d4bdba47..a11a3026 100644 --- a/docs/src/demos/vben-form/query/index.vue +++ b/docs/src/demos/vben-form/query/index.vue @@ -78,7 +78,7 @@ const [QueryForm] = useVbenForm({ // 是否可展开 showCollapseButton: true, submitButtonOptions: { - text: '查询', + content: '查询', }, wrapperClass: 'grid-cols-1 md:grid-cols-2', }); diff --git a/packages/@core/ui-kit/form-ui/src/components/form-actions.vue b/packages/@core/ui-kit/form-ui/src/components/form-actions.vue index 25c54d7c..0ac5b24e 100644 --- a/packages/@core/ui-kit/form-ui/src/components/form-actions.vue +++ b/packages/@core/ui-kit/form-ui/src/components/form-actions.vue @@ -16,16 +16,16 @@ const collapsed = defineModel({ default: false }); const resetButtonOptions = computed(() => { return { + content: `${$t.value('reset')}`, show: true, - text: `${$t.value('reset')}`, ...unref(rootProps).resetButtonOptions, }; }); const submitButtonOptions = computed(() => { return { + content: `${$t.value('submit')}`, show: true, - text: `${$t.value('submit')}`, ...unref(rootProps).submitButtonOptions, }; }); @@ -78,7 +78,9 @@ watch(