diff --git a/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue b/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue index de32a20c34..da28b18185 100644 --- a/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue +++ b/frontend/src/components/business/ms-minders/featureCaseMinder/index.vue @@ -751,7 +751,7 @@ }; } - function resetMinderParams(clearDeleteResource = false) { + function resetMinderParams(clearDeleteResource = true) { tempMinderParams.value = { projectId: appStore.currentProjectId, versionId: '', @@ -808,7 +808,11 @@ }); } } - + const minderNode: MinderJsonNode = window.minder.getNodeById(node.data.id); + if (minderNode.data) { + minderNode.data.isNew = false; + minderNode.data.changed = false; + } return true; }); return tempMinderParams.value; @@ -831,7 +835,7 @@ } catch (error) { // eslint-disable-next-line no-console console.log(error); - resetMinderParams(true); + resetMinderParams(false); } finally { loading.value = false; } diff --git a/frontend/src/components/pure/ms-table/select-all.vue b/frontend/src/components/pure/ms-table/select-all.vue index 964e1e6d05..c0e9967ccc 100644 --- a/frontend/src/components/pure/ms-table/select-all.vue +++ b/frontend/src/components/pure/ms-table/select-all.vue @@ -77,7 +77,11 @@ if (!isHasChildren.value) { return ( (props.selectedKeys.size > 0 && selectAllStatus.value === SelectAllEnum.ALL) || - (props.selectedKeys.size > 0 && props.selectedKeys.size === props.total) + (props.selectedKeys.size > 0 && props.selectedKeys.size === props.total) || + (props.selectedKeys.size > 0 && + props.selectedKeys.size > props.total && + props.currentData.length === props.total && + props.currentData.every((e) => props.selectedKeys.has(e[props.rowKey]))) ); } // 含有子级 children全选条件