From 6e8ad6fa3dfec4691b9f14db211750912b2a6234 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Thu, 5 Aug 2021 17:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=9Envue=E9=A1=B5=E9=9D=A2=E6=97=B6=E7=99=BD=E5=B1=8F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20-=20=E6=B3=A8=E6=84=8F?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=AC=E6=AC=A1=E5=9C=A8=E4=B8=AD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E8=B7=AF=E7=94=B1=E6=8B=A6=E6=88=AA=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=98=AF=E4=B8=AA=E5=85=BC=E5=AE=B9=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=EF=BC=9B=E5=BD=93=E9=A6=96=E9=A1=B5=E4=B8=BA=E9=9D=9E?=
 =?UTF-8?q?nvue=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B7=AF=E7=94=B1=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E5=99=A8=E9=80=BB=E8=BE=91=E4=BC=9A=E5=9C=A8=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=A6=96=E9=A1=B5=E6=97=B6=E6=89=A7=E8=A1=8C=E3=80=82?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8B=E6=9D=A5=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84?=
 =?UTF-8?q?hx=E7=BC=96=E8=AF=91=E7=9A=84uni-app=E9=A1=B9=E7=9B=AE=E6=97=A0?=
 =?UTF-8?q?=E8=AE=BA=E9=A6=96=E9=A1=B5=E6=98=AF=E5=90=A6=E4=B8=BAnvue?=
 =?UTF-8?q?=E9=83=BD=E4=B8=8D=E8=B5=B0=E6=8B=A6=E6=88=AA=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E5=90=84=E7=AB=AF=E9=80=BB=E8=BE=91=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |    4 +-
 changelog.md                                  |    3 +
 common/appInit.js                             |   15 +-
 .../uni-user-profile/uni-user-profile.vue     |    3 +
 index.html                                    |    4 +-
 manifest.json                                 |    2 +-
 package.json                                  |    2 +-
 pages.json                                    |   12 +-
 pages/list/detail.vue                         |   16 +-
 pages/list/{list.nvue => list.vue}            |   11 +-
 pages/ucenter/about/about.vue                 |    1 -
 pages/ucenter/ucenter.vue                     |    9 +-
 uni-starter.config.js                         |    2 +-
 .../js_sdk/wa-permission/permission.js        |    2 +-
 .../uni-agree/pages/uni-agree/uni-agree.nvue  |    3 +-
 uni_modules/uni-badge/changelog.md            |   38 +-
 .../components/uni-badge/uni-badge.vue        |    1 +
 uni_modules/uni-badge/package.json            |  166 +--
 uni_modules/uni-calendar/changelog.md         |    6 +-
 .../uni-calendar/uni-calendar-item.vue        |    1 +
 .../components/uni-calendar/uni-calendar.vue  |    1 +
 uni_modules/uni-calendar/package.json         |    2 +-
 uni_modules/uni-card/changelog.md             |    6 +-
 .../uni-card/components/uni-card/uni-card.vue |    1 +
 uni_modules/uni-card/package.json             |    2 +-
 uni_modules/uni-collapse/changelog.md         |   30 +-
 .../uni-collapse-item/uni-collapse-item.vue   |    5 +
 .../components/uni-collapse/uni-collapse.vue  |    1 +
 uni_modules/uni-collapse/package.json         |    2 +-
 uni_modules/uni-collapse/readme.md            |    8 +-
 uni_modules/uni-combox/changelog.md           |    6 +-
 .../components/uni-combox/uni-combox.vue      |   25 +-
 uni_modules/uni-combox/package.json           |    2 +-
 uni_modules/uni-countdown/changelog.md        |   20 +-
 .../uni-countdown/uni-countdown.vue           |   10 +-
 uni_modules/uni-countdown/package.json        |  162 +--
 uni_modules/uni-data-checkbox/changelog.md    |    8 +-
 .../uni-data-checkbox/uni-data-checkbox.vue   |   29 +-
 uni_modules/uni-data-checkbox/package.json    |    6 +-
 uni_modules/uni-drawer/changelog.md           |    6 +-
 .../components/uni-drawer/uni-drawer.vue      |    1 +
 uni_modules/uni-drawer/package.json           |    2 +-
 uni_modules/uni-easyinput/changelog.md        |    8 +-
 .../uni-easyinput/uni-easyinput.vue           |    3 +-
 uni_modules/uni-easyinput/package.json        |    2 +-
 uni_modules/uni-fab/changelog.md              |    6 +-
 .../uni-fab/components/uni-fab/uni-fab.vue    |    1 +
 uni_modules/uni-fab/package.json              |    2 +-
 uni_modules/uni-file-picker/changelog.md      |   17 +-
 .../uni-file-picker/choose-and-upload-file.js |  344 +++--
 .../uni-file-picker/uni-file-picker.vue       | 1206 ++++++++---------
 .../uni-file-picker/upload-file.vue           |    1 +
 .../uni-file-picker/upload-image.vue          |    3 +-
 .../components/uni-file-picker/utils.js       |  109 ++
 uni_modules/uni-file-picker/package.json      |  163 +--
 uni_modules/uni-forms/changelog.md            |   17 +-
 .../uni-forms-item/uni-forms-item.vue         |   48 +-
 .../components/uni-forms/uni-forms.vue        |    2 +
 .../components/uni-forms/validate.js          |  886 ++++++------
 uni_modules/uni-forms/package.json            |    4 +-
 uni_modules/uni-forms/readme.md               |   13 +-
 uni_modules/uni-grid/changelog.md             |    6 +-
 .../uni-grid/components/uni-grid/uni-grid.vue |    1 +
 uni_modules/uni-grid/package.json             |    2 +-
 uni_modules/uni-group/changelog.md            |    7 +-
 .../components/uni-group/uni-group.vue        |    2 +
 uni_modules/uni-group/package.json            |    2 +-
 uni_modules/uni-group/readme.md               |   11 +-
 uni_modules/uni-icons/changelog.md            |    6 +-
 .../components/uni-icons/uni-icons.vue        |    1 +
 uni_modules/uni-icons/package.json            |    2 +-
 .../uni-image-menu/js_sdk/uni-image-menu.js   |   12 +-
 uni_modules/uni-indexed-list/changelog.md     |    6 +-
 .../uni-indexed-list-item.vue                 |    1 +
 .../uni-indexed-list/uni-indexed-list.vue     |    1 +
 uni_modules/uni-indexed-list/package.json     |   11 +-
 uni_modules/uni-link/changelog.md             |   16 +-
 .../uni-link/components/uni-link/uni-link.vue |  236 ++--
 uni_modules/uni-link/package.json             |  164 +--
 uni_modules/uni-link/readme.md                |    7 +
 uni_modules/uni-list/changelog.md             |    6 +-
 .../uni-list-chat/uni-list-chat.vue           |    1 +
 .../uni-list-item/uni-list-item.vue           |    4 +-
 uni_modules/uni-list/package.json             |    2 +-
 uni_modules/uni-load-more/changelog.md        |    6 +-
 .../uni-load-more/uni-load-more.vue           |    1 +
 uni_modules/uni-load-more/package.json        |    2 +-
 uni_modules/uni-nav-bar/changelog.md          |    6 +-
 .../components/uni-nav-bar/uni-nav-bar.vue    |    1 +
 .../components/uni-nav-bar/uni-status-bar.vue |    6 +-
 uni_modules/uni-nav-bar/package.json          |    6 +-
 uni_modules/uni-notice-bar/changelog.md       |    6 +-
 .../uni-notice-bar/uni-notice-bar.vue         |    1 +
 uni_modules/uni-notice-bar/package.json       |    2 +-
 uni_modules/uni-number-box/changelog.md       |    6 +-
 .../uni-number-box/uni-number-box.vue         |    1 +
 uni_modules/uni-number-box/package.json       |    2 +-
 uni_modules/uni-pagination/changelog.md       |    6 +-
 .../uni-pagination/uni-pagination.vue         |   13 +
 uni_modules/uni-pagination/package.json       |    2 +-
 uni_modules/uni-popup/changelog.md            |    6 +-
 .../uni-popup-dialog/uni-popup-dialog.vue     |    1 +
 .../uni-popup-share/uni-popup-share.vue       |    1 +
 .../components/uni-popup/uni-popup.vue        |    1 +
 uni_modules/uni-popup/package.json            |  164 +--
 uni_modules/uni-rate/changelog.md             |    6 +-
 .../uni-rate/components/uni-rate/uni-rate.vue |   11 +-
 uni_modules/uni-rate/package.json             |    2 +-
 uni_modules/uni-search-bar/changelog.md       |    6 +-
 .../uni-search-bar/uni-search-bar.vue         |    1 +
 uni_modules/uni-search-bar/package.json       |    2 +-
 .../uni-segmented-control/changelog.md        |    6 +-
 .../uni-segmented-control.vue                 |    1 +
 .../uni-segmented-control/package.json        |    2 +-
 uni_modules/uni-share/changelog.md            |    2 +
 .../uni-share/js_sdk/uni-image-menu.js        |   20 +-
 uni_modules/uni-share/js_sdk/uni-share.js     |   23 +-
 uni_modules/uni-share/package.json            |    6 +-
 uni_modules/uni-swipe-action/changelog.md     |    3 +
 .../uni-swipe-action-item/bindingx.js         |   15 +-
 .../uni-swipe-action-item/mpalipay.js         |   15 +-
 .../uni-swipe-action-item/mpother.js          |   15 +-
 .../components/uni-swipe-action-item/mpwxs.js |   18 +-
 .../uni-swipe-action-item.vue                 |  288 ++--
 .../uni-swipe-action/uni-swipe-action.vue     |    7 +-
 uni_modules/uni-swipe-action/package.json     |    2 +-
 uni_modules/uni-swipe-action/readme.md        |    2 +-
 uni_modules/uni-swiper-dot/changelog.md       |    8 +-
 .../uni-swiper-dot/uni-swiper-dot.vue         |    1 +
 uni_modules/uni-swiper-dot/package.json       |    2 +-
 uni_modules/uni-table/changelog.md            |   10 +-
 .../components/uni-table/uni-table.vue        |    1 +
 .../components/uni-th/filter-dropdown.vue     |    3 +-
 .../uni-table/components/uni-th/uni-th.vue    |    1 +
 .../components/uni-tr/table-checkbox.vue      |    1 +
 uni_modules/uni-table/package.json            |    4 +-
 uni_modules/uni-tag/changelog.md              |   22 +-
 .../uni-tag/components/uni-tag/uni-tag.vue    |    1 +
 uni_modules/uni-tag/package.json              |  164 +--
 uni_modules/uni-transition/changelog.md       |    8 +-
 .../uni-transition/uni-transition.vue         |    1 +
 uni_modules/uni-transition/package.json       |    2 +-
 uni_modules/uni-transition/readme.md          |    2 -
 uni_modules/uni-ui/changelog.md               |   32 +
 .../uni-ui/components/uni-ui/uni-ui.vue       |   14 +-
 uni_modules/uni-ui/package.json               |    9 +-
 uni_modules_tools/copy/manifest.json          |    2 +-
 147 files changed, 2627 insertions(+), 2332 deletions(-)
 rename pages/list/{list.nvue => list.vue} (94%)
 create mode 100644 uni_modules/uni-file-picker/components/uni-file-picker/utils.js

diff --git a/App.vue b/App.vue
index 71ce47c1..534f3c14 100644
--- a/App.vue
+++ b/App.vue
@@ -1,13 +1,13 @@
 <script>
 	import initApp from '@/common/appInit.js';
-	import checkIsAgree from '@/uni_modules/uni-agree/utils/uni-agree.js';
+	import checkIsAgree from '@/uni_modules/uni-agree/utils/uni-agree.js';
 	export default {
 		globalData: {
 			searchText: '',
 			appVersion: {},
 			config: {}
 		},
-		onLaunch: function() {
+		onLaunch: function() {
 			console.log('App Launch')
 			initApp();
 			// #ifdef APP-PLUS
diff --git a/changelog.md b/changelog.md
index 886a95d5..158de842 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+## 1.0.44（2021-08-05）
+解决首页为非nvue页面时白屏的问题。
+- 注意：本次在`common/appInit.js`中修改了路由拦截的逻辑，是个兼容方案；当首页为非nvue页面，路由拦截器逻辑会在加载首页时执行。接下来新版本的hx编译的uni-app项目无论首页是否为nvue都不走拦截器，保持各端逻辑一致。
 ## 1.0.43（2021-08-02）
 1. 微信小程序端，新增：微信登陆成功后，弹出是否"获取微信头像和昵称，完善个人资料"的弹框
 2. APP端，新增逻辑：微信登陆成功后，自动获取用户的微信昵称和头像完善用户个人资料
diff --git a/common/appInit.js b/common/appInit.js
index 1c8ee4d9..84196002 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -56,7 +56,7 @@ export default async function() {
 	uniStarterConfig.router.login = loginConfig
 
 	// uniStarterConfig挂载到getApp().globalData.config
-	setTimeout(() => {
+	setTimeout(() => {
 		getApp({
 			allowDefault: true
 		}).globalData.config = uniStarterConfig;
@@ -309,12 +309,14 @@ export default async function() {
 					//token是否已失效
 					tokenExpired = uni.getStorageSync('uni_id_token_expired') < Date.now(),
 					//获取要跳转的页面路径（url去掉"?"和"?"后的参数）
-					url = e.url.split('?')[0],
+					url = e.url.split('?')[0];
 					//获取要前往的页面路径（即url去掉"?"和"?"后的参数）
-					pages = getCurrentPages(),
-					fromUrl = pages[pages.length - 1].route;
-				
-				
+				const pages = getCurrentPages();
+				if(!pages.length){
+					return e
+				}
+				const fromUrl = pages[pages.length - 1].route;
+			
 				let inLoginPage = fromUrl.split('/')[2] == 'login-page'
 					
 				//控制登录优先级
@@ -430,6 +432,5 @@ function initAppVersion() {
 		})
 	});
 	// 检查更新
-	checkUpdate();
 	// #endif
 }
diff --git a/components/uni-user-profile/uni-user-profile.vue b/components/uni-user-profile/uni-user-profile.vue
index f3603544..62beb864 100644
--- a/components/uni-user-profile/uni-user-profile.vue
+++ b/components/uni-user-profile/uni-user-profile.vue
@@ -66,6 +66,9 @@
 					        }
 							callBack()
 					    },
+						fail: (err) => {
+							console.error(err)
+						},
 						complete: (e) => {
 							// console.log("downloadFile",e);
 						}
diff --git a/index.html b/index.html
index 9efb7332..bb564510 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
     <title></title>
     <!--preload-links-->
     <!--app-context-->
@@ -11,4 +11,4 @@
     <div id="app"><!--app-html--></div>
     <script type="module" src="/main.js"></script>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 4075549d..9236c4a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,7 +22,7 @@
     "nvueStyleCompiler": "uni-app",
     "compilerVersion": 3,
     "splashscreen": {
-      "alwaysShowBeforeRender": true,
+      "alwaysShowBeforeRender": false,
       "waiting": true,
       "autoclose": true,
       "delay": 0
diff --git a/package.json b/package.json
index 28e45f9b..40fe0832 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.0.43",
+	"version": "1.0.44",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",
diff --git a/pages.json b/pages.json
index 727c18bb..fb76cbf5 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,12 @@
 {
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/list/list",
 			"style": {
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
-			}
-		},
+			}
+		},
 		{
 			"path": "pages/grid/grid",
 			"style": {
@@ -42,7 +43,6 @@
 				},
 				"h5": {
 					"titleNView": {
-						"buttons": [],
 						"type": "transparent"
 					}
 				},
@@ -174,6 +174,8 @@
 	},
 	"condition": {
 		"list": [{
+				"path": "pages/list/detail"
+			},{
 				"path": "pages/list/list"
 			},
 			{
@@ -185,7 +187,7 @@
 				"path": "pages/ucenter/settings/settings"
 			}
 		],
-		"current": 0
+		"current": 1
 	},
 	"tabBar": {
 		"color": "#7A7E83",
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index eb079a8e..76f3372d 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -81,7 +81,9 @@
 				return getApp().globalData.config
 			}
 		},
-		onLoad(event) {
+		onLoad(event) {
+			console.log(event);
+			event = {"id":"60783c5cb781700001375672","title":"阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务","excerpt":"阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务","avatar":"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-aliyun-gacrhzeynhss7c6d04/249516a0-3941-11eb-899d-733ae62bed2f.jpg"}
 			//获取真实新闻id，通常 id 来自上一个页面
 			if (event.id) {
 				this.id = event.id
@@ -94,7 +96,7 @@
 				})
 			}
 		},
-		onNavigationBarButtonTap(event) {
+		onNavigationBarButtonTap(event) {
 			if (event.type == 'share') {
 				this.shareClick();
 			}
@@ -183,7 +185,13 @@
 					title,
 					excerpt,
 					avatar
-				} = this.$refs.detail.dataList
+				} = this.$refs.detail.dataList
+				console.log( JSON.stringify({
+					_id,
+					title,
+					excerpt,
+					avatar
+				}) );
 				uniShare({
 					content: { //公共的分享类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
 						type: 0,
@@ -251,7 +259,7 @@
 					],
 					cancelText: "取消分享",
 				}, e => { //callback
-					console.log(e);
+					// console.log(e);
 				})
 			},
 		}
diff --git a/pages/list/list.nvue b/pages/list/list.vue
similarity index 94%
rename from pages/list/list.nvue
rename to pages/list/list.vue
index e51fe8d1..07a35f3f 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
 		<!-- #ifndef H5 -->
-		<statusBar></statusBar>
+		<statusBar></statusBar>
 		<!-- #endif -->
 		<!-- 搜索功能 -->
 		<view @click.capture="searchClick">
@@ -132,7 +132,14 @@
 	}
 </script>
 
-<style scoped>
+<style scoped>
+	/* #ifndef APP-NVUE */
+	view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+	/* #endif */
 	.pages {
 		background-color: #FFFFFF;
 	}
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 51a89337..c04b16ac 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -129,7 +129,6 @@
 		box-sizing: border-box;
 		flex-direction: column;
 	}
-
 	/* #endif */
 	.about {
 		width: 750upx;
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 1aca00d2..42b0f856 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -16,7 +16,7 @@
 				<uni-icons class="icon" color="#007AFF" :type="item.icon" size="26"></uni-icons>
 				<text class="text">{{item.text}}</text>
 			</uni-grid-item>
-		</uni-grid>
+		</uni-grid>
 		<uni-list class="center-list" v-for="(sublist , index) in ucenterList" :key="index">
 			<uni-list-item v-for="(item,i) in sublist" :title="item.title" link :rightText="item.rightText" :key="i"
 				:clickable="true" :to="item.to" @click="ucenterListClick(item)" :show-extra-icon="true"
@@ -129,7 +129,7 @@
 				icon: 'loop',
 				showBadge: this.appVersion.hasNew
 			})
