gxd-uni-library-editx 1.0.9 → 1.0.10-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.9",
+  "version": "1.0.10-beta2",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdBaiduMap/XdBaiduMap.vue

@@ -151,7 +151,7 @@
       },
 
       reLoad(){
-        if(this.count > 10) {
+        if(this.count > 5) {
           let date = new Date();
           this.$xdLog.setARMSCustomError('baidu_Location_fail', {
             time: date.getTime(),
@@ -185,8 +185,8 @@
             this.uiCenter = point;
             this.location = location;
             storage.set(this.threeLocationContentSave, location, 1/60)
-            this.LocationContent = `我的坐标:{lat:${location.latitude}, lng:${location.longitude}}`
-            this.$emit('onLocationSuccess',location);
+            this.LocationContent = `我的坐标:{lat:${location.latitude}, lng:${location.longitude}}`;
+            this.$emit('onLocationSuccess', location);
           },
           (error) => {
             this.reLoad();

package/src/components/XdCityLocation/XdCityLocation.vue

@@ -82,6 +82,9 @@
         backed: false,
         initBaidu: false,
         uiBaiduAk: '',
+        
+        failStatus: false,
+        timeStatus: null,
       }
     },
     created() {
@@ -110,6 +113,7 @@
       init(){
 
         if(this.stateLocation){
+          this.$xdLog.setProject('Location.cache', this.stateLocation);
           this.$emit('done', this.stateLocation);
           if(!this.showSwitchCity) return;
         }
@@ -117,6 +121,12 @@
         //#ifdef H5
         if(this.baidu) {
           this.initBaidu = true;
+          // 超时3秒
+          this.timeStatus = setTimeout(() => {
+            this.$emit('done', null);
+            this.failStatus = true;
+            this.$xdLog.setProject('Location.timeout', 'Location.timeout.3s');
+          }, 3000)
         }
         // #endif
       },
@@ -139,7 +149,13 @@
         if(this.backed) return;
         this.backed = true;
         this.setLocationInfo(this.location);
-        this.$emit('done', this.location);
+        
+        //超过3秒就不走这里的逻辑
+        if(this.failStatus === false) {
+          this.$xdLog.setProject('Location.done', this.location);
+          this.$emit('done', this.location);
+          clearTimeout(this.timeStatus);
+        }
       },
 
       handleBaiduInit(location){

package/src/components/XdCityShowApi/XdCityShowApi.vue

@@ -93,9 +93,11 @@
       async init(){
         //缓存中获取用户定位信息
         if (this.stateCity) {
+          this.$xdLog.setProject('Get.city.cache', {city: this.stateCity, location: this.stateLocation});
           this.$emit("done", {city: this.stateCity, location: this.stateLocation});
         } else {
           await this.getCity();
+          this.$xdLog.setProject('Get.city.done', {city: this.stateCity, location: this.stateLocation});
           this.$emit("done", {city: this.stateCity, location: this.stateLocation});
         }
       },
@@ -122,9 +124,9 @@
                 errMsg: 'request:fail timeout',
                 stateLocation: this.stateLocation
               });
-              
               let cityInfo = this.$xdUniHelper.cloneDeep(this.$settings.defaultCity);
               this.setCityInfo(cityInfo);
+              this.$xdLog.setProject('Get.city.timeout', {city: cityInfo, location: this.stateLocation});
               status = true;
               resolve()
             }, time);
@@ -175,7 +177,6 @@
       },
 
       handleDone(location) {
-        console.log('location', location);
         this.setLocationInfo(location);
         this.init();
       },

package/src/components/XdConfirm/XdConfirm.vue

@@ -32,6 +32,7 @@
       <view class="xd-input-confirm__body-btn">
         <view>
           <xd-button
+            :font-size="32"
             v-if="confirm.cancel"
             @click="handleConfirm('cancel')"
             :type="confirm.cancelColorType"
@@ -43,6 +44,7 @@
         </view>
         <view>
           <xd-button
+            :font-size="32"
             @click="handleConfirm('confirm')"
             v-if="confirm.confirm"
             :type="confirm.confirmColorType"

package/src/components/XdLayout/XdLayout.vue

@@ -438,12 +438,22 @@
       },
   
       //框架加载完成
-      layoutLoading(){
+      layoutLoading(value){
+        if(value === true) {
+          this.$xdLog.setProject('Layout.loading.done', {
+            time: new Date().getTime(),
+            timeString: new Date().toLocaleString(),
+          });
+        }
         this.doneLayoutAndLocation()
       },
       
       //定位完成
       locationStatus(){
+        this.$xdLog.setProject('Layout.location.done', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+        });
         this.doneLayoutAndLocation()
       }
     },
@@ -532,7 +542,7 @@
         if (this.locationStatus && this.layoutLoading) {
           this.$emit('onDone', this.getLayoutInfo);
           this.$emit('done', this.getLayoutInfo);
-          this.$xdLog.setProject('Layout.init.done', {...this.getLayoutInfo, time: new Date().getTime() - this.startTime})
+          this.$xdLog.setProject('Layout.done', {...this.getLayoutInfo, time: new Date().getTime() - this.startTime})
         }
       },
       

