|
@@ -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;
|
|
|
}
|
|
|
|