feat: 解决Form组件slot必须传递component字段才显示的问题 (#3049)

feat: 解决Form组件slot必须传递component字段才显示的问题
vbenjs · Sep 21, 2023 · a6b65b5 · a6b65b5
1 parent 556575f
commit a6b65b5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
@@ -159,7 +159,10 @@
  const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel')
  ? rulesMessageJoinLabel
  : globalRulesMessageJoinLabel;
- const defaultMsg = createPlaceholderMessage(component) + `${joinLabel ? label : ''}`;
+ const assertLabel = joinLabel ? label : '';
+ const defaultMsg = component
+ ? createPlaceholderMessage(component) + assertLabel
+ : assertLabel;
 
  function validator(rule: any, value: any) {
  const msg = rule.message || defaultMsg;
@@ -382,8 +385,8 @@
  }
 
  return () => {
- const { colProps = {}, colSlot, renderColContent, component } = props.schema;
- if (!componentMap.has(component)) {
+ const { colProps = {}, colSlot, renderColContent, component, slot } = props.schema;
+ if (!componentMap.has(component) && !slot) {
  return null;
  }