- 更新表结构，解决部分clientDB操作没有权限的问题

b7fb0671 · DCloud_JSON · study夏羽 · eab26cd5 · b7fb0671 · b7fb0671
90 changed file
--- a/uni_modules/uni-calendar/changelog.md
+++ b/uni_modules/uni-calendar/changelog.md
+## 1.4.7（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.4.6（2022-09-08）
+- fix: 表头年月切换，导致改变当前日期为选择月1号，且未触发change事件
+## 1.4.5（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.4.4（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
 ## 1.4.3（2021-09-22）
 - 修复 startDate、 endDate 属性失效的 bug
 ## 1.4.2（2021-08-24）

--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -96,6 +96,13 @@
 </script>
 <style lang="scss" scoped>
+	$uni-font-size-base:14px;
+	$uni-text-color:#333;
+	$uni-font-size-sm:12px;
+	$uni-color-error: #e43d33;
+	$uni-opacity-disabled: 0.3;
+	$uni-text-color-disable:#c0c0c0;
+	$uni-primary: #2979ff !default;
 	.uni-calendar-item__weeks-box {
 		flex: 1;
 		/* #ifndef APP-NVUE */
@@ -145,11 +152,11 @@
 	}
 	.uni-calendar-item--isDay-text {
-		color: $uni-color-primary;
+		color: $uni-primary;
 	}
 	.uni-calendar-item--isDay {
-		background-color: $uni-color-primary;
+		background-color: $uni-primary;
 		opacity: 0.8;
 		color: #fff;
 	}
@@ -160,13 +167,13 @@
 	}
 	.uni-calendar-item--checked {
-		background-color: $uni-color-primary;
+		background-color: $uni-primary;
 		color: #fff;
 		opacity: 0.8;
 	}
 	.uni-calendar-item--multiple {
-		background-color: $uni-color-primary;
+		background-color: $uni-primary;
 		color: #fff;
 		opacity: 0.8;
 	}

--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -184,13 +184,13 @@
 				this.init(newVal)
 			},
 			startDate(val){
 				this.cale.resetSatrtDate(val)
 				this.cale.setDate(this.nowDate.fullDate)
 				this.weeks = this.cale.weeks
 			},
 			endDate(val){
 				this.cale.resetEndDate(val)
 				this.cale.setDate(this.nowDate.fullDate)
 				this.weeks = this.cale.weeks
 			},
 			selected(newVal) {
@@ -218,7 +218,7 @@
 			bindDateChange(e) {
 				const value = e.detail.value + '-1'
 				console.log(this.cale.getDate(value));
-				this.init(value)
+				this.setDate(value)
 			},
 			/**
 			 * 初始化日期显示
@@ -361,6 +361,14 @@
 </script>
 <style lang="scss" scoped>
+	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
+	$uni-border-color: #EDEDED;
+	$uni-text-color: #333;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-font-size-base:14px;
+	$uni-text-color-placeholder: #808080;
+	$uni-color-subtitle: #555555;
+	$uni-text-color-grey:#999;
 	.uni-calendar {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -388,17 +396,17 @@
 	}
 	.uni-calendar--fixed {
 		position: fixed;
 		/* #ifdef APP-NVUE */
 		bottom: 0;
 		/* #endif */
 		left: 0;
 		right: 0;
 		transition-property: transform;
 		transition-duration: 0.3s;
 		transform: translateY(460px);
 		/* #ifndef APP-NVUE */
 		bottom: calc(var(--window-bottom));
 		z-index: 99;
 		/* #endif */
 	}