-			//#endif
+			//#endif
 		},
 		computed: {
 			...mapGetters({
@@ -231,6 +231,8 @@
 						title: msg,
 						icon: 'none'
 					});
+				}).finally(()=>{
+					uni.hideLoading()
 				})
 			},
 			async share() {
@@ -318,13 +320,12 @@
 	view {
 		display: flex;
 		box-sizing: border-box;
-		flex-direction: column;
+		flex-direction: column;
 	}
 
 	page {
 		background-color: #f8f8f8;
 	}
-
 	/* #endif*/
 
 	.center {
diff --git a/uni-starter.config.js b/uni-starter.config.js
index c4252756..b0f69eda 100644
--- a/uni-starter.config.js
+++ b/uni-starter.config.js
@@ -38,7 +38,7 @@ export default {
 			{"pattern":/^\/pages\/list.*/},	//支持正则表达式
 			"/pages/grid/grid",
 			"/pages/ucenter/ucenter",
-			"/pages/ucenter/about/about",
+			"/pages/ucenter/about/about"
 		],
 		/*
 		login:配置登陆类型与优先级
diff --git a/uni_modules/json-gps/js_sdk/wa-permission/permission.js b/uni_modules/json-gps/js_sdk/wa-permission/permission.js
index 5df56239..185dfae6 100644
--- a/uni_modules/json-gps/js_sdk/wa-permission/permission.js
+++ b/uni_modules/json-gps/js_sdk/wa-permission/permission.js
@@ -264,7 +264,7 @@ function checkSystemEnableLocation() {
 	}
 }
 
-module.exports = {
+export default {
 	judgeIosPermission: judgeIosPermission,
 	requestAndroidPermission: requestAndroidPermission,
 	checkSystemEnableLocation: checkSystemEnableLocation,
diff --git a/uni_modules/uni-agree/pages/uni-agree/uni-agree.nvue b/uni_modules/uni-agree/pages/uni-agree/uni-agree.nvue
index fd5ddb02..4ac97e65 100644
--- a/uni_modules/uni-agree/pages/uni-agree/uni-agree.nvue
+++ b/uni_modules/uni-agree/pages/uni-agree/uni-agree.nvue
@@ -34,7 +34,8 @@
 </template>
 
 <script>
-import {about} from '@/uni-starter.config.js';
+import config from '@/uni-starter.config.js';
+const { about } = config
     export default {
         data() {
             return {
diff --git a/uni_modules/uni-badge/changelog.md b/uni_modules/uni-badge/changelog.md
index c3a043d6..90bde25b 100644
--- a/uni_modules/uni-badge/changelog.md
+++ b/uni_modules/uni-badge/changelog.md
@@ -1,18 +1,20 @@
-## 1.1.4（2021-07-29）
-- 修复 去掉 nvue 不支持css 的 align-self 属性，nvue 下不暂支持 absolute 属性
-## 1.1.3（2021-06-24）
-- 优化 示例项目
-## 1.1.1（2021-05-12）
-- 新增 组件示例地址
-## 1.1.0（2021-05-12）
-- 新增 uni-badge 的 absolute 属性，支持定位
-- 新增 uni-badge 的 offset 属性，支持定位偏移
-- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点
-- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+
-- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式
-## 1.0.7（2021-05-07）
-- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug
-- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug
-- 新增 uni-badge 属性 custom-style， 支持自定义样式
-## 1.0.6（2021-02-04）
-- 调整为uni_modules目录规范
+## 1.1.5（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.4
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.3（2021-06-24）
+- 优化 示例项目
+## 1.1.1（2021-05-12）
+- 新增 组件示例地址
+## 1.1.0（2021-05-12）
+- 新增 uni-badge 的 absolute 属性，支持定位
+- 新增 uni-badge 的 offset 属性，支持定位偏移
+- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点
+- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+
+- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式
+## 1.0.7（2021-05-07）
+- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug
+- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug
+- 新增 uni-badge 属性 custom-style， 支持自定义样式
+## 1.0.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
index 5af00511..6665b170 100644
--- a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
+++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
@@ -28,6 +28,7 @@
 	 */
 	export default {
 		name: 'UniBadge',
+		emits:['click'],
 		props: {
 			type: {
 				type: String,
diff --git a/uni_modules/uni-badge/package.json b/uni_modules/uni-badge/package.json
index bb166ea4..29a4edca 100644
--- a/uni_modules/uni-badge/package.json
+++ b/uni_modules/uni-badge/package.json
@@ -1,84 +1,84 @@
-{
-  "id": "uni-badge",
-  "displayName": "uni-badge 数字角标",
-  "version": "1.1.4",
-  "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
-  "keywords": [
-    "",
-    "badge",
-    "uni-ui",
-    "uniui",
-    "数字角标",
-    "徽章"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-badge",
+  "displayName": "uni-badge 数字角标",
+  "version": "1.1.5",
+  "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
+  "keywords": [
+    "",
+    "badge",
+    "uni-ui",
+    "uniui",
+    "数字角标",
+    "徽章"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-calendar/changelog.md b/uni_modules/uni-calendar/changelog.md
index b63828fc..811456f8 100644
--- a/uni_modules/uni-calendar/changelog.md
+++ b/uni_modules/uni-calendar/changelog.md
@@ -1,4 +1,6 @@
-## 1.3.16（2021-05-12）
-- 新增 组件示例地址
+## 1.4.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.3.16（2021-05-12）
+- 新增 组件示例地址
 ## 1.3.15（2021-02-04）
 - 调整为uni_modules目录规范 
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
index 55fe14d0..e563ced3 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -52,6 +52,7 @@
 
 <script>
 	export default {
+		emits:['change'],
 		props: {
 			weeks: {
 				type: Object,
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
index b2d464c6..f1f99e47 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -87,6 +87,7 @@
 		components: {
 			calendarItem
 		},
+		emits:['close','confirm','change','monthSwitch'],
 		props: {
 			date: {
 				type: String,
diff --git a/uni_modules/uni-calendar/package.json b/uni_modules/uni-calendar/package.json
index 5f1cfb31..46279f79 100644
--- a/uni_modules/uni-calendar/package.json
+++ b/uni_modules/uni-calendar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-calendar",
   "displayName": "uni-calendar 日历",
-  "version": "1.3.16",
+  "version": "1.4.0",
   "description": "日历组件",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-card/changelog.md b/uni_modules/uni-card/changelog.md
index 409deaca..c84f1ace 100644
--- a/uni_modules/uni-card/changelog.md
+++ b/uni_modules/uni-card/changelog.md
@@ -1,5 +1,7 @@
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.1.8（2021-07-01）
 - 优化 图文卡片无图片加载时，提供占位图标
 - 新增 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
diff --git a/uni_modules/uni-card/components/uni-card/uni-card.vue b/uni_modules/uni-card/components/uni-card/uni-card.vue
index 2587f98d..7458b777 100644
--- a/uni_modules/uni-card/components/uni-card/uni-card.vue
+++ b/uni_modules/uni-card/components/uni-card/uni-card.vue
@@ -78,6 +78,7 @@
 	 */
 	export default {
 		name: 'UniCard',
+		emits:['click'],
 		props: {
 			title: {
 				type: String,
diff --git a/uni_modules/uni-card/package.json b/uni_modules/uni-card/package.json
index f0dba426..79533648 100644
--- a/uni_modules/uni-card/package.json
+++ b/uni_modules/uni-card/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-card",
   "displayName": "uni-card 卡片",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Card 组件，提供常见的卡片样式。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-collapse/changelog.md b/uni_modules/uni-collapse/changelog.md
index 3088bc25..1f54a2ed 100644
--- a/uni_modules/uni-collapse/changelog.md
+++ b/uni_modules/uni-collapse/changelog.md
@@ -1,16 +1,20 @@
-## 1.2.2（2021-07-21）
-- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
-## 1.2.1（2021-07-21）
-- 优化 组件示例
-## 1.2.0（2021-07-21）
-- 新增 组件折叠动画
-- 新增 value\v-model 属性 ，动态修改面板折叠状态
-- 新增 title 插槽 ，可定义面板标题
-- 新增 border 属性 ，显示隐藏面板内容分隔线
-- 新增 title-border 属性 ，显示隐藏面板标题分隔线
-- 修复 resize 方法失效的Bug
-- 修复 change 事件返回参数不正确的Bug
-- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
 ## 1.1.7（2021-05-12）
 - 新增 组件示例地址
 ## 1.1.6（2021-02-05）
diff --git a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
index 8e1e5bef..6867832b 100644
--- a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
+++ b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -119,16 +119,21 @@
 			this.collapse = this.getCollapse()
 			this.oldHeight = 0
 		},
+		// #ifndef VUE3
 		// TODO vue2
 		destroyed() {
 			if (this.__isUnmounted) return
 			this.uninstall()
 		},
+		// #endif
+		// #ifdef VUE3
 		// TODO vue3
 		unmounted() {
 			this.__isUnmounted = true
 			this.uninstall()
 		},
+		// #endif
+		
 		mounted() {
 			
 			if (!this.collapse) return
diff --git a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
index 03c1f68c..f16d8fa7 100644
--- a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
+++ b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
@@ -14,6 +14,7 @@
 	 */
 	export default {
 		name: 'uniCollapse',
+		emits:['change','activeItem','input','update:modelValue'],
 		props: {
 			value: {
 				type: [String, Array],
diff --git a/uni_modules/uni-collapse/package.json b/uni_modules/uni-collapse/package.json
index c70ed4c3..5373020c 100644
--- a/uni_modules/uni-collapse/package.json
+++ b/uni_modules/uni-collapse/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-collapse",
   "displayName": "uni-collapse 折叠面板",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-collapse/readme.md b/uni_modules/uni-collapse/readme.md
index fd877207..b3c0b3a2 100644
--- a/uni_modules/uni-collapse/readme.md
+++ b/uni_modules/uni-collapse/readme.md
@@ -265,10 +265,10 @@ export default {
 
 ### Collapse Slots
 
-|	插槽名 	| 说明 |
-| :-:			| :-:		  |
-|	default	|默认插槽|
-|	title	|面板标题插槽，如使用此插槽禁用样式效果将失效|
+|插槽名|说明|
+|:-:| :-:|
+|default|默认插槽|
+|title|面板标题插槽，如使用此插槽禁用样式效果将失效|
 
 ## 组件示例
 
diff --git a/uni_modules/uni-combox/changelog.md b/uni_modules/uni-combox/changelog.md
index 40654e61..77cedbd7 100644
--- a/uni_modules/uni-combox/changelog.md
+++ b/uni_modules/uni-combox/changelog.md
@@ -1,5 +1,7 @@
-## 0.0.6（2021-05-12）
-- 新增 组件示例地址
+## 0.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.6（2021-05-12）
+- 新增 组件示例地址
 ## 0.0.5（2021-04-21）
 - 优化 添加依赖 uni-icons, 导入后自动下载依赖
 ## 0.0.4（2021-02-05）
diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
index 5f753a67..3c201d3a 100644
--- a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
+++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -35,6 +35,7 @@
 	 */
 	export default {
 		name: 'uniCombox',
+		emits:['input','update:modelValue'],
 		props: {
 			label: {
 				type: String,
@@ -58,10 +59,18 @@
 				type: String,
 				default: '无匹配项'
 			},
+			// #ifndef VUE3
 			value: {
 				type: [String, Number],
 				default: ''
-			}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
 		},
 		data() {
 			return {
@@ -88,12 +97,22 @@
 			}
 		},
 		watch: {
+			// #ifndef VUE3
 			value: {
 				handler(newVal) {
 					this.inputVal = newVal
 				},
 				immediate: true
-			}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
 		},
 		methods: {
 			toggleSelector() {
@@ -111,10 +130,12 @@
 				this.inputVal = this.filterCandidates[index]
 				this.showSelector = false
 				this.$emit('input', this.inputVal)
+				this.$emit('update:modelValue', this.inputVal)
 			},
 			onInput() {
 				setTimeout(() => {
 					this.$emit('input', this.inputVal)
+					this.$emit('update:modelValue', this.inputVal)
 				})
 			}
 		}
diff --git a/uni_modules/uni-combox/package.json b/uni_modules/uni-combox/package.json
index 27dd81ea..951a9015 100644
--- a/uni_modules/uni-combox/package.json
+++ b/uni_modules/uni-combox/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-combox",
   "displayName": "uni-combox 组合框",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "可以选择也可以输入的表单项 ",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md
index 78473610..32427909 100644
--- a/uni_modules/uni-countdown/changelog.md
+++ b/uni_modules/uni-countdown/changelog.md
@@ -1,8 +1,12 @@
-## 1.0.5（2021-06-18）
-- 修复 uni-countdown 重复赋值跳两秒的 bug
-## 1.0.4（2021-05-12）
-- 新增 组件示例地址
-## 1.0.3（2021-05-08）
-- 修复 uni-countdown 不能控制倒计时的 bug
-## 1.0.2（2021-02-04）
-- 调整为uni_modules目录规范
+## 1.1.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-06-18）
+- 修复 uni-countdown 重复赋值跳两秒的 bug
+## 1.0.4（2021-05-12）
+- 新增 组件示例地址
+## 1.0.3（2021-05-08）
+- 修复 uni-countdown 不能控制倒计时的 bug
+## 1.0.2（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
index a6eb5fba..f57e9e97 100644
--- a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -34,6 +34,7 @@
 	 */
 	export default {
 		name: 'UniCountdown',
+		emits:['timeup'],
 		props: {
 			showDay: {
 				type: Boolean,
@@ -126,9 +127,16 @@
 			this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
 			this.countDown()
 		},
-		beforeDestroy() {
+		// #ifndef VUE3
+		destroyed() {
 			clearInterval(this.timer)
 		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			clearInterval(this.timer)
+		},
+		// #endif
 		methods: {
 			toSeconds(timestamp, day, hours, minutes, seconds) {
 				if (timestamp) {
diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json
index f62f8c40..d55b8bcb 100644
--- a/uni_modules/uni-countdown/package.json
+++ b/uni_modules/uni-countdown/package.json
@@ -1,82 +1,82 @@
-{
-  "id": "uni-countdown",
-  "displayName": "uni-countdown 倒计时",
-  "version": "1.0.5",
-  "description": "CountDown 倒计时组件",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "countdown",
-    "倒计时"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-countdown",
+  "displayName": "uni-countdown 倒计时",
+  "version": "1.1.1",
+  "description": "CountDown 倒计时组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "countdown",
+    "倒计时"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md
index 179ee067..3a3df4a0 100644
--- a/uni_modules/uni-data-checkbox/changelog.md
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -1,5 +1,9 @@
-## 0.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.2.2（2021-07-30）
+- 优化 在uni-forms组件，与label不对齐的问题
+## 0.2.1（2021-07-27）
+- 修复 单选默认值为0不能选中的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.1.11（2021-07-06）
 - 优化 删除无用日志
 ## 0.1.10（2021-07-05）
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
index 57b82635..43bdb728 100644
--- a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-data-checklist">
+	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
 		<template v-if="!isLocal">
 			<view class="uni-data-loading">
 				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18" :content-text="contentText"></uni-load-more>
@@ -74,12 +74,13 @@
 		// 	prop: 'modelValue',
 		// 	event: 'update:modelValue'
 		// },
+		emits:['input','update:modelValue','change'],
 		props: {
 			mode: {
 				type: String,
 				default: 'default'
 			},
-			
+
 			multiple: {
 				type: Boolean,
 				default: false
@@ -179,12 +180,15 @@
 				styles: {
 					selectedColor: '#007aff',
 					selectedTextColor: '#333',
-				}
+				},
+				isTop:0
 			};
 		},
 		computed:{
 			dataValue(){
-				return this.value || this.modelValue
+				if(this.value === '')return this.modelValue
+				if(this.modelValue === '') return this.value
+				return this.value
 			}
 		},
 		created() {
@@ -192,7 +196,8 @@
 			this.formItem = this.getForm('uniFormsItem')
 			// this.formItem && this.formItem.setValue(this.value)
 
-			if (this.formItem) {
+			if (this.formItem) {
+				this.isTop = 6
 				if (this.formItem.name) {
 					this.rename = this.formItem.name
 					this.form.inputChildrens.push(this)
@@ -247,7 +252,7 @@
 
 				if (this.multiple) {
 					this.range.forEach(item => {
-						
+
 						if (values.includes(item[this.map.value] + '')) {
 							detail.value.push(item[this.map.value])
 							detail.data.push(item)
@@ -334,7 +339,7 @@
 							}
 						}
 					}
-					this.setStyles(item, index)  
+					this.setStyles(item, index)
 					list[index] = item
 				})
 				return list
@@ -388,7 +393,7 @@
 			setStyleIcon(item) {
 				let styles = {}
 				let classles = ''
-				let selectedColor = this.selectedColor?this.selectedColor:'#007aff' 
+				let selectedColor = this.selectedColor?this.selectedColor:'#007aff'
 				styles['background-color'] = item.selected?selectedColor:'#fff'
 				styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
 
@@ -414,7 +419,7 @@
 				if(!item.selected && item.disabled){
 					styles.color = '#999'
 				}
-				
+
 				for (let i in styles) {
 					classles += `${i}:${styles[i]};`
 				}
@@ -503,9 +508,9 @@
 						border-right-color: #007aff;
 						border-right-style: solid;
 						border-bottom-width:1px;
-						border-bottom-color: #007aff; 
+						border-bottom-color: #007aff;
 						border-bottom-style: solid;
-						height: 12px; 
+						height: 12px;
 						width: 6px;
 						left: -5px;
 						transform-origin: center;
@@ -622,7 +627,7 @@
 							color: $checked-color;
 						}
 						// 选中禁用
-						&.is-disable { 
+						&.is-disable {
 							.checkbox__inner {
 								opacity: $disable;
 							}
diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json
index 533abad7..75915418 100644
--- a/uni_modules/uni-data-checkbox/package.json
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -1,13 +1,13 @@
 {
   "id": "uni-data-checkbox",
   "displayName": "uni-data-checkbox 数据选择器",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "通过数据驱动的单选框和复选框",
   "keywords": [
     "uni-ui",
-    "uniui",
     "checkbox",
-    "",
+    "单选",
+    "多选",
     "单选多选"
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
diff --git a/uni_modules/uni-drawer/changelog.md b/uni_modules/uni-drawer/changelog.md
index ee1eb7a9..4077ce1c 100644
--- a/uni_modules/uni-drawer/changelog.md
+++ b/uni_modules/uni-drawer/changelog.md
@@ -1,5 +1,7 @@
-## 1.1.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.7（2021-05-12）
 - 新增 组件示例地址
 ## 1.0.6（2021-02-04）
diff --git a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
index 383cbc6e..253d7f50 100644
--- a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
+++ b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
@@ -33,6 +33,7 @@
 			keypress
 			// #endif
 		},
+		emits:['change'],
 		props: {
 			/**
 			 * 显示模式（左、右），只在初始化生效
diff --git a/uni_modules/uni-drawer/package.json b/uni_modules/uni-drawer/package.json
index bf7b5c52..446171bc 100644
--- a/uni_modules/uni-drawer/package.json
+++ b/uni_modules/uni-drawer/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-drawer",
   "displayName": "uni-drawer 抽屉",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "抽屉式导航，用于展示侧滑菜单，侧滑导航。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
index 2b4826b2..102ea8b5 100644
--- a/uni_modules/uni-easyinput/changelog.md
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -1,5 +1,9 @@
-## 0.1.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 0.1.1
+- 优化 errorMessage 属性支持 Boolean 类型
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.0.16（2021-06-29）
 - 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
 ## 0.0.15（2021-06-21）
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
index 5de849c6..67e76287 100644
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -79,6 +79,7 @@
 
 	export default {
 		name: 'uni-easyinput',
+		emits:['click','iconClick','update:modelValue','input','focus','blur','confirm'],
 		model:{
 			prop:'modelValue',
 			event:'update:modelValue'
@@ -152,7 +153,7 @@
 				}
 			},
 			errorMessage:{
-				type:String,
+				type:[String,Boolean],
 				default:''
 			}
 		},
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
index 3463152b..ec3dcb9a 100644
--- a/uni_modules/uni-easyinput/package.json
+++ b/uni_modules/uni-easyinput/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-easyinput",
   "displayName": "uni-easyinput 增强输入框",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Easyinput 组件是对原生input组件的增强",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md
index ae232591..1895c7d7 100644
--- a/uni_modules/uni-fab/changelog.md
+++ b/uni_modules/uni-fab/changelog.md
@@ -1,5 +1,7 @@
-## 1.0.7（2021-05-12）
-- 新增 组件示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
 ## 1.0.6（2021-02-05）
 - 调整为uni_modules目录规范
 - 优化 按钮背景色调整
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
index e077eae7..599a2d49 100644
--- a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -67,6 +67,7 @@
 	 */
 	export default {
 		name: 'UniFab',
+		emits:['fabClick','trigger'],
 		props: {
 			pattern: {
 				type: Object,
diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json
index e4816d6e..9e71b42a 100644
--- a/uni_modules/uni-fab/package.json
+++ b/uni_modules/uni-fab/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-fab",
   "displayName": "uni-fab 悬浮按钮",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-file-picker/changelog.md b/uni_modules/uni-file-picker/changelog.md
index 31a66036..43ad48a6 100644
--- a/uni_modules/uni-file-picker/changelog.md
+++ b/uni_modules/uni-file-picker/changelog.md
@@ -1,5 +1,18 @@
-## 0.2.1（2021-07-26）
-- 修复 vue3下双向绑定失效的Bug
+## 0.2.9（2021-08-03）
+- 修复 auto-upload 属性失效的Bug
+## 0.2.8（2021-07-31）
+- 修复 fileExtname属性不指定值报错的Bug
+## 0.2.7（2021-07-31）
+- 修复 在某种场景下图片不回显的Bug
+## 0.2.6（2021-07-30）
+- 修复 return-type为object下，返回值不正确的Bug
+## 0.2.5（2021-07-30）
+- 修复（重要） H5 平台下如果和uni-forms组件一同使用导致页面卡死的问题
+## 0.2.3（2021-07-28）
+- 优化 调整示例代码
+## 0.2.2（2021-07-27）
+- 修复 vue3 下赋值错误的Bug
+- 优化 h5平台下上传文件导致页面卡死的问题
 ## 0.2.0（2021-07-13）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.1.1（2021-07-02）
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js b/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
index 4efc5f54..9c4af20f 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
@@ -1,142 +1,224 @@
-'use strict';
-
-// Object.defineProperty(exports, '__esModule', { value: true });
-
+'use strict';
+
 const ERR_MSG_OK = 'chooseAndUploadFile:ok';
 const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
+
 function chooseImage(opts) {
-		const { count, sizeType = ['original','compressed'], sourceType = ['album', 'camera'], extension } = opts
-    return new Promise((resolve, reject) => {
-        uni.chooseImage({
-            count,
-            sizeType,
-            sourceType,
-            extension,
-            success(res) {
-                resolve(normalizeChooseAndUploadFileRes(res, 'image'));
-            },
-            fail(res) {
-                reject({
-                    errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
-                });
-            },
-        });
-    });
+	const {
+		count,
+		sizeType = ['original', 'compressed'],
+		sourceType = ['album', 'camera'],
+		extension
+	} = opts
+	return new Promise((resolve, reject) => {
+		uni.chooseImage({
+			count,
+			sizeType,
+			sourceType,
+			extension,
+			success(res) {
+				resolve(normalizeChooseAndUploadFileRes(res, 'image'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
 }
+
 function chooseVideo(opts) {
-    const { camera, compressed, maxDuration, sourceType = ['album', 'camera'], extension } = opts;
-    return new Promise((resolve, reject) => {
-        uni.chooseVideo({
-            camera,
-            compressed,
-            maxDuration,
-            sourceType,
-            extension,
-            success(res) {
-                const { tempFilePath, duration, size, height, width } = res;
-                resolve(normalizeChooseAndUploadFileRes({
-                    errMsg: 'chooseVideo:ok',
-                    tempFilePaths: [tempFilePath],
-                    tempFiles: [
-                        {
-                            name: (res.tempFile && res.tempFile.name) || '',
-                            path: tempFilePath,
-                            size,
-                            type: (res.tempFile && res.tempFile.type) || '',
-                            width,
-                            height,
-                            duration,
-                            fileType: 'video',
-                            cloudPath: '',
-                        },
-                    ],
-                }, 'video'));
-            },
-            fail(res) {
-                reject({
-                    errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
-                });
-            },
-        });
-    });
+	const {
+		camera,
+		compressed,
+		maxDuration,
+		sourceType = ['album', 'camera'],
+		extension
+	} = opts;
+	return new Promise((resolve, reject) => {
+		uni.chooseVideo({
+			camera,
+			compressed,
+			maxDuration,
+			sourceType,
+			extension,
+			success(res) {
+				const {
+					tempFilePath,
+					duration,
+					size,
+					height,
+					width
+				} = res;
+				resolve(normalizeChooseAndUploadFileRes({
+					errMsg: 'chooseVideo:ok',
+					tempFilePaths: [tempFilePath],
+					tempFiles: [
+					{
+						name: (res.tempFile && res.tempFile.name) || '',
+						path: tempFilePath,
+						size,
+						type: (res.tempFile && res.tempFile.type) || '',
+						width,
+						height,
+						duration,
+						fileType: 'video',
+						cloudPath: '',
+					}, ],
+				}, 'video'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
 }
+
 function chooseAll(opts) {
-    const { count, extension } = opts;
-    return new Promise((resolve, reject) => {
-        let chooseFile = uni.chooseFile;
-        if (typeof wx !== 'undefined' &&
-            typeof wx.chooseMessageFile === 'function') {
-            chooseFile = wx.chooseMessageFile;
-        }
-        if (typeof chooseFile !== 'function') {
-            return reject({
-                errMsg: ERR_MSG_FAIL + ' 请指定 type 类型，该平台仅支持选择 image 或 video。',
-            });
-        }
-        chooseFile({
-            type: 'all',
-            count,
-            extension,
-            success(res) {
-                resolve(normalizeChooseAndUploadFileRes(res));
-            },
-            fail(res) {
-                reject({
-                    errMsg: res.errMsg.replace('chooseFile:fail', ERR_MSG_FAIL),
-                });
-            },
-        });
-    });
+	const {
+		count,
+		extension
+	} = opts;
+	return new Promise((resolve, reject) => {
+		let chooseFile = uni.chooseFile;
+		if (typeof wx !== 'undefined' &&
+			typeof wx.chooseMessageFile === 'function') {
+			chooseFile = wx.chooseMessageFile;
+		}
+		if (typeof chooseFile !== 'function') {
+			return reject({
+				errMsg: ERR_MSG_FAIL + ' 请指定 type 类型，该平台仅支持选择 image 或 video。',
+			});
+		}
+		chooseFile({
+			type: 'all',
+			count,
+			extension,
+			success(res) {
+				resolve(normalizeChooseAndUploadFileRes(res));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseFile:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
 }
+
 function normalizeChooseAndUploadFileRes(res, fileType) {
-    res.tempFiles.forEach((item, index) => {
-        if (!item.name) {
-            item.name = item.path.substring(item.path.lastIndexOf('/') + 1);
-        }
-        if (fileType) {
-            item.fileType = fileType;
-        }
-        item.cloudPath =
-            Date.now() + '_' + index + item.name.substring(item.name.lastIndexOf('.'));
-    });
-    // wx.chooseMessageFile
-    if (!res.tempFilePaths) {
-        res.tempFilePaths = res.tempFiles.map((file) => file.path);
-    }
-    return res;
+	res.tempFiles.forEach((item, index) => {
+		if (!item.name) {
+			item.name = item.path.substring(item.path.lastIndexOf('/') + 1);
+		}
+		if (fileType) {
+			item.fileType = fileType;
+		}
+		item.cloudPath =
+			Date.now() + '_' + index + item.name.substring(item.name.lastIndexOf('.'));
+	});
+	if (!res.tempFilePaths) {
+		res.tempFilePaths = res.tempFiles.map((file) => file.path);
+	}
+	return res;
 }
-function uploadCloudFiles(res, max = 5, onUploadProgress) {}
-function uploadFiles(choosePromise, { onChooseFile, onUploadProgress }) {
-    return choosePromise
-        .then((res) => {
-        if (onChooseFile) {
-            const customChooseRes = onChooseFile(res);
-            if (typeof customChooseRes !== 'undefined') {
-                return Promise.resolve(customChooseRes).then((chooseRes) => typeof chooseRes === 'undefined' ? res : chooseRes);
-            }
-        }
-        return res;
-    })
-        .then((res) => {
-        if (res === false) {
-            return {
-                errMsg: ERR_MSG_OK,
-                tempFilePaths: [],
-                tempFiles: [],
-            };
-        }
-		return res
-        // return uploadCloudFiles(res, 5, onUploadProgress);
-    })
+
+function uploadCloudFiles(files, max = 5, onUploadProgress) {
+	files = JSON.parse(JSON.stringify(files))
+	const len = files.length
+	let count = 0
+	let self = this
+	return new Promise(resolve => {
+		while (count < max) {
+			next()
+		}
+
+		function next() {
+			let cur = count++
+			if (cur >= len) {
+				!files.find(item => !item.url && !item.errMsg) && resolve(files)
+				return
+			}
+			const fileItem = files[cur]
+			const index = self.files.findIndex(v => v.uuid === fileItem.uuid)
+			fileItem.url = ''
+			delete fileItem.errMsg
+
+			uniCloud
+				.uploadFile({
+					filePath: fileItem.path,
+					cloudPath: fileItem.cloudPath,
+					fileType: fileItem.fileType,
+					onUploadProgress: res => {
+						res.index = index
+						onUploadProgress && onUploadProgress(res)
+					}
+				})
+				.then(res => {
+					fileItem.url = res.fileID
+					fileItem.index = index
+					if (cur < len) {
+						next()
+					}
+				})
+				.catch(res => {
+					fileItem.errMsg = res.errMsg || res.message
+					fileItem.index = index
+					if (cur < len) {
+						next()
+					}
+				})
+		}
+	})
 }
-function chooseAndUploadFile(opts = { type: 'all' }) {
-    if (opts.type === 'image') {
-        return uploadFiles(chooseImage(opts), opts);
-    }
-    else if (opts.type === 'video') {
-        return uploadFiles(chooseVideo(opts), opts);
-    }
-    return uploadFiles(chooseAll(opts), opts);
-}
-
-export {chooseAndUploadFile};
+
+
+
+
+
+function uploadFiles(choosePromise, {
+	onChooseFile,
+	onUploadProgress
+}) {
+	return choosePromise
+		.then((res) => {
+			if (onChooseFile) {
+				const customChooseRes = onChooseFile(res);
+				if (typeof customChooseRes !== 'undefined') {
+					return Promise.resolve(customChooseRes).then((chooseRes) => typeof chooseRes === 'undefined' ?
+						res : chooseRes);
+				}
+			}
+			return res;
+		})
+		.then((res) => {
+			if (res === false) {
+				return {
+					errMsg: ERR_MSG_OK,
+					tempFilePaths: [],
+					tempFiles: [],
+				};
+			}
+			return res
+		})
+}
+
+function chooseAndUploadFile(opts = {
+	type: 'all'
+}) {
+	if (opts.type === 'image') {
+		return uploadFiles(chooseImage(opts), opts);
+	}
+	else if (opts.type === 'video') {
+		return uploadFiles(chooseVideo(opts), opts);
+	}
+	return uploadFiles(chooseAll(opts), opts);
+}
+
+export {
+	chooseAndUploadFile,
+	uploadCloudFiles
+};
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index 7b126375..6d2c3ec9 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -4,18 +4,9 @@
 			<text class="file-title">{{ title }}</text>
 			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
 		</view>
-		<upload-image
-			v-if="fileMediatype === 'image' && showType === 'grid'"
-			:readonly="readonly"
-			:image-styles="imageStyles"
-			:files-list="filesList"
-			:limit="limitLength"
-			:disablePreview="disablePreview"
-			:delIcon="delIcon"
-			@uploadFiles="uploadFiles"
-			@choose="choose"
-			@delFile="delFile"
-		>
+		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
+			:image-styles="imageStyles" :files-list="filesList" :limit="limitLength" :disablePreview="disablePreview"
+			:delIcon="delIcon" @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
 			<slot>
 				<view class="is-add">
 					<view class="icon-add"></view>
@@ -23,718 +14,605 @@
 				</view>
 			</slot>
 		</upload-image>
-		<upload-file
-			v-if="fileMediatype !== 'image' || showType !== 'grid'"
-			:readonly="readonly"
-			:list-styles="listStyles"
-			:files-list="filesList"
-			:showType="showType"
-			:delIcon="delIcon"
-			@uploadFiles="uploadFiles"
-			@choose="choose"
-			@delFile="delFile"
-		>
+		<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
+			:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
+			@uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
 			<slot><button type="primary" size="mini">选择文件</button></slot>
 		</upload-file>
 	</view>
 </template>
 
 <script>
-	import {chooseAndUploadFile} from './choose-and-upload-file.js'
+	import {
+		chooseAndUploadFile,
+		uploadCloudFiles
+	} from './choose-and-upload-file.js'
+	import {
+		get_file_ext,
+		get_extname,
+		get_files_and_is_max,
+		get_file_info,
+		get_file_data
+	} from './utils.js'
 	import uploadImage from './upload-image.vue'
 	import uploadFile from './upload-file.vue'
 	let fileInput = null
-/**
- * FilePicker 文件选择上传
- * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
- * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
- * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
- * @property {Boolean}	disabled=[true|false]	组件禁用
- * 	@value true 	禁用
- * 	@value false 	取消禁用
- * @property {Boolean}	readonly=[true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
- * 	@value true 	只读
- * 	@value false 	取消只读
- * @property {String}	return-type=[array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
- * 	@value array	规定 value 属性的类型为数组
- * 	@value object	规定 value 属性的类型为对象
- * @property {Boolean}	disable-preview=[true|false]	禁用图片预览，仅 mode:grid 时生效
- * 	@value true 	禁用图片预览
- * 	@value false 	取消禁用图片预览
- * @property {Boolean}	del-icon=[true|false]	是否显示删除按钮
- * 	@value true 	显示删除按钮
- * 	@value false 	不显示删除按钮
- * @property {Boolean}	auto-upload=[true|false]	是否自动上传，值为true则只触发@select,可自行上传
- * 	@value true 	自动上传
- * 	@value false 	取消自动上传
- * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
- * @property {String}	title	组件标题，右侧显示上传计数
- * @property {String}	mode=[list|grid]	选择文件后的文件列表样式
- * 	@value list 	列表显示
- * 	@value grid 	宫格显示
- * @property {String}	file-mediatype=[image|video|all]	选择文件类型
- * 	@value image	只选择图片
- * 	@value video	只选择视频
- * 	@value all		选择所有文件
- * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
- * @property {Object}	list-style	mode:list 时的样式
- * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
- * @event {Function} select 	选择文件后触发
- * @event {Function} progress 文件上传时触发
- * @event {Function} success 	上传成功触发
- * @event {Function} fail 		上传失败触发
- * @event {Function} delete 	文件从列表移除时触发
- */
-export default {
-	name: 'uniFilePicker',
-	components: {
-		uploadImage,
-		uploadFile
-	},
-	props: {
-		// #ifdef VUE3
-		modelValue: {
-			type: [Array, Object],
-			default() {
-				return []
-			}
-		},
-		// #endif
+	/**
+	 * FilePicker 文件选择上传
+	 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+	 * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+	 * @property {Boolean}	disabled = [true|false]	组件禁用
+	 * 	@value true 	禁用
+	 * 	@value false 	取消禁用
+	 * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+	 * 	@value true 	只读
+	 * 	@value false 	取消只读
+	 * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
+	 * 	@value array	规定 value 属性的类型为数组
+	 * 	@value object	规定 value 属性的类型为对象
+	 * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+	 * 	@value true 	禁用图片预览
+	 * 	@value false 	取消禁用图片预览
+	 * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+	 * 	@value true 	显示删除按钮
+	 * 	@value false 	不显示删除按钮
+	 * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+	 * 	@value true 	自动上传
+	 * 	@value false 	取消自动上传
+	 * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+	 * @property {String}	title	组件标题，右侧显示上传计数
+	 * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+	 * 	@value list 	列表显示
+	 * 	@value grid 	宫格显示
+	 * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+	 * 	@value image	只选择图片
+	 * 	@value video	只选择视频
+	 * 	@value all		选择所有文件
+	 * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @property {Object}	list-style	mode:list 时的样式
+	 * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @event {Function} select 	选择文件后触发
+	 * @event {Function} progress 文件上传时触发
+	 * @event {Function} success 	上传成功触发
+	 * @event {Function} fail 		上传失败触发
+	 * @event {Function} delete 	文件从列表移除时触发
+	 */
+	export default {
+		name: 'uniFilePicker',
+		components: {
+			uploadImage,
+			uploadFile
+		},
+		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
+		props: {
+			// #ifdef VUE3
+			modelValue: {
+				type: [Array, Object],
+				default () {
+					return []
+				}
+			},
+			// #endif
 
-		// #ifndef VUE3
-		value: {
-			type: [Array, Object],
-			default() {
-				return []
-			}
-		},
-		// #endif
+			// #ifndef VUE3
+			value: {
+				type: [Array, Object],
+				default () {
+					return []
+				}
+			},
+			// #endif
 
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		disablePreview: {
-			type: Boolean,
-			default: false
-		},
-		delIcon: {
-			type: Boolean,
-			default: true
-		},
-		// 自动上传
-		autoUpload: {
-			type: Boolean,
-			default: true
-		},
-		// 最大选择个数 ，h5只能限制单选或是多选
-		limit: {
-			type: [Number, String],
-			default: 9
-		},
-		// 列表样式 grid | list | list-card
-		mode: {
-			type: String,
-			default: 'grid'
-		},
-		// 选择文件类型  image/video/all
-		fileMediatype: {
-			type: String,
-			default: 'image'
-		},
-		// 文件类型筛选
-		fileExtname: {
-			type: [Array, String],
-			default() {
-				return []
-			}
-		},
-		title: {
-			type: String,
-			default: ''
-		},
-		listStyles: {
-			type: Object,
-			default() {
-				return {
-					// 是否显示边框
-					border: true,
-					// 是否显示分隔线
-					dividline: true,
-					// 线条样式
-					borderStyle: {}
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			disablePreview: {
+				type: Boolean,
+				default: false
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			// 自动上传
+			autoUpload: {
+				type: Boolean,
+				default: true
+			},
+			// 最大选择个数 ，h5只能限制单选或是多选
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			// 列表样式 grid | list | list-card
+			mode: {
+				type: String,
+				default: 'grid'
+			},
+			// 选择文件类型  image/video/all
+			fileMediatype: {
+				type: String,
+				default: 'image'
+			},
+			// 文件类型筛选
+			fileExtname: {
+				type: [Array, String],
+				default () {
+					return []
 				}
-			}
-		},
-		imageStyles: {
-			type: Object,
-			default() {
-				return {
-					width: 'auto',
-					height: 'auto'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			listStyles: {
+				type: Object,
+				default () {
+					return {
+						// 是否显示边框
+						border: true,
+						// 是否显示分隔线
+						dividline: true,
+						// 线条样式
+						borderStyle: {}
+					}
+				}
+			},
+			imageStyles: {
+				type: Object,
+				default () {
+					return {
+						width: 'auto',
+						height: 'auto'
+					}
+				}
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			returnType: {
+				type: String,
+				default: 'array'
+			},
+			sizeType: {
+				type: Array,
+				default () {
+					return ['original', 'compressed']
 				}
 			}
 		},
-		readonly: {
-			type: Boolean,
-			default: false
-		},
-		returnType: {
-			type: String,
-			default: 'array'
-		},
-		sizeType:{
-			type: Array,
-			default(){
-				return ['original','compressed']
+		data() {
+			return {
+				files: [],
+				localValue: []
 			}
-		}
-	},
-	watch: {
-		// #ifndef VUE3
-		value: {
-			handler(newVal) {
-				this.setValue(newVal)
-			},
-			immediate: true
 		},
-		// #endif
-		// #ifdef VUE3
-		modelValue:{
-			handler(newVal) {
-				this.setValue(newVal)
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal)
+				},
+				immediate: true
 			},
-			immediate: true
-		},
-		// #endif
-
-	},
-	data() {
-		return {
-			files: [],
-		}
-	},
-	computed: {
-		filesList() {
-			let files = []
-			this.files.forEach(v => {
-				files.push(v)
-			})
-			return files
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal)
+				},
+				immediate: true
+			},
+			// #endif
 		},
-		showType() {
-			if (this.fileMediatype === 'image') {
-				return this.mode
+		computed: {
+			filesList() {
+				let files = []
+				this.files.forEach(v => {
+					files.push(v)
+				})
+				return files
+			},
+			showType() {
+				if (this.fileMediatype === 'image') {
+					return this.mode
+				}
+				return 'list'
+			},
+			limitLength() {
+				if (this.returnType === 'object') {
+					return 1
+				}
+				if (!this.limit) {
+					return 1
+				}
+				if (this.limit >= 9) {
+					return 9
+				}
+				return this.limit
 			}
-			return 'list'
 		},
-		limitLength() {
-			if (this.returnType === 'object') {
-				return 1
+		created() {
+			// TODO 兼容不开通服务空间的情况
+			if (!(uniCloud.config && uniCloud.config.provider)) {
+				this.noSpace = true
+				uniCloud.chooseAndUploadFile = chooseAndUploadFile
 			}
-			if (!this.limit) {
-				return 1
-			}
-			if (this.limit >= 9) {
-				return 9
+			this.tempData = {}
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.form && this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
 			}
-			return this.limit
 		},
-		extname(){
-			if (!Array.isArray(this.fileExtname)) {
-				let extname = this.fileExtname.replace(/(\[|\])/g,'')
-				return extname.split(',')
-			} else {
-				return this.fileExtname
-			}
-			return []
-		}
-	},
-	created() {
-		// TODO 兼容不开通服务空间的情况
-		if(!(uniCloud.config && uniCloud.config.provider)){
-			this.noSpace = true
-			uniCloud.chooseAndUploadFile = chooseAndUploadFile
-		}
-		this.tempData = {}
-		this.form = this.getForm('uniForms')
-		this.formItem = this.getForm('uniFormsItem')
-		if (this.form && this.formItem) {
-			if (this.formItem.name) {
-				this.rename = this.formItem.name
-				this.form.inputChildrens.push(this)
-			}
-		}
-	},
-	methods: {
-		setValue(newVal){
-			let newFils = []
-			let newData = [].concat(newVal || [])
-			newData.forEach(v => {
-				const files = this.files.find(i => i.url === v.url)
-				const reg = /cloud:\/\/([\w.]+\/?)\S*/
-				if (!v.path) {
+		methods: {
+			setValue(newVal, oldVal) {
+				const newData = (v) => {
+					const files = this.files.find(i => i.url === v.url)
+					const reg = /cloud:\/\/([\w.]+\/?)\S*/
 					v.path = v.url
+					if (reg.test(v.url)) {
+						this.getTempFileURL(v, v.url)
+					}
+					return v
 				}
-				if (reg.test(v.url)) {
-					this.getTempFileURL(v, v.url)
-				}
-				newFils.push(files ? files : v)
-			})
-			let data  = null
-			if (this.returnType === 'object') {
-				data = this.backObject(newFils)[0]
-			} else {
-				data = this.backObject(newFils)
-			}
-			this.formItem && this.formItem.setValue(data)
-			if(newFils.length){
-				this.files = newFils
-			}
-		},
-		/**
-		 * 获取父元素实例
-		 */
-		getForm(name = 'uniForms') {
-			let parent = this.$parent;
-			let parentName = parent.$options.name;
-			while (parentName !== name) {
-				parent = parent.$parent;
-				if (!parent) return false;
-				parentName = parent.$options.name;
-			}
-			return parent;
-		},
-		/**
-		 * 继续上传
-		 */
-		upload() {
-			// TODO 先放弃这个实现 ，不能全部上传
-			// if (this.$uploadFiles) {
-			// 	this.$uploadFiles()
-			// } else {
-			// 	uni.showToast({
-			// 		title: '请先选择文件',
-			// 		icon: 'none'
-			// 	})
-			// }
-			let files = []
-			this.files.forEach((v, index) => {
-				if (v.status === 'ready' || v.status === 'error') {
-					files.push(Object.assign({}, v))
+				// let data = null
+				if (this.returnType === 'object') {
+					newData(newData)
+				} else {
+					newVal.forEach(v => {
+						newData(v)
+					})
 				}
-			})
-
-			this.uploadFiles(files)
-		},
-		/**
-		 * 选择文件
-		 */
-		choose() {
+				this.localValue = newVal
+				this.formItem && this.formItem.setValue(this.localValue)
+				this.files = [].concat(newVal || [])
+			},
 
-			if (this.disabled) return
-			if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType === 'array') {
-				uni.showToast({
-					title: `您最多选择 ${this.limitLength} 个文件`,
-					icon: 'none'
+			/**
+			 * 继续上传
+			 */
+			upload() {
+				let files = []
+				this.files.forEach((v, index) => {
+					if (v.status === 'ready' || v.status === 'error') {
+						files.push(Object.assign({}, v))
+					}
 				})
-				return
-			}
-			// uni.showActionSheet({
-			// 	itemList: ['填写 url 地址', '选择文件'],
-			// 	success: (res) => {
-			// 		if (res.tapIndex === 1) {
-			// 			this.chooseFiles()
-			// 		}
-			// 	},
-			// 	fail: function(res) {}
-			// });
-			this.chooseFiles()
-		},
 
-		/**
-		 * 选择文件并上传
-		 */
-		chooseFiles() {
+				this.uploadFiles(files)
+			},
+			/**
+			 * 选择文件
+			 */
+			choose() {
 
-			uniCloud
-				.chooseAndUploadFile({
-					type: this.fileMediatype,
-					compressed: false,
-					sizeType:this.sizeType,
-					// TODO 如果为空，video 有问题
-					extension: this.extname.length > 0 ? this.extname : undefined,
-					count: this.limitLength - this.files.length, //默认9
-					onChooseFile: async res => {
-						if ((Number(this.limitLength) === 1 && this.disablePreview && !this.disabled) || this.returnType === 'object') {
-							this.files = []
-						}
-						let filePaths = []
-						let files = []
-						if (this.extname && this.extname.length > 0) {
-							res.tempFiles.forEach(v => {
-								let fileFullName = this.getFileExt(v.name)
-								const extname = fileFullName.ext.toLowerCase()
-								if (this.extname.indexOf(extname) !== -1) {
-									files.push(v)
-									filePaths.push(v.path)
-								}
-							})
-							if (files.length !== res.tempFiles.length) {
-								uni.showToast({
-									title: `当前选择了${res.tempFiles.length}个文件 ，${res.tempFiles.length - files.length} 个文件格式不正确`,
-									icon: 'none',
-									duration: 5000
-								})
-							}
-						} else {
-							filePaths = res.tempFilePaths
-							files = res.tempFiles
-						}
+				if (this.disabled) return
+				if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
+					'array') {
+					uni.showToast({
+						title: `您最多选择 ${this.limitLength} 个文件`,
+						icon: 'none'
+					})
+					return
+				}
+				this.chooseFiles()
+			},
 
-						let currentData = []
-						for (let i = 0; i < files.length; i++) {
-							if (this.limitLength - this.files.length <= 0) break
-							files[i].uuid = Date.now()
-							let filedata = await this.getFileData(files[i], this.fileMediatype)
-							filedata.progress = 0
-							filedata.status = 'ready'
-							this.files.push(filedata)
-							currentData.push({...filedata,file:files[i]})
+			/**
+			 * 选择文件并上传
+			 */
+			chooseFiles() {
+				const _extname = get_extname(this.fileExtname)
+				// 获取后缀
+				uniCloud
+					.chooseAndUploadFile({
+						type: this.fileMediatype,
+						compressed: false,
+						sizeType: this.sizeType,
+						// TODO 如果为空，video 有问题
+						extension: _extname.length > 0 ? _extname : undefined,
+						count: this.limitLength - this.files.length, //默认9
+						onChooseFile: this.chooseFileCallback,
+						onUploadProgress: progressEvent => {
+							this.setProgress(progressEvent, progressEvent.index)
 						}
-						this.$emit('select', {
-							tempFiles: currentData,
-							tempFilePaths: filePaths
-						})
-						res.tempFiles = files
-						// 停止自动上传
-						if (!this.autoUpload || this.noSpace) {
-							res.tempFiles = []
-							// TODO 先放弃这个实现 ，不能全部上传
-							// return new Promise((resolve) => {
-							// 	this.$uploadFiles = () => {
-							// 		// this._is_uploading = true
-							// 		resolve(res)
-							// 	}
-							// })
-						}
-					},
-					onUploadProgress: progressEvent => {
-						this.setProgress(progressEvent, progressEvent.index)
-					}
-				})
-				.then(result => {
-					this.setSuccessAndError(result.tempFiles)
-				})
-				.catch(err => {
-					console.log('选择失败', err)
-				})
-		},
+					})
+					.then(result => {
+						this.setSuccessAndError(result.tempFiles)
+					})
+					.catch(err => {
+						console.log('选择失败', err)
+					})
+			},
 
-		/**
-		 * 批传
-		 * @param {Object} e
-		 */
-		uploadFiles(files) {
-			files = [].concat(files)
-			this.uploadCloudFiles(files, 5, res => {
-				this.setProgress(res, res.index, true)
-			})
-				.then(result => {
-					this.setSuccessAndError(result)
-				})
-				.catch(err => {
-					console.log('err', err)
-				})
-		},
+			/**
+			 * 选择文件回调
+			 * @param {Object} res
+			 */
+			async chooseFileCallback(res) {
+				const _extname = get_extname(this.fileExtname)
+				const is_one = (Number(this.limitLength) === 1 &&
+						this.disablePreview &&
+						!this.disabled) ||
+					this.returnType === 'object'
+				// 如果这有一个文件 ，需要清空本地缓存数据
+				if (is_one) {
+					this.files = []
+				}
 
-		/**
-		 * 成功或失败
-		 */
-		async setSuccessAndError(res, fn) {
-			let successData = []
-			let errorData = []
-			let tempFilePath = []
-			let errorTempFilePath = []
-			for (let i = 0; i < res.length; i++) {
-				// const index  = item.index
-				const item = res[i]
-				const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
-				if (index === -1 || !this.files) break
-				if (item.errMsg === 'request:fail') {
-					this.files[index].url = item.path
-					this.files[index].status = 'error'
-					this.files[index].errMsg = item.errMsg
-					// this.files[index].progress = -1
-					errorData.push(this.files[index])
-					errorTempFilePath.push(this.files[index].url)
-				} else {
-					this.files[index].errMsg = ''
-					this.files[index].url = item.url
-					this.files[index].status = 'success'
-					this.files[index].progress += 1
-					successData.push(this.files[index])
-					tempFilePath.push(this.files[index].url)
+				let {
+					filePaths,
+					files
+				} = get_files_and_is_max(res, _extname)
+				if (!(_extname && _extname.length > 0)) {
+					filePaths = res.tempFilePaths
+					files = res.tempFiles
 				}
-			}
 
-			if (successData.length > 0) {
-				this.setEmit()
-				// 状态改变返回
-				this.$emit('success', {
-					tempFiles: this.backObject(successData),
-					tempFilePaths: tempFilePath
+				let currentData = []
+				for (let i = 0; i < files.length; i++) {
+					if (this.limitLength - this.files.length <= 0) break
+					files[i].uuid = Date.now()
+					let filedata = await get_file_data(files[i], this.fileMediatype)
+					filedata.progress = 100
+					filedata.status = 'ready'
+					this.files.push(filedata)
+					currentData.push({
+						...filedata,
+						file: files[i]
+					})
+				}
+				this.$emit('select', {
+					tempFiles: currentData,
+					tempFilePaths: filePaths
 				})
-			}
+				res.tempFiles = files
+				// 停止自动上传
+				if (!this.autoUpload || this.noSpace) {
+					res.tempFiles = []
+				}
+			},
 
-			if (errorData.length > 0) {
-				this.$emit('fail', {
-					tempFiles: this.backObject(errorData),
-					tempFilePaths: errorTempFilePath
-				})
-			}
-		},
+			/**
+			 * 批传
+			 * @param {Object} e
+			 */
+			uploadFiles(files) {
+				files = [].concat(files)
+				uploadCloudFiles.call(this, files, 5, res => {
+						this.setProgress(res, res.index, true)
+					})
+					.then(result => {
+						this.setSuccessAndError(result)
+					})
+					.catch(err => {
+						console.log('err', err)
+					})
+			},
 
-		/**
-		 * 获取进度
-		 * @param {Object} progressEvent
-		 * @param {Object} index
-		 * @param {Object} type
-		 */
-		setProgress(progressEvent, index, type) {
-			const fileLenth = this.files.length
-			const percentNum = (index / fileLenth) * 100
-			const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
-			let idx = index
-			if (!type) {
-				idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
-			}
-			if (idx === -1 || !this.files[idx]) return
-			// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
-			this.files[idx].progress = percentCompleted - 1
-			// 上传中
-			this.$emit('progress', {
-				index: idx,
-				progress: parseInt(percentCompleted),
-				tempFile: this.files[idx]
-			})
-		},
+			/**
+			 * 成功或失败
+			 */
+			async setSuccessAndError(res, fn) {
+				let successData = []
+				let errorData = []
+				let tempFilePath = []
+				let errorTempFilePath = []
+				for (let i = 0; i < res.length; i++) {
+					// const index  = item.index
+					const item = res[i]
+					const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
+					if (index === -1 || !this.files) break
+					if (item.errMsg === 'request:fail') {
+						this.files[index].url = item.path
+						this.files[index].status = 'error'
+						this.files[index].errMsg = item.errMsg
+						// this.files[index].progress = -1
+						errorData.push(this.files[index])
+						errorTempFilePath.push(this.files[index].url)
+					} else {
+						this.files[index].errMsg = ''
+						this.files[index].url = item.url
+						this.files[index].status = 'success'
+						this.files[index].progress += 1
+						successData.push(this.files[index])
+						tempFilePath.push(this.files[index].url)
+					}
+				}
 
-		/**
-		 * 删除
-		 * @param {Object} index
-		 */
-		delFile(index) {
-			this.$emit('delete', {
-				tempFile: this.files[index],
-				tempFilePath: this.files[index].url
-			})
-			this.files.splice(index, 1)
-			this.$nextTick(()=>{
-				this.setEmit()
-			})
-		},
+				if (successData.length > 0) {
+					this.setEmit()
+					// 状态改变返回
+					this.$emit('success', {
+						tempFiles: this.backObject(successData),
+						tempFilePaths: tempFilePath
+					})
+				}
 
-		/**
-		 * 获取文件名和后缀
-		 * @param {Object} name
-		 */
-		getFileExt(name) {
-			const last_len = name.lastIndexOf('.')
-			const len = name.length
-			return {
-				name: name.substring(0, last_len),
-				ext: name.substring(last_len + 1, len)
-			}
-		},
+				if (errorData.length > 0) {
+					this.$emit('fail', {
+						tempFiles: this.backObject(errorData),
+						tempFilePaths: errorTempFilePath
+					})
+				}
+			},
 
-		/**
-		 * 获取图片信息
-		 * @param {Object} filepath
-		 */
-		getFileInfo(filepath) {
-			return new Promise((resolve, reject) => {
-				uni.getImageInfo({
-					src: filepath,
-					success(res) {
-						resolve(res)
-					},
-					fail(err) {
-						reject(err)
-					}
+			/**
+			 * 获取进度
+			 * @param {Object} progressEvent
+			 * @param {Object} index
+			 * @param {Object} type
+			 */
+			setProgress(progressEvent, index, type) {
+				const fileLenth = this.files.length
+				const percentNum = (index / fileLenth) * 100
+				const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+				let idx = index
+				if (!type) {
+					idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
+				}
+				if (idx === -1 || !this.files[idx]) return
+				// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+				this.files[idx].progress = percentCompleted - 1
+				// 上传中
+				this.$emit('progress', {
+					index: idx,
+					progress: parseInt(percentCompleted),
+					tempFile: this.files[idx]
 				})
-			})
-		},
+			},
 
-		/**
-		 * 获取封装数据
-		 */
-		async getFileData(files, type = 'image') {
-			// 最终需要上传数据库的数据
-			let fileFullName = this.getFileExt(files.name)
-			const extname = fileFullName.ext.toLowerCase()
-			let filedata = {
-				name: files.name,
-				uuid: files.uuid,
-				extname: extname || '',
-				cloudPath: files.cloudPath,
-				fileType: files.fileType,
-				url: files.path || files.path,
-				size: files.size, //单位是字节
-				image: {},
-				path: files.path,
-				video: {}
-			}
-			if (type === 'image') {
-				const imageinfo = await this.getFileInfo(files.path)
-				delete filedata.video
-				filedata.image.width = imageinfo.width
-				filedata.image.height = imageinfo.height
-				filedata.image.location = imageinfo.path
-			}else{
-				delete filedata.image
-			}
-			return filedata
-		},
+			/**
+			 * 删除文件
+			 * @param {Object} index
+			 */
+			delFile(index) {
+				this.$emit('delete', {
+					tempFile: this.files[index],
+					tempFilePath: this.files[index].url
+				})
+				this.files.splice(index, 1)
+				this.$nextTick(() => {
+					this.setEmit()
+				})
+			},
 
-		/**
-		 * 批量上传
-		 */
-		uploadCloudFiles(files, max = 5, onUploadProgress) {
-			files = JSON.parse(JSON.stringify(files))
-			const len = files.length
-			let count = 0
-			let self = this
-			return new Promise(resolve => {
-				while (count < max) {
-					next()
+			/**
+			 * 获取文件名和后缀
+			 * @param {Object} name
+			 */
+			getFileExt(name) {
+				const last_len = name.lastIndexOf('.')
+				const len = name.length
+				return {
+					name: name.substring(0, last_len),
+					ext: name.substring(last_len + 1, len)
 				}
+			},
 
-				function next() {
-					let cur = count++
-					if (cur >= len) {
-						!files.find(item => !item.url && !item.errMsg) && resolve(files)
-						return
+			/**
+			 * 处理返回事件
+			 */
+			setEmit() {
+				let data = []
+				if (this.returnType === 'object') {
+					data = this.backObject(this.files)[0]
+					this.localValue = {}
+					Object.assign(this.localValue, data)
+				} else {
+					data = this.backObject(this.files)
+					if (!this.localValue) {
+						this.localValue = []
 					}
-					const fileItem = files[cur]
-					const index = self.files.findIndex(v => v.uuid === fileItem.uuid)
-					fileItem.url = ''
-					delete fileItem.errMsg
+					this.localValue = [...data]
+				}
+				// #ifdef VUE3
+				this.$emit('update:modelValue', this.localValue)
+				// #endif
+				// #ifndef VUE3
+				this.$emit('input', this.localValue)
+				// #endif
+			},
 
-					uniCloud
-						.uploadFile({
-							filePath: fileItem.path,
-							cloudPath: fileItem.cloudPath,
-							fileType: fileItem.fileType,
-							onUploadProgress: res => {
-								res.index = index
-								onUploadProgress && onUploadProgress(res)
-							}
-						})
-						.then(res => {
-							fileItem.url = res.fileID
-							fileItem.index = index
-							if (cur < len) {
-								next()
-							}
-						})
-						.catch(res => {
-							fileItem.errMsg = res.errMsg || res.message
-							fileItem.index = index
-							if (cur < len) {
-								next()
-							}
-						})
+			/**
+			 * 处理返回参数
+			 * @param {Object} files
+			 */
+			backObject(files) {
+				let newFilesData = []
+				files.forEach(v => {
+					newFilesData.push({
+						extname: v.extname,
+						fileType: v.fileType,
+						image: v.image,
+						name: v.name,
+						path: v.path,
+						size: v.size,
+						url: v.url
+					})
+				})
+				return newFilesData
+			},
+			async getTempFileURL(file, fileList) {
+				fileList = {
+					fileList: [].concat(fileList)
 				}
-			})
-		},
-		setEmit() {
-			let data = []
-			if (this.returnType === 'object') {
-				data = this.backObject(this.files)[0]
-			} else {
-				data = this.backObject(this.files)
-			}
-			// #ifdef VUE3
-			this.$emit('update:modelValue',data)
-			// #endif
-			// #ifndef VUE3
-			this.$emit('input', data)
-			// #endif
-		},
-		backObject(files) {
-			let newFilesData = JSON.parse(JSON.stringify(files))
-			newFilesData.map(v => {
-				delete v.path
-				delete v.uuid
-				delete v.video
-				delete v.progress
-				delete v.errMsg
-				delete v.status
-				delete v.cloudPath
-				return v
-			})
-			return newFilesData
-		},
-		async getTempFileURL(file, fileList) {
-			fileList = {
-				fileList: [].concat(fileList)
-			}
-			const urls = await uniCloud.getTempFileURL(fileList)
-			file.path = urls.fileList[0].tempFileURL || ''
-			const index = this.files.findIndex(v => v.path === file.path)
-			if (index !== -1) {
-				this.$set(this.files, index, file)
+				const urls = await uniCloud.getTempFileURL(fileList)
+				file.url = urls.fileList[0].tempFileURL || ''
+				file.path = file.url
+				const index = this.files.findIndex(v => v.path === file.path)
+				if (index !== -1) {
+					this.$set(this.files, index, file)
+				}
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
 			}
 		}
 	}
-}
 </script>
 
 <style>
-.uni-file-picker {
-	/* #ifndef APP-NVUE */
-	box-sizing: border-box;
-	overflow: hidden;
-	/* #endif */
-}
+	.uni-file-picker {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		overflow: hidden;
+		/* #endif */
+	}
 
-.uni-file-picker__header {
-	padding-top: 5px;
-	padding-bottom: 10px;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	justify-content: space-between;
-}
+	.uni-file-picker__header {
+		padding-top: 5px;
+		padding-bottom: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: space-between;
+	}
 
-.file-title {
-	font-size: 14px;
-	color: #333;
-}
+	.file-title {
+		font-size: 14px;
+		color: #333;
+	}
 
-.file-count {
-	font-size: 14px;
-	color: #999;
-}
+	.file-count {
+		font-size: 14px;
+		color: #999;
+	}
 
-.is-add {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	align-items: center;
-	justify-content: center;
-}
+	.is-add {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+	}
 
-.icon-add {
-	width: 50px;
-	height: 5px;
-	background-color: #f1f1f1;
-	border-radius: 2px;
-}
+	.icon-add {
+		width: 50px;
+		height: 5px;
+		background-color: #f1f1f1;
+		border-radius: 2px;
+	}
 
-.rotate {
-	position: absolute;
-	transform: rotate(90deg);
-}
-</style>
\ No newline at end of file
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+</style>
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
index bc9916aa..eb1840b7 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
@@ -37,6 +37,7 @@
 <script>
 	export default {
 		name: "uploadFile",
+		emits:['uploadFiles','choose','delFile'],
 		props: {
 			filesList: {
 				type: Array,
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
index 486e2094..157cf92e 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
@@ -2,7 +2,7 @@
 	<view class="uni-file-picker__container">
 		<view class="file-picker__box" v-for="(item,index) in filesList" :key="index" :style="boxStyle">
 			<view class="file-picker__box-content" :style="borderStyle">
-				<image class="file-image" :src="item.path" mode="aspectFill" @click.stop="prviewImage(item,index)"></image>
+				<image class="file-image" :src="item.url" mode="aspectFill" @click.stop="prviewImage(item,index)"></image>
 				<view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
 					<view class="icon-del"></view>
 					<view class="icon-del rotate"></view>
@@ -30,6 +30,7 @@
 <script>
 	export default {
 		name: "uploadImage",
+		emits:['uploadFiles','choose','delFile'],
 		props: {
 			filesList: {
 				type: Array,
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/utils.js b/uni_modules/uni-file-picker/components/uni-file-picker/utils.js
new file mode 100644
index 00000000..6d94b1a7
--- /dev/null
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/utils.js
@@ -0,0 +1,109 @@
+/**
+ * 获取文件名和后缀
+ * @param {String} name
+ */
+export const get_file_ext = (name) => {
+	const last_len = name.lastIndexOf('.')
+	const len = name.length
+	return {
+		name: name.substring(0, last_len),
+		ext: name.substring(last_len + 1, len)
+	}
+}
+
+/**
+ * 获取扩展名
+ * @param {Array} fileExtname
+ */
+export const get_extname = (fileExtname) => {
+	if (!Array.isArray(fileExtname)) {
+		let extname = fileExtname.replace(/(\[|\])/g, '')
+		return extname.split(',')
+	} else {
+		return fileExtname
+	}
+	return []
+}
+
+/**
+ * 获取文件和检测是否可选
+ */
+export const get_files_and_is_max = (res, _extname) => {
+	let filePaths = []
+	let files = []
+	if(!_extname || _extname.length === 0){
+		return {
+			filePaths,
+			files
+		}
+	}
+	res.tempFiles.forEach(v => {
+		let fileFullName = get_file_ext(v.name)
+		const extname = fileFullName.ext.toLowerCase()
+		if (_extname.indexOf(extname) !== -1) {
+			files.push(v)
+			filePaths.push(v.path)
+		}
+	})
+	if (files.length !== res.tempFiles.length) {
+		uni.showToast({
+			title: `当前选择了${res.tempFiles.length}个文件 ，${res.tempFiles.length - files.length} 个文件格式不正确`,
+			icon: 'none',
+			duration: 5000
+		})
+	}
+
+	return {
+		filePaths,
+		files
+	}
+}
+
+
+/**
+ * 获取图片信息
+ * @param {Object} filepath
+ */
+export const get_file_info = (filepath) => {
+	return new Promise((resolve, reject) => {
+		uni.getImageInfo({
+			src: filepath,
+			success(res) {
+				resolve(res)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+	})
+}
+/**
+ * 获取封装数据
+ */
+export const get_file_data = async (files, type = 'image') => {
+	// 最终需要上传数据库的数据
+	let fileFullName = get_file_ext(files.name)
+	const extname = fileFullName.ext.toLowerCase()
+	let filedata = {
+		name: files.name,
+		uuid: files.uuid,
+		extname: extname || '',
+		cloudPath: files.cloudPath,
+		fileType: files.fileType,
+		url: files.path || files.path,
+		size: files.size, //单位是字节
+		image: {},
+		path: files.path,
+		video: {}
+	}
+	if (type === 'image') {
+		const imageinfo = await get_file_info(files.path)
+		delete filedata.video
+		filedata.image.width = imageinfo.width
+		filedata.image.height = imageinfo.height
+		filedata.image.location = imageinfo.path
+	} else {
+		delete filedata.image
+	}
+	return filedata
+}
diff --git a/uni_modules/uni-file-picker/package.json b/uni_modules/uni-file-picker/package.json
index 060c5842..5343c8b0 100644
--- a/uni_modules/uni-file-picker/package.json
+++ b/uni_modules/uni-file-picker/package.json
@@ -1,81 +1,86 @@
 {
-	"id": "uni-file-picker",
-	"displayName": "uni-file-picker 文件选择上传",
-	"version": "0.2.1",
-	"description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
-	"keywords": [
-        "uni-ui",
-        "图片上传",
-        "上传"
+  "id": "uni-file-picker",
+  "displayName": "uni-file-picker 文件选择上传",
+  "version": "0.2.9",
+  "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "图片上传",
+    "文件上传"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
     ],
-	"repository": "https://github.com/dcloudio/uni-ui",
-	"engines": {
-		"HBuilderX": ""
-	},
-	"directories": {
-		"example": "../../temps/example_temps"
-	},
-	"dcloudext": {
-		"category": [
-			"前端组件",
-			"通用组件"
-		],
-		"sale": {
-			"regular": {
-				"price": "0.00"
-			},
-			"sourcecode": {
-				"price": "0.00"
-			}
-		},
-		"contact": {
-			"qq": ""
-		},
-		"declaration": {
-			"ads": "无",
-			"data": "无",
-			"permissions": "无"
-		},
-		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-	},
-	"uni_modules": {
-		"dependencies": [],
-		"encrypt": [],
-		"platforms": {
-			"cloud": {
-				"tcb": "y",
-				"aliyun": "y"
-			},
-			"client": {
-				"App": {
-					"app-vue": "y",
-					"app-nvue": "n"
-				},
-				"H5-mobile": {
-					"Safari": "y",
-					"Android Browser": "y",
-					"微信浏览器(Android)": "y",
-					"QQ浏览器(Android)": "y"
-				},
-				"H5-pc": {
-					"Chrome": "y",
-					"IE": "y",
-					"Edge": "y",
-					"Firefox": "y",
-					"Safari": "y"
-				},
-				"小程序": {
-					"微信": "y",
-					"阿里": "y",
-					"百度": "y",
-					"字节跳动": "y",
-					"QQ": "y"
-				},
-				"快应用": {
-					"华为": "u",
-					"联盟": "u"
-				}
-			}
-		}
-	}
-}
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-forms/changelog.md b/uni_modules/uni-forms/changelog.md
index faf42836..23718721 100644
--- a/uni_modules/uni-forms/changelog.md
+++ b/uni_modules/uni-forms/changelog.md
@@ -1,9 +1,14 @@
-## 1.2.1（2021-07-22）
-- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
-- 修复 不指定name属性时，运行报错的Bug
-- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
-- 优化 组件示例，新增动态校验示例代码
-- 优化 组件文档，使用方式更清晰
+## 1.2.3（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.2（2021-07-26）
+- 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
+- 修复 1.2.1 引起的示例在小程序平台报错的Bug
+## 1.2.1（2021-07-22）
+- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
+- 修复 不指定name属性时，运行报错的Bug
+- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
+- 优化 组件示例，新增动态校验示例代码
+- 优化 组件文档，使用方式更清晰
 ## 1.2.0（2021-07-13）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.1.2（2021-06-25）
diff --git a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
index 4e4aa3fd..43c5cf85 100644
--- a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
+++ b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
@@ -179,30 +179,18 @@ export default {
 		}
 		this.init();
 	},
-	// TODO vue2
-	destroyed() {
-		if(this.__isUnmounted) return
-		if (this.form) {
-			this.form.childrens.forEach((item, index) => {
-				if (item === this) {
-					this.form.childrens.splice(index, 1)
-					delete this.form.formData[item.name]
-				}
-			})
-		}
-	},
-	// TODO vue3
-	unmounted(){
-		this.__isUnmounted = true
-		if (this.form) {
-			this.form.childrens.forEach((item, index) => {
-				if (item === this) {
-					this.form.childrens.splice(index, 1)
-					delete this.form.formData[item.name]
-				}
-			})
-		}
-	},
+	// #ifndef VUE3
+	destroyed() {
+		if(this.__isUnmounted) return
+		this.unInit()
+	},
+	// #endif
+	// #ifdef VUE3
+	unmounted(){
+		this.__isUnmounted = true
+		this.unInit()
+	},
+	// #endif
 	methods: {
 		init() {
 			if (this.form) {
@@ -247,13 +235,23 @@ export default {
 				if (this.rules.length > 0) {
 					validator.updateSchema(formRules);
 				}
-				
+
 				this.validator = validator;
 			} else {
 				this.labelPos = this.labelPosition || 'left';
 				this.labelWid = this.labelWidth || 65;
 				this.labelAli = this.labelAlign || 'left';
 			}
+		},
+		unInit(){
+			if (this.form) {
+				this.form.childrens.forEach((item, index) => {
+					if (item === this) {
+						this.form.childrens.splice(index, 1)
+						delete this.form.formData[item.name]
+					}
+				})
+			}
 		},
 		/**
 		 * 获取父元素实例
diff --git a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
index 777c9a80..cf23095d 100644
--- a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -60,6 +60,7 @@
 			prop: 'modelValue',
 			event: 'update:modelValue'
 		},
+		emits:['update:modelValue','input','reset','validate','submit'],
 		props: {
 			// 即将弃用
 			value: {
@@ -252,6 +253,7 @@
 					if (inputComp) {
 						inputComp.errMsg = '';
 						inputComp.$emit('input', inputComp.multiple ? [] : '');
+						inputComp.$emit('update:modelValue', inputComp.multiple ? [] : '');
 					}
 				});
 
diff --git a/uni_modules/uni-forms/components/uni-forms/validate.js b/uni_modules/uni-forms/components/uni-forms/validate.js
index e4aad950..c29ef7fa 100644
--- a/uni_modules/uni-forms/components/uni-forms/validate.js
+++ b/uni_modules/uni-forms/components/uni-forms/validate.js
@@ -1,472 +1,486 @@
-
 var pattern = {
-  email: /^\S+?@\S+?\.\S+?$/,
-  idcard: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-  url: new RegExp("^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$", 'i')
+	email: /^\S+?@\S+?\.\S+?$/,
+	idcard: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+	url: new RegExp(
+		"^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+		'i')
 };
 
 const FORMAT_MAPPING = {
-  "int": 'integer',
-  "bool": 'boolean',
-  "double": 'number',
-  "long": 'number',
-  "password": 'string'
-  // "fileurls": 'array'
+	"int": 'integer',
+	"bool": 'boolean',
+	"double": 'number',
+	"long": 'number',
+	"password": 'string'
+	// "fileurls": 'array'
 }
 
 function formatMessage(args, resources = '') {
-  var defaultMessage = ['label']
-  defaultMessage.forEach((item) => {
-    if (args[item] === undefined) {
-      args[item] = ''
-    }
-  })
-
-  let str = resources
-  for (let key in args) {
-    let reg = new RegExp('{' + key + '}')
-    str = str.replace(reg, args[key])
-  }
-  return str
+	var defaultMessage = ['label']
+	defaultMessage.forEach((item) => {
+		if (args[item] === undefined) {
+			args[item] = ''
+		}
+	})
+
+	let str = resources
+	for (let key in args) {
+		let reg = new RegExp('{' + key + '}')
+		str = str.replace(reg, args[key])
+	}
+	return str
 }
 
 function isEmptyValue(value, type) {
-  if (value === undefined || value === null) {
-    return true;
-  }
+	if (value === undefined || value === null) {
+		return true;
+	}
 
-  if (typeof value === 'string' && !value) {
-    return true;
-  }
+	if (typeof value === 'string' && !value) {
+		return true;
+	}
 
-  if (Array.isArray(value) && !value.length) {
-    return true;
-  }
+	if (Array.isArray(value) && !value.length) {
+		return true;
+	}
 
-  if (type === 'object' && !Object.keys(value).length) {
-    return true;
-  }
+	if (type === 'object' && !Object.keys(value).length) {
+		return true;
+	}
 
-  return false;
+	return false;
 }
 
 const types = {
-  integer(value) {
-    return types.number(value) && parseInt(value, 10) === value;
-  },
-  string(value) {
-    return typeof value === 'string';
-  },
-  number(value) {
-    if (isNaN(value)) {
-      return false;
-    }
-    return typeof value === 'number';
-  },
-  "boolean": function (value) {
-    return typeof value === 'boolean';
-  },
-  "float": function (value) {
-    return types.number(value) && !types.integer(value);
-  },
-  array(value) {
-    return Array.isArray(value);
-  },
-  object(value) {
-    return typeof value === 'object' && !types.array(value);
-  },
-  date(value) {
-    return value instanceof Date;
-  },
-  timestamp(value) {
-    if (!this.integer(value) || Math.abs(value).toString().length > 16) {
-      return false
-    }
-    return true;
-  },
-  file(value) {
-    return typeof value.url === 'string';
-  },
-  email(value) {
-    return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
-  },
-  url(value) {
-    return typeof value === 'string' && !!value.match(pattern.url);
-  },
-  pattern(reg, value) {
-    try {
-      return new RegExp(reg).test(value);
-    } catch (e) {
-      return false;
-    }
-  },
-  method(value) {
-    return typeof value === 'function';
-  },
-  idcard(value) {
-    return typeof value === 'string' && !!value.match(pattern.idcard);
-  },
-  'url-https'(value) {
-    return this.url(value) && value.startsWith('https://');
-  },
-  'url-scheme'(value) {
-    return value.startsWith('://');
-  },
-  'url-web'(value) {
-    return false;
-  }
+	integer(value) {
+		return types.number(value) && parseInt(value, 10) === value;
+	},
+	string(value) {
+		return typeof value === 'string';
+	},
+	number(value) {
+		if (isNaN(value)) {
+			return false;
+		}
+		return typeof value === 'number';
+	},
+	"boolean": function(value) {
+		return typeof value === 'boolean';
+	},
+	"float": function(value) {
+		return types.number(value) && !types.integer(value);
+	},
+	array(value) {
+		return Array.isArray(value);
+	},
+	object(value) {
+		return typeof value === 'object' && !types.array(value);
+	},
+	date(value) {
+		return value instanceof Date;
+	},
+	timestamp(value) {
+		if (!this.integer(value) || Math.abs(value).toString().length > 16) {
+			return false
+		}
+		return true;
+	},
+	file(value) {
+		return typeof value.url === 'string';
+	},
+	email(value) {
+		return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
+	},
+	url(value) {
+		return typeof value === 'string' && !!value.match(pattern.url);
+	},
+	pattern(reg, value) {
+		try {
+			return new RegExp(reg).test(value);
+		} catch (e) {
+			return false;
+		}
+	},
+	method(value) {
+		return typeof value === 'function';
+	},
+	idcard(value) {
+		return typeof value === 'string' && !!value.match(pattern.idcard);
+	},
+	'url-https'(value) {
+		return this.url(value) && value.startsWith('https://');
+	},
+	'url-scheme'(value) {
+		return value.startsWith('://');
+	},
+	'url-web'(value) {
+		return false;
+	}
 }
 
 class RuleValidator {
 
-  constructor(message) {
-    this._message = message
-  }
-
-  async validateRule(fieldKey, fieldValue, value, data, allData) {
-    var result = null
-
-    let rules = fieldValue.rules
-
-    let hasRequired = rules.findIndex((item) => {
-      return item.required
-    })
-    if (hasRequired < 0) {
-      if (value === null || value === undefined) {
-        return result
-      }
-      if (typeof value === 'string' && !value.length) {
-        return result
-      }
-    }
-
-    var message = this._message
-
-    if (rules === undefined) {
-      return message['default']
-    }
-
-    for (var i = 0; i < rules.length; i++) {
-      let rule = rules[i]
-      let vt = this._getValidateType(rule)
-
-      Object.assign(rule, {
-        label: fieldValue.label || `["${fieldKey}"]`
-      })
-
-      if (RuleValidatorHelper[vt]) {
-        result = RuleValidatorHelper[vt](rule, value, message)
-        if (result != null) {
-          break
-        }
-      }
-
-      if (rule.validateExpr) {
-        let now = Date.now()
-        let resultExpr = rule.validateExpr(value, allData, now)
-        if (resultExpr === false) {
-          result = this._getMessage(rule, rule.errorMessage || this._message['default'])
-          break
-        }
-      }
-
-      if (rule.validateFunction) {
-        result = await this.validateFunction(rule, value, data, allData, vt)
-        if (result !== null) {
-          break
-        }
-      }
-    }
-
-    if (result !== null) {
-      result = message.TAG + result
-    }
-
-    return result
-  }
-
-  async validateFunction(rule, value, data, allData, vt) {
-    let result = null
-    try {
-      let callbackMessage = null
-      const res = await rule.validateFunction(rule, value, allData || data, (message) => {
-        callbackMessage = message
-      })
-      if (callbackMessage || (typeof res === 'string' && res) || res === false) {
-        result = this._getMessage(rule, callbackMessage || res, vt)
-      }
-    } catch (e) {
-      result = this._getMessage(rule, e.message, vt)
-    }
-    return result
-  }
-
-  _getMessage(rule, message, vt) {
-    return formatMessage(rule, message || rule.errorMessage || this._message[vt] || message['default'])
-  }
-
-  _getValidateType(rule) {
-    // TODO
-    var result = ''
-    if (rule.required) {
-      result = 'required'
-    } else if (rule.format) {
-      result = 'format'
-    } else if (rule.arrayType) {
-      result = 'arrayTypeFormat'
-    } else if (rule.range) {
-      result = 'range'
-    } else if (rule.maximum || rule.minimum) {
-      result = 'rangeNumber'
-    } else if (rule.maxLength || rule.minLength) {
-      result = 'rangeLength'
-    } else if (rule.pattern) {
-      result = 'pattern'
-    } else if (rule.validateFunction) {
-      result = 'validateFunction'
-    }
-    return result
-  }
+	constructor(message) {
+		this._message = message
+	}
+
+	async validateRule(fieldKey, fieldValue, value, data, allData) {
+		var result = null
+
+		let rules = fieldValue.rules
+
+		let hasRequired = rules.findIndex((item) => {
+			return item.required
+		})
+		if (hasRequired < 0) {
+			if (value === null || value === undefined) {
+				return result
+			}
+			if (typeof value === 'string' && !value.length) {
+				return result
+			}
+		}
+
+		var message = this._message
+
+		if (rules === undefined) {
+			return message['default']
+		}
+
+		for (var i = 0; i < rules.length; i++) {
+			let rule = rules[i]
+			let vt = this._getValidateType(rule)
+
+			Object.assign(rule, {
+				label: fieldValue.label || `["${fieldKey}"]`
+			})
+
+			if (RuleValidatorHelper[vt]) {
+				result = RuleValidatorHelper[vt](rule, value, message)
+				if (result != null) {
+					break
+				}
+			}
+
+			if (rule.validateExpr) {
+				let now = Date.now()
+				let resultExpr = rule.validateExpr(value, allData, now)
+				if (resultExpr === false) {
+					result = this._getMessage(rule, rule.errorMessage || this._message['default'])
+					break
+				}
+			}
+
+			if (rule.validateFunction) {
+				result = await this.validateFunction(rule, value, data, allData, vt)
+				if (result !== null) {
+					break
+				}
+			}
+		}
+
+		if (result !== null) {
+			result = message.TAG + result
+		}
+
+		return result
+	}
+
+	async validateFunction(rule, value, data, allData, vt) {
+		let result = null
+		try {
+			let callbackMessage = null
+			const res = await rule.validateFunction(rule, value, allData || data, (message) => {
+				callbackMessage = message
+			})
+			if (callbackMessage || (typeof res === 'string' && res) || res === false) {
+				result = this._getMessage(rule, callbackMessage || res, vt)
+			}
+		} catch (e) {
+			result = this._getMessage(rule, e.message, vt)
+		}
+		return result
+	}
+
+	_getMessage(rule, message, vt) {
+		return formatMessage(rule, message || rule.errorMessage || this._message[vt] || message['default'])
+	}
+
+	_getValidateType(rule) {
+		var result = ''
+		if (rule.required) {
+			result = 'required'
+		} else if (rule.format) {
+			result = 'format'
+		} else if (rule.arrayType) {
+			result = 'arrayTypeFormat'
+		} else if (rule.range) {
+			result = 'range'
+		} else if (rule.maximum !== undefined || rule.minimum !== undefined) {
+			result = 'rangeNumber'
+		} else if (rule.maxLength !== undefined || rule.minLength !== undefined) {
+			result = 'rangeLength'
+		} else if (rule.pattern) {
+			result = 'pattern'
+		} else if (rule.validateFunction) {
+			result = 'validateFunction'
+		}
+		return result
+	}
 }
 
 const RuleValidatorHelper = {
-  required(rule, value, message) {
-    if (rule.required && isEmptyValue(value, rule.format || typeof value)) {
-      return formatMessage(rule, rule.errorMessage || message.required);
-    }
-
-    return null
-  },
-
-  range(rule, value, message) {
-    const { range, errorMessage } = rule;
-
-    let list = new Array(range.length);
-    for (let i = 0; i < range.length; i++) {
-      const item = range[i];
-      if (types.object(item) && item.value !== undefined) {
-        list[i] = item.value;
-      } else {
-        list[i] = item;
-      }
-    }
-
-    let result = false
-    if (Array.isArray(value)) {
-      result = (new Set(value.concat(list)).size === list.length);
-    } else {
-      if (list.indexOf(value) > -1) {
-        result = true;
-      }
-    }
-
-    if (!result) {
-      return formatMessage(rule, errorMessage || message['enum']);
-    }
-
-    return null
-  },
-
-  rangeNumber(rule, value, message) {
-    if (!types.number(value)) {
-      return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
-    }
-
-    let { minimum, maximum, exclusiveMinimum, exclusiveMaximum } = rule;
-    let min = exclusiveMinimum ? value <= minimum : value < minimum;
-    let max = exclusiveMaximum ? value >= maximum : value > maximum;
-
-    if (minimum !== undefined && min) {
-      return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMinimum ? 'exclusiveMinimum' : 'minimum'])
-    } else if (maximum !== undefined && max) {
-      return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMaximum ? 'exclusiveMaximum' : 'maximum'])
-    } else if (minimum !== undefined && maximum !== undefined && (min || max)) {
-      return formatMessage(rule, rule.errorMessage || message['number'].range)
-    }
-
-    return null
-  },
-
-  rangeLength(rule, value, message) {
-    if (!types.string(value) && !types.array(value)) {
-      return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
-    }
-
-    let min = rule.minLength;
-    let max = rule.maxLength;
-    let val = value.length;
-
-    if (min !== undefined && val < min) {
-      return formatMessage(rule, rule.errorMessage || message['length'].minLength)
-    } else if (max !== undefined && val > max) {
-      return formatMessage(rule, rule.errorMessage || message['length'].maxLength)
-    } else if (min !== undefined && max !== undefined && (val < min || val > max)) {
-      return formatMessage(rule, rule.errorMessage || message['length'].range)
-    }
-
-    return null
-  },
-
-  pattern(rule, value, message) {
-    if (!types['pattern'](rule.pattern, value)) {
-      return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
-    }
-
-    return null
-  },
-
-  format(rule, value, message) {
-    var customTypes = Object.keys(types);
-    var format = FORMAT_MAPPING[rule.format] ? FORMAT_MAPPING[rule.format] : (rule.format || rule.arrayType);
-
-    if (customTypes.indexOf(format) > -1) {
-      if (!types[format](value)) {
-        return formatMessage(rule, rule.errorMessage || message.typeError);
-      }
-    }
-
-    return null
-  },
-
-  arrayTypeFormat(rule, value, message) {
-    if (!Array.isArray(value)) {
-      return formatMessage(rule, rule.errorMessage || message.typeError);
-    }
-
-    for (let i = 0; i < value.length; i++) {
-      const element = value[i];
-      let formatResult = this.format(rule, element, message)
-      if (formatResult !== null) {
-        return formatResult
-      }
-    }
-
-    return null
-  }
+	required(rule, value, message) {
+		if (rule.required && isEmptyValue(value, rule.format || typeof value)) {
+			return formatMessage(rule, rule.errorMessage || message.required);
+		}
+
+		return null
+	},
+
+	range(rule, value, message) {
+		const {
+			range,
+			errorMessage
+		} = rule;
+
+		let list = new Array(range.length);
+		for (let i = 0; i < range.length; i++) {
+			const item = range[i];
+			if (types.object(item) && item.value !== undefined) {
+				list[i] = item.value;
+			} else {
+				list[i] = item;
+			}
+		}
+
+		let result = false
+		if (Array.isArray(value)) {
+			result = (new Set(value.concat(list)).size === list.length);
+		} else {
+			if (list.indexOf(value) > -1) {
+				result = true;
+			}
+		}
+
+		if (!result) {
+			return formatMessage(rule, errorMessage || message['enum']);
+		}
+
+		return null
+	},
+
+	rangeNumber(rule, value, message) {
+		if (!types.number(value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		let {
+			minimum,
+			maximum,
+			exclusiveMinimum,
+			exclusiveMaximum
+		} = rule;
+		let min = exclusiveMinimum ? value <= minimum : value < minimum;
+		let max = exclusiveMaximum ? value >= maximum : value > maximum;
+
+		if (minimum !== undefined && min) {
+			return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMinimum ?
+				'exclusiveMinimum' : 'minimum'
+			])
+		} else if (maximum !== undefined && max) {
+			return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMaximum ?
+				'exclusiveMaximum' : 'maximum'
+			])
+		} else if (minimum !== undefined && maximum !== undefined && (min || max)) {
+			return formatMessage(rule, rule.errorMessage || message['number'].range)
+		}
+
+		return null
+	},
+
+	rangeLength(rule, value, message) {
+		if (!types.string(value) && !types.array(value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		let min = rule.minLength;
+		let max = rule.maxLength;
+		let val = value.length;
+
+		if (min !== undefined && val < min) {
+			return formatMessage(rule, rule.errorMessage || message['length'].minLength)
+		} else if (max !== undefined && val > max) {
+			return formatMessage(rule, rule.errorMessage || message['length'].maxLength)
+		} else if (min !== undefined && max !== undefined && (val < min || val > max)) {
+			return formatMessage(rule, rule.errorMessage || message['length'].range)
+		}
+
+		return null
+	},
+
+	pattern(rule, value, message) {
+		if (!types['pattern'](rule.pattern, value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		return null
+	},
+
+	format(rule, value, message) {
+		var customTypes = Object.keys(types);
+		var format = FORMAT_MAPPING[rule.format] ? FORMAT_MAPPING[rule.format] : (rule.format || rule.arrayType);
+
+		if (customTypes.indexOf(format) > -1) {
+			if (!types[format](value)) {
+				return formatMessage(rule, rule.errorMessage || message.typeError);
+			}
+		}
+
+		return null
+	},
+
+	arrayTypeFormat(rule, value, message) {
+		if (!Array.isArray(value)) {
+			return formatMessage(rule, rule.errorMessage || message.typeError);
+		}
+
+		for (let i = 0; i < value.length; i++) {
+			const element = value[i];
+			let formatResult = this.format(rule, element, message)
+			if (formatResult !== null) {
+				return formatResult
+			}
+		}
+
+		return null
+	}
 }
 
 class SchemaValidator extends RuleValidator {
 
-  constructor(schema, options) {
-    super(SchemaValidator.message);
-
-    this._schema = schema
-    this._options = options || null
-  }
-
-  updateSchema(schema) {
-    this._schema = schema
-  }
-
-  async validate(data, allData) {
-    let result = this._checkFieldInSchema(data)
-    if (!result) {
-      result = await this.invokeValidate(data, false, allData)
-    }
-    return result.length ? result[0] : null
-  }
-
-  async validateAll(data, allData) {
-    let result = this._checkFieldInSchema(data)
-    if (!result) {
-      result = await this.invokeValidate(data, true, allData)
-    }
-    return result
-  }
-
-  async validateUpdate(data, allData) {
-    let result = this._checkFieldInSchema(data)
-    if (!result) {
-      result = await this.invokeValidateUpdate(data, false, allData)
-    }
-    return result.length ? result[0] : null
-  }
-
-  async invokeValidate(data, all, allData) {
-    let result = []
-    let schema = this._schema
-    for (let key in schema) {
-      let value = schema[key]
-      let errorMessage = await this.validateRule(key, value, data[key], data, allData)
-      if (errorMessage != null) {
-        result.push({
-          key,
-          errorMessage
-        })
-        if (!all) break
-      }
-    }
-    return result
-  }
-
-  async invokeValidateUpdate(data, all, allData) {
-    let result = []
-    for (let key in data) {
-      let errorMessage = await this.validateRule(key, this._schema[key], data[key], data, allData)
-      if (errorMessage != null) {
-        result.push({
-          key,
-          errorMessage
-        })
-        if (!all) break
-      }
-    }
-    return result
-  }
-
-  _checkFieldInSchema(data) {
-    var keys = Object.keys(data)
-    var keys2 = Object.keys(this._schema)
-    if (new Set(keys.concat(keys2)).size === keys2.length) {
-      return ''
-    }
-
-    var noExistFields = keys.filter((key) => { return keys2.indexOf(key) < 0; })
-    var errorMessage = formatMessage({
-      field: JSON.stringify(noExistFields)
-    }, SchemaValidator.message.TAG + SchemaValidator.message['defaultInvalid'])
-    return [{
-      key: 'invalid',
-      errorMessage
-    }]
-  }
+	constructor(schema, options) {
+		super(SchemaValidator.message);
+
+		this._schema = schema
+		this._options = options || null
+	}
+
+	updateSchema(schema) {
+		this._schema = schema
+	}
+
+	async validate(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidate(data, false, allData)
+		}
+		return result.length ? result[0] : null
+	}
+
+	async validateAll(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidate(data, true, allData)
+		}
+		return result
+	}
+
+	async validateUpdate(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidateUpdate(data, false, allData)
+		}
+		return result.length ? result[0] : null
+	}
+
+	async invokeValidate(data, all, allData) {
+		let result = []
+		let schema = this._schema
+		for (let key in schema) {
+			let value = schema[key]
+			let errorMessage = await this.validateRule(key, value, data[key], data, allData)
+			if (errorMessage != null) {
+				result.push({
+					key,
+					errorMessage
+				})
+				if (!all) break
+			}
+		}
+		return result
+	}
+
+	async invokeValidateUpdate(data, all, allData) {
+		let result = []
+		for (let key in data) {
+			let errorMessage = await this.validateRule(key, this._schema[key], data[key], data, allData)
+			if (errorMessage != null) {
+				result.push({
+					key,
+					errorMessage
+				})
+				if (!all) break
+			}
+		}
+		return result
+	}
+
+	_checkFieldInSchema(data) {
+		var keys = Object.keys(data)
+		var keys2 = Object.keys(this._schema)
+		if (new Set(keys.concat(keys2)).size === keys2.length) {
+			return ''
+		}
+
+		var noExistFields = keys.filter((key) => {
+			return keys2.indexOf(key) < 0;
+		})
+		var errorMessage = formatMessage({
+			field: JSON.stringify(noExistFields)
+		}, SchemaValidator.message.TAG + SchemaValidator.message['defaultInvalid'])
+		return [{
+			key: 'invalid',
+			errorMessage
+		}]
+	}
 }
 
 function Message() {
-  return {
-    TAG: "",
-    default: '验证错误',
-    defaultInvalid: '提交的字段{field}在数据库中并不存在',
-    validateFunction: '验证无效',
-    required: '{label}必填',
-    'enum': '{label}超出范围',
-    timestamp: '{label}格式无效',
-    whitespace: '{label}不能为空',
-    typeError: '{label}类型无效',
-    date: {
-      format: '{label}日期{value}格式无效',
-      parse: '{label}日期无法解析,{value}无效',
-      invalid: '{label}日期{value}无效'
-    },
-    length: {
-      minLength: '{label}长度不能少于{minLength}',
-      maxLength: '{label}长度不能超过{maxLength}',
-      range: '{label}必须介于{minLength}和{maxLength}之间'
-    },
-    number: {
-      minimum: '{label}不能小于{minimum}',
-      maximum: '{label}不能大于{maximum}',
-      exclusiveMinimum: '{label}不能小于等于{minimum}',
-      exclusiveMaximum: '{label}不能大于等于{maximum}',
-      range: '{label}必须介于{minimum}and{maximum}之间'
-    },
-    pattern: {
-      mismatch: '{label}格式不匹配'
-    }
-  };
+	return {
+		TAG: "",
+		default: '验证错误',
+		defaultInvalid: '提交的字段{field}在数据库中并不存在',
+		validateFunction: '验证无效',
+		required: '{label}必填',
+		'enum': '{label}超出范围',
+		timestamp: '{label}格式无效',
+		whitespace: '{label}不能为空',
+		typeError: '{label}类型无效',
+		date: {
+			format: '{label}日期{value}格式无效',
+			parse: '{label}日期无法解析,{value}无效',
+			invalid: '{label}日期{value}无效'
+		},
+		length: {
+			minLength: '{label}长度不能少于{minLength}',
+			maxLength: '{label}长度不能超过{maxLength}',
+			range: '{label}必须介于{minLength}和{maxLength}之间'
+		},
+		number: {
+			minimum: '{label}不能小于{minimum}',
+			maximum: '{label}不能大于{maximum}',
+			exclusiveMinimum: '{label}不能小于等于{minimum}',
+			exclusiveMaximum: '{label}不能大于等于{maximum}',
+			range: '{label}必须介于{minimum}and{maximum}之间'
+		},
+		pattern: {
+			mismatch: '{label}格式不匹配'
+		}
+	};
 }
 
 
 SchemaValidator.message = new Message();
 
-export default SchemaValidator
+export default SchemaValidator
diff --git a/uni_modules/uni-forms/package.json b/uni_modules/uni-forms/package.json
index d4e55fd6..052824b6 100644
--- a/uni_modules/uni-forms/package.json
+++ b/uni_modules/uni-forms/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-forms",
   "displayName": "uni-forms 表单",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
   "keywords": [
     "uni-ui",
@@ -82,4 +82,4 @@
       }
     }
   }
-}
+}
diff --git a/uni_modules/uni-forms/readme.md b/uni_modules/uni-forms/readme.md
index 20d334e8..3e151a54 100644
--- a/uni_modules/uni-forms/readme.md
+++ b/uni_modules/uni-forms/readme.md
@@ -80,7 +80,6 @@ uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
 ### 如何使用 
 
 1. `uni-forms` 需要通过 `rules` 属性传入约定的校验规则，详细描述下文`校验规则说明`。
-
 ```html
 <!-- rules 内容详见下方完整示例 -->
 <uni-forms ref="form" :rules="rules">
@@ -89,7 +88,6 @@ uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
 ```
 
 2. `uni-forms` 需要绑定`modelValue`属性，值为表单的key\value 组成的对象。
-
 ```html
 <!-- formData、rules 内容详见下方完整示例 -->
 <uni-forms ref="form" :modelValue="formData" :rules="rules">
@@ -98,7 +96,6 @@ uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
 ```
 
 3. `uni-forms-item` 需要设置 `name` 属性为当前字段名，字段为 `String` 类型而非变量。
-
 ```html
 <!-- formData、rules 内容详见下方完整示例 -->
 <uni-forms :modelValue="formData" :rules="rules">
@@ -433,29 +430,25 @@ export default {
 
 多用于同一个字段需要添加多次的场景，如需要动态创建多个域名参与检验。
 
-1. 在 `formData` 中定义个变量用来接受同一个字段的多个结果
+1. 在 `formData` 中定义个变量用来接受同一个字段的多个结果。
 ```javascript
 dynamicFormData: {
 	email: '',
 	// domains 字段下会有多个结果
 	domains: {}
 }
-
 ```
 
 
 2. 使用 `uni-forms-item` 的 `rules` 属性定义单个表单域的校验规则。
-
 ```html
 <uni-forms-item :label="item.label+' '+index" required
 	:rules="[{'required': true,errorMessage: '域名项必填'}]" :key="item.id">
 	...
 </uni-forms-item>
-
 ```
 
 3. `name` 需要动态指定，格式为： `字段[唯一值]`
-
 ```html
 <uni-forms-item 
 	required
@@ -466,12 +459,9 @@ dynamicFormData: {
 	>
 	...
 </uni-forms-item>
-
 ```
 
 4. 需要绑定值的组件的 v-model 也需要动态指定，格式为：`数据源.字段[唯一值]`
-
-
 ```html
 <uni-forms-item 
 	required
@@ -482,7 +472,6 @@ dynamicFormData: {
 	>
 	<uni-easyinput v-model="dynamicFormData.domains[item.id]" placeholder="请输入域名" />
 </uni-forms-item>
-
 ```
 
 **完整示例**
diff --git a/uni_modules/uni-grid/changelog.md b/uni_modules/uni-grid/changelog.md
index 1f35889e..8fc506d7 100644
--- a/uni_modules/uni-grid/changelog.md
+++ b/uni_modules/uni-grid/changelog.md
@@ -1,5 +1,7 @@
-## 1.3.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.3.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.3.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.2.4（2021-05-12）
 - 新增 组件示例地址
 ## 1.2.3（2021-02-05）
diff --git a/uni_modules/uni-grid/components/uni-grid/uni-grid.vue b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
index 8f14051c..b7cc9a49 100644
--- a/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
+++ b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
@@ -24,6 +24,7 @@
 	 */
 	export default {
 		name: 'UniGrid',
+		emits:['change'],
 		props: {
 			// 每列显示个数
 			column: {
diff --git a/uni_modules/uni-grid/package.json b/uni_modules/uni-grid/package.json
index 068c0f4f..90306f59 100644
--- a/uni_modules/uni-grid/package.json
+++ b/uni_modules/uni-grid/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-grid",
   "displayName": "uni-grid 宫格",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Grid 宫格组件，提供移动端常见的宫格布局，如九宫格。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-group/changelog.md b/uni_modules/uni-group/changelog.md
index ee91dadc..6a36f7df 100644
--- a/uni_modules/uni-group/changelog.md
+++ b/uni_modules/uni-group/changelog.md
@@ -1,5 +1,8 @@
-## 1.0.3（2021-05-12）
-- 新增 组件示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 优化 组件文档
+## 1.0.3（2021-05-12）
+- 新增 组件示例地址
 ## 1.0.2（2021-02-05）
 - 调整为uni_modules目录规范
 - 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-group/components/uni-group/uni-group.vue b/uni_modules/uni-group/components/uni-group/uni-group.vue
index 21c15617..eaae7f0c 100644
--- a/uni_modules/uni-group/components/uni-group/uni-group.vue
+++ b/uni_modules/uni-group/components/uni-group/uni-group.vue
@@ -18,9 +18,11 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3281
 	 * @property {String} title 主标题
 	 * @property {Number} top 分组间隔
+	 * @property {Number} mode 模式
 	 */
 	export default {
 		name: 'uniGroup',
+		emits:['click'],
 		props: {
 			title: {
 				type: String,
diff --git a/uni_modules/uni-group/package.json b/uni_modules/uni-group/package.json
index cd6024a1..ec178634 100644
--- a/uni_modules/uni-group/package.json
+++ b/uni_modules/uni-group/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-group",
   "displayName": "uni-group 分组",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "分组组件可用于将组件用于分组，添加间隔，以产生明显的区块",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-group/readme.md b/uni_modules/uni-group/readme.md
index 9490e691..deefb22c 100644
--- a/uni_modules/uni-group/readme.md
+++ b/uni_modules/uni-group/readme.md
@@ -28,7 +28,7 @@
 在 ``template`` 中使用组件
 
 ```html
-<uni-group title="分组1" margin-top="20">
+<uni-group title="分组1" top="20">
     <view>分组1 的内容</view>
     <view>分组1 的内容</view>
 </uni-group>
@@ -41,10 +41,11 @@
 
 ### 属性说明
 
-属性名|类型|默认值|说明
-:-:|:-:|:-:|:-:
-title|String|主标题|
-top|Number|分组间隔|
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:|:-:|
+|title|String|-|主标题|
+|top|Number|-|分组间隔|
+|mode|String|''|模式 ，card 为卡片模式|
 
 
 
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index c4a05dc0..d466748d 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,4 +1,6 @@
-## 1.1.5（2021-05-12）
-- 新增 组件示例地址
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
 ## 1.1.4（2021-02-05）
 - 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index 71aef8a0..e3cca4e8 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -23,6 +23,7 @@
 	 */
 	export default {
 		name: 'UniIcons',
+		emits:['click'],
 		props: {
 			type: {
 				type: String,
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index eb0f9860..648c73bc 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js b/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js
index e4c8655b..b482b833 100644
--- a/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js
+++ b/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js
@@ -1,6 +1,7 @@
 var nvMask,nvImageMenu;
 export default {
 	show({list,cancelText},callback){
+		console.log(789789879);
 		if(!list){
 			list = [{
 				"img":"/static/sharemenu/wechatfriend.png",
@@ -30,6 +31,9 @@ export default {
 		var left4 = left1 + (iconWidth + iconSpace) * 3
 		var top1 = left1
 		var top2 = top1 + iconWidth + icontextSpace + textHeight + left1
+		
+		const TOP = {top1,top2}, LEFT = {left1,left2,left3,left4};
+		
 		nvMask = new plus.nativeObj.View("nvMask", { //先创建遮罩层
 			top: '0px',
 			left: '0px',
@@ -55,8 +59,8 @@ export default {
 				tag: 'img',
 				src: item.img,
 				position: {
-					top: eval('top'+( parseInt(i/4) +1)),
-					left: eval('left'+(1+i%4)),
+					top: TOP['top'+( parseInt(i/4) +1)],
+					left: LEFT['left'+(1+i%4)],
 					width: iconWidth,
 					height: iconWidth
 				}
@@ -68,8 +72,8 @@ export default {
 					size: textHeight
 				},
 				position: {
-					top: eval('top'+(parseInt(i/4)+1)) + iconWidth + icontextSpace,
-					left: eval('left'+(1+i%4)),
+					top: TOP['top'+(parseInt(i/4)+1)] + iconWidth + icontextSpace,
+					left: LEFT['left'+(1+i%4)],
 					width: iconWidth,
 					height: textHeight
 				}
diff --git a/uni_modules/uni-indexed-list/changelog.md b/uni_modules/uni-indexed-list/changelog.md
index 0e95dca7..66b20d79 100644
--- a/uni_modules/uni-indexed-list/changelog.md
+++ b/uni_modules/uni-indexed-list/changelog.md
@@ -1,5 +1,7 @@
-## 1.0.11（2021-05-12）
-- 新增 组件示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
 ## 1.0.10（2021-04-21）
 - 优化 添加依赖 uni-icons, 导入后自动下载依赖
 ## 1.0.9（2021-02-05）
diff --git a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
index 827131d9..afa50412 100644
--- a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
+++ b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
@@ -21,6 +21,7 @@
 <script>
 	export default {
 		name: 'UniIndexedList',
+		emits:['itemClick'],
 		props: {
 			loaded: {
 				type: Boolean,
diff --git a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
index ac567f0c..e507051b 100644
--- a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
+++ b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
@@ -87,6 +87,7 @@
 		components: {
 			indexedListItem
 		},
+		emits:['click'],
 		props: {
 			options: {
 				type: Array,
diff --git a/uni_modules/uni-indexed-list/package.json b/uni_modules/uni-indexed-list/package.json
index 8c90427a..3f2c0cc6 100644
--- a/uni_modules/uni-indexed-list/package.json
+++ b/uni_modules/uni-indexed-list/package.json
@@ -1,12 +1,13 @@
 {
   "id": "uni-indexed-list",
   "displayName": "uni-indexed-list 索引列表",
-  "version": "1.0.11",
-  "description": "索引列表",
+  "version": "1.1.0",
+  "description": "索引列表组件，右侧带索引的列表，方便快速定位到具体内容，通常用于城市/机场选择等场景",
   "keywords": [
     "uni-ui",
-    "uniui",
-    "索引列表"
+    "索引列表",
+    "索引",
+    "列表"
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
   "engines": {
@@ -80,4 +81,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-link/changelog.md b/uni_modules/uni-link/changelog.md
index a92b8b89..1d24c16c 100644
--- a/uni_modules/uni-link/changelog.md
+++ b/uni_modules/uni-link/changelog.md
@@ -1,9 +1,11 @@
+## 0.0.6（2021-07-30）
+- 支持自定义插槽
 ## 0.0.5（2021-06-21）
 - 新增 download 属性，H5平台下载文件名
-## 0.0.4（2021-05-12）
-- 新增 组件示例地址
-## 0.0.3（2021-03-09）
-- 新增 href 属性支持 tel:|mailto:
-
-## 0.0.2（2021-02-05）
-- 调整为uni_modules目录规范
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-03-09）
+- 新增 href 属性支持 tel:|mailto:
+
+## 0.0.2（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-link/components/uni-link/uni-link.vue b/uni_modules/uni-link/components/uni-link/uni-link.vue
index af819340..d8aaaf8f 100644
--- a/uni_modules/uni-link/components/uni-link/uni-link.vue
+++ b/uni_modules/uni-link/components/uni-link/uni-link.vue
@@ -1,116 +1,120 @@
-<template>
-	<a v-if="isShowA" class="uni-link" :href="href"
-		:class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
-		:style="{color,fontSize:fontSize+'px'}" :download="download">{{text}}</a>
-	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
-		:style="{color,fontSize:fontSize+'px'}" @click="openURL">{{text}}</text>
-</template>
-
-<script>
-	/**
-	 * Link 外部网页超链接组件
-	 * @description uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1182
-	 * @property {String} href 点击后打开的外部网页url
-	 * @property {String} text 显示的文字
-	 * @property {String} downlaod H5平台下载文件名
-	 * @property {Boolean} showUnderLine 是否显示下划线
-	 * @property {String} copyTips 在小程序端复制链接时显示的提示语
-	 * @property {String} color 链接文字颜色
-	 * @property {String} fontSize 链接文字大小
-	 * @example * <uni-link href="https://ext.dcloud.net.cn" text="https://ext.dcloud.net.cn"></uni-link>
-	 */
-	export default {
-		name: 'uniLink',
-		props: {
-			href: {
-				type: String,
-				default: ''
-			},
-			text: {
-				type: String,
-				default: ''
-			},
-			download: {
-				type: String,
-				default: ''
-			},
-			showUnderLine: {
-				type: [Boolean, String],
-				default: true
-			},
-			copyTips: {
-				type: String,
-				default: '已自动复制网址，请在手机浏览器里粘贴该网址'
-			},
-			color: {
-				type: String,
-				default: '#999999'
-			},
-			fontSize: {
-				type: [Number, String],
-				default: 14
-			}
-		},
-		computed: {
-			isShowA() {
-				// #ifdef H5
-				this._isH5 = true;
-				// #endif
-				if ((this.isMail() || this.isTel()) && this._isH5 === true) {
-					return true;
-				}
-				return false;
-			}
-		},
-		created() {
-			this._isH5 = null;
-		},
-		methods: {
-			isMail() {
-				return this.href.startsWith('mailto:');
-			},
-			isTel() {
-				return this.href.startsWith('tel:');
-			},
-			openURL() {
-				// #ifdef APP-PLUS
-				if (this.isTel()) {
-					this.makePhoneCall(this.href.replace('tel:', ''));
-				} else {
-					plus.runtime.openURL(this.href);
-				}
-				// #endif
-				// #ifdef H5
-				window.open(this.href)
-				// #endif
-				// #ifdef MP
-				uni.setClipboardData({
-					data: this.href
-				});
-				uni.showModal({
-					content: this.copyTips,
-					showCancel: false
-				});
-				// #endif
-			},
-			makePhoneCall(phoneNumber) {
-				uni.makePhoneCall({
-					phoneNumber
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	/* #ifndef APP-NVUE */
-	.uni-link {
-		cursor: pointer;
-	}
-
-	/* #endif */
-	.uni-link--withline {
-		text-decoration: underline;
-	}
-</style>
+<template>
+	<a v-if="isShowA" class="uni-link" :href="href"
+		:class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" :download="download">
+		<slot>{{text}}</slot>
+	</a>
+	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
+		<slot>{{text}}</slot>
+	</text>
+</template>
+
+<script>
+	/**
+	 * Link 外部网页超链接组件
+	 * @description uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1182
+	 * @property {String} href 点击后打开的外部网页url
+	 * @property {String} text 显示的文字
+	 * @property {String} downlaod H5平台下载文件名
+	 * @property {Boolean} showUnderLine 是否显示下划线
+	 * @property {String} copyTips 在小程序端复制链接时显示的提示语
+	 * @property {String} color 链接文字颜色
+	 * @property {String} fontSize 链接文字大小
+	 * @example * <uni-link href="https://ext.dcloud.net.cn" text="https://ext.dcloud.net.cn"></uni-link>
+	 */
+	export default {
+		name: 'uniLink',
+		props: {
+			href: {
+				type: String,
+				default: ''
+			},
+			text: {
+				type: String,
+				default: ''
+			},
+			download: {
+				type: String,
+				default: ''
+			},
+			showUnderLine: {
+				type: [Boolean, String],
+				default: true
+			},
+			copyTips: {
+				type: String,
+				default: '已自动复制网址，请在手机浏览器里粘贴该网址'
+			},
+			color: {
+				type: String,
+				default: '#999999'
+			},
+			fontSize: {
+				type: [Number, String],
+				default: 14
+			}
+		},
+		computed: {
+			isShowA() {
+				// #ifdef H5
+				this._isH5 = true;
+				// #endif
+				if ((this.isMail() || this.isTel()) && this._isH5 === true) {
+					return true;
+				}
+				return false;
+			}
+		},
+		created() {
+			this._isH5 = null;
+		},
+		methods: {
+			isMail() {
+				return this.href.startsWith('mailto:');
+			},
+			isTel() {
+				return this.href.startsWith('tel:');
+			},
+			openURL() {
+				// #ifdef APP-PLUS
+				if (this.isTel()) {
+					this.makePhoneCall(this.href.replace('tel:', ''));
+				} else {
+					plus.runtime.openURL(this.href);
+				}
+				// #endif
+				// #ifdef H5
+				window.open(this.href)
+				// #endif
+				// #ifdef MP
+				uni.setClipboardData({
+					data: this.href
+				});
+				uni.showModal({
+					content: this.copyTips,
+					showCancel: false
+				});
+				// #endif
+			},
+			makePhoneCall(phoneNumber) {
+				uni.makePhoneCall({
+					phoneNumber
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	/* #ifndef APP-NVUE */
+	.uni-link {
+		cursor: pointer;
+	}
+
+	/* #endif */
+	.uni-link--withline {
+		text-decoration: underline;
+	}
+</style>
diff --git a/uni_modules/uni-link/package.json b/uni_modules/uni-link/package.json
index 7f2a96da..96f23445 100644
--- a/uni_modules/uni-link/package.json
+++ b/uni_modules/uni-link/package.json
@@ -1,83 +1,83 @@
-{
-  "id": "uni-link",
-  "displayName": "uni-link 超链接",
-  "version": "0.0.5",
-  "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "link",
-    "超链接",
-    ""
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-link",
+  "displayName": "uni-link 超链接",
+  "version": "0.0.6",
+  "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "link",
+    "超链接",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-link/readme.md b/uni_modules/uni-link/readme.md
index 588b96df..0735374c 100644
--- a/uni_modules/uni-link/readme.md
+++ b/uni_modules/uni-link/readme.md
@@ -29,12 +29,19 @@ uni-link是一个外部网页超链接组件，在小程序内复制url，在app
 |:-:					|:-:		|:-:										|:-:							|
 |href					|String	|-											|链接地址						|
 |text					|String	|-											|显示文字						|
+|download     |String |-                      |H5平台下载文件名        |
 |showUnderLine|Boolean|true										|是否显示下划线					|
 |copyTips			|String	|已自动复制网址，请在手机浏览器里粘贴该网址	|在小程序端复制链接时的提示语	|
 |color				|String	|#999999								|链接文字颜色					|
 |fontSize			|String	|14											|链接文字大小，单位px			|
 
 
+### Link Slots
+
+|名称|说明|					
+|:-:|:-:|						
+|default|自定义内容，回覆盖原有的内容显示|
+
 
 ## 组件示例
 
diff --git a/uni_modules/uni-list/changelog.md b/uni_modules/uni-list/changelog.md
index eadf914d..03ff4986 100644
--- a/uni_modules/uni-list/changelog.md
+++ b/uni_modules/uni-list/changelog.md
@@ -1,5 +1,7 @@
-## 1.1.1（2021-07-21）
-- 修复 与其他组件嵌套使用时，点击失效的Bug
+## 1.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.1（2021-07-21）
+- 修复 与其他组件嵌套使用时，点击失效的Bug
 ## 1.1.0（2021-07-13）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.17（2021-05-12）
diff --git a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
index 8e8b1e67..9f8796f8 100644
--- a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
+++ b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
@@ -70,6 +70,7 @@
 	 */
 	export default {
 		name: 'UniListChat',
+		emits:['click'],
 		props: {
 			title: {
 				type: String,
diff --git a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
index 6bb0484a..e9af2dfa 100644
--- a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -74,6 +74,7 @@
  */
 export default {
 	name: 'UniListItem',
+	emits:['click','switchChange'],
 	props: {
 		direction: {
 			type: String,
@@ -162,8 +163,7 @@ export default {
 			default: true
 		}
 	},
-	// inject: ['list'],
-	emits:['click'],
+	// inject: ['list'],
 	data() {
 		return {
 			isFirstChild: false
diff --git a/uni_modules/uni-list/package.json b/uni_modules/uni-list/package.json
index 5ca02d1c..d8d693c5 100644
--- a/uni_modules/uni-list/package.json
+++ b/uni_modules/uni-list/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-list",
   "displayName": "uni-list 列表",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "List 组件 ，帮助使用者快速构建列表。",
   "keywords": [
     "",
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
index 7155a62b..a787d5e9 100644
--- a/uni_modules/uni-load-more/changelog.md
+++ b/uni_modules/uni-load-more/changelog.md
@@ -1,5 +1,7 @@
-## 1.1.8（2021-05-12）
-- 新增 组件示例地址
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
 ## 1.1.7（2021-03-30）
 - 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
 ## 1.1.6（2021-02-05）
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
index 6e6f4263..2d7038f2 100644
--- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -53,6 +53,7 @@
 	 */
 	export default {
 		name: 'UniLoadMore',
+		emits:['clickLoadMore'],
 		props: {
 			status: {
 				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
index 2bd058e2..b06e2323 100644
--- a/uni_modules/uni-load-more/package.json
+++ b/uni_modules/uni-load-more/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-load-more",
   "displayName": "uni-load-more 加载更多",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-nav-bar/changelog.md b/uni_modules/uni-nav-bar/changelog.md
index cfbf6a32..70b3c488 100644
--- a/uni_modules/uni-nav-bar/changelog.md
+++ b/uni_modules/uni-nav-bar/changelog.md
@@ -1,5 +1,7 @@
-## 1.0.11（2021-05-12）
-- 新增 组件示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
 ## 1.0.10（2021-04-30）
 - 修复 在nvue下fixed为true，宽度不能撑满的Bug
 ## 1.0.9（2021-04-21）
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
index 72d8867e..0df773fe 100644
--- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -66,6 +66,7 @@
 		components: {
 			statusBar
 		},
+		emits:['clickLeft','clickRight','clickTitle'],
 		props: {
 			title: {
 				type: String,
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
index 507065f2..c91e6775 100644
--- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
@@ -5,13 +5,15 @@
 </template>
 
 <script>
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
 	export default {
 		name: 'UniStatusBar',
 		data() {
 			return {
-				statusBarHeight: statusBarHeight
+				statusBarHeight: 20
 			}
+		},
+		mounted() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
 		}
 	}
 </script>
diff --git a/uni_modules/uni-nav-bar/package.json b/uni_modules/uni-nav-bar/package.json
index 87a793f8..caf0ed4b 100644
--- a/uni_modules/uni-nav-bar/package.json
+++ b/uni_modules/uni-nav-bar/package.json
@@ -1,12 +1,12 @@
 {
   "id": "uni-nav-bar",
   "displayName": "uni-nav-bar 自定义导航栏",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "description": "自定义导航栏组件，主要用于头部导航。",
   "keywords": [
     "uni-ui",
-    "uniui",
-    "title",
+    "导航",
+    "导航栏",
     "自定义导航栏"
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md
index 4bca31ae..37d7319e 100644
--- a/uni_modules/uni-notice-bar/changelog.md
+++ b/uni_modules/uni-notice-bar/changelog.md
@@ -1,5 +1,7 @@
-## 1.0.9（2021-05-12）
-- 新增 组件示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 组件示例地址
 ## 1.0.8（2021-04-21）
 - 优化 添加依赖 uni-icons, 导入后自动下载依赖
 ## 1.0.7（2021-02-05）
diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
index b0504980..914ebe2c 100644
--- a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
+++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
@@ -55,6 +55,7 @@
 
 	export default {
 		name: 'UniNoticeBar',
+		emits:['click','getmore','close'],
 		props: {
 			text: {
 				type: String,
diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json
index 04caa6ea..e11a4179 100644
--- a/uni_modules/uni-notice-bar/package.json
+++ b/uni_modules/uni-notice-bar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-notice-bar",
   "displayName": "uni-notice-bar 通告栏",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md
index 9cdb1c03..1b73c791 100644
--- a/uni_modules/uni-number-box/changelog.md
+++ b/uni_modules/uni-number-box/changelog.md
@@ -1,5 +1,7 @@
-## 1.1.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.7（2021-05-12）
 - 新增 组件示例地址
 ## 1.0.6（2021-04-20）
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
index b372cdb3..aee1742d 100644
--- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -24,6 +24,7 @@
 
 	export default {
 		name: "UniNumberBox",
+		emits:['change','input','update:modelValue','blur','focus'],
 		props: {
 			value: {
 				type: [Number, String],
diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json
index 43d9a09e..940a2957 100644
--- a/uni_modules/uni-number-box/package.json
+++ b/uni_modules/uni-number-box/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-number-box",
   "displayName": "uni-number-box 数字输入框",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-pagination/changelog.md b/uni_modules/uni-pagination/changelog.md
index 5422ea61..9c4fde2f 100644
--- a/uni_modules/uni-pagination/changelog.md
+++ b/uni_modules/uni-pagination/changelog.md
@@ -1,5 +1,7 @@
-## 1.0.7（2021-05-12）
-- 新增 组件示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
 ## 1.0.6（2021-04-12）
 - 新增 PC 和 移动端适配不同的 ui 
 ## 1.0.5（2021-02-05）
diff --git a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
index 000dbcea..4f07c0eb 100644
--- a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
+++ b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
@@ -70,11 +70,16 @@
 
 export default {
 	name: 'UniPagination',
+	emits:['update:modelValue','input','change'],
 	props: {
 		value: {
 			type: [Number, String],
 			default: 1
 		},
+		modelValue: {
+			type: [Number, String],
+			default: 1
+		},
 		prevText: {
 			type: String,
 			default: '上一页'
@@ -185,6 +190,13 @@ export default {
 			} else {
 				this.currentIndex = val
 			}
+		},
+		modelValue(val) {
+			if (val < 1) {
+				this.currentIndex = 1
+			} else {
+				this.currentIndex = val
+			}
 		}
 	},
 	created() {
@@ -235,6 +247,7 @@ export default {
 		},
 		change(e) {
 			this.$emit('input', this.currentIndex)
+			this.$emit('update:modelValue', this.currentIndex)
 			this.$emit('change', {
 				type: e,
 				current: this.currentIndex
diff --git a/uni_modules/uni-pagination/package.json b/uni_modules/uni-pagination/package.json
index bae5496a..b0e9501a 100644
--- a/uni_modules/uni-pagination/package.json
+++ b/uni_modules/uni-pagination/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-pagination",
   "displayName": "uni-pagination 分页器",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "Pagination 分页器组件，用于展示页码、请求数据等。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index f7ff7fb0..be48b60a 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,5 +1,7 @@
-## 1.6.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.5.0（2021-06-23）
 - 新增 mask-click 遮罩层点击事件
 ## 1.4.5（2021-06-22）
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index bdda6e86..e6916753 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -50,6 +50,7 @@
 	export default {
 		name: "uniPopupDialog",
 		mixins: [popup],
+		emits:['confirm','close'],
 		props: {
 			value: {
 				type: [String, Number],
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index 80e082f1..355cac93 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -21,6 +21,7 @@
 	export default {
 		name: 'UniPopupShare',
 		mixins:[popup],
+		emits:['select'],
 		props: {
 			title: {
 				type: String,
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index efef682a..31744451 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -44,6 +44,7 @@ export default {
 		keypress
 		// #endif
 	},
+	emits:['change','maskClick'],
 	props: {
 		// 开启动画
 		animation: {
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index 02a2819e..51fa273d 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,83 +1,85 @@
 {
-  "id": "uni-popup",
-  "displayName": "uni-popup 弹出层",
-  "version": "1.6.0",
-  "description": " Popup 组件，提供常用的弹层",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "弹出层"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.6.1",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
     ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-      "uni-transition"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-rate/changelog.md b/uni_modules/uni-rate/changelog.md
index 0fcd7bba..9fe0e841 100644
--- a/uni_modules/uni-rate/changelog.md
+++ b/uni_modules/uni-rate/changelog.md
@@ -1,5 +1,7 @@
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.1.2（2021-05-12）
 - 新增 组件示例地址
 ## 1.1.1（2021-04-21）
diff --git a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
index 63ba1a0e..082f6767 100644
--- a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
+++ b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
@@ -107,6 +107,11 @@
 				type: [Number, String],
 				default: 1
 			},
+			modelValue: {
+				// 当前评分
+				type: [Number, String],
+				default: 1
+			},
 			max: {
 				// 最大评分
 				type: [Number, String],
@@ -150,6 +155,9 @@
 			value(newVal) {
 				this.valueSync = Number(newVal);
 			},
+			modelValue(newVal) {
+				this.valueSync = Number(newVal);
+			},
 		},
 		computed: {
 			stars() {
@@ -180,7 +188,7 @@
 			}
 		},
 		created() {
-			this.valueSync = Number(this.value);
+			this.valueSync = Number(this.value||this.modelValue);
 			this._rateBoxLeft = 0
 			this._oldValue = null
 		},
@@ -313,6 +321,7 @@
 			_onChange() {
 
 				this.$emit("input", this.valueSync);
+				this.$emit("update:modelValue", this.valueSync);
 				this.$emit("change", {
 					value: this.valueSync
 				});
diff --git a/uni_modules/uni-rate/package.json b/uni_modules/uni-rate/package.json
index 6b7f2381..1cb4669a 100644
--- a/uni_modules/uni-rate/package.json
+++ b/uni_modules/uni-rate/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-rate",
   "displayName": "uni-rate 评分",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-search-bar/changelog.md b/uni_modules/uni-search-bar/changelog.md
index e7e1f460..de96b8a6 100644
--- a/uni_modules/uni-search-bar/changelog.md
+++ b/uni_modules/uni-search-bar/changelog.md
@@ -1,5 +1,7 @@
-## 1.0.9（2021-05-12）
-- 新增 项目示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 项目示例地址
 ## 1.0.8（2021-04-21）
 - 优化 添加依赖 uni-icons, 导入后自动下载依赖
 ## 1.0.7（2021-04-15）
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
index f3da0267..bdecaf8b 100644
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -49,6 +49,7 @@
 
 	export default {
 		name: "UniSearchBar",
+		emits:['input','update:modelValue','clear','cancel','confirm','blur','focus'],
 		props: {
 			placeholder: {
 				type: String,
diff --git a/uni_modules/uni-search-bar/package.json b/uni_modules/uni-search-bar/package.json
index fab6ee95..c5f1238e 100644
--- a/uni_modules/uni-search-bar/package.json
+++ b/uni_modules/uni-search-bar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-search-bar",
   "displayName": "uni-search-bar 搜索栏",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "搜索栏组件，通常用于搜索商品、文章等",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-segmented-control/changelog.md b/uni_modules/uni-segmented-control/changelog.md
index f8605a5d..b3eacdca 100644
--- a/uni_modules/uni-segmented-control/changelog.md
+++ b/uni_modules/uni-segmented-control/changelog.md
@@ -1,4 +1,6 @@
-## 1.0.5（2021-05-12）
-- 新增 项目示例地址
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-05-12）
+- 新增 项目示例地址
 ## 1.0.4（2021-02-05）
 - 调整为uni_modules目录规范
diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
index ad97dff8..e3f6e5ec 100644
--- a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
+++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
@@ -35,6 +35,7 @@
 
 	export default {
 		name: 'UniSegmentedControl',
+		emits:['clickItem'],
 		props: {
 			current: {
 				type: Number,
diff --git a/uni_modules/uni-segmented-control/package.json b/uni_modules/uni-segmented-control/package.json
index bcc37302..56807131 100644
--- a/uni_modules/uni-segmented-control/package.json
+++ b/uni_modules/uni-segmented-control/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-segmented-control",
   "displayName": "uni-segmented-control 分段器",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-share/changelog.md b/uni_modules/uni-share/changelog.md
index 00875ac1..a655c2e7 100644
--- a/uni_modules/uni-share/changelog.md
+++ b/uni_modules/uni-share/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.5（2021-08-05）
+优化代码实现，修改原来用`eval()`函数实现的逻辑
 ## 1.0.4（2021-06-07）
 为符合苹果应用市场的审核，只显示存在对应的分享客户端的选项。如：配置包含微信分享，但是用户手机上并没有安装微信，就不显示微信分享。
 ## 1.0.2（2021-05-06）
diff --git a/uni_modules/uni-share/js_sdk/uni-image-menu.js b/uni_modules/uni-share/js_sdk/uni-image-menu.js
index 26c0c1f5..b482b833 100644
--- a/uni_modules/uni-share/js_sdk/uni-image-menu.js
+++ b/uni_modules/uni-share/js_sdk/uni-image-menu.js
@@ -1,18 +1,13 @@
 var nvMask,nvImageMenu;
 export default {
 	show({list,cancelText},callback){
+		console.log(789789879);
 		if(!list){
 			list = [{
-				"img":"https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-dc-site/9a952c80-6080-11eb-a16f-5b3e54966275.png",
+				"img":"/static/sharemenu/wechatfriend.png",
 				"text":"图标文字"
 			}]
 		}
-		if(list.length>8){
-			return uni.showToast({
-				title: '目前版本最多支持8个图标',
-				icon: 'none'
-			});
-		}
 		//以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
 		var screenWidth = plus.screen.resolutionWidth
 		//以360px宽度屏幕为例，上下左右边距及2排按钮边距留25像素，图标宽度55像素，同行图标间的间距在360宽的屏幕是30px，但需要动态计算，以此原则计算4列图标分别的left位置
@@ -36,6 +31,9 @@ export default {
 		var left4 = left1 + (iconWidth + iconSpace) * 3
 		var top1 = left1
 		var top2 = top1 + iconWidth + icontextSpace + textHeight + left1
+		
+		const TOP = {top1,top2}, LEFT = {left1,left2,left3,left4};
+		
 		nvMask = new plus.nativeObj.View("nvMask", { //先创建遮罩层
 			top: '0px',
 			left: '0px',
@@ -61,8 +59,8 @@ export default {
 				tag: 'img',
 				src: item.img,
 				position: {
-					top: eval('top'+( parseInt(i/4) +1)),
-					left: eval('left'+(1+i%4)),
+					top: TOP['top'+( parseInt(i/4) +1)],
+					left: LEFT['left'+(1+i%4)],
 					width: iconWidth,
 					height: iconWidth
 				}
@@ -74,8 +72,8 @@ export default {
 					size: textHeight
 				},
 				position: {
-					top: eval('top'+(parseInt(i/4)+1)) + iconWidth + icontextSpace,
-					left: eval('left'+(1+i%4)),
+					top: TOP['top'+(parseInt(i/4)+1)] + iconWidth + icontextSpace,
+					left: LEFT['left'+(1+i%4)],
 					width: iconWidth,
 					height: textHeight
 				}
diff --git a/uni_modules/uni-share/js_sdk/uni-share.js b/uni_modules/uni-share/js_sdk/uni-share.js
index 2b2b3494..99d118de 100644
--- a/uni_modules/uni-share/js_sdk/uni-share.js
+++ b/uni_modules/uni-share/js_sdk/uni-share.js
@@ -10,16 +10,25 @@ export default async (param,callback) => {
 				menus.push(item)
 			}
 		})
-		console.log(menus);
+		// console.log(menus);
 		uniImageMenu.show({list:menus,cancelText:param.cancelText}, e => {
-			console.log(e);
 			if (typeof(menus[e]['share']) == 'string') {
-				eval(menus[e]['share']+'()')
+				switch (menus[e]['share']){
+					case "copyurl":
+						copyurl()
+						break;
+					case "shareSystem":
+						shareSystem()
+						break;
+					default:
+						console.error('未知事件名称:'+menus[e]['share']);
+						break;
+				}
 			} else {
-				// console.log(123456,{
-				// 	...param.content,
-				// 	...menus[e].share,
-				// });
+				console.log(123456,{
+					...param.content,
+					...menus[e].share,
+				});
 				uni.share({
 					...param.content,
 					...menus[e].share,
diff --git a/uni_modules/uni-share/package.json b/uni_modules/uni-share/package.json
index d9f36bc6..7c6ef194 100644
--- a/uni_modules/uni-share/package.json
+++ b/uni_modules/uni-share/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-share",
   "displayName": "uni-share",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "底部弹出宫格图标式的分享菜单，可覆盖原生组件。",
   "keywords": [
     "分享菜单"
@@ -69,6 +69,10 @@
         "快应用": {
           "华为": "n",
           "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
         }
       }
     }
diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md
index 82f98c67..080c2510 100644
--- a/uni_modules/uni-swipe-action/changelog.md
+++ b/uni_modules/uni-swipe-action/changelog.md
@@ -1,3 +1,6 @@
+## 1.2.1（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 修复 跨页面修改组件数据 ，导致不能滑动的问题
 ## 1.1.10（2021-06-17）
 - 修复 按钮点击执行两次的bug
 ## 1.1.9（2021-05-12）
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
index 0b7b25f2..29d4e9a2 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
@@ -27,6 +27,7 @@ export default {
 		}
 	},
 	created() {
+		this.swipeaction = this.getSwipeAction()
 		if (this.swipeaction.children !== undefined) {
 			this.swipeaction.children.push(this)
 		}
@@ -38,13 +39,13 @@ export default {
 		this.rightButton = this.getEl(this.$refs['selector-right-button--hock']);
 		this.init()
 	},
-	beforeDestroy() {
-		this.swipeaction.children.forEach((item, index) => {
-			if (item === this) {
-				this.swipeaction.children.splice(index, 1)
-			}
-		})
-	},
+	// beforeDestroy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
 	methods: {
 		init() {
 			this.$nextTick(() => {
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
index 5958a101..07c58a25 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
@@ -20,18 +20,19 @@ export default {
 		}
 	},
 	created() {
+		this.swipeaction = this.getSwipeAction()
 		if (this.swipeaction.children !== undefined) {
 			this.swipeaction.children.push(this)
 		}
 	},
 
-	beforeDestroy() {
-		this.swipeaction.children.forEach((item, index) => {
-			if (item === this) {
-				this.swipeaction.children.splice(index, 1)
-			}
-		})
-	},
+	// beforeDestroy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
 	mounted() {
 		this.isopen = false
 		setTimeout(() => {
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
index 8c29186b..36306ce4 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
@@ -29,19 +29,20 @@ export default {
 		}
 	},
 	mounted() {
+		this.swipeaction = this.getSwipeAction()
 		// this.position = {}
 		if (this.swipeaction.children !== undefined) {
 			this.swipeaction.children.push(this)
 		}
 		this.init()
 	},
-	beforeDestoy() {
-		this.swipeaction.children.forEach((item, index) => {
-			if (item === this) {
-				this.swipeaction.children.splice(index, 1)
-			}
-		})
-	},
+	// beforeDestoy() {
+	// 	this.swipeaction.children.forEach((item, index) => {
+	// 		if (item === this) {
+	// 			this.swipeaction.children.splice(index, 1)
+	// 		}
+	// 	})
+	// },
 	methods: {
 		init(){
 			clearTimeout(this.timer)
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
index 8215e250..8a12e946 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
@@ -7,14 +7,6 @@ export default {
 			btn: "[]"
 		}
 	},
-	// computed: {
-	// 	pos() {
-	// 		return JSON.stringify(this.position)
-	// 	},
-	// 	btn() {
-	// 		return JSON.stringify(this.button)
-	// 	}
-	// },
 	watch: {
 		button: {
 			handler(newVal) {
@@ -38,6 +30,7 @@ export default {
 		}
 	},
 	created() {
+		this.swipeaction = this.getSwipeAction()
 		if (this.swipeaction.children !== undefined) {
 			this.swipeaction.children.push(this)
 		}
@@ -45,12 +38,9 @@ export default {
 	mounted() {
 		this.init()
 	},
-	beforeDestroy() {
-		this.swipeaction.children.forEach((item, index) => {
-			if (item === this) {
-				this.swipeaction.children.splice(index, 1)
-			}
-		})
+	// fixme by mehaotian 在页面激活的时候需要重新获取元素信息
+	activated(){
+		this.init()
 	},
 	methods: {
 		init() {
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
index eb1032dc..b8cb8651 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -2,62 +2,36 @@
 	<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
 	<!-- #ifdef APP-VUE || MP-WEIXIN || H5 -->
 	<view class="uni-swipe">
-		<view
-		    class="uni-swipe_box"
-		    :data-threshold="threshold"
-		    :data-disabled="disabled"
-		    :change:prop="swipe.sizeReady"
-		    :prop="btn"
-		    @touchstart="swipe.touchstart"
-		    @touchmove="swipe.touchmove"
-		    @touchend="swipe.touchend"
-				@mousedown="swipe.mousedown"
-				@mousemove="swipe.mousemove"
-				@mouseup="swipe.mouseup"
-				@mouseleave="swipe.mouseleave"
-		>
+		<view class="uni-swipe_box" :data-threshold="threshold" :data-disabled="disabled" :change:prop="swipe.sizeReady"
+			:prop="btn" @touchstart="swipe.touchstart" @touchmove="swipe.touchmove" @touchend="swipe.touchend"
+			@mousedown="swipe.mousedown" @mousemove="swipe.mousemove" @mouseup="swipe.mouseup"
+			@mouseleave="swipe.mouseleave">
 			<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
 			<view class="uni-swipe_button-group button-group--left">
 				<slot name="left">
-					<view
-					    v-for="(item,index) in leftOptions"
-					    :data-button="btn"
-					    :key="index"
-					    :style="{
+					<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}"
-					    class="uni-swipe_button button-hock"
-					    @touchstart="appTouchStart"
-					    @touchend="appTouchEnd($event,index,item,'left')"
-							@click.stop="onClickForPC(index,item,'left')"
-					><text
-						    class="uni-swipe_button-text"
-						    :style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}"
-						>{{ item.text }}</text></view>
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+						@touchend="appTouchEnd($event,index,item,'left')" @click.stop="onClickForPC(index,item,'left')">
+						<text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					</view>
 				</slot>
-			</view>
-			<view class="uni-swipe_text--center">
+			</view>
+			<view class="uni-swipe_text--center">
 				<slot></slot>
 			</view>
 			<view class="uni-swipe_button-group button-group--right">
 				<slot name="right">
-					<view
-					    v-for="(item,index) in rightOptions"
-					    :data-button="btn"
-					    :key="index"
-					    :style="{
+					<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}"
-					    class="uni-swipe_button button-hock"
-					    @touchstart="appTouchStart"
-					    @touchend="appTouchEnd($event,index,item,'right')"
-							@click.stop="onClickForPC(index,item,'right')"
-					><text
-						    class="uni-swipe_button-text"
-						    :style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}"
-						>{{ item.text }}</text></view>
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+						@touchend="appTouchEnd($event,index,item,'right')"
+						@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					</view>
 				</slot>
 			</view>
 		</view>
@@ -65,58 +39,30 @@
 	<!-- #endif -->
 	<!-- app nvue端 使用 bindingx -->
 	<!-- #ifdef APP-NVUE -->
-	<view
-	    ref="selector-box--hock"
-	    class="uni-swipe"
-	    @horizontalpan="touchstart"
-	    @touchend="touchend"
-	>
-		<view
-		    ref='selector-left-button--hock'
-		    class="uni-swipe_button-group button-group--left"
-		>
+	<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+		<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
 			<slot name="left">
-				<view
-				    v-for="(item,index) in leftOptions"
-				    :data-button="btn"
-				    :key="index"
-				    :style="{
+				<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
 				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 				  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-				}"
-				    class="uni-swipe_button button-hock"
-				    @click.stop="onClick(index,item,'left')"
-				><text
-					    class="uni-swipe_button-text"
-					    :style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}"
-					>{{ item.text }}</text></view>
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
+						class="uni-swipe_button-text"
+						:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+				</view>
 			</slot>
 		</view>
-		<view
-		    ref='selector-right-button--hock'
-		    class="uni-swipe_button-group button-group--right"
-		>
+		<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
 			<slot name="right">
-				<view
-				    v-for="(item,index) in rightOptions"
-				    :data-button="btn"
-				    :key="index"
-				    :style="{
+				<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
 				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 				  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-				}"
-				    class="uni-swipe_button button-hock"
-				    @click.stop="onClick(index,item,'right')"
-				><text
-					    class="uni-swipe_button-text"
-					    :style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}"
-					>{{ item.text }}</text></view>
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
+						class="uni-swipe_button-text"
+						:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+				</view>
 			</slot>
 		</view>
-		<view
-		    ref='selector-content--hock'
-		    class="uni-swipe_box"
-		>
+		<view ref='selector-content--hock' class="uni-swipe_box">
 			<slot></slot>
 		</view>
 	</view>
@@ -124,51 +70,29 @@
 	<!-- 其他平台使用 js ，长列表性能可能会有影响-->
 	<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
 	<view class="uni-swipe">
-		<view
-		    class="uni-swipe_box"
-		    @touchstart="touchstart"
-		    @touchmove="touchmove"
-		    @touchend="touchend"
-		    :style="{transform:moveLeft}"
-		    :class="{ani:ani}"
-		>
+		<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
+			:style="{transform:moveLeft}" :class="{ani:ani}">
 			<view class="uni-swipe_button-group button-group--left">
 				<slot name="left">
-					<view
-					    v-for="(item,index) in leftOptions"
-					    :data-button="btn"
-					    :key="index"
-					    :style="{
+					<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}"
-					    class="uni-swipe_button button-hock"
-					    @touchstart="appTouchStart"
-					    @touchend="appTouchEnd($event,index,item,'left')"
-					><text
-						    class="uni-swipe_button-text"
-						    :style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}"
-						>{{ item.text }}</text></view>
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+						@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					</view>
 				</slot>
 			</view>
 			<slot></slot>
 			<view class="uni-swipe_button-group button-group--right">
 				<slot name="right">
-					<view
-					    v-for="(item,index) in rightOptions"
-					    :data-button="btn"
-					    :key="index"
-					    :style="{
+					<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}"
-					    @touchstart="appTouchStart"
-					    @touchend="appTouchEnd($event,index,item,'right')"
-					    class="uni-swipe_button button-hock"
-					><text
-						    class="uni-swipe_button-text"
-						    :style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}"
-						>{{ item.text }}</text></view>
+					}" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')"
+						class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					</view>
 				</slot>
 			</view>
 		</view>
@@ -176,11 +100,7 @@
 	<!-- #endif -->
 
 </template>
-<script
-    src="./index.wxs"
-    module="swipe"
-    lang="wxs"
-></script>
+<script src="./index.wxs" module="swipe" lang="wxs"></script>
 <script>
 	// #ifdef APP-VUE|| MP-WEIXIN || H5
 	import mpwxs from './mpwxs'
@@ -200,7 +120,7 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
 	 * @property {Boolean} show = [left|right｜none] 	开启关闭组件，auto-close = false 时生效
 	 * @property {Boolean} disabled = [true|false] 		是否禁止滑动
-	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
+	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
 	 * @property {Number}  threshold 					滑动缺省值
 	 * @property {Array} leftOptions 					左侧选项内容及样式
 	 * @property {Array} rgihtOptions 					右侧选项内容及样式
@@ -221,12 +141,12 @@
 		mixins: [mixins],
 		// #endif
 
-		props: {
-			// 控制开关
-			show: {
-				type: String,
-				default: 'none'
-			},
+		props: {
+			// 控制开关
+			show: {
+				type: String,
+				default: 'none'
+			},
 
 			// 禁用
 			disabled: {
@@ -238,38 +158,73 @@
 			autoClose: {
 				type: Boolean,
 				default: true
-			},
-
+			},
+
 			// 滑动缺省距离
 			threshold: {
 				type: Number,
 				default: 20
-			},
-
-			// 左侧按钮内容
-			leftOptions: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-
-			// 右侧按钮内容
-			rightOptions: {
-				type: Array,
-				default () {
-					return []
-				}
-			}
+			},
 
+			// 左侧按钮内容
+			leftOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+
+			// 右侧按钮内容
+			rightOptions: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
 		},
-		inject: ['swipeaction']
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+		
+		methods: {
+			uninstall() {
+				if (this.swipeaction) {
+					this.swipeaction.children.forEach((item, index) => {
+						if (item === this) {
+							this.swipeaction.children.splice(index, 1)
+						}
+					})
+				}
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getSwipeAction(name = 'uniSwipeAction') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
 	}
 </script>
-<style
-    lang="scss"
-    scoped
->
+<style lang="scss" scoped>
 	.uni-swipe {
 		position: relative;
 		/* #ifndef APP-NVUE */
@@ -281,6 +236,7 @@
 		/* #ifndef APP-NVUE */
 		display: flex;
 		flex-shrink: 0;
+		// touch-action: none;
 		/* #endif */
 		position: relative;
 	}
@@ -288,13 +244,13 @@
 	.uni-swipe_content {
 		// border: 1px red solid;
 	}
-
-	.uni-swipe_text--center {
-		width:100%;
-		/* #ifndef APP-NVUE */
-		cursor: grab;
-		/* #endif */
-	}
+
+	.uni-swipe_text--center {
+		width: 100%;
+		/* #ifndef APP-NVUE */
+		cursor: grab;
+		/* #endif */
+	}
 
 	.uni-swipe_button-group {
 		/* #ifndef APP-NVUE */
@@ -304,9 +260,9 @@
 		flex-direction: row;
 		position: absolute;
 		top: 0;
-		bottom: 0;
-		/* #ifdef H5 */
-		cursor: pointer;
+		bottom: 0;
+		/* #ifdef H5 */
+		cursor: pointer;
 		/* #endif */
 	}
 
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
index 2b2cb8be..70fd6d97 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue
@@ -11,15 +11,10 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=181
 	 */
 	export default {
-		name:"UniSwipeAction",
+		name:"uniSwipeAction",
 		data() {
 			return {};
 		},
-		provide() {
-			return {
-				swipeaction: this
-			};
-		},
 		created() {
 			this.children = [];
 		},
diff --git a/uni_modules/uni-swipe-action/package.json b/uni_modules/uni-swipe-action/package.json
index 7a9d5362..ba9fc825 100644
--- a/uni_modules/uni-swipe-action/package.json
+++ b/uni_modules/uni-swipe-action/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-swipe-action",
   "displayName": "uni-swipe-action 滑动操作",
-  "version": "1.1.10",
+  "version": "1.2.1",
   "description": "SwipeAction 滑动操作操作组件",
   "keywords": [
     "",
diff --git a/uni_modules/uni-swipe-action/readme.md b/uni_modules/uni-swipe-action/readme.md
index 2492bf93..d69e6118 100644
--- a/uni_modules/uni-swipe-action/readme.md
+++ b/uni_modules/uni-swipe-action/readme.md
@@ -103,7 +103,7 @@ export default {
       console.log('点击了'+(e.position === 'left' ? '左侧' : '右侧') + e.content.text + '按钮')
     },
     swipeChange(e,index){
-      console.log('当前状态：'+ open +'，下标：' + index)
+      console.log('当前状态：'+ e +'，下标：' + index)
     }
   }
 }
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
index 64fcf4bd..dd6e4449 100644
--- a/uni_modules/uni-swiper-dot/changelog.md
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -1,6 +1,8 @@
-## 1.0.6（2021-05-12）
-- 新增 示例地址
-- 修复 示例项目缺少组件的Bug
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
 ## 1.0.5（2021-02-05）
 - 调整为uni_modules目录规范
 - 新增 clickItem 事件，支持指示点控制轮播
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
index 452a2f0f..79c0816f 100644
--- a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -47,6 +47,7 @@
 
 	export default {
 		name: 'UniSwiperDot',
+		emits:['clickItem'],
 		props: {
 			info: {
 				type: Array,
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
index b6516778..31393d77 100644
--- a/uni_modules/uni-swiper-dot/package.json
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-swiper-dot",
   "displayName": "uni-swiper-dot 轮播图指示点",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "自定义轮播图指示点组件",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-table/changelog.md b/uni_modules/uni-table/changelog.md
index 6efc3e57..d8743f25 100644
--- a/uni_modules/uni-table/changelog.md
+++ b/uni_modules/uni-table/changelog.md
@@ -1,7 +1,9 @@
-## 1.0.7（2021-07-08）
-- 新增 uni-th 支持 date 日期筛选范围
-## 1.0.6（2021-07-05）
-- 新增 uni-th 支持 range 筛选范围
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-07-08）
+- 新增 uni-th 支持 date 日期筛选范围
+## 1.0.6（2021-07-05）
+- 新增 uni-th 支持 range 筛选范围
 ## 1.0.5（2021-06-28）
 - 新增 uni-th 筛选功能
 ## 1.0.4（2021-05-12）
diff --git a/uni_modules/uni-table/components/uni-table/uni-table.vue b/uni_modules/uni-table/components/uni-table/uni-table.vue
index b74a44a0..d8d49db1 100644
--- a/uni_modules/uni-table/components/uni-table/uni-table.vue
+++ b/uni_modules/uni-table/components/uni-table/uni-table.vue
@@ -38,6 +38,7 @@ export default {
 	options: {
 		virtualHost: true
 	},
+	emits:['selection-change'],
 	props: {
 		data: {
 			type: Array,
diff --git a/uni_modules/uni-table/components/uni-th/filter-dropdown.vue b/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
index 40734af3..0045f965 100644
--- a/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
+++ b/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
@@ -82,6 +82,7 @@
 
 	export default {
 		name: 'FilterDropdown',
+		emits:['change'],
 		components: {
 			checkBox
 		},
@@ -499,4 +500,4 @@
 		background-color: #1890ff;
 		color: #ffffff;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-table/components/uni-th/uni-th.vue b/uni_modules/uni-table/components/uni-th/uni-th.vue
index 8d73f66d..d87f1e82 100644
--- a/uni_modules/uni-table/components/uni-th/uni-th.vue
+++ b/uni_modules/uni-table/components/uni-th/uni-th.vue
@@ -44,6 +44,7 @@ export default {
 	components: {
 		dropdown
 	},
+	emits:['sort-change','filter-change'],
 	props: {
 		width: {
 			type: [String, Number],
diff --git a/uni_modules/uni-table/components/uni-tr/table-checkbox.vue b/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
index 87e58a94..7c315603 100644
--- a/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
+++ b/uni_modules/uni-table/components/uni-tr/table-checkbox.vue
@@ -12,6 +12,7 @@
 <script>
 	export default {
 		name: 'TableCheckbox',
+		emits:['checkboxSelected'],
 		props: {
 			indeterminate: {
 				type: Boolean,
diff --git a/uni_modules/uni-table/package.json b/uni_modules/uni-table/package.json
index f5309554..ad55cc3c 100644
--- a/uni_modules/uni-table/package.json
+++ b/uni_modules/uni-table/package.json
@@ -1,8 +1,8 @@
 {
   "id": "uni-table",
   "displayName": "uni-table 表格",
-  "version": "1.0.7",
-  "description": "用于展示多条结构类似的数据",
+  "version": "1.1.0",
+  "description": "表格组件，多用于展示多条结构类似的数据，如",
   "keywords": [
     "uni-ui",
     "uniui",
diff --git a/uni_modules/uni-tag/changelog.md b/uni_modules/uni-tag/changelog.md
index 10628715..e931d541 100644
--- a/uni_modules/uni-tag/changelog.md
+++ b/uni_modules/uni-tag/changelog.md
@@ -1,10 +1,12 @@
-## 1.0.7（2021-06-18）
-- 修复 uni-tag 在字节跳动小程序上 css 类名编译错误的 bug
-## 1.0.6（2021-06-04）
-- 修复 未定义 sass 变量 "$uni-color-royal" 的bug
-## 1.0.5（2021-05-10）
-- 修复 royal 类型无效的bug
-- 修复 uni-tag 宽度不自适应的bug
-- 新增 uni-tag 支持属性 custom-style 自定义样式
-## 1.0.4（2021-02-05）
-- 调整为uni_modules目录规范
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-06-18）
+- 修复 uni-tag 在字节跳动小程序上 css 类名编译错误的 bug
+## 1.0.6（2021-06-04）
+- 修复 未定义 sass 变量 "$uni-color-royal" 的bug
+## 1.0.5（2021-05-10）
+- 修复 royal 类型无效的bug
+- 修复 uni-tag 宽度不自适应的bug
+- 新增 uni-tag 支持属性 custom-style 自定义样式
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
index 06ebee01..498d3642 100644
--- a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
+++ b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
@@ -26,6 +26,7 @@
 
 	export default {
 		name: "UniTag",
+		emits:['click'],
 		props: {
 			type: {
 				// 标签类型default、primary、success、warning、error、royal
diff --git a/uni_modules/uni-tag/package.json b/uni_modules/uni-tag/package.json
index 3ccb4206..6a4c65ef 100644
--- a/uni_modules/uni-tag/package.json
+++ b/uni_modules/uni-tag/package.json
@@ -1,83 +1,83 @@
-{
-  "id": "uni-tag",
-  "displayName": "uni-tag 标签",
-  "version": "1.0.7",
-  "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "",
-    "tag",
-    "标签"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-tag",
+  "displayName": "uni-tag 标签",
+  "version": "1.1.0",
+  "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "",
+    "tag",
+    "标签"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
index 6dfd8520..2c33b5e2 100644
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -1,6 +1,8 @@
-## 1.1.1（2021-05-12）
-- 新增 示例地址
-- 修复 示例项目缺少组件的Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
 ## 1.1.0（2021-04-22）
 - 新增 通过方法自定义动画
 - 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
index 77d9a499..5a16f89a 100644
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -23,6 +23,7 @@ import { createAnimation } from './createAnimation'
  */
 export default {
 	name: 'uniTransition',
+	emits:['click','change'],
 	props: {
 		show: {
 			type: Boolean,
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
index 77b7f72b..481270d9 100644
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-transition",
   "displayName": "uni-transition 过渡动画",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "元素的简单过渡动画",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
index ad75fd64..f3986238 100644
--- a/uni_modules/uni-transition/readme.md
+++ b/uni_modules/uni-transition/readme.md
@@ -78,13 +78,11 @@ export default {
 </style>
 <style lang="scss">
 /* 如果使用 scss 需要使用 /deep/  */
-/* #ifndef APP-NVUE  || VUE3 */
 .content /deep/ .custom-transition {
 	width:100px;
 	height:100px;
 	background-color:red;
 }
-/* #endif */
 </style>
 ```
 
diff --git a/uni_modules/uni-ui/changelog.md b/uni_modules/uni-ui/changelog.md
index 8744efeb..5b8534a6 100644
--- a/uni_modules/uni-ui/changelog.md
+++ b/uni_modules/uni-ui/changelog.md
@@ -1,3 +1,35 @@
+## 1.3.9（2021-08-02）
+- uni-datetime-picker 新增 return-type 属性支持返回 date 日期对象
+- uni-file-picker 修复 fileExtname属性不指定值报错的Bug
+- uni-file-picker 修复 在某种场景下图片不回显的Bug
+- uni-link 支持自定义插槽
+## 1.3.8（2021-07-31）
+- uni-ui 组件兼容 vue3
+- uni-collapse 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+- uni-collapse 优化 组件示例
+- uni-collapse 新增 组件折叠动画
+- uni-collapse 新增 value\v-model 属性 ，动态修改面板折叠状态
+- uni-collapse 新增 title 插槽 ，可定义面板标题
+- uni-collapse 新增 border 属性 ，显示隐藏面板内容分隔线
+- uni-collapse 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- uni-collapse 修复 resize 方法失效的Bug
+- uni-collapse 修复 change 事件返回参数不正确的Bug
+- uni-collapse 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+- uni-data-checkbox 优化 在uni-forms组件，与label不对齐的问题
+- uni-data-checkbox 修复 单选默认值为0不能选中的Bug
+- uni-easyinput 优化 errorMessage 属性支持 Boolean 类型
+- uni-file-picker 修复 return-type为object下，返回值不正确的Bug
+- uni-file-picker 修复（重要） H5 平台下如果和uni-forms组件一同使用导致页面卡死的问题
+- uni-file-picker 优化 h5平台下上传文件导致页面卡死的问题
+- uni-forms 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
+- uni-forms 修复 1.2.1 引起的示例在小程序平台报错的Bug
+- uni-forms 修复 动态校验表单，默认值为空的情况下校验失效的Bug
+- uni-forms 修复 不指定name属性时，运行报错的Bug
+- uni-forms 优化 label默认宽度从65调整至70，使required为true且四字时不换行
+- uni-forms 优化 组件示例，新增动态校验示例代码
+- uni-forms 优化 组件文档，使用方式更清晰
+- uni-list 修复 与其他组件嵌套使用时，点击失效的Bug
+- uni-swipe-action 修复 跨页面修改组件数据 ，导致不能滑动的问题
 ## 1.3.7（2021-07-16）
 - uni-ui 兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 - uni-datetime-picker 修复 单选日期类型，初始赋值后不在当前日历的 bug
diff --git a/uni_modules/uni-ui/components/uni-ui/uni-ui.vue b/uni_modules/uni-ui/components/uni-ui/uni-ui.vue
index 0970892f..eaba9abf 100644
--- a/uni_modules/uni-ui/components/uni-ui/uni-ui.vue
+++ b/uni_modules/uni-ui/components/uni-ui/uni-ui.vue
@@ -1,7 +1,7 @@
-<template>
-	<view>占位组件，请勿使用</view>
-</template>
-<script>
-</script>
-<style>
-</style>
+<template>
+	<view>占位组件，请勿使用</view>
+</template>
+<script>
+</script>
+<style>
+</style>
diff --git a/uni_modules/uni-ui/package.json b/uni_modules/uni-ui/package.json
index efa8521e..68b2a294 100644
--- a/uni_modules/uni-ui/package.json
+++ b/uni_modules/uni-ui/package.json
@@ -1,12 +1,11 @@
 {
   "id": "uni-ui",
   "displayName": "uni-ui",
-  "version": "1.3.7",
-  "description": "基于 uni-app 的 UI 组件库",
+  "version": "1.3.9",
+  "description": "uni-ui 是一个基于uni-app全端兼容的高性能UI框架",
   "keywords": [
     "uni-ui",
     "uniui",
-    "",
     "UI组件库",
     "ui框架",
     "ui库"
@@ -118,6 +117,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
         }
       }
     }
diff --git a/uni_modules_tools/copy/manifest.json b/uni_modules_tools/copy/manifest.json
index db05c056..ca120295 100644
--- a/uni_modules_tools/copy/manifest.json
+++ b/uni_modules_tools/copy/manifest.json
@@ -22,7 +22,7 @@
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
+            "alwaysShowBeforeRender" : false,
             "waiting" : true,
             "autoclose" : true,
             "delay" : 0
-- 
GitLab