jufubao-mall 2.0.29-beta1 → 2.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.29-beta1",
+  "version": "2.0.31",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

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

@@ -528,6 +528,9 @@ export default function (data, gValue, gColor, oldData) {
       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 => {

package/src/components/JfbMallSpecialHome/Attr.js

@@ -1,594 +1,18 @@
 'use strict';
-import {getRemoteOptions} from "@/utils/AttrTools";
-
-
-
+import Content from './cusAttr/content'
+import Style from './cusAttr/style'
+import Advanced from './cusAttr/advanced'
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: (data) => {
-    let options = getRemoteOptions('productList', data);
+  content: (data, gValue, gColor, oldData = {}) => {
     return [
-      //商品配置
-      {
-        label: "列表展示列数",
-        groupKey: 'content',
-        ele: 'xd-radio',
-        valueKey: "column_num",
-        value: data['column_num'] || 2,
-        isKey: true,
-        list: [
-          {label: "一列", value: 1},
-          {label: "两列", value: 2},
-          {label: "三列", value: 3}
-        ]
-      },
-      {
-        label: '专题分类切换是否显示底线:',
-        ele: 'xd-radio',
-        valueKey: 'isFooterLine',
-        value: data['isFooterLine'] || 'N',
-        groupKey:'content',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      {
-        label: '否展示品牌:',
-        ele: 'xd-radio',
-        valueKey: 'is_show_brand',
-        value: data['is_show_brand'] || 'N',
-        placeholder: '请选择是否展示品牌',
-        multiple: false,
-        className: 'input80',
-        groupKey: 'content',
-        list: [
-          { label: '展示', value: 'Y' },
-          { label: '隐藏', value: 'N' },
-        ]
-      },
-      ...options,
-      {
-        label: "是否展示购物车设置",
-        ele: "xd-radio",
-        valueKey: "isAddCart",
-        value: data['isAddCart'] || 'Y',
-        groupKey: 'content',
-        list: [
-          { label: "展示", value: 'Y' },
-          { label: "隐藏", value: 'N' }
-        ]
-      },
-      {
-        label: '是否展示示价格:',
-        ele: 'xd-radio',
-        groupKey: 'content',
-        valueKey: 'isPrice',
-        value: data['isPrice'] || 'Y',
-        placeholder: '请选择是否显示价格',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '展示', value: 'Y' },
-          { label: '隐藏', value: 'N' },
-        ]
-      },
-      data.isPrice === 'Y' && {
-        label: '是否展示划线价:',
-        groupKey: 'content',
-        ele: 'xd-radio',
-        valueKey: 'isShowDiscount',
-        value: data.isShowDiscount || "Y",
-        rules: [
-          { required: true, message: '请选择', trigger: ['blur', 'change'] }
-        ],
-        list: [
-          { "label": "展示", "value": "Y" },
-          { "label": "隐藏", "value": "N" },
-        ]
-      },
-      data.isShowDiscount === 'Y' && {
-        groupKey: 'content',
-        label: '划线价取市场价，市场价-售价差值大于等于设置值时展示:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'differ',
-        value: data['differ'] || '',
-        placeholder: '价差，默认值：1',
-        className: 'input60',
-      },
-
-      //style
-      {
-        label: '列间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        groupKey:'style',
-        valueKey: 'mainSpacing',
-        value: data['mainSpacing'] || '',
-        className: 'input50',
-        inline: false,
-        notice:'列间距设置，单位像素，默认：<span style="color:red">30</span>px'
-      },
-      {
-        label: '行间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        groupKey:'style',
-        valueKey: 'rowMainSpacing',
-        value: data['rowMainSpacing'] || '',
-        className: 'input50',
-        inline: false,
-        notice:'行间距设置，单位像素，默认：<span style="color:red">30</span>px'
-      },
-
-      {
-        ele: 'title',
-        label: '导航设置',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        groupKey:'style',
-        valueKey: 'tabBackgroundColor',
-        value: data['tabBackgroundColor'] || null,
-        placeholder: '请选择导航背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '文字样式:',
-        ele: 'xd-text-and-bgc',
-        groupKey:'style',
-        valueKey: 'titleStyle',
-        value: data['titleStyle'] || null,
-        setting: {
-          fontSize: true,
-          weight:true,
-          bgColor: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-margin-padding',
-        groupKey:'style',
-        valueKey: 'posterPadding',
-        value: data['posterPadding'] || null,
-        setting: {
-          type: 'margin',
-        },
-        inline: false,
-        notice: '边距设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">0</span> 像素',
-      },
-      {
-        label: '圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'posterRradius',
-        value: data['posterRradius'] || '0',
-        groupKey:'style',
-        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);
-            });
-        },
-      },
-
-      {
-        ele: 'title',
-        label: '列表样式设置',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '边距设置:',
-        ele: 'xd-margin-padding',
-        groupKey:'style',
-        valueKey: 'contMargin',
-        value: data['contMargin'] || null,
-        setting: {
-          type: 'margin',
-        },
-        inline: false,
-        notice: '边距设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">0</span> 像素',
-      },
-      {
-        label: '填充设置:',
-        ele: 'xd-margin-padding',
-        groupKey:'style',
-        valueKey: 'contPadding',
-        value: data['contPadding'] || null,
-        setting: {
-          type: 'padding',
-        },
-        inline: false,
-        notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
-      },
-      {
-        label: '列间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        groupKey:'style',
-        valueKey: 'contSpacing',
-        value: data['contSpacing'] || '',
-        className: 'input50',
-        inline: false,
-        notice:'列间距设置，单位像素，默认：<span style="color:red">20</span>px，此配置仅在<span style="color:red">一列</span>显示生效'
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'contBgColor',
-        value: data['contBgColor'] || '',
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-        groupKey:'style',
-        inline: false,
-        notice: '背景色建议使用浅色色值，切勿使用深色色值'
-      },
-      {
-        label: '商品名称样式设置:',
-        ele: 'xd-text-and-bgc',
-        groupKey:'style',
-        valueKey: 'contStyle',
-        value: data['contStyle'] || null,
-        setting: {
-          fontSize: true,
-          weight:true,
-          bgColor:false,
-          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: 'contBrandColor',
-        value: data['contBrandColor'] || '',
-        placeholder: '请选择品牌名称颜色',
-        classNmae: 'input80',
-        groupKey:'style',
-      },
-      {
-        label: '当前投影设置:',
-        ele: 'xd-shadow',
-        groupKey:'style',
-        valueKey: 'contShadow',
-        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: data['contBorder'] || '',
-        setting: {
-          selected:'N'
-        },
-      },
-      {
-        label: '圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'contRadius',
-        value: data['contRadius'] || '10',
-        groupKey:'style',
-        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-site-select-list',
-        valueKey: 'imageRadius',
-        value: data['imageRadius'] || '10',
-        groupKey:'style',
-        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);
-            });
-        },
-      },
-
-      {
-        ele: 'title',
-        label: '更多按钮样式',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '自定义更多按钮名称:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey:'content',
-        valueKey: 'moreName',
-        value: data['moreName'] || '',
-        notice: '自定义更多按钮名称，默认值：<span style="color:red">查看更多</span>',
-        inline: false,
-        className: 'input60',
-      },
-      {
-        label: '文字样式:',
-        ele: 'xd-text-and-bgc',
-        groupKey:'style',
-        valueKey: 'moreStyle',
-        value: data['moreStyle'] || null,
-        setting: {
-          fontSize: true,
-          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-shadow',
-        groupKey:'style',
-        valueKey: 'moreShadow',
-        value: data['moreShadow'] || '',
-        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: 'moreBorder',
-        value: data['moreBorder'] || '',
-        setting: {
-          selected:'N'
-        },
-      },
-      {
-        label: '圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'moreRradius',
-        value: data['moreRradius'] || '10',
-        groupKey:'style',
-        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);
-            });
-        },
-      },
-
-      {
-        ele: 'title',
-        label: '专题说明按钮样式',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '内容边距设置:',
-        ele: 'xd-margin-padding',
-        groupKey:'style',
-        valueKey: 'descMargin',
-        value: data['descMargin'] || null,
-        setting: {
-          type: 'margin',
-        },
-        inline: false,
-        notice: '内容边距设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">0</span> 像素',
-      },
-      {
-        label: '自定义专题说明名称:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey:'content',
-        valueKey: 'descName',
-        value: data['descName'] || '',
-        notice: '自定义专题说明名称，默认值：<span style="color:red">专题说明</span>',
-        inline: false,
-        className: 'input60',
-      },
-      {
-        label: '文字样式:',
-        ele: 'xd-text-and-bgc',
-        groupKey:'style',
-        valueKey: 'descStyle',
-        value: data['descStyle'] || null,
-        setting: {
-          fontSize: true,
-          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-shadow',
-        groupKey:'style',
-        valueKey: 'descShadow',
-        value: data['descShadow'] || '',
-        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: 'descBorder',
-        value: data['descBorder'] || '',
-        setting: {
-          selected:'N'
-        },
-      },
-      {
-        label: '圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'descRradius',
-        value: data['descRradius'] || '0',
-        groupKey:'style',
-        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-choose-namespace",
-        valueKey: "xnamespace",
-        groupKey:'advanced',
-        className: 'input60',
-        value: data.xnamespace || "",
-        handleCustom: (cb) => {
-          XdBus.getParentApi('getOptionsNamespaces')()
-            .then(res => {
-              cb(res.list)
-            })
-            .catch();
-        }
-      },
-      {
-        label: '专题详情跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'specialInfoPath',
-        placeholder: '请选择专题详情跳转路径',
-        value: data.specialInfoPath || null,
-        groupKey:'advanced',
-        className: 'input100',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      {
-        label: '商品详情跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'productInfoPath',
-        placeholder: '请选择商品详情跳转路径',
-        value: data.productInfoPath || null,
-        groupKey:'advanced',
-        className: 'input100',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-    ].filter(i=>i)
+      ...Content(data, gValue, gColor, oldData),
+      ...Style(data, gValue, gColor, oldData),
+      ...Advanced(data, gValue, gColor, oldData),
+    ].filter(i => i)
   },
   advanced: [