Skip to content

Commit

Permalink
fix(pro:search): name select label not rendering (#1493)
Browse files Browse the repository at this point in the history
  • Loading branch information
sallerli1 committed Mar 7, 2023
1 parent 168620e commit cb4b86a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions packages/pro/search/demo/RemoteSearch.md
Expand Up @@ -7,8 +7,8 @@ title:

## zh

`'select'``'treeSelect'` 类型搜索项支持服务端搜索。
`'select'``'treeSelect'``'cascader'` 类型搜索项支持服务端搜索。

## en

Server-side searching is supported under field type of `'select'`, `'treeSelect'`.
Server-side searching is supported under field type of `'select'`, `'treeSelect'`, `'cascader'`.
13 changes: 5 additions & 8 deletions packages/pro/search/src/segments/CreateNameSegment.tsx
Expand Up @@ -35,21 +35,18 @@ export function createNameSegment(
return
}

const renderNameLabel = (key: VKey, renderer?: (searchField: SearchField) => VNodeChild) => {
if (!renderer) {
return undefined
}

const renderNameLabel = (key: VKey, renderer: (searchField: SearchField) => VNodeChild) => {
const searchField = searchFields!.find(field => field.key === key)!
return renderer(searchField)
}

const _customNameLabel = customNameLabel ?? 'nameLabel'
const customNameLabelRender = isString(_customNameLabel) ? slots[_customNameLabel] : _customNameLabel

const panelSlots = {
optionLabel: isString(_customNameLabel)
? (option: SelectPanelData) => renderNameLabel(option.key, slots[_customNameLabel])
: (option: SelectPanelData) => renderNameLabel(option.key, _customNameLabel),
optionLabel: customNameLabelRender
? (option: SelectPanelData) => renderNameLabel(option.key, customNameLabelRender)
: undefined,
}

return (
Expand Down

0 comments on commit cb4b86a

Please sign in to comment.