jufubao-base 1.0.197-beta5 → 1.0.197-beta7

package/src/components/JfbBaseUserInfo/Attr.js

@@ -1,18 +1,24 @@
 'use strict';
+import {oldTonNewBorAndSha, checkValue} from '@/utils/AttrTools'
 import ICONS from "@/ICONS.js"
+
 /**
  * @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'
+    }
+
+    let defContShadow = oldTonNewBorAndSha(data.contShadow, data.is_shadow,data.is_shadow_w ,data.is_shadow_bg);
+    if(defContShadow.type === 'Y' && data.is_shadow ==='Y') {
+      data.is_shadow = 'N'
+    }
+
     return [
-      {
-        label: '',
-        ele: 'slot',
-        slot: 'is_reference_title',
-        groupKey:'advanced',
-      },
       {
         label: '内容排版:',
         ele: 'xd-radio',
@@ -31,19 +37,68 @@ export default {
         label: "头像右侧内容:",
         ele: "xd-radio-self",
         valueKey: "rightContent",
-        value: data.rightContent,
+        value: data.rightContent || {
+          type: "logout",
+          name: "退出登录",
+          icon: "",
+          iconName: "",
+        },
         groupKey: "content",
         setting: {
           icons: ICONS
         }
       },
+      // {
+      //   label: '退出登录自定义名称:',
+      //   ele: 'el-input',
+      //   type: 'text',
+      //   groupKey:'content',
+      //   valueKey: 'logoutName',
+      //   value: data['logoutName'] || '',
+      //   notice: '退出登录自定义名称设置，默认值：<span style="color:red">[退出登录]</span>',
+      //   inline: false,
+      //   className: 'input60',
+      // },
+
       {
-        label: '内容文字颜色:',
+        ele: 'title',
+        label: '基础',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '设置外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        groupKey:'style',
+        value: data['margin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: '设置填充:',
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'padding',
+        value: data['padding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '设置填充',
+        inline: false,
+        notice: '设置填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: '背景颜色:',
         ele: 'xd-color',
-        valueKey: 'textColor',
+        valueKey: 'backgroundColor',
         groupKey:'style',
-        value: data.textColor || '',
-        placeholder: '请选择内容文字颜色',
+        value: data.backgroundColor || '',
+        labelInline:true,
+        placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
       {
@@ -67,21 +122,13 @@ export default {
         maxlen: 100, //当上传图片列表时候，最大数量数量
       },
       {
-        label: '内容背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'backgroundColor',
-        groupKey:'style',
-        value: data.backgroundColor || '',
-        placeholder: '请选择内容背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '内容圆角设置:',
+        label: '圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: data['radius'] || '',
+        value: data['radius'] || '0',
+        labelInline:true,
         groupKey:'style',
-        placeholder: '请选择内容圆角设置',
+        placeholder: '请选择圆角设置',
         multiple: false,
         className: 'input60',
         handleCustom({action, data}) {
@@ -98,31 +145,108 @@ export default {
         },
       },
       {
-        label: '内容设置外边距:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
+        label: '投影设置:',
+        ele: 'xd-shadow',
         groupKey:'style',
-        value: data['margin'] || null,
+        valueKey: 'contShadow',
+        value: defContShadow,
+        labelInline:true,
         setting: {
-          type: 'margin',
+          selected: defContShadow.type
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
         },
-        placeholder: '请设置外边距',
-        inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
       },
       {
-        label: '内容设置内边距:',
+        label: '边框设置:',
+        ele: 'xd-border',
         groupKey:'style',
-        ele: 'xd-margin-padding',
-        valueKey: 'padding',
-        value: data['padding'] || null,
+        valueKey: 'contBorder',
+        value: defContBorder,
+        labelInline:true,
         setting: {
-          type: 'padding',
+          selected:defContBorder.type
         },
-        placeholder: '请设置边距',
-        inline: false,
-        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
+      {
+        label: "昵称字体样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'nickStyle',
+        value: data['nickStyle'] || 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: '用户图像设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'imageColor',
+        value: data['imageColor'] || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+        labelInline:true,
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'imageRadius',
+        value: data['imageRadius'] || '50%',
+        groupKey:'style',
+        placeholder: '请选择圆角设置',
+        labelInline:true,
+        multiple: false,
+        className: 'input60',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list.map(item=>{
+                return {
+                  ...item,
+                  value: item.value + 'rpx'
+                }
+              }).concat({label: '圆角', value:'50%'}))
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+
+      //=====属性已废弃(不能删除，已隐藏)====
       {
         ele: 'title',
         label: '投影设置',
@@ -139,13 +263,13 @@ export default {
         placeholder: '请选择是否投影',
         multiple: false,
         className: 'input80',
+        hidden: true,
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ],
-        hidden: true,
+        ]
       },
-      data['is_shadow'] === 'Y' && {
+      {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
@@ -155,7 +279,7 @@ export default {
         classNmae: 'input80',
         hidden: true,
       },
-      data['is_shadow'] === 'Y' && {
+      {
         label: '投影范围:',
         groupKey:'style',
         ele: 'xd-site-select-list',
@@ -178,33 +302,8 @@ export default {
         },
         hidden: true,
       },
-      {
-        label: "边框阴影设置：",
-        ele: "xd-shadow",
-        valueKey: "boxShadow",
-        value: data['boxShadow'] || null,
-        groupKey:'style',
-        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",
-        valueKey: "boxBorder",
-        value: data['boxBorder'] || null,
-        groupKey:'style',
-        setting: {
-          selected:'N'
-        },
-      },
+
+      //=====属性已废弃(不能删除，已隐藏)====
       {
         ele: 'title',
         label: '边框设置',
@@ -215,6 +314,7 @@ export default {
       {
         label: '是否有边框:',
         ele: 'xd-radio',
+        hidden: true,
         valueKey: 'is_border',
         groupKey:'style',
         value: data['is_border'] || 'N',
@@ -224,20 +324,20 @@ export default {
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ],
-        hidden: true,
+        ]
       },
-      data['is_border'] === 'Y' && {
+      {
         label: '边框颜色:',
+        hidden: true,
         ele: 'xd-color',
         groupKey:'style',
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
-        hidden: true,
       },
-      data['is_border'] === 'Y' && {
+      {
+        hidden: true,
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
@@ -246,7 +346,22 @@ export default {
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
-        hidden: true,
+      },
+      //=====属性已废弃(不能删除，已隐藏)====
+
+      0&&{
+        label: '是否显示设置:',
+        ele: 'xd-radio',
+        valueKey: 'isSetting',
+        value: data['isSetting'] || 'N',
+        groupKey:'advanced',
+        placeholder: '是否显示设置',
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '不显示', value: 'N'},
+          {label: '显示', value: 'Y'},
+        ]
       },
       {
         label: "头像右侧内容配置",
@@ -263,13 +378,37 @@ export default {
         groupKey: "style",
       },
       {
-        label: "头像右侧内容文字颜色:",
-        ele: "xd-color",
-        valueKey: "rightContentTextColor",
-        value: data.rightContentTextColor || '',
-        placeholder: '请选择头像右侧内容文字颜色',
-        groupKey: "style",
+        label: "头像右侧内容文字颜色",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'logoutStyle',
+        value: data['logoutStyle'] || 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: "头像右侧内容文字颜色:",
+      //   ele: "xd-color",
+      //   valueKey: "rightContentTextColor",
+      //   value: data.rightContentTextColor || '',
+      //   placeholder: '请选择头像右侧内容文字颜色',
+      //   groupKey: "style",
+      // },
       {
         label: "头像右侧内容内边距配置:",
         ele: 'xd-margin-padding',
@@ -311,11 +450,14 @@ export default {
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择编辑地址路径', trigger: 'change'},
-        ],
         inline: false,
       },
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference_title',
+        groupKey:'advanced',
+      },
       {
         label: '',
         ele: 'slot',