github
/
jeecg-boot-vue3
mirror of https://github.com/jeecgboot/jeecgboot-vue3
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

3.7.0大版本发布(修几个bug)

pull/186/merge
JEECG 2024-06-13 14:38:11 +08:00
parent 1dda6e229b
commit 300ed41b09
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/Table/src/hooks/useDataSource.ts
View File

@ -133,6 +133,11 @@ export function useDataSource(
if (row) {
for (const field in row) {
if (Reflect.has(record, field)) row[field] = record[field];
//update-begin---author:wangshuai---date:2024-06-11---for:【TV360X-437】树表 部分组件编辑完后，列表未刷新---
if (Reflect.has(record, field + '_dictText')) {
row[field + '_dictText'] = record[field + '_dictText'];
}
//update-end---author:wangshuai---date:2024-06-11---for:【TV360X-437】树表 部分组件编辑完后，列表未刷新---
}
return row;
}

7
src/design/index.less
View File

@ -287,3 +287,10 @@ html[data-theme='dark'] {
}
}
// update-end--author:liaozhiyang---date:20240605---for：【TV360X-857】online代码生成详情样式调整
// update-begin--author:wangshuai---date:20240611---for：【TV360X-1070】一对多内嵌，为什么多这一块，不从头对齐
.ant-table-wrapper .ant-table.ant-table-middle .ant-table-tbody .ant-table-wrapper:only-child .ant-table{
margin-block: 0;
margin-inline: 0;
}
// update-end--author:wangshuai---date:20240611---for：【TV360X-1070】一对多内嵌，为什么多这一块，不从头对齐

4
src/hooks/system/useJvxeMethods.ts
View File

@ -65,7 +65,9 @@ export function useJvxeMethod(requestAddOrEdit, classifyIntoFormData, tableRefs,
if(e.paneKey){
activeKey.value = e.paneKey
}else{
activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index];
//update-begin-author:liusq date:2024-06-12 for: TV360X-478 一对多tab，校验未通过时，tab没有跳转
activeKey.value = e.subIndex == null ? (e.index == null ? unref(activeKey) : refKeys.value[e.index]) : Object.keys(tableRefs)[e.subIndex];
//update-end-author:liusq date:2024-06-12 for: TV360X-478 一对多tab，校验未通过时，tab没有跳转
}
//update-end-author:taoyan date:2022-11-22 for: VUEN-2866【代码生成】Tab风格 一对多子表校验不通过时，点击提交表单空白了，流程附加页面也有此问题
} else {

6
src/utils/common/vxeUtils.ts
View File

@ -31,7 +31,7 @@ export async function validateFormModelAndTables(validate, formData, cases, prop
resolve(formData);
})
.catch(() => {
reject({ error: VALIDATE_FAILED });
reject({ error: VALIDATE_FAILED, index: 0 });
});
});
Object.assign(dataMap, { formValue: values });
@ -79,7 +79,9 @@ export function validateTables(cases, autoJumpTab = true) {
}
}
// 出现未验证通过的表单，不再进行下一步校验，直接返回失败
reject({ error: VALIDATE_FAILED, index, paneKey, errMap });
//update-begin-author:liusq date:2024-06-12 for: TV360X-478 一对多tab，校验未通过时，tab没有跳转
reject({ error: VALIDATE_FAILED, index, paneKey, errMap, subIndex: index });
//update-end-author:liusq date:2024-06-12 for: TV360X-478 一对多tab，校验未通过时，tab没有跳转
}
});
})();