From 825a12526c95db3f2cba97099ab11f50737ae1be Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Tue, 23 Apr 2024 02:52:40 -0700
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=B9=B6=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/page/src/PageTree.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue
index 8183978e10..7ef013dc47 100644
--- a/packages/plugins/page/src/PageTree.vue
+++ b/packages/plugins/page/src/PageTree.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script lang="jsx">
-import { reactive, ref, watchEffect } from 'vue'
+import { reactive, ref, watchEffect, watch } from 'vue'
 import { Search, Tree, Collapse, CollapseItem } from '@opentiny/vue'
 import { IconFolderOpened, IconFolderClosed } from '@opentiny/vue-icon'
 import { useCanvas, useApp, useModal, usePage, useBreadcrumb, useLayout } from '@opentiny/tiny-engine-controller'
@@ -79,7 +79,6 @@ export default {
       collapseValue: [STATIC_PAGE_GROUP_ID, COMMON_PAGE_GROUP_ID],
       currentNodeData: {}
     })
-
     const formatTreeData = (data, parentId, id) => {
       const originObj = { [ROOT_ID]: { id: ROOT_ID, name: '站点根目录', children: [] } }
       const treeArr = []
@@ -305,6 +304,13 @@ export default {
       }
     }
 
+    watch(
+      () => pageSettingState.pages,
+      () => {
+        searchPageData(state.pageSearchValue)
+      },
+      { deep: true }
+    )
     const filterPageTreeData = (value, data) => {
       if (!value) return true
 

From 9d610097215ff9a8c188936fdc05f36df7a2dfef Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Wed, 24 Apr 2024 19:10:11 -0700
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=B9=B6=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/page/src/PageTree.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue
index 7ef013dc47..2ce7e4e343 100644
--- a/packages/plugins/page/src/PageTree.vue
+++ b/packages/plugins/page/src/PageTree.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script lang="jsx">
-import { reactive, ref, watchEffect, watch } from 'vue'
+import { reactive, ref, watchEffect } from 'vue'
 import { Search, Tree, Collapse, CollapseItem } from '@opentiny/vue'
 import { IconFolderOpened, IconFolderClosed } from '@opentiny/vue-icon'
 import { useCanvas, useApp, useModal, usePage, useBreadcrumb, useLayout } from '@opentiny/tiny-engine-controller'
@@ -135,6 +135,7 @@ export default {
       const firstGroupTreeData = formatTreeData([...firstGroupData.data], 'parentId', 'id')
       firstGroupData.data = firstGroupTreeData[ROOT_ID].children
       pageSettingState.pages = [firstGroupData, secondGroupData]
+      state.pageSearchValue = ''
       return pageSettingState.pages
     }
 
@@ -304,13 +305,6 @@ export default {
       }
     }
 
-    watch(
-      () => pageSettingState.pages,
-      () => {
-        searchPageData(state.pageSearchValue)
-      },
-      { deep: true }
-    )
     const filterPageTreeData = (value, data) => {
       if (!value) return true
 

From ec7a1bff82f8497a0ef4443c42bd9635fec9d263 Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Thu, 25 Apr 2024 20:00:03 -0700
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=B9=B6=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/page/src/PageHistory.vue |  3 +++
 packages/plugins/page/src/PageTree.vue    | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/plugins/page/src/PageHistory.vue b/packages/plugins/page/src/PageHistory.vue
index 178a5bcb33..58c60567c4 100644
--- a/packages/plugins/page/src/PageHistory.vue
+++ b/packages/plugins/page/src/PageHistory.vue
@@ -32,6 +32,9 @@ export default {
 
       if (pageId) {
         fetchPageHistory(pageId + params).then((data) => {
+          if (!data) {
+            return
+          }
           data.forEach((item) => {
             item.backupTitle = item.message
             item.backupTime = getDateFromNow(new Date(item.time))
diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue
index 2ce7e4e343..d6cbdc9c85 100644
--- a/packages/plugins/page/src/PageTree.vue
+++ b/packages/plugins/page/src/PageTree.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script lang="jsx">
-import { reactive, ref, watchEffect } from 'vue'
+import { reactive, ref, watchEffect, nextTick } from 'vue'
 import { Search, Tree, Collapse, CollapseItem } from '@opentiny/vue'
 import { IconFolderOpened, IconFolderClosed } from '@opentiny/vue-icon'
 import { useCanvas, useApp, useModal, usePage, useBreadcrumb, useLayout } from '@opentiny/tiny-engine-controller'
@@ -105,6 +105,16 @@ export default {
       return pageSettingState.treeDataMapping
     }
 
+    const searchPageData = (value) => {
+      if (Array.isArray(pageTreeRefs?.value)) {
+        nextTick(() => {
+          pageTreeRefs.value.forEach((item) => {
+            item?.filter(value)
+          })
+        })
+      }
+    }
+
     const refreshPageList = async (appId, data) => {
       const pagesData = data ? data : await fetchPageList(appId)
 
@@ -135,7 +145,7 @@ export default {
       const firstGroupTreeData = formatTreeData([...firstGroupData.data], 'parentId', 'id')
       firstGroupData.data = firstGroupTreeData[ROOT_ID].children
       pageSettingState.pages = [firstGroupData, secondGroupData]
-      state.pageSearchValue = ''
+      searchPageData(state.pageSearchValue)
       return pageSettingState.pages
     }
 
@@ -297,14 +307,6 @@ export default {
       }
     })
 
-    const searchPageData = (value) => {
-      if (Array.isArray(pageTreeRefs?.value)) {
-        pageTreeRefs.value.forEach((item) => {
-          item?.filter(value)
-        })
-      }
-    }
-
     const filterPageTreeData = (value, data) => {
       if (!value) return true