From 1a197182b4574e05b2286a2b44ee63c73719f8d9 Mon Sep 17 00:00:00 2001
From: shutao <shutao@dcloud.io>
Date: Wed, 23 Oct 2024 17:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4native-view=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	pages/component/native-view/native-view.uvue
#	uni_modules/native-button/components/native-button/native-button.uvue
---
 pages/component/native-view/native-view.uvue  | 101 +++++++++---------
 .../native-button/native-button.uvue          |  86 +++++++--------
 uni_modules/native-button/package.json        |   9 +-
 .../native-time-picker.uvue}                  |   0
 uni_modules/native-time-picker/package.json   |  11 +-
 uni_modules/native-time-picker/readme.md      |   2 +-
 6 files changed, 100 insertions(+), 109 deletions(-)
 rename uni_modules/native-time-picker/components/{time-picker/time-picker.uvue => native-time-picker/native-time-picker.uvue} (100%)

diff --git a/pages/component/native-view/native-view.uvue b/pages/component/native-view/native-view.uvue
index 4207eb83..46a1ee06 100644
--- a/pages/component/native-view/native-view.uvue
+++ b/pages/component/native-view/native-view.uvue
@@ -1,50 +1,53 @@
-<template>
-  <view>
-    <native-button class="native-button" style="width: 200px; height: 100px;" :text="buttonText" @buttonTap="ontap"
-      @load="onload"></native-button>
-    <time-picker class="native-time-picker" :hour=2 :minute=3 @changed="onChanged"></time-picker>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        title: 'Hello',
-        buttonText: "native-button",
-        isLoad: false
-      }
-    },
-    onLoad() {
-
-    },
-    methods: {
-      ontap(e : UniNativeViewEvent) {
-        uni.showToast({
-          title: "按钮被点击了"
-        })
-      },
-      onload() {
-        //标记已初始化 用于自动化测试
-        this.isLoad = true
-      },
-      onChanged(e : UniNativeViewEvent) {
-        console.log("onchanged-----", e.detail)
-      }
-    }
-  }
-</script>
-
-<style>
-  .native-button {
-    height: 100px;
-    width: 100px;
-    margin: 25px auto 25px auto;
-  }
-
-  .native-time-picker {
-    margin: 10px auto 25px auto;
-    border-style: solid;
-    border-radius: 5px;
-  }
+<template>
+  <view>
+    <native-button class="native-button" style="width: 200px; height: 100px;" :text="buttonText" @buttonTap="ontap"
+      @load="onload"></native-button>
+    <native-time-picker class="native-time-picker" :hour=2 :minute=3 @changed="onChanged"></native-time-picker>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: 'Hello',
+        buttonText: "native-button",
+        isLoad: false,
+        clickCount: 0
+      }
+    },
+    onLoad() {
+
+    },
+    methods: {
+      ontap(e : UniNativeViewEvent) {
+        uni.showToast({
+          title: "按钮被点击了"
+        })
+        this.clickCount ++
+        this.buttonText = "native-button"+this.clickCount
+      },
+      onload() {
+        //标记已初始化 用于自动化测试
+        this.isLoad = true
+      },
+      onChanged(e : UniNativeViewEvent) {
+        console.log("onchanged-----", e.detail)
+      }
+    }
+  }
+</script>
+
+<style>
+  .native-button {
+    height: 100px;
+    width: 100px;
+    margin: 25px auto 25px auto;
+  }
+
+  .native-time-picker {
+    margin: 10px auto 25px auto;
+    border-style: solid;
+    border-radius: 5px;
+  }
 </style>
diff --git a/uni_modules/native-button/components/native-button/native-button.uvue b/uni_modules/native-button/components/native-button/native-button.uvue
index a0c4e0f4..639bf3ea 100644
--- a/uni_modules/native-button/components/native-button/native-button.uvue
+++ b/uni_modules/native-button/components/native-button/native-button.uvue
@@ -1,48 +1,44 @@
 <template>
-	<native-view @init="onviewinit" @customClick="ontap"></native-view>
-</template>
-<script lang="uts">
+	<native-view @init="onviewinit" @customClick="ontap"></native-view>
+</template>
+<script setup lang="uts">
 	import { NativeButton } from "@/uni_modules/native-button";
