theluyuan/layui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨(component): update

Browse Source
This commit is contained in:
就眠儀式 2022-08-09 10:00:52 +08:00
parent 716af194bd
commit ce92da5a95
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package/component/src/component/formItem/index.vue
View File

@ -92,22 +92,30 @@ const validate = (callback?: ValidateCallback) => {
if (props.prop && (ruleItems.value as RuleItem[]).length > 0) {
// 校验规则
const descriptor: Rules = {};
descriptor[layForm.useCN ? props.label || props.prop : props.prop] = ruleItems.value;
descriptor[layForm.useCN ? props.label || props.prop : props.prop] =
ruleItems.value;
const validator = new Schema(descriptor);
let model: { [key: string]: any } = {};
let validateMessage = null;
// 使用中文错误提示
if (layForm.useCN) {
validateMessage = Object.assign({},cnValidateMessage,layForm.validateMessage
validateMessage = Object.assign(
{},
cnValidateMessage,
layForm.validateMessage
);
model[props.label || props.prop] = filedValue.value;
} else {
layForm.validateMessage && (validateMessage = layForm.validateMessage);
model[props.prop] = filedValue.value;
}
// @ts-ignore 自定义消息验证
layForm.requiredErrorMessage && (validateMessage = Object.assign(validateMessage, { required: layForm.requiredErrorMessage}));
// 自定义消息验证
layForm.requiredErrorMessage &&
// @ts-ignore
(validateMessage = Object.assign(validateMessage, {
required: layForm.requiredErrorMessage,
}));
validateMessage && validator.messages(validateMessage);
// 开始校验
@ -118,12 +126,13 @@ const validate = (callback?: ValidateCallback) => {
const _errors = errors as FieldValidateError[];
// 如果是中文,将错误信息转换成 FieldValidateError 类型
layForm.useCN &&
_errors.forEach((error) => {
error.label = props.label;
_errors.forEach((error) => {
error.label = props.label;
error.field = props.prop;
});
errorMsg.value = props.errorMessage ?? _errors[0].message;
slotParentDiv.childElementCount > 0 && slotParentDiv.firstElementChild?.classList.add("layui-form-danger");
slotParentDiv.childElementCount > 0 &&
slotParentDiv.firstElementChild?.classList.add("layui-form-danger");
callback && callback(_errors, fields);
} else {
clearValidate();
@ -160,7 +169,10 @@ onMounted(() => {
const getMarginLeft = computed(() => {
if (props.mode == "block") {
if (props.labelPosition != "top") {
let labelWidth = typeof props.labelWidth === "string" ? parseFloat(props.labelWidth) : props.labelWidth;
let labelWidth =
typeof props.labelWidth === "string"
? parseFloat(props.labelWidth)
: props.labelWidth;
labelWidth += 15;
return {
"margin-left": `${labelWidth}px`,