feat(mbm-bugs): fix plugin tree visible bug & modify review

Author: betterdancing

packages/canvas/container/src/components/CanvasAction.vue

@@ -252,10 +252,10 @@ export default {
 
     const hide = () => {
       if (getCurrent().schema?.id) {
-        const { clearSelect } = useCanvas().canvasApi.value
+        const { selectNode } = useCanvas().canvasApi.value
         getRenderer().setCondition(getCurrent().schema.id, false)
         useCanvas().pageState.nodesStatus[getCurrent().schema.id] = false
-        clearSelect()
+        selectNode('body')
       }
       updateRect()
     }

packages/canvas/container/src/container.ts

@@ -486,8 +486,7 @@ export const updateRect = (id?: string) => {
     const duration = window.getComputedStyle(element).getPropertyValue('transition-duration')
     let waitTime = 0
     if (duration) {
-      const unit = duration.slice(-2)
-      if (unit === 'ms') {
+      if (duration.endsWith('ms')) {
         waitTime = parseFloat(duration)
       } else {
         waitTime = parseFloat(duration) * 1000
@@ -828,7 +827,6 @@ export const dragMove = (event: DragEvent, isHover: boolean) => {
 // type == clickTree, 为点击大纲; type == loop-id=xxx ,为点击循环数据
 export const selectNode = async (id: string, type?: string, isMultiple = false) => {
   const { node } = useCanvas().getNodeWithParentById(id) || {}
-
   let element = querySelectById(id)
 
   if (element && node) {
@@ -837,7 +835,6 @@ export const selectNode = async (id: string, type?: string, isMultiple = false)
   }
 
   const nodeIsSelected = setSelectRect(id, element, { isMultiple, type, schema: node })
-
   // 执行setSelectRect之后再去判断multiSelectedStates的长度
   if (multiSelectedStates.value.length === 1) {
     const { schema: node, parent, type } = multiSelectedStates.value[0]
@@ -863,6 +860,7 @@ export const selectNode = async (id: string, type?: string, isMultiple = false)
   if (multiSelectedStates.value.length === 1) {
     const { schema: node, parent, type, id } = multiSelectedStates.value[0]
     canvasState.emit('selected', node, parent, type, id)
+
     return node
   } else {
     canvasState.emit('selected')

packages/plugins/materials/src/composable/useResource.ts

@@ -133,14 +133,14 @@ const initPageOrBlock = async () => {
     return
   }
 
-  // url 没有 pageid 或 blockid，到当前用户有权限查看的第一页或页面首页
+  // url 没有 pageid 或 blockid，到当前用户有权限查看的第一页(如果没有则停留在第一页)或页面首页
   const pageInfo = appSchemaState.pageTree.find((page) => page?.meta?.isHome) ||
-    appSchemaState.pageTree.find(
-      (page) =>
-        page.componentName === COMPONENT_NAME.Page &&
-        page?.meta?.group !== 'publicPages' &&
-        globalState.userInfo.id === page.meta.occupier.id
-    ) || {
+    appSchemaState.pageTree.find((page) => {
+      if (page.componentName === COMPONENT_NAME.Page && globalState.userInfo.id === page.meta.occupier.id) {
+        return true
+      }
+      return page.componentName === COMPONENT_NAME.Page && page?.meta?.group !== 'publicPages'
+    }) || {
       page_content: {
         componentName: COMPONENT_NAME.Page
       }

packages/plugins/tree/src/Main.vue

@@ -31,7 +31,7 @@
                 :name="eyeOpen(row.id) ? 'eye' : 'eye-invisible'"
                 @click="showNode($event, row.rawData)"
               ></svg-icon>
-              <svg-icon name="delete" @click="delNode(row.rawData)"></svg-icon>
+              <svg-icon name="delete" @mouseup="delNode(row.rawData)"></svg-icon>
             </template>
           </div>
         </template>
@@ -155,14 +155,13 @@ export default {
     const showNode = (event, data) => {
       pageState.nodesStatus[data.id] = !(pageState.nodesStatus[data.id] !== false)
       data.show = pageState.nodesStatus[data.id]
-
-      const { getRenderer, clearSelect } = useCanvas().canvasApi.value
+      const { getRenderer, selectNode } = useCanvas().canvasApi.value
 
       getRenderer().setCondition(data.id, data.show)
 
       if (!data.show) {
         event.stopPropagation()
-        clearSelect()
+        selectNode('body', 'clickTree')
       }
     }