-	export default {
-		data() {
-			return {
-				button: null as NativeButton | null,
-				value: ""
-			}
-		},
-		props: {
-			"text": {
-				type: String,
-				default: ''
-			}
-		},
-		watch: {
-			"text": {
-				handler(newValue : string, oldValue : string) {
-					this.value = newValue
-					this.updateText(newValue)
-				},
-				immediate: true
-			},
-		},
-		methods: {
-			//native-view初始化时触发此方法
-			onviewinit(e : UniNativeViewInitEvent) {
-				//获取UniNativeViewElement 传递给NativeButton对象
-				this.button = new NativeButton(e.detail.element);
-				this.button?.updateText(this.value)
-        this.$emit("load")
-			},
-			ontap(e: UniNativeViewEvent) {
-				this.$emit("buttonTap", e)
-			},
-			updateText(value: string) {
-				this.button?.updateText(value)
-			}
-		},
-		unmounted() {
-			// iOS平台需要主动释放 uts 实例
-			this.button?.destroy()
-		}
-	}
+	let button : NativeButton | null = null
+
+	//声明属性
+	const props = defineProps<{ text : string }>()
+
+	//声明事件
+	const emit = defineEmits<{
+		(e : "load") : void
+		(e : "buttonTap", event : UniNativeViewEvent) : void
+	}>()
+
+	//声明方法
+	function updateText(value : string) {
+		button?.updateText(value)
+	}
+
+	//监听属性变化
+	watchEffect(() => {
+		const text = props.text
+		updateText(text)
+	})
+
+	//native-view初始化时触发此方法
+	function onviewinit(e : UniNativeViewInitEvent) {
+		//获取UniNativeViewElement 传递给NativeButton对象
+		button = new NativeButton(e.detail.element);
+		updateText(props.text)
+		emit("load")
+	}
+
+	function ontap(e : UniNativeViewEvent) {
+		emit("buttonTap", e)
+	}
+
+	function onUnmounted() {
+		// iOS平台需要主动释放 uts 实例
+		button?.destroy()
+	}
 </script>
diff --git a/uni_modules/native-button/package.json b/uni_modules/native-button/package.json
index dff99bce..3f86656c 100644
--- a/uni_modules/native-button/package.json
+++ b/uni_modules/native-button/package.json
@@ -1,13 +1,8 @@
 {
-  "id": "uni-native-button",
-  "displayName": "uni-native-button",
+  "id": "native-button",
+  "displayName": "native-button",
   "version": "0.0.1",
   "description": "vue开发button原生组件",
-  "keywords": [
-    "tencent",
-    "map",
-    "tmap"
-  ],
   "repository": "",
   "engines": {
     "HBuilderX": "^4.25"
diff --git a/uni_modules/native-time-picker/components/time-picker/time-picker.uvue b/uni_modules/native-time-picker/components/native-time-picker/native-time-picker.uvue
similarity index 100%
rename from uni_modules/native-time-picker/components/time-picker/time-picker.uvue
rename to uni_modules/native-time-picker/components/native-time-picker/native-time-picker.uvue
diff --git a/uni_modules/native-time-picker/package.json b/uni_modules/native-time-picker/package.json
index 9d5b19a4..da5a7eb5 100644
--- a/uni_modules/native-time-picker/package.json
+++ b/uni_modules/native-time-picker/package.json
@@ -1,11 +1,8 @@
 {
-  "id": "uni-time-picker",
-  "displayName": "uni-time-picker",
+  "id": "native-time-picker",
+  "displayName": "native-time-picker",
   "version": "1.0.0",
-  "description": "uni-time-picker",
-  "keywords": [
-    "uni-time-picker"
-],
+  "description": "native-time-picker",
   "repository": "",
   "engines": {
     "HBuilderX": "^3.1.0"
@@ -80,4 +77,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/uni_modules/native-time-picker/readme.md b/uni_modules/native-time-picker/readme.md
index c119a2a8..9e94a670 100644
--- a/uni_modules/native-time-picker/readme.md
+++ b/uni_modules/native-time-picker/readme.md
@@ -1 +1 @@
-# uni-time-picker
\ No newline at end of file
+# native-time-picker
-- 
GitLab