dolphin-weex-ui 2.2.1 → 2.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dolphin-weex-ui",
3
- "version": "2.2.1",
3
+ "version": "2.2.2",
4
4
  "description": "inteligense cross platform frame",
5
5
  "main": "index.js",
6
6
  "directories": {
@@ -759,6 +759,8 @@ export default {
759
759
  width: '112px',
760
760
  height: '112px',
761
761
  borderRadius: '56px',
762
+ marginTop: this._isColmo ? '0px' : '16px',
763
+ marginBottom: this._isColmo ? '0px' : '16px',
762
764
  backgroundColor: iconColor ? iconColor : 'transparent'
763
765
  }
764
766
  } else if (iconSize === 'medium') {
@@ -766,6 +768,8 @@ export default {
766
768
  width: '76px',
767
769
  height: '76px',
768
770
  borderRadius: '38px',
771
+ marginTop: this._isColmo ? '0px' : '40px',
772
+ marginBottom: this._isColmo ? '0px' : '40px',
769
773
  backgroundColor: iconColor ? iconColor : 'transparent'
770
774
  }
771
775
  } else if (iconSize === 'min') {
@@ -773,6 +777,8 @@ export default {
773
777
  width: '40px',
774
778
  height: '40px',
775
779
  borderRadius: '20px',
780
+ marginTop: this._isColmo ? '0px' : '32px',
781
+ marginBottom: this._isColmo ? '0px' : '32px',
776
782
  backgroundColor: iconColor ? iconColor : 'transparent'
777
783
  }
778
784
  } else {
@@ -780,6 +786,8 @@ export default {
780
786
  width: '64px',
781
787
  height: '64px',
782
788
  borderRadius: '32px',
789
+ marginTop: this._isColmo ? '0px' : '48px',
790
+ marginBottom: this._isColmo ? '0px' : '48px',
783
791
  backgroundColor: iconColor ? iconColor : 'transparent'
784
792
  }
785
793
  }
@@ -7,7 +7,7 @@
7
7
  v-if="index < formattedList.length - 1"
8
8
  :class="['step-line', showLine && 'hline']"
9
9
  :key="'line' + index"
10
- :style="{ ...item.lineStyles, ...linePos[index] }"
10
+ :style="Object.assign(item.lineStyles, linePos[index])"
11
11
  ></div>
12
12
  </template>
13
13
  </div>