From 22d5663fb1a80fc45daa612fedb307d4cba1d32c Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Mon, 1 Jul 2024 16:18:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=A4=BA=E4=BE=8B=E9=A1=B5=E9=9D=A2=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  14 +-
 .../public-events.test.js}                    |   2 +-
 .../public-events.uvue}                       | 548 ++++++++++--------
 .../touch-events.uvue}                        |   0
 .../transition-events.test.js}                |   2 +-
 .../transition-events.uvue}                   |   0
 .../public-properties.test.js}                |   2 +-
 .../public-properties.uvue}                   |   4 +-
 pages/pages.test.js                           |  10 +-
 9 files changed, 320 insertions(+), 262 deletions(-)
 rename pages/component/{general-event/general-event.test.js => public-events/public-events.test.js} (97%)
 rename pages/component/{general-event/general-event.uvue => public-events/public-events.uvue} (79%)
 rename pages/component/{general-event/touch-event.uvue => public-events/touch-events.uvue} (100%)
 rename pages/component/{general-event/transition-event.test.js => public-events/transition-events.test.js} (88%)
 rename pages/component/{general-event/transition-event.uvue => public-events/transition-events.uvue} (100%)
 rename pages/component/{general-attribute/general-attribute.test.js => public-properties/public-properties.test.js} (91%)
 rename pages/component/{general-attribute/general-attribute.uvue => public-properties/public-properties.uvue} (97%)