--- a/uni_modules/uni-calendar/components/uni-calendar/util.js
+++ b/uni_modules/uni-calendar/components/uni-calendar/util.js
@@ -122,7 +122,6 @@ class Calendar {
 		let dateArr = []
 		let fullDate = this.date.fullDate
 		for (let i = 1; i <= dateData; i++) {
-			let isinfo = false
 			let nowDate = full.year + '-' + (full.month < 10 ?
 				full.month : full.month) + '-' + (i < 10 ?
 				'0' + i : i)
@@ -140,15 +139,15 @@ class Calendar {
 			let disableAfter = true
 			if (this.startDate) {
 				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
 				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
 				disableBefore = this.dateCompare(this.startDate, nowDate)
 			}
 			if (this.endDate) {
 				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
 				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
 				disableAfter = this.dateCompare(nowDate, this.endDate)
 			}
 			let multiples = this.multipleStatus.data
 			let checked = false
 			let multiplesStatus = -1
@@ -173,7 +172,7 @@ class Calendar {
 				lunar: this.getlunar(full.year, full.month, i),
 				disable: !(disableBefore && disableAfter),
 				isDay
 			}
 			if (info) {
 				data.extraInfo = info
 			}
@@ -283,17 +282,17 @@ class Calendar {
 		let {
 			before,
 			after
 		} = this.multipleStatus
 		if (!this.range) return
 		if (before && after) {
 			this.multipleStatus.before = ''
 			this.multipleStatus.after = ''
 			this.multipleStatus.data = []
 		} else {
 			if (!before) {
 				this.multipleStatus.before = fullDate
 			} else {
 				this.multipleStatus.after = fullDate
 				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
 					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
@@ -301,7 +300,7 @@ class Calendar {
 					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
 				}
 			}
 		}
 		this._getWeek(fullDate)
 	}
@@ -311,11 +310,8 @@ class Calendar {
 	 */
 	_getWeek(dateData) {
 		const {
-			fullDate,
 			year,
-			month,
+			month
-			date,
-			day
 		} = this.getDate(dateData)
 		let firstDay = new Date(year, month - 1, 1).getDay()
 		let currentDay = new Date(year, month, 0).getDate()
@@ -351,4 +347,4 @@ class Calendar {
 }
 export default Calendar
--- a/uni_modules/uni-calendar/package.json
+++ b/uni_modules/uni-calendar/package.json
 {
  "id": "uni-calendar",
  "displayName": "uni-calendar 日历",
-  "version": "1.4.3",
+  "version": "1.4.7",
  "description": "日历组件",
  "keywords": [
    "uni-ui",
@@ -18,11 +18,7 @@
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
    "sale": {
      "regular": {
        "price": "0.00"
@@ -39,7 +35,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
  },
  "uni_modules": {
    "dependencies": [],

--- a/uni_modules/uni-data-picker/changelog.md
+++ b/uni_modules/uni-data-picker/changelog.md
+## 1.0.8（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.0.7（2022-07-06）
+- 优化 pc端图标位置不正确的问题
+## 1.0.6（2022-07-05）
+- 优化 显示样式
+## 1.0.5（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
 ## 1.0.4（2022-04-19）
 - 修复 字节小程序 本地数据无法选择下一级的Bug
 ## 1.0.3（2022-02-25）
 - 修复 nvue 不支持的 v-show 的 bug
 ## 1.0.2（2022-02-25）
 - 修复 条件编译 nvue 不支持的 css 样式
 ## 1.0.1（2021-11-23）
 - 修复 由上个版本引发的map、v-model等属性不生效的bug
 ## 1.0.0（2021-11-19）
 - 优化 组件 UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-data-picker](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
 ## 0.4.9（2021-10-28）
 - 修复 VUE2 v-model 概率无效的 bug
 ## 0.4.8（2021-10-27）
 - 修复 v-model 概率无效的 bug
 ## 0.4.7（2021-10-25）
 - 新增 属性 spaceInfo 服务空间配置 HBuilderX 3.2.11+
 - 修复 树型 uniCloud 数据类型为 int 时报错的 bug
 ## 0.4.6（2021-10-19）
 - 修复 非 VUE3 v-model 为 0 时无法选中的 bug
 ## 0.4.5（2021-09-26）
 - 新增 清除已选项的功能（通过 clearIcon 属性配置是否显示按钮），同时提供 clear 方法以供调用，二者等效
 - 修复 readonly 为 true 时报错的 bug
 ## 0.4.4（2021-09-26）
 - 修复 上一版本造成的 map 属性失效的 bug
 - 新增 ellipsis 属性，支持配置 tab 选项长度过长时是否自动省略
 ## 0.4.3（2021-09-24）
 - 修复 某些情况下级联未触发的 bug
 ## 0.4.2（2021-09-23）
 - 新增 提供 show 和 hide 方法，开发者可以通过 ref 调用
 - 新增 选项内容过长自动添加省略号
 ## 0.4.1（2021-09-15）
 - 新增 map 属性 字段映射，将 text/value 映射到数据中的其他字段
 ## 0.4.0（2021-07-13）
 - 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.3.5（2021-06-04）
 - 修复 无法加载云端数据的问题
 ## 0.3.4（2021-05-28）
 - 修复 v-model 无效问题
 - 修复 loaddata 为空数据组时加载时间过长问题
 - 修复 上个版本引出的本地数据无法选择带有 children 的 2 级节点
 ## 0.3.3（2021-05-12）
 - 新增 组件示例地址
 ## 0.3.2（2021-04-22）
 - 修复 非树形数据有 where 属性查询报错的问题
 ## 0.3.1（2021-04-15）
 - 修复 本地数据概率无法回显时问题
 ## 0.3.0（2021-04-07）
 - 新增 支持云端非树形表结构数据
 - 修复 根节点 parent_field 字段等于 null 时选择界面错乱问题
 ## 0.2.0（2021-03-15）
 - 修复 nodeclick、popupopened、popupclosed 事件无法触发的问题
 ## 0.1.9（2021-03-09）
 - 修复 微信小程序某些情况下无法选择的问题
 ## 0.1.8（2021-02-05）
 - 优化 部分样式在 nvue 上的兼容表现
 ## 0.1.7（2021-02-05）
 - 调整为 uni_modules 目录规范
--- a/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js
 // #ifdef H5
 export default {
  name: 'Keypress',
  props: {
    disable: {
      type: Boolean,
      default: false
    }
  },
  mounted () {
    const keyNames = {
      esc: ['Esc', 'Escape'],
      tab: 'Tab',
      enter: 'Enter',
      space: [' ', 'Spacebar'],
      up: ['Up', 'ArrowUp'],
      left: ['Left', 'ArrowLeft'],
      right: ['Right', 'ArrowRight'],
      down: ['Down', 'ArrowDown'],
      delete: ['Backspace', 'Delete', 'Del']
    }
    const listener = ($event) => {
      if (this.disable) {
        return
      }
      const keyName = Object.keys(keyNames).find(key => {
        const keyName = $event.key
        const value = keyNames[key]
        return value === keyName || (Array.isArray(value) && value.includes(keyName))
      })
      if (keyName) {
        // 避免和其他按键事件冲突
        setTimeout(() => {
          this.$emit(keyName, {})
        }, 0)
      }
    }
    document.addEventListener('keyup', listener)
    this.$once('hook:beforeDestroy', () => {
      document.removeEventListener('keyup', listener)
    })
  },
 	render: () => {}
 }
 // #endif
--- a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -10,7 +10,7 @@
 					<scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
 						<view class="selected-list">
 							<view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
-								<text>{{item.text}}</text><text v-if="index<inputSelected.length-1"
+								<text class="text-color">{{item.text}}</text><text v-if="index<inputSelected.length-1"
 									class="input-split-line">{{split}}</text>
 							</view>
 						</view>
@@ -18,7 +18,7 @@
 					<text v-else class="selected-area placeholder">{{placeholder}}</text>
 					<view v-if="clearIcon && !readonly && inputSelected.length" class="icon-clear"
 						@click.stop="clear">
-						<uni-icons type="clear" color="#e1e1e1" size="14"></uni-icons>
+						<uni-icons type="clear" color="#c0c4cc" size="24"></uni-icons>
 					</view>
 					<view class="arrow-area" v-if="(!clearIcon || !inputSelected.length) && !readonly ">
 						<view class="input-arrow"></view>
@@ -212,7 +212,9 @@
 			},
 			onchange(e) {
 				this.hide()
-				this.inputSelected = e
+				this.$nextTick(() => {
+					this.inputSelected = e;
+				})
 				this._dispatchEvent(e)
 			},
 			_processReadonly(dataList, value) {
@@ -294,6 +296,7 @@
 <style >
 	.uni-data-tree {
+		flex: 1;
 		position: relative;
 		font-size: 14px;
 	}
@@ -310,11 +313,13 @@
 		align-items: center;
 		flex-wrap: nowrap;
 		font-size: 14px;
-		line-height: 38px;
+		/* line-height: 35px; */
-		padding: 0 5px;
+		padding: 0 10px;
+		padding-right: 5px;
 		overflow: hidden;
-		/* #ifdef APP-NVUE */
+		height: 35px;
-		height: 40px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
 		/* #endif */
 	}
@@ -347,19 +352,24 @@
 		/* #endif */
 		flex-direction: row;
 		flex-wrap: nowrap;
-		padding: 0 5px;
+		/* padding: 0 5px; */
 	}
 	.selected-item {
 		flex-direction: row;
-		padding: 0 1px;
+		/* padding: 0 1px; */
 		/* #ifndef APP-NVUE */
 		white-space: nowrap;
 		/* #endif */
 	}
+	.text-color {
+		color: #333;
+	}
 	.placeholder {
 		color: grey;
+		font-size: 12px;
 	}
 	.input-split-line {
@@ -475,6 +485,11 @@
 		flex: 1;
 		overflow: hidden;
 	}
+	.icon-clear {
+		display: flex;
+		align-items: center;
+	}
 	/* #ifdef H5 */
 	@media all and (min-width: 768px) {
@@ -500,14 +515,14 @@
 		}
 		.icon-clear {
-			margin-right: 5px;
+			/* margin-right: 5px; */
 		}
 	}
 	/* #endif */
 	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
 	/* #ifndef APP-NVUE */
 	.uni-popper__arrow,
 	.uni-popper__arrow::after {
 		position: absolute;
@@ -534,6 +549,6 @@
 		margin-left: -6px;
 		border-top-width: 0;
 		border-bottom-color: #fff;
 	}
 	/* #endif */
 	</style>
--- a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
--- a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -5,16 +5,16 @@
 				<template v-for="(item,index) in selected">
 					<view class="selected-item"
 						:class="{'selected-item-active':index==selectedIndex, 'selected-item-text-overflow': ellipsis}"
-						:key="index" v-if="item.text" @click="handleSelect(index)">
+						 v-if="item.text" @click="handleSelect(index)">
 						<text class="">{{item.text}}</text>
 					</view>
 				</template>
 			</view>
 		</scroll-view>
 		<view class="tab-c">
-			<template v-for="(child, i) in dataList">
+			<template v-for="(child, i) in dataList" >
 				<scroll-view class="list" :key="i" v-if="i==selectedIndex" :scroll-y="true">
-					<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child" :key="j"
+					<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child"
 						@click="handleNodeClick(item, i, j)">
 						<text class="item-text item-text-overflow">{{item[map.text]}}</text>
 						<view class="check" v-if="selected.length > i && item[map.value] == selected[i].value"></view>
@@ -177,7 +177,9 @@
 		}
 	}
 </script>
-<style >
+<style lang="scss">
+	$uni-primary: #007aff !default;
 	.uni-data-pickerview {
 		flex: 1;
 		/* #ifndef APP-NVUE */
@@ -265,11 +267,11 @@
 	}
 	.selected-item-active {
-		border-bottom: 2px solid #007aff;
+		border-bottom: 2px solid $uni-primary;
 	}
 	.selected-item-text {
-		color: #007aff;
+		color: $uni-primary;
 	}
 	.tab-c {
@@ -319,7 +321,7 @@
 	.check {
 		margin-right: 5px;
-		border: 2px solid #007aff;
+		border: 2px solid $uni-primary;
 		border-left: 0;
 		border-top: 0;
 		height: 12px;

--- a/uni_modules/uni-data-picker/package.json
+++ b/uni_modules/uni-data-picker/package.json
 {
  "id": "uni-data-picker",
  "displayName": "uni-data-picker 数据驱动的picker选择器",
-  "version": "1.0.4",
+  "version": "1.0.8",
  "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
  "keywords": [
    "uni-ui",
    "uniui",
    "picker",
    "级联",
    "省市区",
    ""
 ],
  "repository": "https://github.com/dcloudio/uni-ui",
  "engines": {
    "HBuilderX": ""
  },
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
+    "sale": {
-      "前端组件",
+      "regular": {
-      "通用组件"
+        "price": "0.00"
-    ],
+      },
-    "sale": {
+      "sourcecode": {
-      "regular": {
+        "price": "0.00"
-        "price": "0.00"
+      }
-      },
+    },
-      "sourcecode": {
+    "contact": {
-        "price": "0.00"
+      "qq": ""
-      }
+    },
-    },
+    "declaration": {
-    "contact": {
+      "ads": "无",
-      "qq": ""
+      "data": "无",
-    },
+      "permissions": "无"
-    "declaration": {
+    },
-      "ads": "无",
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-      "data": "无",
+    "type": "component-vue"
-      "permissions": "无"
+  },
-    },
+  "uni_modules": {
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "dependencies": [
-  },
+      "uni-load-more",
-  "uni_modules": {
+			"uni-icons",
-    "dependencies": [
+			"uni-scss"
-      "uni-load-more",
+    ],
-			"uni-icons",
+    "encrypt": [],
-			"uni-scss"
+    "platforms": {
-    ],
+      "cloud": {
-    "encrypt": [],
+        "tcb": "y",
-    "platforms": {
+        "aliyun": "y"
-      "cloud": {
+      },
-        "tcb": "y",
+      "client": {
-        "aliyun": "y"
+        "App": {
-      },
+          "app-vue": "y",
-      "client": {
+          "app-nvue": "u"
-        "App": {
+        },
-          "app-vue": "y",
+        "H5-mobile": {
-          "app-nvue": "y"
+          "Safari": "y",
-        },
+          "Android Browser": "y",
-        "H5-mobile": {
+          "微信浏览器(Android)": "y",
-          "Safari": "y",
+          "QQ浏览器(Android)": "y"
-          "Android Browser": "y",
+        },
-          "微信浏览器(Android)": "y",
+        "H5-pc": {
-          "QQ浏览器(Android)": "y"
+          "Chrome": "y",
-        },
+          "IE": "y",
-        "H5-pc": {
+          "Edge": "y",
-          "Chrome": "y",
+          "Firefox": "y",
-          "IE": "y",
+          "Safari": "y"
-          "Edge": "y",
+        },
-          "Firefox": "y",
+        "小程序": {
-          "Safari": "y"
+          "微信": "y",
-        },
+          "阿里": "y",
-        "小程序": {
+          "百度": "y",
-          "微信": "y",
+          "字节跳动": "y",
-          "阿里": "y",
+        "QQ": "y",
-          "百度": "y",
+        "京东": "u"
-          "字节跳动": "y",
+        },
-          "QQ": "y"
+        "快应用": {
-        },
+          "华为": "u",
-        "快应用": {
+          "联盟": "u"
-          "华为": "u",
+        },
-          "联盟": "u"
+        "Vue": {
-        },
+            "vue2": "y",
-        "Vue": {
+            "vue3": "y"
-            "vue2": "y",
+        }
-            "vue3": "y"
+      }
-        }
+    }
-      }
+  }
-    }
-  }
 }
\ No newline at end of file
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select"  :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="current && clear" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
+					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
+							:key="index" @click="change(item)">
+							<text
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: []
+			};
+		},
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+      disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		created() {
+			this.last = `${this.collection}_last_selected_option_value`
+			if (this.collection && !this.localdata.length) {
+				this.mixinDatacomEasyGet()
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			// #ifndef VUE3
+			value() {
+				this.initDefVal()
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue() {
+				this.initDefVal()
+			},
+			// #endif
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			initDefVal() {
+				let defValue = ''
+				if ((this.value || this.value === 0) && !this.isDisabled(this.value)) {
+					defValue = this.value
+				} else if ((this.modelValue || this.modelValue === 0) && !this.isDisabled(this.modelValue)) {
+					defValue = this.modelValue
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = uni.getStorageSync(this.last)
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem < this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					this.emit(defValue)
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+				return isDisabled;
+			},
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					uni.removeStorageSync(this.last)
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					uni.setStorageSync(this.last, val)
+				}
+			},
+			toggleSelector() {
+        if(this.disabled){
+          return
+        }
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				return this.collection.indexOf('app-list') > 0 ?
+					`${text}(${value})` :
+					(
+						text ?
+						text :
+						`未命名${channel_code}`
+					)
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+    &--disabled{
+      background-color: #f5f7fa;
+      cursor: not-allowed;
+    }
+	}
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "0.1.9",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-data-select/readme.md
+++ b/uni_modules/uni-data-select/readme.md
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+当选项过多时，使用下拉菜单展示并选择内容
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/uni_modules/uni-datetime-picker/changelog.md
+++ b/uni_modules/uni-datetime-picker/changelog.md
+## 2.2.11（2022-09-19）
+- 修复，支付宝小程序样式错乱，[详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复，反向选择日期范围，日期显示异常，[详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的 bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的 bug，详见:[https://ask.dcloud.net.cn/question/140824?item_id=209458&rf=false](https://ask.dcloud.net.cn/question/140824?item_id=209458&rf=false)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化 bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的 bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的 bug
 ## 2.2.2（2021-12-10）
 - 修复 clear-icon 属性在小程序平台不生效的 bug
 ## 2.2.1（2021-12-10）

--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -62,6 +62,8 @@
 </script>
 <style lang="scss" >
+	$uni-primary: #007aff !default;
 	.uni-calendar-item__weeks-box {
 		flex: 1;
 		/* #ifndef APP-NVUE */
@@ -78,7 +80,7 @@
 		font-size: 14px;
 		// font-family: Lato-Bold, Lato;
 		font-weight: bold;
-		color: #455997;
+		color: darken($color: $uni-primary, $amount: 40%);
 	}
 	.uni-calendar-item__weeks-lunar-text {
@@ -138,7 +140,7 @@
 	}
 	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
-		background-color: #007aff;
+		background-color: $uni-primary;
 		border-radius: 50%;
 		box-sizing: border-box;
 		border: 3px solid #fff;
@@ -159,7 +161,7 @@
 	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
 	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
-		background-color: #409eff;
+		background-color: $uni-primary;
 		border-radius: 50%;
 		box-sizing: border-box;
 		border: 3px solid #F6F7FC;

--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
 <template>
 	<view class="uni-calendar" @mouseleave="leaveCale">
 		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
-			@click="clean"></view>
+			@click="clean();maskClick()"></view>
 		<view v-if="insert || show" class="uni-calendar__content"
 			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
 			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
@@ -10,7 +10,7 @@
 				</view>
 				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
 					<text
-						class="uni-calendar__header-text">{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}</text>
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
 				</picker>
 				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
 					<view class="uni-calendar__header-btn uni-calendar--right"></view>
@@ -31,7 +31,7 @@
 						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
 					</view>
 					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
 					</view>
 					<view class="uni-calendar__weeks-day">
 						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
@@ -74,7 +74,9 @@
 						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
 					</time-picker>
 				</view>
-				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
 				<view class="uni-date-changed--time-end">
 					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
 					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
@@ -86,7 +88,7 @@
 				<!-- <view class="uni-calendar__header-btn-box">
 					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
 				</view> -->
-				<view class="uni-datetime-picker--btn" @click="confirm">确认</view>
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
 			</view>
 		</view>
 	</view>
@@ -332,7 +334,13 @@
 			okText() {
 				return t("uni-datetime-picker.ok")
 			},
-			monText() {
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
 				return t("uni-calender.MON")
 			},
 			TUEText() {
@@ -353,6 +361,9 @@
 			SUNText() {
 				return t("uni-calender.SUN")
 			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
 		},
 		created() {
 			// 获取日历方法实例
@@ -402,6 +413,11 @@
 				this.close()
 			},
+			// 蒙版点击事件
+			maskClick() {
+				this.$emit('maskClose')
+			},
 			clearCalender() {
 				if (this.range) {
 					this.timeRange.startTime = ''
@@ -537,8 +553,16 @@
 				this.cale.setMultiple(this.calendar.fullDate, true)
 				this.weeks = this.cale.weeks
 				this.tempSingleDate = this.calendar.fullDate
-				this.tempRange.before = this.cale.multipleStatus.before
+				const beforeStatus = this.cale.multipleStatus.before
-				this.tempRange.after = this.cale.multipleStatus.after
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
 				this.change()
 			},
 			/**
@@ -595,6 +619,8 @@
 </script>
 <style lang="scss" >
+	$uni-primary: #007aff !default;
 	.uni-calendar {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -705,7 +731,7 @@
 		text-align: center;
 		width: 100px;
 		font-size: 14px;
-		color: #007aff;
+		color: $uni-primary;
 		/* #ifndef APP-NVUE */
 		letter-spacing: 3px;
 		/* #endif */
@@ -884,10 +910,10 @@
 		border-radius: 100px;
 		height: 40px;
 		line-height: 40px;
-		background-color: #007aff;
+		background-color: $uni-primary;
 		color: #fff;
 		font-size: 16px;
-		letter-spacing: 5px;
+		letter-spacing: 2px;
 	}
 	/* #ifndef APP-NVUE */

--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -3,17 +3,20 @@
 	"uni-datetime-picker.selectTime": "select time",
 	"uni-datetime-picker.selectDateTime": "select datetime",
 	"uni-datetime-picker.startDate": "start date",
 	"uni-datetime-picker.endDate": "end date",
 	"uni-datetime-picker.startTime": "start time",
 	"uni-datetime-picker.endTime": "end time",
 	"uni-datetime-picker.ok": "ok",
 	"uni-datetime-picker.clear": "clear",
 	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
 	"uni-calender.MON": "MON",
 	"uni-calender.TUE": "TUE",
 	"uni-calender.WED": "WED",
 	"uni-calender.THU": "THU",
 	"uni-calender.FRI": "FRI",
 	"uni-calender.SAT": "SAT",
-	"uni-calender.SUN": "SUN"
+	"uni-calender.SUN": "SUN",
-}
+	"uni-calender.confirm": "confirm"
+}
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
 {
 	"uni-datetime-picker.selectDate": "选择日期",
 	"uni-datetime-picker.selectTime": "选择时间",
 	"uni-datetime-picker.selectDateTime": "选择日期时间",
 	"uni-datetime-picker.startDate": "开始日期",
 	"uni-datetime-picker.endDate": "结束日期",
 	"uni-datetime-picker.startTime": "开始时间",
 	"uni-datetime-picker.endTime": "结束时间",
 	"uni-datetime-picker.ok": "确定",
 	"uni-datetime-picker.clear": "清除",
 	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
 	"uni-calender.SUN": "日",
 	"uni-calender.MON": "一",
 	"uni-calender.TUE": "二",
 	"uni-calender.WED": "三",
 	"uni-calender.THU": "四",
 	"uni-calender.FRI": "五",
-	"uni-calender.SAT": "六"
+	"uni-calender.SAT": "六",
-}
+	"uni-calender.confirm": "确认"
+}
\ No newline at end of file
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
 {
-	"uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectDate": "選擇日期",
-	"uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectTime": "選擇時間",
-	"uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
-	"uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.startDate": "開始日期",
-	"uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.endDate": "結束日期",
-	"uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.startTime": "開始时间",
-	"uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.endTime": "結束时间",
-	"uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.ok": "確定",
-	"uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.clear": "清除",
-	"uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.cancel": "取消",
-	"uni-calender.SUN": "日",
+  "uni-datetime-picker.year": "年",
-	"uni-calender.MON": "一",
+  "uni-datetime-picker.month": "月",
-	"uni-calender.TUE": "二",
+  "uni-calender.SUN": "日",
-	"uni-calender.WED": "三",
+  "uni-calender.MON": "一",
-	"uni-calender.THU": "四",
+  "uni-calender.TUE": "二",
-	"uni-calender.FRI": "五",
+  "uni-calender.WED": "三",
-	"uni-calender.SAT": "六"
+  "uni-calender.THU": "四",
-}
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}
\ No newline at end of file
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -770,7 +770,9 @@
 	}
 </script>
-<style>
+<style lang="scss">
+	$uni-primary: #007aff !default;
 	.uni-datetime-picker {
 		/* #ifndef APP-NVUE */
 		/* width: 100%; */
@@ -804,7 +806,7 @@
 	.uni-datetime-picker-btn-text {
 		font-size: 14px;
-		color: #007AFF;
+		color: $uni-primary;
 	}
 	.uni-datetime-picker-btn-group {
@@ -888,7 +890,8 @@
 	}
 	.uni-datetime-picker-text {
 		font-size: 14px;
+		line-height: 50px
 	}
 	.uni-datetime-picker-sign {

--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -5,12 +5,12 @@
 				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
 		'uni-date-x--border': border}">
 					<view v-if="!isRange" class="uni-date-x uni-date-single">
-						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<uni-icons type="calendar" color="#c0c4cc" size="22"></uni-icons>
 						<input class="uni-date__x-input" type="text" v-model="singleVal"
 							:placeholder="singlePlaceholderText" :disabled="true" />
 					</view>
 					<view v-else class="uni-date-x uni-date-range">
-						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<uni-icons type="calendar" color="#c0c4cc" size="22"></uni-icons>
 						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
 							:placeholder="startPlaceholderText" :disabled="true" />
 						<slot>
@@ -20,7 +20,7 @@
 							:placeholder="endPlaceholderText" :disabled="true" />
 					</view>
 					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
-						<uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons>
+						<uni-icons type="clear" color="#c0c4cc" size="24"></uni-icons>
 					</view>
 				</view>
 			</slot>
@@ -91,7 +91,7 @@
 		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
 			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
 			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
-			:hideSecond="hideSecond" @confirm="mobileChange" />
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" />
 	</view>
 </template>
 <script>
@@ -127,10 +127,23 @@
 	export default {
 		name: 'UniDatetimePicker',
+		options: {
+			virtualHost: true
+		},
 		components: {
 			calendar,
 			timePicker
 		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+			formItem: {
+				from: 'uniFormItem',
+				default: null
+			},
+		},
 		data() {
 			return {
 				isRange: false,
@@ -386,33 +399,16 @@
 			}
 		},
 		created() {
-			this.form = this.getForm('uniForms')
+			// if (this.form && this.formItem) {
-			this.formItem = this.getForm('uniFormsItem')
+			// 	this.$watch('formItem.errMsg', (newVal) => {
+			// 		this.localMsg = newVal
-			// if (this.formItem) {
+			// 	})
-			// 	if (this.formItem.name) {
-			// 		this.rename = this.formItem.name
-			// 		this.form.inputChildrens.push(this)
-			// 	}
 			// }
 		},
 		mounted() {
 			this.platform()
 		},
 		methods: {
-			/**
-			 * 获取父元素实例
-			 */
-			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;
-			},
 			initPicker(newVal) {
 				if (!newVal || Array.isArray(newVal) && !newVal.length) {
 					this.$nextTick(() => {
@@ -519,7 +515,8 @@
 			close() {
 				setTimeout(() => {
 					this.popup = false
 					this.$emit('maskClick', this.value)
+					this.$refs.mobile.close()
 				}, 20)
 			},
 			setEmit(value) {
@@ -545,7 +542,8 @@
 						}
 					}
 				}
-				this.formItem && this.formItem.setValue(value)
 				this.$emit('change', value)
 				this.$emit('input', value)
 				this.$emit('update:modelValue', value)
@@ -710,7 +708,15 @@
 						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
 					}
 					if (needEmit) {
-						this.formItem && this.formItem.setValue('')
+						// 校验规则
+						// if(this.form  && this.formItem){
+						// 	const {
+						// 		validateTrigger
+						// 	} = this.form
+						// 	if (validateTrigger === 'blur') {
+						// 		this.formItem.onFieldChange()
+						// 	}
+						// }
 						this.$emit('change', '')
 						this.$emit('input', '')
 						this.$emit('update:modelValue', '')
@@ -730,7 +736,6 @@
 						this.$refs.right && this.$refs.right.next()
 					}
 					if (needEmit) {
-						this.formItem && this.formItem.setValue([])
 						this.$emit('change', [])
 						this.$emit('input', [])
 						this.$emit('update:modelValue', [])
@@ -778,7 +783,15 @@
 	}
 </script>
-<style>
+<style lang="scss">
+	$uni-primary: #007aff !default;
+	.uni-date {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+		flex: 1;
+	}
 	.uni-date-x {
 		display: flex;
 		flex-direction: row;
@@ -789,25 +802,25 @@
 		background-color: #fff;
 		color: #666;
 		font-size: 14px;
+		flex: 1;
 	}
 	.uni-date-x--border {
 		box-sizing: border-box;
 		border-radius: 4px;
-		border: 1px solid #dcdfe6;
+		border: 1px solid #e5e5e5;
 	}
 	.uni-date-editor--x {
+		display: flex;
+		align-items: center;
 		position: relative;
 	}
 	.uni-date-editor--x .uni-date__icon-clear {
-		position: absolute;
+		padding: 0 5px;
-		top: 0;
+		display: flex;
-		right: 0;
+		align-items: center;
-		display: inline-block;
-		box-sizing: border-box;
-		border: 9px solid transparent;
 		/* #ifdef H5 */
 		cursor: pointer;
 		/* #endif */
@@ -815,10 +828,15 @@
 	.uni-date__x-input {
 		padding: 0 8px;
-		height: 40px;
+		/* #ifndef APP-NVUE */
-		width: 100%;
+		width: auto;
-		line-height: 40px;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1;
 		font-size: 14px;
+		height: 35px;
 	}
 	.t-c {
@@ -926,14 +944,14 @@
 	}
 	.popup-x-footer text:hover {
-		color: #007aff;
+		color: $uni-primary;
 		cursor: pointer;
 		opacity: 0.8;
 	}
 	.popup-x-footer .confirm {
 		margin-left: 20px;
-		color: #007aff;
+		color: $uni-primary;
 	}
 	.uni-date-changed {
@@ -994,4 +1012,4 @@
 		border-top-width: 0;
 		border-bottom-color: #fff;
 	}
 </style>
--- a/uni_modules/uni-datetime-picker/package.json
+++ b/uni_modules/uni-datetime-picker/package.json
 {
  "id": "uni-datetime-picker",
  "displayName": "uni-datetime-picker 日期选择器",
-  "version": "2.2.2",
+  "version": "2.2.11",
  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
  "keywords": [
    "uni-datetime-picker",
@@ -17,11 +17,7 @@
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
    "sale": {
      "regular": {
        "price": "0.00"
@@ -38,7 +34,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
  },
  "uni_modules": {
    "dependencies": [

--- a/uni_modules/uni-easyinput/changelog.md
+++ b/uni_modules/uni-easyinput/changelog.md
+## 1.1.1（2022-09-19）
+- 修复，输入后回车，change 事件触发两次，[详情](https://ask.dcloud.net.cn/question/152149)
 ## 1.1.0（2022-06-30）
 - 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
 - 新增 clear 事件，点击右侧叉号图标触发

--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -202,7 +202,8 @@
 				showClearIcon: false,
 				showPassword: false,
 				focusShow: false,
-				localMsg: ''
+				localMsg: '',
+				isEnter: false // 用于判断当前是否是使用回车操作
 			};
 		},
 		computed: {
@@ -371,8 +372,10 @@
 				let value = event.detail.value;
 				this.focusShow = false
 				this.$emit('blur', event);
 				// 根据类型返回值，在event中获取的值理论上讲都是string
-				this.$emit('change', this.val)
+				if (this.isEnter === false) {
+					this.$emit('change', this.val)
+				}
 				// 失去焦点时参与表单校验
 				if (this.form && this.formItem) {
 					const {
@@ -389,8 +392,12 @@
 			 * @param {Object} e
 			 */
 			onConfirm(e) {
 				this.$emit('confirm', this.val);
-				this.$emit('change', this.val)
+				this.isEnter = true;
+				this.$emit('change', this.val)
+				this.$nextTick(() => {
+					this.isEnter = false
+				})
 			},
 			/**

--- a/uni_modules/uni-easyinput/package.json
+++ b/uni_modules/uni-easyinput/package.json
 {
  "id": "uni-easyinput",
  "displayName": "uni-easyinput 增强输入框",
-  "version": "1.1.0",
+  "version": "1.1.1",
  "description": "Easyinput 组件是对原生input组件的增强",
  "keywords": [
    "uni-ui",
@@ -17,11 +17,7 @@
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
    "sale": {
      "regular": {
        "price": "0.00"
@@ -38,7 +34,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
  },
  "uni_modules": {
    "dependencies": [

--- a/uni_modules/uni-fab/changelog.md
+++ b/uni_modules/uni-fab/changelog.md
+## 1.2.4（2022-09-07）
+小程序端由于 style 使用了对象导致报错，[详情](https://ask.dcloud.net.cn/question/152790?item_id=211778&rf=false)
+## 1.2.3（2022-09-05）
+- 修复 nvue 环境下，具有 tabBar 时，fab 组件下部位置无法正常获取 --window-bottom 的bug，详见：[https://ask.dcloud.net.cn/question/110638?notification_id=826310](https://ask.dcloud.net.cn/question/110638?notification_id=826310)
 ## 1.2.2（2021-12-29）
 - 更新 组件依赖
 ## 1.2.1（2021-11-19）

--- a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -5,7 +5,9 @@
        'uni-fab--rightBottom': rightBottom,
        'uni-fab--leftTop': leftTop,
        'uni-fab--rightTop': rightTop
-      }" class="uni-fab">
+      }" class="uni-fab"
+				:style="nvueBottom"
+			>
 			<view :class="{
          'uni-fab__content--left': horizontal === 'left',
          'uni-fab__content--right': horizontal === 'right',
@@ -32,7 +34,7 @@
 		  'uni-fab__circle--leftTop': leftTop,
 		  'uni-fab__circle--rightTop': rightTop,
 		  'uni-fab__content--other-platform': !isAndroidNvue
-		}" class="uni-fab__circle uni-fab__plus" :style="{ 'background-color': styles.buttonColor }" @click="_onClick">
+		}" class="uni-fab__circle uni-fab__plus" :style="{ 'background-color': styles.buttonColor, 'bottom': nvueBottom }" @click="_onClick">
 			<uni-icons class="fab-circle-icon" type="plusempty" :color="styles.iconColor" size="32"
 				:class="{'uni-fab__plus--active': isShow && content.length > 0}"></uni-icons>
 			<!-- <view class="fab-circle-v"  :class="{'uni-fab__plus--active': isShow && content.length > 0}"></view>
@@ -158,6 +160,16 @@
 			},
 			horizontalRight() {
 				return this.getPosition(2, 'horizontal', 'right')
+			},
+			// 计算 nvue bottom
+			nvueBottom() {
+				const safeBottom = uni.getSystemInfoSync().windowBottom;
+				// #ifdef APP-NVUE
+				return 30 + safeBottom
+				// #endif
+				// #ifndef APP-NVUE
+				return 30
+				// #endif
 			}
 		},
 		watch: {

--- a/uni_modules/uni-fab/package.json
+++ b/uni_modules/uni-fab/package.json
 {
  "id": "uni-fab",
  "displayName": "uni-fab 悬浮按钮",
-  "version": "1.2.2",
+  "version": "1.2.4",
  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
  "keywords": [
    "uni-ui",
@@ -17,11 +17,7 @@
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
    "sale": {
      "regular": {
        "price": "0.00"
@@ -38,7 +34,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
  },
  "uni_modules": {
    "dependencies": ["uni-scss","uni-icons"],

--- a/uni_modules/uni-feedback/changelog.md
+++ b/uni_modules/uni-feedback/changelog.md
+## 1.1.0（2022-07-13）
+新增，应用[pages_init](https://uniapp.dcloud.io/plugin/publish.html#pages-init)当导入插件到项目工程时，自动合并本插件的页面路由到项目的pages.json
+## 1.0.5（2022-07-13）
+新增，应用[pages_init](https://uniapp.dcloud.io/plugin/publish.html#pages-init)当导入插件到项目工程时，自动合并本插件的页面路由到项目的pages.json
 ## 1.0.4（2021-09-26）
 为了数据安全，`opendb-feedback`表的`permission`中`delete`，`update`的值默认为`false`
 ## 1.0.3（2021-08-26）

--- a/uni_modules/uni-feedback/package.json
+++ b/uni_modules/uni-feedback/package.json
 {
  "id": "uni-feedback",
  "displayName": "问题反馈页面模板",
-  "version": "1.0.4",
+  "version": "1.1.0",
  "description": "问题反馈页面模板，方便开发者快速搭建问题反馈界面",
  "keywords": [
    "问题反馈页面模板"
@@ -72,7 +72,11 @@
          "阿里": "y",
          "百度": "y",
          "字节跳动": "y",
-          "QQ": "y"
+        "QQ": "y",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u"
        },
        "快应用": {
          "华为": "u",

--- a/uni_modules/uni-feedback/pages/opendb-feedback/list.vue
+++ b/uni_modules/uni-feedback/pages/opendb-feedback/list.vue
@@ -51,7 +51,7 @@
      fabClick() {
        // 打开新增页面
        uni.navigateTo({
-          url: './add',
+          url: './opendb-feedback',
          events: {
            // 监听新增数据成功后, 刷新当前页面数据
            refreshData: () => {

--- a/uni_modules/uni-file-picker/changelog.md
+++ b/uni_modules/uni-file-picker/changelog.md
+## 1.0.2（2022-07-04）
+- 修复 在uni-forms下样式不生效的bug
 ## 1.0.1（2021-11-23）
 - 修复 参数为对象的情况下，url在某些情况显示错误的bug
 ## 1.0.0（2021-11-19）
@@ -5,57 +7,57 @@
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-file-picker](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
 ## 0.2.16（2021-11-08）
 - 修复 传入空对象 ，显示错误的Bug
 ## 0.2.15（2021-08-30）
 - 修复 return-type="object" 时且存在v-model时，无法删除文件的Bug
 ## 0.2.14（2021-08-23）
 - 新增 参数中返回 fileID 字段
 ## 0.2.13（2021-08-23）
 - 修复 腾讯云传入fileID 不能回显的bug
 - 修复 选择图片后，不能放大的问题
 ## 0.2.12（2021-08-17）
 - 修复 由于 0.2.11 版本引起的不能回显图片的Bug
 ## 0.2.11（2021-08-16）
 - 新增 clearFiles(index) 方法，可以手动删除指定文件
 - 修复 v-model 值设为 null 报错的Bug
 ## 0.2.10（2021-08-13）
 - 修复 return-type="object" 时，无法删除文件的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）
 - 修复 sourceType 缺少默认值导致 ios 无法选择文件
 ## 0.1.0（2021-06-30）
 - 优化 解耦与uniCloud的强绑定关系 ，如不绑定服务空间，默认autoUpload为false且不可更改
 ## 0.0.11（2021-06-30）
 - 修复 由 0.0.10 版本引发的 returnType 属性失效的问题
 ## 0.0.10（2021-06-29）
 - 优化 文件上传后进度条消失时机
 ## 0.0.9（2021-06-29）
 - 修复 在uni-forms 中，删除文件 ，获取的值不对的Bug
 ## 0.0.8（2021-06-15）
 - 修复 删除文件时无法触发 v-model 的Bug
 ## 0.0.7（2021-05-12）
 - 新增 组件示例地址
 ## 0.0.6（2021-04-09）
 - 修复 选择的文件非 file-extname 字段指定的扩展名报错的Bug
 ## 0.0.5（2021-04-09）
 - 优化 更新组件示例
 ## 0.0.4（2021-04-09）
 - 优化 file-extname 字段支持字符串写法，多个扩展名需要用逗号分隔
 ## 0.0.3（2021-02-05）
 - 调整为uni_modules目录规范
 - 修复 微信小程序不指定 fileExtname 属性选择失败的Bug
--- 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
@@ -83,6 +83,9 @@
 		components: {
 			uploadImage,
 			uploadFile
+		},
+		options: {
+			virtualHost: true
 		},
 		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
 		props: {
@@ -278,7 +281,7 @@
 						files.push(Object.assign({}, v))
 					}
 				})
-				this.uploadFiles(files)
+				return this.uploadFiles(files)
 			},
 			async setValue(newVal, oldVal) {
 				const newData =  async (v) => {
@@ -292,7 +295,7 @@
 					if (reg.test(url)) {
 						v.fileID = url
 						v.url = await this.getTempFileURL(url)
 					}
 					if(v.url) v.path = v.url
 					return v
 				}
@@ -416,11 +419,12 @@
 			 */
 			uploadFiles(files) {
 				files = [].concat(files)
-				uploadCloudFiles.call(this, files, 5, res => {
+				return uploadCloudFiles.call(this, files, 5, res => {
 						this.setProgress(res, res.index, true)
 					})
 					.then(result => {
 						this.setSuccessAndError(result)
+						return result;
 					})
 					.catch(err => {
 						console.log(err)
@@ -605,8 +609,10 @@
 	.uni-file-picker {
 		/* #ifndef APP-NVUE */
 		box-sizing: border-box;
 		overflow: hidden;
-		/* #endif */
+		width: 100%;
+		/* #endif */
+		flex: 1;
 	}
 	.uni-file-picker__header {
@@ -647,4 +653,4 @@
 		position: absolute;
 		transform: rotate(90deg);
 	}
 </style>
--- a/uni_modules/uni-file-picker/components/uni-file-picker/utils.js
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/utils.js
 /**
 * 获取文件名和后缀
 * @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
 }
--- a/uni_modules/uni-file-picker/package.json
+++ b/uni_modules/uni-file-picker/package.json
 {
  "id": "uni-file-picker",
  "displayName": "uni-file-picker 文件选择上传",
-  "version": "1.0.1",
+  "version": "1.0.2",
  "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
  "keywords": [
    "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": ["uni-scss"],
    "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": "y"
        }
      }
    }
  }
 }
--- a/uni_modules/uni-id-pages/changelog.md
+++ b/uni_modules/uni-id-pages/changelog.md
+## 1.0.19（2022-09-20）
+- 修复 小程序端，使用将自定义节点设置成[虚拟节点](https://uniapp.dcloud.net.cn/tutorial/vue-api.html#%E5%85%B6%E4%BB%96%E9%85%8D%E7%BD%AE)的uni-ui组件，样式错乱的问题
+## 1.0.18（2022-09-20）
+- 修复 微信小程序端 WXSS 编译报错的bug
+## 1.0.17（2022.09-19）
+- 修复 无法退出登录的bug
+## 1.0.16（2022-09-19）
+- 修复 在 Edge 浏览器下 input[type="password"] 会出现浏览器自带的密码查看按钮
+- 优化 退出登录重定向页面为 uniIdRouter.loginPage
+- 新增 注册账号页面支持返回登录页面
+## 1.0.15（2022-09-19）
+- 更新表结构，解决在uni-admin中部分clientDB操作没有权限的问题
 ## 1.0.14（2022-09-16）
 - 修改 配置项`isAdmin`默认值为`false`
 ## 1.0.13（2022-09-16）

--- a/uni_modules/uni-id-pages/common/common.js
+++ b/uni_modules/uni-id-pages/common/common.js
-import config from '../config'
+import pagesJson from '@/pages.json'
 const uniIdCo = uniCloud.importObject("uni-id-co")
 export default {
 	async logout() {
@@ -6,7 +6,7 @@ export default {
 		uni.removeStorageSync('uni_id_token');
 		uni.setStorageSync('uni_id_token_expired', 0)
 		uni.redirectTo({
-			url: config.isAdmin ? '/uni_modules/uni-id-pages/pages/login/login-withpwd': '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+			url: `/${pagesJson.uniIdRouter?.loginPage ?? 'uni_modules/uni-id-pages/pages/login/login-withoutpwd'}`,
 		});
 		uni.$emit('uni-id-pages-logout')
 	},

--- a/uni_modules/uni-id-pages/common/login-page.scss
+++ b/uni_modules/uni-id-pages/common/login-page.scss
+// 隐藏 edge 浏览器的密码查看按钮
+/* #ifdef H5 */
+.input-box ::v-deep{
+  .uni-input-input[type="password"] {
+    &::-ms-reveal {
+      display: none;
+    }
+  }
+}
+/* #endif */
 .uni-content {
  padding: 0 60rpx;
 }
@@ -15,13 +27,13 @@
 	margin-left: calc(50% - 200px);
 	/* #endif */
 	/* #ifdef H5 */
 	margin: 0 auto;
 	position: relative;
 	top: 100px;
 	padding: 30px 40px 80px 40px;
 	max-width: 450px;
 	max-height: 450px;
 	border-radius: 10px;
 	box-shadow: 0 0 20px #efefef;
 	background-color: #FFF;
 	/* #endif */
@@ -31,12 +43,12 @@
  	display: flex;
  	justify-content: center;
  }
  .login-logo image {
 	width: 60px;
  	height: 60px;
  }
  .register-back{
 	  display: none;
  }
@@ -67,17 +79,23 @@
  font-size: 11px;
  margin: 6px 0;
 }
+/* #ifdef MP */
+// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
+.uni-content ::v-deep .uni-easyinput__content,
+/* #endif */
 .input-box {
  padding: 4px;
-  background-color: #F8F8F8;
+  background-color: #F8F8F8 !important;
  border-radius: 0;
  font-size: 14px;
  /* #ifndef APP-NVUE */
  display: flex;
  /* #endif */
  flex: 1;
 }
 .link {
  color: #04498c;
@@ -95,9 +113,8 @@
 	margin: 15px 0 0 0;
 	color: #FFF !important;
 	border-radius: 5px;
 }
 .uni-body.uni_modules-uni-id-pages-pages-login-login-withoutpwd{
 	height: auto !important;
 }
\ No newline at end of file
--- a/uni_modules/uni-id-pages/package.json
+++ b/uni_modules/uni-id-pages/package.json
 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.0.14",
+	"version": "1.0.19",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
        "用户管理",

--- a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
@@ -169,7 +169,11 @@
 		left: 3px;
 		position: relative;
 	}
+	/* #ifdef MP */
+	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
+	.phone-box ::v-deep .uni-easyinput__content,
+	/* #endif */
 	.input-box {
 		/* #ifndef APP-NVUE */
 		box-sizing: border-box;

--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
@@ -31,7 +31,8 @@
 				<view class="link-box">
 					<text class="link" @click="retrieveByPhone">通过手机验证码找回密码</text>
 					<view></view>
-				</view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
 			</match-media>
 		</uni-forms>
 		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
@@ -182,7 +183,12 @@
 				uni.navigateTo({
 					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
 				})
-			}
+			},
+      backLogin () {
+        uni.redirectTo({
+          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+        })
+      }
 		}
 	}
 </script>
@@ -199,7 +205,7 @@
 		.uni-content{
 			padding: 30px 40px 40px;
 		}
 		.link-box {
 			/* #ifndef APP-NVUE */
 			display: flex;
@@ -208,7 +214,7 @@
 			justify-content: space-between;
 			margin-top: 10px;
 		}
 		.link {
 			font-size: 12px;
 		}

--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
@@ -31,7 +31,8 @@
 				<view class="link-box">
 					<text class="link" @click="retrieveByEmail">通过邮箱验证码找回密码</text>
 					<view></view>
-				</view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
 			</match-media>
 		</uni-forms>
 		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
@@ -206,7 +207,12 @@
 				uni.navigateTo({
 					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
 				})
-			}
+			},
+      backLogin () {
+        uni.redirectTo({
+          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+        })
+      }
 		}
 	}
 </script>
@@ -231,7 +237,7 @@
 			justify-content: space-between;
 			margin-top: 10px;
 		}
 		.link {
 			font-size: 12px;
 		}

--- a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
@@ -31,7 +31,8 @@
 <script>
 	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	const uniIdCo = uniCloud.importObject("uni-id-co", {
+  import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+  const uniIdCo = uniCloud.importObject("uni-id-co", {
 		customUI:true
 	})
 	export default {
@@ -58,37 +59,8 @@
 							}
 						]
 					},
-					newPassword: {
+          ...passwordMod.getPwdRules('newPassword', 'newPassword2')
-						rules: [{
+        },
-								required: true,
-								errorMessage: '请输入新密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							}
-						]
-					},
-					newPassword2: {
-						rules: [{
-								required: true,
-								errorMessage: '请确认密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									if (value != data.newPassword) {
-										callback('两次输入密码不一致')
-									};
-									return true
-								}
-							}
-						]
-					}
-				},
 				logo: "/static/logo.png"
 			}
 		},
@@ -122,16 +94,16 @@
 								oldPassword,
 								newPassword
 							}).then(e => {
 								console.log(e);
 								uni.removeStorageSync('uni_id_token');
 								uni.setStorageSync('uni_id_token_expired', 0)
 								uni.redirectTo({
 									url:'/uni_modules/uni-id-pages/pages/login/login-withpwd'
 								})
 							}).catch(e => {
 								uni.showModal({
 									content: e.message,
 									showCancel: false
 								});
 							})
 					}).catch(errors => {
@@ -153,10 +125,10 @@
 			margin-top: 15px;
 		}
 	}
 	@media screen and (min-width: 690px) {
 		.uni-content{
 			padding: 30px 40px 40px;
 		}
 	}
 </style>
