Skip to content

Commit 4e77b88

Browse files
wlxuquwlxuqu
committed
1. select组件新增自定义value和label属性名的value-name和label-name，还有额外参数extra
2. toast组件新增callback回调参数 3. 修复由于deepClone方法缺陷导致select组件报错的问题 4. 修复slider在演示中无法显示拖动滑块的问题 5. 优化mask组件缩放效果时，传入的slot被一直停留在1.2倍放大的问题 6. 优化modal组件同时取消确定和取消按钮时，底部有占用空间的问题 7. swiper新增轮播切换时的change事件 8. 优化switch组件切换的控件可能会受父组件字体大小影响的问题 9. 去除请求插件中的默认header请求头的content-type字段，避免某些特殊情况下造成影响
1 parent 9e15c6c commit 4e77b88

File tree

41 files changed

+516
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+516
-689
lines changed

‎App.vue

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@
1515

1616
<style lang="scss">
1717
@import "uview-ui/index.scss";
18+
@import "common/demo.scss";
1819
/*每个页面公共css */
19-
/* H5的时候，隐藏滚动条 */
20-
/* #ifdef H5 */
21-
::-webkit-scrollbar {
22-
display: none;
23-
width: 0 !important;
24-
height: 0 !important;
25-
-webkit-appearance: none;
26-
background: transparent;
27-
}
28-
/* #endif */
2920
</style>

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全
2626
#### **vue-admin-beautiful** —— [企业级、通用型中后台前端解决方案（基于vue/cli 4 最新版，同时支持电脑，手机，平板）](https://github.com/chuzhixin/vue-admin-beautiful)
2727

2828
#### **vue-admin-beautiful** —— [在线演示](http://beautiful.panm.cn/vue-admin-beautiful/#/index)
29+
30+
#### **pl-table** —— [ 完美解决 element 万级表格数据渲染卡顿问题](https://github.com/livelyPeng/pl-table)
2931
<br>
3032

3133
## 安装

‎common/demo.scss

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
/* start--演示页面使用的统一样式--start */
3+
.u-demo {
4+
padding: 50rpx 40rpx;
5+
}
6+
7+
.u-demo-wrap {
8+
border-width: 1px;
9+
border-color: #ddd;
10+
border-style: dashed;
11+
background-color: rgb(250, 250, 250);
12+
padding: 40rpx 20rpx;
13+
border-radius: 6px;
14+
}
15+
16+
.u-demo-area {
17+
text-align: center;
18+
}
19+
20+
.u-no-demo-here {
21+
color: $u-tips-color;
22+
font-size: 26rpx;
23+
}
24+
25+
.u-demo-result-line {
26+
border-width: 1px;
27+
border-color: #ddd;
28+
border-style: dashed;
29+
padding: 10rpx 40rpx;
30+
margin-top: 30rpx;
31+
border-radius: 5px;
32+
background-color: rgb(240, 240, 240);
33+
color: $u-content-color;
34+
font-size: 32rpx;
35+
/* #ifndef APP-NVUE */
36+
word-break: break-word;
37+
display: inline-block;
38+
/* #endif */
39+
text-align: left;
40+
41+
}
42+
43+
.u-demo-title,
44+
.u-config-title {
45+
text-align: center;
46+
font-size: 32rpx;
47+
font-weight: bold;
48+
margin-bottom: 40rpx;
49+
}
50+
51+
.u-config-item {
52+
margin-top: 50rpx;
53+
}
54+
55+
.u-config-title {
56+
margin-top: 40rpx;
57+
padding-bottom: 10rpx;
58+
}
59+
60+
.u-item-title {
61+
position: relative;
62+
font-size: 28rpx;
63+
padding-left: 8px;
64+
line-height: 1;
65+
margin-bottom: 22rpx;
66+
}
67+
68+
.u-item-title:after {
69+
position: absolute;
70+
width: 4px;
71+
top: -1px;
72+
height: 16px;
73+
/* #ifndef APP-NVUE */
74+
content: '';
75+
/* #endif */
76+
left: 0;
77+
border-radius: 10px;
78+
background-color: $u-content-color;
79+
}
80+
/* end--演示页面使用的统一样式--end */

‎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.0.0",
5+
"versionName" : "1.3.6",
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
@@ -233,7 +233,7 @@
233233
"navigationBarTitleText": "keyboardPay 自定义键盘支付"
234234
}
235235
},
236-
// // douyin 仿抖音
236+
// douyin 仿抖音
237237
// {
238238
// "path": "douyin/index",
239239
// "style": {

‎pages/componentsA/form/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<u-input type="textarea" :border="border" placeholder="请填写简介" v-model="model.intro" />
1212
</u-form-item>
1313
<u-form-item :label-position="labelPosition" label="密码" prop="password">
14-
<u-input :border="border" type="password" :password="true" v-model="model.password" placeholder="请输入密码"></u-input>
14+
<u-input :password-icon="true" :border="border" type="password" v-model="model.password" placeholder="请输入密码"></u-input>
1515
</u-form-item>
1616
<u-form-item :label-position="labelPosition" label="确认密码" label-width="150" prop="rePassword">
17-
<u-input :border="border" type="password" :password="true" v-model="model.rePassword" placeholder="请确认密码"></u-input>
17+
<u-input :border="border" type="password" v-model="model.rePassword" placeholder="请确认密码"></u-input>
1818
</u-form-item>
1919
<u-form-item :label-position="labelPosition" label="水果品种" label-width="150" prop="likeFruit">
2020
<u-checkbox-group @change="checkboxGroupChange" :width="radioCheckWidth" :wrap="radioCheckWrap">

‎pages/componentsA/fullScreen/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
}
3030
},
3131
onShow() {
32-
this.$nextTick(function(){
32+
this.$nextTick(() => {
3333
this.current = 1;
3434
})
3535
},

‎pages/componentsA/select/index.vue

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,32 @@ export default {
3232
list: [],
3333
list1: [
3434
{
35-
value: '江',
36-
label: '江'
35+
id: '江',
36+
name: '江'
3737
},
3838
{
39-
value: '湖',
40-
label: '湖'
39+
id: '湖',
40+
name: '湖'
4141
},
4242
{
43-
value: '夜',
44-
label: '夜'
43+
id: '夜',
44+
name: '夜'
4545
},
4646
{
47-
value: '雨',
48-
label: '雨'
47+
id: '雨',
48+
name: '雨'
4949
},
5050
{
51-
value: '十',
52-
label: '十'
51+
id: '十',
52+
name: '十'
5353
},
5454
{
55-
value: '年',
56-
label: '年'
55+
id: '年',
56+
name: '年'
5757
},
5858
{
59-
value: '灯',
60-
label: '灯'
59+
id: '灯',
60+
name: '灯'
6161
}
6262
],
6363
list2: [

‎pages/componentsA/slider/index.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
@end="end"
1212
@moving="moving"
1313
>
14-
<view class="">
15-
<view class="badge-button" v-if="useSlot">
14+
<!-- #ifndef MP-WEIXIN -->
15+
<view class="" v-if="useSlot">
16+
<view class="badge-button">
1617
{{value}}
1718
</view>
1819
</view>
20+
<!-- #endif -->
1921
</u-slider>
2022
<view class="u-demo-result-line">
2123
滑块值：{{value}}
@@ -28,10 +30,12 @@
2830
<view class="u-item-title">自定义颜色</view>
2931
<u-subsection vibrateShort :list="['primary', 'warning', 'error', 'success']" @change="typeChange"></u-subsection>
3032
</view>
33+
<!-- #ifndef MP-WEIXIN -->
3134
<view class="u-config-item">
3235
<view class="u-item-title">自定义传入内容</view>
3336
<u-subsection vibrateShort current="1" :list="['是', '否']" @change="slotChange"></u-subsection>
3437
</view>
38+
<!-- #endif -->
3539
<view class="u-config-item">
3640
<view class="u-item-title">自定义尺寸</view>
3741
<u-subsection vibrateShort current="1" :list="['是', '否']" @change="sizeChange"></u-subsection>

‎pages/componentsB/card/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</view>
1818
</view>
1919
<view class="" slot="foot">
20-
<u-icon v-if="bottomSlot" name="chat-fill" size="34" color="" label="30评论"></u-icon>
20+
<u-icon v-if="bottomSlot" name="chat-fill" size="34" label="30评论"></u-icon>
2121
</view>
2222
</u-card>
2323
</view>

‎pages/componentsB/line/index.vue

Lines changed: 10 additions & 2 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 u-flex u-row-center">
6-
<u-line color="red" :color="color" :length="length" :direction="direction" :hair-line="hairLine"></u-line>
6+
<u-line :border-style="borderStyle" color="red" :color="color" :length="length" :direction="direction" :hair-line="hairLine"></u-line>
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="['primary', 'success', 'warning', 'error', 'info']" @change="colorChange"></u-subsection>
1616
</view>
17+
<view class="u-config-item">
18+
<view class="u-item-title">线条类型</view>
19+
<u-subsection vibrateShort :list="['实线', '方形虚线', '圆点虚线']" @change="borderStyleChange"></u-subsection>
20+
</view>
1721
<view class="u-config-item">
1822
<view class="u-item-title">细边</view>
1923
<u-subsection vibrateShort :list="['是', '否']" @change="hairLineChange"></u-subsection>
@@ -33,7 +37,8 @@
3337
direction: 'row',
3438
hairLine: true,
3539
length: '100%',
36-
color: this.$u.color['primary']
40+
color: this.$u.color['primary'],
41+
borderStyle: 'solid'
3742
}
3843
},
3944
methods: {
@@ -48,6 +53,9 @@
4853
if(index == 0) this.length = '100%';
4954
else this.length = '50rpx';
5055
},
56+
borderStyleChange(index) {
57+
this.borderStyle = ['solid', 'dashed', 'dotted'][index];
58+
}
5159
}
5260
}
5361
</script>

