jufubao-base 1.0.169-beta9 → 1.0.169

package/src/mixins/colorCardMixins.js

@@ -6,12 +6,12 @@ import getServiceUrl from "@/common/getServiceUrl";
 export default {
   data() {
     return {
-      colorObj : {},
+
     }
   },
 
   created(){
-    this.colorObj = this.$colorConfig || getApp().globalData.$colorConfig;
+
   },
 
   methods: {
@@ -23,14 +23,14 @@ export default {
       }
       return result;
     },
-    getCardThemes(name , disabled='N') {
-      let colorLen = this.colorObj.cardThemesColor.length;
-      let imgLen =  this.colorObj.cardThemesImage.length;
+    getCardThemes(name) {
+      let colorLen = this.cardThemesColor.length;
+      let imgLen = this.cardThemesImage.length;
       let colorIndex = this.stringToNumber(name) % colorLen;
       let imgIndex = this.stringToNumber(name) % imgLen;
       return {
-        color: disabled === 'N' ?  this.colorObj.cardThemesColor[colorIndex]: this.getDisabledColor(),
-        image:  this.colorObj.cardThemesImage[imgIndex],
+        color: this.cardThemesColor[colorIndex],
+        image: this.cardThemesImage[imgIndex],
       }
     },
     getEntry(codes = [], allEntry = []) {
@@ -48,75 +48,13 @@ export default {
       });
       return support
     },
-
-    filterNotSupportEntry(allEntry){
-      let isH5FilterEntryList = [];
-      let isMpFilterEntryList = [];
-      allEntry =  allEntry.map(item=>{
-        try {
-          if(!item.redirect_data) item.redirect_data = null;
-          else {
-            item.redirect_data = JSON.parse(item.redirect_data);
-            item.redirect_data.appType = item.redirect_data.appType || 'h5';
-          }
-        }catch (e){
-          item.redirect_data = null
-        }
-        return item;
-      })
-        .filter(item=>{
-          //地址不存在
-          if(!item.redirect_data) return false
-
-          //#ifdef H5
-          //在H5平台应用中不可跳转到微信小程序应用
-          if(item.redirect_data.appType === 'wxmp'){
-            isH5FilterEntryList.push(item)
-          }
-          return item.redirect_data.appType !== 'wxmp';
-          //#endif
-
-          //#ifdef MP-WEIXIN
-          const dir = item['redirect_data'].dir;
-          const actDir = this.projectAttr['deploy_dir'];
-          if(item.redirect_data.appType === 'wxmp') {
-            if(dir !== actDir) isMpFilterEntryList.push(item)
-            return dir === actDir;
-          }
-          return true
-          //#endif
-
-        });
-
-      //#ifdef MP-WEIXIN
-      console.warn(`微信小程序端被过滤的入口列表：${JSON.stringify(isMpFilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
-      //#endif
-      //#ifdef H5
-      console.warn(`H5端被过滤的入口列表：${JSON.stringify(isH5FilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
-      //#endif
-      console.warn(`福利入口链接列表:${JSON.stringify(allEntry.map(item=> `${item.redirect_data.appType}:${item.redirect_data.appType === 'h5'?(item.redirect_data['site_url'] || item.redirect_data['path']) :item.redirect_data['path']}`),null,2)}`);
-
-      return allEntry
-    },
-
-    getCardGroupItem(list, allEntry, disabled='N') {
+    getCardGroupItem(list, allEntry) {
       list.map(item => {
         //设置卡片样式
-        item['theme'] = this.getCardThemes(item['card_type_name'], disabled);
+        item['theme'] = this.getCardThemes(item['card_type_name']);
         item['entries'] = this.getEntry(item['business_codes'], allEntry)
       });
       return list
     },
-
-    getDisabledColor(){
-      return  this.colorObj.disableColor
-    },
-    getMergBg(disabled = 'Y'){
-      return disabled === 'Y' ?  this.colorObj['mergIcon'][1]
-        :  this.colorObj['mergIcon'][0]
-    },
-    getNoData(){
-      return this.colorObj.nodata
-    }
   }
 }

package/src/mixins/componentsMixins.js

@@ -1,10 +1,6 @@
 '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 {getContainerFnPropsValue, getContainerPropsValue} from "@/utils/xd.base";
 
 export default {
   props: {
@@ -113,55 +109,11 @@ export default {
       subMainColor: '',
       infoColor: '',
       defaultColor: '',
-      dangerColor: '',
-      mainGradient: '',
-      subGradient: '',
-
-      //test
-      posterTest:{
-        "content_id": "KpBbUKdj4aBejwe7Fh1ki",
-        "position_id": "QCk3PmoyQmOWRP1SxnYR3",
-        "partner_id": 0,
-        "site_id": "",
-        "content_name": "测试.",
-        "image_url": "//dummyimage.com/200x200",
-        "redirect_type": "EMP",
-        "redirect_type_name": "无链接",
-        "redirect_data": "",
-        "sort": "",
-        "status": "",
-        "start_time": "",
-        "end_time": "",
-        "op_user_id": "",
-        "created_time": 0,
-        "updated_time": 0
-      }
-    }
-  },
-
-  destroyed() {
-    console.warn('componentsMixins.destroyed.my(timeer|timer)');
-    if (this.timeer && typeof this.timeer === "number") {
-      clearTimeout(this.timeer);
-      console.warn('componentsMixins.destroyed.my.timeer');
-    }
-    if (this.timer && typeof this.timer === "number") {
-      clearTimeout(this.timer);
-      console.warn('componentsMixins.destroyed.my.timer');
+      dangerColor: ''
     }
-
-    //卸载页面
-    if(typeof this.onJfbUnload === "function") {
-      console.warn('componentsMixins.destroyed.exec.onJfbUnload');
-      this.onJfbUnload()
-    }
-
   },
-
   created(){
-    let tag = '';
-    if (this.$vnode && this.$vnode.tag) tag = this.$vnode.tag;
-    this.$xdLog.setProject('App.components.start', `App.components.vnode.name.${tag}`);
+    console.warn(`init.components._uid:${this._uid},vnode.name=${this.$vnode.tag}`);
 
     //设置插件cid
     if (this.cid) {
@@ -170,14 +122,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
-    //保存到vuex
-    console.log('setStyleCommon',this)
-    this.setStyleCommon(this.styles);
-
     //初始化风格
     this.initThemesToData();
 
-
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -205,120 +152,35 @@ export default {
 
   //#ifdef H5
   mounted() {
-    let that = this;
-    this.autoHideMask();
-    if (this.$configProject.isPreview && this.selfMask !== true ) {
-      this.$nextTick(()=>{
-        function handle() {
-          let elx = that.$el.getElementsByClassName(`${that.cssRoot}__body`);
+    if (this.$configProject.isPreview) {
+      let that = this;
+      function handle() {
+        let className = `${that.cssRoot}__body-mask`;
+        if (document.getElementsByClassName(className).length === 0) {
+          let elx = document.getElementsByClassName(`${that.cssRoot}__body`);
           if (elx.length === 0) {
             setTimeout(() => {
               handle()
-            }, 50)
+            }, 100)
           } else {
-            let len = elx.length;
-            for (let i = 0; i < len; i++) {
-              if (!elx.item(i).classList.contains('isGPreview')) {
-                elx.item(i).classList.add("isGPreview");
-              }
-            }
+            const mask = document.createElement("div");
+            mask.className = 'jfb-mask';
+            mask.style.position = 'absolute';
+            mask.style.left = '0px';
+            mask.style.right = '0px';
+            mask.style.top = '0px';
+            mask.style.bottom = '0px';
+            mask.style.zIndex = 9999;
+            elx.item(0).appendChild(mask);
           }
         }
-        handle();
-      });
-    }
-
-    //模式不显示虚线
-    if(this.$configProject.type === 'test'
-      && this.$configProject.NODE_ENV === 'development'
-      && this.$configProject.viewType === 'pack'
-    ){
-      this.isEditx = false;
+      }
+      handle()
     }
-
   },
   // #endif
 
-  computed:{
-    ...mapState({
-      pageNamespace: state=> state.pageBusinessCode,
-    })
-  },
-
-  watch:{
-    active(val){
-      if(this.$configProject.isPreview && val) this.autoHideMask();
-    },
-  },
-
   methods:{
-    ...mapActions(['setXNamespace','setStyleCommon']),
-    ...mapMutations(['setCurrentStyle']),
-
-    /**
-     * @description 自动生成调试模式
-     */
-    autoHideMask(){
-      if(this.$configProject.isPreview && this.hideMask === true){
-        this.$nextTick(()=>{
-          let className = this.$el.classList;
-          if(!className.contains('gHideMask')) {
-            className.add("gHideMask")
-          }
-        })
-      }
-    },
-
-    /**
-     * @description 检查是否同域名
-     * @param url
-     * @param dir {String} 部署目录
-     * @returns {*}
-     */
-    //#ifdef H5
-    getSameSiteAndDomain(url, dir) {
-      let regDir = new RegExp(`^/${dir}/\.*$`);
-      let host = window.location.host;
-      let pages = this.$xdUniHelper.parseURL(url);
-
-      //域名相同并且部署目录相同
-      if (host === pages.host && regDir.test(pages.path)) {
-        return pages.relative;
-      }
-      return url;
-    },
-    // #endif
-
-    setNameSpace(options){
-      this.xnamespace = this.xnamespace || this.pageNamespace;
-      if(!this.xnamespace && !this.$configProject.isPreview){
-        this.$xdAlert({content: '未设置业务编码',type:'error'});
-        throw new Error('请配置业务编码')
-      }
-      this.setXNamespace(this.xnamespace)
-    },
-
-    /**
-     * @description 自动计算列数的宽和间距 （父节点需要设置110%）不兼容微信小程序（废弃）
-     * @param index {number} 当前索引值
-     * @param cell {number} 当前索引值
-     * @param jfbSpacing {number}
-     * @returns {{marginRight: string, overflow: string, width: string, marginTop: string}}
-     */
-    itemStyle(index, cell, jfbSpacing ) {
-      if(this.$xdUniHelper.checkVarType(jfbSpacing) === 'string') jfbSpacing = Number(jfbSpacing);
-      let maxW = 100 / cell;
-      let padding = Math.floor(this.$rpxNum * jfbSpacing + this.$rpxNum * (jfbSpacing / cell))
-      return {
-        marginTop: jfbSpacing + 'rpx',
-        marginRight: (index + 1) % cell === 0 ? '0' : jfbSpacing + 'rpx',
-        width: `calc(${maxW}vw - ${padding}px)`,
-        overflow: 'hidden'
-      };
-    },
-
-
-
     /**
      * @description 获取吸顶样式
      * @param options {Object} 样式参数
@@ -330,23 +192,15 @@ export default {
      * @param options.height 距离底部距离（paddingBottom和height选其一即可）
      * @param options.zIndex
      * @param type {String} 吸顶类型 其值：bottom/top
-     * @param fixed {Boolean} 是否吸顶或者占位
      * @return {String}
      */
-    fixedStyle(options = {}, type = 'bottom', fixed = true) {
+    fixedStyle(options = {}, type = 'bottom') {
       let paddingBottom = options.paddingBottom || options.height || 0;
       if (options.paddingBottom) delete options.paddingBottom;
       if (options.height) delete options.height;
       let obj = Object.assign({}, {
         top: 0, left: 0, right: 0, bottom: 0, zIndex: 100,
       }, options);
-      if (!fixed) {
-        let padding = (this.layoutInfo.bottomHeight + this.layoutInfo.footerHeight + paddingBottom) * this.$rpxNum;
-        let sy = `padding-bottom:calc(${padding}px + constant(safe-area-inset-bottom));`;
-        sy = `${style}; padding-bottom:calc(${padding}px + env(safe-area-inset-bottom));`;
-        return sy;
-      }
-
       let style = 'position: fixed';
       style = `${style};left:${obj.left}rpx`;
       style = `${style};right:${obj.right}rpx`;
@@ -363,7 +217,6 @@ export default {
       return style;
     },
 
-
     /**
      * 检查插件是否加载成功
      */
@@ -373,15 +226,10 @@ export default {
      * @description 业务组件风格map到data中
      */
     initThemesToData() {
-      let current = {};
       Object.keys(this.styles).map(key => {
         let k = key.replace('$', '');
-        if (this[k] !== undefined){
-          this[k] = this.styles[key];
-          current[k] = this.styles[key];
-        }
+        if (this[k] !== undefined) this[k] = this.styles[key];
       });
-      this.setCurrentStyle(helper.cloneDeep(current))
     },
 
     /**
@@ -397,7 +245,6 @@ export default {
      * @description 点击删除操作按钮
      */
     delEdit() {
-      if(this.isReferenceTemplate) return;
       XdBus.send('onDelPackage', {
         containerId: this.containerId,
         componentAtrr: this.componentAtrr,
@@ -453,176 +300,6 @@ export default {
       })
       //#endif
     },
-
-    checkValue(value, dValue = 0){
-      if(value === undefined || value === '' || value === null) return dValue;
-      return Number(value || 0);
-    },
-
-    getXdShadow(defaultObj, newObj){
-      if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0 0 0 rgba(0,0,0,0)`;
-      let width = defaultObj.width;
-      let color = defaultObj.color;
-      if(newObj.value !== null) {
-        if(newObj.value.width) width = newObj.value.width;
-        if(newObj.value.color) color  = newObj.value.color
-      }
-      return `0 0 ${width}rpx ${color}`;
-    },
-
-    getXdBorder(defaultObj, newObj){
-      if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0`
-      let width = defaultObj.width;
-      let color = defaultObj.color;
-      if(newObj.value !== null) {
-        if(newObj.value.width) width = newObj.value.width
-        if(newObj.value.color) color  = newObj.value.color
-      }
-      return `${width}rpx solid ${color}`;
-    },
-
-    getUrlCallback(path){
-      if(this.inCallbackUrlOrg) {
-        if(path.indexOf('?') === -1) path = `${path}?inCallback=${this.inCallbackUrlOrg}`;
-        else  path = `${path}&inCallback=${this.inCallbackUrlOrg}`;
-      }
-      return path
-    },
-
-    baiduTogcj(bd_lng, bd_lat) {//坐标第转换
-      const x_PI = 3.14159265358979324 * 3000.0 / 180.0;
-      const x = bd_lng - 0.0065;
-      const y = bd_lat - 0.006;
-      const z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_PI);
-      const theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_PI);
-      const gg_lng = z * Math.cos(theta);
-      const gg_lat = z * Math.sin(theta);
-      return [gg_lng, gg_lat]
-    },
-
-
-    //#ifdef H5
-    webChatEnvOpenLocation({latitude,longitude,name, address}, cb){
-      store.dispatch('getH5WxAuthorize',{jsApiList: ['openLocation', 'getLocation']})
-        .then(({jwxSDK})=>{
-          let zb = this.baiduTogcj(latitude, longitude)
-          jwxSDK.openLocation({
-            latitude: zb[0],
-            longitude:zb[1],
-            name: name || '我的位置',
-            address: address||'',
-            scale: 15,
-            infoUrl: ''
-          });
-        })
-        .catch(err=>{
-          console.error(err)
-          this.$xdAlert({
-            content:'暂时不支持唤起APP导航功能',
-            time:5000,
-          })
-        })
-    },
-    //#endif
-
-    handleOpenLocation({latitude,longitude, name, address}, cb){
-      //latitude = latitude||39.961521814959795;
-      //longitude = longitude || 116.84499635227222
-
-      if(typeof latitude === 'string') latitude = Number(latitude);
-      if(typeof longitude === 'string') longitude = Number(longitude);
-
-      //#ifdef MP-WEIXIN
-      let zb = this.baiduTogcj(latitude, longitude);
-      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);
-      else {
-        let params = '';
-        params = `${params}&location=${latitude},${longitude}`;
-        params = `${params}&title=${encodeURIComponent(name)}`;
-        params = `${params}&content=${encodeURIComponent(address)}&output=html&zoom=15`;
-        window.location.href = `http://api.map.baidu.com/marker?${params}`;
-      }
-      //#endif
-    },
-
-    getUrlHasSpStr(pathDir){
-      if(pathDir.indexOf('@site_domain@/') === 0) {
-        return pathDir.replace('@site_domain@/','').split('/')[0]
-      }
-      return ''
-    },
-
-    /**
-     * @description 过滤不可以用
-     * 当前项目未H5时,过滤所有小程序应用
-     * 当前项目未小程序时,过滤所有非当前小程序应用
-     * 站外地址直接返回
-     * 站内地址未选值直接返回
-     * 预览模式全过
-     * @param url {object}
-     */
-    checkUrlIsValid(url){
-      if(!url) return null;
-      try {
-
-      }catch (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;
-
-    },
   }
 }