jufubao-base 1.0.129 → 1.0.130-beta2

package/src/components/JfbBasePosterBigSmall/Attr.js

@@ -6,7 +6,8 @@ import getWidthHeight from './getWidthHeight'
 export default {
   style: [],
   content: (params) => {
-    console.log(params,'apapapap');
+    if(!params.margin) params.margin = {};
+    if(params.msMargin !== 0 && !params.msMargin) params.msMargin = 0;
     if(!params['isCarousel']) params['isCarousel'] = 1;
     if(params.poster) {
       let bigWidth = getWidthHeight(params.height,params.margin,params.msMargin).bigWidth
@@ -15,101 +16,107 @@ export default {
         width: bigWidth,
         height: bigHeight,
       }
-      params.poster.type=1
-      console.log(params.poster,'params.posterparams.poster');
+      params.poster.type='1'
     }
-    if(params.topPoster) {
+    if(params['topPoster']) {
       let bigWidth = getWidthHeight(params.height,params.margin,params.msMargin).bigWidth
       let smallHeight = getWidthHeight(params.height,params.margin,params.msMargin).smallHeight
       params.topPoster.size={
         width: bigWidth,
         height: smallHeight,
       }
-      params.topPoster.type=1
+      params.topPoster.type='1'
     }
-    if(params.bottomPoster) {
+    if(params['bottomPoster']) {
       let bigWidth = getWidthHeight(params.height,params.margin,params.msMargin).bigWidth
       let smallHeight = getWidthHeight(params.height,params.margin,params.msMargin).smallHeight
       params.bottomPoster.size={
         width: bigWidth,
         height: smallHeight,
       }
-      params.bottomPoster.type=1
+      params.bottomPoster.type='1'
     }
+    let xiugai = false;
+    if(params.poster && params.poster.position && params.poster.position.position_id) xiugai = true;
+    if(params['topPoster'] && params['topPoster'].position && params['topPoster'].position.position_id) xiugai = true;
+    if(params['bottomPoster'] && params['bottomPoster'].position && params['bottomPoster'].position.position_id) xiugai = true;
     return [
       {
         label: '广告位高度:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'height',
+        groupKey:'style',
         value: params.height || 500,
         className: 'input40',
         placeholder: '请广告位内容间距设置',
-        notice: '单位：像素（px）',
+        disabled:xiugai,
+        notice: '广告位选取内容后，将无法修改，单位：像素，默认: <span style="color:red">500</span>像素',
         inline: false,
       },
-      {
-        label: '样式:',
-        ele: 'xd-radio',
-        valueKey: 'position',
-        value: params['position'] || 1,
-        rules: [
-          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "大图靠左", "value": 1},
-          {"label": "大图靠右", "value": 2},
-        ]
-      },
       {
         label: '广告位边距设置:',
         ele: 'xd-margin-padding',
+        groupKey:'style',
         valueKey: 'margin',
-        value: params.margin || {
-          top: 0,
-          bottom: 0,
-          left: 0,
-          right: 0,
-        },
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
+        value: params.margin || null,
+        disabled: xiugai,
+        setting: { type: 'margin'},
         placeholder: '请设置广告位边距设置',
-
+        notice: '广告位选取内容后，将无法修改，单位：像素',
+        inline: false,
       },
       {
         label: '图片间距:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'msMargin',
+        groupKey:'style',
         value: params.msMargin || 10,
         className: 'input40',
         placeholder: '请广告位内容间距设置',
-        notice: '单位：像素（px）',
+        disabled: xiugai,
+        notice: '广告位选取内容后，将无法修改，单位：像素，默认: <span style="color:red">10</span>像素',
         inline: false,
       },
+      {
+        label: '样式:',
+        ele: 'xd-radio',
+        valueKey: 'position',
+        groupKey:'content',
+        value: params['position'] || 1,
+        rules: [
+          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "大图靠左", "value": 1},
+          {"label": "大图靠右", "value": 2},
+        ]
+      },
+
+
       {
         ele: 'title',
         label: '大图设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'content',
       },
       {
-        label: '大图广告位置配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'poster', //form[valueKey]
+        label: '大图广告位置配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'poster',
+        groupKey:'content',
         className: 'input80',
         isKey: true,
         key: new Date().getTime(),
         value: params.poster || {},
         setting: {
-          count: 1,
+          count: '1',
           scene: {label: '广告', value: 'normal'},
-          partDisabled: true
+          partDisabled: true,
+          disabled: true,
         },
         handleCustom({action, data}) {
-          console.log(params.poster,'posteryyyy');
-          console.log(getWidthHeight(params.height,params.margin,params.msMargin),'getWidthHeight');
           if (data && data.params) {
             //当一个插件中出现多个内容分类时候需要设置code值，在页面引用时候（容器id + code）进行拼接获取数据列表
             data.params = Object.assign({}, data.params, {code: 'big'});
@@ -314,21 +321,11 @@ export default {
           {required: true, message: '请选择广告位置', trigger: 'change'},
         ],
       },
-      params.poster &&  params.poster['type']&& params.poster['type'] !== '1' && {
-        label: '广告位内容间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'padding',
-        value: params.padding || 0,
-        className: 'input40',
-        placeholder: '请广告位内容间距设置',
-        notice: '在使用通屏显示类型广告位之外的样式时，该属性生效，单位：像素（px）',
-        inline: false,
-      },
       {
         label: '大图广告圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'content',
         value: params['radius'] || '20',
         placeholder: '请选择广告圆角设置',
         multiple: false,
@@ -348,6 +345,7 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'number',
+        groupKey:'content',
         value: params.number || 1,
         placeholder: '请输入广告位置使用张数',
         className: 'input40',
@@ -364,6 +362,7 @@ export default {
         label: '大图广告位显示方式:',
         ele: 'xd-radio',
         valueKey: 'isCarousel',
+        groupKey:'content',
         value: params['isCarousel'] || 1,
         rules: [
           {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
@@ -377,6 +376,7 @@ export default {
         label: '大图广告位轮播周期:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'content',
         isKey: true,
         valueKey: 'carouselTime',
         value: params.carouselTime || 5,
@@ -392,10 +392,11 @@ export default {
         ]
       },
       params['isCarousel'] === 2 && {
-        label: '大图广告显示dot类型:', //label
-        ele: 'xd-select-list', //package 名称
-        valueKey: 'dot_type', //form[valueKey]
-        value: params['dot_type'] || 'dot', //v-model
+        label: '大图广告显示dot类型:',
+        ele: 'xd-select-list',
+        valueKey: 'dot_type',
+        groupKey:'content',
+        value: params['dot_type'] || 'dot',
         placeholder: '请选择广告显示dot类型',
         multiple: false,
         className: 'input80',
@@ -413,20 +414,23 @@ export default {
       {
         ele: 'title',
         label: '小图上设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'content',
       },
       {
-        label: '小图上广告位置配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'topPoster', //form[valueKey]
+        label: '小图上广告位置配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'topPoster',
+        groupKey:'content',
         className: 'input80',
-        value: params.topPoster || {},
+        value: params['topPoster'] || {},
         isKey: true,
         key: new Date().getTime(),
         setting: {
           count: 1,
           scene: {label: '广告', value: 'normal'},
-          partDisabled: true
+          partDisabled: true,
+          disabled: true,
         },
         handleCustom({action, data}) {
           if (data && data.params) {
@@ -636,6 +640,7 @@ export default {
         label: '小图上广告圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'topRadius',
+        groupKey:'content',
         value: params['topRadius'] || '20',
         placeholder: '请选择广告圆角设置',
         multiple: false,
@@ -655,6 +660,7 @@ export default {
         ele: 'el-input',
         type: 'topNumber',
         valueKey: 'topNumber',
+        groupKey:'content',
         value: params.topNumber || 1,
         placeholder: '请输入广告位置使用张数',
         className: 'input40',
@@ -671,6 +677,7 @@ export default {
         label: '小图上广告位显示方式:',
         ele: 'xd-radio',
         valueKey: 'topIsCarousel',
+        groupKey:'content',
         value: params['topIsCarousel'] || 1,
         rules: [
           {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
@@ -684,6 +691,7 @@ export default {
         label: '小图上广告位轮播周期:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'content',
         isKey: true,
         valueKey: 'topCarouselTime',
         value: params.topCarouselTime || 5,
@@ -699,10 +707,11 @@ export default {
         ]
       },
       params['topIsCarousel'] === 2 && {
-        label: '小图上广告显示dot类型:', //label
-        ele: 'xd-select-list', //package 名称
-        valueKey: 'top_dot_type', //form[valueKey]
-        value: params['top_dot_type'] || 'dot', //v-model
+        label: '小图上广告显示dot类型:',
+        ele: 'xd-select-list',
+        groupKey:'content',
+        valueKey: 'top_dot_type',
+        value: params['top_dot_type'] || 'dot',
         placeholder: '请选择广告显示dot类型',
         multiple: false,
         className: 'input80',
@@ -720,20 +729,23 @@ export default {
       {
         ele: 'title',
         label: '小图下设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'content',
       },
       {
-        label: '小图下广告位置配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'bottomPoster', //form[valueKey]
+        label: '小图下广告位置配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'bottomPoster',
         className: 'input80',
-        value: params.bottomPoster || {},
+        groupKey:'content',
+        value: params['bottomPoster'] || {},
         isKey: true,
         key: new Date().getTime(),
         setting: {
           count: 1,
           scene: {label: '广告', value: 'normal'},
-          partDisabled: true
+          partDisabled: true,
+          disabled: true,
         },
         handleCustom({action, data}) {
           if (data && data.params) {
@@ -943,6 +955,7 @@ export default {
         label: '小图下广告圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'bottomRadius',
+        groupKey:'content',
         value: params['bottomRadius'] || '20',
         placeholder: '请选择广告圆角设置',
         multiple: false,
@@ -961,6 +974,7 @@ export default {
         label: '小图下广告位置使用张数:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'content',
         valueKey: 'bottomNumber',
         value: params.bottomNumber || 1,
         placeholder: '请输入广告位置使用张数',
@@ -977,6 +991,7 @@ export default {
       {
         label: '小图下广告位显示方式:',
         ele: 'xd-radio',
+        groupKey:'content',
         valueKey: 'bottomIsCarousel',
         value: params['bottomIsCarousel'] || 1,
         rules: [
@@ -992,6 +1007,7 @@ export default {
         ele: 'el-input',
         type: 'number',
         isKey: true,
+        groupKey:'content',
         valueKey: 'bottomCarouselTime',
         value: params.bottomCarouselTime || 5,
         placeholder: '请输入广告位轮播周期，单位秒',
@@ -1006,10 +1022,11 @@ export default {
         ]
       },
       params['bottomIsCarousel'] === 2 && {
-        label: '小图下广告显示dot类型:', //label
-        ele: 'xd-select-list', //package 名称
-        valueKey: 'bottom_dot_type', //form[valueKey]
-        value: params['bottom_dot_type'] || 'dot', //v-model
+        label: '小图下广告显示dot类型:',
+        ele: 'xd-select-list',
+        valueKey: 'bottom_dot_type',
+        groupKey:'content',
+        value: params['bottom_dot_type'] || 'dot',
         placeholder: '请选择广告显示dot类型',
         multiple: false,
         className: 'input80',

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -468,7 +468,8 @@ export default {
     },
   },
   watch: {
-    container(value) {
+    container(value,oloValue) {
+      if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
       this.init(value);
       if(this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(()=>{
@@ -667,12 +668,7 @@ export default {
     init(container) {
       this.height = getContainerPropsValue(container, "content.height", "500");
       // 获取最外面间距，如果没有则设置默认值
-      this.mS = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0,
-      });
+      this.mS = getContainerPropsValue(container, "content.margin", {top: 0, bottom: 0,left: 0, right: 0});
       this.position = getContainerPropsValue(container, "content.position", 1);
       // 获取大小图之间间距，如果没有则设置默认值
       this.msMargin = getContainerPropsValue(container, "content.msMargin", 10);

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmallLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-poster-big-small {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-poster-big-small {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBasePosterBigSmall/getWidthHeight.js

@@ -1,4 +1,4 @@
-function getWidthHeight(height, mS, msMargin) {
+function getWidthHeight(height, mS= {}, msMargin={}) {
   let bigWidth =
     uni.getSystemInfoSync().safeArea.width -
     (mS.left + mS.right + Number(msMargin)) / 2;
@@ -9,4 +9,4 @@ function getWidthHeight(height, mS, msMargin) {
     2;
   return { bigWidth, bigHeight, smallHeight };
 }
-export default getWidthHeight;
+export default getWidthHeight;

package/src/components/JfbBasePosterEntry/Attr.js

@@ -8,15 +8,15 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
-    console.log('params',params);
-    if (!params['number']) params['number'] = 20;
-    if (!params['radius']) params['radius'] = '20';
+    if (!params['number']) params['number'] = '1';
+    if (!params['radius']) params['radius'] = '';
     return [
       {
-        label: '入口配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'entry', //form[valueKey]
+        label: '入口配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'entry',
         className: 'input80',
+        groupKey: 'content',
         value: params.entry || {
           size:  {height: null, width: null},
           type: '1'
@@ -223,21 +223,49 @@ export default {
             loading.close()
           }
         },
+        rules: [{
+          required: true,
+          validator: (rule, value, callback) => {
+            let message = '请设置综合福利入口置相关内容';
+            if(!value) {
+              callback(message);
+              return;
+            }
+            if(value.size && !value.size.height){
+              callback(message);
+              return
+            }
+
+            if(value.size && !value.size.width){
+              callback(message);
+              return
+            }
+            callback()
+          },trigger: ['blur', 'change']
+        }],
+      },
+      {
+        label: '导航内容置使用张数:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'number',
+        value: params.number,
+        placeholder: '请输入导航内容置使用张数',
+        className: 'input60',
+        groupKey: 'content',
         inline: false,
-        notice: '',
-        rules: [
-          {required: true, message: '请选择广告位置', trigger: 'change'},
-        ],
+        notice:'导航内容默认显示使用张数：5张'
       },
       {
         label: '内容间距设置:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
-        value: params.padding || 0,
-        className: 'input40',
+        value: params.padding || '',
+        className: 'input60',
+        groupKey: 'style',
         placeholder: '请设置内容间距',
-        notice: '在使用二分屏显示类型时，该属性生效，单位：像素（px）',
+        notice: '在使用二分屏显示类型时，该属性生效，单位：像素（px）。默认值：<span style="color: red">20</span> 像素',
         inline: false,
       },
       {
@@ -245,13 +273,13 @@ export default {
         ele: 'xd-margin-padding',
         valueKey: 'margin',
         value: params.margin || null,
-        disabled: false,
+        groupKey: 'style',
         setting: {
           type: 'margin',
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
       },
       {
         label: '导航ICON圆角设置:',
@@ -260,6 +288,7 @@ export default {
         value: params['radius'],
         placeholder: '请选择导航ICON圆角设置',
         multiple: false,
+        groupKey: 'style',
         className: 'input80',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
@@ -271,24 +300,6 @@ export default {
             });
         },
       },
-      {
-        label: '导航内容置使用张数:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'number',
-        value: params.number,
-        placeholder: '请输入导航内容置使用张数',
-        className: 'input40',
-        unit:'张',
-        rules: [
-          {
-            required: true,
-            message: '请输入导航内容置使用张数',
-            trigger: 'blur'
-          },
-        ]
-      },
-
     ].filter(i=>i)
   },
   advanced: [