--- a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
@@ -117,7 +117,7 @@
 				// #endif
 				// #ifdef MP-WEIXIN
-				this.$refs['bind-mobile'].open()
+				this.$refs['bind-mobile-by-sms'].open()
 				// #endif
 				// #ifdef H5

--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
 {
  "name": "uni-id-co",
-  "version": "1.0.13",
+  "version": "1.0.19",
  "description": "",
  "main": "index.js",
  "keywords": [],

--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
 {
 	"bsonType": "object",
+	"required": ["user_id"],
+	"permission": {
+		"read": "'READ_UNI_ID_LOG' in auth.permission"
+	},
 	"properties": {
 		"_id": {
 			"description": "ID，系统自动生成"
@@ -44,6 +48,7 @@
 		},
 		"user_id": {
 			"bsonType": "string",
+			"foreignKey": "uni-id-users._id",
 			"description": "用户id，参考uni-id-users表"
 		},
 		"username": {
@@ -62,6 +67,5 @@
 			"bsonType": "string",
 			"description": "客户端DCloud AppId"
 		}
-	},
+	}
-	"required": []
 }
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
 {
 	"bsonType": "object",
+	"required": ["permission_id", "permission_name"],
+	"permission": {
+		"read": "'READ_UNI_ID_PERMISSIONS' in auth.permission",
+		"create": "'CREATE_UNI_ID_PERMISSIONS' in auth.permission",
+		"update": "'UPDATE_UNI_ID_PERMISSIONS' in auth.permission",
+		"delete": "'DELETE_UNI_ID_PERMISSIONS' in auth.permission"
+	},
 	"properties": {
 		"_id": {
 			"description": "存储文档 ID，系统自动生成"
@@ -41,9 +48,5 @@
 			"title": "权限名称",
 			"trim": "both"
 		}
-	},
+	}
-	"required": [
+}
-		"permission_id",
-		"permission_name"
-	]
-}
\ No newline at end of file
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
 {
 	"bsonType": "object",
+	"required": ["role_id", "role_name"],
 	"permission": {
-		"create": false,
+		"read": "'READ_UNI_ID_ROLES' in auth.permission",
-		"delete": false,
+		"create": "'CREATE_UNI_ID_ROLES' in auth.permission",
-		"read": false,
+		"update": "'UPDATE_UNI_ID_ROLES' in auth.permission",
-		"update": false
+		"delete": "'DELETE_UNI_ID_ROLES' in auth.permission"
 	},
 	"properties": {
 		"_id": {
 			"description": "存储文档 ID，系统自动生成"
 		},
 		"comment": {
+			"title": "备注",
 			"bsonType": "string",
 			"description": "备注",
-			"title": "备注",
 			"trim": "both"
 		},
 		"create_date": {
@@ -24,25 +25,26 @@
 			}
 		},
 		"permission": {
+			"title": "权限",
 			"bsonType": "array",
-			"description": "角色拥有的权限列表",
 			"foreignKey": "uni-id-permissions.permission_id",
-			"title": "权限"
+			"description": "角色拥有的权限列表",
+			"enum": {
+				"collection": "uni-id-permissions",
+				"field": "permission_name as text, permission_id as value"
+			}
 		},
 		"role_id": {
+			"title": "唯一ID",
 			"bsonType": "string",
 			"description": "角色唯一标识，不可修改，不允许重复",
-			"title": "唯一ID",
 			"trim": "both"
 		},
 		"role_name": {
+			"title": "名称",
 			"bsonType": "string",
 			"description": "角色名称",
-			"title": "名称",
 			"trim": "both"
 		}
-	},
+	}
-	"required": [
+}
-		"role_id"
-	]
-}
\ No newline at end of file
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
--- a/uni_modules/uni-id/changelog.md
+++ b/uni_modules/uni-id/changelog.md
+## 3.3.28（2022-07-27）
+- 修复 app端微信登录返回的accessToken过期时间（expired）不正确的Bug
+## 3.3.27（2022-07-27）
+- 短信发送失败、微信登录失败等场景下输出原始错误方便排查错误
+## 3.3.26（2022-07-08）
+- 兼容配置放在uni-id下的逻辑，但是仍推荐使用uni-config-center
+## 3.3.25（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 3.3.24（2022-06-28）
+- 修复3.3.12引出的使用多应用配置时报错的Bug
+## 3.3.23（2022-06-13）
+- 修复上版本引出的部分依赖未找到的Bug
+## 3.3.22（2022-06-13）
+- 新增 preferedWebPlatform 配置用于解决HBuilderX 3.4.9版本起web端platform不一致的问题 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-web-platform)
+## 3.3.21（2022-05-24）
+- 修复createInstance传入clientInfo无效的Bug
+## 3.3.20（2022-05-19）
+- 调整以下错误码（账号已注册[uni-id-account-exists]、账号不存在[uni-id-account-not-exists]、账号已绑定[uni-id-account-bound]）
+## 3.3.19（2022-05-19）
+- 修复 addUser 部分情况下会创建出重复账号的Bug
+## 3.3.18（2022-05-12）
+- 调整绑定、解绑邮箱手机号接口，只要传递code参数就进行验证码校验即使传递的值为undefined
 ## 3.3.17（2022-05-09）
 - register_env内增加os_name字段用于区分注册时的客户端系统类型
 ## 3.3.16（2022-05-09）

