修复新增页面搜索条件存在并没有触发 (#448)

This commit is contained in:
tianxin 2024-05-06 19:55:04 +08:00 committed by GitHub
parent e98994f8d9
commit c36cc66f59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 10 deletions

View File

@ -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))

View File

@ -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'
@ -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 = []
@ -106,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)
@ -136,6 +145,7 @@ export default {
const firstGroupTreeData = formatTreeData([...firstGroupData.data], 'parentId', 'id')
firstGroupData.data = firstGroupTreeData[ROOT_ID].children
pageSettingState.pages = [firstGroupData, secondGroupData]
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