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.

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

feat(pro:search): add quick select panel support #1529

Merged
merged 1 commit into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/components/_private/overflow/src/Overflow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,13 @@ export default defineComponent({
throwError('components/_private/overflow', 'item slot must be provided')
}
const nodeContent = slots.item?.(item) ?? ''

const key = props.getKey(item)
return (
<Item
{...itemSharedProps}
itemKey={props.getKey(item)}
key={key}
itemKey={key}
display={index < displayCount.value}
onSizeChange={(itemEl: Element, key?: VKey) => setItemWidth(key!, itemEl)}
>
Expand Down
1 change: 1 addition & 0 deletions packages/components/_private/overlay/src/Overlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export default defineComponent({

expose({
updatePopper: update,
getPopperElement: () => convertElement(popperRef),
})

const handleClickOutside = (evt: Event) => {
Expand Down
1 change: 1 addition & 0 deletions packages/components/_private/overlay/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export const overlayProps = {

export interface OverlayBindings {
updatePopper: (options?: Partial<PopperOptions>) => void
getPopperElement: () => HTMLElement | undefined | null
}

export type OverlayProps = ExtractInnerPropTypes<typeof overlayProps>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/select/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const selectPanelProps = {
onScrolledBottom: [Function, Array] as PropType<MaybeArray<() => void>>,

// private
_virtualScrollHeight: { type: Number, default: 256 },
_virtualScrollHeight: { type: [Number, String] as PropType<number | 'auto' | '100%'>, default: 256 },
_virtualScrollItemHeight: { type: Number, default: 32 },
} as const

Expand Down
14 changes: 13 additions & 1 deletion packages/pro/search/demo/ConvertToKeyword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
:searchFields="searchFields"
:onChange="onChange"
:onSearch="onSearch"
:onItemCreate="onItemCreate"
:onItemConfirm="onItemConfirm"
></IxProSearch>
</template>

<script setup lang="ts">
import type { SearchField, SearchItemConfirmContext, SearchValue } from '@idux/pro/search'
import type { SearchField, SearchItemConfirmContext, SearchItemCreateContext, SearchValue } from '@idux/pro/search'

import { ref } from 'vue'

Expand Down Expand Up @@ -101,6 +102,17 @@ const onChange = (value: SearchValue[] | undefined, oldValue: SearchValue[] | un
const onSearch = () => {
console.log('onSearch')
}

const onItemCreate = (context: SearchItemCreateContext) => {
const { name, nameInput } = context

if (!name && nameInput) {
searchValues.value.push({
key: 'keyword',
value: nameInput,
})
}
}
const onItemConfirm = (context: SearchItemConfirmContext) => {
const { removed, nameInput, operatorInput, valueInput } = context
if (!removed) {
Expand Down
1 change: 0 additions & 1 deletion packages/pro/search/demo/Custom.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ const handleUserFormKeyDown = (evt: KeyboardEvent, confirm: () => void) => {
}
}
.demo-pro-search-custom-user-form-input {
min-width: 305px;
color: #684545;
text-align: center;
}
Expand Down
26 changes: 11 additions & 15 deletions packages/pro/search/demo/MergeItems.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<template>
<IxProSearch
:value="value"
v-model:value="value"
style="width: 100%"
:searchFields="searchFields"
:onSearch="onSearch"
:onUpdate:value="handleValueUpdate"
:onItemConfirm="handleItemConfirm"
></IxProSearch>
</template>

<script setup lang="ts">
import type { SearchField, SearchValue } from '@idux/pro/search'
import type { SearchField, SearchItemConfirmContext, SearchValue } from '@idux/pro/search'

import { reactive, ref } from 'vue'

Expand Down Expand Up @@ -92,22 +92,18 @@ const searchFields: SearchField[] = reactive([
securityStateField,
])

const handleValueUpdate = (searchValues: SearchValue[] | undefined) => {
const securityStateValues = searchValues?.filter(v => v.key === 'security_state') as
| SearchValue<string[]>[]
| undefined

if (!securityStateValues?.length) {
value.value = searchValues ?? []
const handleItemConfirm = (item: SearchItemConfirmContext) => {
if (item.key !== 'security_state') {
return
}

const currentValue = securityStateValues.pop()!
value.value = !securityStateValues.length
? searchValues!
: [...searchValues!.filter(v => v.key !== 'security_state'), currentValue]
const tempValue = (value.value ?? []).filter(v => v.key !== 'security_state')
if (!item.removed && item.value) {
tempValue.push({ key: 'security_state', operator: item.operator, value: item.value })
}

securityStateField.defaultValue = currentValue.value
value.value = tempValue
securityStateField.defaultValue = item.value
}
const onSearch = () => {
console.log('onSearch')
Expand Down
14 changes: 14 additions & 0 deletions packages/pro/search/demo/QuickSelect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
order: 0
title:
zh: 快捷面板
en: Quick select panel
---

## zh

通过 `searchField.quickSelect` 配置支持在快捷搜索面板展示搜索项。

## en

Display searchField panel within quick select panel via `searchField.quickSelect`.