[fix] string 和number隐式转换问题&去除 %支持拖拽的时候会导致计算问题

宋远桥 · 小小鲁班
1 parent 25155a74
Showing 2 changed files with 7 additions and 13 deletions
front-end/h5/src/components/core/editor/right-panel/props.js
front-end/h5/src/components/core/models/element.js
@@ -127,7 +127,7 @@ export default {
      */
     onPositionChange (value, key) {
       this.setElementPosition({
-        [key]: value
+        [key]: Number(value)
       })
     },
     /**
@@ -140,7 +140,7 @@ export default {
         const { type, label, key } = item
         const data = {
           props: {
-            placeholder: `请输入${key},支持 %单位`
+            placeholder: `请输入${key}`
           },
           domProps: {
             value: commonStyle[key]
@@ -75,13 +75,7 @@ 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 {
@@ -92,10 +86,10 @@ class Element {
     const pluginProps = this.pluginProps
     const commonStyle = this.commonStyle
     let style = {
-      top: this.getPositionValue('top', isRem),
-      left: this.getPositionValue('left', isRem),
-      width: this.getPositionValue('width', isRem),
-      height: this.getPositionValue('height', isRem),
+      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),
       fontSize: parsePx(pluginProps.fontSize || commonStyle.fontSize, isRem),
       color: pluginProps.color || commonStyle.color,
       // backgroundColor: pluginProps.backgroundColor || commonStyle.backgroundColor,