jufubao-base 1.0.289-beta2 → 1.0.290-beta1

package/src/mixins/componentsMixins.js

@@ -1,13 +1,11 @@
 'use strict';
 
-import {gCPVal,getContainerFnPropsValue, getContainerPropsValue, isWechat} from "@/utils/xd.base";
+import {getContainerFnPropsValue, getContainerPropsValue,isWechat} from "@/utils/xd.base";
 import {mapActions,mapState, mapMutations} from "vuex";
 import helper from "@/utils/helper";
 import store from "@/store/index";
 import getServiceUrl from "@/common/getServiceUrl"
 import {parsePath} from "@/utils/linkUrl";
-import {Base64} from "js-base64";
-import {isArray, isEmpty, isObject} from "@/utils/AttrTools";
 
 
 export default {
@@ -108,7 +106,6 @@ export default {
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
-      isRefDelIcon: true, //引用情况设置关闭按钮
       // #endif
 
       //风格键
@@ -140,13 +137,7 @@ export default {
         "op_user_id": "",
         "created_time": 0,
         "updated_time": 0
-      },
-
-      //全局样式
-      gStyleValue:{}, //转化好的值
-      gObjStyleValue:{}, //对象数据
-      gOrgStyleValue:{}, //原始数据
-
+      }
     }
   },
 
