From bb36cca31597b6b6db6421fe5ae13a054194ed17 Mon Sep 17 00:00:00 2001 From: HamWong <81913444+hamwong233@users.noreply.github.com> Date: Tue, 15 Jul 2025 09:08:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E9=94=81=E5=AE=9A=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?=20(#6480)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/widgets/lock-screen/lock-screen.vue | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue b/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue index 736d09d5b..6fb7a54a4 100644 --- a/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue +++ b/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue @@ -85,7 +85,7 @@ useScrollLock();
{{ $t('ui.widgets.lockScreen.unlock') }}
-
-
- - {{ meridiem }} - - {{ hour }} -
-
- {{ minute }} +
+
+
+ + {{ meridiem }} + + {{ hour }} +
+
+ {{ minute }} +
@@ -117,9 +121,8 @@ useScrollLock(); class="flex-center size-full" @keydown.enter.prevent="handleSubmit" > -
+
-
@@ -145,12 +148,13 @@ useScrollLock();
-
- {{ hour }}:{{ minute }} {{ meridiem }} +
+ {{ hour }}:{{ minute }} + {{ meridiem }}
-
{{ date }}
+
{{ date }}
From 1bc5d2986b0a237fe146a73fbd791ffedfd07f2a Mon Sep 17 00:00:00 2001 From: Jin Mao <50581550+jinmao88@users.noreply.github.com> Date: Wed, 16 Jul 2025 19:15:39 +0800 Subject: [PATCH 2/3] chore: update-vxe-table (#6516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update vxe-pc-ui,vxe-table * fix(ui): 修复代理配置初始化方法名错误 * fix(ui): 修改远程表格刷新配置 * chroe: update vxeTable 更新到最新 --- packages/effects/plugins/src/vxe-table/use-vxe-grid.vue | 2 +- playground/src/views/examples/vxe-table/remote.vue | 2 +- pnpm-workspace.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue index f3eb6735a..9844c409d 100644 --- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue +++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue @@ -300,7 +300,7 @@ async function init() { const enableProxyConfig = options.value.proxyConfig?.enabled; if (enableProxyConfig && autoLoad) { props.api.grid.commitProxy?.( - '_init', + 'initial', formOptions.value ? ((await formApi.getValues()) ?? {}) : {}, ); // props.api.reload(formApi.form?.values ?? {}); diff --git a/playground/src/views/examples/vxe-table/remote.vue b/playground/src/views/examples/vxe-table/remote.vue index 907c1e2cd..7042019fb 100644 --- a/playground/src/views/examples/vxe-table/remote.vue +++ b/playground/src/views/examples/vxe-table/remote.vue @@ -55,7 +55,7 @@ const gridOptions: VxeGridProps = { custom: true, export: true, // import: true, - refresh: { code: 'query' }, + refresh: true, zoom: true, }, }; diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 887e74dc8..758ff0508 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -187,8 +187,8 @@ catalog: vue-router: ^4.5.1 vue-tippy: ^6.7.1 vue-tsc: 2.2.10 - vxe-pc-ui: ^4.6.42 - vxe-table: ^4.13.51 + vxe-pc-ui: ^4.7.12 + vxe-table: ^4.14.4 watermark-js-plus: ^1.6.2 zod: ^3.25.67 zod-defaults: ^0.1.3 From 07b64ad3846d794652f78dc27d99c7c8456c7fb5 Mon Sep 17 00:00:00 2001 From: panda7 Date: Thu, 17 Jul 2025 09:37:39 +0800 Subject: [PATCH 3/3] feat: add function support for formItemClass prop (#6511) * feat: add function support for formItemClass prop * feat: add try-catch to formItemClass function * fix: formItemClass function ts error --------- Co-authored-by: sqchen --- docs/src/components/common-ui/vben-form.md | 2 +- .../ui-kit/form-ui/src/form-render/form.vue | 20 +++++++++++++++++-- packages/@core/ui-kit/form-ui/src/types.ts | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md index a6d455253..aed2b9f85 100644 --- a/docs/src/components/common-ui/vben-form.md +++ b/docs/src/components/common-ui/vben-form.md @@ -395,7 +395,7 @@ export interface FormCommonConfig { * 所有表单项的栅格布局 * @default "" */ - formItemClass?: string; + formItemClass?: (() => string) | string; /** * 隐藏所有表单项label * @default false 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 ff827c42a..a8ca22a49 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 @@ -12,7 +12,12 @@ import type { import { computed } from 'vue'; import { Form } from '@vben-core/shadcn-ui'; -import { cn, isString, mergeWithArrayOverride } from '@vben-core/shared/utils'; +import { + cn, + isFunction, + isString, + mergeWithArrayOverride, +} from '@vben-core/shared/utils'; import { provideFormRenderProps } from './context'; import { useExpandable } from './expandable'; @@ -110,6 +115,17 @@ const computedSchema = computed( ? keepIndex <= index : false; + // 处理函数形式的formItemClass + let resolvedSchemaFormItemClass = schema.formItemClass; + if (isFunction(schema.formItemClass)) { + try { + resolvedSchemaFormItemClass = schema.formItemClass(); + } catch (error) { + console.error('Error calling formItemClass function:', error); + resolvedSchemaFormItemClass = ''; + } + } + return { colon, disabled, @@ -133,7 +149,7 @@ const computedSchema = computed( 'flex-shrink-0', { hidden }, formItemClass, - schema.formItemClass, + resolvedSchemaFormItemClass, ), labelClass: cn(labelClass, schema.labelClass), }; diff --git a/packages/@core/ui-kit/form-ui/src/types.ts b/packages/@core/ui-kit/form-ui/src/types.ts index ccfe8dd89..a8501e810 100644 --- a/packages/@core/ui-kit/form-ui/src/types.ts +++ b/packages/@core/ui-kit/form-ui/src/types.ts @@ -174,10 +174,10 @@ export interface FormCommonConfig { */ formFieldProps?: FormFieldOptions; /** - * 所有表单项的栅格布局 + * 所有表单项的栅格布局，支持函数形式 * @default "" */ - formItemClass?: string; + formItemClass?: (() => string) | string; /** * 隐藏所有表单项label * @default false