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(picker): add btn default text #342

Merged
merged 2 commits into from
Apr 11, 2022
Merged

fix(picker): add btn default text #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f5865d
fix(picker): add btn default text
jin0209 Apr 11, 2022
468c289
fix(picker): delete btn default text
jin0209 Apr 11, 2022
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
88 changes: 28 additions & 60 deletions example/pages/picker/picker.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,42 @@
<t-demo title="01 类型" desc="基础选择器">
<view class="pannel-item" bind:tap="onClickPicker" data-index="{{1}}">
<view class="pannel-label">城市</view>
<view class="pannel-text {{selectedCityValue ? '' : 'empty'}}"
>{{selectedCityValue || '选择城市'}}</view
>
<view class="pannel-text {{selectedCityValue ? '' : 'empty'}}">{{selectedCityValue || '选择城市'}}</view>
<t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
</view>
<view class="pannel-item" bind:tap="onClickPicker" data-index="{{2}}">
<view class="pannel-label">年份和季节</view>
<view class="pannel-text {{selectedYearsWithSeason ? '' : 'empty'}}">
{{selectedYearsWithSeason}} {{selectedSeason}} {{ !selectedYearsWithSeason ?
'选择年份和季节' : ''}}</view
{{selectedYearsWithSeason}} {{selectedSeason}} {{ !selectedYearsWithSeason ? '选择年份和季节' : ''}}</view
>
<t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
</view>
<view class="pannel-item last" bind:tap="onClickPicker" data-index="{{3}}">
<view class="pannel-label">日期</view>
<view class="pannel-text {{selectedYearsWithDate ? '' : 'empty'}}">
{{selectedYearsWithDate}} {{selectedMonth}} {{selectedDay}} {{!selectedYearsWithDate ?
'选择日期' : ''}}</view
{{selectedYearsWithDate}} {{selectedMonth}} {{selectedDay}} {{!selectedYearsWithDate ? '选择日期' : ''}}</view
>
<t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
</view>
</t-demo>
<t-demo desc="带标题选择器">
<view class="pannel-item" bind:tap="onClickPicker" data-index="{{4}}">
<view class="pannel-label">城市</view>
<view class="pannel-text {{selectedCityValue2 ? '' : 'empty'}}"
>{{selectedCityValue2 || '选择城市'}}</view
>
<view class="pannel-text {{selectedCityValue2 ? '' : 'empty'}}">{{selectedCityValue2 || '选择城市'}}</view>
<t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
</view>
<view
class="pannel-item"
bind:tap="onClickPicker"
data-title="选择年份和季节"
data-index="{{5}}"
>
<view class="pannel-item" bind:tap="onClickPicker" data-title="选择年份和季节" data-index="{{5}}">
<view class="pannel-label">年份和季节</view>
<view class="pannel-text {{selectedYearsWithSeason2 ? '' : 'empty'}}">
{{selectedYearsWithSeason2}} {{selectedSeason2}} {{ !selectedYearsWithSeason2 ?
'选择年份和季节' : ''}}</view
{{selectedYearsWithSeason2}} {{selectedSeason2}} {{ !selectedYearsWithSeason2 ? '选择年份和季节' : ''}}</view
>
<t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
</view>
<view class="pannel-item" bind:tap="onClickPicker" data-title="选择日期" data-index="{{6}}">
<view class="pannel-label">日期</view>
<view class="pannel-text {{selectedYearsWithDate2 ? '' : 'empty'}}">
{{selectedYearsWithDate2}} {{selectedMonth2}} {{selectedDay2}} {{!selectedYearsWithDate2 ?
'选择日期' : ''}}</view
{{selectedYearsWithDate2}} {{selectedMonth2}} {{selectedDay2}} {{!selectedYearsWithDate2 ? '选择日期' :
''}}</view
>
<t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
</view>
Expand All @@ -61,21 +49,21 @@
<t-picker
visible="{{picker1Visible}}"
title="{{pickerTitle}}"
cancelBtn="取消"
confirmBtn="确认"
bindchange="onPickerChange"
bindconfirm="onPicker1Confirm"
bindcancel="onPicker1Cancel"
>
<t-picker-column
options="{{citys}}"
value="{{selectedCityValue}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column options="{{citys}}" value="{{selectedCityValue}}" bindchange="onColumnChange"></t-picker-column>
</t-picker>

