[feature] 根据输入框内容判断使用 px 或者 % 单位

宋远桥 · 小小鲁班
1 parent b14a1ade
Showing 1 changed file with 11 additions and 5 deletions
front-end/h5/src/components/core/models/element.js
@@ -75,7 +75,13 @@ class Element {
     return pluginProps
   }
-
+  getPositionValue (key, isRem = false) {
+    const pluginProps = this.pluginProps
+    const commonStyle = this.commonStyle
+    const value = pluginProps[key] || commonStyle[key]
+    const isPercent = /^\d+%$/.test(value)
+    return isPercent ? value : parsePx(value, isRem)
+  }
   getStyle ({ position = 'static', isRem = false } = {}) {
     if (this.name === 'lbp-background') {
       return {
@@ -86,10 +92,10 @@ class Element {
     const pluginProps = this.pluginProps
     const commonStyle = this.commonStyle
     let style = {
-      top: parsePx(pluginProps.top || commonStyle.top, isRem),
-      left: parsePx(pluginProps.left || commonStyle.left, isRem),
-      width: parsePx(pluginProps.width || commonStyle.width, isRem),
-      height: parsePx(pluginProps.height || commonStyle.height, isRem),
+      top: this.getPositionValue('top', isRem),
+      left: this.getPositionValue('left', isRem),
+      width: this.getPositionValue('width', isRem),
+      height: this.getPositionValue('height', isRem),
       fontSize: parsePx(pluginProps.fontSize || commonStyle.fontSize, isRem),
       color: pluginProps.color || commonStyle.color,
       // backgroundColor: pluginProps.backgroundColor || commonStyle.backgroundColor,