‎pages/componentsB/swiper/index.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
66
<u-toast ref="uToast"></u-toast>
7-
<u-swiper :height="250" :list="list" :title="title" :effect3d="effect3d"
7+
<u-swiper @change="change" :height="250" :list="list" :title="title" :effect3d="effect3d"
88
:indicator-pos="indicatorPos" :mode="mode" :interval="3000" @click="click"></u-swiper>
99
</view>
1010
</view>
@@ -74,6 +74,9 @@
7474
title: `点击了第${index + 1}张图片`,
7575
type: 'success'
7676
})
77+
},
78+
change(index) {
79+
// console.log(index);
7780
}
7881
}
7982
}

‎pages/componentsC/actionSheet/index.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<view class="u-config-title u-border-bottom">
1414
参数配置
1515
</view>
16-
<view class="u-config-item">
17-
<view class="u-item-title">顶部提示文字</view>
18-
<u-subsection vibrateShort :current="show ? 0 : 1" :list="['是', '否']" @change="tipsChange"></u-subsection>
19-
</view>
2016
<view class="u-config-item">
2117
<view class="u-item-title">取消按钮</view>
2218
<u-subsection vibrateShort :list="['是', '否']" @change="cancelChange"></u-subsection>

‎pages/componentsC/mask/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
data() {
4444
return {
4545
show: false,
46-
zoom: false,
46+
zoom: true,
4747
duration: 300,
4848
content: false,
4949
}

‎pages/componentsC/popup/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:closeable="closeable"
1212
:close-icon-pos="closeIconPos"
1313
>
14-
<view v-if="mode == 'center'" style="width: 400rpx;height: 400rpx">
14+
<view v-if="mode == 'center'" style="height: 400rpx">
1515
<view class="close-btn">
1616
<u-button @click="show = false;" size="medium">关闭弹窗</u-button>
1717
</view>

0 commit comments

Comments
 (0)