From 300ed41b09e9e454da6465ec6175e33b27c8b52c Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 13 Jun 2024 14:38:11 +0800 Subject: [PATCH] =?UTF-8?q?3.7.0=E5=A4=A7=E7=89=88=E6=9C=AC=E5=8F=91?= =?UTF-8?q?=E5=B8=83(=E4=BF=AE=E5=87=A0=E4=B8=AAbug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/hooks/useDataSource.ts | 5 +++++ src/design/index.less | 7 +++++++ src/hooks/system/useJvxeMethods.ts | 4 +++- src/utils/common/vxeUtils.ts | 6 ++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts index 101e5c5..6d1ec98 100644 --- a/src/components/Table/src/hooks/useDataSource.ts +++ b/src/components/Table/src/hooks/useDataSource.ts @@ -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; } diff --git a/src/design/index.less b/src/design/index.less index 8a818de..ccc955e 100644 --- a/src/design/index.less +++ b/src/design/index.less @@ -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】一对多内嵌，为什么多这一块，不从头对齐 diff --git a/src/hooks/system/useJvxeMethods.ts b/src/hooks/system/useJvxeMethods.ts index f5262d5..d8327f6 100644 --- a/src/hooks/system/useJvxeMethods.ts +++ b/src/hooks/system/useJvxeMethods.ts @@ -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 { diff --git a/src/utils/common/vxeUtils.ts b/src/utils/common/vxeUtils.ts index 45cb642..84b597b 100644 --- a/src/utils/common/vxeUtils.ts +++ b/src/utils/common/vxeUtils.ts @@ -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没有跳转 } }); })();