diff --git a/packages/form/src/containers/Container.vue b/packages/form/src/containers/Container.vue index 659ab0ed..e59037ff 100644 --- a/packages/form/src/containers/Container.vue +++ b/packages/form/src/containers/Container.vue @@ -97,7 +97,9 @@
- {{ expand ? '收起配置' : '展开更多配置' }} + {{ + expand ? '收起配置' : '展开更多配置' + }}
@@ -177,11 +179,12 @@ const type = computed((): string => { }); const display = computed((): boolean => { - if (props.config.display === 'expand') { + const value = displayFunction(mForm, props.config.display, props); + + if (value === 'expand') { return expand.value; } - - return displayFunction(mForm, props.config.display, props); + return value; }); const itemLabelWidth = computed(() => props.config.labelWidth || props.labelWidth); diff --git a/packages/form/src/utils/form.ts b/packages/form/src/utils/form.ts index c339ebf6..0a361750 100644 --- a/packages/form/src/utils/form.ts +++ b/packages/form/src/utils/form.ts @@ -197,6 +197,10 @@ export const filterFunction = (mForm: FormState | undefined, config: any, props: }; export const display = function (mForm: FormState | undefined, config: any, props: any) { + if (config === 'expand') { + return config; + } + if (typeof config === 'function') { return filterFunction(mForm, config, props); }