feat(ui-engine-bugs): edit on 2.7.x

Author: betterdancing

packages/canvas/DesignCanvas/src/DesignCanvas.vue

@@ -87,6 +87,9 @@ export default {
       footData.value = useCanvas().getNodePath(node?.id)
       pageState.currentSchema = {}
       pageState.properties = null
+      // 删除节点后，重置pageState中组件的属性
+      // 后续需要改造
+      useProperties().getProps(null, null)
     }
 
     const isBlock = useCanvas().isBlock
@@ -106,9 +109,9 @@ export default {
           empty: () => '应用下暂无页面，需新建页面后体验画布功能',
           release: (type) => `当前${componentType[type]}未锁定，点击右上角 “锁定” 图标后编辑${componentType[type]}`,
           lock: (type) =>
-            `当前${componentType[type]}被 ${pageInfo?.username || ''} 锁定，如需编辑请先联系他解锁文件，然后再锁定该${
+            `当前${componentType[type]}被 ${pageInfo?.username || ''} 锁定，您可以创建新页面，如需编辑请先联系他解锁${
               componentType[type]
-            }后编辑！`
+            }，然后再锁定该${componentType[type]}后编辑！`
         }
 
         const renderMsg = message[pageStatus.state](pageSchema.componentName)

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

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

packages/canvas/container/src/container.ts

@@ -466,6 +466,41 @@ const setSelectRect = (
   )
 }
 
+const getElementDurationTime = (elementId?: string) => {
+  const element = elementId ? querySelectById(elementId) : getDocument().body
+  const durationTime = window.getComputedStyle(element).getPropertyValue('transition-duration')
+  const delayTime = window.getComputedStyle(element).getPropertyValue('transition-delay')
+  const transition = window.getComputedStyle(element).getPropertyValue('transition')
+  let delayArray: string[] = []
+  if (transition) {
+    const delayRegex = /([0-9]+(\.[0-9]+)?)(s|ms|S|MS)/
+    const transitions = transition.split(',')
+    transitions.forEach((item) => {
+      const parts = item.trim().split(' ')
+      delayArray = delayArray.concat(parts)
+    })
+    delayArray = delayArray.filter((delay) => delayRegex.test(delay))
+  }
+
+  if (durationTime) {
+    delayArray.push(durationTime)
+  }
+
+  if (delayTime) {
+    delayArray.push(delayTime)
+  }
+
+  const delayTimes: any[] = delayArray.map((item) => {
+    const unit = item.slice(-2)
+    if (unit === 'ms') {
+      return parseFloat(item)
+    } else {
+      return parseFloat(item) * 1000
+    }
+  })
+  return delayTimes.length ? Math.max(...delayTimes) : 300
+}
+
 export const updateRect = (id?: string) => {
   id = (typeof id === 'string' && id) || getCurrent().schema?.id
   clearHover()
@@ -481,17 +516,7 @@ export const updateRect = (id?: string) => {
   const isBodySelected = !selectState.componentName && selectState.width > 0
 
   if (id || isBodySelected) {
-    const element = querySelectById(id) || getDocument().body
-    const duration = window.getComputedStyle(element).getPropertyValue('transition-duration')
-    let waitTime = 300
-    if (duration) {
-      const unit = duration.slice(-2)
-      if (unit === 'ms') {
-        waitTime = parseFloat(duration)
-      } else {
-        waitTime = parseFloat(duration) * 1000
-      }
-    }
+    const waitTime = getElementDurationTime(id)
     setTimeout(() => setSelectRect(id), waitTime)
   } else {
     clearSelect()

packages/configurator/src/variable-configurator/VariableConfigurator.vue

@@ -110,7 +110,9 @@
 
     <template #footer>
       <div class="bind-dialog-footer">
-        <tiny-button type="danger" plain @click="remove">移除绑定</tiny-button>
+        <tiny-button type="danger" plain :disabled="modelValue?.type !== 'JSExpression'" @click="remove"
+          >移除绑定</tiny-button
+        >
         <div class="right">
           <tiny-button @click="cancel">取 消</tiny-button>
           <tiny-button type="info" :disabled="confirmDisabled" @click="confirm">确 定</tiny-button>

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

@@ -119,6 +119,7 @@ const initBlock = async (blockId: string) => {
 const initPageOrBlock = async () => {
   const { pageId, blockId } = getMetaApi(META_SERVICE.GlobalService).getBaseInfo()
   const pagePluginApi = getMetaApi(META_APP.AppManage)
+  const globalState = getMetaApi(META_SERVICE.GlobalService).getState()
 
   if (pageId) {
     const data = await pagePluginApi.getPageById(pageId)
@@ -132,11 +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'
-    ) || {
+    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

@@ -27,7 +27,10 @@
               row.label
             }}</span>
             <template v-if="row.id !== 'body'">
-              <svg-icon :name="eyeOpen(row.id) ? 'eye' : 'eye-invisible'" @mouseup="showNode(row.rawData)"></svg-icon>
+              <svg-icon
+                :name="eyeOpen(row.id) ? 'eye' : 'eye-invisible'"
+                @click="showNode($event, row.rawData)"
+              ></svg-icon>
               <svg-icon name="delete" @mouseup="delNode(row.rawData)"></svg-icon>
             </template>
           </div>
@@ -156,7 +159,10 @@ export default {
       const { getRenderer, clearSelect } = useCanvas().canvasApi.value
 
       getRenderer().setCondition(data.id, data.show)
-      clearSelect()
+      if (!data.show) {
+        event?.stopPropagation()
+        clearSelect()
+      }
     }
 
     const delNode = (data) => {