--- a/uni_modules/uni-id/package.json
+++ b/uni_modules/uni-id/package.json
 {
  "id": "uni-id",
  "displayName": "uni-id",
-  "version": "3.3.17",
+  "version": "3.3.28",
  "description": "简单、统一、可扩展的用户中心",
  "keywords": [
    "uniid",
@@ -14,11 +14,7 @@
  "engines": {
    "HBuilderX": "^3.1.0"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
-      "uniCloud",
-      "云函数模板"
-    ],
    "sale": {
      "regular": {
        "price": "0.00"
@@ -35,7 +31,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": ""
+    "npmurl": "",
+    "type": "unicloud-template-function"
  },
  "uni_modules": {
    "dependencies": ["uni-config-center"],
@@ -68,7 +65,11 @@
          "阿里": "u",
          "百度": "u",
          "字节跳动": "u",
-          "QQ": "u"
+        "QQ": "u",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u"
        },
        "快应用": {
          "华为": "u",

--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+   1. Definitions.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+   END OF TERMS AND CONDITIONS
+   APPENDIX: How to apply the Apache License to your work.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+   Copyright [yyyy] [name of copyright owner]
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
+{
+  "name": "uni-id",
+  "version": "3.3.28",
+  "description": "uni-id for uniCloud",
+  "main": "index.js",
+  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/dcloud/uni-id.git"
+  },
+  "author": "",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file
--- a/uni_modules/uni-nav-bar/changelog.md
+++ b/uni_modules/uni-nav-bar/changelog.md
+## 1.3.6（2022-06-30）
+- 修复 组件示例中插槽用法无法显示内容的bug
+## 1.3.5（2022-05-24）
+- 新增 stat 属性 ，可开启统计title 上报 ，仅使用了title 属性且项目开启了uni统计生效
 ## 1.3.4（2022-01-24）
 - 更新 组件示例
 ## 1.3.3（2022-01-24）

--- a/uni_modules/uni-nav-bar/package.json
+++ b/uni_modules/uni-nav-bar/package.json
 {
  "id": "uni-nav-bar",
  "displayName": "uni-nav-bar 自定义导航栏",
-  "version": "1.3.4",
+  "version": "1.3.6",
  "description": "自定义导航栏组件，主要用于头部导航。",
  "keywords": [
    "uni-ui",

--- a/uni_modules/uni-notice-bar/changelog.md
+++ b/uni_modules/uni-notice-bar/changelog.md
+## 1.2.1（2022-09-05）
+- 新增 属性 fontSize，可修改文字大小。
 ## 1.2.0（2021-11-19）
 - 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-notice-bar](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
 ## 1.1.1（2021-11-09） 
 - 新增 提供组件设计资源，组件样式调整
 ## 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）
 - 优化 组件引用关系，通过uni_modules引用组件
 ## 1.0.6（2021-02-05）
 - 调整为uni_modules目录规范
--- 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
 <template>
-	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
+	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor }" @click="onClick">
 		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound"
-			:color="color" size="22" />
+			:color="color" :size="fontSize * 1.5" />
 		<view ref="textBox" class="uni-noticebar__content-wrapper"
-			:class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
+			:class="{
+				'uni-noticebar__content-wrapper--scrollable': scrollable,
+				'uni-noticebar__content-wrapper--single': !scrollable && (single || moreText)
+			}"
+			:style="{ height: scrollable ? fontSize * 1.5 + 'px' : 'auto' }"
+		>
 			<view :id="elIdBox" class="uni-noticebar__content"
-				:class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
+				:class="{
-				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text"
+					'uni-noticebar__content--scrollable': scrollable,
-					:class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || showGetMore)}"
+					'uni-noticebar__content--single': !scrollable && (single || moreText)
-					:style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
+				}"
+			>
+				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" 
+					:class="{
+						'uni-noticebar__content-text--scrollable': scrollable,
+						'uni-noticebar__content-text--single': !scrollable && (single || showGetMore)
+					}" 
+					:style="{
+						color: color,
+						fontSize: fontSize + 'px',
+						lineHeight: fontSize * 1.5 + 'px',
+						width: wrapWidth + 'px',
+						'animationDuration': animationDuration,
+						'-webkit-animationDuration': animationDuration,
+						animationPlayState: webviewHide ? 'paused' : animationPlayState,
+						'-webkit-animationPlayState': webviewHide ? 'paused' : animationPlayState,
+						animationDelay: animationDelay,
+						'-webkit-animationDelay': animationDelay
+					}"
+				>{{text}}</text>
 			</view>
 		</view>
