From 78eb86a27e26fad6b469ac3519c85d699f172a22 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Mon, 18 Dec 2023 20:51:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=85=BC=E5=AE=B9=20=20web=20?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../get-element-by-id-multiple-root-node.uvue | 97 +++++++++----------
 .../get-element-by-id/get-element-by-id.uvue  | 64 ++++++------
 pages/API/navigator/new-page/onLoad.test.js   |  5 +-
 pages/tabBar/API.uvue                         |  6 --
 4 files changed, 80 insertions(+), 92 deletions(-)

diff --git a/pages/API/get-element-by-id/get-element-by-id-multiple-root-node.uvue b/pages/API/get-element-by-id/get-element-by-id-multiple-root-node.uvue
index 66165ecb..bbce9555 100644
--- a/pages/API/get-element-by-id/get-element-by-id-multiple-root-node.uvue
+++ b/pages/API/get-element-by-id/get-element-by-id-multiple-root-node.uvue
@@ -1,52 +1,47 @@
-<template>
-  <view class="uni-padding-wrap">
-    <page-head
-      id="page-head"
-      title="getElementById-multiple-root-node"
-    ></page-head>
-    <text id="text">this is text</text>
-    <view id="view" class="uni-common-mt" style="border: 1px solid red"
-      >this is view</view
-    >
-    <button class="uni-btn" @click="changePageHeadBackgroundColor">
-      修改 page-head 背景色
-    </button>
-    <button class="uni-btn" @click="changeTextColor">修改 text 字体颜色</button>
-    <button class="uni-btn" @click="changeViewStyle">
-      修改 view 宽高及背景色
-    </button>
-  </view>
-</template>
-
-<script lang="uts">
-export default {
-  data() {
-    return {
-      checked: false,
-      homePagePath: '/pages/tabBar/component',
-      launchOptionsPath: '',
-    }
-  },
-  methods: {
-    getElementByNotExistId(): Element | null {
-      return uni.getElementById('not-exist-id')
-    },
-    changePageHeadBackgroundColor(){
-      const pageHead = uni.getElementById('page-head')!
-      pageHead.style.setProperty('backgroundColor', 'red')
-    },
-    changeTextColor(){
-      const text = uni.getElementById('text')!
-      text.style.setProperty('color', 'red')
-    },
-    changeViewStyle(){
-      const view = uni.getElementById<UniViewElement>('view')
-      if(view !== null){
-        view.style.setProperty('width', '90%')
-        view.style.setProperty('height', '50px')
-        view.style.setProperty('backgroundColor', '#007AFF')
-      }
-    }
-  }
-}
+<template>
+  <view class="uni-padding-wrap">
+    <page-head id="page-head" title="getElementById-multiple-root-node"></page-head>
+    <text id="text">this is text</text>
+    <view id="view" class="uni-common-mt" style="border: 1px solid red">this is view</view>
+    <button class="uni-btn" @click="changePageHeadBackgroundColor">
+      修改 page-head 背景色
+    </button>
+    <button class="uni-btn" @click="changeTextColor">修改 text 字体颜色</button>
+    <button class="uni-btn" @click="changeViewStyle">
+      修改 view 宽高及背景色
+    </button>
+  </view>
+</template>
+
+<script lang="uts">
+  export default {
+    data() {
+      return {
+        checked: false,
+        homePagePath: '/pages/tabBar/component',
+        launchOptionsPath: '',
+      }
+    },
+    methods: {
+      getElementByNotExistId() : Element | null {
+        return uni.getElementById('not-exist-id')
+      },
+      changePageHeadBackgroundColor() {
+        const pageHead = uni.getElementById('page-head')!
+        pageHead.style['backgroundColor'] = 'red'
+      },
+      changeTextColor() {
+        const text = uni.getElementById('text')!
+        text.style['color'] = 'red'
+      },
+      changeViewStyle() {
+        const view = uni.getElementById<UniViewElement>('view')
+        if (view !== null) {
+          view.style['width'] = '90%'
+          view.style['height'] = '50px'
+          view.style['backgroundColor'] = '#007AFF'
+        }
+      }
+    }
+  }
 </script>
