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

feat: 解决Form组件slot必须传递component字段才显示的问题
This commit is contained in:
zmcode 2023-09-21 10:39:44 +08:00 committed by GitHub
parent 556575f501
commit a6b65b58a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -159,7 +159,10 @@
const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel') const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel')
? rulesMessageJoinLabel ? rulesMessageJoinLabel
: globalRulesMessageJoinLabel; : globalRulesMessageJoinLabel;
const defaultMsg = createPlaceholderMessage(component) + `${joinLabel ? label : ''}`; const assertLabel = joinLabel ? label : '';
const defaultMsg = component
? createPlaceholderMessage(component) + assertLabel
: assertLabel;
function validator(rule: any, value: any) { function validator(rule: any, value: any) {
const msg = rule.message || defaultMsg; const msg = rule.message || defaultMsg;
@ -382,8 +385,8 @@
} }
return () => { return () => {
const { colProps = {}, colSlot, renderColContent, component } = props.schema; const { colProps = {}, colSlot, renderColContent, component, slot } = props.schema;
if (!componentMap.has(component)) { if (!componentMap.has(component) && !slot) {
return null; return null;
} }