From f5d577c4f8344159edc15084578c87f8a4d35824 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Tue, 23 Jul 2024 16:26:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/directive/v-bind/Foo-composition.uvue   | 46 +++++++++----------
 pages/directive/v-bind/Foo-options.uvue       | 13 +++---
 .../directive/v-bind/v-bind-composition.uvue  |  6 +--
 pages/directive/v-bind/v-bind-options.uvue    |  6 +--
 .../throw-error/throw-error-composition.uvue  |  4 +-
 .../throw-error/throw-error-options.uvue      |  4 +-
 6 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/pages/directive/v-bind/Foo-composition.uvue b/pages/directive/v-bind/Foo-composition.uvue
index 02aca22..f7f006f 100644
--- a/pages/directive/v-bind/Foo-composition.uvue
+++ b/pages/directive/v-bind/Foo-composition.uvue
@@ -16,28 +16,26 @@
 </template>
 
 <script setup lang="uts">
-defineProps({
-  title: {
-    type: String,
-    default: ''
-  },
-  num: {
-    type: Number,
-    default: 0
-  },
-  checked: {
-    type: Boolean,
-    default: false
-  },
-  obj: {
-    // #ifdef APP-ANDROID
-    // TODO: 确认类型是否合理
-    type: FooPropsObj1ReactiveObject,
-    // #endif
-    // #ifdef APP-IOS || WEB
-    type: Object,
-    // #endif
-    required: true
+  export type FooPropsObj = {
+    name : string
   }
-})
-</script>
+
+  defineProps({
+    title: {
+      type: String,
+      default: ''
+    },
+    num: {
+      type: Number,
+      default: 0
+    },
+    checked: {
+      type: Boolean,
+      default: false
+    },
+    obj: {
+      type: FooPropsObj,
+      required: true
+    }
+  })
+</script>
\ No newline at end of file
diff --git a/pages/directive/v-bind/Foo-options.uvue b/pages/directive/v-bind/Foo-options.uvue
index 3fadbf8..ab4304a 100644
--- a/pages/directive/v-bind/Foo-options.uvue
+++ b/pages/directive/v-bind/Foo-options.uvue
@@ -15,7 +15,11 @@
   </view>
 </template>
 
-<script lang="uts">
+<script lang="uts">
+  export type FooPropsObj = {
+    name : string
+  }
+  
   export default {
     props: {
       title: {
@@ -31,12 +35,7 @@
         default: false
       },
       obj: {
-        // #ifdef APP-ANDROID
-        type: FooPropsObjReactiveObject,
-        // #endif
-        // #ifdef APP-IOS || WEB
-        type: Object,
-        // #endif
+        type: FooPropsObj,
         required: true
       }
     }
diff --git a/pages/directive/v-bind/v-bind-composition.uvue b/pages/directive/v-bind/v-bind-composition.uvue
index 3ad5742..b8a0c7b 100644
--- a/pages/directive/v-bind/v-bind-composition.uvue
+++ b/pages/directive/v-bind/v-bind-composition.uvue
@@ -42,10 +42,8 @@
 
 <script setup lang="uts">
 import Foo from './Foo-composition.uvue'
+import {type FooPropsObj} from './Foo-composition.uvue'
 
-type FooPropsObj = {
-  name : string
-}
 type FooProps = {
   title : string
   num : number
@@ -69,7 +67,7 @@ const dataInfo = reactive({
     num: 1,
     obj: {
       name: 'foo obj name',
-    }
+    } as FooPropsObj
   },
   vBindClassBackgroundColor: 'red',
   vBindClassRpxHeight: '300rpx'
diff --git a/pages/directive/v-bind/v-bind-options.uvue b/pages/directive/v-bind/v-bind-options.uvue
index 6c3ca29..fb41ba5 100644
--- a/pages/directive/v-bind/v-bind-options.uvue
+++ b/pages/directive/v-bind/v-bind-options.uvue
@@ -32,10 +32,8 @@
 
 <script lang="uts">
 import Foo from './Foo-options.uvue'
+import {type FooPropsObj} from './Foo-options.uvue'
 
-type FooPropsObj = {
-  name: string
-}
 type FooProps = {
   title: string
   num: number
@@ -63,7 +61,7 @@ export default {
           num: 1,
           obj: {
             name: 'foo obj name'
-          }
+          } as FooPropsObj
         },
         vBindClassBackgroundColor: 'red',
         vBindClassRpxHeight: '300rpx'
diff --git a/pages/error/throw-error/throw-error-composition.uvue b/pages/error/throw-error/throw-error-composition.uvue
index ebfeb93..090d286 100644
--- a/pages/error/throw-error/throw-error-composition.uvue
+++ b/pages/error/throw-error/throw-error-composition.uvue
@@ -8,10 +8,10 @@
   import { state } from '@/store/index.uts'
   
   onReady(() => {
-    throw Error('error in error composition page onReady')
+    throw new Error('error in error composition page onReady')
   })
   const triggerError = () => {
-    throw Error('trigger error in throw error composition page')
+    throw new Error('trigger error in throw error composition page')
   }
 
   // 自动化测试
diff --git a/pages/error/throw-error/throw-error-options.uvue b/pages/error/throw-error/throw-error-options.uvue
index 47e015f..aaf6e9a 100644
--- a/pages/error/throw-error/throw-error-options.uvue
+++ b/pages/error/throw-error/throw-error-options.uvue
@@ -9,11 +9,11 @@ import { state } from '@/store/index.uts'
 
 export default {
   onReady(){
-    throw Error('error in error options page onReady')
+    throw new Error('error in error options page onReady')
   },
   methods: {
     triggerError(){
-      throw Error('trigger error in throw error options page')
+      throw new Error('trigger error in throw error options page')
     },
     // 自动化测试
     getLifeCycleNum() : number {
-- 
GitLab