Merge branch 'web' into dev

App.uvue

@@ -80,5 +80,8 @@
 
 <style>
   /*每个页面公共css */
-  @import "./common/uni.css";
+  @import "./common/uni.css";
+  page {
+    background-color: #f8f8f8;
+  }
 </style>

components/input-data/input-data.vue

@@ -81,7 +81,7 @@
       <text class="uni-title-text"> {{title}} </text>
     </view>
   </view>
-  <view class="uni-input-wrapper input-wrapper">
+  <view class="input-wrapper">
     <input class="uni-input" :type="inputType" :value="inputClearValue" :placeholder="title" @input="input" @blur="blur" @focus="focus" />
     <image class="input-wrapper_image" src="/static/icons/clear.png" v-if="showClearIcon" @click="clearIcon">
     </image>
@@ -90,20 +90,15 @@
 
 
 <style>
-  .uni-input-wrapper {
-    padding: 8px 13px;
-    margin: 10rpx 0;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    background-color: #ffffff;
-  }
-
   .input-wrapper {
     border: 1px solid rgba(0, 0, 0, .08);
     flex-direction: row;
     justify-content: center;
     padding: 0;
     margin: 0 20rpx;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    background-color: #ffffff;
   }
 
   .input-wrapper_image {

components/uni-collapse-item/uni-collapse-item.vue

@@ -67,12 +67,12 @@
 			openOrClose(open: boolean) {
 				const boxNode = this.boxNode?.style!;
 				const contentNode = this.contentNode?.style!;
-				let hide = open ? 'flex' : 'none';
-				const opacity = open ? 1 : 0
+				let hide = open ? 'flex' : 'none';
+				const opacity = open ? "1" : "0"
 				let ani_transform = open ? 'translateY(0)' : 'translateY(-100%)';
 				boxNode.setProperty('display', hide);
 				this.$nextTick(() => {
-					contentNode.setProperty('transform', ani_transform);
+					contentNode.setProperty('transform', ani_transform);
 					contentNode.setProperty('opacity', opacity);
 				})
 			}
@@ -80,9 +80,9 @@
 	}
 </script>
 
-<style scoped>
-	.uni-collapse-item {
-		background-color: #fff;
+<style scoped>
+	.uni-collapse-item {
+		background-color: #fff;
 	}
 	.uni-collapse-item__title {
 		flex-direction: row;
@@ -115,11 +115,11 @@
 		font-size: 14px;
 		font-weight: 400;
 	}
-
-	.open--active {
-		/* background-color: #f0f0f0; */
-		color: #bbb;
-	}
+
+	.open--active {
+		/* background-color: #f0f0f0; */
+		color: #bbb;
+	}
 
 	.is-disabled {
 		color: #999;
@@ -134,7 +134,7 @@
 		width: 100%;
 		transition-property: transform , opacity;
 		transition-duration: 0.2s;
-		transform: translateY(-100%);
+		transform: translateY(-100%);
 		opacity: 0;
 	}
-</style>
+</style>

pages.json

@@ -50,6 +50,14 @@
         "navigationBarTitleText": "button"
       }
     },
+    // #ifdef WEB
+    {
+      "path": "pages/component/canvas/canvas",
+      "style": {
+        "navigationBarTitleText": "canvas"
+      }
+    },
+    // #endif
     {
       "path": "pages/component/radio/radio",
       "style": {
@@ -246,6 +254,14 @@
         "backgroundColor": "#F8F8F8"
       }
     },
