From a3a6c2bfaf210c7988bebe22e7ffa8ffadae8ac0 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Tue, 14 Jan 2025 15:04:24 +0800
Subject: [PATCH] fix: add error handlers and fix some misspelling of word

---
 .../canvas/route-bar/src/CanvasRouteBar.vue   |  2 +-
 .../RouterSelectConfigurator.vue              | 12 ++++---
 packages/plugins/page/src/PageTree.vue        | 34 ++++++++++++-------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/packages/canvas/route-bar/src/CanvasRouteBar.vue b/packages/canvas/route-bar/src/CanvasRouteBar.vue
index eeffd9192..62e3c4ae5 100644
--- a/packages/canvas/route-bar/src/CanvasRouteBar.vue
+++ b/packages/canvas/route-bar/src/CanvasRouteBar.vue
@@ -63,7 +63,7 @@ watch(
       routes.value = []
       return
     }
-    const ancestors = await getAncestors(value, true)
+    const ancestors = (await getAncestors(value, true)) || []
 
     routes.value = ancestors.concat(value).map((id) => {
       const { route, isPage } = pageSettingState.treeDataMapping[id]
diff --git a/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue b/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue
index 763516e53..88eed6b0b 100644
--- a/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue
+++ b/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue
@@ -15,11 +15,11 @@
 <script setup lang="jsx">
 import { usePage } from '@opentiny/tiny-engine-meta-register'
 import { Select as TinySelect } from '@opentiny/vue'
-import { computed, defineEmits, defineProps, reactive, watch } from 'vue'
+import { computed, defineEmits, defineProps, onMounted, reactive, watch } from 'vue'
 
 const props = defineProps({
   modelValue: {
-    type: [String, Array],
+    type: String,
     default: () => ''
   }
 })
@@ -43,9 +43,11 @@ const pages = computed(() =>
   pageSettingState.pages[STATIC_PAGE_GROUP_ID].data.concat(pageSettingState.pages[COMMON_PAGE_GROUP_ID].data)
 )
 
-if (!Array.isArray(pages.value)) {
-  getPageList()
-}
+onMounted(() => {
+  if (!Array.isArray(pages.value)) {
+    getPageList()
+  }
+})
 
 const pageToTreeData = (page) => {
   const { id, name, isPage, children } = page
diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue
index 8096635ce..6d4db17b7 100644
--- a/packages/plugins/page/src/PageTree.vue
+++ b/packages/plugins/page/src/PageTree.vue
@@ -13,7 +13,7 @@
         <span class="title">{{ groupItem.groupName }}</span>
       </template>
       <div class="app-manage-tree">
-        <draggble-tree
+        <draggable-tree
           :data="groupItem.data"
           label-key="name"
           :active="state.currentNodeData.id"
@@ -49,7 +49,7 @@
               </tiny-popover>
             </div>
           </template>
-        </draggble-tree>
+        </draggable-tree>
       </div>
     </tiny-collapse-item>
   </tiny-collapse>
@@ -75,7 +75,7 @@ import { constants } from '@opentiny/tiny-engine-utils'
 import { closePageSettingPanel } from './PageSetting.vue'
 import { closeFolderSettingPanel } from './PageFolderSetting.vue'
 import http from './http.js'
-import DraggbleTree from './Tree.vue'
+import DraggableTree from './Tree.vue'
 import { SvgButton } from '@opentiny/tiny-engine-common'
 
 const { PAGE_STATUS } = constants
@@ -87,7 +87,7 @@ export default {
     TinyCollapseItem: CollapseItem,
     TinyIconSearch: IconSearch(),
     TinyPopover: Popover,
-    DraggbleTree,
+    DraggableTree,
     SvgButton
   },
   props: {
@@ -316,18 +316,26 @@ export default {
         changeTreeData(newParent.id, dragged.parentId)
         resetPageData()
         // TODO 页面更换父节点后，原来每次变更需要填写变更信息
-        fetchPageDetail(dragged.id).then((pageDetail) => {
-          pageDetail.parentId = newParent.id
-          if (pageDetail.isPage) {
-            updatePage(pageDetail)
-          } else {
-            updateFolder(pageDetail)
-          }
-        })
+        fetchPageDetail(dragged.id)
+          .then((pageDetail) => {
+            pageDetail.parentId = newParent.id
+            if (pageDetail.isPage) {
+              updatePage(pageDetail)
+            } else {
+              updateFolder(pageDetail)
+            }
+          })
+          .catch((error) => {
+            useNotify({
+              type: 'error',
+              title: '移动页面文件/文件夹失败',
+              message: JSON.stringify(error?.message || error)
+            })
+          })
       } else {
         confirm({
           title: '提示',
-          message: '更改关未保存，是否要放弃这些更改？',
+          message: '更改尚未保存，是否要放弃这些更改？',
           exec: () => {
             if (!pageSettingState.isNew) {
               changeTreeData(pageSettingState.oldParentId, pageSettingState.currentPageData.parentId)