Skip to content
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

Jump to bottom

fix(pro:search): unconfirmed item sequence should change when update #1725

Merged
merged 1 commit into from
Oct 30, 2023
Merged

fix(pro:search): unconfirmed item sequence should change when update #1725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
105 changes: 67 additions & 38 deletions packages/pro/search/src/composables/useSearchStates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export function useSearchStates(

return countMap
})
const lastSearchStateIndex = computed(() => searchStates.value[searchStates.value.length - 1]?.index ?? -1)

const findSearchField = (fieldKey?: VKey) => {
if (isNil(fieldKey)) {
Expand Down Expand Up @@ -217,47 +216,77 @@ export function useSearchStates(

const initSearchStates = () => {
const dataKeyCountMap = new Map<VKey, number>()
const newSearchStates = (
searchValues.value?.map((searchValue, index) => {
const fieldKey = searchValue.key
const searchField = findSearchField(fieldKey)
if (!searchField) {
return
}
const newStates: SearchState[] = []

const segmentStates = generateSegmentStates(searchField, searchValue)
const count = dataKeyCountMap.has(fieldKey) ? dataKeyCountMap.get(fieldKey)! : 0
const key = getKey(fieldKey, count)
const _getKey = (fieldKey: VKey) => {
const count = dataKeyCountMap.has(fieldKey) ? dataKeyCountMap.get(fieldKey)! : 0
return getKey(fieldKey, count)
}
const _incrementCount = (fieldKey: VKey) => {
const count = dataKeyCountMap.get(fieldKey)
dataKeyCountMap.set(fieldKey, (count ?? 0) + 1)
}

const searchState = { key, index, fieldKey, searchValue, segmentStates } as SearchState
if (!checkSearchStateValid(searchState, dataKeyCountMap)) {
return
}
const createdStates = getMarks()
.map(({ key, mark }) => mark === 'created' && getSearchStateByKey(key))
.filter(Boolean) as SearchState[]

dataKeyCountMap.set(fieldKey, count + 1)
return searchState
}) ?? []
).filter(Boolean) as SearchState[]
let newStateIndex = 0
let createStateIndex = 0

const lastIndex = newSearchStates[newSearchStates.length - 1]?.index ?? -1
const addCreatedState = (state: SearchState) => {
const fieldKey = state.fieldKey
const key = _getKey(fieldKey)

const createdStates = getMarks()
.map(({ key, mark }) => mark === 'created' && getSearchStateByKey(key))
.filter(Boolean)
.map((state, index) => {
// recreate the state key again to avoid key duplication
const fieldKey = (state as SearchState).fieldKey
const count = dataKeyCountMap.has(fieldKey) ? dataKeyCountMap.get(fieldKey)! : 0
const key = getKey(fieldKey, count)

return {
...state,
key,
index: lastIndex + index + 1,
}
}) as SearchState[]
newStates.push({
...state,
key,
})

_incrementCount(fieldKey)
}
const addNewState = (searchValue: SearchValue | undefined) => {
if (!searchValue) {
return
}

const fieldKey = searchValue.key
const searchField = findSearchField(fieldKey)
if (!searchField) {
return
}

const key = _getKey(fieldKey)
const segmentStates = generateSegmentStates(searchField, searchValue)
const searchState = { key, index: newStates.length, fieldKey, searchValue, segmentStates } as SearchState
if (!checkSearchStateValid(searchState, dataKeyCountMap)) {
return
}

newStates.push(searchState)
_incrementCount(fieldKey)
}

while (newStateIndex < (searchValues.value?.length ?? -1) || createStateIndex < createdStates.length) {
let createdState = createdStates[createStateIndex]
const value = searchValues.value?.[newStateIndex]

if (value && createdState?.index !== newStateIndex) {
addNewState(value)
newStateIndex++
} else if (createdState) {
let lastIndex: number

do {
addCreatedState(createdState)
lastIndex = createdStates[createStateIndex].index
createStateIndex++
createdState = createdStates[createStateIndex]
} while (createdState && createdStates[createStateIndex].index === lastIndex + 1)
}
}

searchStates.value = [...newSearchStates, ...createdStates]
searchStates.value = newStates
}

const initSearchState = (key: VKey, segmentName?: string) => {
Expand All @@ -267,7 +296,7 @@ export function useSearchStates(
return
}

const searchValue = !isNil(searchState.index) ? searchValues.value?.[searchState.index] : undefined
const searchValue = searchState.searchValue
const segmentStates = generateSegmentStates(searchField, searchValue)

if (!segmentName) {
Expand All @@ -293,7 +322,7 @@ export function useSearchStates(
const newSearchState: SearchState = {
key: newKey,
name: searchField.label,
index: lastSearchStateIndex.value + 1,
index: searchStates.value.length,
fieldKey: fieldKey,
segmentStates: generateSegmentStates(searchField, searchValue),
}
Expand Down