Skip to content

fix: parent form field in page settings do not display #1069

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
hexqi merged 3 commits into from
Jan 25, 2025
Merged

fix: parent form field in page settings do not display #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51737d9
fix: parent form field in page settings do not display
gene9831 Jan 24, 2025
ba62f9f
fix: page node disappear when setting parent to root
gene9831 Jan 24, 2025
5f7b024
add guard to avoid runtime errors
gene9831 Jan 24, 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
17 changes: 14 additions & 3 deletions packages/plugins/page/src/PageGeneral.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
prop="parentId"
>
<tiny-select
v-model="pageSettingState.currentPageData.parentId"
v-model="pageParentId"
value-field="id"
render-type="tree"
:tree-op="treeFolderOp"
Expand Down Expand Up @@ -94,15 +94,25 @@ export default {
setup() {
const { pageSettingState, changeTreeData, STATIC_PAGE_GROUP_ID } = usePage()
const ROOT_ID = pageSettingState.ROOT_ID
const oldParentId = ref(pageSettingState.currentPageData.parentId)

const pageParentId = computed({
get() {
return String(pageSettingState.currentPageData.parentId)
},
set(value) {
pageSettingState.currentPageData.parentId = value
}
})

const oldParentId = ref(pageParentId.value)

watchEffect(() => {
oldParentId.value = pageSettingState.oldParentId
})

const currentRoute = computed(() => {
let route = pageSettingState.currentPageData.route || ''
let parentId = pageSettingState.currentPageData.parentId
let parentId = pageParentId

while (parentId !== ROOT_ID) {
const parent = pageSettingState.treeDataMapping[parentId]
Expand Down Expand Up @@ -233,6 +243,7 @@ export default {
pageRules,
folderRules,
pageSettingState,
pageParentId,
generalForm,
validGeneralForm,
treeFolderOp,
Expand Down
23 changes: 17 additions & 6 deletions packages/plugins/page/src/composable/usePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ const isTemporaryPage = reactive({
saved: false
})

const STATIC_PAGE_GROUP_ID = 0
const COMMON_PAGE_GROUP_ID = 1

const generateCssString = (pageOptions, materialsOptions) => {
if (!pageOptions?.pageBaseStyle?.className || !pageOptions?.pageBaseStyle?.style) {
return ''
Expand Down Expand Up @@ -151,10 +154,21 @@ const isCurrentDataSame = () => {
return isEqual
}

const getParentNode = (parentId) => {
return parentId === pageSettingState.ROOT_ID
? { id: pageSettingState.ROOT_ID, children: pageSettingState.pages[STATIC_PAGE_GROUP_ID].data }
: pageSettingState.treeDataMapping[parentId]
}

const changeTreeData = (newParentId, oldParentId) => {
if (newParentId && oldParentId && newParentId !== oldParentId) {
const folderData = pageSettingState.treeDataMapping[newParentId]
const parentData = pageSettingState.treeDataMapping[oldParentId]
if (newParentId && oldParentId && String(newParentId) !== String(oldParentId)) {
const folderData = getParentNode(newParentId)
const parentData = getParentNode(oldParentId)

if (!folderData || !parentData) {
return
}

const currentPageDataId = pageSettingState.currentPageData.id
const curDataIndex = parentData.children?.findIndex?.(({ id }) => id === currentPageDataId)

Expand Down Expand Up @@ -187,9 +201,6 @@ const resetPageData = () => {
// 判断当前页面内容是否有修改
const isChangePageData = () => !isEqual(pageSettingState.currentPageData, pageSettingState.currentPageDataCopy)

const STATIC_PAGE_GROUP_ID = 0
const COMMON_PAGE_GROUP_ID = 1

/**
*
* @typedef {Object} PageData
Expand Down
Loading