From 51737d964d84e526b007c94bf56ef918af394932 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Fri, 24 Jan 2025 11:29:47 +0800
Subject: [PATCH] fix: parent form field in page settings do not display

---
 packages/plugins/page/src/PageGeneral.vue       | 17 ++++++++++++++---
 packages/plugins/page/src/composable/usePage.js |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/page/src/PageGeneral.vue b/packages/plugins/page/src/PageGeneral.vue
index 252da0623..b8a68069c 100644
--- a/packages/plugins/page/src/PageGeneral.vue
+++ b/packages/plugins/page/src/PageGeneral.vue
@@ -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"
@@ -94,7 +94,17 @@ 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
@@ -102,7 +112,7 @@ export default {
 
     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]
@@ -233,6 +243,7 @@ export default {
       pageRules,
       folderRules,
       pageSettingState,
+      pageParentId,
       generalForm,
       validGeneralForm,
       treeFolderOp,
diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js
index 3463548cd..c31edb4e8 100644
--- a/packages/plugins/page/src/composable/usePage.js
+++ b/packages/plugins/page/src/composable/usePage.js
@@ -152,7 +152,7 @@ const isCurrentDataSame = () => {
 }
 
 const changeTreeData = (newParentId, oldParentId) => {
-  if (newParentId && oldParentId && newParentId !== oldParentId) {
+  if (newParentId && oldParentId && String(newParentId) !== String(oldParentId)) {
     const folderData = pageSettingState.treeDataMapping[newParentId]
     const parentData = pageSettingState.treeDataMapping[oldParentId]
     const currentPageDataId = pageSettingState.currentPageData.id