fix some issues

gene9831 · Jan 6, 2025 · ff9937d · ff9937d
1 parent 4a4e25e
commit ff9937d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
@@ -1,7 +1,7 @@
 <template>
   <component :is="CanvasLayout">
     <template #header>
-      <component v-if="!isBlock" :is="CanvasRouteBar"></component>
+      <component v-if="!isBlock()" :is="CanvasRouteBar"></component>
     </template>
     <template #container>
       <component
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { computed, ref, watch, onUnmounted, onMounted } from 'vue'
+import { ref, watch, onUnmounted, onMounted } from 'vue'
 import {
   useProperties,
   useCanvas,
@@ -77,7 +77,7 @@ export default {
       pageState.properties = null
     }
 
-    const isBlock = computed(() => useCanvas().isBlock())
+    const isBlock = useCanvas().isBlock
 
     watch(
       [() => useCanvas().isSaved(), () => useLayout().layoutState.pageStatus, () => useCanvas().getPageSchema()],

diff --git a/packages/canvas/route-bar/src/CanvasRouteBar.vue b/packages/canvas/route-bar/src/CanvasRouteBar.vue
@@ -60,6 +60,7 @@ watch(
   pageId,
   async (value) => {
     if (!value) {
+      routes.value = []
       return
     }
     const ancestors = await getAncestors(value, true)

diff --git a/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue b/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue
@@ -15,7 +15,7 @@
 <script setup lang="jsx">
 import { usePage } from '@opentiny/tiny-engine-meta-register'
 import { Select as TinySelect } from '@opentiny/vue'
-import { computed, defineEmits, defineProps, reactive, watchEffect } from 'vue'
+import { computed, defineEmits, defineProps, reactive, watch } from 'vue'
 
 const props = defineProps({
   modelValue: {
@@ -30,9 +30,12 @@ const state = reactive({
   selected: props.modelValue?.name ?? ''
 })
 
-watchEffect(() => {
-  state.selected = props.modelValue?.name ?? ''
-})
+watch(
+  () => props.modelValue?.name,
+  (value) => {
+    state.selected = value ?? ''
+  }
+)
 
 const { pageSettingState, getPageList, STATIC_PAGE_GROUP_ID } = usePage()
 
@@ -50,7 +53,7 @@ const pageToTreeData = (page) => {
   }
 
   return {
-    id,
+    id: String(id),
     name,
     isPage,
     disabled: !isPage,

diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js
@@ -222,16 +222,15 @@ const getPageList = async (appId) => {
 
 /**
  * @param {string | number} id
- * @param {(string | number)[]} ancestors
- * @returns {(string | number)[]}
+ * @returns {any[]}
  */
 const getAncestorsRecursively = (id) => {
-  const pageNode = pageSettingState.treeDataMapping[id]
-
-  if (pageNode.id === pageSettingState.ROOT_ID) {
+  if (id === pageSettingState.ROOT_ID) {
     return []
   }
 
+  const pageNode = pageSettingState.treeDataMapping[id]
+
   return [pageNode].concat(getAncestorsRecursively(pageNode.parentId))
 }
 
@@ -245,14 +244,16 @@ const getAncestors = async (id, withFolders) => {
     await getPageList()
   }
 
+  if (!pageSettingState.treeDataMapping[id]) {
+    return null
+  }
+
   const ancestorsWithSelf = getAncestorsRecursively(id)
   const ancestors = ancestorsWithSelf.slice(1).reverse()
 
-  if (withFolders) {
-    return ancestors.map((item) => item.id)
-  }
+  const predicate = withFolders ? () => true : (item) => item.isPage
 
-  return ancestors.filter((item) => item.isPage).map((item) => item.id)
+  return ancestors.filter(predicate).map((item) => item.id)
 }
 
 const clearCurrentState = () => {