Skip to content

Commit 81b0ea9

Browse files
1814876473418148764734
authored
Merge pull request dcloudio#862 from 18148764734/master
合并 版本更新
2 parents 4b0c585 + 00fafea commit 81b0ea9

File tree

23 files changed

+116
-45
lines changed

23 files changed

+116
-45
lines changed

Diff for: ‎docs/changelog.md

+53
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,59 @@
77
- 主版本号：含有破坏性更新和新特性，不在发布周期内。
88

99
<!-- 更新占位 -->
10+
<log title="1.5.3" date="2024-03-22">
11+
<log-item title="uni-collapse 组件更新">
12+
<log-item-text tag-type="fix">
13+
titleBorder类型修正
14+
</log-item-text>
15+
</log-item>
16+
<log-item title="uni-data-checkbox 组件更新">
17+
<log-item-text tag-type="fix">
18+
单选模式下选中样式不生效的bug
19+
</log-item-text>
20+
</log-item>
21+
<log-item title="uni-easyinput 组件更新">
22+
<log-item-text tag-type="fix">
23+
在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
24+
</log-item-text>
25+
</log-item>
26+
<log-item title="uni-file-picker 组件更新">
27+
<log-item-text tag-type="perf">
28+
补充 删除文件时返回文件下标
29+
</log-item-text>
30+
</log-item>
31+
<log-item title="uni-number-box 组件更新">
32+
<log-item-text tag-type="feat">
33+
设置宽度属性width(单位：px)
34+
</log-item-text>
35+
</log-item>
36+
<log-item title="uni-popup 组件更新">
37+
<log-item-text tag-type="fix">
38+
uni-popup-dialog 数据输入时修正为双向绑定
39+
</log-item-text>
40+
</log-item>
41+
<log-item title="uni-search-bar 组件更新">
42+
<log-item-text tag-type="fix">
43+
清空按钮emit值错误的bug
44+
</log-item-text>
45+
</log-item>
46+
<log-item title="uni-segmented-control 组件更新">
47+
<log-item-text tag-type="feat">
48+
inActiveColor属性，可供配置未激活时的颜色
49+
</log-item-text>
50+
</log-item>
51+
<log-item title="uni-tag 组件更新">
52+
<log-item-text tag-type="perf">
53+
app下边框过窄导致不显示的bug
54+
</log-item-text>
55+
</log-item>
56+
<log-item title="uni-tooltip 组件更新">
57+
<log-item-text tag-type="fix">
58+
弹出位置修正
59+
</log-item-text>
60+
</log-item>
61+
</log>
62+
1063
<log title="1.5.2" date="2024-02-22">
1164
<log-item title="uni-countdown 组件更新">
1265
<log-item-text tag-type="feat">

Diff for: ‎pages/vue/popup/popup.vue

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<uni-card is-full :is-shadow="false">
44
<text class="uni-h6">弹出层组件用于弹出一个覆盖到页面上的内容，使用场景如：底部弹出分享弹窗、页面插屏广告等。</text>
55
</uni-card>
6-
<uni-section title="基本示例" type="line">
6+
<uni-section title="基本示例" type="line" sub-title="自定义顶部圆角">
77
<view class="example-body box">
88
<button class="button" type="primary" @click="toggle('top')"><text class="button-text">顶部</text></button>
99
<button class="button" type="primary" @click="toggle('bottom')"><text class="button-text">底部</text></button>
@@ -44,16 +44,15 @@
4444
<view class="dialog-box">
4545
<text class="dialog-text">输入内容：{{ value }}</text>
4646
</view>
47-
<button class="button" type="primary" @click="inputDialogToggle"><text
48-
class="button-text">输入对话框</text></button>
47+
<button class="button" type="primary" @click="inputDialogToggle"><text class="button-text">输入对话框</text></button>
4948