-		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point"
+		<view v-if="isShowGetMore" class="uni-noticebar__more uni-cursor-point"
 			@click="clickMore">
-			<text v-if="moreText.length > 0" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
+			<text v-if="moreText.length > 0" :style="{ color: moreColor, fontSize: fontSize + 'px' }">{{ moreText }}</text>
-			<uni-icons v-else type="right" :color="moreColor" size="16" />
+			<uni-icons v-else type="right" :color="moreColor" :size="fontSize * 1.1" />
 		</view>
-		<view class="uni-noticebar-close uni-cursor-point" v-if="(showClose === true || showClose === 'true') && (showGetMore === false || showGetMore === 'false')">
+		<view class="uni-noticebar-close uni-cursor-point" v-if="isShowClose">
-			<uni-icons
+			<uni-icons type="closeempty" :color="color" :size="fontSize * 1.1" @click="close" />
-				type="closeempty" :color="color" size="16" @click="close" />
 		</view>
 	</view>
 </template>
@@ -74,6 +97,10 @@
 				type: String,
 				default: '#FF9A43'
 			},
+			fontSize: {
+				type: Number,
+				default: 14
+			},
 			moreColor: {
 				type: String,
 				default: '#FF9A43'
@@ -123,6 +150,15 @@
 				animationDelay: '0s'
 			}
 		},