+    // #ifdef WEB
+    {
+      "path": "pages/API/canvas/canvas",
+      "style": {
+        "navigationBarTitleText": "创建绘画"
+      }
+    },
+    // #endif
     {
       "path": "pages/API/get-app/get-app",
       "style": {

pages/API/canvas/canvas.uvue

+<template>
+  <view class="page">
+    <page-head :title="title"></page-head>
+    <canvas class="canvas-element" canvas-id="canvas" id="canvas"></canvas>
+    <scroll-view class="scroll-view" :scroll-y="true">
+      <view class="grid-view">
+        <view class="grid-item" v-for="(name, index) in names" :key="index">
+          <button class="canvas-drawing-button" @click="handleCanvasButton(name)">{{name}}</button>
+        </view>
+      </view>
+      <button class="btn-to-image" @click="toTempFilePath" type="primary">toTempFilePath</button>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: 'createContext',
+        names: ["rotate", "scale", "reset", "translate", "save", "restore", "drawImage", "fillText", "fill",
+          "stroke", "clearRect", "beginPath", "closePath", "moveTo", "lineTo", "rect", "arc",
+          "quadraticCurveTo", "bezierCurveTo", "setFillStyle", "setStrokeStyle", "setGlobalAlpha",
+          "setShadow", "setFontSize", "setLineCap", "setLineJoin", "setLineWidth", "setMiterLimit"
+        ],
+        // TODO 缺失 CanvasContext
+        canvasContext: null as any | null
+      }
+    },
+    onReady() {
+      // @ts-ignore
+      this.canvasContext = uni.createCanvasContext('canvas', this)
+    },
+    methods: {
+      toTempFilePath() {
+        // TODO 缺失
+        // uni.canvasToTempFilePath({
+        //   canvasId: 'canvas',
+        //   success: (res) => {
+        //     console.log(res.tempFilePath)
+        //   },
+        //   fail: (err) => {
+        //     console.error(JSON.stringify(err))
+        //   }
+        // })
+      },
+      handleCanvasButton(name : string) {
+        switch (name) {
+          case "rotate":
+            this.rotate();
+            break;
+          case "scale":
+            this.scale();
+            break;
+          case "reset":
+            this.reset();
+            break;
+          case "translate":
+            this.translate();
+            break;
+          case "save":
+            this.save();
+            break;
+          case "restore":
+            this.restore();
+            break;
+          case "drawImage":
+            this.drawImage();
+            break;
+          case "fillText":
+            this.fillText();
+            break;
+          case "fill":
+            this.fill();
+            break;
+          case "stroke":
+            this.stroke();
+            break;
+          case "clearRect":
+            this.clearRect();
+            break;
+          case "beginPath":
+            this.beginPath();
+            break;
+          case "closePath":
+            this.closePath();
+            break;
+          case "moveTo":
+            this.moveTo();
+            break;
+          case "lineTo":
+            this.lineTo();
+            break;
+          case "rect":
+            this.rect();
+            break;
+          case "arc":
+            this.arc();
+            break;
+          case "quadraticCurveTo":
+            this.quadraticCurveTo();
+            break;
+          case "bezierCurveTo":
+            this.bezierCurveTo();
+            break;
+          case "setFillStyle":
+            this.setFillStyle();
+            break;
+          case "setStrokeStyle":
+            this.setStrokeStyle();
+            break;
+          case "setGlobalAlpha":
+            this.setGlobalAlpha();
+            break;
+          case "setShadow":
+            this.setShadow();
+            break;
+          case "setFontSize":
+            this.setFontSize();
+            break;
+          case "setLineCap":
+            this.setLineCap();
+            break;
+          case "setLineJoin":
+            this.setLineJoin();
+            break;
+          case "setLineWidth":
+            this.setLineWidth();
+            break;
+          case "setMiterLimit":
+            this.setMiterLimit();
+            break;
+          default:
+            break;
+        }
+      },
+      rotate() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rotate(10 * Math.PI / 180)
+        this.canvasContext!.rect(225, 75, 20, 10)
+        this.canvasContext!.fill()
+        this.canvasContext!.draw()
+      },
+      scale() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rect(25, 25, 50, 50)
+        this.canvasContext!.stroke()
+
+        this.canvasContext!.scale(2, 2)
+
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rect(25, 25, 50, 50)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      reset() {
+        this.canvasContext!.beginPath()
+
+        this.canvasContext!.setFillStyle('#000000')
+        this.canvasContext!.setStrokeStyle('#000000')
+        this.canvasContext!.setFontSize(10)
+        this.canvasContext!.setGlobalAlpha(1)
+        this.canvasContext!.setShadow(0, 0, 0, 'rgba(0, 0, 0, 0)')
+
+        this.canvasContext!.setLineCap('butt')
+        this.canvasContext!.setLineJoin('miter')
+        this.canvasContext!.setLineWidth(1)
+        this.canvasContext!.setMiterLimit(10)
+        this.canvasContext!.draw()
+      },
+      translate() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rect(10, 10, 100, 50)
+        this.canvasContext!.fill()
+
+        this.canvasContext!.translate(70, 70)
+
+        this.canvasContext!.beginPath()
+        this.canvasContext!.fill()
+        this.canvasContext!.draw()
+      },
+      save() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.setStrokeStyle('#00ff00')
+        this.canvasContext!.save()
+
+        this.canvasContext!.scale(2, 2)
+        this.canvasContext!.setStrokeStyle('#ff0000')
+        this.canvasContext!.rect(0, 0, 100, 100)
+        this.canvasContext!.stroke()
+        this.canvasContext!.restore()
+
+        this.canvasContext!.rect(0, 0, 50, 50)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      restore() {
+        [3, 2, 1].forEach((item) => {
+          this.canvasContext!.beginPath()
+          this.canvasContext!.save()
+          this.canvasContext!.scale(item, item)
+          this.canvasContext!.rect(10, 10, 100, 100)
+          this.canvasContext!.stroke()
+          this.canvasContext!.restore()
+        });
+        this.canvasContext!.draw()
+      },
+      drawImage() {
+        // #ifdef APP-PLUS
+        this.canvasContext!.drawImage('../../../static/app-plus/uni@2x.png', 0, 0)
+        // #endif
+        // #ifndef APP-PLUS
+        this.canvasContext!.drawImage('../../../static/uni.png', 0, 0)
+        // #endif
+        this.canvasContext!.draw()
+      },
+      fillText() {
+        this.canvasContext!.setStrokeStyle('#ff0000')
+
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(0, 10)
+        this.canvasContext!.lineTo(300, 10)
+        this.canvasContext!.stroke()
+        // this.canvasContext!.save()
+        // this.canvasContext!.scale(1.5, 1.5)
+        // this.canvasContext!.translate(20, 20)
+        this.canvasContext!.setFontSize(10)
+        this.canvasContext!.fillText('Hello World', 0, 30)
+        this.canvasContext!.setFontSize(20)
+        this.canvasContext!.fillText('Hello World', 100, 30)
+
+        // this.canvasContext!.restore()
+
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(0, 30)
+        this.canvasContext!.lineTo(300, 30)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      fill() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rect(20, 20, 150, 100)
+        this.canvasContext!.setStrokeStyle('#00ff00')
+        this.canvasContext!.fill()
+        this.canvasContext!.draw()
+      },
+      stroke() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(20, 20)
+        this.canvasContext!.lineTo(20, 100)
+        this.canvasContext!.lineTo(70, 100)
+        this.canvasContext!.setStrokeStyle('#00ff00')
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      clearRect() {
+        this.canvasContext!.setFillStyle('#ff0000')
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rect(0, 0, 300, 150)
+        this.canvasContext!.fill()
+        this.canvasContext!.clearRect(20, 20, 100, 50)
+        this.canvasContext!.draw()
+      },
+      beginPath() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.setLineWidth(5)
+        this.canvasContext!.setStrokeStyle('#ff0000')
+        this.canvasContext!.moveTo(0, 75)
+        this.canvasContext!.lineTo(250, 75)
+        this.canvasContext!.stroke()
+        this.canvasContext!.beginPath()
+        this.canvasContext!.setStrokeStyle('#0000ff')
+        this.canvasContext!.moveTo(50, 0)
+        this.canvasContext!.lineTo(150, 130)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      closePath() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.setLineWidth(1)
+        this.canvasContext!.moveTo(20, 20)
+        this.canvasContext!.lineTo(20, 100)
+        this.canvasContext!.lineTo(70, 100)
+        this.canvasContext!.closePath()
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      moveTo() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(0, 0)
+        this.canvasContext!.lineTo(300, 150)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      lineTo() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(20, 20)
+        this.canvasContext!.lineTo(20, 100)
+        this.canvasContext!.lineTo(70, 100)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      rect() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.rect(20, 20, 150, 100)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      arc() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.setLineWidth(2)
+        this.canvasContext!.arc(75, 75, 50, 0, Math.PI * 2, true)
+        this.canvasContext!.moveTo(110, 75)
+        this.canvasContext!.arc(75, 75, 35, 0, Math.PI, false)
+        this.canvasContext!.moveTo(65, 65)
+        this.canvasContext!.arc(60, 65, 5, 0, Math.PI * 2, true)
+        this.canvasContext!.moveTo(95, 65)
+        this.canvasContext!.arc(90, 65, 5, 0, Math.PI * 2, true)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      quadraticCurveTo() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(20, 20)
+        this.canvasContext!.quadraticCurveTo(20, 100, 200, 20)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      bezierCurveTo() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.moveTo(20, 20)
+        this.canvasContext!.bezierCurveTo(20, 100, 200, 100, 200, 20)
+        this.canvasContext!.stroke()
+        this.canvasContext!.draw()
+      },
+      setFillStyle() {
+        ['#fef957', 'rgb(242,159,63)', 'rgb(242,117,63)', '#e87e51'].forEach((item : string, index : number) => {
+          this.canvasContext!.setFillStyle(item)
+          this.canvasContext!.beginPath()
+          this.canvasContext!.rect(0 + 75 * index, 0, 50, 50)
+          this.canvasContext!.fill()
+        })
+        this.canvasContext!.draw()
+      },
+      setStrokeStyle() {
+        ['#fef957', 'rgb(242,159,63)', 'rgb(242,117,63)', '#e87e51'].forEach((item : string, index : number) => {
+          this.canvasContext!.setStrokeStyle(item)
+          this.canvasContext!.beginPath()
+          this.canvasContext!.rect(0 + 75 * index, 0, 50, 50)
+          this.canvasContext!.stroke()
+        })
+        this.canvasContext!.draw()
+      },
+      setGlobalAlpha() {
+        this.canvasContext!.setFillStyle('#000000');
+        [1, 0.5, 0.1].forEach((item : number, index : number) => {
+          this.canvasContext!.setGlobalAlpha(item)
+          this.canvasContext!.beginPath()
+          this.canvasContext!.rect(0 + 75 * index, 0, 50, 50)
+          this.canvasContext!.fill()
+        })
+        this.canvasContext!.draw()
+        this.canvasContext!.setGlobalAlpha(1)
+      },
+      setShadow() {
+        this.canvasContext!.beginPath()
+        this.canvasContext!.setShadow(10, 10, 10, 'rgba(0, 0, 0, 199)')
+        this.canvasContext!.rect(10, 10, 100, 100)
+        this.canvasContext!.fill()
+        this.canvasContext!.draw()
+      },
+      setFontSize() {
+        [10, 20, 30, 40].forEach((item : number, index : number) => {
+          this.canvasContext!.setFontSize(item)
+          this.canvasContext!.fillText('Hello, world', 20, 20 + 40 * index)
+        })
+        this.canvasContext!.draw()
+      },
+      setLineCap() {
+        this.canvasContext!.setLineWidth(10);
+        ['butt', 'round', 'square'].forEach((item : string, index : number) => {
+          this.canvasContext!.beginPath()
+          this.canvasContext!.setLineCap(item)
+          this.canvasContext!.moveTo(20, 20 + 20 * index)
+          this.canvasContext!.lineTo(100, 20 + 20 * index)
+          this.canvasContext!.stroke()
+        })
+        this.canvasContext!.draw()
+      },
+      setLineJoin() {
+        this.canvasContext!.setLineWidth(10);
+        ['bevel', 'round', 'miter'].forEach((item : string, index : number) => {
+          this.canvasContext!.beginPath()
+          this.canvasContext!.setLineJoin(item)
+          this.canvasContext!.moveTo(20 + 80 * index, 20)
+          this.canvasContext!.lineTo(100 + 80 * index, 50)
+          this.canvasContext!.lineTo(20 + 80 * index, 100)
+          this.canvasContext!.stroke()
+        })
+        this.canvasContext!.draw()
+      },
+      setLineWidth() {
+        [2, 4, 6, 8, 10].forEach((item : number, index : number) => {
+          this.canvasContext!.beginPath()
+          this.canvasContext!.setLineWidth(item)
+          this.canvasContext!.moveTo(20, 20 + 20 * index)
+          this.canvasContext!.lineTo(100, 20 + 20 * index)
+          this.canvasContext!.stroke()
+        })
+        this.canvasContext!.draw()
+      },
+      setMiterLimit() {
+        this.canvasContext!.setLineWidth(4);
+        [2, 4, 6, 8, 10].forEach((item : number, index : number) => {
+          this.canvasContext!.beginPath()
+          this.canvasContext!.setMiterLimit(item)
+          this.canvasContext!.moveTo(20 + 80 * index, 20)
+          this.canvasContext!.lineTo(100 + 80 * index, 50)
+          this.canvasContext!.lineTo(20 + 80 * index, 100)
+          this.canvasContext!.stroke()
+        })
+        this.canvasContext!.draw()
+      }
+    }
+  }
+</script>
+
+<style>
+  .page {
+    flex: 1;
+    height: 100%;
+    overflow: hidden;
+  }
+
+  .scroll-view {
+    flex: 1;
+    padding-bottom: 50px;
+  }
+
+  .canvas-element {
+    width: 100%;
+    height: 500rpx;
+    background-color: #ffffff;
+  }
+
+  .grid-view {
+    padding: 10px;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+
+  .grid-item {
+    width: 50%;
+    padding: 5px;
+  }
+
+  .btn-to-image {
+    margin: 10px;
+  }
+</style>

pages/API/get-app-base-info/get-app-base-info.test.js

@@ -6,11 +6,14 @@ describe('ExtApi-GetAppBaseInfo', () => {
   let res;
   const stringProperties = [
     'appId', 'appName', 'appVersion', 'appVersionCode', 'appLanguage',
-    'language', 'version', 'uniCompileVersion', 'uniPlatform', 'uniRuntimeVersion',
+    'language', 'uniCompileVersion', 'uniPlatform', 'uniRuntimeVersion',
   ]
   const numberProperties = [
     'uniCompileVersionCode', 'uniRuntimeVersionCode'
-  ]
+  ]
+  if (process.env.uniTestPlatformInfo.indexOf('web') === -1) {
+    stringProperties.push('version')
+  }
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)
     await page.waitFor(600);

pages/API/get-app/get-app.uvue

-<template>
-  <!-- #ifdef APP -->
-  <scroll-view style="flex:1;padding-bottom: 20px;">
-  <!-- #endif -->
-    <view>
-      <page-head title="getApp"></page-head>
-      <view class="uni-padding-wrap">
-        <button @click="getGlobalData">get globalData</button>
-        <template v-if="originGlobalData.str.length">
-          <text class="uni-common-mt bold">初始的 globalData:</text>
-          <text class="uni-common-mt">globalData string: {{ originGlobalData.str }}</text>
-          <text class="uni-common-mt">globalData number: {{ originGlobalData.num }}</text>
-          <text class="uni-common-mt">globalData boolean: {{ originGlobalData.bool }}</text>
-          <text class="uni-common-mt">globalData object: {{ originGlobalData.obj }}</text>
-          <text class="uni-common-mt">globalData null: {{ originGlobalData.null }}</text>
-          <text class="uni-common-mt">globalData array: {{ originGlobalData.arr }}</text>
-          <text class="uni-common-mt">globalData Set: {{ originGlobalData.mySet }}</text>
-          <text class="uni-common-mt">globalData Map: {{ originGlobalData.myMap }}</text>
-          <text class="uni-common-mt">globalData func 返回值: {{ originGlobalDataFuncRes }}</text>
-        </template>
-        <button @click="setGlobalData" class="uni-common-mt">set globalData</button>
-        <template v-if="newGlobalData.bool">
-          <text class="uni-common-mt bold">更新后的 globalData:</text>
-          <text class="uni-common-mt">globalData string: {{ newGlobalData.str }}</text>
-          <text class="uni-common-mt">globalData number: {{ newGlobalData.num }}</text>
-          <text class="uni-common-mt">globalData boolean: {{ newGlobalData.bool }}</text>
-          <text class="uni-common-mt">globalData object: {{ newGlobalData.obj }}</text>
-          <text class="uni-common-mt">globalData null: {{ newGlobalData.null }}</text>
-          <text class="uni-common-mt">globalData array: {{ newGlobalData.arr }}</text>
-          <text class="uni-common-mt">globalData Set: {{ newGlobalData.mySet }}</text>
-          <text class="uni-common-mt">globalData Map: {{ newGlobalData.myMap }}</text>
-          <text class="uni-common-mt">globalData func 返回值: {{ newGlobalDataFuncRes }}</text>
-        </template>
-        <text class="uni-common-mt">点击按钮调用 App.uvue methods</text>
-        <text class="margin-top:6px;">increasetLifeCycleNum 方法</text>
-        <button class="uni-common-mt" @click="_increasetLifeCycleNum">
-          increase lifeCycleNum
-        </button>
-        <text class="uni-common-mt">lifeCycleNum: {{ lifeCycleNum }}</text>
-      </view>
-    </view>
-  <!-- #ifdef APP -->
-  </scroll-view>
-  <!-- #endif -->
-</template>
-
-<script lang="uts">
-  import { state, setLifeCycleNum } from '@/store/index.uts'
-
-  type MyGlobalData = {
-    str : string,
-    num : number,
-    bool : boolean,
-    obj : UTSJSONObject,
-    null : string | null,
-    arr : number[],
-    mySet : string[],
-    myMap : UTSJSONObject,
-    func : () => string
-  }
-
-  export default {
-    data() {
-      return {
-        originGlobalData: {
-          str: '',
-          num: 0,
-          bool: false,
-          obj: {
-            str: '',
-            num: 0,
-            bool: false
-          } as UTSJSONObject,
-          null: null,
-          arr: [] as number[],
-          mySet: [] as string[],
-          myMap: {},
-          func: () : string => ''
-        } as MyGlobalData,
-        originGlobalDataFuncRes: '',
-        newGlobalData: {
-          str: '',
-          num: 0,
-          bool: false,
-          obj: {
-            str: '',
-            num: 0,
-            bool: false
-          } as UTSJSONObject,
-          null: null,
-          arr: [] as number[],
-          mySet: [] as string[],
-          myMap: {},
-          func: () : string => ''
-        } as MyGlobalData,
-        newGlobalDataFuncRes: '',
-        lifeCycleNum: 0,
-      }
-    },
-    onReady() {
-      this.lifeCycleNum = state.lifeCycleNum
-    },
-    methods: {
-      getGlobalData() {
-        const app = getApp()
-
-        this.originGlobalData.str = app.globalData.str
-        this.originGlobalData.num = app.globalData.num
-        this.originGlobalData.bool = app.globalData.bool
-        this.originGlobalData.obj = app.globalData.obj
-        this.originGlobalData.null = app.globalData.null
-        this.originGlobalData.arr = app.globalData.arr
-        app.globalData.mySet.forEach((value : string) => {
-          this.originGlobalData.mySet.push(value)
-        })
-        app.globalData.myMap.forEach((value : any, key : string) => {
-          this.originGlobalData.myMap[key] = value
-        })
-        this.originGlobalData.func = app.globalData.func
-        this.originGlobalDataFuncRes = this.originGlobalData.func()
-      },
-      setGlobalData() {
-        const app = getApp()
-
-        app.globalData.str = 'new globalData str'
-        app.globalData.num = 100
-        app.globalData.bool = true
-        app.globalData.obj = {
-          str: 'new globalData obj str',
-          num: 200,
-          bool: true
-        }
-        app.globalData.null = 'not null'
-        app.globalData.arr = [1, 2, 3]
-        app.globalData.mySet = new Set(['a', 'b', 'c'])
-        app.globalData.myMap = new Map([
-          ['a', 1],
-          ['b', 2],
-          ['c', 3]
-        ])
-        app.globalData.func = () : string => {
-          return 'new globalData func'
-        }
-
-        this.newGlobalData.str = app.globalData.str
-        this.newGlobalData.num = app.globalData.num
-        this.newGlobalData.bool = app.globalData.bool
-        this.newGlobalData.obj = app.globalData.obj
-        this.newGlobalData.null = app.globalData.null
-        this.newGlobalData.arr = app.globalData.arr
-        app.globalData.mySet.forEach((value : string) => {
-          this.newGlobalData.mySet.push(value)
-        })
-        app.globalData.myMap.forEach((value : any, key : string) => {
-          this.newGlobalData.myMap[key] = value
-        })
-        this.newGlobalData.func = app.globalData.func
-        this.newGlobalDataFuncRes = this.newGlobalData.func()
-      },
-      _increasetLifeCycleNum: function () {
-        const app = getApp()
-        app.increasetLifeCycleNum()
-        this.lifeCycleNum = state.lifeCycleNum
-      },
-      // 自动化测试
-      setLifeCycleNum(num : number) {
-        setLifeCycleNum(num)
-      }
-    },
-  }
-</script>
-
-<style>
-  .bold {
-    font-weight: bold;
-  }
-
-  .hr {
-    border-bottom: 1px solid #ccc;
-  }
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex:1;padding-bottom: 20px;">
+  <!-- #endif -->
+    <view>
+      <page-head title="getApp"></page-head>
+      <view class="uni-padding-wrap">
+        <button @click="getGlobalData">get globalData</button>
+        <template v-if="originGlobalData.str.length">
+          <text class="uni-common-mt bold">初始的 globalData:</text>
+          <text class="uni-common-mt">globalData string: {{ originGlobalData.str }}</text>
+          <text class="uni-common-mt">globalData number: {{ originGlobalData.num }}</text>
+          <text class="uni-common-mt">globalData boolean: {{ originGlobalData.bool }}</text>
+          <text class="uni-common-mt">globalData object: {{ originGlobalData.obj }}</text>
+          <text class="uni-common-mt">globalData null: {{ originGlobalData.null }}</text>
+          <text class="uni-common-mt">globalData array: {{ originGlobalData.arr }}</text>
+          <text class="uni-common-mt">globalData Set: {{ originGlobalData.mySet }}</text>
+          <text class="uni-common-mt">globalData Map: {{ originGlobalData.myMap }}</text>
+          <text class="uni-common-mt">globalData func 返回值: {{ originGlobalDataFuncRes }}</text>
+        </template>
+        <button @click="setGlobalData" class="uni-common-mt">set globalData</button>
+        <template v-if="newGlobalData.bool">
+          <text class="uni-common-mt bold">更新后的 globalData:</text>
+          <text class="uni-common-mt">globalData string: {{ newGlobalData.str }}</text>
+          <text class="uni-common-mt">globalData number: {{ newGlobalData.num }}</text>
+          <text class="uni-common-mt">globalData boolean: {{ newGlobalData.bool }}</text>
+          <text class="uni-common-mt">globalData object: {{ newGlobalData.obj }}</text>
+          <text class="uni-common-mt">globalData null: {{ newGlobalData.null }}</text>
+          <text class="uni-common-mt">globalData array: {{ newGlobalData.arr }}</text>
+          <text class="uni-common-mt">globalData Set: {{ newGlobalData.mySet }}</text>
+          <text class="uni-common-mt">globalData Map: {{ newGlobalData.myMap }}</text>
+          <text class="uni-common-mt">globalData func 返回值: {{ newGlobalDataFuncRes }}</text>
+        </template>
+        <text class="uni-common-mt">点击按钮调用 App.uvue methods</text>
+        <text class="margin-top:6px;">increasetLifeCycleNum 方法</text>
+        <button class="uni-common-mt" @click="_increasetLifeCycleNum">
+          increase lifeCycleNum
+        </button>
+        <text class="uni-common-mt">lifeCycleNum: {{ lifeCycleNum }}</text>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+
+<script lang="uts">
+  import { state, setLifeCycleNum } from '@/store/index.uts'
+
+  type MyGlobalData = {
+    str : string,
+    num : number,
+    bool : boolean,
+    obj : UTSJSONObject,
+    null : string | null,
+    arr : number[],
+    mySet : string[],
+    myMap : UTSJSONObject,
+    func : () => string
+  }
+
+  export default {
+    data() {
+      return {
+        originGlobalData: {
+          str: '',
+          num: 0,
+          bool: false,
+          obj: {
+            str: '',
+            num: 0,
+            bool: false
+          } as UTSJSONObject,
+          null: null,
+          arr: [] as number[],
+          mySet: [] as string[],
+          myMap: {},
+          func: () : string => ''
+        } as MyGlobalData,
+        originGlobalDataFuncRes: '',
+        newGlobalData: {
+          str: '',
+          num: 0,
+          bool: false,
+          obj: {
+            str: '',
+            num: 0,
+            bool: false
+          } as UTSJSONObject,
+          null: null,
+          arr: [] as number[],
+          mySet: [] as string[],
+          myMap: {},
+          func: () : string => ''
+        } as MyGlobalData,
+        newGlobalDataFuncRes: '',
+        lifeCycleNum: 0,
+      }
+    },
+    onReady() {
+      this.lifeCycleNum = state.lifeCycleNum
+    },
+    methods: {
+      getGlobalData() {
+        const app = getApp()
+
+        this.originGlobalData.str = app.globalData.str
+        this.originGlobalData.num = app.globalData.num
+        this.originGlobalData.bool = app.globalData.bool
+        this.originGlobalData.obj = app.globalData.obj
+        this.originGlobalData.null = app.globalData.null
+        this.originGlobalData.arr = app.globalData.arr
+        app.globalData.mySet.forEach((value : string) => {
+          this.originGlobalData.mySet.push(value)
+        })
+        app.globalData.myMap.forEach((value : any, key : string) => {
+          this.originGlobalData.myMap[key] = value
+        })
+        this.originGlobalData.func = app.globalData.func
+        this.originGlobalDataFuncRes = this.originGlobalData.func()
+      },
+      setGlobalData() {
+        const app = getApp()
+
+        app.globalData.str = 'new globalData str'
+        app.globalData.num = 100
+        app.globalData.bool = true
+        app.globalData.obj = {
+          str: 'new globalData obj str',
+          num: 200,
+          bool: true
+        }
+        app.globalData.null = 'not null'
+        app.globalData.arr = [1, 2, 3]
+        app.globalData.mySet = new Set(['a', 'b', 'c'])
+        app.globalData.myMap = new Map([
+          ['a', 1],
+          ['b', 2],
+          ['c', 3]
+        ])
+        app.globalData.func = () : string => {
+          return 'new globalData func'
+        }
+
+        this.newGlobalData.str = app.globalData.str
+        this.newGlobalData.num = app.globalData.num
+        this.newGlobalData.bool = app.globalData.bool
+        this.newGlobalData.obj = app.globalData.obj
+        this.newGlobalData.null = app.globalData.null
+        this.newGlobalData.arr = app.globalData.arr
+        app.globalData.mySet.forEach((value : string) => {
+          this.newGlobalData.mySet.push(value)
+        })
+        app.globalData.myMap.forEach((value : any, key : string) => {
+          this.newGlobalData.myMap[key] = value
+        })
+        this.newGlobalData.func = app.globalData.func
+        this.newGlobalDataFuncRes = this.newGlobalData.func()
+      },
+      _increasetLifeCycleNum: function () {
+        const app = getApp()
+        app.increasetLifeCycleNum()
+        this.lifeCycleNum = state.lifeCycleNum
+      },
+      // 自动化测试
+      setLifeCycleNum(num : number) {
+        setLifeCycleNum(num)
+      }
+    },
+  }
+</script>
+
+<style>
+  .bold {
+    font-weight: bold;
+  }
+
+  .hr {
+    border-bottom: 1px solid #ccc;
+  }
 </style>

pages/API/get-element-by-id/get-element-by-id-multiple-root-node.uvue

@@ -28,20 +28,20 @@
       },
       changePageHeadBackgroundColor() {
         const pageHead = uni.getElementById('page-head')!
-        pageHead.style['backgroundColor'] = 'red'
+        pageHead.style.setProperty('background-color', 'red')
       },
       changeTextColor() {
         const text = uni.getElementById('text')!
-        text.style['color'] = 'red'
+        text.style.setProperty('color', 'red')
       },
       changeViewStyle() {
         const view = uni.getElementById<UniViewElement>('view')
         if (view !== null) {
-          view.style['width'] = '90%'
-          view.style['height'] = '50px'
-          view.style['backgroundColor'] = '#007AFF'
+          view.style.setProperty('width', '90%')
+          view.style.setProperty('height', '50px')
+          view.style.setProperty('backgroundColor', '#007AFF')
         }
       }
     }
   }
