jufubao-base 1.0.198-beta1 → 1.0.200-beta1

package/src/components/JfbBasePosterBigSmall/getWidthHeight.js

@@ -1,12 +1,10 @@
-function getWidthHeight(height, mS= {}, msMargin={}) {
-  let bigWidth =
-    uni.getSystemInfoSync().safeArea.width -
-    (mS.left + mS.right + Number(msMargin)) / 2;
-  let bigHeight = height - (mS.top + mS.bottom);
+function getWidthHeight(height, mS= {}, msMargin={}, $vm) {
+  let marginRL = $vm.checkValue(mS.left, 0) +  $vm.checkValue(mS.right, 0);
+  let marginTB = $vm.checkValue(mS.top, 0) +  $vm.checkValue(mS.bottom, 0);
+  let bigWidth = (750 - (marginRL + Number(msMargin)))/2;
+  let bigHeight = height - marginTB;
   // 获取容器高度，减去margin的值，再除以2，获取小图高度
-  let smallHeight =
-    (height - (mS.top + mS.bottom + Number(msMargin))) /
-    2;
+  let smallHeight = (height - (marginTB + Number(msMargin)))/2;
   return { bigWidth, bigHeight, smallHeight };
 }
 export default getWidthHeight;

package/src/components/JfbBaseUserCenter/Attr.js

@@ -1,11 +1,18 @@
 'use strict';
 
+import {oldTonNewBorAndSha, checkValue} from '@/utils/AttrTools'
+
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
   content:(data)=>{
+    let defContBorder = oldTonNewBorAndSha(data.contBorder, data.is_border,data.is_border_w ,data.is_border_c,'solid');
+    if(defContBorder.type === 'Y' && data.is_border ==='Y') {
+      data.is_border = 'N'
+    }
+
     return [
       {
         label: '',
@@ -24,15 +31,26 @@ export default {
         className: 'input80',
         rules: [
           {
-            required: true,
+            required: false,
             validator: (rule, value, callback) => {
               value = value.trim();
+              if(value.length === 0) return callback()
               if (value.length < 1 || value.length > 4) callback('卡券自定义名称长度为：1-4字符');
               else callback()
             },
             trigger: 'blur'
           }
         ],
+        notice: '卡券自定义名称设置，默认值：<span style="color:red">卡券</span>，长度为：1-4字符',
+        inline: false,
+      },
+
+      //style
+      {
+        ele: 'title',
+        label: '基础设置',
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '卡券文字颜色:',
@@ -42,13 +60,8 @@ export default {
         value: data['cardNameColor'] || null,
         placeholder: '请选择卡券文字颜色',
         classNmae: 'input80',
-      },
-
-      {
-        ele: 'title',
-        label: '整体风格',
-        size: 'small',
-        groupKey:'style',
+        hidden:true,
+        labelInline:true,
       },
       {
         label: '背景颜色:',
@@ -58,6 +71,7 @@ export default {
         value: data['bodyBackgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
+        labelInline:true,
       },
       {
         label: '圆角设置:',
@@ -66,6 +80,7 @@ export default {
         groupKey:'style',
         value: data['bodyRadius'],
         placeholder: '请选择圆角设置',
+        labelInline:true,
         multiple: false,
         className: 'input80',
         handleCustom({action, data}) {
@@ -79,13 +94,13 @@ export default {
         },
       },
       {
-        label: '间距:',
+        label: '行间距:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
         groupKey:'style',
         value: data.padding || '',
-        placeholder: '请输入间距',
+        placeholder: '请输入行间距',
         className: 'input60',
         inline: false,
         notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
@@ -104,7 +119,7 @@ export default {
         notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: '填充:',
+        label: '外填充:',
         ele: 'xd-margin-padding',
         valueKey: 'bodyPadding',
         groupKey:'style',
@@ -114,14 +129,200 @@ export default {
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：0像素',
+      },
+      {
+        label: '标题边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'titleMargin',
+        groupKey:'style',
+        value: data['titleMargin'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置标题边距',
+        inline: false,
+        notice: '设置标题边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
       },
       {
         ele: 'title',
-        label: '内容区域风格',
+        label: `我的${data['cardName'] || '卡券'}设置`,
         size: 'small',
         groupKey:'style',
       },
+      {
+        label: "标题样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'titleStyle',
+        value: data['titleStyle'] || null,
+        setting: {
+          fontSize: true,
+          color: true,
+          bgColor: false,
+          weight: true,
+          selected:false
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        ele: 'title',
+        label: `添加${data['cardName'] || '卡券'}设置`,
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '是否展示ICON:',
+        ele: 'xd-radio',
+        valueKey: 'isShowICONBtn',
+        value: data['isShowICONBtn'] || 'N',
+        groupKey:'style',
+        multiple: false,
+        labelInline:true,
+        className: 'input80',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
+      },
+      {
+        label: "文字样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'addBtnStyle',
+        value: data['addBtnStyle'] || null,
+        setting: {
+          fontSize: true,
+          color: true,
+          bgColor: false,
+          weight: true,
+          selected:false
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '圆角设置:',
+        labelInline:true,
+        ele: 'xd-site-select-list',
+        valueKey: 'addBtnRadius',
+        groupKey:'style',
+        value: data['addBtnRadius'] || '40',
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'addBtnBgColor',
+        groupKey:'style',
+        value: data['addBtnBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+        labelInline:true,
+      },
+      {
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'style',
+        valueKey: 'addBtnShadow',
+        value: data['addBtnShadow'] || '',
+        labelInline:true,
+        setting: {
+          selected: 'N'
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置:',
+        ele: 'xd-border',
+        groupKey:'style',
+        valueKey: 'addBtnBorder',
+        labelInline:true,
+        setting: {
+          isDef: true,
+          selected: 'D',
+        },
+        value: data['addBtnBorder'] || {},
+      },
+
+
+
+      {
+        ele: 'title',
+        label: `内容基础设置`,
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'contentPadding',
+        groupKey:'style',
+        value: data['contentPadding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color:red">40</span>像素',
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        groupKey:'style',
+        value: data['radius'] || '10',
+        placeholder: '请选择内容圆角设置',
+        labelInline:true,
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',
@@ -130,32 +331,96 @@ export default {
         value: data['backgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
+        labelInline:true,
+      },
+      {
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'style',
+        valueKey: 'contShadow',
+        labelInline:true,
+        value: data['contShadow'] || '',
+        setting: {
+          selected: 'N'
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置:',
+        ele: 'xd-border',
+        groupKey:'style',
+        valueKey: 'contBorder',
+        value: defContBorder,
+        labelInline:true,
+        setting: {
+          selected: defContBorder.type
+        },
+      },
+      {
+        ele: 'title',
+        label: `进入我的${data['cardName'] || '卡券'}设置`,
+        size: 'small',
+        groupKey:'style',
       },
       {
-        label: '按钮背景颜色:',
+        label: '圆角设置:',
+        labelInline:true,
+        ele: 'xd-site-select-list',
+        valueKey: 'btnRadius',
+        value: data['btnRadius'] || '40',
+        groupKey:'style',
+        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-color',
         valueKey: 'btnBgColor',
         groupKey:'style',
         value: data['btnBgColor'] || null,
-        placeholder: '请选择按钮背景颜色',
+        placeholder: '请选择背景颜色',
         classNmae: 'input80',
+        labelInline:true,
       },
       {
-        label: '按钮文字颜色:',
+        label: '文字颜色:',
         ele: 'xd-color',
         valueKey: 'btnTextColor',
         groupKey:'style',
         value: data['btnTextColor'] || null,
-        placeholder: '请选择按钮文字颜色',
+        placeholder: '请选择文字颜色',
         classNmae: 'input80',
+        labelInline:true,
       },
       {
-        label: '按钮文字大小:',
+        label: '文字大小:',
         ele: 'xd-site-select-list',
         valueKey: 'btnFontSize',
         groupKey:'style',
         value: data['btnFontSize'] || '',
-        placeholder: '请选择按钮文字大小',
+        placeholder: '请选择文字大小',
         multiple: false,
         className: 'input80',
         handleCustom({action, data}) {
@@ -171,11 +436,13 @@ export default {
         },
       },
 
+      //=====属性已废弃(不能删除，已隐藏)====
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
+        hidden: true
       },
       {
         label: '是否有边框:',
@@ -186,12 +453,13 @@ export default {
         placeholder: '请选择是否有边框',
         multiple: false,
         className: 'input80',
+        hidden: true,
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
         ]
       },
-      data['is_border'] === 'Y' && {
+      {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
@@ -199,8 +467,9 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
+        hidden: true
       },
-      data['is_border'] === 'Y' && {
+      {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
@@ -209,26 +478,11 @@ export default {
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
+        hidden: true
       },
-      {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        groupKey:'style',
-        value: data['radius'] || '10',
-        placeholder: '请选择内容圆角设置',
-        multiple: false,
-        className: 'input80',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
+      //=====属性已废弃(不能删除，已隐藏)====
+
+
       {
         label: '添加卡券路径:',
         ele: 'xd-select-pages-path',
@@ -236,43 +490,34 @@ export default {
         groupKey:'advanced',
         placeholder: '请选择添加卡券路径',
         value: data['add_url'] || null,
+        className: 'input100',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择添加卡券路径', trigger: 'change'},
-        ],
-        inline: false,
       },
       {
         label: '设置支付密码路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'pwd_url',
         groupKey:'advanced',
+        className: 'input100',
         placeholder: '请选择设置支付密码路径',
         value: data['pwd_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择设置支付密码路径', trigger: 'change'},
-        ],
-        inline: false,
       },
       {
         label: '进入我的票券路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'card_url',
         groupKey:'advanced',
+        className: 'input100',
         placeholder: '请选择进入我的票券路径',
         value: data['card_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择进入我的票券路径', trigger: 'change'},
-        ],
-        inline: false,
       },
       {
         label: '',