+		computed: {
+			isShowGetMore() {
+				return this.showGetMore === true || this.showGetMore === 'true'
+			},
+			isShowClose() {
+				return (this.showClose === true || this.showClose === 'true') 
+					&& (this.showGetMore === false || this.showGetMore === 'false')
+			}
+		},
 		mounted() {
 			// #ifdef APP-PLUS
 			var pages = getCurrentPages();
@@ -310,7 +346,6 @@
 	/* #ifndef APP-NVUE */
 	.uni-noticebar__content-wrapper--scrollable {
 		position: relative;
-		height: 18px;
 	}
 	/* #endif */
@@ -383,13 +418,9 @@
 		padding-left: 5px;
 	}
-	.uni-noticebar__more-text {
-		font-size: 14px;
-	}
 	@keyframes notice {
 		100% {
 			transform: translate3d(-100%, 0, 0);
 		}
 	}
 </style>
--- a/uni_modules/uni-notice-bar/package.json
+++ b/uni_modules/uni-notice-bar/package.json
 {
  "id": "uni-notice-bar",
  "displayName": "uni-notice-bar 通告栏",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告",
  "keywords": [
    "uni-ui",
    "uniui",
    "通告栏",
    "公告",
    "跑马灯"
 ],
  "repository": "https://github.com/dcloudio/uni-ui",
  "engines": {
    "HBuilderX": ""
  },
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
+"dcloudext": {
-    "category": [
+    "sale": {
-      "前端组件",
+      "regular": {
-      "通用组件"
+        "price": "0.00"
-    ],
+      },
-    "sale": {
+      "sourcecode": {
-      "regular": {
+        "price": "0.00"
-        "price": "0.00"
+      }
-      },
+    },
-      "sourcecode": {
+    "contact": {
-        "price": "0.00"
+      "qq": ""
-      }
+    },
-    },
+    "declaration": {
-    "contact": {
+      "ads": "无",
-      "qq": ""
+      "data": "无",
-    },
+      "permissions": "无"
-    "declaration": {
+    },
-      "ads": "无",
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-      "data": "无",
+    "type": "component-vue"
-      "permissions": "无"
+  },
-    },
+  "uni_modules": {
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
    "dependencies": [
 			"uni-scss",
 			"uni-icons"
 		],
    "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"
        },
        "Vue": {
            "vue2": "y",
            "vue3": "y"
        }
      }
    }
  }
 }
