1. 修复toast的position参数无效问题。

2. 处理input在ios nvue上无法获得焦点的问题。 3. avatar-group组件添加extraValue参数，让剩余展示数量可手动控制。 4. tabs组件添加keyName参数用于配置从对象中读取的键名。 5. 处理text组件名字脱敏默认配置无效的问题。 6. 处理picker组件item文本太长换行问题。
a1035909950 · Dec 1, 2021 · e615757 · e615757
1 parent a3bd2a3
commit e615757
Show file tree

Hide file tree

Showing 22 changed files with 767 additions and 732 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -6,7 +6,7 @@ module.exports = {
         // 强制4个空格缩进
         indent: ['error', 4],
         // 不允许出现分号
-        semi: ['error', 'never'],
+        semi: ['error', 'always'],
         // 是否检查连续等号赋值
         'no-multi-assign': 0,
         // 要求 require() 出现在顶层模块作用域中，禁止它

diff --git a/pages/componentsB/toast/toast.nvue b/pages/componentsB/toast/toast.nvue
@@ -54,7 +54,7 @@
 						type: 'warning',
 						position: "top",
 						title: '位置偏移上方',
-						message: "望帝春心托杜鹃",
+						message: "望帝春心托杜鹃",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/top.png'
 					},
 					{

diff --git a/pages/componentsC/avatar/avatar.nvue b/pages/componentsC/avatar/avatar.nvue
@@ -130,7 +130,7 @@
 				<u-avatar-group
 					:urls="urls"
 					size="35"
-					gap="0.6"
+					gap="0.6"
 				></u-avatar-group>
 			</view>
 		</view>

diff --git a/pages/componentsC/input/input.nvue b/pages/componentsC/input/input.nvue
@@ -1,7 +1,7 @@
 <template>
 	<view class="u-page">
 		<view class="u-demo-block">
-			<text class="u-demo-block__title">基础使用</text>
+			<text class="u-demo-block__title">基础使用</text>
 			<view class="u-demo-block__content">
 				<u--input
 				    placeholder="请输入内容"
@@ -86,7 +86,7 @@
 					    margin="0 3px 0 0"
 					    type="tips"
 					></u--text>
-				<!-- #ifdef MP -->
+				<!-- #ifdef MP-WEIXIN -->
 				</u-input>
 				<!-- #endif -->
 				<!-- #ifndef MP-WEIXIN -->
@@ -116,7 +116,7 @@
 							size="mini"
 						></u-button>
 					</template>
-				<!-- #ifdef MP -->
+				<!-- #ifdef MP-WEIXIN -->
 				</u-input>
 				<!-- #endif -->
 				<!-- #ifndef MP-WEIXIN -->

diff --git a/pages/componentsC/layout/layout.nvue b/pages/componentsC/layout/layout.nvue
@@ -1,179 +1,156 @@
-<template>
-	<view class="u-page">
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">基础使用</text>
-			<view class="u-demo-block__content">
-				<u-row customStyle="margin-bottom: 10px">
-					<u-col span="6">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col span="6">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-				</u-row>
-				<u-row customStyle="margin-bottom: 10px">
-					<u-col span="4">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-					<u-col span="4">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col span="4">
-						<view class="demo-layout bg-purple-dark"></view>
-					</u-col>
-				</u-row>
-				<u-row justify="space-between">
-					<u-col span="3">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-					<u-col span="3">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col span="3">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-					<u-col span="3">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">分栏间隔</text>
-			<view class="u-demo-block__content">
-				<u-row
-				    justify="space-between"
-				    gutter="10"
-				>
-					<u-col span="3">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-					<u-col span="3">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col span="3">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-					<u-col span="3">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">混合布局</text>
-			<view class="u-demo-block__content">
-				<u-row
-				    justify="space-between"
-				    gutter="10"
-				>
-					<u-col span="2">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col span="4">
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-					<u-col span="6">
-						<view class="demo-layout bg-purple-dark"></view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">分栏偏移</text>
-			<view class="u-demo-block__content">
-				<u-row
-				    justify="space-between"
-				    customStyle="margin-bottom: 10px"
-				>
-					<u-col
-					    span="3"
-					    offset="3"
-					>
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col
-					    span="3"
-					    offset="3"
-					>
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-				</u-row>
-				<u-row>
-					<u-col span="3">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col
-					    span="3"
-					    offset="3"
-					>
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">对齐方式</text>
-			<view class="u-demo-block__content">
-				<u-row
-				    justify="space-between"
-					customStyle="margin-bottom: 10px"
-				>
-					<u-col
-					    span="3"
-					>
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col
-					    span="3"
-					>
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-				</u-row>
-				<u-row>
-					<u-col span="3">
-						<view class="demo-layout bg-purple-light"></view>
-					</u-col>
-					<u-col
-					    span="3"
-					>
-						<view class="demo-layout bg-purple"></view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.wrap {
-		padding: 12px;
-	}
-
-	.demo-layout {
-		height: 25px;
-		border-radius: 4px;
-	}
-
-	.bg-purple {
-		background: #CED7E1;
-	}
-
-	.bg-purple-light {
-		background: #e5e9f2;
-	}
-
-	.bg-purple-dark {
-		background: #99a9bf;
-	}
-</style>
+<template>
+    <view class="u-page">
+        <view class="u-demo-block">
+            <text class="u-demo-block__title">基础使用</text>
+            <view class="u-demo-block__content">
+                <u-row customStyle="margin-bottom: 10px">
+                    <u-col span="6">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="6">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                </u-row>
+                <u-row customStyle="margin-bottom: 10px">
+                    <u-col span="4">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                    <u-col span="4">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="4">
+                        <view class="demo-layout bg-purple-dark"></view>
+                    </u-col>
+                </u-row>
+                <u-row justify="space-between">
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                </u-row>
+            </view>
+        </view>
+        <view class="u-demo-block">
+            <text class="u-demo-block__title">分栏间隔</text>
+            <view class="u-demo-block__content">
+                <u-row justify="space-between" gutter="10">
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                </u-row>
+            </view>
+        </view>
+        <view class="u-demo-block">
+            <text class="u-demo-block__title">混合布局</text>
+            <view class="u-demo-block__content">
+                <u-row justify="space-between" gutter="10">
+                    <u-col span="2">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="4">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                    <u-col span="6">
+                        <view class="demo-layout bg-purple-dark"></view>
+                    </u-col>
+                </u-row>
+            </view>
+        </view>
+        <view class="u-demo-block">
+            <text class="u-demo-block__title">分栏偏移</text>
+            <view class="u-demo-block__content">
+                <u-row
+                    justify="space-between"
+                    customStyle="margin-bottom: 10px"
+                >
+                    <u-col span="3" offset="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="3" offset="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                </u-row>
+                <u-row>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="3" offset="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                </u-row>
+            </view>
+        </view>
+        <view class="u-demo-block">
+            <text class="u-demo-block__title">对齐方式</text>
+            <view class="u-demo-block__content">
+                <u-row
+                    justify="space-between"
+                    customStyle="margin-bottom: 10px"
+                >
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                </u-row>
+                <u-row>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple-light"></view>
+                    </u-col>
+                    <u-col span="3">
+                        <view class="demo-layout bg-purple"></view>
+                    </u-col>
+                </u-row>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+};
+</script>
+
+<style lang="scss">
+.wrap {
+    padding: 12px;
+}
+
+.demo-layout {
+    height: 25px;
+    border-radius: 4px;
+}
+
+.bg-purple {
+    background: #ced7e1;
+}
+
+.bg-purple-light {
+    background: #e5e9f2;
+}
+
+.bg-purple-dark {
+    background: #99a9bf;
+}
+</style>