Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ const computedProps = computed(() => {

// 自定义帮助信息
const computedHelp = computed(() => {
return help ? onHelpFunc : undefined;
});

const onHelpFunc = () => {
if (!help) {
const helpContent = help;
if (!helpContent) {
return undefined;
}
return isFunction(help) ? help(values.value, formApi!) : help;
};
return () =>
isFunction(helpContent)
? helpContent(values.value, getFormApi())
: helpContent;
});

watch(
() => computedProps.value?.autofocus,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {

import { computed, useAttrs } from 'vue';
// @ts-expect-error - vue-json-viewer does not expose compatible typings for this import path
import VueJsonViewer from 'vue-json-viewer';
import VueJsonViewerImport from 'vue-json-viewer';

import { $t } from '@vben/locales';

Expand Down Expand Up @@ -42,6 +42,11 @@ const emit = defineEmits<{
valueClick: [value: JsonViewerValue];
}>();

/** CJS/UMD 在 Vite 下解析为 { default: Component },需解包否则会出现 missing template or render */
const VueJsonViewer =
(VueJsonViewerImport as { default?: typeof VueJsonViewerImport }).default ??
VueJsonViewerImport;

const attrs: SetupContext['attrs'] = useAttrs();

function handleClick(event: MouseEvent) {
Expand Down
4 changes: 3 additions & 1 deletion playground/src/views/examples/form/basic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,9 @@ const [BaseForm, baseFormApi] = useVbenForm({
component: 'DatePicker',
fieldName: 'datePicker',
help: (values) =>
[`这是一个可输出其他字段值的帮助信息${values?.rate}`].map((v) => h('p', v)),
[`这是一个可输出其他字段值的帮助信息${values?.rate}`].map((v) =>
h('p', v),
),
label: '日期选择框',
},
{
Expand Down
1 change: 0 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,3 @@ catalog:
yaml-eslint-parser: ^2.0.0
zod: ^3.25.76
zod-defaults: 0.1.3

Loading