From 23e797ab8fa79538ec2aed4fc457a43fb0cf5a72 Mon Sep 17 00:00:00 2001
From: jry <ijry@qq.com>
Date: Sun, 7 Apr 2024 23:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0up-copy=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/common/demo.scss                          |   8 +-
 src/main.ts                                   |   2 +-
 src/pages.json                                |  18 +++--
 src/pages/componentsA/cell/cell.nvue          |  34 +++++----
 src/pages/componentsD/copy/copy.vue           |  23 ++++++
 src/pages/example/components.config.js        |   6 ++
 src/static/uview/demo/copy.png                | Bin 0 -> 1157 bytes
 .../uview-plus/components/u-copy/u-copy.vue   |  70 ++++++++++++++++++
 9 files changed, 139 insertions(+), 24 deletions(-)
 create mode 100644 src/pages/componentsD/copy/copy.vue
 create mode 100644 src/static/uview/demo/copy.png
 create mode 100644 src/uni_modules/uview-plus/components/u-copy/u-copy.vue

diff --git a/package.json b/package.json
index f05fa4605..a71d04358 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@rollup/plugin-commonjs": "^25.0.0",
     "clipboard": "^2.0.11",
     "dayjs": "^1.11.8",
-    "uview-plus": "^3.1.39",
+    "uview-plus": "^3.1.52",
     "vue": "^3.2.45",
     "vue-i18n": "^9.2.2",
     "vuex": "^4.1.0"
