Merge branch 'master' of github.com:youlaitech/vue3-element-admin

This commit is contained in:
hxr
2024-06-28 23:17:40 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -139,11 +139,11 @@ function getFormData(key?: string) {
// 设置表单值
function setFormData(data: IObject) {
for (const key in formData) {
if (Object.hasOwn(formData, key) && key in data) {
if (formData.hasOwnProperty(key) && key in data) {
formData[key] = data[key];
}
}
if (Object.hasOwn(data, props.pk)) {
if (data?.hasOwnProperty(props.pk)) {
formData[props.pk] = data[props.pk];
}
}

View File

@@ -307,11 +307,11 @@ function getFormData(key?: string) {
// 设置表单值
function setFormData(data: IObject) {
for (const key in formData) {
if (Object.hasOwn(formData, key) && key in data) {
if (formData.hasOwnProperty(key) && key in data) {
formData[key] = data[key];
}
}
if (Object.hasOwn(data, pk)) {
if (data?.hasOwnProperty(pk)) {
formData[pk] = data[pk];
}
}