diff --git a/pages/API/get-element-by-id/get-element-by-id.uvue b/pages/API/get-element-by-id/get-element-by-id.uvue
index 6201accd..24559446 100644
--- a/pages/API/get-element-by-id/get-element-by-id.uvue
+++ b/pages/API/get-element-by-id/get-element-by-id.uvue
@@ -3,9 +3,7 @@
     <page-head id="page-head" title="getElementById"></page-head>
     <view class="uni-padding-wrap">
       <text id="text">this is text</text>
-      <view id="view" class="uni-common-mt" style="border: 1px solid red"
-        >this is view</view
-      >
+      <view id="view" class="uni-common-mt" style="border: 1px solid red">this is view</view>
       <button class="uni-btn" @click="changePageHeadBackgroundColor">
         修改 page-head 背景色
       </button>
@@ -23,37 +21,37 @@
 </template>
 
 <script lang="uts">
-export default {
-  data() {
-    return {
-      checked: false,
-      homePagePath: '/pages/tabBar/component',
-      launchOptionsPath: '',
-    }
-  },
-  methods: {
-    getElementByNotExistId() : Element | null {
-      return uni.getElementById('not-exist-id')
-    },
-    changePageHeadBackgroundColor() {
-      const pageHead = uni.getElementById('page-head')!
-      pageHead.style.setProperty('backgroundColor', 'red')
-    },
-    changeTextColor() {
-      const text = uni.getElementById('text')!
-      text.style.setProperty('color', 'red')
-    },
-    changeViewStyle() {
-      const view = uni.getElementById<UniViewElement>('view')
-      if (view !== null) {
-        view.style.setProperty('width', '90%')
-        view.style.setProperty('height', '50px')
-        view.style.setProperty('backgroundColor', '#007AFF')
+  export default {
+    data() {
+      return {
+        checked: false,
+        homePagePath: '/pages/tabBar/component',
+        launchOptionsPath: '',
       }
     },
-    goMultipleRootNode() {
-      uni.navigateTo({ url: '/pages/API/get-element-by-id/get-element-by-id-multiple-root-node' })
+    methods: {
+      getElementByNotExistId() : Element | null {
+        return uni.getElementById('not-exist-id')
+      },
+      changePageHeadBackgroundColor() {
+        const pageHead = uni.getElementById('page-head')!
+        pageHead.style['backgroundColor'] = 'red'
+      },
+      changeTextColor() {
+        const text = uni.getElementById('text')!
+        text.style['color'] = 'red'
+      },
+      changeViewStyle() {
+        const view = uni.getElementById<UniViewElement>('view')
+        if (view !== null) {
+          view.style['width'] = '90%'
+          view.style['height'] = '50px'
+          view.style['backgroundColor'] = '#007AFF'
+        }
+      },
+      goMultipleRootNode() {
+        uni.navigateTo({ url: '/pages/API/get-element-by-id/get-element-by-id-multiple-root-node' })
+      }
     }
   }
-}
-</script>
+</script>
diff --git a/pages/API/navigator/new-page/onLoad.test.js b/pages/API/navigator/new-page/onLoad.test.js
index e85097dc..764421e1 100644
--- a/pages/API/navigator/new-page/onLoad.test.js
+++ b/pages/API/navigator/new-page/onLoad.test.js
@@ -72,7 +72,7 @@ describe("onLoad", () => {
       failureThreshold: 0.05,
       failureThresholdType: "percent",
     });
-    await page.waitFor("view");
+    await program.callUniMethod('hideToast')
   });
   it("showLoading", async () => {
     page = await program.reLaunch(INTERMEDIATE_PAGE_PATH);
@@ -90,7 +90,8 @@ describe("onLoad", () => {
     expect(image).toMatchImageSnapshot({
       failureThreshold: 0.05,
       failureThresholdType: "percent",
-    });
+    });
+    await program.callUniMethod('hideLoading')
   });
   it("showModal", async () => {
     page = await program.reLaunch(INTERMEDIATE_PAGE_PATH);
diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue
index 502f3875..99feb769 100644
--- a/pages/tabBar/API.uvue
+++ b/pages/tabBar/API.uvue
@@ -154,12 +154,6 @@
                 name: 'element元素',
                 url: 'get-element-by-id',
                 api: ["getElementById"],
-                // #ifdef APP-ANDROID
-                enable: true,
-                // #endif
-                // #ifndef APP-ANDROID
-                enable: false,
-                // #endif
               },
               {
                 name: 'element draw',
-- 
GitLab