jufubao-base 1.0.311-beta101 → 1.0.311-beta3

package/src/components/JfbBaseVideo/Attr.js

@@ -1,17 +1,309 @@
 'use strict';
 
-import content from "./cusAttr/content";
-import style from "./cusAttr/style";
+import console from "@dcloudio/uni-h5/src/core/helpers/console";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style:[],
-  content:(data, gValue, gColor, oldData={})=>{
+  content:(params)=>{
+    let size = {width:750};
+    let video = {
+      size: Object.assign({},(params.video && params.video.size),size),
+      type:'1',
+      position: Object.assign({},params.video && params.video.position)
+    };
     return [
-      ...content(data, gValue,gColor,oldData),
-      ...style(data, gValue, gColor, oldData)
+      {
+        label: '视频位置配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'video',
+        groupKey:'content',
+        className: 'input80',
+        value:video,
+        setting: {
+          count: 1,
+          scene: {label: '视频', value: 'video'},
+          sizeDisabled: {
+            wDisabled:true,
+            hDisabled: false,
+          },
+          typeDisabled: true
+        },
+        handleCustom({action, data}) {
+          //设置场景参数
+          if(data) {
+            data.params = Object.assign({}, {scene: 'video'}, data.params || {})
+          }
+
+          //获取显示内容
+          if (action === 'screenList') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
+              .then(res => {
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getPosterInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb({list: res.list, selectId: res.selected})
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb(res)
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          let loading = XdBus.getParentApi('loading')({});
+          //位置列表
+          if (action === 'getListPostion') {
+            XdBus.getParentApi('getListPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置创建
+          if (action === 'addPostion') {
+            XdBus.getParentApi('addPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置编辑
+          if (action === 'editPostion') {
+            XdBus.getParentApi('updatePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置删除
+          if (action === 'deleltePostion') {
+            XdBus.getParentApi('deletePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            XdBus.getParentApi('getListPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //广告内容创建
+          if (action === 'addContent') {
+            XdBus.getParentApi('addPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容编辑
+          if (action === 'editContent') {
+            XdBus.getParentApi('updatePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容删除
+          if (action === 'deleteContent') {
+            XdBus.getParentApi('deletePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告内容跳转地址类型
+          if (action === 'jumpPosterContentType') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
+              .then(res => {
+                loading.close();
+                data.cb(res['redirect_type'])
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //发布
+          if (action === 'publish') {
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //获取站内页面地址
+          if (action === 'router') {
+            loading.close()
+            return XdBus.getParentApi('getPagesTree');
+
+          }
+
+          //通知页面进行刷新
+          if(action === 'update') {
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            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.position && (!value.position['position_name'] || !value.position['position_id'])) {
+              //   callback(message);
+              //   return
+              // }
+              callback()
+            },trigger: ['blur', 'change']
+          }
+        ],
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        groupKey:'style',
+        value: params.bgColor || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        groupKey:'style',
+        value: params['radius'] || '0',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input60',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '视频位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        groupKey:'style',
+        value: params.margin || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置视频位边距设置',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '视频位填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'padding',
+        groupKey:'style',
+        value: params.padding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置视频位填充设置',
+        inline: false,
+        notice: '设置填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBaseVideo/JfbBaseVideo.vue

@@ -18,12 +18,19 @@
       <view
         v-if="isShow"
         class="x-video"
-        :style="[boxStyleComp]"
+        :style="{
+          backgroundColor:bgColor,
+          margin:outMargin,
+          borderRadius:radius + 'rpx',
+          padding:outPadding,
+          width: contentWidth + 'rpx',
+          height:contentHeight + 'rpx'
+        }"
       >
         <xd-video
-          v-if="!['',null].includes(video)"
+          v-if="video !== null && video !== ''"
           :key="videoKey"
-          :poster="videoConf"
+          :poster="videoSetting"
           :video="video"
         ></xd-video>
         <view class="not-video" v-if="isPreview && video === ''">
@@ -40,7 +47,7 @@
   import JfbBaseVideoMixin from "./JfbBaseVideoMixin";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
-  import {gCPVal } from "@/utils/xd.base";
+  import { getContainerPropsValue } from "@/utils/xd.base";
   import XdVideo from "./XdVideo.vue";
 
 
@@ -52,46 +59,60 @@
     mixins: [componentsMixins,extsMixins,JfbBaseVideoMixin],
     data() {
       return {
-        closeMask: true,
         isPreview: false,
         page_size: 1,
+        options:{},
 
-        //视频配置
-        video: null, //视频内容
-        videoKey : Date.now(),
-        videoConf: null, //视频配置
-
-        //样式
+        //data
+        video: null,
+        videoSetting: null,
         margin:{},
         padding:{},
-        height:388,
-        width:690,
-        bgColor:'rgba(0,0,0,0)',
+        height:0,
+        width:750,
+        bgColor:'',
         radius:0,
+        videoKey : Date.now(),
       }
     },
 		computed: {
-      boxStyleComp(){
-        return {
-          backgroundColor: this.bgColor,
-          borderRadius: this.radius + 'rpx',
-          margin: this.getMarginAndPadding(this.margin, 0),
-          padding: this.getMarginAndPadding(this.padding, 0),
-          width: this.contentWidth + 'rpx',
-          height: this.contentHeight + 'rpx'
-        }
-      },
       isShow(){
         if(this.isPreview) return true;
         else return this.video
       },
+      iconFont(){
+        if(this.autoplay === 'N') return 'iconplayright'
+        if(this.autoplay === 'E') return 'iconshibai';
+        if(this.autoplay === 'R') return 'iconplayreplay';
+      },
       contentWidth(){
-        let marginRL = this.getPMValue(this.margin,'RL',0);
-        let paddingRL = this.getPMValue(this.padding,'RL',0);
-        return 750 - (marginRL + paddingRL)
+        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);
       },
       contentHeight(){
-        return (this.height*this.contentWidth)/this.width;
+        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);
+        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);
@@ -104,7 +125,7 @@
         if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) {
           this.init(value);
-          this.onJfbLoad()
+          this.onJfbLoad(this.options)
         }
       }
     },
@@ -119,14 +140,19 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.videoConf = gCPVal(container, 'video', { size: {width:690, height: 388}, type: '1'});
-        this.radius = gCPVal(container, 'radius', [this.gStyleValue.radius,0],{sKey: 'radiusStatus', fields: ['radius']})||0;
-        this.bgColor = gCPVal(container, 'bgColor', '#fff',{sKey: 'bgColorStatus', fields: ['bgColor']});
-        this.margin = gCPVal(container, 'margin', [0],{sKey: 'marginStatus', fields: ['margin'], isPMR: true});
-        this.padding = gCPVal(container, 'padding', [0],{sKey: 'paddingStatus', fields: ['padding'], isPMR: true});
+        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.radius = getContainerPropsValue(container, 'content.radius', 0);
+        this.bgColor = getContainerPropsValue(container, 'content.bgColor', 'rgba(0,0,0,0)');
       },
 
-      onJfbLoad() {
+      onJfbLoad(options) {
+        this.options = options;
         jfbRootExec('getListVideoContent', {
           vm: this,
           data: {
@@ -148,7 +174,7 @@
       },
 
       onJfbUpdate() {
-        this.onJfbLoad();
+        this.onJfbLoad(this.options);
       },
 
     }

package/src/components/JfbBaseEntry/cusAttr/content.js

@@ -1,77 +0,0 @@
-'use strict';
-
-import {dataVal} from "@/utils/AttrTools";
-
-export default (data, gValue, gColor, oldData)=>{
-  let entryType = 'default'
-  if(data['entryType'] !== undefined) entryType = data['entryType']
-
-  let rowNum = 1;
-  if(data['rowNum'] !== undefined) rowNum = data['rowNum'];
-
-  return[
-    {
-      ele: 'title',
-      label: '基础',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: '入口分组',
-      ele: 'xd-site-select-list',
-      valueKey: 'entryType',
-      value: entryType,
-      placeholder: '请选择综合入口分组',
-      multiple: false,
-      groupKey:'content',
-      className: 'input100',
-      labelInline:true,
-      rules: [
-        {required: true, message: '请选择综合入口分组', trigger: ['blur', 'change']}
-      ],
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
-          .then(res => {
-            debugger
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {
-      ele: 'title',
-      label: '组件样式',
-      size: 'small',
-      groupKey:'content',
-    },
-
-    {
-      label: "组件样式",
-      ele: "xd-style-image",
-      groupKey: 'content',
-      valueKey: "rowNum",
-      value: rowNum,
-      labelInline:true,
-      className: 'input100',
-      handleCustom(cusRes) {
-        XdBus.getParentApi('getCompStylesOptions')({
-          layout_ids: 'gXd7Z5uu31nJpfZzlFgYz',
-          key: Date.now()
-        })
-          .then(res => {
-            res.list = res.list.map(item => {
-              item.value = Number(item.value)
-              return item;
-            })
-            cusRes.data.cb(res)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-
-  ].filter(i=>i)
-}