jufubao-base 1.0.192 → 1.0.194-beta1

package/package.json

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

package/src/components/JfbBaseImageBlock/JfbBaseImageBlock.vue

@@ -0,0 +1,111 @@
+<template>
+  <view
+    class="jfb-base-image-block"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-image-block__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-image-block__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-image-block__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseImageBlockMixin from "./JfbBaseImageBlockMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseImageBlock",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseImageBlockMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+
+        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseImageBlockLess.less";
+
+  .jfb-base-image-block {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBaseImageBlock/JfbBaseImageBlockLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-image-block {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-image-block {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseImageBlock/JfbBaseImageBlockMixin.js

@@ -0,0 +1,18 @@
+'use strict';
+
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      // #endif
+      cssRoot: 'jfb-base-image-block'
+    }
+  },
+  created() {
+    
+
+  },
+}

package/src/components/JfbBaseLogin/Attr.js

@@ -1091,12 +1091,7 @@ export default {
         groupKey:'style',
         ele: 'xd-margin-padding',
         valueKey: 'agreePadding',
-        value: data.agreePadding || {
-          top: 40,
-          left: 20,
-          right: 20,
-          bottom: 0
-        },
+        value: data.agreePadding || null,
         setting: {
           type: 'padding',
         },

package/src/components/JfbBasePhoneCollect/Attr.js

@@ -930,12 +930,7 @@ export default {
         groupKey: 'style',
         ele: 'xd-margin-padding',
         valueKey: 'agreePadding',
-        value: data.agreePadding || {
-          top: 40,
-          left: 20,
-          right: 20,
-          bottom: 0
-        },
+        value: data.agreePadding || null,
         setting: {
           type: 'padding',
         },

package/src/components/JfbBasePhoneLogin/Attr.js

@@ -919,12 +919,7 @@ export default {
         groupKey: 'style',
         ele: 'xd-margin-padding',
         valueKey: 'agreePadding',
-        value: data.agreePadding || {
-          top: 40,
-          left: 20,
-          right: 20,
-          bottom: 0
-        },
+        value: data.agreePadding || null,
         setting: {
           type: 'padding',
         },

package/src/components/JfbBasePoster/Attr.js

@@ -355,11 +355,17 @@ export default {
           {"label": "三行", "value": 3},
         ]
       },
+      {
+        ele: 'title',
+        label: '广告样式设置',
+        size: 'small',
+        groupKey:'content',
+      },
       {
         label: '广告位边距设置:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
-        groupKey:'style',
+        groupKey:'content',
         value: params.margin || null,
         setting: {
           type: 'margin',
@@ -374,7 +380,7 @@ export default {
         ele: 'xd-margin-padding',
         valueKey: 'bgImagePadding',
         value: params['bgImagePadding'] || null,
-        groupKey:'style',
+        groupKey:'content',
         setting: {
           type: 'padding',
         },
@@ -388,7 +394,7 @@ export default {
         type: 'number',
         valueKey: 'padding',
         value: params.padding || 0,
-        groupKey:'style',
+        groupKey:'content',
         className: 'input40',
         placeholder: '请广告内容之间间距设置',
         notice: '请广告内容之间间距设置。<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
@@ -398,7 +404,7 @@ export default {
         label: '广告圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        groupKey:'style',
+        groupKey:'content',
         value: params['radius'] || '20',
         placeholder: '请选择广告圆角设置',
         multiple: false,

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -15,7 +15,7 @@
     <!-- #endif -->
     <view class="jfb-base-poster__body" v-if="noData">
       <view class="x-line"></view>
-      <view class="jfb-base-poster-cont" :style="getBodyStyle">
+      <view class="jfb-base-poster-cont" :style="[getBodyStyle]">
         <!--一分屏-->
         <template v-if="posterType === '1'">
           <view
@@ -106,7 +106,7 @@
       </view>
     </view>
     <!--解决图片缓冲预加载问题-->
-    <view v-for="(item,index) in info" :key="index" style="position: absolute; top: -19999px; left: -100000px">
+    <view v-if="item.image_background_url" v-for="(item,index) in info" :key="index" style="position: absolute; top: -19999px; left: -100000px">
       <image :src="item.image_background_url" ></image>
     </view>
     <!--解决图片缓冲预加载问题-->
@@ -180,9 +180,9 @@
         }
         image = Object.assign({},image,{
           margin: this.margin,
-          padding: this.outPadding
+          padding: this.outPadding,
         })
-        return this.styleObjectToString(image)
+        return image
       },
       getOneWidth(){
         let margin = this.checkValue(this.mS.left, 0) +  this.checkValue(this.mS.right, 0);
@@ -212,6 +212,7 @@
           carouselTime: this.carouselTime,
           radius: this.radius,
           padding: this.padding,
+          bgImagePadding: this.bgImagePadding,
           rows: this.rows,
           cell,
           height,
@@ -655,6 +656,7 @@
   @import "./JfbBasePosterLess.less";
 
   .jfb-base-poster {
+    min-height: 60rpx!important;
     &__body{
       & > view.jfb-base-poster-cont {
         box-sizing: border-box;

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -33,7 +33,7 @@
 				field="content_name"
 				:mode="config.mode"
 				:dots-styles="config.dotStyleData"
-				:style="{height:(getHeight + 46 * $rpxNum) + 'px', width:'100%'}"
+				:style="{height:(outHeight) + 'px', width:'100%'}"
 			>
         <!--#ifdef MP-WEIXIN-->
         <swiper
@@ -151,7 +151,13 @@
         let height = this.height * this.config.rows;
         let padding = 0;
         if (this.config.rows >= 2) padding = Number(this.config.padding) * this.$rpxNum * (this.config.rows -1);
-        return height + padding;
+        return height + padding
+      },
+
+      outHeight(){
+        let modeHeight = 46 * this.$rpxNum ;
+        if(this.config.mode === "normal") modeHeight = 0;
+        return this.getHeight + modeHeight;
       },
 		},
     watch: {