Skip to content

Commit 50d7b2c

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 41fc10f + 8047ade commit 50d7b2c

File tree

31 files changed

+495
-501
lines changed

31 files changed

+495
-501
lines changed

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "uView",
33
"appid" : "__UNI__60F4B81",
44
"description" : "多平台快速开发的UI框架",
5-
"versionName" : "1.4.8",
5+
"versionName" : "1.5.2",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// "current": 0, //当前激活的模式(list 的索引项)
77
// "list": [{
88
// "name": "test", //模式名称
9-
// "path": "pages/componentsA/select/index", //启动页面，必选
9+
// "path": "pages/componentsB/picker/index", //启动页面，必选
1010
// "query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
1111
// }]
1212
// },

‎pages/componentsB/picker/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ export default {
177177
this.defaultSelector.splice(2, 1, 0)
178178
break
179179
}
180-
this.$forceUpdate()
181180
}
182181
}
183182
};

‎pages/componentsB/radio/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
}
8080
],
8181
disabled: false,
82-
result: '',
83-
shape: 'square',
82+
result: '荔枝',
83+
shape: 'circle',
8484
value: '荔枝',
8585
activeColor: '#2979ff',
8686
size: 34,
@@ -121,12 +121,12 @@
121121
},
122122
// 选中某个单选框时，由radio时触发
123123
radioChange(e) {
124-
// console.log(e);
124+
console.log(e);
125125
},
126126
// 选中任一radio时，由radio-group触发
127127
radioGroupChange(e) {
128128
this.result = e;
129-
// console.log(e);
129+
console.log(e);
130130
},
131131
widthChange(index) {
132132
this.width = index == 0 ? '50%' : '';

‎pages/componentsB/steps/index.vue

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<view class="u-demo-wrap">
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
6-
<u-steps :current="current" :list="steps" :mode="mode" :icon="icon"></u-steps>
6+
<u-steps :direction="direction" :current="current" :list="steps" :mode="mode" :icon="icon"></u-steps>
77
</view>
88
</view>
99
<view class="u-config-wrap">
@@ -14,6 +14,10 @@
1414
<view class="u-item-title">模式</view>
1515
<u-subsection vibrateShort :list="['number', 'dot']" @change="modeChange"></u-subsection>
1616
</view>
17+
<view class="u-config-item">
18+
<view class="u-item-title">方向</view>
19+
<u-subsection vibrateShort :list="['横向', '竖向']" @change="directionChange"></u-subsection>
20+
</view>
1721
<view class="u-config-item">
1822
<view class="u-item-title">自定义图标</view>
1923
<u-subsection vibrateShort :list="['否', '是']" @change="iconChange"></u-subsection>
@@ -41,18 +45,22 @@
4145
}, ],
4246
current: 0,
4347
icon: 'checkmark',
44-
mode: 'number'
48+
mode: 'number',
49+
direction: 'row'
4550
}
4651
},
4752
methods: {
4853
modeChange(index) {
4954
this.mode = index == 0 ? 'number' : 'dot';
5055
},
5156
stepChange(index) {
52-
this.current = index == 0 ? 0 : index == 1 ? 1 : index == 2 ? 2 : 3;
57+
this.current = [0, 1, 2, 3][index];
5358
},
5459
iconChange(index) {
5560
this.icon = index == 0 ? 'checkmark' : 'map-fill';
61+
},
62+
directionChange(index) {
63+
this.direction = index == 0 ? 'row' : 'column';
5664
}
5765
}
5866
}

‎pages/componentsC/test/index.vue

Lines changed: 6 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,17 @@
11
<template>
2-
<view>
3-
<u-select v-model="show" @confirm="confirm" :list="list"></u-select>
4-
<u-button @click="show = true">打开</u-button>
2+
<view class="">
3+
<u-checkbox-group>
4+
<u-checkbox v-model="checked" active-color="red">光影</u-checkbox>
5+
</u-checkbox-group>
56
</view>
67
</template>
78

