Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chilingling merged 3 commits into from
May 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
825a125
修复新增页面搜索条件存在并没有触发
ianxinnew Apr 23, 2024
9d61009
修复新增页面搜索条件存在并没有触发
ianxinnew Apr 25, 2024
ec7a1bf
修复新增页面搜索条件存在并没有触发
ianxinnew Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/plugins/page/src/PageHistory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
22 changes: 12 additions & 10 deletions packages/plugins/page/src/PageTree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 = []
Expand All @@ -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)

Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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

Expand Down