jufubao-base 1.0.203 → 1.0.205-beta1

package/src/mixins/componentsMixins.js

@@ -1,10 +1,11 @@
 'use strict';
 
 import {getContainerFnPropsValue, getContainerPropsValue,isWechat} from "@/utils/xd.base";
-import {Base64} from 'js-base64';
 import {mapActions,mapState, mapMutations} from "vuex";
 import helper from "@/utils/helper";
 import store from "@/store/index";
+import getServiceUrl from "@/common/getServiceUrl"
+
 
 export default {
   props: {
@@ -209,20 +210,31 @@ export default {
 
     //调试模式设置值
     let zIndex = 4;
-    if( this['hideMask'] === true) zIndex = -1;
+    if(this['hideMask'] === true) zIndex = -1;
     if(this['closeMask'] === true)  zIndex = -1;
     if(this['closeMask'] === false) zIndex = 4;
-    document.querySelector(':root').style.setProperty('--preview-z-index', zIndex);
 
     //生产元素
     if(this.$configProject.isPreview) {
       if(zIndex ===-1) {
-        let parentRoot = document.querySelector(`.${this.cssRoot}`);
-        for(let i=0; i < 4;i++) {
-          let span =  document.createElement('span');
-          span.className = 'xd-preview-line xd-preview-line-' + i;
-          parentRoot.appendChild(span);
-        }
+        this.$nextTick(()=>{
+          setTimeout(()=>{
+            let r = document.getElementsByClassName(this.cssRoot);
+            let len = r.length;
+            for (let i=0; i < len; i++) {
+              let el = r.item(i);
+              if(!el.hasAttribute('close-mask')) {
+                el.setAttribute('close-mask', '1');
+                for(let k=0; k < 4;k++) {
+                  let span =  document.createElement('span');
+                  span.className = 'xd-preview-line xd-preview-line-' + k;
+                  el.appendChild(span);
+                }
+              }
+            }
+
+          }, 50)
+        })
       }
 
     }
@@ -513,6 +525,11 @@ export default {
 
     //边框样式生成
     getXdBorder(defaultObj, newObj, type='border'){
+      //使用默认值
+      if(newObj.type ==='D'){
+        if(type === 'border') return `${defaultObj.width}rpx ${defaultObj.style} ${defaultObj.color}`;
+        return `0 0 ${defaultObj.width}rpx ${defaultObj.color}`;
+      }
       if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0`;
       let width = defaultObj.width;
       let color = defaultObj.color;
@@ -633,6 +650,31 @@ export default {
       return str
     },
 
+    /**
+     * @description 获取边距与填充上下或者左右的值
+     * @param obj
+     * @param type
+     * @param defValue
+     * @return {*}
+     */
+    getPMValue(obj = {},type='RL', defValue) {
+      if(this.$xdUniHelper.checkVarType(obj) !== 'object') obj = {};
+      let top = 0,right=0,bottom=0,left=0;
+      if(typeof defValue === 'number') {
+        top = right = left = bottom = defValue;
+      }
+      else if(this.$xdUniHelper.checkVarType(obj) === 'object') {
+        if(typeof defValue.top === "number")  top = defValue.top;
+        if(typeof defValue.right === "number")  right = defValue.right;
+        if(typeof defValue.bottom === "number")  bottom = defValue.bottom;
+        if(typeof defValue.left === "number")  left = defValue.left;
+      }
+      if(type === 'RL') {
+        return this.checkValue(obj.left,left) + this.checkValue(obj.right,right);
+      }
+      return this.checkValue(obj.bottom,bottom) + this.checkValue(obj.top,top);
+    },
+
     /**
      * @description 获取商品显示规则
      * @param container
@@ -788,44 +830,6 @@ export default {
         console.error(e);
         return null;
       }
-      // let content = list.filter(item=>{
-      //   //预览模式
-      //   if(this.$configProject.isPreview) return true;
-      //
-      //   //非内部应用
-      //   if(item.redirect_type !== 'INN') return true
-      //
-      //   //没有配置链接
-      //   if(!item.redirect_data) return true;
-      //
-      //   //内部应用
-      //   else {
-      //     let redirect_data;
-      //     try {
-      //       redirect_data = JSON.parse(item.redirect_data);
-      //       if(!item['app_type']) item['app_type']= 'h5';
-      //
-      //       //#ifdef H5
-      //       return item['app_type'] !== 'wxmp';
-      //       //#endif
-      //
-      //       //#ifdef MP-WEIXIN
-      //       let actDir = this.$parent.projectAttr.deploy_dir;
-      //       let dir = this.getPathDir(redirect_data.page);
-      //       if(item['app_type'] === 'wxmp'){
-      //         return actDir === dir;
-      //       }
-      //       else if(item['app_type'] === 'h5') return true;
-      //       else return true
-      //       //#endif
-      //     }
-      //     catch (e) {
-      //       return true
-      //     }
-      //   }
-      // });
-      // console.warn(`PostersList:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
-      // return content;
 
     },
   }