Skip to content

fix setPages: 确保在子节点没有设置url的时候，正确拼接父级路径。 #12132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aynakeya wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix setPages: 确保在子节点没有设置url的时候，正确拼接父级路径。 #12132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f07337f
fix setPages
aynakeya Jul 11, 2025
33d2e80
修复index冲突问题
aynakeya Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions packages/amis-core/src/store/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,33 +82,46 @@ export const AppStore = ServiceStore.named('AppStore')
return;
}

pages = mapTree(pages, (item, index, level, paths) => {
pages = mapTree(pages, (item, index, level, paths, indexes) => {
let path = item.link || item.url;

if (item.schema || item.schemaApi) {
path =
item.url ||
`/${paths
.map(item => item.index)
.concat(index)
.map(index => `page-${index + 1}`)
.join('/')}`;

if (path && path[0] !== '/') {
let parentPath = '/';
let index = paths.length;
while (index > 0) {
const item = paths[index - 1];
// get current path either url exist or generated url page-index
let currentPath = item.url || `page-${index + 1}`;

// if start with '/', absolute path, return directly
if (currentPath.startsWith('/')) {
path = item.url;
} else {
let closestIndex = paths.length - 1;
let fullPaths: string[] = [currentPath];
while (closestIndex >= 0) {
const item = paths[closestIndex];

// if parent path exists
if (item?.path) {
parentPath = item.path + '/';
break;
fullPaths = fullPaths.concat(item.path);
// if its a scheme, the path might not be generated, so keep moving upwards
if (item.schema || item.schemaApi) {
break;
}
} else {
fullPaths = fullPaths.concat(
`page-${indexes[closestIndex] + 1}`
);
}
index--;
closestIndex--;
}

path = parentPath + path;
path = fullPaths.reverse().join('/');
// maybe add /??,
// if (path && path[0] !== '/') {
// path = `/${path}`;
// }
}
} else {
// the above code would be lot cleaner if we set path for no schema node here.
// but there might be other issue. keep as is.
}

return {
Expand Down
Loading