Commit c94a4f0e9074db8f9d9d770fa21ade7cadf0c3c6

Authored by ly525
1 parent 46322880

replace customStyle with extra.style

front-end/h5/src/components/core/models/element.js
@@ -45,7 +45,7 @@ class Element { @@ -45,7 +45,7 @@ class Element {
45 ...defaultStyle, 45 ...defaultStyle,
46 zindex: ele.zindex, 46 zindex: ele.zindex,
47 ...ele.defaultStyle, 47 ...ele.defaultStyle,
48 - ...ele.customStyle 48 + ...(ele.extra && ele.extra.style)
49 } 49 }
50 } 50 }
51 51
front-end/h5/src/components/plugins/lbp-form-checkbox-group.js
@@ -22,9 +22,11 @@ function getDefaultItems () { @@ -22,9 +22,11 @@ function getDefaultItems () {
22 } 22 }
23 23
24 export default { 24 export default {
25 - customStyle: {  
26 - width: 120,  
27 - height: 120 25 + extra: {
  26 + style: {
  27 + width: 120,
  28 + height: 120
  29 + }
28 }, 30 },
29 name: 'lbp-form-checkbox-group', 31 name: 'lbp-form-checkbox-group',
30 components: { 32 components: {
front-end/h5/src/components/plugins/lbp-form-radio-group.js
@@ -33,9 +33,11 @@ function getDefaultItems () { @@ -33,9 +33,11 @@ function getDefaultItems () {
33 } 33 }
34 34
35 export default { 35 export default {
36 - customStyle: {  
37 - width: 120,  
38 - height: 120 36 + extra: {
  37 + style: {
  38 + width: 120,
  39 + height: 120
  40 + }
39 }, 41 },
40 name: 'lbp-form-radio-group', 42 name: 'lbp-form-radio-group',
41 props: { 43 props: {
front-end/h5/src/components/plugins/lbp-notice-bar.js
@@ -14,9 +14,11 @@ import { NoticeBar } from 'vant' @@ -14,9 +14,11 @@ import { NoticeBar } from 'vant'
14 import 'vant/lib/notice-bar/style' 14 import 'vant/lib/notice-bar/style'
15 15
16 export default { 16 export default {
17 - customStyle: {  
18 - width: 300,  
19 - height: 30 17 + extra: {
  18 + style: {
  19 + width: 300,
  20 + height: 30
  21 + }
20 }, 22 },
21 name: 'lbp-notice-bar', 23 name: 'lbp-notice-bar',
22 props: { 24 props: {