5049
</uni-section>
5150
<uni-section title="底部分享示例" type="line" padding>
5251
<button class="button" type="primary" @click="shareToggle"><text class="button-text">分享模版示例</text></button>
5352
</uni-section>
5453
<view>
5554
<!-- 普通弹窗 -->
56-
<uni-popup ref="popup" background-color="#fff" @change="change">
55+
<uni-popup ref="popup" background-color="#fff" @change="change" border-radius="10px 10px 0 0">
5756
<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"><text
5857
class="text">popup 内容</text></view>
5958
</uni-popup>
@@ -69,7 +68,8 @@
6968
<view>
7069
<!-- 提示窗示例 -->
7170
<uni-popup ref="alertDialog" type="dialog">
72-
<uni-popup-dialog :showClose="showClose" :type="msgType" cancelText="关闭" confirmText="同意" title="通知" content="欢迎使用 uni-popup!" @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
71+
<uni-popup-dialog :showClose="showClose" :type="msgType" cancelText="关闭" confirmText="同意" title="通知"
72+
content="欢迎使用 uni-popup!" @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
7373
</uni-popup>
7474
</view>
7575

@@ -196,7 +196,6 @@
196196
justify-content: center;
197197
padding: 15px;
198198
height: 50px;
199-
background-color: #fff;
200199
}
201200
202201
.popup-height {
@@ -272,4 +271,4 @@
272271
font-size: 14px;
273272
color: #333;
274273
}
275-
</style>
274+
</style>

Diff for: ‎pages/vue/segmented-control/segmented-control.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<uni-section title="实心标签" type="line">
88
<view class="uni-padding-wrap uni-common-mt">
99
<uni-segmented-control :current="current" :values="items" :style-type="styleType"
10-
:active-color="activeColor" @clickItem="onClickItem" :in-active-color="'#2b2b2b'"/>
10+
:active-color="activeColor" @clickItem="onClickItem" :in-active-color="'#f7e2e9'"/>
1111
</view>
1212
<view class="content">
1313
<view v-if="current === 0"><text class="content-text">选项卡1的内容</text></view>

Diff for: ‎temps/sync-version.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"uni-breadcrumb": "0.1.2",
44
"uni-calendar": "1.4.11",
55
"uni-card": "1.3.1",
6-
"uni-collapse": "1.4.3",
6+
"uni-collapse": "1.4.4",
77
"uni-combox": "1.0.1",
88
"uni-countdown": "1.2.3",
9-
"uni-data-checkbox": "1.0.4",
9+
"uni-data-checkbox": "1.0.5",
1010
"uni-data-picker": "2.0.0",
1111
"uni-data-select": "1.0.7",
1212
"uni-dateformat": "1.0.0",
1313
"uni-datetime-picker": "2.2.32",
1414
"uni-drawer": "1.2.1",
15-
"uni-easyinput": "1.1.15",
15+
"uni-easyinput": "1.1.16",
1616
"uni-fab": "1.2.5",
1717
"uni-fav": "1.2.1",
18-
"uni-file-picker": "1.0.7",
18+
"uni-file-picker": "1.0.8",
1919
"uni-forms": "1.4.10",
2020
"uni-goods-nav": "1.2.1",
2121
"uni-grid": "1.4.0",
@@ -27,21 +27,21 @@
2727
"uni-load-more": "1.3.3",
2828
"uni-nav-bar": "1.3.11",
2929
"uni-notice-bar": "1.2.2",
30-
"uni-number-box": "1.2.5",
30+
"uni-number-box": "1.2.6",
3131
"uni-pagination": "1.2.4",
32-
"uni-popup": "1.8.8",
32+
"uni-popup": "1.8.9",
3333
"uni-rate": "1.3.1",
3434
"uni-row": "1.0.0",
3535
"uni-scss": "1.0.3",
36-
"uni-search-bar": "1.2.7",
36+
"uni-search-bar": "1.2.8",
3737
"uni-section": "0.0.1",
38-
"uni-segmented-control": "1.2.0",
38+
"uni-segmented-control": "1.2.1",
3939
"uni-steps": "1.1.1",
4040
"uni-swipe-action": "1.3.10",
4141
"uni-swiper-dot": "1.2.0",
4242
"uni-table": "1.2.4",
43-
"uni-tag": "2.1.0",
43+
"uni-tag": "2.1.1",
4444
"uni-title": "1.1.1",
45-
"uni-tooltip": "0.2.2",
45+
"uni-tooltip": "0.2.3",
4646
"uni-transition": "1.3.2"
4747
}

