fix: parent form field in page settings do not display

gene9831 · Jan 24, 2025 · 51737d9 · 51737d9
1 parent d8c78bd
commit 51737d9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git 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,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]
@@ -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
@@ -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