package/src/utils/xd.event.js

@@ -120,13 +120,14 @@ export class JfbEvent {
       setTimeout(() => {
         let refsObj = this.getRefs(ref);
         if (refsObj && typeof refsObj['onCheck'] === 'function') {
+          this.vm.$xdLog.setProject('App.Event', this.eventName);
           if (typeof refsObj[this.eventName] === 'function') {
             refsObj[this.eventName](this.data);
           }
         } else {
           handle()
         }
-      }, 4)
+      }, 50)
     };
     handle();
   }

package/src/utils/xdh5log.js

@@ -6,6 +6,24 @@ let logInstance = null;
 import cookie from "@/common/cookie";
 
 
+const random= (min, max)=>{
+  let Range = max - min;
+  let Rand = Math.random();
+  return (min + Math.round(Rand * Range));
+};
+
+const randomChar= (len)=>{
+  let arrstring = '_qwertyuiopasdfghjklzxcvbnm123456789QWERTYUIOPASDFGHJKLZXCVBNM'.split('');
+  let str = '';
+  for (let i = 0; i < len; i++) {
+    let index = random(0, arrstring.length - 1);
+    str += arrstring[index];
+  }
+  return str;
+}
+
+
+
 /**
  * @description 过滤上报url
  * @returns {Function[]}
@@ -68,13 +86,14 @@ const __bl = BrowserLogger['singleton']({
   sample:settings.aliSample,
   pvSample: settings.aliPvSample,
   disableHook: settings['aliDisableHook'] !== undefined ? settings['aliDisableHook'] : true, //禁用AJAX请求监听
-  behavior: settings['aliBehavior'] !== undefined ? settings['aliBehavior'] : true, //是否为了便于排查错误而记录报错的用户行为。
+  behavior: true, //是否为了便于排查错误而记录报错的用户行为。
   enableSPA: settings['aliEnableSPA'] !== undefined ? settings['aliEnableSPA'] : false, //是否启动单页面上报pv日志
   enableConsole: settings['aliEnableConsole'] !== undefined ? settings['aliEnableConsole'] : false, //是否劫持Console
   sendResource: settings['aliSendResource'] !== undefined ? settings['aliSendResource'] : true,//静态资源错误上报
   autoSendPerf: settings['aliAutoSendPerf'] !== undefined ? settings['aliAutoSendPerf'] : true, //性能和api分析日志
   appType: "web",
   imgUrl: "https://arms-retcode.aliyuncs.com/r.png?",
+  c1: randomChar(32),
   ignore: {
     ignoreUrls: ignoreUrls(),
     ignoreApis: ignoreApis(),
@@ -86,7 +105,8 @@ const __bl = BrowserLogger['singleton']({
 
 class Logs {
   constructor(){
-    this.initH5GlobalEvent()
+    this.initH5GlobalEvent();
+    this.timeReportBehavior = null;
   }
 
   /**
@@ -126,7 +146,7 @@ class Logs {
    * @param params {*} 上传数据对象
    * @param eventName {string} 事件名字
    */
-  setARMSInfo(params, eventName='default') {
+  setARMSInfo(params, eventName='default', c2) {
     if (Object.prototype.toString.call(params) === '[object Object]'
       || Object.prototype.toString.call(params) === '[object Array]'
     ) {
@@ -137,15 +157,41 @@ class Logs {
     __bl.custom({data: params, c1: eventName})
   }
 
+  getParams(data){
+    if (Object.prototype.toString.call(data) === '[object Array]') {
+      return data.join('--');
+    }
+
+    if(Object.prototype.toString.call(data) === '[object Object]') {
+      return data = Object.keys(data).map(k=>{
+        let d = data[k];
+        if(Object.prototype.toString.call(d) === '[object Array]' || Object.prototype.toString.call(d) === '[object Object]') {
+          d = JSON.stringify(data[k]);
+        }
+        return `${k}.${d}`;
+      }).join('---')
+    }
+
+    return data
+  }
+
   setProject(pos, params){
-    if (cookie.get('jfb_' + pos)) return;
-    this.setARMSInfo({
-      pos: `${pos}`,
-      time: new Date().getTime(),
-      date: new Date().toLocaleString(),
-      ...params
-    }, 'project_init');
-    cookie.set('jfb_' + pos, true, {expires: 1/6});
+    params = this.getParams(params);
+    __bl.addBehavior({
+      data: {
+        name: pos,
+        message: params,
+      },
+      page: window.location.path
+    });
+
+    if(this.timeReportBehavior) {
+      clearTimeout(this.timeReportBehavior);
+      this.timeReportBehavior = null
+    }
+    this.timeReportBehavior = setTimeout(()=>{
+      __bl.reportBehavior();
+    }, 10000)
   }
 
   getARMS(){