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字段，避免某些特殊情况下造成影响
umicro · Jun 19, 2020 · 4e77b88 · 4e77b88
1 parent 9e15c6c
commit 4e77b88
Show file tree

Hide file tree

Showing 41 changed files with 516 additions and 689 deletions.
diff --git a/App.vue b/App.vue
@@ -15,15 +15,6 @@
 
 <style lang="scss">
 	@import "uview-ui/index.scss";
+	@import "common/demo.scss";
 	/*每个页面公共css */
-	/* H5的时候，隐藏滚动条 */
-	/* #ifdef H5 */
-		::-webkit-scrollbar {
-		    display: none;  
-		    width: 0 !important;  
-		    height: 0 !important;  
-		    -webkit-appearance: none;  
-		    background: transparent;  
-		}
-	/* #endif */
 </style>
diff --git a/README.md b/README.md
@@ -26,6 +26,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全
 #### **vue-admin-beautiful** —— [企业级、通用型中后台前端解决方案（基于vue/cli 4 最新版，同时支持电脑，手机，平板）](https://github.com/chuzhixin/vue-admin-beautiful)
 
 #### **vue-admin-beautiful** —— [在线演示](http://beautiful.panm.cn/vue-admin-beautiful/#/index)
+
+#### **pl-table** —— [ 完美解决 element 万级表格数据渲染卡顿问题](https://github.com/livelyPeng/pl-table)
 <br>
 
 ## 安装

diff --git a/common/demo.scss b/common/demo.scss
@@ -0,0 +1,80 @@
+
+/* start--演示页面使用的统一样式--start */
+.u-demo {
+	padding: 50rpx 40rpx;
+}
+
+.u-demo-wrap {
+	border-width: 1px;
+	border-color: #ddd;
+	border-style: dashed;
+	background-color: rgb(250, 250, 250);
+	padding: 40rpx 20rpx;
+	border-radius: 6px;
+}
+
+.u-demo-area {
+	text-align: center;
+}
+
+.u-no-demo-here {
+	color: $u-tips-color;
+	font-size: 26rpx;
+}
+
+.u-demo-result-line {
+	border-width: 1px;
+	border-color: #ddd;
+	border-style: dashed;
+	padding: 10rpx 40rpx;
+	margin-top: 30rpx;
+	border-radius: 5px;
+	background-color: rgb(240, 240, 240);
+	color: $u-content-color;
+	font-size: 32rpx;
+	/* #ifndef APP-NVUE */
+	word-break: break-word;
+	display: inline-block;
+	/* #endif */
+	text-align: left;
+
+}
+
+.u-demo-title,
+.u-config-title {
+	text-align: center;
+	font-size: 32rpx;
+	font-weight: bold;
+	margin-bottom: 40rpx;
+}
+
+.u-config-item {
+	margin-top: 50rpx;
+}
+
+.u-config-title {
+	margin-top: 40rpx;
+	padding-bottom: 10rpx;
+}
+
+.u-item-title {
+	position: relative;
+	font-size: 28rpx;
+	padding-left: 8px;
+	line-height: 1;
+	margin-bottom: 22rpx;
+}
+
+.u-item-title:after {
+	position: absolute;
+	width: 4px;
+	top: -1px;
+	height: 16px;
+	/* #ifndef APP-NVUE */
+	content: '';
+	/* #endif */
+	left: 0;
+	border-radius: 10px;
+	background-color: $u-content-color;
+}
+/* end--演示页面使用的统一样式--end */
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.0.0",
+    "versionName" : "1.3.6",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

diff --git a/pages.json b/pages.json
@@ -233,7 +233,7 @@
 						"navigationBarTitleText": "keyboardPay 自定义键盘支付"
 					}
 				},
-				// // douyin 仿抖音
+				// douyin 仿抖音
 				// {
 				// 	"path": "douyin/index",
 				// 	"style": {