Diff for: ‎uni_modules/uni-collapse/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.4.4（2024-03-20）
2+
- 修复 titleBorder类型修正
13
## 1.4.3（2022-01-25）
24
- 修复 初始化的时候 ，open 属性失效的bug
35
## 1.4.2（2022-01-21）

Diff for: ‎uni_modules/uni-collapse/package.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-collapse",
33
"displayName": "uni-collapse 折叠面板",
4-
"version": "1.4.3",
4+
"version": "1.4.4",
55
"description": "Collapse 组件，可以折叠 / 展开的内容区域。",
66
"keywords": [
77
"uni-ui",
@@ -16,11 +16,7 @@
1616
"directories": {
1717
"example": "../../temps/example_temps"
1818
},
19-
"dcloudext": {
20-
"category": [
21-
"前端组件",
22-
"通用组件"
23-
],
19+
"dcloudext": {
2420
"sale": {
2521
"regular": {
2622
"price": "0.00"
@@ -37,7 +33,8 @@
3733
"data": "无",
3834
"permissions": "无"
3935
},
40-
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
36+
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
37+
"type": "component-vue"
4138
},
4239
"uni_modules": {
4340
"dependencies": [

Diff for: ‎uni_modules/uni-data-checkbox/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.0.5（2024-03-20）
2+
- 修复 单选模式下选中样式不生效的bug
13
## 1.0.4（2024-01-27）
24
- 修复 修复错别字chagne为change
35
## 1.0.3（2022-09-16）

Diff for: ‎uni_modules/uni-data-checkbox/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-data-checkbox",
33
"displayName": "uni-data-checkbox 数据选择器",
4-
"version": "1.0.4",
4+
"version": "1.0.5",
55
"description": "通过数据驱动的单选框和复选框",
66
"keywords": [
77
"uni-ui",

Diff for: ‎uni_modules/uni-easyinput/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.1.16（2024-03-20）
2+
- 修复 在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
13
## 1.1.15（2024-02-21）
24
- 新增 左侧插槽：left
35
## 1.1.14（2024-02-19）

Diff for: ‎uni_modules/uni-easyinput/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-easyinput",
33
"displayName": "uni-easyinput 增强输入框",
4-
"version": "1.1.15",
4+
"version": "1.1.16",
55
"description": "Easyinput 组件是对原生input组件的增强",
66
"keywords": [
77
"uni-ui",

Diff for: ‎uni_modules/uni-file-picker/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.0.8（2024-03-20）
2+
- 补充 删除文件时返回文件下标
13
## 1.0.7（2024-02-21）
24
- 新增 微信小程序选择视频时改用chooseMedia,并返回视频缩略图
35
## 1.0.6（2024-01-06）

Diff for: ‎uni_modules/uni-file-picker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-file-picker",
33
"displayName": "uni-file-picker 文件选择上传",
4-
"version": "1.0.7",
4+
"version": "1.0.8",
55
"description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
66
"keywords": [
77
"uni-ui",

Diff for: ‎uni_modules/uni-popup/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.8.9（2024-03-20）
2+
- 修复 uni-popup-dialog 数据输入时修正为双向绑定
13
## 1.8.8（2024-02-20）
24
- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
35
## 1.8.7（2024-02-02）

Diff for: ‎uni_modules/uni-popup/components/uni-popup/uni-popup.vue

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
* @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
4040
* @property {String} backgroundColor 主窗口背景色
4141
* @property {String} maskBackgroundColor 蒙版颜色
42+
* @property {String} borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
4243
* @property {Boolean} safeArea 是否适配底部安全区
4344
* @event {Function} change 打开关闭弹窗触发，e={show: false}
4445
* @event {Function} maskClick 点击遮罩触发

Diff for: ‎uni_modules/uni-popup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-popup",
33
"displayName": "uni-popup 弹出层",
4-
"version": "1.8.8",
4+
"version": "1.8.9",
55
"description": " Popup 组件，提供常用的弹层",
66
"keywords": [
77
"uni-ui",

Diff for: ‎uni_modules/uni-segmented-control/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.2.1（2024-03-20）
2+
- 新增 inActiveColor属性，可供配置未激活时的颜色
13
## 1.2.0（2021-11-19）
24
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
35
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-segmented-control](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)

Diff for: ‎uni_modules/uni-segmented-control/package.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-segmented-control",
33
"displayName": "uni-segmented-control 分段器",
4-
"version": "1.2.0",
4+
"version": "1.2.1",
55
"description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
66
"keywords": [
77
"uni-ui",
@@ -17,11 +17,7 @@
1717
"directories": {
1818
"example": "../../temps/example_temps"
1919
},
20-
"dcloudext": {
21-
"category": [
22-
"前端组件",
23-
"通用组件"
24-
],
20+
"dcloudext": {
2521
"sale": {
2622
"regular": {
2723
"price": "0.00"
@@ -38,7 +34,8 @@
3834
"data": "无",
3935
"permissions": "无"
4036
},
41-
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
37+
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
38+
"type": "component-vue"
4239
},
4340
"uni_modules": {
4441
"dependencies": ["uni-scss"],

Diff for: ‎uni_modules/uni-tag/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 2.1.1（2024-03-20）
2+
- 优化 app下边框过窄导致不显示的bug
13
## 2.1.0（2021-11-19）
24
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
35
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-tag](https://uniapp.dcloud.io/component/uniui/uni-tag)

Diff for: ‎uni_modules/uni-tag/package.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-tag",
33
"displayName": "uni-tag 标签",
4-
"version": "2.1.0",
4+
"version": "2.1.1",
55
"description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
66
"keywords": [
77
"uni-ui",
@@ -17,11 +17,7 @@
1717
"directories": {
1818
"example": "../../temps/example_temps"
1919
},
20-
"dcloudext": {
21-
"category": [
22-
"前端组件",
23-
"通用组件"
24-
],
20+
"dcloudext": {
2521
"sale": {
2622
"regular": {
2723
"price": "0.00"
@@ -38,7 +34,8 @@
3834
"data": "无",
3935
"permissions": "无"
4036
},
41-
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
37+
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
38+
"type": "component-vue"
4239
},
4340
"uni_modules": {
4441
"dependencies": ["uni-scss"],

Diff for: ‎uni_modules/uni-tooltip/changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 0.2.3（2024-03-20）
2+
- 修复 弹出位置修正
13
## 0.2.2（2024-01-15）
24
- 新增 placement支持设置四个方向:top bottom left right
35
## 0.2.1（2022-05-09）

Diff for: ‎uni_modules/uni-tooltip/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-tooltip",
33
"displayName": "uni-tooltip 提示文字",
4-
"version": "0.2.2",
4+
"version": "0.2.3",
55
"description": "Tooltip 提示文字",
66
"keywords": [
77
"uni-tooltip",

Diff for: ‎uni_modules/uni-ui/changelog.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 1.5.3（2024-03-22）
2+
- uni-collapse 修复 titleBorder类型修正
3+
- uni-data-checkbox 修复 单选模式下选中样式不生效的bug
4+
- uni-easyinput 修复 在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
5+
- uni-file-picker 补充 删除文件时返回文件下标
6+
- uni-number-box 新增 设置宽度属性width(单位：px)
7+
- uni-popup 修复 uni-popup-dialog 数据输入时修正为双向绑定
8+
- uni-search-bar 修复 清空按钮emit值错误的bug
9+
- uni-segmented-control 新增 inActiveColor属性，可供配置未激活时的颜色
10+
- uni-tag 优化 app下边框过窄导致不显示的bug
11+
- uni-tooltip 修复 弹出位置修正
112
## 1.5.2（2024-02-22）
213
- uni-countdown 新增 支持控制小时，分钟的显隐：showHour showMinute
314
- uni-datetime-picker 修复 日历的close事件触发异常的bug [详情](https://github.com/dcloudio/uni-ui/issues/844)

Diff for: ‎uni_modules/uni-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "uni-ui",
33
"displayName": "uni-ui",
4-
"version": "1.5.2",
4+
"version": "1.5.3",
55
"description": "uni-ui 是基于uni-app的、全端兼容的、高性能UI框架",
66
"keywords": [
77
"uni-ui",

0 commit comments

Comments
 (0)