From f86fc1b76cdf161bc3a9e51356f0942d31d9bc8f Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Tue, 12 Dec 2023 08:57:15 +0800
Subject: [PATCH] 11

---
 uni_modules/.DS_Store                         | Bin 0 -> 12292 bytes
 uni_modules/uni-fab/changelog.md              |  23 +
 .../uni-fab/components/uni-fab/uni-fab.vue    | 491 +++++++++++++
 uni_modules/uni-fab/package.json              |  84 +++
 uni_modules/uni-fab/readme.md                 |   9 +
 uni_modules/uni-icons/changelog.md            |  12 +
 .../components/uni-icons/uni-icons.uvue       |  89 +++
 .../components/uni-icons/uni-icons.vue        |  90 ++-
 .../components/uni-icons/uniicons.css         |  63 +-
 .../components/uni-icons/uniicons.ttf         | Bin 35760 -> 35824 bytes
 .../components/uni-icons/uniicons_file.ts     | 664 ++++++++++++++++++
 uni_modules/uni-icons/package.json            |  26 +-
 uni_modules/uview-ui/.DS_Store                | Bin 0 -> 8196 bytes
 uni_modules/uview-ui/components/.DS_Store     | Bin 0 -> 12292 bytes
 14 files changed, 1469 insertions(+), 82 deletions(-)
 create mode 100644 uni_modules/.DS_Store
 create mode 100644 uni_modules/uni-fab/changelog.md
 create mode 100644 uni_modules/uni-fab/components/uni-fab/uni-fab.vue
 create mode 100644 uni_modules/uni-fab/package.json
 create mode 100644 uni_modules/uni-fab/readme.md
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
 create mode 100644 uni_modules/uview-ui/.DS_Store
 create mode 100644 uni_modules/uview-ui/components/.DS_Store