diff --git a/pages/componentsA/form/index.vue b/pages/componentsA/form/index.vue
@@ -11,10 +11,10 @@
 				<u-input type="textarea" :border="border" placeholder="请填写简介" v-model="model.intro" />
 			</u-form-item>
 			<u-form-item :label-position="labelPosition" label="密码" prop="password">
-				<u-input :border="border" type="password" :password="true" v-model="model.password" placeholder="请输入密码"></u-input>
+				<u-input :password-icon="true" :border="border" type="password" v-model="model.password" placeholder="请输入密码"></u-input>
 			</u-form-item>
 			<u-form-item :label-position="labelPosition" label="确认密码" label-width="150" prop="rePassword">
-				<u-input :border="border" type="password" :password="true" v-model="model.rePassword" placeholder="请确认密码"></u-input>
+				<u-input :border="border" type="password" v-model="model.rePassword" placeholder="请确认密码"></u-input>
 			</u-form-item>
 			<u-form-item :label-position="labelPosition" label="水果品种" label-width="150" prop="likeFruit">
 				<u-checkbox-group @change="checkboxGroupChange" :width="radioCheckWidth" :wrap="radioCheckWrap">

diff --git a/pages/componentsA/fullScreen/index.vue b/pages/componentsA/fullScreen/index.vue
@@ -29,7 +29,7 @@
 			}
 		},
 		onShow() {
-			this.$nextTick(function(){
+			this.$nextTick(() => {
 				this.current = 1;
 			})
 		},

diff --git a/pages/componentsA/select/index.vue b/pages/componentsA/select/index.vue
@@ -32,32 +32,32 @@ export default {
 			list: [],
 			list1: [
 				{
-					value: '江',
-					label: '江'
+					id: '江',
+					name: '江'
 				},
 				{
-					value: '湖',
-					label: '湖'
+					id: '湖',
+					name: '湖'
 				},
 				{
-					value: '夜',
-					label: '夜'
+					id: '夜',
+					name: '夜'
 				},
 				{
-					value: '雨',
-					label: '雨'
+					id: '雨',
+					name: '雨'
 				},
 				{
-					value: '十',
-					label: '十'
+					id: '十',
+					name: '十'
 				},
 				{
-					value: '年',
-					label: '年'
+					id: '年',
+					name: '年'
 				},
 				{
-					value: '灯',
-					label: '灯'
+					id: '灯',
+					name: '灯'
 				}
 			],
 			list2: [

diff --git a/pages/componentsA/slider/index.vue b/pages/componentsA/slider/index.vue
@@ -11,11 +11,13 @@
 					@end="end"
 					@moving="moving"
 				>
-					<view class="">
-						<view class="badge-button" v-if="useSlot">
+					<!-- #ifndef MP-WEIXIN -->
+					<view class="" v-if="useSlot">
+						<view class="badge-button">
 							{{value}}
 						</view>
 					</view>
+					<!-- #endif -->
 				</u-slider>
 				<view class="u-demo-result-line">
 					滑块值：{{value}}
@@ -28,10 +30,12 @@
 				<view class="u-item-title">自定义颜色</view>
 				<u-subsection vibrateShort :list="['primary', 'warning', 'error', 'success']" @change="typeChange"></u-subsection>
 			</view>
+			<!-- #ifndef MP-WEIXIN -->
 			<view class="u-config-item">
 				<view class="u-item-title">自定义传入内容</view>
 				<u-subsection vibrateShort current="1" :list="['是', '否']" @change="slotChange"></u-subsection>
 			</view>
+			<!-- #endif -->
 			<view class="u-config-item">
 				<view class="u-item-title">自定义尺寸</view>
 				<u-subsection vibrateShort current="1" :list="['是', '否']" @change="sizeChange"></u-subsection>

diff --git a/pages/componentsB/card/index.vue b/pages/componentsB/card/index.vue
@@ -17,7 +17,7 @@
 					</view>
 				</view>
 				<view class="" slot="foot">
-					<u-icon v-if="bottomSlot" name="chat-fill" size="34" color="" label="30评论"></u-icon>
+					<u-icon v-if="bottomSlot" name="chat-fill" size="34" label="30评论"></u-icon>
 				</view>
 			</u-card>
 		</view>

diff --git a/pages/componentsB/line/index.vue b/pages/componentsB/line/index.vue
@@ -3,7 +3,7 @@
 		<view class="u-demo-wrap">
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area u-flex u-row-center">
-				<u-line color="red" :color="color" :length="length" :direction="direction" :hair-line="hairLine"></u-line>
+				<u-line :border-style="borderStyle" color="red" :color="color" :length="length" :direction="direction" :hair-line="hairLine"></u-line>
 			</view>
 		</view>
 		<view class="u-config-wrap">
@@ -14,6 +14,10 @@
 				<view class="u-item-title">颜色</view>
 				<u-subsection vibrateShort :list="['primary', 'success', 'warning', 'error', 'info']" @change="colorChange"></u-subsection>
 			</view>
+			<view class="u-config-item">
+				<view class="u-item-title">线条类型</view>
+				<u-subsection vibrateShort :list="['实线', '方形虚线', '圆点虚线']" @change="borderStyleChange"></u-subsection>
+			</view>
 			<view class="u-config-item">
 				<view class="u-item-title">细边</view>
 				<u-subsection vibrateShort :list="['是', '否']" @change="hairLineChange"></u-subsection>
@@ -33,7 +37,8 @@
 				direction: 'row',
 				hairLine: true,
 				length: '100%',
-				color: this.$u.color['primary']
+				color: this.$u.color['primary'],
+				borderStyle: 'solid'
 			}
 		},
 		methods: {
@@ -48,6 +53,9 @@
 				if(index == 0) this.length = '100%';
 				else this.length = '50rpx';
 			},
+			borderStyleChange(index) {
+				this.borderStyle = ['solid', 'dashed', 'dotted'][index];
+			}
 		}
 	}
 </script>

