jufubao-base 1.0.134-beta8 → 1.0.134

package/src/components/JfbBaseVideo/JfbBaseVideo.vue

@@ -14,29 +14,16 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-video__body">
-      <view class="x-line"></view>
-      <view
-        class="x-video"
-        :style="{
-          backgroundColor:bgColor,
-          margin:outMargin,
-          borderRadius:radius + 'rpx',
-          padding:outPadding,
-          width: contentWidth + 'rpx',
-          height:contentHeight + 'rpx'
-        }"
-      >
-
+      <view class="float"></view>
+      <view class="video" v-if="video !== null">
         <xd-video
-          v-if="video !== null && video !== ''"
           :key="videoKey"
+          :margin="margin"
           :poster="videoSetting"
           :video="video"
+          :radius="radius"
           :pack-this="$vm"
         ></xd-video>
-        <view class="not-video" v-if="video === ''">
-          <image :src="getVideoSrc"></image>
-        </view>
       </view>
     </view>
   </view>
@@ -68,10 +55,6 @@
         video: null,
         videoSetting: null,
         margin:{},
-        padding:{},
-        height:0,
-        width:750,
-        bgColor:'',
         radius:0,
         $vm: {},
         videoKey : Date.now()
@@ -84,51 +67,39 @@
         if(this.autoplay === 'R') return 'iconplayreplay';
       },
       contentWidth(){
-        let margin = Number(this.checkValue(this.margin.left, 0)) + Number(this.checkValue(this.margin.right, 0));
-        let padding = Number(this.checkValue(this.padding.left, 0)) + Number(this.checkValue(this.padding.right, 0));
         let border = 0;
-        //if(this.isPreview) border = 2;
-        return this.width - (padding + margin + border);
+        if(this.isPreview) border = 2;
+        return 750 - (this.margin.left + this.margin.right + border);
       },
       contentHeight(){
-        let margin = Number(this.checkValue(this.margin.left, 0)) + Number(this.checkValue(this.margin.right, 0));
-        let padding = Number(this.checkValue(this.padding.left, 0)) + Number(this.checkValue(this.padding.right, 0));
         let border = 0;
-        //if(this.isPreview) border = 2;
-        let winWidth = this.width - (padding + margin + border);
+        if(this.isPreview) border = 2;
+        let winWidth = 750 - ((this.margin.left||0) + (this.margin.right||0) + border);
         return winWidth * this.height/this.width;
       },
