jufubao-base 1.0.311-beta1 → 1.0.311-beta101

package/src/components/JfbBaseNotice/cusAttr/cssThree.js

@@ -0,0 +1,101 @@
+'use strict';
+
+import {dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
+export default function (data, gValue, gColor, oldData) {
+  let style = '1';
+  if(data['style'] !== undefined) style = data['style'];
+  let defBtnFields = ['btnConfirmWidth','','btnConfirmBgColor','btnConfirmTextColor']
+  return [
+    style ==='3' && {
+      ele: 'title',
+      label: '风格三（弹窗显示）',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '弹窗间隔',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'timeStatus',
+      value: statusDataVal({data, key:'timeStatus', fields:['time'],gValue}),
+      labelInline:true,
+      hidden: style !== '3',
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'text',
+      groupKey:'style',
+      valueKey: 'time',
+      value: dataVal({data, key:'time', dValue:3, gValue}),
+      hidden: style !== '3'|| !statusShow({data, key: 'timeStatus', fields:['time'], gValue}),
+      className: 'input100',
+      notice: '弹窗间隔，单位：小时。默认值：<span style="color: red">3</span>小时',
+      unit: '小时',
+    },
+    {ele: 'group_end'},
+    {
+      label: '按钮样式',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'btnStatus',
+      value: statusDataVal({data, key:'btnStatus', fields:defBtnFields,gValue}),
+      labelInline:true,
+      hidden: style !== '3',
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "按钮长度",
+      ele: "el-input",
+      valueKey: "btnConfirmWidth",
+      value: dataVal({data, key:'btnConfirmWidth', dValue:'', gValue}),
+      hidden: style !== '3'|| !statusShow({data, key: 'btnStatus', fields:defBtnFields, gValue}),
+      placeholder: '请输入按钮长度',
+      className: 'inpu100',
+      groupKey: "style",
+      labelInline: true,
+      setting: {
+        showAlpha: true
+      },
+      unit:'px'
+    },
+    {
+      label: "按钮背景",
+      ele: "xd-color",
+      valueKey: "btnConfirmBgColor",
+      groupKey:'style',
+      className: 'inpu100',
+      labelInline: true,
+      value: dataVal({data, key:'btnConfirmBgColor', dValue:'', gValue}),
+      hidden: style !== '3'|| !statusShow({data, key: 'btnStatus', fields:defBtnFields, gValue}),
+      setting: {
+        showAlpha: true
+      },
+      placeholder: '请选择按钮背景颜色',
+    },
+    {
+      label: "按钮文字",
+      ele: "xd-color",
+      valueKey: "btnConfirmTextColor",
+      groupKey:'style',
+      className: 'inpu100',
+      labelInline: true,
+      value: dataVal({data, key:'btnConfirmTextColor', dValue:'', gValue}),
+      hidden: style !== '3'|| !statusShow({data, key: 'btnStatus', fields:defBtnFields, gValue}),
+      setting: {
+        showAlpha: true
+      },
+      placeholder: '请选择按钮文字颜色',
+    },
+    {ele: 'group_end'},
+  ].filter(i=>i)
+}

package/src/components/JfbBaseNotice/cusAttr/cssTwo.js

@@ -0,0 +1,208 @@
+'use strict';
+
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  cRaBorShadow
+} from "@/utils/AttrTools";
+export default function (data, gValue, gColor, oldData) {
+  let style = '1';
+  if(data['style'] !== undefined) style = data['style'];
+
+  let defScrollBorder = cRaBorShadow( data, 'scrollBorder', {dValue:'N', cValue: 'N'},gValue);
+  let defScrollShadow = cRaBorShadow( data, 'scrollShadow', {dValue:'N', cValue: 'N'},gValue);
+
+  return [
+    style === '2' && {
+      ele: 'title',
+      label: '风格二（滚动显示）',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '滚动条件',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'numStatus',
+      value: statusDataVal({data, key:'numStatus', fields:['num'],gValue}),
+      labelInline:true,
+      hidden: style !== '2',
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'el-input',
+      groupKey:'style',
+      type: 'number',
+      valueKey: 'num',
+      value: dataVal({data, key:'num', dValue:1, gValue}),
+      hidden: style !== '2' || !statusShow({data, key: 'numStatus', fields:['num'], gValue}),
+      placeholder: '请输入滚动显示条数，默认：1',
+      className: 'input100',
+      unit: '条'
+    },
+    {ele: 'group_end'},
+
+    {
+      label: '滚动速度',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'speedStatus',
+      value: statusDataVal({data, key:'speedStatus', fields:['speed'],gValue}),
+      labelInline:true,
+      hidden: style !== '2',
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'number',
+      groupKey:'style',
+      valueKey: 'speed',
+      value: dataVal({data, key:'speed', dValue:20, gValue}),
+      hidden: style !== '2' || !statusShow({data, key: 'speedStatus', fields:['speed'], gValue}),
+      placeholder: '请输入滚动速度值，默认：20',
+      className: 'input100',
+      notice: '建议取值：20-60， 值越大越快',
+      inline: false,
+    },
+    {ele: 'group_end'},
+    {
+      label: '圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'scrollRadiusStatus',
+      value: statusDataVal({data, key:'scrollRadiusStatus', cValue: 'N', dValue:'N', fields:['scrollRadius'],gValue}),
+      labelInline:true,
+      hidden: style !== '2',
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '无圆角', value: 'N'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-site-select-list',
+      labelInline: true,
+      valueKey: 'scrollRadius',
+      value: dataVal({data, key:'scrollRadius', dValue:'10', gValue}),
+      hidden: style !== '2' || !statusShow({data, key: 'scrollRadiusStatus', fields:['scrollRadius'], gValue}),
+      placeholder: '请选择圆角',
+      multiple: false,
+      className: 'input100',
+      groupKey:'style',
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'edtix_style_radius',
+          key: Date.now()
+        })
+          .then(res => {
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {ele: 'group_end'},
+
+    {
+      label: '描边',
+      ele: 'xd-border',
+      labelInline: true,
+      groupKey:'style',
+      valueKey: 'scrollBorder',
+      value: defScrollBorder,
+      hidden: style !== '2',
+      setting: {
+        selected:defScrollBorder.type,
+        isRadio: true,//启用editx默认
+        isDef: true, //启动默认选项
+        //==设置默认值==
+        color: '#fff',
+        width: '0',
+        style: 'solid'
+        //==设置默认值==
+      },
+    },
+    {
+      label: '投影',
+      ele: 'xd-shadow',
+      labelInline: true,
+      groupKey:'style',
+      valueKey: 'scrollShadow',
+      value: defScrollShadow,
+      className: 'input100',
+      hidden: style !== '2',
+      setting: {
+        selected: defScrollShadow.type,
+        isRadio:true,
+        isDef: true,
+        default: {
+          color:'rgba(0,0,0,0)',
+          width:'0',
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+          .then(res => {
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+
+    {
+      label: '外边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'scrollMarginStatus',
+      value: statusDataVal({data, key:'scrollMarginStatus', fields:['scrollMargin'],gValue}),
+      labelInline:true,
+      hidden: style !== '2',
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey:'style',
+      valueKey: 'scrollMargin',
+      value: dataVal({
+        data,
+        key:'scrollMargin',
+        dValue:0,
+        gValue,
+        isPM: true,
+      }),
+      hidden: style !== '2' || !statusShow({data, key: 'scrollMarginStatus', fields:['scrollMargin'], gValue}),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+  ].filter(i=>i)
+}

package/src/components/JfbBaseNotice/cusAttr/style.js

@@ -0,0 +1,31 @@
+'use strict';
+
+import cssThree from "./cssThree";
+import cssTwo from "./cssTwo";
+import cssOne from "./cssOne";
+export default function (data, gValue, gColor, oldData) {
+  return [
+    ...cssOne(data, gValue, gColor, oldData),
+    ...cssTwo(data, gValue, gColor, oldData),
+    ...cssThree(data, gValue, gColor, oldData),
+    {
+      label: '版本号:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'content',
+      valueKey: 'version',
+      value: 'v2.0',
+      hidden: true,
+    },
+    {
+      label: '过滤引用模版字段:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'content',
+      valueKey: 'refFilterKey',
+      value: '[]',
+      hidden: true,
+    },
+  ].filter(i=>i);
+}
+

package/src/components/JfbBaseVideo/Attr.js

@@ -1,309 +1,17 @@
 'use strict';
 
-import console from "@dcloudio/uni-h5/src/core/helpers/console";
+import content from "./cusAttr/content";
+import style from "./cusAttr/style";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style:[],
-  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)
-    };
+  content:(data, gValue, gColor, oldData={})=>{
     return [
-      {
-        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>像素',
-      },
-
+      ...content(data, gValue,gColor,oldData),
+      ...style(data, gValue, gColor, oldData)
     ].filter(i=>i)
   },
   advanced: [