jufubao-mall 2.0.23-beta1 → 2.0.24

package/package.json

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

package/src/components/JfbMallProductList/ComFilterQuery.vue

@@ -113,7 +113,7 @@
     <view
       v-if="showQueryModal"
       class="jfb-filter-mask"
-      :style="[queryMaskComp]"
+      :style="[queryTopComp]"
       @click="closeQueryModal"
       @touchmove.stop.prevent="moveHandle"
     ></view>
@@ -238,11 +238,6 @@ export default {
     }
   },
   computed:{
-    queryMaskComp(){
-      return {
-        top: this.topHeight + this.layoutInfo.top + 'rpx'
-      }
-    },
     placeholderStyleComp(){
       let {paddingTb, borderTopWidth} =  this.cusMenuStyle;
       return {
@@ -250,10 +245,11 @@ export default {
       }
     },
     menuStyleTopComp(){
+      let top = this.topHeight + this.layoutInfo.top;
       return {
         zIndex: this.showQueryModal ? 1002 : 1,
         position:this.$configProject.isPreview?'absolute':'fixed',
-        top: this.$configProject.isPreview ? 0 : (parseInt(this.queryMaskComp.top) - 2) + 'rpx',
+        top: this.$configProject.isPreview ? 0 : (parseInt(top) - 2) + 'rpx',
       }
     },
     queryTopComp(){

package/src/components/JfbMallNetworkMedia/Api.js

@@ -1,58 +0,0 @@
-'use strict';
-/**
- * @description  接口配置，
- * 在设置方法名字当时候，别忘记加上【模块名字】：Network
- * @type {*[]}
- */
-module.exports = [
-  {
-    //设置方法名字当别忘记加上【模块名字】：Network
-    mapFnName: 'getNetworkByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
-    isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Network
-    mapFnName: 'updateNetworkFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Network
-    mapFnName: 'removeNetworkFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Network
-    mapFnName: 'addNetworkFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];

package/src/components/JfbMallNetworkMedia/Attr.js

@@ -1,20 +0,0 @@
-'use strict';
-
-import content from "./cusAttr/content";
-import style from "./cusAttr/style";
-import advanced from "./cusAttr/advanced";
-
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
-export default {
-  style: [],
-  content: (data, gValue, gColor, oldData={}) => {
-    return [
-      ...content(data, gValue, gColor, oldData),
-      //...style(data, gValue, gColor, oldData),
-      //...advanced(data)
-    ].filter(i=>i)
-  },
-  advanced: [],
-};

package/src/components/JfbMallNetworkMedia/JfbMallNetworkMedia.vue

@@ -1,84 +0,0 @@
-<template>
-  <view
-    class="jfb-mall-network-media"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
-    <!--#ifdef H5-->
-    <view
-      class="jfb-mall-network-media__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
-      <view class="jfb-mall-network-media__edit-icon" @click.stop="delEdit">
-        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
-      </view>
-    </view>
-    <!-- #endif -->
-    <view class="jfb-mall-network-media__body">
-      <view>测试插件( {{containerId}} )</view>
-    </view>
-  </view>
-</template>
-
-<script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbMallNetworkMediaMixin from "./JfbMallNetworkMediaMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbMallNetworkMedia",
-    components: {
-      XdFontIcon
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbMallNetworkMediaMixin
-    ],
-    data() {
-      return {
-
-      }
-    },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
-    },
-    created() {
-      this.init(this.container);
-    },
-    methods: {
-      onJfbLoad(options) {
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-
-      },
-
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-    }
-  }
-
-</script>
-
-<style scoped lang="less">
-  @import "./JfbMallNetworkMediaLess.less";
-
-  .jfb-mall-network-media {
-    &__body{
-
-    }
-  }
-</style>

package/src/components/JfbMallNetworkMedia/JfbMallNetworkMediaLess.less

@@ -1,80 +0,0 @@
-/**
-* @desc 获取绝对路径完整地址
-* @param @path
-**/
-//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
-@basePath: 'business/';
-@doMain: '//sandbox-img.jufubao.cn/';
-
-.getBusinessImageUrl(@path, @size: 'size8') {
-  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
-  background-image: url(@url);
-}
-
-//start
-.jfb-mall-network-media {
-  box-sizing: border-box;
-
-  &__body{
-      position: relative;
-      overflow: hidden;
-      z-index: 2
-  }
-
-  &.editx,&.editx:hover {
-    position: relative;
-    min-height: unit(100, rpx);
-    z-index: 3;
-    &::after {
-      border: 2rpx dashed blue;
-      content: " ";
-      position: absolute;
-      top:0;
-      left:0;
-      bottom:0;
-      right:0;
-      z-index: var(--preview-z-index);
-      cursor: pointer;
-    }
-
-  }
-
-
-  &__edit {
-    cursor: pointer;
-    position: absolute;
-    right: unit(0, rpx);
-    top: unit(0, rpx);
-    height: unit(50, rpx);
-    z-index: 100;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background: rgba(0, 0, 0, .4);
-    border-radius: 0 0 0 20rpx;
-    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
-    color: #fff;
-    font-size: unit(22, rpx);
-    padding: 0 6rpx 0 6px;
-
-    &-icon{
-      padding: 0 unit(20, rpx);
-    }
-
-    &.editx {
-      box-sizing: border-box;
-
-    }
-  }
-}
-//end
-
-
-/**notPreview**/
-.jfb-mall-network-media {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
-}
-/**endNotPreview**/

package/src/components/JfbMallNetworkMedia/JfbMallNetworkMediaMixin.js

@@ -1,30 +0,0 @@
-'use strict';
-
-
-//@AttrImport
-import Attr from "./Attr";
-//@EndAttrImport
-
-
-export default {
-  data() {
-    return {
-      //#ifdef H5
-      
-      //@AttrData
-      Attr:{}, //对外开发编辑属性
-      //@EndAttrData
-      
-      // #endif
-      cssRoot: 'jfb-mall-network-media'
-    }
-  },
-  created() {
-    
-    //@AttrDataCreated
-    this.Attr = this.$xdUniHelper.customClone(Attr);
-    //@EndAttrDataCreated
-    
-
-  },
-}

package/src/components/JfbMallNetworkMedia/Mock.js

@@ -1,13 +0,0 @@
-'use strict';
-
-module.exports = {
-  
-  getNetworkByIdFilmSquate:{},
-  
-  updateNetworkFilmPaiqiDate:{},
-  
-  removeNetworkFilmAddress:{},
-  
-  addNetworkFilmcart:{},
-  
-}

package/src/components/JfbMallNetworkMedia/cusAttr/advanced.js

@@ -1,60 +0,0 @@
-'use strict';
-
-export default (data)=>{
-  let isCityFilter = 'N',productInfoPath =null;
-  if(['Y','N'].includes(data['isCityFilter'])) {
-    isCityFilter = data['isCityFilter']
-  }
-  if(data['productInfoPath'] !== undefined) {
-    productInfoPath = data['productInfoPath']
-  }
-  return [
-    {
-      label: '城市筛选',
-      ele: 'xd-radio',
-      valueKey: 'isCityFilter',
-      groupKey:'advanced',
-      value: isCityFilter,
-      placeholder: '请选择是否开启城市筛选',
-      multiple: false,
-      labelInline:true,
-      list: [
-        {label: '开启', value: 'Y'},
-        {label: '禁用', value: 'N'},
-      ]
-    },
-    {
-      label: '确认订单',
-      ele: 'xd-select-pages-path',
-      valueKey: 'productInfoPath',
-      placeholder: '请选择确认订单跳转地址',
-      groupKey: 'advanced',
-      value: productInfoPath,
-      labelInline: true,
-      className: 'input100',
-      setting: {
-        mode: 'new',
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-    },
-    {
-      label: '版本号:',
-      ele: 'el-input',
-      type: 'text',
-      groupKey: 'advanced',
-      valueKey: 'version',
-      value: 'v2.0',
-      hidden: true,
-    },
-    {
-      label: '过滤引用模版字段:',
-      ele: 'el-input',
-      type: 'text',
-      groupKey: 'advanced',
-      valueKey: 'refFilterKey',
-      value: '[]',
-      hidden: true,
-    },
-  ]
-}
-

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

@@ -1,125 +0,0 @@
-'use strict';
-import {
-  dataVal ,
-  statusShow,
-  statusDataVal,
-  customVal,
-  cusDisabled ,
-  getCustomAttr,
-  isArray,
-  isObject
-} from "@/utils/AttrTools";
-import PosterAttr from "@/utils/Attr/PosterAttr";
-import ProductAttr from "@/utils/Attr/ProductAttr";
-
-export default (data, gValue,gColor,oldData)=>{
-  //兼容品牌展示
-  let filterMode = dataVal({data, key:'filterMode', dValue:[['common','filter']], gValue});
-  if(data['showBrandFilter'] === 'out'){
-    filterMode.push('brand');
-    data['showBrandFilter'] = 'in';
-  }
-
-  //兼容分类操作
-  let  category = 'v1';
-  //老数据已设置
-  if(data['categoryLayout']) {
-    category = data['categoryLayout'];
-    //设置v1项
-    if(data['categoryLayout'] === 'v1') {
-      if(data['categoryLayout1ShowType'] === 'child') {
-        category = 'v3';
-      }
-    }
-  }
-  //分类已设置隐藏（设置隐藏项）
-  if(data['showCategory'] === 'N') {
-    category = 'none';
-  }
-  //新数据已设置值
-  if(data['category'] !== undefined) {
-    category = data['category'] ;
-  }
-
-  //类型
-  let navStyle = 'line-6-8-l';
-  if(data['navStyle'] && ['line-6-8-s', 'triangle', 'center', 'desc', 'none'].includes(data['navStyle'])){
-    navStyle = data['navStyle'];
-  }
-
-  //过滤配送方式兼容
-  let isShowDelivery = [];
-  if(typeof data['isShowDelivery'] === 'string') {
-    if(['Y'].includes(data['isShowDelivery'])) isShowDelivery = ['send'];
-  }
-  if(isArray(data['isShowDelivery'])){
-    isShowDelivery = data['isShowDelivery'];
-  }
-
-  let categoryParentType = dataVal({data, key:'categoryParentType', dValue:'root', gValue});
-
-
-  return[
-    {
-      ele: 'title',
-      label: '基础',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: "业务线",
-      ele: "xd-choose-namespace",
-      valueKey: "xnamespace",
-      groupKey:'content',
-      placeholder: '请选择业务线',
-      notice:'空继承上级业务线',
-      inline: false,
-      labelInline:true,
-      value:  dataVal({data, key:'xnamespace', dValue:null, gValue}),
-      className: 'input100',
-      handleCustom: (cb) => {
-        XdBus.getParentApi('getOptionsNamespaces')()
-          .then(res => {
-            cb(res.list)
-          })
-          .catch();
-      }
-    },
-    {
-      ele: 'title',
-      label: '展示内容',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: '划线价',
-      ele: 'xd-cus-switch',
-      valueKey: 'isShowDiscount',
-      value: data['isShowDiscount'] || 'Y',
-      className: 'input100',
-      labelInline:true,
-      groupKey:'content',
-      hidden: data.isPrice!=='Y',
-      setting: {
-        isBackType: 'string'
-      },
-    },
-    {ele: 'group_start'},
-    {
-      label: '差值',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'differ',
-      labelInline:true,
-      value: data['differ'] || '',
-      hidden: data.isShowDiscount!=='Y',
-      groupKey:'content',
-      placeholder: '价差，默认值：1',
-      className: 'input80',
-      notice: '划线价取市场价，市场价-售价差值大于等于设置值时展示',
-      inline: false
-    },
-    {ele: 'group_end'},
-
-  ]
-}

package/src/components/JfbMallNetworkMedia/cusAttr/filter.js

@@ -1,333 +0,0 @@
-'use strict';
-
-import {cRaBorShadow, dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
-
-export default (data, gValue, gColor, oldData)=>{
-  let filterTopBorder = cRaBorShadow(data , 'filterTopBorder',{dValue:'D'}, gValue)
-  let filterBgcColor = '#fff';
-  if(gValue.isAdd && gValue.isFirst) {
-    if(data['category'] === 'v4') filterBgcColor = '#f8f8f8';
-  }
-  return [
-    {
-      ele: 'title',
-      label: '筛选项样式',
-      size: 'small',
-      groupKey:'style',
-    },
-
-    {
-      ele:'xd-line-title',
-      groupKey:'style',
-      label: '横向菜单'
-    },
-    {
-      label: '上边框',
-      ele: 'xd-border',
-      labelInline: true,
-      groupKey:'style',
-      valueKey: 'filterTopBorder',
-      value: filterTopBorder,
-      className: 'input100',
-      setting: {
-        selected: filterTopBorder.type,//设置默认选中项
-        isRadio:true,//启用editx默认
-        isDef: true,//启动默认选项
-        //设置默认值
-        default: {
-          color: '#f8f8f8',
-          width: '2',
-          type: 'solid'
-        }
-      },
-      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: 'filterBgcColorStatus',
-      value: statusDataVal({data, key:'filterBgcColorStatus', fields:['filterBgcColor'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'filterBgcColor',
-      groupKey:'style',
-      value: dataVal({data, key:'filterBgcColor', dValue:filterBgcColor, gValue}),
-      hidden: !statusShow({data, key: 'filterBgcColorStatus', fields:['filterBgcColor'], gValue}),
-      classNmae: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '选项颜色',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterColorStatus',
-      value: statusDataVal({data, key:'filterColorStatus', fields:['filterColor'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'filterColor',
-      groupKey:'style',
-      value: dataVal({data, key:'filterColor', dValue:'#333', gValue}),
-      hidden: !statusShow({data, key: 'filterColorStatus', fields:['filterColor'], gValue}),
-      classNmae: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '内边距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterPaddingStatus',
-      value: statusDataVal({data, key:'filterPaddingStatus', fields:['filterPadding'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'filterPadding',
-      value: dataVal({
-        data,
-        key:'filterPadding',
-        dValue:16,
-        gValue,
-        isPM: true,
-      }),
-      hidden: !statusShow({data, key: 'filterPaddingStatus', fields:['filterPadding'], gValue}),
-      setting: {
-        type: 'margin',
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      ele:'xd-line-title',
-      groupKey:'style',
-      label: '下拉菜单'
-    },
-
-    {
-      label: '行间距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterRowSpacingStatus',
-      value: statusDataVal({data, key:'filterRowSpacingStatus', fields:['filterRowSpacing'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: "行间距",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "filterRowSpacing",
-      value: dataVal({data, key:'filterRowSpacing', dValue:gValue.isFirst && gValue.isAdd ? 16: 20, gValue}),
-      hidden: !statusShow({data, key: 'filterRowSpacingStatus', fields:['filterRowSpacing'], gValue}),
-      className: "input80",
-      labelInline: true,
-      setting:{
-        min: 0,
-        max: 60,
-        step:1,
-        showStops:false,
-        showInput:false,
-      }
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '背景颜色',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterListColorStatus',
-      value: statusDataVal({data, key:'filterListColorStatus', fields:['filterListColor'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'filterListColor',
-      groupKey:'style',
-      value: dataVal({data, key:'filterListColor', dValue:gValue.isAdd && gValue.isFirst ? '#fff':'#f8f8f8', gValue}),
-      hidden: !statusShow({data, key: 'filterListColorStatus', fields:['filterListColor'], gValue}),
-      classNmae: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-
-
-    {
-      label: '圆角',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterListRadiusStatus',
-      value: statusDataVal({data, key:'filterListRadiusStatus', fields:['filterListRadius'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无圆角', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-site-select-list',
-      labelInline: true,
-      valueKey: 'filterListRadius',
-      value: dataVal({data, key:'filterListRadius', dValue:gValue.isAdd && gValue.isFirst?'10':'60', gValue}),
-      hidden: !statusShow({data, key: 'filterListRadiusStatus', fields:['filterListRadius'], gValue}),
-      placeholder: '请选择图标圆角',
-      multiple: false,
-      className: 'input80',
-      groupKey:'style',
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({
-          setting_id: 'edtix_style_radius',
-          key: Date.now()
-        })
-          .then(res => {
-            let list = (res.list || [])
-              .filter(item=>{
-                return item.label !== '无'
-              });
-            data.cb(list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '内边距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterListPaddingStatus',
-      value: statusDataVal({data, key:'filterListPaddingStatus', fields:['filterListPadding'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'filterListPadding',
-      value: dataVal({
-        data,
-        key:'filterListPadding',
-        dValue:gValue.isAdd && gValue.isFirst ? {top: 32, left: 48, right: 48, bottom: 32}:20,
-        gValue,
-        isPM: true,
-      }),
-      hidden: !statusShow({data, key: 'filterListPaddingStatus', fields:['filterListPadding'], gValue}),
-      setting: {
-        type: 'margin',
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '文字按钮',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'filterFontStyleStatus',
-      value: statusDataVal({data, key:'filterFontStyleStatus', fields:['filterFontStyle'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-text-and-bgc',
-      groupKey:'style',
-      valueKey: 'filterFontStyle',
-      value: dataVal({data, key:'filterFontStyle', dValue:{}, gValue}),
-      hidden: !statusShow({data, key: 'filterFontStyleStatus', fields:['filterFontStyle'], gValue}),
-      setting: {
-        fontSize: true,
-        weight:false,
-        bgColor:false,
-        selected:true,
-        default:{
-          color: '#666',
-          fontSize:'24rpx',
-          actFontSize:'24rpx',
-          actColor: gColor.mainColor,
-        }
-      },
-      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: 'group_end'},
-
-
-  ].filter(i=>i)
-}

package/src/components/JfbMallNetworkMedia/cusAttr/font.js

@@ -1,114 +0,0 @@
-'use strict';
-
-import {dataVal, isObject, statusDataVal, statusShow} from "@/utils/AttrTools";
-const Color = require('color');
-
-export default (data, gValue, gColor, oldData)=>{
-
-  //兼容
-  let titleStyleColor = '#333'
-  if(data.titleColor) titleStyleColor = data.titleColor;
-  if(isObject(data.titleStyle) && data.titleStyle.color)  titleStyleColor = data.titleStyle.color;
-  let disabled = !['v1','v2', 'v5'].includes(data['category']);
-
-  return [
-    {
-      ele: 'title',
-      label: '分类-文字区样式',
-      size: 'small',
-      groupKey:'style',
-      hidden: disabled
-    },
-    {
-      label: '导航背景',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'titleBgColorStatus',
-      value: statusDataVal({data, key:'titleBgColorStatus', fields:['titleBgColor'],gValue}),
-      labelInline:true,
-      hidden: disabled,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'titleBgColor',
-      groupKey:'style',
-      value: dataVal({data, key:'titleBgColor', dValue:'#fff', gValue}),
-      hidden: !statusShow({data, key: 'titleBgColorStatus', fields:['titleBgColor'], gValue}) || disabled,
-      classNmae: 'input80',
-
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '名称样式',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'titleStyleStatus',
-      value: statusDataVal({data, key:'titleStyleStatus', fields:['titleStyle','titleColor'],gValue}),
-      labelInline:true,
-      hidden: disabled,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-text-and-bgc',
-      groupKey:'style',
-      valueKey: 'titleStyle',
-      value: dataVal({data, key:'titleStyle', dValue:{}, gValue}),
-      hidden: !statusShow({data, key: 'titleStyleStatus', fields:['titleStyle','titleColor'], gValue}) || disabled,
-      setting: {
-        fontSize: true,
-        weight:true,
-        bgColor:true,
-        selected:true,
-        default:{
-          color: titleStyleColor,
-          fontSize:gValue.isAdd && gValue.isFirst?'32':'30',
-          bgColor:'#f8f8f8',
-          fontWeight:gValue.isAdd && gValue.isFirst?'400':'normal',
-          actFontSize:gValue.isAdd && gValue.isFirst?'32':'30',
-          actColor: gColor.mainColor,
-          actFontWeight:gValue.isAdd && gValue.isFirst?'500':'normal',
-          actBgColor: Color(gColor.mainColor).alpha(0.15).toString()
-        }
-      },
-      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: 'group_end'},
-
-    //废弃不可删除（已做兼容）
-    {
-      label: '文字颜色:',
-      ele: 'xd-color',
-      valueKey: 'titleColor',
-      groupKey:'style',
-      value: data['titleColor'] || '',
-      placeholder: '请选择文字颜色',
-      classNmae: 'input80',
-      hidden:true,
-    },
-    //废弃不可删除（已做兼容）
-  ].filter(i=>i)
-}

package/src/components/JfbMallNetworkMedia/cusAttr/icon.js

@@ -1,298 +0,0 @@
-'use strict';
-
-import {cRaBorShadow, dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
-
-export default (data, gValue, gColor, oldData)=>{
-  let level2NameStatus = statusDataVal({data, key:'level2NameStatus', fields:['level2Name','level2Color'],gValue});
-  let level2Name = {
-    fontSize: '24',
-    actFontSize: '24',
-    color: '#333',
-    actColor: gColor.mainColor,
-    bgColor:'',
-    actBgColor:'',
-    fontWeight: 'normal',
-    actFontWeight: 'normal',
-    borderStyle:'solid',
-    borderColor: 'rgba(0,0,0,0)',
-    borderWidth: 0,
-    borderActStyle:'solid',
-    borderActColor: 'rgba(0,0,0,0)',
-    borderActWidth: 0,
-  }
-  // if(data['subTitleIconBorder'] !== undefined && data['subTitleIconBorder']['type'] === 'Y') {
-  //   const value = data['subTitleIconBorder'].value;
-  //   if(value.style) level2Name['borderStyle'] = value.style
-  //   if(value.color) level2Name['borderColor'] = value.color
-  //   if(value.width !== undefined) level2Name['borderWidth'] = value.width
-  //   if(value.style) level2Name['borderActStyle'] = value.style
-  //   if(value.color) level2Name['borderActColor'] = value.color
-  //   if(value.width !== undefined) level2Name['borderActWidth'] = value.width
-  //   data['subTitleIconBorder']['type'] = 'N'
-  //   data['subTitleIconBorder']['value'] = {}
-  // }
-  let subTitleIconBorder = cRaBorShadow(data , 'subTitleIconBorder',{dValue:'D'}, gValue)
-  let disabled = !['v1','v2', 'v3', 'v4'].includes(data['category']);
-
-  return [
-    {
-      ele: 'title',
-      label: '分类-图标区样式',
-      size: 'small',
-      groupKey:'style',
-      hidden: disabled,
-    },
-
-    {
-      label: '导航背景',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'level2BgcColorStatus',
-      value: statusDataVal({data, key:'level2BgcColorStatus', fields:['level2BgcColor'],gValue}),
-      labelInline:true,
-      hidden: disabled,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'level2BgcColor',
-      groupKey:'style',
-      value: dataVal({data, key:'level2BgcColor', dValue:gValue.isAdd && gValue.isFirst?'#fff':'#f8f8f8', gValue}),
-      hidden: !statusShow({data, key: 'level2BgcColorStatus', fields:['level2BgcColor'], gValue}) || disabled,
-      classNmae: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-    {
-      label: '选中图描边',
-      ele: 'xd-border',
-      groupKey:'style',
-      valueKey: 'subTitleIconBorder',
-      value: subTitleIconBorder,
-      labelInline: true,
-      className: 'input100',
-      setting: {
-        selected: subTitleIconBorder.type,//设置默认选中项
-        isRadio: true,//启用editx默认
-        isDef: true, //启动默认选项
-        //==设置默认值==
-        color: gColor.mainColor,
-        width: '2',
-        style: 'solid'
-        //==设置默认值==
-      },
-    },
-    {
-      label: '图标圆角',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'subTitleRadiusStatus',
-      value: statusDataVal({data, key:'subTitleRadiusStatus', fields:['subTitleRadius'],gValue}),
-      labelInline:true,
-      hidden: disabled,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无圆角', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-site-select-list',
-      labelInline: true,
-      valueKey: 'subTitleRadius',
-      value: dataVal({data, key:'subTitleRadius', dValue:'40rpx', gValue}),
-      hidden: !statusShow({data, key: 'subTitleRadiusStatus', fields:['subTitleRadius'], gValue}) || disabled,
-      placeholder: '请选择图标圆角',
-      multiple: false,
-      className: 'input80',
-      groupKey:'style',
-
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({
-          setting_id: 'edtix_style_radius',
-          key: Date.now()
-        })
-          .then(res => {
-            let list = (res.list || [])
-              .map(item=>{
-                return {
-                  ...item,
-                  value: item.value + 'rpx',
-                }
-              })
-              .filter(item=>{
-                return item.label !== '无'
-              })
-              .concat([{label:'圆角',value: '50%'}]);
-            data.cb(list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {ele: 'group_end'},
-    {
-      label: '图标大小',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'iconWdithStatus',
-      value: statusDataVal({data, key:'iconWdithStatus', fields:['iconWdith'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: "",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "iconWdith",
-      value: dataVal({data, key:'iconWdith', dValue:96, gValue}),
-      hidden: !statusShow({data, key: 'iconWdithStatus', fields:['iconWdith'], gValue}),
-      className: "input80",
-      labelInline: true,
-      setting:{
-        min: 50,//最小值
-        max: 96, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-        showInput:false,//显示输入框
-      },
-    },
-    {ele: 'group_end'},
-    {
-      label: '图标间距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'iconImageSpStatus',
-      value: statusDataVal({data, key:'iconImageSpStatus', fields:['iconImageSp'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: "",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "iconImageSp",
-      value: dataVal({data, key:'iconImageSp', dValue:16, gValue}),
-      hidden: !statusShow({data, key: 'iconImageSpStatus', fields:['iconImageSp'], gValue}),
-      className: "input80",
-      labelInline: true,
-      setting:{
-        min: 1,//最小值
-        max: 64, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-        showInput:false,//显示输入框
-      },
-    },
-    {ele: 'group_end'},
-    {
-      label: '图标背景',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'iconBgColorStatus',
-      value: statusDataVal({data, key:'iconBgColorStatus', fields:['iconBgColor'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'iconBgColor',
-      groupKey:'style',
-      value: dataVal({data, key:'iconBgColor', dValue:'#f8f8f8', gValue}),
-      hidden: !statusShow({data, key: 'iconBgColorStatus', fields:['iconBgColor'], gValue}),
-      classNmae: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '名称样式',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'level2NameStatus',
-      value: level2NameStatus,
-      labelInline:true,
-      hidden: disabled,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-text-and-bgc',
-      groupKey:'style',
-      valueKey: 'level2Name',
-      value:  dataVal({data, key:'level2Name', dValue:'{}', gValue}),
-      hidden: !statusShow({data, key: 'level2NameStatus', fields:['level2Name','level2Color'], gValue}) || disabled,
-      setting: {
-        fontSize: true,
-        weight:false,
-        bgColor:true,
-        selected:true,
-        isBorder:false,
-        default: level2Name
-      },
-      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: 'group_end'},
-
-    {
-      label: '二级导航文字颜色:',
-      ele: 'xd-color',
-      valueKey: 'level2Color',
-      value: data['level2Color'] || '',
-      placeholder: '请选择二级导航文字颜色',
-      classNmae: 'input80',
-      groupKey:'style',
-      hidden: true
-    },
-
-    {
-      label: '上边框设置:',
-      ele: 'xd-border',
-      groupKey:'style',
-      valueKey: 'subTitleBorder',
-      value: data['subTitleBorder'] || '',
-      setting: {
-        selected:'N',
-      },
-      hidden: true
-    },
-  ].filter(i=>i)
-}

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

@@ -1,91 +0,0 @@
-'use strict';
-
-import {
-  dataVal ,
-  statusShow,
-  statusDataVal,
-  customVal,
-  cusDisabled ,
-  getCustomAttr,
-} from "@/utils/AttrTools";
-
-import font from "./font";
-import icon from "./icon";
-import filter from './filter';
-import productStyle from "@/utils/Attr/productStyle";
-
-export default function (data, gValue, gColor, oldData) {
-  return [
-    {
-      ele: 'title',
-      label: '内容区',
-      size: 'small',
-      groupKey:'style',
-    },
-    {
-      label: '内容区背景',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'contentColorStatus',
-      value: statusDataVal({data, key:'contentColorStatus', fields:['contentColor'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      groupKey:'style',
-      valueKey: 'contentColor',
-      value: dataVal({data, key:'contentColor', dValue:gValue.isAdd && gValue.isFirst ? '#f8f8f8': '#fafafa', gValue}),
-      hidden: !statusShow({data, key: 'contentColorStatus', fields:['contentColor'], gValue}),
-      placeholder: '请选择背景颜色',
-      classNmae: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '内容区边距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'listPaddingStatus',
-      value: statusDataVal({data, key:'listPaddingStatus', fields:['listPadding'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'listPadding',
-      value: dataVal({
-        data,
-        key:'listPadding',
-        dValue:(gValue.isAdd && gValue.isFirst? ({top:16, left:16, right:16,bottom:0}) : 20),
-        gValue,
-        isPM: true,
-      }),
-      hidden: !statusShow({data, key: 'listPaddingStatus', fields:['listPadding'], gValue}),
-      setting: {
-        type: 'margin',
-      },
-    },
-    {ele: 'group_end'},
-
-    ...font(data, gValue, gColor, oldData),
-    ...icon(data, gValue, gColor, oldData),
-    ...filter(data, gValue, gColor, oldData),
-    ...productStyle(data, gValue, gColor, oldData, 'list')
-  ]
-}
-