+
       outMargin(){
-        let str = `${this.checkValue(this.margin.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.left, 0)}rpx`;
-        return str
-      },
-      outPadding(){
-        let str = `${this.checkValue(this.padding.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left, 0)}rpx`;
-        return str
-      },
-      getVideoSrc(){
-        let width = Math.floor(this.contentWidth * this.$rpxNum);
-        let height = Math.floor(this.contentHeight * this.$rpxNum);
-        return `//dummyimage.com/${width}x${height}`;
+        let margin = `${this.margin.top !== null ? this.margin.top : 0}rpx`;
+        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 0}rpx`;
+        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom :0}rpx`;
+        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 0}rpx`;
+        return margin;
       }
 		},
     watch: {
-      container(value, oloValue) {
-        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+      container(value) {
         this.init(value);
-        if (this.$configProject['isPreview']) this.onJfbLoad(this.options)
+        if(this.timer) clearTimeout(this.timer);
+        this.timer = setTimeout(()=>{
+          if (this.$configProject['isPreview']) this.onJfbLoad(this.options)
+				}, 400)
       }
     },
     created() {
       this.$vm = this;
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
+
     },
     methods: {
 
@@ -138,14 +109,8 @@
        */
       init(container) {
         this.videoSetting = getContainerPropsValue(container, 'content.video', {size:{width: 400, height: 300}, type: '1'});
-        if(this.videoSetting && this.videoSetting.size && this.videoSetting.size.height) {
-          this.height = Number(this.videoSetting.size.height) || 563;
-          this.width = 750;
-        }
-        this.margin = getContainerPropsValue(container, 'content.margin', {});
-        this.padding = getContainerPropsValue(container, 'content.padding', {});
+        this.margin = getContainerPropsValue(container, 'content.margin', {top:0, bottom:0, right:0, left: 0});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
-        this.bgColor = getContainerPropsValue(container, 'content.bgColor', 'rgba(0,0,0,0)');
       },
 
       onJfbLoad(options) {
@@ -162,7 +127,6 @@
             if(res && res.list &&  res.list.length > 0) {
               this.video = res.list[0];
             }
-            else this.video = '';
             this.videoKey = Date.now()
           })
           .catch(error => {
@@ -184,20 +148,15 @@
 
   .jfb-base-video {
     &__body{
-      .x-video {
-        overflow: hidden;
-      }
 
-      .not-video {
-        width: 100%;
-        height: 100%;
-
-        & > image {
-          width: 100%;
-          height: 100%;
-        }
-      }
     }
+
+  }
+
+  .float {
+    height: 1px;
+    width: 100%;
+    overflow: hidden;
   }
 
 </style>

package/src/components/JfbBaseVideo/JfbBaseVideoLess.less

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

package/src/components/JfbBaseVideo/XdVideo.vue

@@ -1,6 +1,18 @@
 <template>
-  <view class="video-box">
-    <view class="thumb" :class="{noImageUrl: !imageUrl}" v-if="!playStatus">
+  <view
+    class="video-box"
+    :style="{
+      width: contentWidth + 'rpx',
+      height:contentHeight + 'rpx',
+      margin: outMargin
+    }"
+  >
+    <view
+      class="thumb"
+      :class="{noImageUrl: !imageUrl}"
+      v-if="!playStatus"
+      :style="{borderRadius: radius + 'rpx'}"
+    >
       <image :src="imageUrl" v-if="imageUrl" />
       <view v-if="videoUrl" @click="handlePlay()">
         <xd-font-icon
@@ -8,6 +20,7 @@
           size="100"
           color="#fff"
         ></xd-font-icon>
+
       </view>
     </view>
     <view
@@ -39,7 +52,12 @@
       margin:{
         type: Object,
         default(){
-          return {}
+          return {
+            top:0,
+            left:0,
+            right:0,
+            bottom:0
+          }
         }
       },
       poster:{
@@ -63,6 +81,10 @@
       return {
         isPreview: false,
 
+        //css
+        width: 0,
+        height: 0,
+
         //play
         imageUrl: '',
         videoUrl: '',
@@ -76,6 +98,25 @@
         if(this.autoplay === 'E') return 'iconshibai';
         if(this.autoplay === 'R') return 'iconplayreplay';
       },
+      contentWidth(){
+        let border = 0;
+        if(this.isPreview) border = 2;
+        return 750 - (this.margin.left + this.margin.right + border);
+      },
+      contentHeight(){
+        let border = 0;
+        if(this.isPreview) border = 2;
+        let winWidth = 750 - ((this.margin.left||0) + (this.margin.right||0) + border);
+        return winWidth * this.height/this.width;
+      },
+
+      outMargin(){
+        let margin = `${this.margin.top !== null ? this.margin.top : 0}rpx`;
+        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 0}rpx`;
+        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom :0}rpx`;
+        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 0}rpx`;
+        return margin;
+      }
     },
     watch:{
       poster(){
@@ -132,9 +173,6 @@
 
 <style scoped lang="less">
 .video-box {
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
   view.noImageUrl {
     background: rgba(0,0,0,.6);
   }

package/src/components/JfbBaseWallet/Attr.js

@@ -11,7 +11,6 @@ export default {
         label: '更改分类label(可排序):',
         ele: 'xd-set-sort-label',
         valueKey: 'newLabel',
-        groupKey:'content',
         value: data['newLabel'] || null,
         disabled: false,
         defaultValue: data['newLabel'],
@@ -21,7 +20,7 @@ export default {
             label: "票券",
             value: 'card',
             sort: 1
-          },
+          }, 
           {
             icon: "iconyuanbao",
             label: "元宝",
@@ -40,41 +39,36 @@ export default {
         label: '是否展示票券入口:',
         ele: 'xd-radio',
         valueKey: 'isCard',
-        groupKey:'content',
         value: data['isCard'] || 'Y',
         list: [
           { "label": "是", "value": 'Y' },
           { "label": "否", "value": 'N' },
         ]
       },
-
+      {
+        label: '票券跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardPath',
+        value: data['cardPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
       {
         label: '是否展示元宝入口:',
         ele: 'xd-radio',
         valueKey: 'isYuanbao',
-        groupKey:'content',
         value: data['isYuanbao'] || 'Y',
         list: [
           { "label": "是", "value": 'Y' },
           { "label": "否", "value": 'N' },
         ]
       },
-      {
-        label: '是否展示积分入口:',
-        ele: 'xd-radio',
-        valueKey: 'isIntegral',
-        groupKey:'content',
-        value: data['isIntegral'] || 'Y',
-        list: [
-          { "label": "是", "value": 'Y' },
-          { "label": "否", "value": 'N' },
-        ]
-      },
       {
         label: '元宝跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'yuanbaoPath',
-        groupKey:'advanced',
         value: data['yuanbaoPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
@@ -82,20 +76,18 @@ export default {
         inline: false,
       },
       {
-        label: '票券跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'cardPath',
-        groupKey:'advanced',
-        value: data['cardPath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-        inline: false,
+        label: '是否展示积分入口:',
+        ele: 'xd-radio',
+        valueKey: 'isIntegral',
+        value: data['isIntegral'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
       },
       {
         label: '积分跳转路径:',
         ele: 'xd-select-pages-path',
-        groupKey:'advanced',
         valueKey: 'integralPath',
         value: data['integralPath'] || {},
         setting: {

package/src/components/JfbBaseWallet/JfbBaseWalletLess.less

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

package/src/components/JfbBaseWalletDetail/Attr.js

@@ -6,7 +6,11 @@
 export default {
   style: [],
   content: (data) => {
-    return [].filter(i=>i)
+    return [
+
+    ].filter(i=>i)
   },
-  advanced: [],
+  advanced: [
+  ],
 };
+ 

package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetailLess.less

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

package/src/components/JfbBaseWalletEffective/JfbBaseWalletEffectiveLess.less

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

package/src/components/JfbBaseWalletIndex/Attr.js

@@ -11,17 +11,15 @@ export default {
         label: '钱包详情跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'walletDetailPath',
-        groupKey:'advanced',
         value: data['walletDetailPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },
         inline: false,
-      },
+      }, 
       {
         label: '账单详情跳转路径:',
         ele: 'xd-select-pages-path',
-        groupKey:'advanced',
         valueKey: 'billDetailPath',
         value: data['billDetailPath'] || {},
         setting: {

package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndexLess.less

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