--- a/uni_modules/uni-pagination/changelog.md
+++ b/uni_modules/uni-pagination/changelog.md
+## 1.2.4（2022-09-19）
+- 修复，未对主题色设置默认色，导致未引入 uni-scss 变量文件报错。
+- 修复，未对移动端当前页文字做主题色适配。
+## 1.2.3（2022-09-15）
+- 修复未使用 uni-scss 主题色的 bug。
+## 1.2.2（2022-07-06）
+- 修复 es 语言 i18n 错误
 ## 1.2.1（2021-11-22）
 - 修复 vue3中某些scss变量无法找到的问题
 ## 1.2.0（2021-11-19）

--- a/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json
 {
 	"uni-pagination.prevText": "prev",
-	"uni-pagination.nextText": "next"
+	"uni-pagination.nextText": "next",
+	"uni-pagination.piecePerPage": "piece/page"
 }
--- a/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json
 {
 	"uni-pagination.prevText": "anterior",
-	"uni-pagination.nextText": "próxima"
+	"uni-pagination.nextText": "prxima",
+	"uni-pagination.piecePerPage": "Art��culo/P��gina"
 }
--- a/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json
 {
 	"uni-pagination.prevText": "précédente",
-	"uni-pagination.nextText": "suivante"
+	"uni-pagination.nextText": "suivante",
+	"uni-pagination.piecePerPage": "Articles/Pages"
 }
