Merge branch 'dev' into alpha

pages.json

@@ -1003,10 +1003,10 @@
       }
     },
     {
-      "path" : "pages/component/transition-event/transition-event",
+      "path" : "pages/component/general-event/transition-event",
       "style" : 
       {
-        "navigationBarTitleText" : "",
+        "navigationBarTitleText" : "transitionend事件",
         "enablePullDownRefresh" : false
       }
     }

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

@@ -4,7 +4,7 @@ describe('transition event', () => {
 
     let page;
     beforeAll(async () => {
-        page = await program.reLaunch('/pages/component/transition-event/transition-event')
+        page = await program.reLaunch('/pages/component/general-event/transition-event')
         await page.waitFor(3000);
     });
 

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

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex:1">
+  <scroll-view style="flex:1;padding: 10px;">
   <!-- #endif -->
     <button @click="switchBtn">{{buttonValue}}</button>
     <image class="transition-transform" id="transition-transform" @transitionend="onEnd" src="/static/uni.png"></image>
+    <text>对图片设置transform进行旋转，在旋转完成的transitionend事件后，继续旋转</text>
   <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->

pages/pages.test.js

@@ -37,7 +37,7 @@ const pages = [
   '/pages/component/view/view',
   // '/pages/component/web-view/web-view', // 动态内容
   '/pages/component/web-view-local/web-view-local',
-  '/pages/component/transition-event/transition-event',
+  '/pages/component/general-event/transition-event',
   
   // CSS
   '/pages/CSS/background/background-color',

pages/tabBar/component.uvue

@@ -256,7 +256,7 @@ export default {
              enable: true,
            },{
              name: 'Transition事件',
-             url: '/pages/component/transition-event/transition-event',
+             url: '/pages/component/general-event/transition-event',
              enable: true,
            },
          ] as Page[],