diff --git a/uni_modules/.DS_Store b/uni_modules/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5e278a41e7d2ff979b4b576bba8f3892bef29c57
GIT binary patch
literal 12292
zcmeI2O^6&t6vwMKiJ8qNx+alCP#8_{GpoBvR1yWp%>*<c1Sjf2Wiwydj62gk?#yJf
ziID*@9#q(if(QW-@e)7C#R#G&HBk}+67gb)2NCpO4j%NP{$KU<^n24aHN6OerhDnG
z-k$fb>fd|y(N*0_DQB`(no#N%rBn(#rK2lxcu}eJ2vWAu@3cp@CAi{XKZG6Uqe@lO
zm@28fYN~R?I(lIUmq@=9`x@0!uFyB}Uk&+;sXESzY6j=C)#-^`(W}*UX3kqHaJ>kN
z27aqzFQViutea|HSPrc^3dJg6t+PlDi3bu7BpygSka*y-^8k&#*it>?y?-@1CLTyU
za9MkR`iC@jN;93b?Welyz=0m&>34dB*Bj0;575`roix))+kUF0&}b=AU+Q$G7>+N;
z^)#6y&2-YXpZap;_;TfRN_ILk6i1g1U0RzfC*!BdG4Vj+fv5*|<5JAIcg@RY3stWG
zMe4Wnr#`$e^VtK7QJ4OKy1t*y`-jpf7PI+a#h{E8hlZNRyx+xIK}$6ss(QuFouWH%
zUV`<pzw|~zn^LSAsN5;LHTTHQji&>TSnjOmg<goK5ag;&_kUHFd>@!;-9xOA^w9qS
z1*adNmL7QL*TLm+FRWkwW#EMY<#12LS4nSNB5w>cZ+L1JYeo&}fuZRh4;U1Z`n&7Q
z`Et_iZC?eXhWt34-BJ+wqgPmerj>`k5^DDt>ULfokYoz&&$-fAvm;7LxS<6?OF5i$
z&%<-?wyL_VTNPo=j;9dhY5_OIVo5809+-P#sow7)4t?KM2vX;jgXVlW;ju%TpFiXi
z8uH_@v|9=y=Nu8Gy0x>4w%UmFP1pDEMC=8P`r#W>o}A_A@iRfajO4{hY<7}koH)YB
zR}q&y>f{(&8nw5wtdrE+_NkK*rDWSRZ!d>aUOaI&ptRf>=Z&Wj<mv+=zp@)a7iTq9
zpmk`_7eIfohaG*bV7F=|{f+bhYqjV6qmQ0%zwYWbIY1M(%D5WogWcqVuvOGSO=E0b
zl2acm$PEg~`|KO$d^zR$U0(-LHsr^nYqu0cejgjQjRty}Mx>vip7lA_vqtPC%?=kd
z5gX3(>DetoA7ii!qhzxa9O@E9CX7D41IeRi7S(=TJ8>>!r29_JWYtQ(+kYNZ7H3^}
zZ)?D6ErUleu15M`fqXF1ZK31?dIwZNEp;WmLp?30@1v63>t5}jKPUcu?YW?)_Q{vC
z4z`w*8KMkZ0P!{Hxvz(idR|UwP)NG<FPQV?WGA+F$qe~%D!ZkDD6AVz)Z09b_L|HT
zJ?dFGn^h|*?>YlYt3Bsk_H>tbfF^9SaW&EhdvRO3&o}_;vYJDyZK;ZksqR-fH}xID
zzA)FQcjh`D73$SWqd7kQtuwS_>9Q-9r<SKiQcvafdvm#FzS(L_=4YRv|MqxZwGf==
z3y)RGb5o;hcX)0yUvbN`T2LvKVe;hT6}RNgO?oZ2)X>_T|3hjxH9R$X?cu`{+a~VW
zl-@kP<;bS=;cc78H>J03x%<eG;nX!7?!5PrshMic^=JZy&FQS&;9){;FXP_`m<ZyU
zZ9kf9c;L3L`Xy+Bk-T^{wb_XP-EfiaGLqMU+^k#mT$)q_JY@GD-EPHw%lG2qExN3Y
zG~ZBnuu;*X6yY<ye;4KOKu%ovI0&RAe;(3!3K86)3{bGv_zc<}ts?~AE#z@VBPfle
z&B#*$W*>ropk8<(z51s(WpZDfeC?CK7X!=U9$Ab|_$95MdBdK*pr7@pBV!FlQ{f4N
zLa?iw{)EC{#c5B!{dquZv<!P(yQLsf`U#ervHyKZQOC9<Yqnk^;x#*BFKKQ*4w{G!
zXL<AcE{nk~B(d2UI94(a56=Kq(9|(*_C5>Hst@PstCL)lC!y<W%lS4wm|cB;P0v6q
z_915+d&yhJt*8}(mu6p)S(jel;jBiD<lHdTFK^B`vF?kYJ{t4nEpCvlWYcx>>MooA
z%~a6$P|rAHBGvuxG1mXa$U$=NqhTwCihE(#eAf%Hlwr&lr<5LApy-Edh@pqrw_dUh
z)BL8-N~cjRJ#*i_!R2wUv@dkMGT<(GEs3v^-q?$qi@Q!Qy+ZSz&?{`sK&fSvDZc$1
z!C`0r@Bg$>a!5Roc;Nr(0cUA8mz@M#zxfQkYfod}i#^z2tIcuHui}yFSMf;ot9Yd2
z%r-;kxYqVloMHRdKLQB899GHrk9kk;oQFMk@R4qDqc|V!7N?XWUNZi(H{O2Bi}{{D
H-uVAF3no`F

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md
new file mode 100644
index 0000000..9bd4729
--- /dev/null
+++ b/uni_modules/uni-fab/changelog.md
@@ -0,0 +1,23 @@
+## 1.2.5（2023-03-29）
+- 新增 pattern.icon 属性，可自定义图标
+## 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）
+- 修复 阴影颜色不正确的bug
+## 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-fab](https://uniapp.dcloud.io/component/uniui/uni-fab)
+## 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.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 按钮背景色调整
+- 优化 兼容pc端
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
new file mode 100644
index 0000000..43b4531
--- /dev/null
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -0,0 +1,491 @@
+<template>
+	<view class="uni-cursor-point">
+		<view v-if="popMenu && (leftBottom||rightBottom||leftTop||rightTop) && content.length > 0" :class="{
+        'uni-fab--leftBottom': leftBottom,
+        'uni-fab--rightBottom': rightBottom,
+        'uni-fab--leftTop': leftTop,
+        'uni-fab--rightTop': rightTop
+      }" class="uni-fab"
+				:style="nvueBottom"
+			>
+			<view :class="{
+          'uni-fab__content--left': horizontal === 'left',
+          'uni-fab__content--right': horizontal === 'right',
+          'uni-fab__content--flexDirection': direction === 'vertical',
+          'uni-fab__content--flexDirectionStart': flexDirectionStart,
+          'uni-fab__content--flexDirectionEnd': flexDirectionEnd,
+		  'uni-fab__content--other-platform': !isAndroidNvue
+        }" :style="{ width: boxWidth, height: boxHeight, backgroundColor: styles.backgroundColor }"
+				class="uni-fab__content" elevation="5">
+				<view v-if="flexDirectionStart || horizontalLeft" class="uni-fab__item uni-fab__item--first" />
+				<view v-for="(item, index) in content" :key="index" :class="{ 'uni-fab__item--active': isShow }"
+					class="uni-fab__item" @click="_onItemClick(index, item)">
+					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="uni-fab__item-image"
+						mode="aspectFit" />
+					<text class="uni-fab__item-text"
+						:style="{ color: item.active ? styles.selectedColor : styles.color }">{{ item.text }}</text>
+				</view>
+				<view v-if="flexDirectionEnd || horizontalRight" class="uni-fab__item uni-fab__item--first" />
+			</view>
+		</view>
+		<view :class="{
+		  'uni-fab__circle--leftBottom': leftBottom,
+		  'uni-fab__circle--rightBottom': rightBottom,
+		  '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, 'bottom': nvueBottom }" @click="_onClick">
+			<uni-icons class="fab-circle-icon" :type="styles.icon" :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>
+			<view class="fab-circle-h" :class="{'uni-fab__plus--active': isShow  && content.length > 0}"></view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	let platform = 'other'
+	// #ifdef APP-NVUE
+	platform = uni.getSystemInfoSync().platform
+	// #endif
+
+	/**
+	 * Fab 悬浮按钮
+	 * @description 点击可展开一个图形按钮菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=144
+	 * @property {Object} pattern 可选样式配置项
+	 * @property {Object} horizontal = [left | right] 水平对齐方式
+	 * 	@value left 左对齐
+	 * 	@value right 右对齐
+	 * @property {Object} vertical = [bottom | top] 垂直对齐方式
+	 * 	@value bottom 下对齐
+	 * 	@value top 上对齐
+	 * @property {Object} direction = [horizontal | vertical] 展开菜单显示方式
+	 * 	@value horizontal 水平显示
+	 * 	@value vertical 垂直显示
+	 * @property {Array} content 展开菜单内容配置项
+	 * @property {Boolean} popMenu 是否使用弹出菜单
+	 * @event {Function} trigger 展开菜单点击事件，返回点击信息
+	 * @event {Function} fabClick 悬浮按钮点击事件
+	 */
+	export default {
+		name: 'UniFab',
+		emits: ['fabClick', 'trigger'],
+		props: {
+			pattern: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			horizontal: {
+				type: String,
+				default: 'left'
+			},
+			vertical: {
+				type: String,
+				default: 'bottom'
+			},
+			direction: {
+				type: String,
+				default: 'horizontal'
+			},
+			content: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			show: {
+				type: Boolean,
+				default: false
+			},
+			popMenu: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				fabShow: false,
+				isShow: false,
+				isAndroidNvue: platform === 'android',
+				styles: {
+					color: '#3c3e49',
+					selectedColor: '#007AFF',
+					backgroundColor: '#fff',
+					buttonColor: '#007AFF',
+					iconColor: '#fff',
+					icon: 'plusempty'
+				}
+			}
+		},
+		computed: {
+			contentWidth(e) {
+				return (this.content.length + 1) * 55 + 15 + 'px'
+			},
+			contentWidthMin() {
+				return '55px'
+			},
+			// 动态计算宽度
+			boxWidth() {
+				return this.getPosition(3, 'horizontal')
+			},
+			// 动态计算高度
+			boxHeight() {
+				return this.getPosition(3, 'vertical')
+			},
+			// 计算左下位置
+			leftBottom() {
+				return this.getPosition(0, 'left', 'bottom')
+			},
+			// 计算右下位置
+			rightBottom() {
+				return this.getPosition(0, 'right', 'bottom')
+			},
+			// 计算左上位置
+			leftTop() {
+				return this.getPosition(0, 'left', 'top')
+			},
+			rightTop() {
+				return this.getPosition(0, 'right', 'top')
+			},
+			flexDirectionStart() {
+				return this.getPosition(1, 'vertical', 'top')
+			},
+			flexDirectionEnd() {
+				return this.getPosition(1, 'vertical', 'bottom')
+			},
+			horizontalLeft() {
+				return this.getPosition(2, 'horizontal', 'left')
+			},
+			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: {
+			pattern: {
+				handler(val, oldVal) {
+					this.styles = Object.assign({}, this.styles, val)
+				},
+				deep: true
+			}
+		},
+		created() {
+			this.isShow = this.show
+			if (this.top === 0) {
+				this.fabShow = true
+			}
+			// 初始化样式
+			this.styles = Object.assign({}, this.styles, this.pattern)
+		},
+		methods: {
+			_onClick() {
+				this.$emit('fabClick')
+				if (!this.popMenu) {
+					return
+				}
+				this.isShow = !this.isShow
+			},
+			open() {
+				this.isShow = true
+			},
+			close() {
+				this.isShow = false
+			},
+			/**
+			 * 按钮点击事件
+			 */
+			_onItemClick(index, item) {
+				if (!this.isShow) {
+					return
+				}
+				this.$emit('trigger', {
+					index,
+					item
+				})
+			},
+			/**
+			 * 获取 位置信息
+			 */
+			getPosition(types, paramA, paramB) {
+				if (types === 0) {
+					return this.horizontal === paramA && this.vertical === paramB
+				} else if (types === 1) {
+					return this.direction === paramA && this.vertical === paramB
+				} else if (types === 2) {
+					return this.direction === paramA && this.horizontal === paramB
+				} else {
+					return this.isShow && this.direction === paramA ? this.contentWidth : this.contentWidthMin
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-shadow-base:0 1px 5px 2px rgba($color: #000000, $alpha: 0.3) !default;
+
+	.uni-fab {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		z-index: 10;
+		border-radius: 45px;
+		box-shadow: $uni-shadow-base;
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-fab--active {
+		opacity: 1;
+	}
+
+	.uni-fab--leftBottom {
+		left: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab--leftTop {
+		left: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab--rightBottom {
+		right: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab--rightTop {
+		right: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+		// padding: 10px;
+	}
+
+	.uni-fab__circle {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		width: 55px;
+		height: 55px;
+		background-color: #3c3e49;
+		border-radius: 45px;
+		z-index: 11;
+		// box-shadow: $uni-shadow-base;
+	}
+
+	.uni-fab__circle--leftBottom {
+		left: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+	}
+
+	.uni-fab__circle--leftTop {
+		left: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+	}
+
+	.uni-fab__circle--rightBottom {
+		right: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		bottom: calc(30px + var(--window-bottom));
+		/* #endif */
+	}
+
+	.uni-fab__circle--rightTop {
+		right: 15px;
+		top: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		top: calc(30px + var(--window-top));
+		/* #endif */
+	}
+
+	.uni-fab__circle--left {
+		left: 0;
+	}
+
+	.uni-fab__circle--right {
+		right: 0;
+	}
+
+	.uni-fab__circle--top {
+		top: 0;
+	}
+
+	.uni-fab__circle--bottom {
+		bottom: 0;
+	}
+
+	.uni-fab__plus {
+		font-weight: bold;
+	}
+
+	// .fab-circle-v {
+	// 	position: absolute;
+	// 	width: 2px;
+	// 	height: 24px;
+	// 	left: 0;
+	// 	top: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	/* #ifndef APP-NVUE */
+	// 	margin: auto;
+	// 	/* #endif */
+	// 	background-color: white;
+	// 	transform: rotate(0deg);
+	// 	transition: transform 0.3s;
+	// }
+
+	// .fab-circle-h {
+	// 	position: absolute;
+	// 	width: 24px;
+	// 	height: 2px;
+	// 	left: 0;
+	// 	top: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	/* #ifndef APP-NVUE */
+	// 	margin: auto;
+	// 	/* #endif */
+	// 	background-color: white;
+	// 	transform: rotate(0deg);
+	// 	transition: transform 0.3s;
+	// }
+
+	.fab-circle-icon {
+		transform: rotate(0deg);
+		transition: transform 0.3s;
+		font-weight: 200;
+	}
+
+	.uni-fab__plus--active {
+		transform: rotate(135deg);
+	}
+
+	.uni-fab__content {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-radius: 55px;
+		overflow: hidden;
+		transition-property: width, height;
+		transition-duration: 0.2s;
+		width: 55px;
+		border-color: #DDDDDD;
+		border-width: 1rpx;
+		border-style: solid;
+	}
+
+	.uni-fab__content--other-platform {
+		border-width: 0px;
+		box-shadow: $uni-shadow-base;
+	}
+
+	.uni-fab__content--left {
+		justify-content: flex-start;
+	}
+
+	.uni-fab__content--right {
+		justify-content: flex-end;
+	}
+
+	.uni-fab__content--flexDirection {
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.uni-fab__content--flexDirectionStart {
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.uni-fab__content--flexDirectionEnd {
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.uni-fab__item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 55px;
+		height: 55px;
+		opacity: 0;
+		transition: opacity 0.2s;
+	}
+
+	.uni-fab__item--active {
+		opacity: 1;
+	}
+
+	.uni-fab__item-image {
+		width: 20px;
+		height: 20px;
+		margin-bottom: 4px;
+	}
+
+	.uni-fab__item-text {
+		color: #FFFFFF;
+		font-size: 12px;
+		line-height: 12px;
+		margin-top: 2px;
+	}
+
+	.uni-fab__item--first {
+		width: 55px;
+	}
+</style>
diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json
new file mode 100644
index 0000000..18c0810
--- /dev/null
+++ b/uni_modules/uni-fab/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-fab",
+  "displayName": "uni-fab 悬浮按钮",
+  "version": "1.2.5",
+  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "按钮",
+    "悬浮按钮",
+    "fab"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "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-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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-fab/readme.md b/uni_modules/uni-fab/readme.md
new file mode 100644
index 0000000..9a444e8
--- /dev/null
+++ b/uni_modules/uni-fab/readme.md
@@ -0,0 +1,9 @@
+## Fab 悬浮按钮
+> **组件名：uni-fab**
+> 代码块： `uFab`
+
+
+点击可展开一个图形按钮菜单
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fab)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 6449885..85519e8 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,3 +1,15 @@
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
 ## 1.3.5（2022-01-24）
 - 优化 size 属性可以传入不带单位的字符串数值
 ## 1.3.4（2022-01-24）
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
new file mode 100644
index 0000000..456b11d
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,89 @@
+<template>
+	<text class="uni-icons" :style="styleObj">
+		<slot>{{unicode}}</slot>
+	</text>
+</template>
+
+<script>
+	import { fontData, IconsDataItem } from './uniicons_file'
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icon 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: "uni-icons",
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: Object,
+				default: 24
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			unicode() : string {
+				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+				if (codes !== null) {
+					return codes.unicode
+				}
+				return ''
+			},
+			iconSize() : string {
+				if (typeof this.size == 'string') {
+					return '' + this.size
+				}
+				const size = this.size as number
+				return this.getFontSize(size)
+			},
+			styleObj() : UTSJSONObject {
+				if (this.fontFamily !== '') {
+					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+				}
+				return { color: this.color, fontSize: this.iconSize }
+			}
+		},
+		created() { },
+		methods: {
+			/**
+			 * 字体大小
+			 */
+			getFontSize(size : number) : string {
+				return size + 'px';
+			},
+		},
+	}
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: UniIconsFontFamily;
+		src: url('./uniicons.ttf');
+	}
+
+	.uni-icons {
+		font-family: UniIconsFontFamily;
+		font-size: 18px;
+		font-style: normal;
+		color: #333;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index a87f68e..227b077 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -1,24 +1,22 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
-	<!-- #endif -->
-	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import icons from './icons.js';
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
+	import { fontData } from './uniicons_file.ts';
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
 	domModule.addRule('fontFace', {
 		'fontFamily': "uniicons",
-		'src': "url('"+iconUrl+"')"
+		'src': "url('" + iconUrl + "')"
 	});
 	// #endif
 
@@ -28,13 +26,13 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
 	 * @property {Number} size 图标大小
 	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @property {String} customPrefix 自定义图标
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
 	 * @event {Function} click 点击 Icon 触发事件
 	 */
 	export default {
 		name: 'UniIcons',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				type: String,
@@ -46,29 +44,43 @@
 			},
 			size: {
 				type: [Number, String],
-				default: 16
-			},
-			customPrefix:{
-				type: String,
-				default: ''
+				default: 24
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
 			return {
-				icons: icons.glyphs
+				icons: fontData 
+			}
+		},
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
+				}
+				return ''
+			},
+			iconSize()  {
+				if (typeof this.size == 'string') {
+					return this.size
+				}
+				const size = this.size
+				return size + 'px'
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
 			}
-		},
-		computed:{
-			unicode(){
-				let code = this.icons.find(v=>v.font_class === this.type)
-				if(code){
-					return unescape(`%u${code.unicode}`)
-				}
-				return ''
-			},
-			iconSize(){
-				return getVal(this.size)
-			}
 		},
 		methods: {
 			_onClick() {
@@ -78,19 +90,19 @@
 	}
 </script>
 
-<style lang="scss">
-	/* #ifndef APP-NVUE */
+<style lang="scss">
+	/* #ifndef APP-NVUE */
 	@import './uniicons.css';
+
 	@font-face {
 		font-family: uniicons;
-		src: url('./uniicons.ttf') format('truetype');
+		src: url('./uniicons.ttf');
 	}
 
-	/* #endif */
+	/* #endif */
 	.uni-icons {
 		font-family: uniicons;
 		text-decoration: none;
 		text-align: center;
 	}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
index 2f56eab..0a6b6fe 100644
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -1,3 +1,12 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
 .uniui-color:before {
   content: "\e6cf";
 }
@@ -58,10 +67,6 @@
   content: "\e6c3";
 }
 
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
 .uniui-fire-filled:before {
   content: "\e6c5";
 }
@@ -82,6 +87,18 @@
   content: "\e698";
 }
 
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
 .uniui-back:before {
   content: "\e6b9";
 }
@@ -94,55 +111,43 @@
   content: "\e6bb";
 }
 
-.uniui-arrowthinright:before {
-  content: "\e6bb";
-}
-
 .uniui-arrow-left:before {
   content: "\e6bc";
 }
 
-.uniui-arrowthinleft:before {
-  content: "\e6bc";
-}
-
 .uniui-arrow-up:before {
   content: "\e6bd";
 }
 
-.uniui-arrowthinup:before {
-  content: "\e6bd";
-}
-
 .uniui-arrow-down:before {
   content: "\e6be";
 }
 
-.uniui-arrowthindown:before {
-  content: "\e6be";
+.uniui-arrowthinright:before {
+  content: "\e6d1";
 }
 
-.uniui-bottom:before {
+.uniui-down:before {
   content: "\e6b8";
 }
 
-.uniui-arrowdown:before {
+.uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-right:before {
-  content: "\e6b5";
+.uniui-arrowright:before {
+  content: "\e6d5";
 }
 
-.uniui-arrowright:before {
+.uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-top:before {
+.uniui-up:before {
   content: "\e6b6";
 }
 
-.uniui-arrowup:before {
+.uniui-top:before {
   content: "\e6b6";
 }
 
@@ -150,8 +155,8 @@
   content: "\e6b7";
 }
 
-.uniui-arrowleft:before {
-  content: "\e6b7";
+.uniui-arrowup:before {
+  content: "\e6d6";
 }
 
 .uniui-eye:before {
@@ -638,10 +643,6 @@
   content: "\e627";
 }
 
-.uniui-cart-filled:before {
-  content: "\e629";
-}
-
 .uniui-checkbox:before {
   content: "\e62b";
 }
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
index 835f33bc9411461b8b9046b3fec742e921d6ce3a..14696d038d828073edac09ea4e5ba1dec2f58115 100644
GIT binary patch
delta 3270
zcmYM$c~I2n83*w1Z&}#oaF<0`P&szFg$04-5)qXg8lxu0BL<C%Ab1cl8&WIPtVz|R
z9z<Oe)DS{bwbrybBu#B<t!=EeCb5*NlX0BRG&6mgKROvF(>5KaL;8L9(H7>j``ZiV
zec$K#KKpLJ?RLNIKwjlZz}g33b=y;|o4>x%{b#_w4oKM3*|oLfjicc&faGf6>7jLN
zTiXkR+xibK4mdwd_{;{l{&Dc7oV06zt#fntGd+g~leYpp8v)1r2hRmEJ-s<t<!<~Z
z67Br^z+d)cF1U9ev0EQoH-<;7w`|j|z%ox;7ZDS^3h+LGfAk9M))Bst%-<M5iX<RG
zX^<H*OKyDgP4t<P$XUBToQh0jBcH#(Q5?ZByoLe1jzRR}RlI^eyo>`lh(n0rF!tj)
zgs}t9qW~}9yV!|c*o_zQ68!ic_FymeVH>ui3r}Gay0IBgBZOzrgJ<zAY{9p&6}|Wl
z)?)*5u@Ni6coHkI3ainIHE2US)}jNQScj!}9Lw+oTCf}sVJ;rVJd|QS7T^&)iU1bk
zF)YGjEWv{)!)(mKOw2+v?!*0f0A4g;8X7SjX=uU>lw%4iP>Cu8QH>hZq7L<#iY3LE
zj1r`x2zC@AkNc2~9QcrhiI~K_Nk;}IU_4xKb1yxxAqDZ=<3uE39Gr-Q1F_NFzxQ5#
ze%Kc`&hlU2mYSdAX1f))7*e8eB+}xT9q#9&pyGx@rYdedq(SizAgm38#{rqHcrcJA
z#Up~uP&_QiEX8Ak+^2Yekoy&n67m2LHa9#~$b*XK3z@BW(vUfdXAXHt@$?~c73%=<
zuwq3(<|)<&WWHjRKv=*A>jm<NV&#M(kMaSrh#(6U%L($BVqrlRDV7*yv0|}7mME4T
zWT|2SLLOHvMaVM6qJ%u5Se}p;gR5nwLY6DmEM$dZ^+KLhtYgSZ#fpZkQmk#rYQ-vt
zv?|s+WQ}6wL)sL30Mf454Uq6!-VhrD(xKQQkWR&BfiP4IwhiPiHW1`4wi0BcVpBoP
zN(p8mW~IbFgP4U9I}TzNN?|r1#H^Iqh7hw-VnagAN{OurF)JlDDa5Rl*sc(>Qexvm
z%u0zZ3^6MuHZ#Pml-Sk~vruA#Lwe2mbG7Vsh*>GI>mlY0iTw{TXGlx}h$&QJCUEN%
z(*d$WF()9VP>G2Fc|kEdAf`BpDFQLYNtkc`$S%cbftczfh79CI#khf(;v@zS#1tek
zf*__KiD3lUs~Ag=eTo4E*{>K?kUquGg1k&&-Y~x)2NaVGa!@hTAcquY@;;)NbCAP|
zi3fQ_G5a8|DyAT$Uoj6MM--D0a#S%R+5gA*fEbsM*A#;jGN2ftkk=K%6f&q7tB^Mo
z0~Ru*7`2e^D~2xQO~v?y{6H~?A;+V*|5dy=p_tB)lZrVF`JrNBLry7XH{?f(DGoWU
znCFnU6q6nDV})Yg|3oqDA#W?jKI9#9{_k-0sl0zzaTY+{Q=AHrGm7&8GORc$Anz+P
zJLRW}(*yE>;v9keOu@(dvx>6?@^gjoL|%NTIB+1pP#iswbBaR<@=L{W1Uaubm>|DW
z98r)9io*)>YsIkz`HkWLgM6eo${-ib`SXTT4f0#X`3AY9IO!n2Q|5bxTvnWZkl!oL
zLC6)wi3s^vaW+CeQJj*HPZj4S<f`K2WdHwx4=DOYWrWvczRbuURdgptc}>xs_!F-w
zx)axUP0^jW&TEPu!3|!MIfCd<3$9s*tUI<1w#zZ)F*{>M>>2iUyTmqxV+UiuhzrD>
ziM!)ya_n)Obxw57b@n<>JI^~u<8ASQ_@(hX;!nqal~A2<KGB=FBJoU8VbVa-=(vV)
z1Fj6$V%IhIGWWldo04yMYCQuf-ju$Se~%B1|9fhE>W<VaY0YVUX<vF9y#wA`>4Ef<
z8Lo_$jB^v3C+wSWdt&3nkxAi}Nmnx)GB0FhWG7``%xTOS^cDNMe8+sFey6|Be=gUR
z8_K<$=gjNLyOdv@e?0&5f;k0)1-A;z3lA55RkW<=WN~eAZ}G{=uF36_M@mvl`bsXB
zCYOF0NDV9qoGMEyJ5ctY^4jvD@|#ndrwmQGSy553vf@&uuX1NqepN@+P<7RnU}kVb
zP^zn{->$w{GqdK++KSrd+C#Nh>#FK{>%H}x>PO7c@O<{$uCoV%XpG$6HX~BAy)F{k
zUdjgI*WT#sVcQrxdm7_rAy2T}Dz)lrYpM(L94^ak6_s0gjyPVX=eevbE89x<WZQ!N
zCi5OoU6WN)P&>`4@}|a>T1COC94jxku)5ard-6Q~8h=eN%^wqv31lyhiLEbkdkbA<
zRqo<6m&aWY&Pr~{F1AuVww&rLYc##Yof+#+8N223I^F5%?&a?}y{;+Clf7Q+uVbH1
z9sA5Go@xbcmD!UW?&RWniyxfYl$>H&4)@%A{)4S4zJ#%_vn#V~X&!%x6%&(?JN}Nx
z>+{a@Oylj?sj-i&=?y2CSEi7;DZ_tre~>tQBJ;X!xWwnPBE31o!}I+ImJgrU{)r<y
zv8^@KQ`WJ*t7~n0V(0pfd)KjT-Cf<G$d+9lcdtI*wJ0)c_w3c<T0^1kEj{bjZ|Yjx
z(UbVUN6&8l|10g?TQ=F(w6<+@baaQdw1(RCZDpbLo$GqyqaQJENr+xWpN#40-mEVS
NkM16_N1oeT@n2MfM_vE`