diff --git a/src/common/demo.scss b/src/common/demo.scss
index 600365cdf..0c95d71c3 100644
--- a/src/common/demo.scss
+++ b/src/common/demo.scss
@@ -1,6 +1,6 @@
-.u-block{
+.u-block {
 	padding: 14px;
-	&__section{
+	&__section {
 		margin-bottom:10px;
 	}
 	&__title {
@@ -9,7 +9,7 @@
 		color: $u-content-color;
 		margin-bottom:10px;
 	}
-	&__flex{
+	&__flex {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -26,6 +26,8 @@
 .u-page {
 	padding: 15px 15px 40px 15px;
 	&__item {
+		flex: 1;
+		margin-bottom: 23px;
 		&__title {
 			font-size: 14px;
 			color: rgb(143, 156, 162);
diff --git a/src/main.ts b/src/main.ts
index a4cba6f64..ab3be9972 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -27,7 +27,7 @@ import mixin from './common/mixin'
 import { createSSRApp } from 'vue'
 import { createI18n } from 'vue-i18n'
 const i18n = createI18n(i18nConfig)
-import {initRequest} from './util/request/index'
+import { initRequest } from './util/request/index'
 export function createApp() {
   const app = createSSRApp(App)
   
diff --git a/src/pages.json b/src/pages.json
index 91ad10661..48ca49a00 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -435,12 +435,20 @@
 	},
 	{
 		"root": "pages/componentsD",
-		"pages": [{
-			"path": "qrcode/qrcode",
-			"style": {
-				"navigationBarTitleText": "二维码"
+		"pages": [
+			{
+				"path": "qrcode/qrcode",
+				"style": {
+					"navigationBarTitleText": "二维码"
+				}
 			}
-		}]
+			,{
+				"path": "copy/copy",
+				"style": {
+					"navigationBarTitleText": "复制"
+				}
+			}
+		]
 	},
 	{
 		"root": "pages/template",
diff --git a/src/pages/componentsA/cell/cell.nvue b/src/pages/componentsA/cell/cell.nvue
index 187070693..75e08b72f 100644
--- a/src/pages/componentsA/cell/cell.nvue
+++ b/src/pages/componentsA/cell/cell.nvue
@@ -6,12 +6,12 @@
 				<u-cell
 				    title="uview-plus"
 				    value="内容"
-				    :isLink="true"
+				    :isLink="true"
 				></u-cell>
 				<u-cell
 				    title="利剑出鞘,一统江湖"
 				    value="内容"
-				    label="挣脱束缚,向往自由"
+				    label="挣脱束缚,向往自由"
 				></u-cell>
 			</u-cell-group>
 		</view>
@@ -114,14 +114,14 @@
 				<u-cell
 				    title="单元格"
 					isLink
-				>
-					<template #value>
-						<text
-						    class="u-slot-value"
-						>99</text>
+				>
+					<template #value>
+						<text
+						    class="u-slot-value"
+						>99</text>
 					</template>
-					<template #right-icon>
-						0
+					<template #right-icon>
+						0
 					</template>
 				</u-cell>
 			</u-cell-group>
@@ -145,6 +145,7 @@
 <style lang="scss">
 	.cell-page {
 		padding-bottom: 20px;
+		background-color: #f3f4f6;
 	}
 
 	.cell-box {
@@ -156,19 +157,19 @@
 
 		&__block {
 			// background-color: #fff;
-			margin-top: 20px;
+			margin-top: 10px;
 		}
 	}
 
 	.u-page {
 		padding: 0;
-
 		&__item {
+			margin-bottom: 10px;
 
 			&__title {
 				color: $u-tips-color;
-				background-color: $u-bg-color;
-				padding: 15px;
+				padding: 10px 15px;
+				margin-bottom: 0px;
 				font-size: 15px;
 
 				&__slot-title {
@@ -176,6 +177,10 @@
 					font-size: 14px;
 				}
 			}
+
+			:deep(.u-cell-group) {
+				background-color: #fff;
+			}
 		}
 	}
 
@@ -200,6 +205,7 @@
 		height: 17px;
 		color: #FFFFFF;
 		border-radius: 100px;
-		background-color: #f56c6c;
		margin-left: auto;
+		background-color: #f56c6c;
+		margin-left: auto;
 	}
 </style>
diff --git a/src/pages/componentsD/copy/copy.vue b/src/pages/componentsD/copy/copy.vue
new file mode 100644
index 000000000..9d6bd0699
--- /dev/null
+++ b/src/pages/componentsD/copy/copy.vue
@@ -0,0 +1,23 @@
+<template>
+  	<view class="u-page">
+		<view class="u-page__item">
+			<text class="u-page__item__title" style="margin-top: 0;">点击文字复制</text>
+			<view class="u-page__item__content">
+				<up-copy content="uview-plus is great !">
+					<text>点击复制</text>
+				</up-copy>
+			</view>
+		</view>
+		<view class="u-page__item">
+			<text class="u-page__item__title" style="margin-top: 0;">点击按钮复制</text>
+			<view class="u-page__item__content">
+				<up-copy content="uview-plus is great !">
+					<up-button type="primary">点击复制</up-button>
+				</up-copy>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+</script>
diff --git a/src/pages/example/components.config.js b/src/pages/example/components.config.js
index 1d75c422d..1f951d9fc 100644
--- a/src/pages/example/components.config.js
+++ b/src/pages/example/components.config.js
@@ -231,6 +231,12 @@ export default [{
         icon: 'modal',
         title: 'Modal 模态框',
         title_en: 'Modal'
+    }
+	, {
+        path: '/pages/componentsD/copy/copy',
+        icon: 'copy',
+        title: 'copy 复制',
+        title_en: '复制'
     }
         // {
         // 	path: '/pages/componentsA/fullScreen/fullScreen',
diff --git a/src/static/uview/demo/copy.png b/src/static/uview/demo/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..bede77458671eb8f40afb83fed57e2d4d0f37908
GIT binary patch
literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(KS@MERCr$Pnp<cbRT#(r-<fWWmd3`UP>q>wQi_Fw3bqe{K1jXc>`HBSHV=YC
zinaRSlc3;(7kuzdL0_y`wDxUwO(o4t@KP_JzF1mI5frt_?)LK1+EOWLqcfizVX>rp
znX_}*gq-s_-}(OE`OP=qxy&If^G3^j{Llb&1}t*|iGBiBrIaTUqab7x=gj;M11C7Z
zH`D9w<6-q;2k=PExy=B*L`*M+4I*wk27ZK~cfC6c2iy6M6@XQ7o&;z=5oOv5r}3PK
zzM_o(^x<`5GtKm31CXC}Mp=j-(ioVE27|x#%;Not1ISg&UjTSeCAhR~nRt&kRQ#Zk
zUMv~#=&Z9{2yrB>0d=5r(lzb769bT|mG^=1Ob3Cb)+J!tHk~bezfdri49Hc>=K=Jm
zHkyuv=oQy2yb(Kqou?=I=Yv23Smcclxn^-!>;SA8XB`>h+#(-6K;*hZg}er^fPiuh
z$W=ZWVS~3&zys13Gxwgm_UD^PWk6qMHEuR;itavY2IOj`=fN}%;J)jlne(sVy9+0x
z2iU@c1aN!L05+@|>|Cc)09JKk2iQMAM7K6lPXj<*SAy8QdKi5xd(}a70w7;2Tg-4<
zsig^^9><n7o75q60wB!%-VFdU6Sno=qm~7#0CLsxZUFn+sdNK?jOmV^0c`FaX&2uA
z&pQC{HGrnOsJiEF0Z`5Y6#(*3V+D%~VeobffQ(J47N`KQD$YYh;`3z-AYXB8CQ(}K
z07g~~hF=?~WPk>sGeCa=x(4VXsAmB^4eE7(UI>LC(9OMoUJ2@@u-*%Fe={V@ggh0N
zwIJ=LR0BZ!T(j_Os2?LLyFuyj=%rt9asG1J<A)Le##3(AK9C52Kdzj?sVip|H2^U;
zzxME5Pu%biv*Dj1)ePv?R2Vh`81$iM7UUuC4J{S`((Bo)=kfF9Q>kV_SOA8R*)%!0
z<JUw1NaqrO1d&z?1Au@RrcC>-W--N<0d;{i>p@EZgrC5{tFAdV+3JPF4nT^@njnkf
zTri*L?9c!J6Ja6<;CNZv36qJ509YuT)Ec43SoyZ$)B9471Nc)L?BBu+`g)sG0H_8P
z)}EPP_OiuDcM~*#Mzr&%OAl~BUxs}X-LhlgInT7;i=y8!10J6_wB~QazZk`F8hshq
z>Y4V@C|XVL2w9cV5hB_i#d*SgXI;}Cj;hfVK(10A2jQcr0!j5J;@78!imyfW-}07N
zu2MP<qI;u?B+)<P8-1S+@4OV%cS`_|RZ9;CpwFU;#ND3*-s7!reEVBftL;6({A}4`
z@!zMgR@HeD_QYa*D!c3BxO}$-P#3Z)rM(1<gJ?7^aRomoiEz-rddoZ08?9K6o<akt
z2b-@sgFcI`A_x+{9nK{FS|NgClS5;_E5K4RRR*BseF+$A088K{B^sj6fJE^w0q6e$
X)5ber@a4GF00000NkvXXu0mjfKpGq*

literal 0
HcmV?d00001

diff --git a/src/uni_modules/uview-plus/components/u-copy/u-copy.vue b/src/uni_modules/uview-plus/components/u-copy/u-copy.vue
new file mode 100644
index 000000000..fbc5aca89
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/u-copy/u-copy.vue
@@ -0,0 +1,70 @@
+<template>
+	<view @click="handleClick">
+        <slot>复制</slot>
+    </view>
+</template>
+<script>
+export default {
+    name: "xy-copy",
+    props: {
+        content: {
+            type: String,
+            default: ''
+        },
+		alertStyle: {
+			type: String,
+			default: 'toast'
+		},
+		notice: {
+			type: String,
+			default: '复制成功'
+		}
+    },
+	emits: ['success'],
+    methods: {
+        handleClick() {
+            let content = this.content;
+			if (!content) {
+				uni.showToast({
+				    title: '暂无',
+				    icon: 'none',
+				    duration: 2000,
+				});
+				return false;
+			}
+            content = typeof content === 'string' ? content : content.toString() // 复制内容，必须字符串，数字需要转换为字符串
+            /**
+			* 小程序端 和 app端的复制逻辑
+			*/
+			let that = this;
+            uni.setClipboardData({
+                data: content,
+                success: function() {
+					if (that.alertStyle == 'modal') {
+						uni.showModal({
+							title: '提示',
+							content: that.notice
+						});
+					} else {
+						uni.showToast({
+						    title: that.notice,
+						    icon: 'none'
+						});
+					}
+					that.$emit('success');
+                },
+                fail:function(){
+                    uni.showToast({
+                        title: '复制失败',
+                        icon: 'none',
+                        duration:3000,
+                    });
+                }
+            });
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>