-</script>
+</script>

pages/API/get-element-by-id/get-element-by-id.uvue

@@ -35,18 +35,18 @@
       },
       changePageHeadBackgroundColor() {
         const pageHead = uni.getElementById('page-head')!
-        pageHead.style['backgroundColor'] = 'red'
+        pageHead.style.setProperty('background-color', 'red')
       },
       changeTextColor() {
-        const text = uni.getElementById('text')!
-        text.style['color'] = 'red'
-      },
+        const text = uni.getElementById('text')!
+        text.style.setProperty('color', 'red')
+      },
       changeViewStyle() {
         const view = uni.getElementById<UniViewElement>('view')
         if (view !== null) {
-          view.style['width'] = '90%'
-          view.style['height'] = '50px'
-          view.style['backgroundColor'] = '#007AFF'
+          view.style.setProperty('width', '90%')
+          view.style.setProperty('height', '50px')
+          view.style.setProperty('background-color', '#007AFF')
         }
       },
       goMultipleRootNode() {
@@ -54,4 +54,4 @@
       }
     }
   }
-</script>
+</script>

pages/API/get-system-info/get-system-info.test.js

@@ -7,7 +7,7 @@ describe('ExtApi-GetSystemInfo', () => {
   const stringProperties = [
     'appId', 'appLanguage', 'appName', 'appVersion', 'appVersionCode',
     'brand', 'deviceId', 'deviceBrand', 'deviceModel', 'deviceType', 'language',
-    'model', 'version', 'osName', 'osVersion', 'osLanguage', 'platform', 'system', 'ua', 'uniCompileVersion',
+    'model', 'osName', 'osVersion', 'osLanguage', 'platform', 'system', 'ua', 'uniCompileVersion',
     'uniPlatform', 'uniRuntimeVersion', 'romName', 'romVersion',
   ]
   const numberProperties = [
@@ -15,7 +15,12 @@ describe('ExtApi-GetSystemInfo', () => {
     'windowWidth',
     'windowHeight', 'windowTop', 'windowBottom', 'screenTop',
     'uniCompileVersionCode', 'uniRuntimeVersionCode'
-  ]
+  ]
+
+
+  if (process.env.uniTestPlatformInfo.indexOf('web') === -1) {
+    stringProperties.push('version')
+  }
 
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)

pages/API/navigator/new-page/onLoad.uvue

@@ -55,11 +55,13 @@ export default {
   },
   // #ifdef WEB
   onUnload() {
-    // web 端页面销毁前,关闭 modal 和 actionsheet
+    // web 端页面销毁前,关闭 modal 和 actionsheet
+    // @ts-ignore
     const modalBtn = document.querySelector('.uni-modal__btn')
     if (modalBtn) {
       modalBtn.click()
-    }
+    }
+    // @ts-ignore
     const actionSheetBtn = document.querySelector('.uni-actionsheet__action .uni-actionsheet__cell')
     if (actionSheetBtn) {
       actionSheetBtn.click()

pages/API/request/request.test.js

@@ -69,24 +69,29 @@ describe('ExtApi-Request', () => {
   });
   it('Check PATCH', async () => {
     await request(page, 'PATCH');
-  });
-  it('Check OPTIONS', async () => {
-    await request(page, 'OPTIONS');
-  });
+  });
+  if (process.env.uniTestPlatformInfo.indexOf('web') === -1) {
+    it('Check OPTIONS', async () => {
+      await request(page, 'OPTIONS');
+    });
+  }
   it('Check HEAD', async () => {
     await request(page, 'HEAD');
   });
 
-  it('Check Set Cookie', async () => {
-    res = await page.callMethod('jest_set_cookie')
-    await page.waitFor(500);
-    res = await page.data('jest_result');
-    expect(res).toBe(true)
-  });
-  it('Check Delete Cookie', async () => {
-    res = await page.callMethod('jest_delete_cookie')
-    await page.waitFor(1000);
-    res = await page.data('jest_result');
-    expect(res).toBe(true)
-  });
+
+  if (process.env.uniTestPlatformInfo.indexOf('web') === -1) {
+    it('Check Set Cookie', async () => {
+      res = await page.callMethod('jest_set_cookie')
+      await page.waitFor(500);
+      res = await page.data('jest_result');
+      expect(res).toBe(true)
+    });
+    it('Check Delete Cookie', async () => {
+      res = await page.callMethod('jest_delete_cookie')
+      await page.waitFor(1000);
+      res = await page.data('jest_result');
+      expect(res).toBe(true)
+    });
+  }
 });

pages/CSS/display/flex.uvue

 <template>
-<!-- #ifdef APP -->
 <view class="page" style="flex:1">
-<!-- #endif -->
 	<view class="head">
 		<text class="tip">下面有一个灰色区域，display默认值为flex</text>
 		<text class="tip">当前display值：{{display}}</text>
@@ -10,9 +8,7 @@
 		<text style="background-color: aquamarine;">展示display区域</text>
 	</view>
 	<button @tap="switchDisplay">切换display属性</button>
-<!-- #ifdef APP -->
 </view>
-<!-- #endif -->
 </template>
 
 <script>

pages/CSS/display/none.uvue

 <template>
-<!-- #ifdef APP -->
 <view class="page" style="flex:1">
-<!-- #endif -->
 	<view class="head">
 		<text class="tip">下面有一个灰色区域，display默认值为none</text>
 		<text class="tip">当前display值：{{display}}</text>
@@ -10,9 +8,7 @@
 		<text style="background-color: aquamarine;">展示display区域</text>
 	</view>
 	<button @tap="switchDisplay">切换display属性</button>
-<!-- #ifdef APP -->
 </view>
-<!-- #endif -->
 </template>
 
 <script>

pages/CSS/layout/position.uvue

@@ -7,6 +7,7 @@
         <text>position: relative</text>
         <scroll-view
           style="width: 500rpx; height: 500rpx; background-color: gray"
+          scroll-y="true"
         >
           <view
             style="width: 100rpx; height: 100rpx; background-color: red"
@@ -42,6 +43,7 @@
         <text>position: absolute</text>
         <scroll-view
           style="width: 500rpx; height: 500rpx; background-color: gray"
+          scroll-y="true"
         >
           <view
             style="width: 100rpx; height: 100rpx; background-color: red"
@@ -77,6 +79,7 @@
         <text>position: fixed</text>
         <scroll-view
           style="width: 500rpx; height: 500rpx; background-color: gray"
+          scroll-y="true"
         >
           <view
             style="width: 100rpx; height: 100rpx; background-color: red"

pages/CSS/transform/rotate.uvue

 <template>
-<!-- #ifdef APP -->
-<scroll-view class="page">
-<!-- #endif -->
+<scroll-view class="page" scroll-y="true">
 
 	<view class="trace">
 		<view class="base reserve">
@@ -39,9 +37,7 @@
 		<text>转变后位置</text>
 	</view>
 
-<!-- #ifdef APP -->
 </scroll-view>
-<!-- #endif -->
 </template>
 
 <script lang="uts">

pages/CSS/transform/scale.uvue

 <template>
-<!-- #ifdef APP -->
-<scroll-view class="page">
-<!-- #endif -->
-
+<scroll-view class="page" scroll-y="true">
 	<view class="trace">
 		<view class="base reserve">
 			<text class="reserve-text">scaleX(0.6)</text>
@@ -30,10 +27,7 @@
 		<text>scale(1.2,1.2)</text>
 		<text>转变后位置</text>
 	</view>
-
-<!-- #ifdef APP -->
 </scroll-view>
-<!-- #endif -->
 </template>
 
 <script lang="uts">

pages/CSS/transform/translate.uvue

 <template>
-<!-- #ifdef APP -->
-<scroll-view class="page">
-<!-- #endif -->
-
+<scroll-view class="page" scroll-y="true">
 	<view class="trace">
 		<view class="base reserve">
 			<text class="reserve-text">translateX(80%)</text>
@@ -30,10 +27,7 @@
 		<text>translate(-50%,50%)</text>
 		<text>转变后位置</text>
 	</view>
-
-<!-- #ifdef APP -->
 </scroll-view>
-<!-- #endif -->
 </template>
 
 <script lang="uts">

pages/CSS/transition/transition.uvue