delta 3174
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
WG}d?b6t%2rZ*OjjT;5yCDEc4U`6v_s

diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
new file mode 100644
index 0000000..86318df
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
+
+export type IconsData = {
+	id : string
+	name : string
+	font_family : string
+	css_prefix_text : string
+	description : string
+	glyphs : Array<IconsDataItem>
+}
+
+export type IconsDataItem = {
+	font_class : string
+	unicode : string
+}
+
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+] as IconsDataItem[]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index d1c4e77..8f46053 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.5",
+  "version": "2.0.6",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,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"],
@@ -50,7 +47,8 @@
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "y",
+          "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -70,11 +68,15 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+          "QQ": "y",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
         },
         "快应用": {
-          "华为": "u",
-          "联盟": "u"
+          "华为": "y",
+          "联盟": "y"
         },
         "Vue": {
             "vue2": "y",
@@ -83,4 +85,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uview-ui/.DS_Store b/uni_modules/uview-ui/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8b1da6f71e71e0d17ec54fc05870b62af55e127d
GIT binary patch
literal 8196
zcmeHMO-~a+7=8z<Z26EysY29bV=pEU1SA?`47EVCenBWf@T=^$Ls{6)G`kB$2}$o7
ze}D&nfr(eWn)nwyc<~Q-@MPji-<jD$KOiwNF(l3;GtcbI`^-D@?9Oc8EdY@8Mqw17
z9{>!@0?ke=_DP~&<d)PHwR9m8<O39ef(IONxW!sGXa%$aS^=$qRzNFo7!<&Fwn)YS
z?|s#)ORa!b;J;KroDUXefvE_q3gyv(g$w}@W7sSc)-eu{94o?9gjI!-ieswifkadi
zg&0K9vELHrh^Yvx3KboQq63LMlPE$V(mV1jX$~Z%P?uT(tw5^+B6jbBJgkBZtRa3c
zK_TPuyyI~PZN#>^fqD3sOjrZxKpuw@l(A$O`7;P1XyUy46OK~}%8{QBPT6yVaAf2&
zX*&`-daT`OH#&_c*;QW2hIY6Sq;3C^xSHqOb82<lS#W73XZB5U7TPYOz9hH>iYAXA
zxU9e{X}-Y<f#haYhY>g8Idfopd-Uq)l_6_v<kHTNwS9GLWXKx7ba`hdZX}Wyug&Gw
zy%OUu<dT6z=MQwN>)rAt*7g;|&2L7FBOhyv`)ZoC<;6QXySk6}n7t=X_V)EA5{Xl%
z6a51NXL9CA$Ih=8eKGAx?r}fuZO}zG&so-eP8UPE6^csEJkew~M+;B)n&zLC(WY;&
zL5_9Pr<6S^`fg!nWhJ2DV$SRd@;>*xSsu8d%h^(0@6zJ{70-mUlwm6zJ#M1fGi6~G
zEKol{Y~e31*}iYHB27Pg;@J-MW>}hsAukC_F&Zvp)~8}5=_y;b^DZkUC%!95ld0KS
z<$|i1kW>}?$=X+|MM&luXEYv9rtU;71`Of@dmFO&XjkAByoR^%9zMYr_y#{njGQ9p
z$sidg*U1FAMKa_e$&qDZD|TD$E}w1mL)P$m-@Ck-^_j<65&H$#02jAI0XM}KehOP_
z-WKE>+B9yZdiwx3R?xx`PhdSKhM(G8a9ZqsHrchqUC6*BOv8OtW4dvJwuu?nkJ^RX
z*+&2CSc=bia`s|_H}d3R@TTrCh{GIuxB*je4{;ceh34Z!90m1^4m>Va(L+gk*?-MK
zr+Uur{?qS&R7NMQz+WhEL~;8?{6Bs0_y51}ps88`t-xVdfW)S<Q)!%K?N?9pghi}v
wVP3{8lCY~PloTvvIF2a8am3v}46$yZso<m{tSZD7O!`BBltC9-fq$yNZ)Vp<cK`qY

literal 0
HcmV?d00001

diff --git a/uni_modules/uview-ui/components/.DS_Store b/uni_modules/uview-ui/components/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3195c994eba32613421f4faa6f666d2482a3924d
GIT binary patch
literal 12292
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
b{yze!e9>d(SwG9w^M5`6n_1O8IrIO2*O5nn

literal 0
HcmV?d00001