<!-- 年+ 季节 不带标题 -->
<t-picker
visible="{{picker2Visible}}"
title="{{pickerTitle}}"
cancelBtn="取消"
confirmBtn="确认"
bindchange="onPickerChange"
bindconfirm="onPicker2Confirm"
bindcancel="onPicker2Cancel"
Expand All @@ -85,17 +73,15 @@
value="{{selectedYearsWithSeason}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column
options="{{seasons}}"
value="{{selectedSeason}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column options="{{seasons}}" value="{{selectedSeason}}" bindchange="onColumnChange"></t-picker-column>
</t-picker>

<!-- 年月日 不带标题 -->
<t-picker
visible="{{picker3Visible}}"
title="{{pickerTitle}}"
cancelBtn="取消"
confirmBtn="确认"
bindchange="onPickerChange"
bindconfirm="onPicker3Confirm"
bindcancel="onPicker3Cancel"
Expand All @@ -105,37 +91,29 @@
value="{{selectedYearsWithDate}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column
options="{{months}}"
value="{{selectedMonth}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column
options="{{days}}"
value="{{selectedDay}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column options="{{months}}" value="{{selectedMonth}}" bindchange="onColumnChange"></t-picker-column>
<t-picker-column options="{{days}}" value="{{selectedDay}}" bindchange="onColumnChange"></t-picker-column>
</t-picker>

<!-- 城市带标题 -->
<t-picker
visible="{{picker4Visible}}"
title="选中城市"
cancelBtn="取消"
confirmBtn="确认"
bindchange="onPickerChange"
bindconfirm="onPicker4Confirm"
bindcancel="onPicker4Cancel"
>
<t-picker-column
options="{{citys}}"
value="{{selectedCityValue2}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column options="{{citys}}" value="{{selectedCityValue2}}" bindchange="onColumnChange"></t-picker-column>
</t-picker>

<!-- 年+季节 带标题 -->
<t-picker
visible="{{picker5Visible}}"
title="选择年份和季节"
cancelBtn="取消"
confirmBtn="确认"
bindchange="onPickerChange"
bindconfirm="onPicker5Confirm"
bindcancel="onPicker5Cancel"
Expand All @@ -145,17 +123,15 @@
value="{{selectedYearsWithSeason2}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column
options="{{seasons}}"
value="{{selectedSeason2}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column options="{{seasons}}" value="{{selectedSeason2}}" bindchange="onColumnChange"></t-picker-column>
</t-picker>

<!-- 年月日带标题 -->
<t-picker
visible="{{picker6Visible}}"
title="选择日期"
cancelBtn="取消"
confirmBtn="确认"
bindchange="onPickerChange"
bindconfirm="onPicker6Confirm"
bindcancel="onPicker6Cancel"
Expand All @@ -165,15 +141,7 @@
value="{{selectedYearsWithDate2}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column
options="{{months}}"
value="{{selectedMonth2}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column
options="{{days}}"
value="{{selectedDay2}}"
bindchange="onColumnChange"
></t-picker-column>
<t-picker-column options="{{months}}" value="{{selectedMonth2}}" bindchange="onColumnChange"></t-picker-column>
<t-picker-column options="{{days}}" value="{{selectedDay2}}" bindchange="onColumnChange"></t-picker-column>
</t-picker>
</view>
6 changes: 4 additions & 2 deletions src/picker/picker.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<t-popup visible="{{visible}}" placement="bottom">
<view slot="content" class="{{classPrefix}} t-class">
<view class="{{classPrefix}}__toolbar" wx:if="{{header}}">
<view class="{{classPrefix}}__cancel t-class-cancel" bindtap="onCancel">{{cancelBtn}}</view>
<view class="{{classPrefix}}__cancel t-class-cancel" wx:if="{{cancelBtn}}" bindtap="onCancel">{{cancelBtn}}</view>
<view class="{{classPrefix}}__title t-class-title">{{title}}</view>
<view class="{{classPrefix}}__confirm t-class-confirm" bindtap="onConfirm">{{confirmBtn}}</view>
<view class="{{classPrefix}}__confirm t-class-confirm" wx:if="{{confirmBtn}}" bindtap="onConfirm"
>{{confirmBtn}}</view
>
</view>
<!-- 扩展插槽 -->
<slot name="header"></slot>
Expand Down
4 changes: 2 additions & 2 deletions src/picker/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ const props: TdPickerProps = {
/** 选中值 */
value: {
type: Array,
value: null,
},
/** 选中值，非受控属性 */
defaultValue: {
type: null,
value: undefined,
type: Array,
},
/** 是否显示 */
visible: {
Expand Down