@@ -86,29 +86,29 @@
     methods: {
       changeWidthOrHeight() {
         this.widthOrHeight?.style?.setProperty("width", this.isTranstionWidthOrHeight
-          ? '400rpx'
-          : '600rpx')
+          ? '60%'
+          : '100%')
         this.isTranstionWidthOrHeight = !this.isTranstionWidthOrHeight
       },
       changeMargin() {
         this.styleMargin?.style?.setProperty("margin-top", this.isTranstionChangeMargin
-          ? '0rpx'
-          : '100rpx'
+          ? '0px'
+          : '50px'
         )
         this.styleMargin?.style?.setProperty("margin-left", this.isTranstionChangeMargin
-          ? '0rpx'
-          : '100rpx'
+          ? '0px'
+          : '50px'
         )
         this.isTranstionChangeMargin = !this.isTranstionChangeMargin
       },
 
       changePadding() {
         this.stylePadding?.style?.setProperty("padding-top", this.isTransitionStylePadding
-          ? '0rpx'
-          : '100rpx')
+          ? '0px'
+          : '50px')
         this.stylePadding?.style?.setProperty("padding-left", this.isTransitionStylePadding
-          ? '0rpx'
-          : '100rpx')
+          ? '0px'
+          : '50px')
         this.isTransitionStylePadding = !this.isTransitionStylePadding
       },
       changeBackground() {
@@ -157,8 +157,8 @@
       },
       changestylePosition() {
         this.stylePosition?.style?.setProperty("left", this.isTransitionstylePosition
-          ? '0rpx'
-          : '150rpx'
+          ? '0px'
+          : '100px'
         )
         this.isTransitionstylePosition = !this.isTransitionstylePosition
       },

pages/component/canvas/canvas.uvue

+<template>
+  <view>
+    <page-head :title="title"></page-head>
+    <view class="page-body">
+      <!-- #ifdef APP-PLUS || H5 -->
+      <canvas canvas-id="canvas" class="canvas" :start="startStatus" :change:start="animate.start"
+        :data-width="canvasWidth" :data-height="canvasWidth"></canvas>
+      <!-- #endif -->
+      <!-- #ifndef APP-PLUS || H5 -->
+      <canvas canvas-id="canvas" id="canvas" class="canvas"></canvas>
+      <!-- #endif -->
+    </view>
+  </view>
+</template>
+
+<script module="animate" lang="renderjs">
+  function Ball({
+    x,
+    y,
+    vx,
+    vy,
+    canvasWidth,
+    canvasHeight,
+    ctx
+  }) {
+    this.canvasWidth = canvasWidth
+    this.canvasHeight = canvasHeight
+    this.ctx = ctx
+    this.x = x
+    this.y = y
+    this.vx = vx
+    this.vy = vy
+    this.radius = 5
+  }
+
+  Ball.prototype.draw = function() {
+    this.ctx.beginPath()
+    this.ctx.fillStyle = '#007AFF'
+    this.ctx.arc(this.x, this.y, this.radius, 0, 2 * Math.PI)
+    this.ctx.closePath()
+    this.ctx.fill()
+  }
+
+  Ball.prototype.move = function() {
+    this.x += this.vx
+    this.y += this.vy
+    // 回到中心
+    // if (getDistance(this.x - this.canvasWidth / 2, this.y - this.canvasHeight / 2) >
+    // 	getDistance(this.canvasWidth / 2, this.canvasHeight / 2) + this.radius) {
+    // 	this.x = this.canvasWidth / 2
+    // 	this.y = this.canvasHeight / 2
+    // }
+
+    // 边框反弹
+    if (this.x < this.radius) {
+      this.vx = Math.abs(this.vx)
+      return
+    }
+    if (this.x > this.canvasWidth - this.radius) {
+      this.vx = -Math.abs(this.vx)
+    }
+    if (this.y < this.radius) {
+      this.vy = Math.abs(this.vy)
+      return
+    }
+    if (this.y > this.canvasWidth - this.radius) {
+      this.vy = -Math.abs(this.vy)
+    }
+  }
+
+  function getDistance(x, y) {
+    return Math.pow(Math.pow(x, 2) + Math.pow(y, 2), 0.5)
+  }
+
+  export default {
+    methods: {
+      start(newVal, oldVal, owner, ins) {
+        let canvasWidth = ins.getDataset().width,
+          canvasHeight = ins.getDataset().height,
+          canvasEle = document.querySelectorAll('.canvas>canvas')[0],
+          ctx = canvasEle.getContext('2d'),
+          speed = 3,
+          ballList = [],
+          layer = 3,
+          ballInlayer = 20
+        for (let i = 0; i < layer; i++) {
+          let radius = getDistance(canvasWidth / 2, canvasHeight / 2) / layer * i
+          for (let j = 0; j < ballInlayer; j++) {
+            let deg = j * 2 * Math.PI / ballInlayer,
+              sin = Math.sin(deg),
+              cos = Math.cos(deg),
+              x = radius * cos + canvasWidth / 2,
+              y = radius * sin + canvasHeight / 2,
+              vx = speed * cos,
+              vy = speed * sin;
+            ballList.push(new Ball({x, y, vx, vy, canvasWidth, canvasHeight, ctx, radius: 5}))
+          }
+        }
+
+        function animate(ballList) {
+          ctx.clearRect(0, 0, canvasEle.width, canvasEle.height)
+          ballList.forEach(function(item) {
+            item.move()
+            item.draw()
+          })
+          requestAnimationFrame(function() {
+            animate(ballList)
+          })
+        }
+        animate(ballList)
+      }
+    }
+  }
+</script>
+
+<script>
+  // #ifndef APP-PLUS || H5
+
+  let ctx = null,
+    interval = null;
+
+  function Ball(x, y, vx, vy, canvasWidth, canvasHeight, ctx) {
+    this.canvasWidth = canvasWidth
+    this.canvasHeight = canvasHeight
+    this.ctx = ctx
+    this.x = x
+    this.y = y
+    this.vx = vx
+    this.vy = vy
+    this.radius = 5
+  }
+
+  Ball.prototype.draw = function () {
+    this.ctx.setFillStyle('#007AFF')
+    this.ctx.beginPath()
+    this.ctx.arc(this.x, this.y, this.radius, 0, 2 * Math.PI)
+    this.ctx.closePath()
+    this.ctx.fill()
+  }
+
+  Ball.prototype.move = function () {
+    this.x += this.vx
+    this.y += this.vy
+    // 回到中心
+    if (getDistance(this.x - this.canvasWidth / 2, this.y - this.canvasHeight / 2) >
+      getDistance(this.canvasWidth / 2, this.canvasHeight / 2) + this.radius) {
+      this.x = this.canvasWidth / 2
+      this.y = this.canvasHeight / 2
+    }
+
+    // 边框反弹
+    if (this.x < this.radius) {
+      this.vx = Math.abs(this.vx)
+      return
+    }
+    if (this.x > this.canvasWidth - this.radius) {
+      this.vx = -Math.abs(this.vx)
+    }
+    if (this.y < this.radius) {
+      this.vy = Math.abs(this.vy)
+      return
+    }
+    if (this.y > this.canvasWidth - this.radius) {
+      this.vy = -Math.abs(this.vy)
+    }
+  }
+
+  function getDistance(x, y) {
+    return 1
+  }
+
+  // #endif
+
+  export default {
+    data() {
+      return {
+        title: 'canvas',
+        canvasWidth: 0,
+        startStatus: false,
+        ballList: []
+      }
+    },
+    onReady: function () {
+      this.$nextTick(() => {
+        uni.createSelectorQuery().select(".canvas").boundingClientRect(data => {
+          this.canvasWidth = data.width
+          // #ifdef APP-PLUS || H5
+          this.startStatus = true
+          // #endif
+          // #ifndef APP-PLUS || H5
+          ctx = uni.createCanvasContext('canvas')
+          this.drawBall()
+          // #endif
+        }).exec()
+      })
+    },
+    // #ifndef APP-PLUS || H5
+    onUnload: function () {
+      clearInterval(interval);
+    },
+    methods: {
+      drawBall: function () {
+        let canvasWidth = this.canvasWidth,
+          canvasHeight = this.canvasWidth,
+          speed = 3,
+          ballList = [],
+          layer = 3,
+          ballInlayer = 20
+        for (let i = 0; i < layer; i++) {
+          let radius = getDistance(canvasWidth / 2, canvasHeight / 2) / layer * i
+          for (let j = 0; j < ballInlayer; j++) {
+            let deg = j * 2 * Math.PI / ballInlayer,
+              sin = Math.sin(deg),
+              cos = Math.cos(deg),
+              x = radius * cos + canvasWidth / 2,
+              y = radius * sin + canvasHeight / 2,
+              vx = speed * cos,
+              vy = speed * sin
+            ballList.push(new Ball(x, y, vx, vy, canvasWidth, canvasHeight, ctx))
+          }
+        }
+
+        function animate(ballList) {
+          ctx.clearRect(0, 0, canvasWidth, canvasHeight)
+          ballList.forEach(function (item) {
+            item.move()
+            item.draw()
+          })
+          ctx.draw()
+        }
+
+        interval = setInterval(function () {
+          animate(ballList)
+        }, 17)
+      }
+    }
+    // #endif
+  }
+</script>
+
+<style>
+  .canvas {
+    width: 610rpx;
+    height: 610rpx;
+    background-color: #fff;
+    margin-left: auto;
+    margin-right: auto;
+  }
+</style>

pages/component/checkbox/checkbox.test.js

-function getData(key = '') {
-  return new Promise(async (resolve, reject) => {
-    const data = await page.data()
-    resolve(key ? data[key] : data)
-  })
-}
-
-let page
-beforeAll(async () => {
-  page = await program.reLaunch('/pages/component/checkbox/checkbox')
-  await page.waitFor(2000);
-})
-
-describe('Checkbox.uvue', () => {
-  it('change', async () => {
-    expect(await getData('value')).toEqual([])
-    const cb1 = await page.$('.cb1')
-    await cb1.tap()
-    expect(await getData('value')).toEqual(['cb', 'cb1'])
-    const cb = await page.$('.cb')
-    await cb.tap()
-    expect(await getData('value')).toEqual(['cb1'])
-    const cb2 = await page.$('.cb2')
-    await cb2.tap()
-    expect(await getData('value')).toEqual(['cb1'])
-    await cb1.tap()
-    expect(await getData('value')).toEqual([])
-  })
-  it('length', async () => {
-    const checkboxGroupElements = await page.$$('.checkbox-group')
-    expect(checkboxGroupElements.length).toBe(3)
-    const checkboxElements = await page.$$('.checkbox')
-    expect(checkboxElements.length).toBe(12)
-  })
-  it('text', async () => {
-    const cb = await page.$('.cb1')
-    expect(await cb.text()).toEqual('未选中')
-    await page.setData({
-      text: 'not selected',
-    })
-    expect(await cb.text()).toEqual('not selected')
-  })
-  it('checked', async () => {
-    const cb = await page.$('.cb')
-    expect(await cb.property('checked')).toBe(true)
-    await page.setData({
-      checked: false,
-    })
-    expect(await cb.property('checked')).toBe(false)
-  })
-  it('color', async () => {
-    const cb = await page.$('.cb')
-    expect(await cb.property('color')).toBe('#007aff')
-    await page.setData({
-      color: '#63acfc',
-    })
-    expect(await cb.property('color')).toBe('#63acfc')
-  })
-  it('disabled', async () => {
-    const cb = await page.$('.cb2')
-    expect(await cb.property('disabled')).toBe(true)
-    await page.setData({
-      disabled: false,
-    })
-    expect(await cb.property('disabled')).toBe(false)
-  })
-})
+function getData(key = '') {
+  return new Promise(async (resolve, reject) => {
+    const data = await page.data()
+    resolve(key ? data[key] : data)
+  })
+}
+
+let page
+beforeAll(async () => {
+  page = await program.reLaunch('/pages/component/checkbox/checkbox')
+  await page.waitFor(2000);
+})
+
+describe('Checkbox.uvue', () => {
+  it('change', async () => {
+    expect(await getData('value')).toEqual([])
+    const cb1 = await page.$('.cb1')
+    await cb1.tap()
+    expect(await getData('value')).toEqual(['cb', 'cb1'])
+    const cb = await page.$('.cb')
+    await cb.tap()
+    expect(await getData('value')).toEqual(['cb1'])
+    const cb2 = await page.$('.cb2')
+    await cb2.tap()
+    expect(await getData('value')).toEqual(['cb1'])
+    await cb1.tap()
+    expect(await getData('value')).toEqual([])
+  })
+  it('length', async () => {
+    const checkboxGroupElements = await page.$$('.checkbox-group')
+    expect(checkboxGroupElements.length).toBe(3)
+    const checkboxElements = await page.$$('.checkbox')
+    expect(checkboxElements.length).toBe(12)
+  })
+  it('text', async () => {
+    const cb = await page.$('.cb1')
+    expect(await cb.text()).toEqual('未选中')
+    await page.setData({
+      text: 'not selected',
+    })
+    expect(await cb.text()).toEqual('not selected')
+  })
+  it('checked', async () => {
+    const cb = await page.$('.cb')
+    expect(await cb.property('checked')).toBe(true)
+    await page.setData({
+      checked: false,
+    })
+    expect(await cb.property('checked')).toBe(false)
+  })
+  it('color', async () => {
+    const cb = await page.$('.cb')
+    expect(await cb.attribute('color')).toBe('#007aff')
+    await page.setData({
+      color: '#63acfc',
+    })
+    expect(await cb.attribute('color')).toBe('#63acfc')
+  })
+  it('disabled', async () => {
+    const cb = await page.$('.cb2')
+    expect(await cb.attribute('disabled')).toBe(true + '')
+    await page.setData({
+      disabled: false,
+    })
+    expect(await cb.attribute('disabled')).toBe(false + '')
+  })
+})

pages/component/form/form.uvue

 <template>
-  <!-- #ifdef APP -->
   <scroll-view class="page">
