diff --git a/pages.json b/pages.json
index c102734667e0570d3862e217906bbf21e087cd1f..7f6594dcb6e9444445b7c553e949eba508f72c25 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 13bbd087b1e8703cbcd63e0ee3d356eccf4c318d..3c51b1a0b6743f3fb530bcf401a2dfd8b84d892e 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 6ad90de7f950c41a393d762dd7ec3bbf5f24bfaf..15379c1b2ce3a273a3bb348dfbe0161b1aebc089 100644
--- a/pages/component/general-event/general-event.uvue
+++ b/pages/component/public-events/public-events.uvue
@@ -14,7 +14,9 @@
touch[{{ index }}]:
identifier:
- {{touch.identifier}}
+ {{
+ touch.identifier
+ }}
pageX:
@@ -44,33 +46,43 @@
changedTouches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{
+ touch.identifier
+ }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{
+ touch.clientX
+ }}
+
+
+ clientY:
+ {{
+ touch.clientY
+ }}
+
+
+ screenX:
+ {{
+ touch.screenX
+ }}
+
+
+ screenY:
+ {{
+ touch.screenY
+ }}
@@ -79,65 +91,81 @@
touches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{
+ touch.identifier
+ }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{ touch.clientX }}
+
+
+ clientY:
+ {{ touch.clientY }}
+
+
+ screenX:
+ {{ touch.screenX }}
+
+
+ screenY:
+ {{ touch.screenY }}
changedTouches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{
+ touch.identifier
+ }}
+
+
+ pageX:
+ {{
+ touch.pageX
+ }}
+
+
+ pageY:
+ {{
+ touch.pageY
+ }}
+
+
+ clientX:
+ {{
+ touch.clientX
+ }}
+
+
+ clientY:
+ {{
+ touch.clientY
+ }}
+
+
+ screenX:
+ {{
+ touch.screenX
+ }}
+
+
+ screenY:
+ {{
+ touch.screenY
+ }}
@@ -146,65 +174,75 @@
touches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{ touch.identifier }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{ touch.clientX }}
+
+
+ clientY:
+ {{ touch.clientY }}
+
+
+ screenX:
+ {{ touch.screenX }}
+
+
+ screenY:
+ {{ touch.screenY }}
changedTouches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{
+ touch.identifier
+ }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{
+ touch.clientX
+ }}
+
+
+ clientY:
+ {{
+ touch.clientY
+ }}
+
+
+ screenX:
+ {{
+ touch.screenX
+ }}
+
+
+ screenY:
+ {{
+ touch.screenY
+ }}
@@ -214,65 +252,75 @@
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{ touch.identifier }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{ touch.clientX }}
+
+
+ clientY:
+ {{ touch.clientY }}
+
+
+ screenX:
+ {{ touch.screenX }}
+
+
+ screenY:
+ {{ touch.screenY }}
changedTouches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{
+ touch.identifier
+ }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{
+ touch.clientX
+ }}
+
+
+ clientY:
+ {{
+ touch.clientY
+ }}
+
+
+ screenX:
+ {{
+ touch.screenX
+ }}
+
+
+ screenY:
+ {{
+ touch.screenY
+ }}
@@ -282,65 +330,75 @@
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{ touch.identifier }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{ touch.clientX }}
+
+
+ clientY:
+ {{ touch.clientY }}
+
+
+ screenX:
+ {{ touch.screenX }}
+
+
+ screenY:
+ {{ touch.screenY }}
changedTouches:
touch[{{ index }}]:
-
- identifier:
- {{touch.identifier}}
-
-
- pageX:
- {{ touch.pageX }}
-
-
- pageY:
- {{ touch.pageY }}
-
-
- clientX:
- {{ touch.clientX }}
-
-
- clientY:
- {{ touch.clientY }}
-
-
- screenX:
- {{ touch.screenX }}
-
-
- screenY:
- {{ touch.screenY }}
+
+ identifier:
+ {{
+ touch.identifier
+ }}
+
+
+ pageX:
+ {{ touch.pageX }}
+
+
+ pageY:
+ {{ touch.pageY }}
+
+
+ clientX:
+ {{
+ touch.clientX
+ }}
+
+
+ clientY:
+ {{
+ touch.clientY
+ }}
+
+
+ screenX:
+ {{
+ touch.screenX
+ }}
+
+
+ screenY:
+ {{
+ touch.screenY
+ }}
@@ -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 8e5a35aec879596aa1d122c3da42a7a9a7561e57..dc627edf86b4fcb13c3bf7576d8da5cd6bea5b94 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 9e5ec5df7dbe3d697fb8cf88f32aca5c5fa41b17..1f415bd084e50215e340f7733ae4d8d8a219006c 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 8bd60160a51cad6b8ca2afeb8b858b38e5129766..c3c76ef7bc77d817dda3ef09363af7c5359e67c3 100644
--- a/pages/component/general-attribute/general-attribute.uvue
+++ b/pages/component/public-properties/public-properties.uvue
@@ -28,7 +28,7 @@
{{ validateGeneralAttrText }}
- {{changeHeightByRefText}}
+ {{ changeHeightByRefText }}
按下 50 ms 后背景变红
@@ -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 6a72e3735b293cf61e74a928e31fc82f2ba9eba2..bed1b7f99a2f04b432f325e8d302468f2bc99997 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'
) {