Skip to content

H
hls-easy-ui
Commit d2060d74 authored by nature2104's avatar nature2104
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9ab03b29 00717980
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
packages/components/HContent/index.vue
View file @ d2060d74
...@@ -66,20 +66,20 @@ export default { ...@@ -66,20 +66,20 @@ export default {
do { do {
if (nextElement) { if (nextElement) {
let position = window.getComputedStyle(nextElement).position let position = window.getComputedStyle(nextElement).position
if (position === 'fixed') { if (position !== 'fixed') {
let elHeight = window.getComputedStyle(nextElement).height let elHeight = window.getComputedStyle(nextElement).height
let part = /^\d+(\.\d+)?px$/ let part = /^\d+(\.\d+)?px$/
if (elHeight && part.test(elHeight)) { if (elHeight && part.test(elHeight)) {
nextHeight += Number(elHeight.replace('px', '')) nextHeight += Number(elHeight.replace('px', ''))
} }
let paddingTopHeight = window.getComputedStyle(nextElement).paddingTop //let paddingTopHeight = window.getComputedStyle(nextElement).paddingTop
let paddingBottomHeight = window.getComputedStyle(nextElement).paddingBottom //let paddingBottomHeight = window.getComputedStyle(nextElement).paddingBottom
if (paddingTopHeight && part.test(paddingTopHeight)) { //if (paddingTopHeight && part.test(paddingTopHeight)) {
nextHeight += Number(paddingTopHeight.replace('px', '')) // nextHeight += Number(paddingTopHeight.replace('px', ''))
} //}
if (paddingBottomHeight && part.test(paddingBottomHeight)) { //if (paddingBottomHeight && part.test(paddingBottomHeight)) {
nextHeight += Number(paddingBottomHeight.replace('px', '')) // nextHeight += Number(paddingBottomHeight.replace('px', ''))
} //}
} }
nextElement = nextElement.nextElementSibling nextElement = nextElement.nextElementSibling
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment