Merge branch 'dev' into alpha

pages/component/input/input.test.js

@@ -15,30 +15,30 @@ describe('component-native-input', () => {
   //   expect(image).toMatchImageSnapshot()
   // })
   // 测试焦点及键盘弹起
-  // it('focus', async () => {
-  //   const input = await page.$('.uni-input-focus');
-  //   expect(await input.property('focus')).toBe(true)
-  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
-  //   await page.setData({
-  //     focus: false,
-  //   })
-  //   expect(await input.property('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)
-  //   await page.waitFor(1000)
-  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
-  //   await page.setData({
-  //     focus: false,
-  //   })
-  //   expect(await input.property('focus')).toBe(false)
-  //   await page.waitFor(1000)
-  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(false)
-  //   await page.waitFor(1000)
-  // });
+  it('focus', async () => {
+    const input = await page.$('.uni-input-focus');
+    expect(await input.property('focus')).toBe("true")
+    // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
+    await page.setData({
+      focus: false,
+    })
+    expect(await input.property('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)
+    // await page.waitFor(1000)
+    // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
+    // await page.setData({
+    //   focus: false,
+    // })
+    // expect(await input.property('focus')).toBe(false)
+    // await page.waitFor(1000)
+    // expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(false)
+    // await page.waitFor(1000)
+  });
 
   // 测试修改value属性
   it("value", async () => {

pages/component/text/text-props.uvue

@@ -21,6 +21,7 @@
         <text>\\n 换行</text>
         <text>\\\n 换行</text>
         <text>\n 换行 \\n 换行 \\\n 换行 \\\\n 换行 \\\\\n 换行</text>
+        <text space="nbsp">HBuilderX，轻巧、极速，极客编辑器;\nuni-app x，终极跨平台方案;</text>
       </view>
 
       <view class="uni-title">
@@ -84,6 +85,17 @@
           <text style="font-size: 50px">二级节点大字体</text>
         </text>
       </view>
+
+      <view class="uni-title">
+        <text class="uni-subtitle-text">padding</text>
+      </view>
+      <view class="text-box">
+        <text class="text-padding">hello uni-app x</text>
+        <text class="text-padding" style="width: 200px;">hello uni-app x</text>
+        <text class="text-padding" style="height: 100px;">hello uni-app x</text>
+        <text class="text-padding" style="width: 200px;height: 100px;">hello uni-app x</text>
+      </view>
+
     </view>
   </scroll-view>
 </template>
@@ -118,4 +130,11 @@ export default {
   line-height: 54rpx;
   text-align: center;
 }
+
+.text-padding {
+  margin-top: 5px;
+  padding: 20px;
+  border: 1px solid red;
+  text-align: center;
+}
 </style>