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

packages/effects/common-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vben/common-ui",
-  "version": "5.5.9",
+  "version": "5.6.0",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {

packages/effects/common-ui/src/ui/profile/base-setting.vue

@@ -5,6 +5,8 @@ import type { VbenFormSchema } from '@vben-core/form-ui';
 
 import { computed, reactive } from 'vue';
 
+import { $t } from '@vben/locales';
+
 import { useVbenForm } from '@vben-core/form-ui';
 import { VbenButton } from '@vben-core/shadcn-ui';
 
@@ -50,7 +52,7 @@ defineExpose({
   <div @keydown.enter.prevent="handleSubmit">
     <Form />
     <VbenButton type="submit" class="mt-4" @click="handleSubmit">
-      更新基本信息
+      {{ $t('profile.updateBasicProfile') }}
     </VbenButton>
   </div>
 </template>

packages/effects/common-ui/src/ui/profile/password-setting.vue

@@ -5,6 +5,8 @@ import type { VbenFormSchema } from '@vben-core/form-ui';
 
 import { computed, reactive } from 'vue';
 
+import { $t } from '@vben/locales';
+
 import { useVbenForm } from '@vben-core/form-ui';
 import { VbenButton } from '@vben-core/shadcn-ui';
 
@@ -23,6 +25,7 @@ const emit = defineEmits<{
 const [Form, formApi] = useVbenForm(
   reactive({
     commonConfig: {
+      labelWidth: 130,
       // 所有表单项
       componentProps: {
         class: 'w-full',
@@ -50,7 +53,7 @@ defineExpose({
   <div>
     <Form />
     <VbenButton type="submit" class="mt-4" @click="handleSubmit">
-      更新密码
+      {{ $t('profile.updatePassword') }}
     </VbenButton>
   </div>
 </template>