@@ -174,14 +165,6 @@ export default {
     if (this.$vnode && this.$vnode.tag) tag = this.$vnode.tag;
     this.$xdLog.setProject('App.components.start', `App.components.vnode.name.${tag}`);
 
-    let style = this.pageAttr['configs']['default_style']
-
-    //全局样式处理
-    if(style) {
-      this.gOrgStyleValue = this.$xdUniHelper.cloneDeep(style);
-      this.setGStyleValue(style);
-    }
-
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -221,8 +204,6 @@ export default {
     // #endif
   },
 
-
-
   //#ifdef H5
   mounted() {
     let that = this;
@@ -296,35 +277,16 @@ export default {
       && this.$configProject.NODE_ENV === 'development'
       && this.$configProject.viewType === 'pack'
     ){
-      that.isEditx = false;
+      this.isEditx = false;
     }
+
   },
   // #endif
 
   computed:{
     ...mapState({
       pageNamespace: state=> state.pageBusinessCode,
-      jfbAuthorize: state=> state.jfbAuthorize,
-    }),
-
-    isGVipSite(){
-      return this.projectAttr.headers['X-Site-Group']==="vip";
-    },
-
-    isGVip(){
-      //非vip站点直接返回 非vip
-      if(!this.isGVipSite) return 'N';
-
-      //预览模式
-      if(this.$configProject.isPreview) return 'Y';
-
-      //token中获取vip标识
-      if(this.getTokenForKey('user_level')) {
-        return this.getTokenForKey('user_level')==='VIP'?'Y':'N'
-      }
-      //非vip
-      else return 'N';
-    },
+    })
   },
 
   watch:{
@@ -337,90 +299,6 @@ export default {
     ...mapActions(['setXNamespace','setStyleCommon','wxCodeForGetAppId']),
     ...mapMutations(['setCurrentStyle']),
 
-    getBSStr({color, width, style = 'solid'}, type='border'){
-
-      width = Number(width)
-      //1px solid #eee
-      if(type === 'border'){
-        if(width === 0) return 0
-        return `${width}rpx ${style} ${color}`;
-      }
-      //0 0 10rpx #fff
-      else {
-        debugger
-        if(width === 0) return 'none';
-        return `0 0 ${width}rpx ${color}`
-      }
-    },
-
-    /**
-     * @description 设置全局样式
-     * @param data
-     */
-    setGStyleValue(data){
-
-      function objFn(mpObj){
-        if(mpObj['type'] === 'D') return {top: 0, left: 20, right: 20, bottom:20};
-        else {
-          Object.keys(mpObj['custom']).map(key=>{
-            if(mpObj['custom'][key] === -999999) mpObj['custom'][key] = 0;
-          })
-        }
-        return  mpObj['custom'];
-      }
-      let temp = {};
-      let objTemp = {};
-      Object.keys(data).map(key=>{
-        if(key === 'padding' || key === 'margin') {
-          temp[key] = objFn(data[key]);
-          objTemp[key] =  objFn(data[key]);
-        }
-        else if(key === 'shadow') {
-          if(data['type'] === 'D'){
-            temp['shadow'] = 'none';
-            objTemp['shadow'] = {color: 'rgba(0,0,0,0)', width: '0'};
-          }
-          else {
-            if(data[key]['custom'] && data[key]['custom']['color']) {
-              temp['shadow'] = `0 0 ${data[key]['custom']['width']}rpx ${data[key]['custom']['color']}`
-              objTemp['shadow'] = data[key]['custom'];
-            }
-            else {
-              temp['shadow'] = 'none';
-              objTemp['shadow'] = {color: 'rgba(0,0,0,0)', width: '0'};
-            }
-
-          }
-        }
-        else if(key === 'background') {
-          if(data['type'] === 'D') temp['background'] = 'none';
-          else {
-            if(data[key]['custom']) {
-              temp['background'] = data[key]['custom']
-              objTemp['background'] =  data[key]['custom'];
-            }
-            else {
-              temp['background'] = 'none';
-              objTemp['background'] = 'none';
-            }
-          }
-        }
-        else if(key === 'radius') {
-          if(data['type'] === 'D') {
-            temp['radius'] = 0;
-            objTemp['radius'] =  '0';
-          }
-          else {
-            temp['radius'] = Number(data[key]['custom']);
-            objTemp['radius'] =  data[key]['custom'];
-          }
-
-        }
-      });
-      this.gStyleValue = this.$xdUniHelper.cloneDeep(temp);
-      this.gObjStyleValue = this.$xdUniHelper.cloneDeep(objTemp);
-    },
-
     /**
      * @description 自动生成调试模式
      */
@@ -438,6 +316,8 @@ export default {
       }
     },
 
+
+
     /**
      * @description 检查是否同域名
      * @param url
@@ -458,17 +338,12 @@ export default {
     },
     // #endif
 
-    setNameSpace(options, isAlert=true){
+    setNameSpace(options){
       this.xnamespace = this.xnamespace || this.pageNamespace;
-
-      //不检查业务线
-      if(isAlert) {
-        if(!this.xnamespace && !this.$configProject.isPreview){
-          this.$xdAlert({content: '未设置业务编码',type:'error'});
-          throw new Error('请配置业务编码')
-        }
+      if(!this.xnamespace && !this.$configProject.isPreview){
+        this.$xdAlert({content: '未设置业务编码',type:'error'});
+        throw new Error('请配置业务编码')
       }
-
       this.setXNamespace(this.xnamespace)
     },
 
@@ -551,9 +426,6 @@ export default {
       Object.keys(this.styles).map(key => {
         let k = key.replace('$', '');
         if (this[k] !== undefined){
-          if(typeof this.styles[key] === 'string'){
-            this.styles[key] = this.styles[key].trim()
-          }
           this[k] = this.styles[key];
           current[k] = this.styles[key];
         }
@@ -588,44 +460,25 @@ export default {
      * @description 点击选择插件显示边框
      */
     handleEditxSelect() {
-
       //加载本地业务插件库
       if (this.noBorder) return;
 
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-
       let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
         this.$xdUniHelper.customClone(this.Attr) : {style: [], advanced: [], content: []};
 
-      let gStyleColor =  {
-        mainColor: this.mainColor,
-        successColor: this.successColor,
-        infoColor: this.infoColor,
-        subMainColor: this.subMainColor,
-        warningColor: this.warningColor,
-        defaultColor: this.defaultColor,
-        dangerColor: this.dangerColor
-      }
-
       //设置已绑定数据
       Object.keys(AttrObj).map(type => {
         //配置的是方法
         if (type === 'style' || type === 'advanced' || type === 'content') {
           if (typeof AttrObj[type] === "function") {
             let params = getContainerFnPropsValue(this.container, `${type}`);
-
-            //默认样式设置
-            let defaultGValue = this.$xdUniHelper.cloneDeep(this.gStyleValue);
-            //是否为添加组件操作
-            defaultGValue['isAdd'] = this.container.isAdd === true;
-            //面板首次加载
-            defaultGValue['isFirst'] = true;
             let Attr = this.$xdUniHelper.customClone(this.Attr);
             AttrObj[`${type}.isFn`] = true;
             AttrObj[`${type}.Fn`] = Attr[type];
-            AttrObj[type] = Attr[type](params, defaultGValue, gStyleColor);
+            AttrObj[type] = Attr[type](params);
           } else {
             AttrObj[type].map(item => {
               if (item.value !== undefined) {
@@ -641,32 +494,16 @@ export default {
       });
 
       //发送点击组件事件
-      let sendContainer = this.$xdUniHelper.cloneDeep(this.container);
-      sendContainer.defaultData = this.$xdUniHelper.cloneDeep(this.gStyleValue||{});//设置全局默认值
-      sendContainer.gStyleColor = this.$xdUniHelper.cloneDeep(gStyleColor);//设置全局默认值
-
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: this.$xdUniHelper.customClone(AttrObj),
-        container: sendContainer
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件
       XdBus.message('select', {
         containerId: this.containerId,
-      });
-
-      //引用模版直接不显示编辑按钮
-      this.$nextTick(()=>{
-        if(this.pageAttr.configs['template_type'] === 2){
-          const editCss = `${this.cssRoot}__edit`;
-          let el = document.getElementsByClassName(editCss).item(0);
-          el.style.display = 'none';
-        }
       })
-
-
-
       //#endif
     },
 
@@ -703,132 +540,80 @@ export default {
      * @return {string} 例如：`0,0,10rpx,rgba(0,0,0,0)`
      */
     getXdShadow(defaultObj, newObj){
-      if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return 'none';
+      if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0 0 0 rgba(0,0,0,0)`;
       return this.getXdBorder(defaultObj,newObj,'shadow')
     },
 
     /**
      * @description 边框样式生成
-     * @param options {Object|Array} 默认值
+     * @param defaultObj {Object} 默认值
      * @param newObj {Object} 新组件对象
      * @param type {string} border/shadow
      * @return {string} 例如：`2rpx solid rgba(0,0,0,0)`
      */
-    getXdBorder(options, newObj, type='border'){
-      let defaultObj = {};
-      let gValue = {};
-      if(this.$xdUniHelper.checkVarType(options) === 'object') {
-        defaultObj = this.$xdUniHelper.cloneDeep(options);
-        gValue = this.$xdUniHelper.cloneDeep(options);
-      }
-      if(this.$xdUniHelper.checkVarType(options) === 'array') {
-        if(options.length ===1) {
-          defaultObj = options[0];
-          gValue = options[0];
-        }
-        if(options.length ===2) {
-          defaultObj = options[0];
-          gValue = options[1];
-        }
-      }
-
-      //使用默认值
-      if((this.$xdUniHelper.isEmpty(newObj)) || newObj.type ==='D' ){
-        if(type === 'border') return `${gValue.width}rpx ${gValue.style||'solid'} ${gValue.color}`;
-        return `0 0 ${gValue.width}rpx ${gValue.color}`;
+    getXdBorder(defaultObj, newObj, type='border'){
+      //使用默认值()
+      if((this.$xdUniHelper.isEmpty(newObj) && defaultObj.type === 'D')
+        || newObj.type ==='D'
+      ){
+        if(type === 'border') return `${defaultObj.width * this.$rpxNum}px ${defaultObj.style||'solid'} ${defaultObj.color}`;
+        return `0 0 ${defaultObj.width}rpx ${defaultObj.color}`;
       }
-
-      //border
       if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0`;
-
-      //Y
       let width = defaultObj.width;
       let color = defaultObj.color;
       let style = defaultObj.style || 'solid';
       let value = newObj.value || {};
-      if(value.width !== undefined) width = value.width;
+      if(value.width) width = value.width;
       if(value.color) color = value.color;
       if(value.style) style = value.style;
-      if(type === 'border') return `${width}rpx ${style} ${color}`
+      if(type === 'border') return `${width* this.$rpxNum}px ${style} ${color}`
       return `0 0 ${width}rpx ${color}`;
     },
 
     /**
      * @description 兼容新老border与shadow组件数据
      * @param newObj {Object} 新对象border与shadow
-     * @param oldObj {Object} 新对象border与shadow,老数据
-     * @param oldObj.type {string}
-     * @param oldObj.width {number|string}老border与shadow的宽度字段
+     * @param oldObj {Object} 新对象border与shadow
+     * @param oldObj.width {Number}老border与shadow的宽度字段
      * @param oldObj.color {String} 老border与shadow的颜色字段
      * @param oldObj.style {String|undefined} 老border样式默认值：solid
      * @param type {String}
-     * @param options {Array} 默认值
      * @return {string} 例如：`2rpx solid rgba(0,0,0,0)`
      */
-    getBorderCompatibleOldStyle(newObj={}, oldObj={}, type='border', options=[]){
-
-      let contWidth = null;
-      let contColor = null;
-      let contrStyle = null;
-      let hasValue = false;
-      let gValue = '';
-      let dValue = '';
-      if(options.length === 1) {
-        dValue = options[0]
-        gValue = options[0];
-      }
-      if(options.length === 2) {
-        dValue = options[0]
-        gValue = options[1];
-      }
-
-
-      //等于默认选项直接返回默认值
-      if(newObj.type === 'D') return gValue;
+    getBorderCompatibleOldStyle(newObj={}, oldObj={}, type='border'){
+      let contWidth = 0;
+      let contColor = 'rgba(0.0.0.0)';
+      let contrStyle = 'solid';
 
       if(oldObj.type === 'Y') {
-        hasValue = true;
         if(oldObj.width !== undefined) contWidth = oldObj.width;
         if(oldObj.color !== undefined) contColor = oldObj.color;
-        contrStyle = 'solid';
       }
-
       if(newObj.type === 'Y') {
-        hasValue = true;
         let value = newObj.value || {};
         if(value.color) contColor = value.color;
         if(value.style) contrStyle = value.style;
-        if(value.width !== undefined) contWidth = value.width;
+        if(value.width) contWidth = value.width;
       }
 
-      //边距设置
       if(type === 'border'){
-        if(hasValue) {
-          if(contWidth !==null && contColor !== null) return `${contWidth* this.$rpxNum}px ${contrStyle} ${contColor}`
-          else return dValue
-        }
-        return '0'
+        if(oldObj.type === 'N' && newObj.type === 'N') return 0;
+        return `${contWidth* this.$rpxNum}px ${contrStyle} ${contColor}`
       }
-      //投影值
-      if(hasValue) {
-        if(contWidth !==null && contColor !== null) return `0 0  ${contWidth}rpx ${contColor}`
-        else return dValue
-      }
-      return 'none' ;
+      return `0 0  ${contWidth}rpx ${contColor}` ;
     },
 
     /**
      * @description 兼容新老border与shadow组件数据
      * @param newShadow {Object} 新对象border与shadow
      * @param oldShadow {Object} 新对象border与shadow
-     * @param oldShadow.type {string}
-     * @param oldShadow.width {number|string} 老border与shadow的宽度字段
+     * @param oldShadow.width {Number}老border与shadow的宽度字段
      * @param oldShadow.color {String} 老border与shadow的颜色字段
-     * @param options {Array} 默认值
      * @return {string} 例如：`0,0,10rpx,rgba(0,0,0,1)`
      */
-    getShadowCompatibleOldStyle(newShadow={},oldShadow={}, options){
-      return this.getBorderCompatibleOldStyle(newShadow, oldShadow, 'shadow', options)
+    getShadowCompatibleOldStyle(newShadow={},oldShadow={}){
+      return this.getBorderCompatibleOldStyle(newShadow,oldShadow, 'shadow')
     },
 
     /**
@@ -938,76 +723,12 @@ export default {
       return this.checkValue(obj.bottom,bottom) + this.checkValue(obj.top,top);
     },
 
-    //==检查自定义关联属性状态==========================
-
-    checkAttrEmpty(data){
-      //数组判断
-      if(this.$xdUniHelper.checkVarType(data) === 'array') return data.length === 0;
-      //对象判断
-      else if(this.$xdUniHelper.checkVarType(data) === 'object') return this.$xdUniHelper.isEmpty(data);
-      //字符串
-      else if(typeof data === 'string') return !data;
-      //其他
-      else return (typeof data === 'undefined' || data === null);
-    },
-
-    getRelationStatus(container, key, relation={}, dValue=null){
-      let props = container['component']['props']['content'];
-
-
-      //自定义属性已经设置值
-      if(props[key]) return props[key];
-
-      //检查关联属性状态
-      let tempStatus = [];
-      Object.keys(relation).map(sKey=>{
-        //边框与投影处理
-        if(relation[sKey][1] === 'bs') {
-          if(props[sKey]) {
-            if(['N','Y'].includes(props[sKey]['type'])) tempStatus.push(sKey);
-          }
-        }
-        //其他属性处理
-        else {
-          //有状态选项卡值
-          if(props[sKey]) {
-            if(props[sKey] === 'C') tempStatus.push(sKey);
-          }
-          //无状态选项卡值
-          else {
-            let has = [];
-            relation[sKey].map(item=>{
-              let noValue = this.checkAttrEmpty(props[item])
-              if(!noValue) has.push(noValue);
-            });
-            if(has.length > 0) tempStatus.push(sKey)
-          }
-        }
-
-      });
-
-      //关联属性某一个值已设置自定义选项值
-      if(tempStatus.length > 0) return 'none'
-
-      //已保存版本号
-      if(props['version'] === 'v2.0') {
-        return dValue
-      }
-
-      //未保存版本号
-      return 'none'
-
-    },
-
-    //==检查自定义关联属性状态==========================
-
     /**
      * @description 获取商品显示规则
      * @param container
-     * @param cartStyle {String}
      * @return {{isAddCart: *, isShowDiscount: *, isPrice: *, is_show_brand: *, showActivityPrice: *, isShowTag: *, differ: *}}
      */
-    getProductConfig(container,{cartStyle=''}={}){
+    getProductConfig(container){
       let is_show_brand = getContainerPropsValue(container, "content.is_show_brand", "N");
       let isPrice = getContainerPropsValue(container, "content.isPrice", "Y");
       let isShowDiscount = getContainerPropsValue(container, "content.isShowDiscount", "Y");
@@ -1016,13 +737,6 @@ export default {
       let isShowTag = getContainerPropsValue(container, "content.isShowTag", "Y");
       let isAddCart = getContainerPropsValue(container, "content.isAddCart", "N");
       let showFreeShipping = getContainerPropsValue(container, "content.showFreeShipping", "N");
-      let cartIcon = '';
-      let cartName = '';
-      if(cartStyle) {
-        cartIcon = getContainerPropsValue(container, "content.cartStyle", cartStyle);
-        cartName =  getContainerPropsValue(container, "content.cartName", '购买');
-      }
-
       return {
         isShowDiscount: isShowDiscount,
         isPrice: isPrice,
@@ -1031,9 +745,7 @@ export default {
         showActivityPrice:showActivityPrice,
         isShowTag : isShowTag,
         differ: differ,
-        showFreeShipping: showFreeShipping,
-        cartIcon,
-        cartName,
+        showFreeShipping: showFreeShipping
       }
     },
 
@@ -1098,23 +810,19 @@ export default {
 
       //#ifdef MP-WEIXIN
       let zb = this.baiduTogcj(latitude, longitude);
-      let mapInfo = Base64.encodeURI(JSON.stringify([name,address,zb, this.mainColor]));
-      uni.navigateTo({
-        url: `/pages/location/location?map=${mapInfo}`
-      })
-      // uni.openLocation({
-      //   latitude: zb[0],
-      //   longitude: zb[1],
-      //   name: name || '我的位置',
-      //   scale: 15,
-      //   address: address ||'',
-      //   success: function () {
-      //     if(typeof cb === 'function') {
-      //       cb();
-      //     }
-      //     console.log('success');
-      //   }
-      // });
+      uni.openLocation({
+        latitude: zb[0],
+        longitude: zb[1],
+        name: name || '我的位置',
+        scale: 15,
+        address: address ||'',
+        success: function () {
+          if(typeof cb === 'function') {
+            cb();
+          }
+          console.log('success');
+        }
+      });
       //#endif
       //#ifdef H5
       if(isWechat()) this.webChatEnvOpenLocation({latitude,longitude, name, address}, cb);
@@ -1201,20 +909,6 @@ export default {
         return null;
       }
     },
-    getTokenForKey(key='csrf_user_id'){
-      let token = this.jfbAuthorize.getToken('user')
-      if(token) {
-        let arr = token.split('.');
-        try {
-          let uid = JSON.parse(Base64.decode(arr[1]));
-          return uid[key];
-        }catch (e) {
-          return null;
-        }
-      }else {
-        return null;
-      }
-    },
 
     getProductTagsParams(conf=null,data={}){
       var temp = [];
@@ -1222,7 +916,6 @@ export default {
         isShowTag:"market",
         showActivityPrice:"flashsale",
         showTag: "market",
-        showParams: 'param'
       }
       try{
         if(conf) {
@@ -1248,10 +941,9 @@ export default {
     getProductTagsKeys(conf=null,container,type='productList'){
       let defaultValue
       if(type==='productList' ){
-        defaultValue = ["isShowTag","showActivityPrice",'showParams']
-      }
-      else {
-        defaultValue = ["showTag","showActivityPrice",'showParams']
+        defaultValue = ["isShowTag","showActivityPrice"]
+      } else {
+        defaultValue = ["showTag","showActivityPrice"]
       }
       try{
         if(conf) conf = JSON.parse(conf).keys;