Merge remote-tracking branch 'origin/master'

packages/components/HContent/index.vue

@@ -66,20 +66,20 @@ export default {
       do {
         if (nextElement) {
           let position = window.getComputedStyle(nextElement).position
-          if (position === 'fixed') {
+          if (position !== 'fixed') {
             let elHeight = window.getComputedStyle(nextElement).height
             let part = /^\d+(\.\d+)?px$/
             if (elHeight && part.test(elHeight)) {
               nextHeight += Number(elHeight.replace('px', ''))
             }
-            let paddingTopHeight = window.getComputedStyle(nextElement).paddingTop
-            let paddingBottomHeight = window.getComputedStyle(nextElement).paddingBottom
-            if (paddingTopHeight && part.test(paddingTopHeight)) {
-              nextHeight += Number(paddingTopHeight.replace('px', ''))
-            }
-            if (paddingBottomHeight && part.test(paddingBottomHeight)) {
-              nextHeight += Number(paddingBottomHeight.replace('px', ''))
-            }
+            //let paddingTopHeight = window.getComputedStyle(nextElement).paddingTop
+            //let paddingBottomHeight = window.getComputedStyle(nextElement).paddingBottom
+            //if (paddingTopHeight && part.test(paddingTopHeight)) {
+            //  nextHeight += Number(paddingTopHeight.replace('px', ''))
+            //}
+            //if (paddingBottomHeight && part.test(paddingBottomHeight)) {
+            //  nextHeight += Number(paddingBottomHeight.replace('px', ''))
+            //}
           }
           nextElement = nextElement.nextElementSibling
         }