diff --git a/pages/componentsB/swiper/index.vue b/pages/componentsB/swiper/index.vue
@@ -4,7 +4,7 @@
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area">
 				<u-toast ref="uToast"></u-toast>
-				<u-swiper :height="250" :list="list" :title="title" :effect3d="effect3d" 
+				<u-swiper @change="change" :height="250" :list="list" :title="title" :effect3d="effect3d" 
 				:indicator-pos="indicatorPos" :mode="mode" :interval="3000" @click="click"></u-swiper>
 			</view>
 		</view>
@@ -74,6 +74,9 @@
 					title: `点击了第${index + 1}张图片`,
 					type: 'success'
 				})
+			},
+			change(index) {
+				// console.log(index);
 			}
 		}
 	}

diff --git a/pages/componentsC/actionSheet/index.vue b/pages/componentsC/actionSheet/index.vue
@@ -13,10 +13,6 @@
 			<view class="u-config-title u-border-bottom">
 				参数配置
 			</view>
-			<view class="u-config-item">
-				<view class="u-item-title">顶部提示文字</view>
-				<u-subsection vibrateShort :current="show ? 0 : 1" :list="['是', '否']" @change="tipsChange"></u-subsection>
-			</view>
 			<view class="u-config-item">
 				<view class="u-item-title">取消按钮</view>
 				<u-subsection vibrateShort :list="['是', '否']" @change="cancelChange"></u-subsection>

diff --git a/pages/componentsC/mask/index.vue b/pages/componentsC/mask/index.vue
@@ -43,7 +43,7 @@
 		data() {
 			return {
 				show: false,
-				zoom: false,
+				zoom: true,
 				duration: 300,
 				content: false,
 			}

diff --git a/pages/componentsC/popup/index.vue b/pages/componentsC/popup/index.vue
@@ -11,7 +11,7 @@
 					:closeable="closeable"
 					:close-icon-pos="closeIconPos"
 				>
-					<view v-if="mode == 'center'" style="width: 400rpx;height: 400rpx">
+					<view v-if="mode == 'center'" style="height: 400rpx">
 						<view class="close-btn">
 							<u-button @click="show = false;" size="medium">关闭弹窗</u-button>
 						</view>