From 6e8315ab40a66d287a313c31cf883529a22c8ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <126167116+caodachen@users.noreply.github.com> Date: Mon, 26 Jan 2026 16:11:37 +0800 Subject: [PATCH 01/29] fix: arguments order update (#7132) Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com> --- .../components/render-content/render-content.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue b/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue index 1816051c6..470866235 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue @@ -42,14 +42,17 @@ export default defineComponent({ return props.content; } } - return h(props.content as never, { - ...attrs, - props: { - ...props, + return h( + props.content as never, + { ...attrs, + props: { + ...props, + ...attrs, + }, }, slots, - }); + ); }; }, }); From 6a9012e5e457f66f1ec4e80818106a48ab826a49 Mon Sep 17 00:00:00 2001 From: programmer Date: Mon, 26 Jan 2026 16:12:09 +0800 Subject: [PATCH 02/29] =?UTF-8?q?chore:=20=E7=BB=99=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=842=E4=B8=AA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=20i18n=20(#7138)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 个人中心按钮i18n * fix: eslint format * fix: 调整label宽度让英文显示在一行 * chore: 调整label小点 * fix: import --------- Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com> --- packages/effects/common-ui/src/ui/profile/base-setting.vue | 4 +++- .../effects/common-ui/src/ui/profile/password-setting.vue | 5 ++++- packages/locales/src/langs/en-US/profile.json | 4 ++++ packages/locales/src/langs/zh-CN/profile.json | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/locales/src/langs/en-US/profile.json create mode 100644 packages/locales/src/langs/zh-CN/profile.json diff --git a/packages/effects/common-ui/src/ui/profile/base-setting.vue b/packages/effects/common-ui/src/ui/profile/base-setting.vue index 1ef1c1a04..15fc97bad 100644 --- a/packages/effects/common-ui/src/ui/profile/base-setting.vue +++ b/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({
- 更新基本信息 + {{ $t('profile.updateBasicProfile') }}
diff --git a/packages/effects/common-ui/src/ui/profile/password-setting.vue b/packages/effects/common-ui/src/ui/profile/password-setting.vue index 1d90e086b..06b9b3d10 100644 --- a/packages/effects/common-ui/src/ui/profile/password-setting.vue +++ b/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({
- 更新密码 + {{ $t('profile.updatePassword') }}
diff --git a/packages/locales/src/langs/en-US/profile.json b/packages/locales/src/langs/en-US/profile.json new file mode 100644 index 000000000..1c17e2ec6 --- /dev/null +++ b/packages/locales/src/langs/en-US/profile.json @@ -0,0 +1,4 @@ +{ + "updatePassword": "Update Password", + "updateBasicProfile": "Update Basic Profile" +} diff --git a/packages/locales/src/langs/zh-CN/profile.json b/packages/locales/src/langs/zh-CN/profile.json new file mode 100644 index 000000000..a38908c58 --- /dev/null +++ b/packages/locales/src/langs/zh-CN/profile.json @@ -0,0 +1,4 @@ +{ + "updatePassword": "更新密码", + "updateBasicProfile": "更新基本信息" +} From 528395e2c351f1e809ec67f42372d1a6b829d0d8 Mon Sep 17 00:00:00 2001 From: ming4762 Date: Mon, 26 Jan 2026 16:12:26 +0800 Subject: [PATCH 03/29] perf: optimizing hidden fields cannot trigger `dependencies` (#7142) --- packages/@core/ui-kit/form-ui/src/form-render/dependencies.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/@core/ui-kit/form-ui/src/form-render/dependencies.ts b/packages/@core/ui-kit/form-ui/src/form-render/dependencies.ts index 9881db14c..cec74818a 100644 --- a/packages/@core/ui-kit/form-ui/src/form-render/dependencies.ts +++ b/packages/@core/ui-kit/form-ui/src/form-render/dependencies.ts @@ -82,10 +82,8 @@ export default function useDependencies( // 2. 判断show，如果show为false，则隐藏 if (isFunction(show)) { isShow.value = !!(await show(formValues, formApi)); - if (!isShow.value) return; } else if (isBoolean(show)) { isShow.value = show; - if (!isShow.value) return; } if (isFunction(componentProps)) { From bb5d75bc7ec56e93da6db5df8a4dceb4cb36e799 Mon Sep 17 00:00:00 2001 From: Jin Mao <50581550+jinmao88@users.noreply.github.com> Date: Tue, 27 Jan 2026 11:35:50 +0800 Subject: [PATCH 04/29] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=B1=95=E5=BC=80=E6=97=A0=E6=95=88=20(#7148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正模板中 ref 属性的引用名称 --- packages/@core/ui-kit/form-ui/src/form-render/form.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/@core/ui-kit/form-ui/src/form-render/form.vue b/packages/@core/ui-kit/form-ui/src/form-render/form.vue index 4b69e3830..752fc6928 100644 --- a/packages/@core/ui-kit/form-ui/src/form-render/form.vue +++ b/packages/@core/ui-kit/form-ui/src/form-render/form.vue @@ -53,11 +53,7 @@ const wrapperClass = computed(() => { provideFormRenderProps(props); -const { - isCalculated, - keepFormItemIndex, - wrapperRef: _wrapperRef, -} = useExpandable(props); +const { isCalculated, keepFormItemIndex, wrapperRef } = useExpandable(props); const shapes = computed(() => { const resultShapes: FormShape[] = []; @@ -174,7 +170,7 @@ const computedSchema = computed(