89
<script>
910
export default {
1011
data() {
1112
return {
12-
show: false,
13-
list: [
14-
{
15-
label: '测试',
16-
value: 'b0da629fa36e32110ea86dbfc53db96a',
17-
extra: {
18-
ductId: 'b0da629fa36e32110ea86dbfc53db96a',
19-
name: '测试',
20-
type: 3,
21-
imgUrl: '1594173070713.jpg',
22-
effectiveDay: 4,
23-
dateType: 'day',
24-
isInlay: 1,
25-
createTime: '2020-07-08 09:51:13',
26-
printerNum: 3,
27-
createBy: '1',
28-
updateTime: '2020-07-08 09:51:13',
29-
updateBy: null,
30-
ductAccessoryInfoList: []
31-
}
32-
},
33-
{
34-
label: 'PICC - 2类',
35-
value: '1c0c70fafe74e840dc79f1bfe2833b2b',
36-
extra: {
37-
ductId: '1c0c70fafe74e840dc79f1bfe2833b2b',
38-
name: 'PICC - 2类',
39-
type: 3,
40-
imgUrl: '1592987125427.jpeg',
41-
effectiveDay: 7,
42-
dateType: 'day',
43-
isInlay: 1,
44-
createTime: '2020-06-24 16:25:25',
45-
printerNum: 1,
46-
createBy: '1',
47-
updateTime: '2020-07-09 12:01:02',
48-
updateBy: null,
49-
ductAccessoryInfoList: [
50-
{
51-
ductAccessoryId: 'aecdc0e314dcb346a5ec1838929c02e6',
52-
name: '敷贴 - 2类',
53-
type: 1,
54-
imgUrl: '',
55-
effectiveDay: 3,
56-
createTime: '2020-06-24 16:26:01',
57-
createBy: '1',
58-
updateTime: '2020-07-09 12:02:25',
59-
dateType: 'day',
60-
updateBy: null,
61-
ductId: '1c0c70fafe74e840dc79f1bfe2833b2b',
62-
printerNum: 2
63-
},
64-
{
65-
ductAccessoryId: 'cea78c669259529a6e66cd0d3b7ea357',
66-
name: '敷贴 - 1类',
67-
type: 1,
68-
imgUrl: '1592987145754.jpeg',
69-
effectiveDay: 7,
70-
createTime: '2020-06-24 16:25:46',
71-
createBy: '1',
72-
updateTime: '2020-07-09 12:04:29',
73-
dateType: 'day',
74-
updateBy: null,
75-
ductId: '1c0c70fafe74e840dc79f1bfe2833b2b',
76-
printerNum: 2
77-
}
78-
]
79-
}
80-
},
81-
{
82-
label: 'PICC - 1类',
83-
value: '903a262182003743bb3062fe7393ffbd',
84-
extra: {
85-
ductId: '903a262182003743bb3062fe7393ffbd',
86-
name: 'PICC - 1类',
87-
type: 3,
88-
imgUrl: '1592987111641.jpeg',
89-
effectiveDay: 56,
90-
dateType: 'hour',
91-
isInlay: 1,
92-
createTime: '2020-06-24 16:25:12',
93-
printerNum: 1,
94-
createBy: '1',
95-
updateTime: '2020-07-09 14:24:02',
96-
updateBy: null,
97-
ductAccessoryInfoList: []
98-
}
99-
}
100-
]
13+
checked: true
10114
};
10215
},
103-
methods: {
104-
confirm(e) {
105-
console.log(e);
106-
}
107-
}
10816
};
109-
</script>
17+
</script>

‎pages/library/timeFrom/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<view class="u-config-item">
2020
<view class="u-item-title">时间</view>
2121
<u-subsection vibrateShort :list="timeArr1" @change="timeArr1Change"></u-subsection>
22+
<u-gap></u-gap>
2223
<u-subsection vibrateShort style="margin-top: 40rpx;" :list="timeArr2" @change="timeArr2Change"></u-subsection>
2324
</view>
2425
</view>

‎uview-ui/components/u-alert-tips/u-alert-tips.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
type ? 'u-alert-tips--bg--' + type + '-light' : '',
55
type ? 'u-alert-tips--border--' + type + '-disabled' : '',
66
]" :style="{
7-
backgroundColor: borderColor,
8-
borderColor: bgColor
7+
backgroundColor: bgColor,
8+
borderColor: borderColor
99
}">
1010
<view class="u-icon-wrap">
1111
<u-icon v-if="showIcon" :name="$u.type2icon(type)" :size="description ? 40 : 32" class="u-icon" :color="type"></u-icon>

‎uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@touchend="touchEnd"
1010
:style="{ width: cropperOpt.width, height: cropperOpt.height, backgroundColor: 'rgba(0, 0, 0, 0.8)' }"
1111
canvas-id="cropper"
12+
id="cropper"
1213
></canvas>
1314
<canvas
1415
class="cropper"
@@ -21,6 +22,7 @@
2122
height: `${cropperOpt.height * cropperOpt.pixelRatio}`
2223
}"
2324
canvas-id="targetId"
25+
id="targetId"
2426
></canvas>
2527
</view>
2628
<view class="cropper-buttons safe-area-padding" :style="{ height: bottomNavHeight + 'px' }">
@@ -181,7 +183,6 @@ export default {
181183
this.cropper.touchEnd(e);
182184
},
183185
getCropperImage(isPre = false) {
184-
console.log(this.src);
185186
if(!this.src) return this.$u.toast('请先选择图片再裁剪');
186187
187188
let cropper_opt = {

‎uview-ui/components/u-cell-item/u-cell-item.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ export default {
215215
display: flex;
216216
box-sizing: border-box;
217217
width: 100%;
218-
padding: 20rpx 32rpx;
218+
padding: 26rpx 32rpx;
219219
font-size: 28rpx;
220-
line-height: 48rpx;
220+
line-height: 54rpx;
221221
color: $u-content-color;
222222
background-color: #fff;
223223
text-align: left;

‎uview-ui/components/u-checkbox-group/u-checkbox-group.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
* @property {String Number} max 最多能选中多少个checkbox（默认999）
1414
* @property {String Number} size 组件整体的大小，单位rpx（默认40）
1515
* @property {Boolean} disabled 是否禁用所有checkbox（默认false）
16+
* @property {String Number} icon-size 图标大小，单位rpx（默认20）
17+
* @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
1618
* @property {String} width 宽度，需带单位
19+
* @property {String} width 宽度，需带单位
20+
* @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
1721
* @property {Boolean} wrap 是否每个checkbox都换行（默认false）
1822
* @property {String} active-color 选中时的颜色，应用到所有子Checkbox组件（默认#2979ff）
1923
* @event {Function} change 任一个checkbox状态发生变化时触发，回调为一个对象
@@ -71,7 +75,7 @@
7175
default: 'auto'
7276
},
7377
// 是否每个checkbox都换行
74-
wrap: {
78+
wrap: {
7579
type: Boolean,
7680
default: false
7781
},

0 commit comments

Comments
 (0)