--- a/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json
 {
 	"uni-pagination.prevText": "上一页",
-	"uni-pagination.nextText": "下一页"
+	"uni-pagination.nextText": "下一页",
+	"uni-pagination.piecePerPage": "条/页"
 }
--- a/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json
 {
 	"uni-pagination.prevText": "上一頁",
-	"uni-pagination.nextText": "下一頁"
+	"uni-pagination.nextText": "下一頁",
+	"uni-pagination.piecePerPage": "條/頁"
 }
--- a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
+++ b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
 <template>
 	<view class="uni-pagination">
+		<!-- #ifndef MP -->
+		<picker v-if="showPageSize === true || showPageSize === 'true'" class="select-picker" mode="selector"
+			:value="pageSizeIndex" :range="pageSizeRange" @change="pickerChange" @cancel="pickerClick"
+			@click.native="pickerClick">
+			<button type="default" size="mini" :plain="true">
+				<text>{{pageSizeRange[pageSizeIndex]}} {{piecePerPage}}</text>
+				<uni-icons class="select-picker-icon" type="arrowdown" size="12" color="#999"></uni-icons>
+			</button>
+		</picker>
+		<!-- #endif -->
 		<!-- #ifndef APP-NVUE -->
 		<view class="uni-pagination__total is-phone-hide">共 {{ total }} 条</view>
 		<!-- #endif -->
@@ -16,8 +26,7 @@
 		</view>
 		<view class="uni-pagination__num uni-pagination__num-flex-none">
 			<view class="uni-pagination__num-current">
-				<text class="uni-pagination__num-current-text is-pc-hide"
+				<text class="uni-pagination__num-current-text is-pc-hide current-index-text">{{ currentIndex }}</text>
-					style="color:#409EFF">{{ currentIndex }}</text>
 				<text class="uni-pagination__num-current-text is-pc-hide">/{{ maxPage || 0 }}</text>
 				<!-- #ifndef APP-NVUE -->
 				<view v-for="(item, index) in paper" :key="index" :class="{ 'page--active': item === currentIndex }"
@@ -49,11 +58,15 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=32
 	 * @property {String} prevText 左侧按钮文字
 	 * @property {String} nextText 右侧按钮文字
+	 * @property {String} piecePerPageText 条/页文字
 	 * @property {Number} current 当前页
 	 * @property {Number} total 数据总量
 	 * @property {Number} pageSize 每页数据量
-	 * @property {Number} showIcon = [true|false] 是否以 icon 形式展示按钮
+	 * @property {Boolean} showIcon = [true|false] 是否以 icon 形式展示按钮
+	 * @property {Boolean} showPageSize = [true|false] 是否展示每页条数
+	 * @property {Array} pageSizeRange = [20, 50, 100, 500] 每页条数选框
 	 * @event {Function} change 点击页码按钮时触发 ,e={type,current} current为当前页，type值为：next/prev，表示点击的是上一页还是下一个
+	 * * @event {Function} pageSizeChange 当前每页条数改变时触发 ,e={pageSize} pageSize 为当前所选的每页条数
 	 */
 	import {
@@ -65,7 +78,7 @@
 	} = initVueI18n(messages)
 	export default {
 		name: 'UniPagination',
-		emits: ['update:modelValue', 'input', 'change'],
+		emits: ['update:modelValue', 'input', 'change', 'pageSizeChange'],
 		props: {
 			value: {
 				type: [Number, String],
@@ -81,6 +94,9 @@
 			nextText: {
 				type: String,
 			},
+			piecePerPageText: {
+				type: String
+			},
 			current: {
 				type: [Number, String],
 				default: 1
@@ -100,18 +116,32 @@
 				type: [Boolean, String],
 				default: false
 			},
+			showPageSize: {
+				// 是否以 icon 形式展示按钮
+				type: [Boolean, String],
+				default: false
+			},
 			pagerCount: {
 				type: Number,
 				default: 7
+			},
+			pageSizeRange: {
+				type: Array,
+				default: () => [20, 50, 100, 500]
 			}
 		},
 		data() {
 			return {
+				pageSizeIndex: 0,
 				currentIndex: 1,
-				paperData: []
+				paperData: [],
+				pickerShow: false
 			}
 		},
 		computed: {
+			piecePerPage() {
+				return this.piecePerPageText || t('uni-pagination.piecePerPage')
+			},
 			prevPageText() {
 				return this.prevText || t('uni-pagination.prevText')
 			},
@@ -181,17 +211,17 @@
 		watch: {
 			current: {
 				immediate: true,
 				handler(val, old) {
 					if (val < 1) {
 						this.currentIndex = 1
 					} else {
 						this.currentIndex = val
 					}
 				}
 			},
 			value: {
 				immediate: true,
 				handler(val) {
 					if (Number(this.current) !== 1) return
 					if (val < 1) {
 						this.currentIndex = 1
@@ -199,9 +229,31 @@
 						this.currentIndex = val
 					}
 				}
+			},
+			pageSizeIndex(val) {
+				this.$emit('pageSizeChange', this.pageSizeRange[val])
 			}
 		},
 		methods: {
+			pickerChange(e) {
+				this.pageSizeIndex = e.detail.value
+				this.pickerClick()
+			},
+			pickerClick() {
+				// #ifdef H5
+				const body = document.querySelector('body')
+				if (!body) return
+				const className = 'uni-pagination-picker-show'
+				this.pickerShow = !this.pickerShow
+				if (this.pickerShow) {
+					body.classList.add(className)
+				} else {
+					setTimeout(() => body.classList.remove(className), 300)
+				}
+				// #endif
+			},
 			// 选择标签
 			selectPage(e, index) {
 				if (parseInt(e)) {
@@ -257,7 +309,7 @@
 </script>
 <style lang="scss" scoped>
-	$uni-primary: #2979ff;
+	$uni-primary: #2979ff !default;
 	.uni-pagination {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -288,8 +340,8 @@
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
 		text-align: center;
 		border-radius: 5px;
 		// border-width: 1px;
 		// border-style: solid;
 		// border-color: $uni-border-color;
@@ -304,8 +356,8 @@
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
 		text-align: center;
 		color: #666;
 		font-size: 12px;
 	}
@@ -334,7 +386,7 @@
 		text-align: center;
 		line-height: 30px;
 		// border: 1px red solid;
 		color: #999;
 		border-radius: 4px;
 		// border-width: 1px;
 		// border-style: solid;
@@ -350,6 +402,10 @@
 	.uni-pagination__num-current-text {
 		font-size: 15px;
+	}
+	.current-index-text{
+		color: $uni-primary;
 	}
 	.uni-pagination--enabled {

--- a/uni_modules/uni-pagination/package.json
+++ b/uni_modules/uni-pagination/package.json
--- a/uni_modules/uni-pagination/readme.md
+++ b/uni_modules/uni-pagination/readme.md
@@ -9,5 +9,3 @@
 ### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-pagination)
 #### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/uni_modules/uni-scss/manifest.json
+++ b/uni_modules/uni-scss/manifest.json
--- a/uni_modules/uni-search-bar/readme.md
+++ b/uni_modules/uni-search-bar/readme.md
--- a/uni_modules/uni-section/changelog.md
+++ b/uni_modules/uni-section/changelog.md
--- a/uni_modules/uni-section/components/uni-section/uni-section.vue
+++ b/uni_modules/uni-section/components/uni-section/uni-section.vue
--- a/uni_modules/uni-section/package.json
+++ b/uni_modules/uni-section/package.json
--- a/uni_modules/uni-section/readme.md
+++ b/uni_modules/uni-section/readme.md
--- a/uni_modules/uni-tooltip/changelog.md
+++ b/uni_modules/uni-tooltip/changelog.md
--- a/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue
+++ b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue
--- a/uni_modules/uni-tooltip/package.json
+++ b/uni_modules/uni-tooltip/package.json
--- a/uni_modules/uni-tooltip/readme.md
+++ b/uni_modules/uni-tooltip/readme.md
--- a/uni_modules/uni-ui/changelog.md
+++ b/uni_modules/uni-ui/changelog.md
--- a/uni_modules/uni-ui/package.json
+++ b/uni_modules/uni-ui/package.json
--- a/uni_modules/uni-ui/readme.md
+++ b/uni_modules/uni-ui/readme.md
--- a/uni_modules/uni-upgrade-center-app/changelog.md
+++ b/uni_modules/uni-upgrade-center-app/changelog.md
--- a/uni_modules/uni-upgrade-center-app/package.json
+++ b/uni_modules/uni-upgrade-center-app/package.json
--- a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
+++ b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
--- a/uni_modules/uni-upgrade-center-app/readme.md
+++ b/uni_modules/uni-upgrade-center-app/readme.md
--- a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/temp.png
+++ b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/temp.png
--- a/uni_modules/uni-upgrade-center-app/utils/call-check-version.js
+++ b/uni_modules/uni-upgrade-center-app/utils/call-check-version.js
--- a/uni_modules/uni-upgrade-center-app/utils/check-update.js
+++ b/uni_modules/uni-upgrade-center-app/utils/check-update.js