Skip to content

fix: preview page nesting and adding null detection processing #1035

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

Merged
rhlin merged 2 commits into from
Jan 14, 2025
Merged

fix: preview page nesting and adding null detection processing #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f8c2e
fix: 预览页面嵌套添加判空处理
lichunn Jan 14, 2025
7f7aaee
fix: fix review
lichunn Jan 14, 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
4 changes: 4 additions & 0 deletions packages/design-core/src/preview/src/preview/Preview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ export default {
const familyPages = []
const ancestors = queryParams.ancestors

if (!ancestors?.length || !appData?.componentsMap) {
return familyPages
}

for (let i = 0; i < ancestors.length; i++) {
const nextPage = i < ancestors.length - 1 ? ancestors[i + 1].name : null
const panelValueAndType = {
Expand Down
12 changes: 6 additions & 6 deletions packages/vue-generator/src/plugins/genRouterPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ const convertToNestedRoutes = (schema) => {
}

const parts = item.meta?.router?.split('/').filter(Boolean)
let curretnLevel = result
let currentLevel = result

parts.forEach((part, index) => {
let found = false

for (let i = 0; i < curretnLevel.length; i++) {
if (curretnLevel[i].path === part) {
for (let i = 0; i < currentLevel.length; i++) {
if (currentLevel[i].path === part) {
// 如果已经存在该路径部分，则进入下一层级
curretnLevel = curretnLevel[i].children
currentLevel = currentLevel[i].children
found = true
break
}
Expand All @@ -83,8 +83,8 @@ const convertToNestedRoutes = (schema) => {
newNode.name = item.meta.id
}

curretnLevel.push(newNode)
curretnLevel = newNode.children
currentLevel.push(newNode)
currentLevel = newNode.children
}
})
})
Expand Down