jufubao-base 1.0.435 → 1.0.436

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.435",
+  "version": "1.0.436",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -90,6 +90,7 @@
         iconMargin:20,
         titleStyle:{},
         columnSpacing:0,
+        titleMargin:4,
       }
     },
 		computed: {
@@ -144,7 +145,7 @@
           scrollStyleComp: this.scrollStyleComp, //滑块外框样式
           height: this.iconWH.height,
           width: this.iconWH.width,
-          titleStyle: this.titleStyle,
+          titleStyle: Object.assign({}, this.titleStyle, { marginTop: this.titleMargin + 'rpx' }),
           dotStyleData: this.dotStyleData,
           carouselType: this.carouselType
         }
@@ -245,7 +246,7 @@
 
         return {
           width:width,
-          height: width + textHeight,
+          height: width + this.titleMargin + textHeight,
           marginBT,
           contentPaddingBT,
           textHeight,
@@ -320,6 +321,7 @@
         this.iconBgColor  = gCPVal(container, 'iconBgColor', ['#fff'], {sKey:'iconBgColorStatus', fields:['iconBgColor','iconBgImage']})
         this.iconBgImage = gCPVal(container, 'iconBgImage', {url: ""}, {sKey:'iconBgColorStatus', fields:['iconBgColor','iconBgImage']});
         this.columnSpacing = gCPVal(container, 'columnSpacing', [16,0],{sKey:'columnSpacingStatus', fields:['columnSpacing']});
+        this.titleMargin = gCPVal(container, 'titleMargin', [16,4],{sKey:'titleMarginStatus', fields:['titleMargin']});
         let defaultPadding = 20;
         if(this.column === 4) defaultPadding = 25
         this.iconMargin = gCPVal(container, 'iconMargin', [16,defaultPadding],{sKey:'iconMarginStatus', fields:['iconMargin']});

package/src/components/JfbBasePosterType/cusAttr/icon.js

@@ -11,11 +11,12 @@ import {
 
 function checkAndSetValue(iconSetBaseStyle,data,gValue){
   if(gValue.isAdd && gValue.isFirst) return;
-  let status = ['columnSpacingStatus','radiusStatus','iconMarginStatus','titleStyle'];
+  let status = ['columnSpacingStatus','radiusStatus','iconMarginStatus','titleStyle','titleMarginStatus'];
   let defValue = {
     columnSpacing:0,
     radius:'20',
     iconMargin:20,
+    titleMargin:4,
     titleStyle:{
       fontSize:'24rpx',
       color:data['textColor'] || '#333',
@@ -295,6 +296,38 @@ export default (data, gValue, gColor, oldData={})=>{
     },
     {ele: 'group_end'},
 
+    {
+      label: '标与字间距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'titleMarginStatus',
+      value: statusDataVal({data, key:'titleMarginStatus', fields:['titleMargin'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "titleMargin",
+      value: dataVal({data, key:'titleMargin', dValue:gValue.isAdd && gValue.isFirst?10:4, gValue}),
+      hidden: !statusShow({data, key: 'titleMarginStatus', fields:['titleMargin'], gValue}),
+      className: "input80",
+      labelInline: true,
+      setting:{
+        min: 0,
+        max: 60,
+        step:1,
+        showStops:false,
+        showInput:false,
+      }
+    },
+    {ele: 'group_end'},
+
     {
       label: '图标投影',
       ele: 'xd-shadow',