-  <!-- #endif -->
     <form @submit="onFormSubmit" @reset="onFormReset">
       <view class="uni-form-item">
         <view class="title">姓名</view>
@@ -11,10 +9,10 @@
         <view class="title">性别</view>
         <radio-group name="gender" class="flex-row">
           <view class="group-item">
-            <radio :value="0" :checked="gender=='0'" /><text>男</text>
+            <radio value="0" :checked="gender=='0'" /><text>男</text>
           </view>
           <view class="group-item">
-            <radio :value="1" :checked="gender=='1'" /><text>女</text>
+            <radio value="1" :checked="gender=='1'" /><text>女</text>
           </view>
         </radio-group>
       </view>
@@ -46,9 +44,7 @@
     </form>
     <view class="result">提交的表单数据</view>
     <textarea class="textarea" :value="formDataText"></textarea>
-  <!-- #ifdef APP -->
   </scroll-view>
-  <!-- #endif -->
 </template>
 
 <script>

pages/component/general-event/touch-event.uvue

@@ -44,6 +44,7 @@
         }
       },
 			onTouchMove(e: TouchEvent) {
+        e.preventDefault()
         this.touchEvent = e
         let p = e.touches[0]
         if(p.screenX == this.lastX && p.screenY == this.lastY){

pages/component/general-event/transition-event.test.js

 // uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
 
 describe('transition event', () => {
-
+    if (process.env.uniTestPlatformInfo.indexOf('web') > -1) {
+      it('dummyTest', () => {
+        expect(1).toBe(1)
+      })
+      return
+    }
     let page;
     beforeAll(async () => {
         page = await program.reLaunch('/pages/component/general-event/transition-event')

pages/component/general-event/transition-event.uvue

@@ -37,7 +37,7 @@
           this.times = 0
           this.buttonValue = "开启图片旋转"
           this.element!.style.setProperty('transform', 'rotate(' + this.times * 360 + 'deg)')
-          this.element!.style.setProperty('transition-duration', '0s')
+          this.element!.style.setProperty('transition-duration', '0ms')
         }
       },
       onEnd() {

pages/component/input/input.test.js

@@ -17,24 +17,24 @@ describe('component-native-input', () => {
   // 测试焦点及键盘弹起
   it('focus', async () => {
     const input = await page.$('#uni-input-focus');
-    expect(await input.property('focus')).toBe("true")
+    expect(await input.attribute('focus')).toBe(true)
     // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
     await page.setData({
       focus: false,
     })
-    expect(await input.property('focus')).toBe("false")
+    expect(await input.attribute('focus')).toBe(false)
     // await page.waitFor(1000)
     // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(false)
     // await page.setData({
     //   focus: true,
     // })
-    // expect(await input.property('focus')).toBe(true)
+    // expect(await input.attribute('focus')).toBe(true)
     // await page.waitFor(1000)
     // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
     // await page.setData({
     //   focus: false,
     // })
-    // expect(await input.property('focus')).toBe(false)
+    // expect(await input.attribute('focus')).toBe(false)
     // await page.waitFor(1000)
     // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(false)
     // await page.waitFor(1000)
@@ -52,21 +52,21 @@ describe('component-native-input', () => {
     const number = await page.$('#uni-input-type-number');
     const digit = await page.$('#uni-input-type-digit');
     const tel = await page.$('#uni-input-type-tel');
-    expect(await text.property('type')).toEqual("text")
-    expect(await number.property('type')).toEqual("number")
-    expect(await digit.property('type')).toEqual("digit")
-    expect(await tel.property('type')).toEqual("tel")
+    expect(await text.attribute('type')).toEqual("text")
+    expect(await number.attribute('type')).toEqual("number")
+    expect(await digit.attribute('type')).toEqual("digit")
+    expect(await tel.attribute('type')).toEqual("tel")
   })
 
   //  测试密码属性
   // it("password", async () => {
   //   const input = await page.$('.uni-input-password');
-  //   expect(await input.property('password')).toBe(true)
+  //   expect(await input.attribute('password')).toBe(true)
   //   await page.setData({
   //     inputPassword: false,
   //     inputPasswordValue: "inputPasswordValue"
   //   })
-  //   expect(await input.property('password')).toBe(false)
+  //   expect(await input.attribute('password')).toBe(false)
   //   await page.waitFor(500)
   //   await page.setData({
   //     inputPassword: true
@@ -75,21 +75,21 @@ describe('component-native-input', () => {
   // 测试placeholder
   // it("placeholder", async () => {
   //   const placeholder1 = await page.$('.uni-input-placeholder1');
-  //   expect(await placeholder1.property("placeholder-style")).toMatchObject({
+  //   expect(await placeholder1.attribute("placeholder-style")).toMatchObject({
   //     "color": "red"
   //   })
-  //   expect(await placeholder1.property("placeholder")).toEqual("占位符文字颜色为红色")
+  //   expect(await placeholder1.attribute("placeholder")).toEqual("占位符文字颜色为红色")
   //   await page.setData({
   //     inputPlaceHolderStyle: "color:#CC00CC",
   //   })
-  //   expect(await placeholder1.property("placeholder-style")).toMatchObject({
+  //   expect(await placeholder1.attribute("placeholder-style")).toMatchObject({
   //     "color": "#CC00CC"
   //   })
 
   //   await page.setData({
   //     inputPlaceHolderStyle: "color:#CC19CC;background-color:#00b1c0",
   //   })
-  //   expect(await placeholder1.property("placeholder-style")).toMatchObject({
+  //   expect(await placeholder1.attribute("placeholder-style")).toMatchObject({
   //     "color": "#CC19CC",
   //     "backgroundColor": "#00b1c0"
   //   })
@@ -97,7 +97,7 @@ describe('component-native-input', () => {
   //   await page.setData({
   //     inputPlaceHolderStyle: "color:#CC19CC;background-color:#00b1c0;text-align:center;font-size:44px;font-weight:900",
   //   })
-  //   expect(await placeholder1.property("placeholder-style")).toEqual({
+  //   expect(await placeholder1.attribute("placeholder-style")).toEqual({
   //     "backgroundColor": "#00b1c0",
   //     "color": "#CC19CC",
   //     "fontSize": "44px",
@@ -106,29 +106,29 @@ describe('component-native-input', () => {
   //   })
 
   //   const placeholder2 = await page.$('.uni-input-placeholder2');
-  //   expect(await placeholder2.property("placeholder-class")).toMatchObject({
+  //   expect(await placeholder2.attribute("placeholder-class")).toMatchObject({
   //     "backgroundColor": "#008000"
   //   })
   //   await page.setData({
   //     inputPlaceHolderClass: "uni-input-placeholder-class-ts",
   //   })
-  //   expect(await placeholder2.property("placeholder-class")).toMatchObject({
+  //   expect(await placeholder2.attribute("placeholder-class")).toMatchObject({
   //     "backgroundColor": "#FFA500"
   //   })
-  //   expect(await placeholder2.property("placeholder")).toEqual("占位符背景色为绿色")
+  //   expect(await placeholder2.attribute("placeholder")).toEqual("占位符背景色为绿色")
   // })
 
   it("disable", async () => {
     const input = await page.$('#uni-input-disable');
-    expect(await input.property("disabled")).toBe("true")
+    expect(await input.attribute("disabled")).toBe("true")
   })
 
   it("confirm-type", async () => {
-    expect(await (await page.$('#uni-input-confirm-send')).property("confirmType")).toEqual("send")
-    expect(await (await page.$('#uni-input-confirm-search')).property("confirmType")).toEqual("search")
-    expect(await (await page.$('#uni-input-confirm-next')).property("confirmType")).toEqual("next")
-    expect(await (await page.$('#uni-input-confirm-go')).property("confirmType")).toEqual("go")
-    expect(await (await page.$('#uni-input-confirm-done')).property("confirmType")).toEqual("done")
+    expect(await (await page.$('#uni-input-confirm-send')).attribute("confirmType")).toEqual("send")
+    expect(await (await page.$('#uni-input-confirm-search')).attribute("confirmType")).toEqual("search")
+    expect(await (await page.$('#uni-input-confirm-next')).attribute("confirmType")).toEqual("next")
+    expect(await (await page.$('#uni-input-confirm-go')).attribute("confirmType")).toEqual("go")
+    expect(await (await page.$('#uni-input-confirm-done')).attribute("confirmType")).toEqual("done")
   })
 
   // it("maxlength", async () => {
@@ -144,7 +144,7 @@ describe('component-native-input', () => {
       cursor_color: "transparent",
     })
     await page.waitFor(500)
-    expect(await (await page.$('#uni-input-cursor-color')).property("cursor-color")).toBe("transparent")
+    expect(await (await page.$('#uni-input-cursor-color')).attribute("cursor-color")).toBe("transparent")
   })
 
   it("afterAllTestScreenshot", async () => {

pages/component/input/input.uvue

@@ -8,7 +8,7 @@
         <view class="uni-title">
           <text class="uni-title-text">设置输入框的初始内容</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-default" class="uni-input" value="hello uni-app x" />
         </view>
       </view>
@@ -17,16 +17,16 @@
         <view class="uni-title">
           <text class="uni-title-text">type取值（不同输入法表现可能不一致）</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-type-text" class="uni-input" type="text" placeholder="文本输入键盘" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-type-number" class="uni-input" type="number" placeholder="数字输入键盘" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-type-digit" class="uni-input" type="digit" placeholder="带小数点的数字输入键盘" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-type-tel" class="uni-input" :type="inputTypeTel" placeholder="电话输入键盘" />
         </view>
       </view>
@@ -35,7 +35,7 @@
         <view class="uni-title">
           <text class="uni-title-text">密码输入框</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-password" class="uni-input" :password="inputPassword" :value="inputPasswordValue" />
         </view>
       </view>
@@ -44,10 +44,10 @@
         <view class="uni-title">
           <text class="uni-title-text">占位符样式</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-placeholder1" class="uni-input" :placeholder-style="inputPlaceHolderStyle" placeholder="占位符文字颜色为红色" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-placeholder2" class="uni-input" :placeholder-class="inputPlaceHolderClass" placeholder="占位符背景色为绿色" />
         </view>
       </view>
@@ -56,7 +56,7 @@
         <view class="uni-title">
           <text class="uni-title-text">设置禁用输入框</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-disable" class="uni-input" :disabled="true" />
         </view>
       </view>
@@ -65,7 +65,7 @@
         <view class="uni-title">
           <text class="uni-title-text">设置最大输入长度</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-maxlength" class="uni-input" :maxlength="10" placeholder="最大输入长度为10" :value="inputMaxLengthValue" @input="onMaxLengthInput" :focus="inputMaxLengthFocus" />
         </view>
       </view>
@@ -74,16 +74,16 @@
         <view class="uni-title">
           <text class="uni-title-text">设置光标与键盘的距离</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" :cursor-spacing="1000" placeholder="光标与键盘的距离为1000px" />
         </view>
-      </view>
-
+      </view>
+
       <view>
         <view class="uni-title">
           <text class="uni-title-text">自动获取焦点</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-focus" class="uni-input" :focus="focus" @keyboardheightchange="inputFocusKeyBoardChange"/>
         </view>
       </view>
@@ -92,19 +92,19 @@
         <view class="uni-title">
           <text class="uni-title-text">confirm-type取值（不同输入法表现可能不一致）</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-confirm-send" class="uni-input" confirmType="send" placeholder="键盘右下角按钮显示为发送" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-confirm-search" class="uni-input" confirmType="search" placeholder="键盘右下角按钮显示为搜索" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-confirm-next" class="uni-input" confirmType="next" placeholder="键盘右下角按钮显示为下一个" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-confirm-go" class="uni-input" confirmType="go" placeholder="键盘右下角按钮显示为前往" />
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input id="uni-input-confirm-done" class="uni-input" confirmType="done" placeholder="键盘右下角按钮显示为完成" />
         </view>
       </view>
@@ -113,7 +113,7 @@
         <view class="uni-title">
           <text class="uni-title-text">点击键盘右下角按钮时保持键盘不收起</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" :confirm-hold="true" />
         </view>
       </view>
@@ -122,7 +122,7 @@
         <view class="uni-title" @click="setCursor(4)">
           <text class="uni-title-text">设置输入框聚焦时光标的位置（点击生效）</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input ref="input" class="uni-input" value="0123456789" :cursor="cursor" />
         </view>
       </view>
@@ -131,25 +131,25 @@
         <view class="uni-title" @click="setSelection(0, 4)">
           <text class="uni-title-text">设置输入框聚焦时光标的起始位置和结束位置（点击生效）</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input ref="input2" class="uni-input" value="0123456789" :selection-start="selectionStart" :selection-end="selectionEnd" />
         </view>
-      </view>
-
-      <view>
-        <view class="uni-title" @click="changeCursorColor">
-          <text class="uni-title-text">设置光标颜色为透明（点击本行文字生效，再点复位）</text>
-        </view>
-        <view class="uni-input-wrapper">
-          <input id="uni-input-cursor-color" class="uni-input" :cursor-color="cursor_color" value="光标颜色" />
-        </view>
+      </view>
+
+      <view>
+        <view class="uni-title" @click="changeCursorColor">
+          <text class="uni-title-text">设置光标颜色为透明（点击本行文字生效，再点复位）</text>
+        </view>
+        <view class="input-wrapper">
+          <input id="uni-input-cursor-color" class="uni-input" :cursor-color="cursor_color" value="光标颜色" />
+        </view>
       </view>
 
       <view>
         <view class="uni-title">
           <text class="uni-title-text">键盘弹起时，自动上推页面</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" :adjust-position="true" />
         </view>
       </view>
@@ -159,7 +159,7 @@
           <text class="uni-title-text">input事件</text>
           <text class="uni-subtitle-text" v-if="inputEventDetail">{{inputEventDetail}}</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" @input="onInput" />
         </view>
       </view>
@@ -169,7 +169,7 @@
           <text class="uni-title-text">focus事件和blur事件</text>
           <text class="uni-subtitle-text" v-if="focusAndBlurEventDetail">{{focusAndBlurEventDetail}}</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" @focus="onFocus" @blur="onBlur" />
         </view>
       </view>
@@ -179,7 +179,7 @@
           <text class="uni-title-text">confirm事件</text>
           <text class="uni-subtitle-text" v-if="confirmEventDetail">{{confirmEventDetail}}</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" @confirm="onConfirm" />
         </view>
       </view>
@@ -189,7 +189,7 @@
           <text class="uni-title-text">keyboardheightchange事件</text>
           <text class="uni-subtitle-text" v-if="keyboardHeightChangeEventDetail">{{keyboardHeightChangeEventDetail}}</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" @keyboardheightchange="onKeyborardHeightChange" />
         </view>
       </view>
@@ -198,7 +198,7 @@
         <view class="uni-title">
           <text class="uni-title-text">带清除按钮的输入框</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" placeholder="带清除按钮的输入框" :value="inputClearValue" @input="clearInput" />
           <image class="uni-icon" src="/static/icons/clear.png" v-if="showClearIcon" @click="clearIcon">
           </image>
@@ -209,7 +209,7 @@
         <view class="uni-title">
           <text class="uni-title-text">可查看密码的输入框</text>
         </view>
-        <view class="uni-input-wrapper">
+        <view class="input-wrapper">
           <input class="uni-input" placeholder="请输入密码" :password="showPassword" />
           <image class="uni-icon" :src="!showPassword ? '/static/icons/eye-active.png' : '/static/icons/eye.png'" @click="changePassword"></image>
         </view>
@@ -227,7 +227,7 @@
         showClearIcon: false,
         inputClearValue: '',
         showPassword: true,
-        cursor: -1,
+        cursor: -1,
         cursor_color: "#3393E2",
         selectionStart: -1,
         selectionEnd: -1,
@@ -239,20 +239,20 @@
         inputPassword: true,
         inputTypeTel: "tel",
         inputPlaceHolderStyle: "color:red",
-        inputPlaceHolderClass: "uni-input-placeholder-class",
-        inputMaxLengthValue:"",
-        onMaxLengthInputValue:"",
-        inputMaxLengthFocus:false,
-        inputPasswordValue:"",
+        inputPlaceHolderClass: "uni-input-placeholder-class",
+        inputMaxLengthValue:"",
+        onMaxLengthInputValue:"",
+        inputMaxLengthFocus:false,
+        inputPasswordValue:"",
         inputFocusKeyBoardChangeValue:true
       }
     },
-    methods: {
-      inputFocusKeyBoardChange(e:InputKeyboardHeightChangeEvent) {
-        this.inputFocusKeyBoardChangeValue = e.detail.height > 50
-      },
-      onMaxLengthInput(event:InputEvent) {
-        this.onMaxLengthInputValue = event.detail.value
+    methods: {
+      inputFocusKeyBoardChange(e:InputKeyboardHeightChangeEvent) {
+        this.inputFocusKeyBoardChangeValue = e.detail.height > 50
+      },
+      onMaxLengthInput(event:InputEvent) {
+        this.onMaxLengthInputValue = event.detail.value
       },
       setCursor: function (cursor : number) {
         (this.$refs['input'] as Element).focus();
@@ -297,23 +297,23 @@
       onKeyborardHeightChange: function (event : InputKeyboardHeightChangeEvent) {
         console.log("键盘高度发生变化", JSON.stringify(event.detail));
         this.keyboardHeightChangeEventDetail = JSON.stringify(event.detail);
-      },
-      test_check_input_value():number {
-        return this.onMaxLengthInputValue.length
-      },
-      changeCursorColor(){
-        if(this.cursor_color == "#3393E2"){
-          this.cursor_color = "transparent"
-        }else{
-          this.cursor_color = "#3393E2"
-        }
+      },
+      test_check_input_value():number {
+        return this.onMaxLengthInputValue.length
+      },
+      changeCursorColor(){
+        if(this.cursor_color == "#3393E2"){
+          this.cursor_color = "transparent"
+        }else{
+          this.cursor_color = "#3393E2"
+        }
       }
     }
   }
 </script>
 
 <style scoped>
-  .uni-input-wrapper {
+  .input-wrapper {
     display: flex;
     padding: 8px 13px;
     margin: 10rpx 0;
@@ -337,8 +337,8 @@
 
   .uni-input-placeholder-class {
     background-color: green;
-  }
-  .uni-input-placeholder-class-ts {
-    background-color: orange;
   }
-</style>
+  .uni-input-placeholder-class-ts {
+    background-color: orange;
+  }
+</style>

pages/component/mixin-datacom/mixin-datacom.test.js

 const PAGE_PATH = '/pages/component/mixin-datacom/mixin-datacom'
 
 describe('mixin-datacom', () => {
+  if (process.env.uniTestPlatformInfo.startsWith('web')) {
+    it('dummyTest', async () => {
+      expect(1).toBe(1)
+    })
+    return
+  }
   let page
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)

pages/component/picker-view/picker-view.test.js

@@ -39,22 +39,22 @@ describe('PickerView.uvue', () => {
     const el = await page.$('.picker-view')
     await page.setData({
       indicatorStyle: 'height: 100px;',
-    })
+    })
     await page.waitFor(500)
-    expect(await el.property('indicatorStyle')).toBe('height: 100px;')
+    expect(await el.attribute('indicatorStyle')).toBe('height: 100px;')
   })
   it('mask-top-style', async () => {
     const el = await page.$('.picker-view')
     await page.setData({
       maskTopStyle: 'background: #ffffff;',
     })
-    expect(await el.property('mask-top-style')).toBe('background: #ffffff;')
+    expect(await el.attribute('mask-top-style')).toBe('background: #ffffff;')
   })
   it('mask-bottom-style', async () => {
     const el = await page.$('.picker-view')
     await page.setData({
       maskBottomStyle: 'background: #ffffff;',
     })
-    expect(await el.property('mask-bottom-style')).toBe('background: #ffffff;')
+    expect(await el.attribute('mask-bottom-style')).toBe('background: #ffffff;')
   })
 })

pages/component/progress/progress.test.js

@@ -16,22 +16,22 @@ describe('Progress.uvue', () => {
     await page.callMethod('setProgress')
     await page.waitFor(1000);
     const p = await page.$('.p')
-    expect(await p.property('percent')).toEqual(20)
+    expect(await p.attribute('percent')).toEqual(20 + '')
     const p1 = await page.$('.p1')
-    expect(await p1.property('percent')).toEqual(40)
+    expect(await p1.attribute('percent')).toEqual(40 + '')
     const p2 = await page.$('.p2')
-    expect(await p2.property('percent')).toEqual(60)
+    expect(await p2.attribute('percent')).toEqual(60 + '')
     const p3 = await page.$('.p3')
-    expect(await p3.property('percent')).toEqual(80)
+    expect(await p3.attribute('percent')).toEqual(80 + '')
     if (process.env.UNI_PLATFORM === 'app-android') {
       expect(await getData('curPercent')).toEqual(20)
     }
     await page.callMethod('clearProgress')
     await page.waitFor(1000)
-    expect(await p.property('percent')).toEqual(0)
-    expect(await p1.property('percent')).toEqual(0)
-    expect(await p2.property('percent')).toEqual(0)
-    expect(await p3.property('percent')).toEqual(0)
+    expect(await p.attribute('percent')).toEqual(0 + '')
+    expect(await p1.attribute('percent')).toEqual(0 + '')
+    expect(await p2.attribute('percent')).toEqual(0 + '')
+    expect(await p3.attribute('percent')).toEqual(0 + '')
     if (process.env.UNI_PLATFORM === 'app-android') {
       expect(await getData('curPercent')).toEqual(0)
     }
@@ -42,42 +42,42 @@ describe('Progress.uvue', () => {
   })
   it('show-info', async () => {
     const el = await page.$('.p')
-    expect(await el.property('show-info')).toEqual(true)
+    expect(await el.attribute('show-info')).toEqual(true + '')
     await page.setData({
       showInfo: false
     })
-    expect(await el.property('show-info')).toEqual(false)
+    expect(await el.attribute('show-info')).toEqual(false + '')
   })
   it('border-radius', async () => {
     const el = await page.$('.p')
-    expect(await el.property('border-radius')).toEqual(0)
+    expect(await el.attribute('border-radius')).toEqual(0 + '')
     await page.setData({
       borderRadius: 5
     })
-    expect(await el.property('border-radius')).toEqual(5)
+    expect(await el.attribute('border-radius')).toEqual(5 + '')
   })
   it('font-size', async () => {
     const el = await page.$('.p')
-    expect(await el.property('font-size')).toEqual(16)
+    expect(await el.attribute('font-size')).toEqual(16 + '')
     await page.setData({
       fontSize: 18
     })
-    expect(await el.property('font-size')).toEqual(18)
+    expect(await el.attribute('font-size')).toEqual(18 + '')
   })
   it('stroke-width', async () => {
     const el = await page.$('.p')
-    expect(await el.property('stroke-width')).toEqual(3)
+    expect(await el.attribute('stroke-width')).toEqual(3 + '')
     await page.setData({
       strokeWidth: 6
     })
-    expect(await el.property('stroke-width')).toEqual(6)
+    expect(await el.attribute('stroke-width')).toEqual(6 + '')
   })
   it('backgroundColor', async () => {
     const el = await page.$('.p')
-    expect(await el.property('background-color')).toEqual('#EBEBEB')
+    expect(await el.attribute('background-color')).toEqual('#EBEBEB')
     await page.setData({
       backgroundColor: "#007aff"
     })
-    expect(await el.property('background-color')).toEqual('#007aff')
+    expect(await el.attribute('background-color')).toEqual('#007aff')
   })
-})
+})
\ No newline at end of file

pages/component/radio/radio.test.js

-function getData(key = '') {
-  return new Promise(async (resolve, reject) => {
-    const data = await page.data()
-    resolve(key ? data[key] : data)
-  })
-}
-
-let page
-beforeAll(async () => {
-  page = await program.reLaunch('/pages/component/radio/radio')
-  await page.waitFor(2000);
-})
-
-describe('Radio.uvue', () => {
-  it('change', async () => {
-    expect(await getData('value')).toEqual('')
-    const radio1 = await page.$('.r1')
-    await radio1.tap()
-    expect(await getData('value')).toEqual('r1')
-    const radio = await page.$('.r')
-    await radio.tap()
-    expect(await getData('value')).toEqual('r')
-    const radio2 = await page.$('.r2')
-    await radio2.tap()
-    expect(await getData('value')).toEqual('r')
-  })
-  it('length', async () => {
-    const radioGroupElements = await page.$$('.radio-group')
-    expect(radioGroupElements.length).toBe(3)
-    const radioElements = await page.$$('.radio')
-    expect(radioElements.length).toBe(12)
-  })
-  it('text', async () => {
-    const radio = await page.$('.r1')
-    expect(await radio.text()).toEqual('未选中')
-    await page.setData({
-      text: 'not selected',
-    })
-    expect(await radio.text()).toEqual('not selected')
-  })
-  it('checked', async () => {
-    const radio = await page.$('.r')
-    expect(await radio.property('checked')).toBe(true)
-    await page.setData({
-      checked: false,
-    })
-    expect(await radio.property('checked')).toBe(false)
-  })
-  it('color', async () => {
-    const radio = await page.$('.r')
-    expect(await radio.property('color')).toBe('#007aff')
-    await page.setData({
-      color: '#63acfc',
-    })
-    expect(await radio.property('color')).toBe('#63acfc')
-  })
-  it('disabled', async () => {
-    const radio = await page.$('.r2')
-    expect(await radio.property('disabled')).toBe(true)
-    await page.setData({
-      disabled: false,
-    })
-    expect(await radio.property('disabled')).toBe(false)
-  })
-})
+function getData(key = '') {
+  return new Promise(async (resolve, reject) => {
+    const data = await page.data()
+    resolve(key ? data[key] : data)
+  })
+}
+
+let page
+beforeAll(async () => {
+  page = await program.reLaunch('/pages/component/radio/radio')
+  await page.waitFor(2000);
+})
+
+describe('Radio.uvue', () => {
+  it('change', async () => {
+    expect(await getData('value')).toEqual('')
+    const radio1 = await page.$('.r1')
+    await radio1.tap()
+    expect(await getData('value')).toEqual('r1')
+    const radio = await page.$('.r')
+    await radio.tap()
+    expect(await getData('value')).toEqual('r')
+    const radio2 = await page.$('.r2')
+    await radio2.tap()
+    expect(await getData('value')).toEqual('r')
+  })
+  it('length', async () => {
+    const radioGroupElements = await page.$$('.radio-group')
+    expect(radioGroupElements.length).toBe(3)
+    const radioElements = await page.$$('.radio')
+    expect(radioElements.length).toBe(12)
+  })
+  it('text', async () => {
+    const radio = await page.$('.r1')
+    expect(await radio.text()).toEqual('未选中')
+    await page.setData({
+      text: 'not selected',
+    })
+    expect(await radio.text()).toEqual('not selected')
+  })
+  it('checked', async () => {
+    const radio = await page.$('.r')
+    expect(await radio.property('checked')).toBe(true)
+    await page.setData({
+      checked: false,
+    })
+    expect(await radio.property('checked')).toBe(false)
+  })
+  it('color', async () => {
+    const radio = await page.$('.r')
+    expect(await radio.attribute('color')).toBe('#007aff')
+    await page.setData({
+      color: '#63acfc',
+    })
+    expect(await radio.attribute('color')).toBe('#63acfc')
+  })
+  it('disabled', async () => {
+    const radio = await page.$('.r2')
+    expect(await radio.attribute('disabled')).toBe(true + '')
+    await page.setData({
+      disabled: false,
+    })
+    expect(await radio.attribute('disabled')).toBe(false + '')
+  })
+})

pages/component/scroll-view/scroll-view-props.test.js

@@ -25,7 +25,7 @@ describe('component-native-scroll-view', () => {
         })
         await page.waitFor(600)
         const element = await page.$('#scrollViewY')
-        const scrollTop = await element.attribute("scrollTop")
+        const scrollTop = await element.property("scrollTop")
         console.log("check_scroll_top---"+scrollTop)
         expect(scrollTop-600).toBeGreaterThanOrEqual(0)
     })
@@ -37,7 +37,7 @@ describe('component-native-scroll-view', () => {
         })
         await page.waitFor(600)
         const element = await page.$('#scrollViewY')
-        const scrollTop = await element.attribute("scrollTop")
+        const scrollTop = await element.property("scrollTop")
         console.log("check_scroll_into_view_top--"+scrollTop)
         await page.setData({
             scrollIntoView: ""
@@ -54,7 +54,7 @@ describe('component-native-scroll-view', () => {
       const value = await page.callMethod('checkScrollWidth')
       expect(value).toBe(true)
     })
-    
+
     //检测横向scrollLeft属性赋值
     it('check_scroll_left', async () => {
       await page.setData({
@@ -62,11 +62,11 @@ describe('component-native-scroll-view', () => {
       })
       await page.waitFor(600)
       const element = await page.$('#scrollViewX')
-      const scrollLeft = await element.attribute("scrollLeft")
+      const scrollLeft = await element.property("scrollLeft")
       console.log("check_scroll_left---"+scrollLeft)
       expect(scrollLeft-600).toBeGreaterThanOrEqual(0)
     })
-    
+
     //检测横向scroll_into_view属性赋值
     it('check_scroll_into_view_left', async () => {
       await page.setData({
@@ -74,7 +74,7 @@ describe('component-native-scroll-view', () => {
       })
       await page.waitFor(600)
       const element = await page.$('#scrollViewX')
-      const scrollLeft = await element.attribute("scrollLeft")
+      const scrollLeft = await element.property("scrollLeft")
       console.log("check_scroll_into_view_left--"+scrollLeft)
       await page.setData({
           scrollIntoView: ""

pages/component/scroll-view/scroll-view-props.uvue

@@ -5,7 +5,7 @@
 			<!-- 暂时分成两个方向不同的滚动视图，原因为：scroll-x或scroll-y属性一经设置不能动态改变。 -->
 			<scroll-view v-if="scrollX" :scroll-x="true" :scroll-y="false" :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
-				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation" style="flex-direction: row;"
+				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation" style="flex-direction: row;width: 100%;height: 100%;"
 				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
 				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend" ref="scrollViewX" id="scrollViewX">
 				<view class="item" :id="'horizontal_'+item.id" v-for="(item,_) in items">
@@ -15,9 +15,9 @@
 			<scroll-view v-else :scroll-y="scrollY"  :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation"
-				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
+				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
 				@touchmove="onTouchMove"
-				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend" ref="scrollViewY" id="scrollViewY">
+				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend" ref="scrollViewY" id="scrollViewY" style="width: 100%;height: 100%;">
 				<view class="item" :id="item.id" v-for="(item,_) in items">
 					<text class="uni-text">{{item.label}}</text>
 				</view>
@@ -40,10 +40,10 @@
 			<view class="uni-option">
 				<text>是否横向滚动</text>
 				<switch :checked="scrollX" @change="changeDirectionX"></switch>
-			</view>
-			<view class="uni-option">
-				<text>是否竖向滚动</text>
-				<switch :checked="scrollY" @change="changeDirectionY"></switch>
+			</view>
+			<view class="uni-option">
+				<text>是否竖向滚动</text>
+				<switch :checked="scrollY" @change="changeDirectionY"></switch>
 			</view>
 			<view class="uni-common-pb"></view>
 			<view class="uni-slider">
@@ -91,7 +91,7 @@
 		data() {
 			return {
 				items: [] as Item[],
-				scrollX: false,
+				scrollX: false,
 				scrollY: true,
 				rebound: false,
 				scrollTop: 0,
@@ -122,20 +122,20 @@
 				this.scrollTop = e.detail.value;
 			},
 			changeDirectionX() {
-				this.scrollX = !this.scrollX;
-				if(this.scrollX) {
-					this.scrollY = false
+				this.scrollX = !this.scrollX;
+				if(this.scrollX) {
+					this.scrollY = false
+				}
+				this.scrollTop = 0;
+				this.scrollLeft = 0;
+			},
+			changeDirectionY() {
+				this.scrollY = !this.scrollY;
+				if(this.scrollY) {
+					this.scrollX = false
 				}
 				this.scrollTop = 0;
 				this.scrollLeft = 0;
-			},
-			changeDirectionY() {
-				this.scrollY = !this.scrollY;
-				if(this.scrollY) {
-					this.scrollX = false
-				}
-				this.scrollTop = 0;
-				this.scrollLeft = 0;
 			},
 			handleScrollIntoView() {
 				if (this.scrollX) {
@@ -176,33 +176,33 @@
 			},
 			scrollend() {
 				console.log("滚动停止");
-			},
-			onTouchMove() {
-				console.log("TouchMove");
-			},
-      //自动化测试专用
-      checkScrollHeight(): Boolean {
-        var element = this.$refs["scrollViewY"]
-        if(element != null) {
-           var scrollHeight = (element as Element).scrollHeight
-           console.log("checkScrollHeight"+scrollHeight)
-           if(scrollHeight > 1900) {
-             return true
-           }
-        }
-        return false
-      },
-      //自动化测试专用
-      checkScrollWidth(): Boolean {
-        var element = this.$refs["scrollViewX"]
-        if(element != null) {
-           var scrollWidth = (element as Element).scrollWidth
-           console.log("checkScrollWidth---"+scrollWidth)
-           if(scrollWidth > 1900) {
-             return true
-           }
-        }
-        return false
+			},
+			onTouchMove() {
+				console.log("TouchMove");
+			},
+      //自动化测试专用
+      checkScrollHeight(): Boolean {
+        var element = this.$refs["scrollViewY"]
+        if(element != null) {
+           var scrollHeight = (element as Element).scrollHeight
+           console.log("checkScrollHeight"+scrollHeight)
+           if(scrollHeight > 1900) {
+             return true
+           }
+        }
+        return false
+      },
+      //自动化测试专用
+      checkScrollWidth(): Boolean {
+        var element = this.$refs["scrollViewX"]
+        if(element != null) {
+           var scrollWidth = (element as Element).scrollWidth
+           console.log("checkScrollWidth---"+scrollWidth)
+           if(scrollWidth > 1900) {
+             return true
+           }
+        }
+        return false
       }
 		}
 	}
@@ -221,7 +221,7 @@
 		height: 400rpx;
 		width: 100%;
 		background-color: azure;
-		border-width: 2rpx;
+		border-width: 2rpx;
     border-style: solid;
 		border-color: chocolate;
 	}
@@ -249,4 +249,4 @@
 		padding: 30rpx;
 		justify-content: center;
 	}
-</style>
+</style>

pages/component/scroll-view/scroll-view-refresher-props.uvue

@@ -2,11 +2,11 @@
 	<view style="flex:1;">
 		<page-head title="下拉刷新的scroll-view属性示例"></page-head>
 		<view class="uni-margin-wrap">
-			<scroll-view :refresher-enabled="refresherEnabled" :refresher-threshold="refresherThreshold"
+			<scroll-view scroll-y="true" :refresher-enabled="refresherEnabled" :refresher-threshold="refresherThreshold"
 				:refresher-default-style="refresherDefaultStyle" :refresher-background="refresherBackground"
 				:refresher-triggered="refresherTriggered" @refresherpulling="refresherpulling"
 				@refresherrefresh="refresherrefresh" @refresherrestore="refresherrestore"
-				@refresherabort="refresherabort">
+				@refresherabort="refresherabort" style="width: 100%;height: 100%;">
 				<view class="item" :id="item.id" v-for="(item,_) in items">
 					<text class="uni-text">{{item.label}}</text>
 				</view>

pages/component/slider-100/slider-100.uvue

 <template>
-  <!-- #ifdef APP -->
   <scroll-view class="page">
-  <!-- #endif -->
     <page-head :title="title"></page-head>
     <view class="flex-row">
       <view class="flex-fill">
@@ -21,9 +19,7 @@
           @change="sliderChange" :value="sliderValue" :block-size="20" :show-value="true" />
       </view>
     </view>
-  <!-- #ifdef APP -->
   </scroll-view>
-  <!-- #endif -->
 </template>
 
 <script>

pages/component/slider/slider.test.js

@@ -19,9 +19,9 @@ describe('slider', () => {
   })
   it('color', async () => {
     const slider = await page.$('.slider-custom-color-and-size')
-    expect(await slider.property('backgroundColor')).toBe('#000000')
-    expect(await slider.property('activeColor')).toBe('#FFCC33')
-    expect(await slider.property('blockColor')).toBe('#8A6DE9')
+    expect(await slider.attribute('backgroundColor')).toBe('#000000')
+    expect(await slider.attribute('activeColor')).toBe('#FFCC33')
+    expect(await slider.attribute('blockColor')).toBe('#8A6DE9')
 
     const backgroundColor = '#008000'
     const activeColor = '#00FF00'
@@ -33,19 +33,19 @@ describe('slider', () => {
       sliderBlockColor: blockColor,
     })
     await page.waitFor(100)
-    expect(await slider.property('backgroundColor')).toBe(backgroundColor)
-    expect(await slider.property('activeColor')).toBe(activeColor)
-    expect(await slider.property('blockColor')).toBe(blockColor)
+    expect(await slider.attribute('backgroundColor')).toBe(backgroundColor)
+    expect(await slider.attribute('activeColor')).toBe(activeColor)
+    expect(await slider.attribute('blockColor')).toBe(blockColor)
   })
   it('block-size', async () => {
     const slider = await page.$('.slider-custom-color-and-size')
-    expect(await slider.property('blockSize')).toBe(20)
+    expect(await slider.attribute('blockSize')).toBe(20 + '')
 
     const blockSize = 18
     await page.setData({
       sliderBlockSize: blockSize,
     })
     await page.waitFor(100)
-    expect(await slider.property('blockSize')).toBe(blockSize)
+    expect(await slider.attribute('blockSize')).toBe(blockSize + '')
   })
-})
+})
\ No newline at end of file

pages/component/sticky-section/sticky-section.uvue

-<template>
+<template>
   <page-head title="sticky-section"></page-head>
-  <list-view id="list-view" ref="list-view" show-scrollbar=false class="page" :scroll-into-view="scrollIntoView"
-  @scroll="onScroll" @scrollend="onScrollEnd" rebound="false">
-    <list-item style="padding: 10px; margin: 5px 0;align-items: center;" :type = 20>
-      <button @click="gotoStickyHeader('C')" size="mini">跳转到id为C的sticky-header位置上</button>
+  <list-view id="list-view" ref="list-view" show-scrollbar=false class="page" :scroll-into-view="scrollIntoView"
+  @scroll="onScroll" @scrollend="onScrollEnd" rebound="false">
+    <list-item style="padding: 10px; margin: 5px 0;align-items: center;" :type = 20>
+      <button @click="gotoStickyHeader('C')" size="mini">跳转到id为C的sticky-header位置上</button>
     </list-item>
     <sticky-section v-for="(sectionText) in data" :padding="sectionPadding" :push-pinned-header="true">
       <sticky-header :header-id="sectionText" :id="sectionText">
@@ -13,7 +13,7 @@
         <text class="text">{{sectionText}}--item--content----{{i}}</text>
       </list-item>
     </sticky-section>
-    <list-item style="padding: 10px; margin: 5px 0;align-items: center;" :type= 30>
+    <list-item style="padding: 10px; margin: 5px 0;align-items: center;" :type= 30>
       <!-- <text style="color: #aaa">到底了</text> -->
       <button @click="toTop" size="mini">回到顶部</button>
     </list-item>
@@ -25,33 +25,33 @@
     data() {
       return {
         data: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'],
-        sectionPadding: [0, 10, 0, 10] as Array<number>,
-        scrollIntoView: "",
+        sectionPadding: [0, 10, 0, 10] as Array<number>,
+        scrollIntoView: "",
         scrolling: false
       }
     },
-    methods: {
-      toTop(){
-        this.scrollIntoView = ""
-        uni.getElementById("list-view")!.scrollTop = 0
+    methods: {
+      toTop(){
+        this.scrollIntoView = ""
+        uni.getElementById("list-view")!.scrollTop = 0
       },
       //用于自动化测试
       listViewScrollByY(y : number) {
         const listview = this.$refs["list-view"] as Element
         listview.scrollBy(0, y)
-      },
-      gotoStickyHeader(id : string) {
-        this.scrollIntoView = id
-      },
-      onScroll() {
-        this.scrolling = true
-      },
-      onScrollEnd() {
-        this.scrolling = false
-        //滚动后重置scrollIntoView = ""
-        if(this.scrollIntoView != "") {
-          this.scrollIntoView = ""
-        }
+      },
+      gotoStickyHeader(id : string) {
+        this.scrollIntoView = id
+      },
+      onScroll() {
+        this.scrolling = true
+      },
+      onScrollEnd() {
+        this.scrolling = false
+        //滚动后重置scrollIntoView = ""
+        if(this.scrollIntoView != "") {
+          this.scrollIntoView = ""
+        }
       }
     }
   }
@@ -75,4 +75,4 @@
     margin: 5px 0;
     background-color: #fff;
   }
-</style>
+</style>

pages/component/swiper/swiper.test.js

@@ -39,7 +39,7 @@ describe('test swiper', () => {
         expect(await getData('currentValChange')).toEqual(1)
         await page.waitFor(5000)
         expect(await getData('currentValChange')).toEqual(2)
-
+        await page.waitFor(300)
         await page.setData({
           circularSelect: true
         })
@@ -50,6 +50,7 @@ describe('test swiper', () => {
           circularSelect: false,
           autoplaySelect: false
         })
+        await page.waitFor(300)
     });
 
 

pages/component/swiper/swiper.uvue

@@ -198,7 +198,6 @@
 	.uni-margin-wrap {
 		width: 690rpx;
 		width: 100%;
-		;
 	}
 
 	.swiper {

pages/component/switch/switch.test.js

@@ -39,7 +39,7 @@ describe('switch', () => {
   })
   it('color', async () => {
     const switch_element = await page.$('.switch-color')
-    expect(await switch_element.property('color')).toBe('#FFCC33')
+    expect(await switch_element.attribute('color')).toBe('#FFCC33')
 
     const color = '#00ff00'
 
@@ -47,6 +47,6 @@ describe('switch', () => {
       color: color
     })
     await page.waitFor(100)
-    expect(await switch_element.property('color')).toBe(color)
+    expect(await switch_element.attribute('color')).toBe(color)
   })
-})
+})
\ No newline at end of file

pages/component/textarea/textarea.test.js

@@ -12,12 +12,12 @@ describe('component-native-textarea', () => {
   });
 
   it('focus', async () => {
-    expect(await textarea.property("focus")).toBe("false")
+    expect(await textarea.attribute("focus")).toBe("false")
     await page.setData({
       focus_boolean: true,
     })
     await page.waitFor(500)
-    expect(await textarea.property("focus")).toBe("true")
+    expect(await textarea.attribute("focus")).toBe("true")
   });
   /* it("auto-height", async () => {
     await page.setData({
@@ -66,7 +66,7 @@ describe('component-native-textarea', () => {
       cursor_color: "transparent",
     })
     await page.waitFor(500)
-    expect(await textarea.property("cursor-color")).toBe("transparent")
+    expect(await textarea.attribute("cursor-color")).toBe("transparent")
   })
 
   it("inputmode", async () => {
@@ -76,7 +76,7 @@ describe('component-native-textarea', () => {
       console.log(x['value'], x['name'])
       await page.callMethod("radio_change_inputmode_enum", x['value']);
       await page.waitFor(500)
-      expect(await textarea.property("inputmode")).toEqual(x['name'])
+      expect(await textarea.attribute("inputmode")).toEqual(x['name'])
       await page.waitFor(500)
     }
   })

pages/component/video/video-format.uvue

@@ -27,6 +27,7 @@
       return {
         title: 'video-format',
         supportFormats: [
+          // TODO web本地运行时本地服务返回的content-type不对，导致本地视频无法播放。此外web端原生video不支持flv、m3u8、avi格式，但是和app端相比多了ogg格式的支持
           {
             format: 'mp4',
             src: 'https://qiniu-web-assets.dcloud.net.cn/video/sample/2minute-demo.mp4'
@@ -47,6 +48,7 @@
             format: '3gp',
             src: 'https://qiniu-web-assets.dcloud.net.cn/video/sample/2minute-demo.3gp'
           },
+          // #ifndef WEB
           {
             format: 'flv',
             src: 'https://qiniu-web-assets.dcloud.net.cn/video/sample/2minute-demo.flv'
@@ -59,16 +61,19 @@
             format: '本地m3u8',
             src: '/static/test-video/2minute-demo.m3u8'
           },
+          // #endif
           {
             format: '错误路径',
             src: 'https://www.dcloud.net.cn/errorpath.mp4'
           },
         ] as Array<VideoFormat>,
         notSupportFormats: [
+          // #ifndef WEB
           {
             format: 'ogg',
             src: 'https://qiniu-web-assets.dcloud.net.cn/video/sample/2minute-demo.ogg'
           },
+          // #endif
           {
             format: 'avi',
             src: 'https://qiniu-web-assets.dcloud.net.cn/video/sample/2minute-demo.avi'
@@ -79,7 +84,7 @@
     },
     methods: {
       onError: function (format: string, e : VideoErrorEvent) {
-        console.log(format + ":" + e.detail);
+        console.log(format + ":" + JSON.stringify(e));
         if (format != "错误路径") {
           this.isError = true;
         }

pages/component/video/video.test.js

 // uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
-jest.setTimeout(10000);
+jest.setTimeout(20000);
 describe('component-native-video', () => {
   let page;
 
   beforeAll(async () => {
     page = await program.reLaunch('/pages/component/video/video');
     await page.waitFor('video');
+    await page.waitFor(300)
   });
 
   it('test API', async () => {

pages/component/video/video.uvue

@@ -220,6 +220,11 @@
         isFullScreen: false
       }
     },
+    onLoad() {
+      // #ifdef WEB
+      this.muted = true // web端非静音视频不可自动播放
+      // #endif
+    },
     methods: {
       // API
       play: function () {
@@ -228,7 +233,7 @@
       },
       pause: function () {
         console.log("pause");
-        (uni.getElementById("video") as UniVideoElement).pause(); //as写法测试。注意id不对时as会崩溃
+        (uni.getElementById("video") as unknown as UniVideoElement).pause(); //as写法测试。注意id不对时as会崩溃
         // this.videoContext?.pause();
       },
       seek: function (pos : number) {

pages/component/web-view/web-view.uvue

@@ -37,7 +37,10 @@
       }
     },
     onReady() {
+      // #ifdef APP
+      // TODO web 实现createWebviewContext
       this.webviewContext = uni.createWebviewContext('web-view', this)
+      // #endif
     },
     methods: {
       back() {

pages/tabBar/API.uvue

@@ -63,9 +63,13 @@
                 name: 'getApp',
                 url: 'get-app',
               },
-              {
-                name: 'getCurrentPages',
-                url: 'get-current-pages',
+              {
+                name: 'getCurrentPages',
+                url: 'get-current-pages',
+              },
+              {
+                name: 'globalProperties',
+                url: 'globalProperties',
               }
             ] as Page[],
           },
@@ -77,11 +81,11 @@
                 name: '事件总线event-bus',
                 url: 'event-bus',
                 api: ["$on", "$once", "$off", "$emit"]
-              },
-              {
-                name: '拦截器',
-                url: 'interceptor',
-                api: ["addInterceptor", "removeInterceptor"]
+              },
+              {
+                name: '拦截器',
+                url: 'interceptor',
+                api: ["addInterceptor", "removeInterceptor"]
               },
               {
                 name: '获取启动参数',
@@ -131,34 +135,36 @@
             id: 'ui',
             name: '界面',
             pages: [
-              /* {
-                name: "创建动画",
-                url: "animation",
-                enable: false
-              },
+              // {
+              //   name: "创建动画",
+              //   url: "animation",
+              //   enable: false
+              // },
+              // #ifdef WEB
               {
                 name: "创建绘画",
                 url: "canvas",
-                enable: false
-              },
-              {
-                name: "节点布局交互状态",
-                url: "intersection-observer",
-                enable: false
-              }, */
+                enable: true
+              },
+              // #endif
+              // {
+              //   name: "节点布局交互状态",
+              //   url: "intersection-observer",
+              //   enable: false
+              // },
               {
                 name: 'element元素',
                 url: 'get-element-by-id',
-                api: ["getElementById"],
-              },
-              {
-                name: 'element draw',
-                url: 'element-draw',
-                api: ["Element.getDrawableContext"]
-              },{
-                name: 'element截图',
-                url: 'element-takesnapshot',
-                api: ["Element.takeSnapshot"]
+                api: ["getElementById"],
+              },
+              {
+                name: 'element draw',
+                url: 'element-draw',
+                api: ["Element.getDrawableContext"]
+              },{
+                name: 'element截图',
+                url: 'element-takesnapshot',
+                api: ["Element.takeSnapshot"]
               },
               {
                 name: 'node节点',
@@ -188,38 +194,38 @@
                 api: ["showToast"]
               }
             ] as Page[],
-          },
-          {
-            id: 'network',
-            name: '网络',
-            pages: [
-              {
-                name: '发起请求request',
-                url: 'request',
-              },
-              {
-                name: '上传文件',
-                url: 'upload-file',
-              },
-              {
-                name: '下载文件',
-                url: 'download-file',
-              },
-              {
-                name: '获取设备网络状态',
-                url: 'get-network-type',
-              },
-              {
-                name: 'socketTask',
-                url: 'websocket-socketTask',
-                api: [""] //它不是uni.的api
-              },
-              {
-                name: '全局websocket',
-                url: 'websocket-global',
-                api: ["connectSocket", "onSocketOpen", "onSocketError", "sendSocketMessage", "onSocketMessage", "closeSocket", "onSocketClose"]
-              },
-            ] as Page[],
+          },
+          {
+            id: 'network',
+            name: '网络',
+            pages: [
+              {
+                name: '发起请求request',
+                url: 'request',
+              },
+              {
+                name: '上传文件',
+                url: 'upload-file',
+              },
+              {
+                name: '下载文件',
+                url: 'download-file',
+              },
+              {
+                name: '获取设备网络状态',
+                url: 'get-network-type',
+              },
+              {
+                name: 'socketTask',
+                url: 'websocket-socketTask',
+                api: [""] //它不是uni.的api
+              },
+              {
+                name: '全局websocket',
+                url: 'websocket-global',
+                api: ["connectSocket", "onSocketOpen", "onSocketError", "sendSocketMessage", "onSocketMessage", "closeSocket", "onSocketClose"]
+              },
+            ] as Page[],
           },
           {
             id: 'device',
@@ -252,10 +258,10 @@
               {
                 name: '电量',
                 url: 'get-battery-info',
-              },
-              {
-                name: '安装Apk',
-                url: 'install-apk'
+              },
+              {
+                name: '安装Apk',
+                url: 'install-apk'
               }
               /* {
                 name: "打电话",
@@ -314,10 +320,10 @@
           {
             id: 'media',
             name: '媒体',
-            pages: [
-              {
-                name: "拍照和相册选择",
-                url: 'choose-image'
+            pages: [
+              {
+                name: "拍照和相册选择",
+                url: 'choose-image'
               },
               {
                 name: '图片预览',
@@ -393,55 +399,55 @@
                 name: 'storage（key-value存储）',
                 url: 'storage',
                 api: ["getStorageInfo", "getStorageInfoSync", "getStorage", "getStorageSync", "setStorage", "setStorageSync", "removeStorage", "removeStorageSync", "clearStorage", "clearStorageSync"]
-              }
+              }
             ] as Page[],
           },{
             id: 'file',
             name: '文件',
             pages: [
-              {
-                name: 'fileSystemManager文件管理',
-                url: 'get-file-system-manager'
+              {
+                name: 'fileSystemManager文件管理',
+                url: 'get-file-system-manager'
               },
             ] as Page[],
-          },
-          {
-            id: 'unicloud',
-            name: 'uniCloud',
-            pages: [
-              {
-                name: '云函数',
-                url: 'unicloud-call-function',
-              },
-              {
-                name: '云对象',
-                url: 'unicloud-import-object',
-              },
-              {
-                name: '云存储',
-                url: 'unicloud-file-api',
-              },
-              {
-                name: 'clientDB',
-                url: 'unicloud-database',
-              },
-            ] as Page[],
-          },
-          // #ifdef APP
-          {
-            id: 'login',
-            name: '登录与认证',
-            pages: [
-              {
-                name: '一键登录',
-                url: 'get-univerify-manager',
-              },
-              {
-                name: '实人认证',
-                url: 'facial-recognition-verify',
-              }
-            ] as Page[],
-          },
+          },
+          {
+            id: 'unicloud',
+            name: 'uniCloud',
+            pages: [
+              {
+                name: '云函数',
+                url: 'unicloud-call-function',
+              },
+              {
+                name: '云对象',
+                url: 'unicloud-import-object',
+              },
+              {
+                name: '云存储',
+                url: 'unicloud-file-api',
+              },
+              {
+                name: 'clientDB',
+                url: 'unicloud-database',
+              },
+            ] as Page[],
+          },
+          // #ifdef APP
+          {
+            id: 'login',
+            name: '登录与认证',
+            pages: [
+              {
+                name: '一键登录',
+                url: 'get-univerify-manager',
+              },
+              {
+                name: '实人认证',
+                url: 'facial-recognition-verify',
+              }
+            ] as Page[],
+          },
           // #endif
           /* {
             id: "rewarded-video-ad",
@@ -536,4 +542,4 @@
   .item {
     margin-bottom: 12px;
   }
-</style>
+</style>

pages/tabBar/component.uvue

@@ -93,9 +93,12 @@ export default {
                 enable: false
               },
               */
+            // #ifdef APP
+            // TODO web 实现list-view
             {
               name: 'list-view',
             },
+            // #endif
             {
               name: 'sticky-header',
             },
@@ -205,6 +208,8 @@ export default {
               }
             ] as Page[]
           },
+          */
+         // #ifdef WEB
           {
             id: 'canvas',
             name: '画布',
@@ -214,7 +219,7 @@ export default {
               }
             ] as Page[]
           },
-          */
+          // #endif
         {
           id: 'web-view',
           name: '网页',

pages/template/half-screen/half-screen.uvue

@@ -190,4 +190,4 @@
   .item {
     height: 100px;
   }
-</style>
+</style>

pages/template/scroll-fold-nav/scroll-fold-nav.uvue

@@ -194,4 +194,4 @@
     padding: 5px 8px;
     border-radius: 100px;
   }
-</style>
+</style>