jufubao-base 1.0.194-beta3 → 1.0.194-beta4

package/package.json

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

package/src/components/JfbBasePoster/Attr.js

@@ -1,6 +1,8 @@
 'use strict';
-
-import console from "@dcloudio/uni-h5/src/core/helpers/console";
+function checkValue(value, dValue = 0){
+  if(value === undefined || value === '' || value === null) return dValue;
+  return Number(value || 0);
+}
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -8,6 +10,26 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
+    let poster = params.poster;
+    let showBg = false;
+    let posterHeight = 0;
+    if(toString.call(params.poster) === '[object Object]') {
+      if(poster.size && poster.size.height && poster.size.width){
+        showBg = true;
+        posterHeight = Number(poster.size.height)
+      }
+    }
+    let paddingDeflaut = 20;
+    if(toString.call(params.background) === '[object Object]'){
+      if(params.background && params.background.url) {
+        paddingDeflaut = 0
+      }
+    }
+    let marginRL = checkValue((params.margin||{}).right,0) + checkValue((params.margin||{}).left,0);
+    let paddingBT = checkValue((params.bgImagePadding||{}).bottom,paddingDeflaut) + checkValue((params.bgImagePadding||{}).top,paddingDeflaut);
+    let outWidth = Math.floor(750 - marginRL);
+    let outHeight = Math.floor(posterHeight + paddingBT);
+
     if(!params['isCarousel']) params['isCarousel'] = 1;
     return [
       {
@@ -253,7 +275,7 @@ export default {
         size: 'small',
         groupKey:'content',
       },
-      params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
+      showBg && params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
         label: '广告背景图:',
         ele: 'xd-upload',
         valueKey: 'background',
@@ -261,10 +283,10 @@ export default {
         value: params.background || {},
         defaultValue: params.background || null,
         slot: true,
-        oneWidth: 100,
-        oneHeight: 100,
+        oneWidth: 375,
+        oneHeight: 375*outHeight/outWidth,
         elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        tipsformet: `上传文件格式：@imageType@，不超过@size@MB，尺寸：${outWidth}*${outHeight}像素`,
         type: ['jpg', 'png', 'jpeg'],
         styleType: 'one',
         uploadType: 'aliyun',