diff --git a/pages.json b/pages.json
index c1027346..7f6594dc 100644
--- a/pages.json
+++ b/pages.json
@@ -314,27 +314,27 @@
       }
     },
     {
-      "path": "pages/component/general-attribute/general-attribute",
+      "path": "pages/component/public-properties/public-properties",
       "style": {
-        "navigationBarTitleText": "general-attribute"
+        "navigationBarTitleText": "public-properties"
       }
     },
     {
-      "path": "pages/component/general-event/general-event",
+      "path": "pages/component/public-events/public-events",
       "style": {
-        "navigationBarTitleText": "general-event"
+        "navigationBarTitleText": "public-events"
       }
     },
     {
-      "path": "pages/component/general-event/transition-event",
+      "path": "pages/component/public-events/transition-events",
       "style": {
         "navigationBarTitleText": "transitionend事件"
       }
     },
     {
-      "path": "pages/component/general-event/touch-event",
+      "path": "pages/component/public-events/touch-events",
       "style": {
-        "navigationBarTitleText": "touch-event"
+        "navigationBarTitleText": "touch-events"
       }
     },
     {
diff --git a/pages/component/general-event/general-event.test.js b/pages/component/public-events/public-events.test.js
similarity index 97%
rename from pages/component/general-event/general-event.test.js
rename to pages/component/public-events/public-events.test.js
index 13bbd087..3c51b1a0 100644
--- a/pages/component/general-event/general-event.test.js
+++ b/pages/component/public-events/public-events.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/component/general-event/general-event'
+const PAGE_PATH = '/pages/component/public-events/public-events'
 
 describe('event trigger', () => {
   const platformInfo = process.env.uniTestPlatformInfo.toLocaleLowerCase()
diff --git a/pages/component/general-event/general-event.uvue b/pages/component/public-events/public-events.uvue
similarity index 79%
rename from pages/component/general-event/general-event.uvue
rename to pages/component/public-events/public-events.uvue
index 6ad90de7..15379c1b 100644
--- a/pages/component/general-event/general-event.uvue
+++ b/pages/component/public-events/public-events.uvue
@@ -14,7 +14,9 @@
           <text class="title3">touch[{{ index }}]:</text>
           <view class="uni-list-cell">
             <text>identifier: </text>
-            <text id="touch-start-touch-identifier">{{touch.identifier}}</text>
+            <text id="touch-start-touch-identifier">{{
+              touch.identifier
+            }}</text>
           </view>
           <view class="uni-list-cell">
             <text>pageX: </text>
@@ -44,33 +46,43 @@
         <text class="title2 uni-common-mt">changedTouches: </text>
         <template v-for="(touch, index) in touchStartEvent!.changedTouches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-start-changed-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-start-changed-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-start-changed-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-start-changed-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-start-changed-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-start-changed-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-start-changed-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-start-changed-touch-identifier">{{
+              touch.identifier
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-start-changed-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-start-changed-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-start-changed-touch-client-x">{{
+              touch.clientX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-start-changed-touch-client-y">{{
+              touch.clientY
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-start-changed-touch-screen-x">{{
+              touch.screenX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-start-changed-touch-screen-y">{{
+              touch.screenY
+            }}</text>
           </view>
         </template>
       </view>
@@ -79,65 +91,81 @@
         <text class="title2">touches: </text>
         <template v-for="(touch, index) in touchCancelEvent!.touches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-cancel-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-cancel-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-cancel-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-cancel-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-cancel-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-cancel-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-cancel-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-cancel-touch-identifier">{{
+              touch.identifier
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-cancel-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-cancel-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-cancel-touch-client-x">{{ touch.clientX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-cancel-touch-client-y">{{ touch.clientY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-cancel-touch-screen-x">{{ touch.screenX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-cancel-touch-screen-y">{{ touch.screenY }}</text>
           </view>
         </template>
         <text class="title2 uni-common-mt">changedTouches: </text>
         <template v-for="(touch, index) in touchCancelEvent!.changedTouches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-cancel-changed-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-cancel-changed-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-cancel-changed-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-cancel-changed-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-cancel-changed-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-cancel-changed-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-cancel-changed-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-cancel-changed-touch-identifier">{{
+              touch.identifier
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-cancel-changed-touch-page-x">{{
+              touch.pageX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-cancel-changed-touch-page-y">{{
+              touch.pageY
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-cancel-changed-touch-client-x">{{
+              touch.clientX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-cancel-changed-touch-client-y">{{
+              touch.clientY
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-cancel-changed-touch-screen-x">{{
+              touch.screenX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-cancel-changed-touch-screen-y">{{
+              touch.screenY
+            }}</text>
           </view>
         </template>
       </view>
@@ -146,65 +174,75 @@
         <text class="title2">touches: </text>
         <template v-for="(touch, index) in touchMoveEvent!.touches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-move-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-move-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-move-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-move-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-move-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-move-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-move-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-move-touch-identifier">{{ touch.identifier }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-move-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-move-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-move-touch-client-x">{{ touch.clientX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-move-touch-client-y">{{ touch.clientY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-move-touch-screen-x">{{ touch.screenX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-move-touch-screen-y">{{ touch.screenY }}</text>
           </view>
         </template>
         <text class="title2 uni-common-mt">changedTouches: </text>
         <template v-for="(touch, index) in touchMoveEvent!.changedTouches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-move-changed-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-move-changed-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-move-changed-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-move-changed-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-move-changed-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-move-changed-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-move-changed-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-move-changed-touch-identifier">{{
+              touch.identifier
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-move-changed-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-move-changed-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-move-changed-touch-client-x">{{
+              touch.clientX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-move-changed-touch-client-y">{{
+              touch.clientY
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-move-changed-touch-screen-x">{{
+              touch.screenX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-move-changed-touch-screen-y">{{
+              touch.screenY
+            }}</text>
           </view>
         </template>
       </view>
@@ -214,65 +252,75 @@
         <template v-if="touchEndEvent!.touches.length > 0" v-for="(touch, index) in touchEndEvent!.touches"
           :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-end-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-end-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-end-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-end-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-end-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-end-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-end-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-end-touch-identifier">{{ touch.identifier }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-end-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-end-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-end-touch-client-x">{{ touch.clientX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-end-touch-client-y">{{ touch.clientY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-end-touch-screen-x">{{ touch.screenX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-end-touch-screen-y">{{ touch.screenY }}</text>
           </view>
         </template>
         <text class="title2 uni-common-mt">changedTouches: </text>
         <template v-for="(touch, index) in touchEndEvent!.changedTouches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="touch-end-changed-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="touch-end-changed-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="touch-end-changed-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="touch-end-changed-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="touch-end-changed-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="touch-end-changed-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="touch-end-changed-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="touch-end-changed-touch-identifier">{{
+              touch.identifier
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="touch-end-changed-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="touch-end-changed-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="touch-end-changed-touch-client-x">{{
+              touch.clientX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="touch-end-changed-touch-client-y">{{
+              touch.clientY
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="touch-end-changed-touch-screen-x">{{
+              touch.screenX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="touch-end-changed-touch-screen-y">{{
+              touch.screenY
+            }}</text>
           </view>
         </template>
       </view>
@@ -282,65 +330,75 @@
         <template v-if="longPressEvent!.touches.length > 0" v-for="(touch, index) in longPressEvent!.touches"
           :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="long-press-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="long-press-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="long-press-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="long-press-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="long-press-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="long-press-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="long-press-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="long-press-touch-identifier">{{ touch.identifier }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="long-press-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="long-press-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="long-press-touch-client-x">{{ touch.clientX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="long-press-touch-client-y">{{ touch.clientY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="long-press-touch-screen-x">{{ touch.screenX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="long-press-touch-screen-y">{{ touch.screenY }}</text>
           </view>
         </template>
         <text class="title2 uni-common-mt">changedTouches: </text>
         <template v-for="(touch, index) in longPressEvent!.changedTouches" :key="index">
           <text class="title3">touch[{{ index }}]:</text>
-          <view class="uni-list-cell">
-            <text>identifier: </text>
-            <text id="long-press-changed-touch-identifier">{{touch.identifier}}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageX: </text>
-            <text id="long-press-changed-touch-page-x">{{ touch.pageX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>pageY: </text>
-            <text id="long-press-changed-touch-page-y">{{ touch.pageY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientX: </text>
-            <text id="long-press-changed-touch-client-x">{{ touch.clientX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>clientY: </text>
-            <text id="long-press-changed-touch-client-y">{{ touch.clientY }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenX: </text>
-            <text id="long-press-changed-touch-screen-x">{{ touch.screenX }}</text>
-          </view>
-          <view class="uni-list-cell">
-            <text>screenY: </text>
-            <text id="long-press-changed-touch-screen-y">{{ touch.screenY }}</text>
+          <view class="uni-list-cell">
+            <text>identifier: </text>
+            <text id="long-press-changed-touch-identifier">{{
+              touch.identifier
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageX: </text>
+            <text id="long-press-changed-touch-page-x">{{ touch.pageX }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>pageY: </text>
+            <text id="long-press-changed-touch-page-y">{{ touch.pageY }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientX: </text>
+            <text id="long-press-changed-touch-client-x">{{
+              touch.clientX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>clientY: </text>
+            <text id="long-press-changed-touch-client-y">{{
+              touch.clientY
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenX: </text>
+            <text id="long-press-changed-touch-screen-x">{{
+              touch.screenX
+            }}</text>
+          </view>
+          <view class="uni-list-cell">
+            <text>screenY: </text>
+            <text id="long-press-changed-touch-screen-y">{{
+              touch.screenY
+            }}</text>
           </view>
         </template>
       </view>
@@ -375,7 +433,7 @@
   export default {
     data() {
       return {
-        title: 'general-event',
+        title: 'public-events',
         touchStartEvent: null as TouchEvent | null,
         touchCancelEvent: null as TouchEvent | null,
         touchMoveEvent: null as TouchEvent | null,
diff --git a/pages/component/general-event/touch-event.uvue b/pages/component/public-events/touch-events.uvue
similarity index 100%
rename from pages/component/general-event/touch-event.uvue
rename to pages/component/public-events/touch-events.uvue
diff --git a/pages/component/general-event/transition-event.test.js b/pages/component/public-events/transition-events.test.js
similarity index 88%
rename from pages/component/general-event/transition-event.test.js
rename to pages/component/public-events/transition-events.test.js
index 8e5a35ae..dc627edf 100644
--- a/pages/component/general-event/transition-event.test.js
+++ b/pages/component/public-events/transition-events.test.js
@@ -3,7 +3,7 @@
 describe('transition event', () => {
     let page;
     beforeAll(async () => {
-        page = await program.reLaunch('/pages/component/general-event/transition-event')
+        page = await program.reLaunch('/pages/component/public-events/transition-events')
         await page.waitFor(3000);
     });
 
diff --git a/pages/component/general-event/transition-event.uvue b/pages/component/public-events/transition-events.uvue
similarity index 100%
rename from pages/component/general-event/transition-event.uvue
rename to pages/component/public-events/transition-events.uvue
diff --git a/pages/component/general-attribute/general-attribute.test.js b/pages/component/public-properties/public-properties.test.js
similarity index 91%
rename from pages/component/general-attribute/general-attribute.test.js
rename to pages/component/public-properties/public-properties.test.js
index 9e5ec5df..1f415bd0 100644
--- a/pages/component/general-attribute/general-attribute.test.js
+++ b/pages/component/public-properties/public-properties.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/component/general-attribute/general-attribute'
+const PAGE_PATH = '/pages/component/public-properties/public-properties'
 
 describe('general attribute', () => {
   let page
diff --git a/pages/component/general-attribute/general-attribute.uvue b/pages/component/public-properties/public-properties.uvue
similarity index 97%
rename from pages/component/general-attribute/general-attribute.uvue
rename to pages/component/public-properties/public-properties.uvue
index 8bd60160..c3c76ef7 100644
--- a/pages/component/general-attribute/general-attribute.uvue
+++ b/pages/component/public-properties/public-properties.uvue
@@ -28,7 +28,7 @@
           <text class="btn-inner">{{ validateGeneralAttrText }}</text>
         </view>
         <view class="btn btn-ref uni-common-mt" @click="changeHeight">
-          <text class="btn-inner">{{changeHeightByRefText}}</text>
+          <text class="btn-inner">{{ changeHeightByRefText }}</text>
         </view>
         <view class="view-class" :hover-class="hoverClass" ref="view-target">
           <text class="text">按下 50 ms 后背景变红</text>
@@ -55,7 +55,7 @@
 export default {
   data() {
     return {
-      title: 'general-attribute',
+      title: 'public-properties',
       generalId: 'general-id',
       generalClass: 'general-class',
       generalName: 'general-name',
diff --git a/pages/pages.test.js b/pages/pages.test.js
index 6a72e373..bed1b7f9 100755
--- a/pages/pages.test.js
+++ b/pages/pages.test.js
@@ -83,10 +83,10 @@ const pages = [
   // '/pages/component/unicloud-db/unicloud-db/contacts/detail',
   '/pages/component/unicloud-db/unicloud-db/mixin-datacom/mixin-datacom',
   // 单独测试例截图
-  // '/pages/component/general-attribute/general-attribute',
-  '/pages/component/general-event/general-event',
-  '/pages/component/general-event/transition-event',
-  '/pages/component/general-event/touch-event',
+  // '/pages/component/public-properties/public-properties',
+  '/pages/component/public-events/public-events',
+  '/pages/component/public-events/transition-events',
+  '/pages/component/public-events/touch-events',
   // 单独测试例截图
   // '/pages/component/nested-scroll-header/nested-scroll-header',
   // 单独测试例截图
@@ -349,7 +349,7 @@ function getWaitForTagName(pagePath) {
     return 'video'
   }
   if (
-    pagePath === '/pages/component/general-event/transition-event' ||
+    pagePath === '/pages/component/public-events/transition-events' ||
     pagePath === '/pages/component/list-view/list-view-refresh' ||
     pagePath === '/pages/API/env/env'
   ) {
-- 
GitLab