* picker: fix display not work as expected.

easysoft · Mar 26, 2024 · cf9ffb4 · cf9ffb4
1 parent f47403c
commit cf9ffb4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/picker/dev.ts b/lib/picker/dev.ts
@@ -176,6 +176,7 @@ onPageUpdate(() => {
         items,
         search: false,
         multiple: true,
+        placeholder: '请选择你的最爱',
         display: '已选择 {count} 项',
     });
     console.log('> noSearchMultiPicker', noSearchMultiPicker);

diff --git a/lib/picker/src/component/picker-multi-select.tsx b/lib/picker/src/component/picker-multi-select.tsx
@@ -69,7 +69,7 @@ export class PickerMultiSelect extends PickTrigger<PickerState, PickerSelectProp
         const showSearch = open && search;
         let view: ComponentChildren;
         const noSelections = !showSearch && !selections.length;
-        if (display && (noSelections || placeholder === undefined)) {
+        if (display && (!noSelections || placeholder === undefined)) {
             if (typeof display === 'function') {
                 view = display.call(this, valueList, selections);
             } else if (typeof display === 'string') {

diff --git a/lib/picker/src/component/picker-single-select.tsx b/lib/picker/src/component/picker-single-select.tsx
@@ -68,13 +68,13 @@ export class PickerSingleSelect extends PickTrigger<PickerState, PickerSelectPro
     protected _renderTrigger(props: PickerSelectProps) {
         const {children, state: {selections = [], value, open}, placeholder, search, disabled, readonly, clearable, display} = props;
 
-        const [selection = {text: '', value: ''}] = selections;
+        const [selection] = selections;
         const showSearch = open && search;
         let view: ComponentChildren;
         if (showSearch) {
             view = this._renderSearch(props);
         } else if (selection || (placeholder === undefined && display)) {
-            const {text = ''} = selection;
+            const {text} = selection || {text: '', value: ''};
             if (typeof display === 'function') {
                 view = display.call(this, value, selections);
             } else if (typeof display === 'string') {