Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
U
uview-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李晖
uview-ui
Commits
a908cb80
Commit
a908cb80
authored
May 10, 2020
by
wlxuqu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. noticeBarzz组件新增volume-size参数
2. picker组件新增show-time-tag参数
parent
04d61164
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
u-collapse.vue
uview-ui/components/u-collapse/u-collapse.vue
+2
-2
u-picker.vue
uview-ui/components/u-picker/u-picker.vue
+12
-6
No files found.
uview-ui/components/u-collapse/u-collapse.vue
View file @
a908cb80
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
* @property {Boolean} accordion 是否手风琴模式(默认true)
* @property {Boolean} accordion 是否手风琴模式(默认true)
* @property {Boolean} arrow 是否显示标题右侧的箭头(默认true)
* @property {Boolean} arrow 是否显示标题右侧的箭头(默认true)
* @property {String} arrow-color 标题右侧箭头的颜色(默认#909399)
* @property {String} arrow-color 标题右侧箭头的颜色(默认#909399)
* @property {
String} head-bg-color 标题的背景颜色(默认#ffffff)
* @property {
Object} head-style 标题自定义样式,对象形式
* @property {
String} body-bg-color 主体内容的背景颜色(默认#ffffff)
* @property {
Object} body-style 主体自定义样式,对象形式
* @property {String} hover-class 样式类名,按下时有效(默认u-hover-class)
* @property {String} hover-class 样式类名,按下时有效(默认u-hover-class)
* @event {Function} change 当前激活面板展开时触发(如果是手风琴模式,参数activeNames类型为String,否则为Array)
* @event {Function} change 当前激活面板展开时触发(如果是手风琴模式,参数activeNames类型为String,否则为Array)
* @example <u-collapse></u-collapse>
* @example <u-collapse></u-collapse>
...
...
uview-ui/components/u-picker/u-picker.vue
View file @
a908cb80
...
@@ -35,32 +35,32 @@
...
@@ -35,32 +35,32 @@
<picker-view
v-else
:value=
"valueArr"
@
change=
"change"
class=
"u-picker-view"
>
<picker-view
v-else
:value=
"valueArr"
@
change=
"change"
class=
"u-picker-view"
>
<picker-view-column
v-if=
"!reset && params.year"
>
<picker-view-column
v-if=
"!reset && params.year"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in years"
:key=
"index"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in years"
:key=
"index"
>
{{
item
}}
<text
class=
"u-text"
>
年
</text>
{{
item
}}
<text
class=
"u-text"
v-if=
"showTimeTag"
>
年
</text>
</view>
</view>
</picker-view-column>
</picker-view-column>
<picker-view-column
v-if=
"!reset && params.month"
>
<picker-view-column
v-if=
"!reset && params.month"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in months"
:key=
"index"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in months"
:key=
"index"
>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
>
月
</text>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
v-if=
"showTimeTag"
>
月
</text>
</view>
</view>
</picker-view-column>
</picker-view-column>
<picker-view-column
v-if=
"!reset && params.day"
>
<picker-view-column
v-if=
"!reset && params.day"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in days"
:key=
"index"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in days"
:key=
"index"
>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
>
日
</text>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
v-if=
"showTimeTag"
>
日
</text>
</view>
</view>
</picker-view-column>
</picker-view-column>
<picker-view-column
v-if=
"!reset && params.hour"
>
<picker-view-column
v-if=
"!reset && params.hour"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in hours"
:key=
"index"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in hours"
:key=
"index"
>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
>
时
</text>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
v-if=
"showTimeTag"
>
时
</text>
</view>
</view>
</picker-view-column>
</picker-view-column>
<picker-view-column
v-if=
"!reset && params.minute"
>
<picker-view-column
v-if=
"!reset && params.minute"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in minutes"
:key=
"index"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in minutes"
:key=
"index"
>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
>
分
</text>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
v-if=
"showTimeTag"
>
分
</text>
</view>
</view>
</picker-view-column>
</picker-view-column>
<picker-view-column
v-if=
"!reset && params.second"
>
<picker-view-column
v-if=
"!reset && params.second"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in seconds"
:key=
"index"
>
<view
class=
"u-column-item"
v-for=
"(item,index) in seconds"
:key=
"index"
>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
>
秒
</text>
{{
formatNumber
(
item
)
}}
<text
class=
"u-text"
v-if=
"showTimeTag"
>
秒
</text>
</view>
</view>
</picker-view-column>
</picker-view-column>
</picker-view>
</picker-view>
...
@@ -83,6 +83,7 @@
...
@@ -83,6 +83,7 @@
* @property {String Number} start-year 可选的开始年份,mode=time时有效(默认1950)
* @property {String Number} start-year 可选的开始年份,mode=time时有效(默认1950)
* @property {String Number} end-year 可选的结束年份,mode=time时有效(默认2050)
* @property {String Number} end-year 可选的结束年份,mode=time时有效(默认2050)
* @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
* @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
* @property {Boolean} show-time-tag 时间模式时,是否显示后面的年月日中文提示
* @property {String} cancel-color 取消按钮的颜色(默认#606266)
* @property {String} cancel-color 取消按钮的颜色(默认#606266)
* @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
* @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
* @property {String} default-time 默认选中的时间,mode=time时有效
* @property {String} default-time 默认选中的时间,mode=time时有效
...
@@ -151,6 +152,11 @@
...
@@ -151,6 +152,11 @@
return
[];
return
[];
}
}
},
},
// 时间模式时,是否显示后面的年月日中文提示
showTimeTag
:
{
type
:
Boolean
,
default
:
true
},
// 默认显示地区的编码,defaultRegion和areaCode同时存在,areaCode优先,可传类似["13", "1303", "130304"]
// 默认显示地区的编码,defaultRegion和areaCode同时存在,areaCode优先,可传类似["13", "1303", "130304"]
areaCode
:
{
areaCode
:
{
type
:
Array
,
type
:
Array
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment