gxd-uni-library-editx 1.0.8-beta151 → 1.0.8-beta153

package/package.json

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

package/src/components/XdCityShowApi/XdCityShowApi.vue

@@ -103,16 +103,26 @@
         let timer = null;
         let time = 3000;
         let status = false;
+        let startTime = new Date().getTime();
+        let startTimeLocalString = new Date().toLocaleString();
+        let logCityInfo = JSON.parse(JSON.stringify(this.$settings.defaultCity));
+        
         return new  Promise((resolve, reject)=>{
           //定位成功
           if (this.stateLocation) {
-            
             //接口3秒无返回结果
             timer = setTimeout(()=>{
+              let nowTime = new Date()
+              this.$xdLog.setARMSCustomError(`api_location_timeout_${time}`,{
+                ...logCityInfo,
+                startTime,
+                startTimeLocalString,
+                endTime: nowTime.getTime(),
+                endTimeLocalString: nowTime.toLocaleString(),
+                errMsg: 'request:fail timeout'
+              });
+              
               let cityInfo = this.$settings.defaultCity;
-              this.$xdLog.setARMSCustomError(`api_location_timeout_${time}`,
-                JSON.parse(JSON.stringify({...cityInfo, errMsg: 'request:fail timeout'}))
-              );
               this.setCityInfo(cityInfo);
               status = true;
               resolve()
@@ -122,7 +132,12 @@
               .then(cityInfo => {
                 //返回数据中没有city_code和city_name
                 if (!cityInfo.city_code || !cityInfo.city_name) {
-                  this.$xdLog.setARMSCustomError('api_location_back_value_fail', JSON.parse(JSON.stringify(cityInfo)));
+                  this.$xdLog.setARMSCustomError('api_location_back_value_fail', {
+                    cityInfo,
+                    logCityInfo,
+                    startTime,
+                    startTimeLocalString
+                  });
                   cityInfo = this.$settings.defaultCity;
                 }
                 this.setCityInfo(cityInfo);
@@ -131,7 +146,13 @@
               })
               .catch(error => {
                 if (status) return;
-                this.$xdLog.setARMSError(error);
+                this.$xdLog.setARMSCustomError('api_location_fail', {
+                  error,
+                  logCityInfo,
+                  startTime,
+                  useTime: new Date().getTime() - startTime,
+                  startTimeLocalString
+                });
                 let cityInfo = this.$settings.defaultCity;
                 this.setCityInfo(cityInfo);
                 clearTimeout(timer);
@@ -143,7 +164,7 @@
           else {
             let cityInfo = this.$settings.defaultCity;
             this.setCityInfo(cityInfo);
-            this.$xdLog.setARMSCustomError('three_cocation_fail', {stateLocation: this.stateLocation, cityInfo});
+            this.$xdLog.setARMSCustomError('three_location_fail', {stateLocation: this.stateLocation, cityInfo});
             resolve()
           }
         })

package/src/components/XdFormItem/XdFormItem.vue

@@ -243,7 +243,7 @@ export default {
           contentAlign
         } = this.form;
 				this.labelPos = this.labelPosition ? this.labelPosition : labelPosition;
-        this.contentAlign = contentAlign;
+        //this.contentAlign = contentAlign;
 
 				if(this.label){
 					this.labelWid = (this.labelWidth ? this.labelWidth : (labelWidth||140))

package/src/components/XdLayout/XdLayout.vue

@@ -112,6 +112,11 @@
     <xd-tips v-if="getLayoutInfo" :get-layout-info="getLayoutInfo"></xd-tips>
     <view class="xd-Layout__padding" id="xd-Layout__padding"></view>
     <view class="xd-Layout__padding-placeholder" :style="{backgroundColor: background}"></view>
+    <xd-city-show-api
+      v-if="open"
+      :get-city-info-by-location="getCityInfoByLocation"
+      @done="handleLocationDone"
+    ></xd-city-show-api>
   </view>
 </template>
 
@@ -122,6 +127,9 @@
   import XdConfirm from "@/components/XdConfirm/XdConfirm";
   import XdLoading from "@/components/XdLoading/XdLoading";
   import XdTips from "@/components/XdTips/XdTips";
+  import XdCityShowApi from "@/components/XdCityShowApi/XdCityShowApi";
+  import locationMixins from "@/mixins/locationMixins";
+  import XdAppClass from "@/XdAppClass";
   import {mapState} from 'vuex';
 
 
@@ -158,7 +166,9 @@
       XdFontIcon,
       XdFooterTabbar,
       XdBar,
+      XdCityShowApi
     },
+    mixins: [locationMixins],
     props: {
       topHeight: {
         type: Number,
@@ -246,7 +256,12 @@
     },
     data() {
       return {
+        //定位
+        open: false,
+        layoutLoading: false,
         startTime: new Date().getTime(),
+        
+        
         startAnimation : false, //开始动画效果
         doneAnimation: false, //完成动画效果
         defaultImage: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDM4QTUyMkNDRUQyMTFFQzkzRTZDOUJBNTFBNTA3RDUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDM4QTUyMkRDRUQyMTFFQzkzRTZDOUJBNTFBNTA3RDUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozMkE3N0VGRkNFRDAxMUVDOTNFNkM5QkE1MUE1MDdENSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkE3N0YwMENFRDAxMUVDOTNFNkM5QkE1MUE1MDdENSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PliHXlsAAAAQSURBVHjaYvj//z8DQIABAAj8Av7bok0WAAAAAElFTkSuQmCC',
@@ -347,7 +362,6 @@
         return bgImg
       },
       
-
       getBottom(){
         return this.footerHeight
       },
@@ -419,12 +433,31 @@
       },
       logs(value){
         this.uiLogs = value;
+      },
+  
+      //框架加载完成
+      layoutLoading(){
+        this.doneLayoutAndLocation()
+      },
+      
+      //定位完成
+      locationStatus(){
+        this.doneLayoutAndLocation()
       }
     },
 
     created() {
+      uni.showNavigationBarLoading();
       this.wiewType = this.$configProject.isPreview;
       this.systemInfoSyn = uni.getSystemInfoSync();
+  
+      if (this.$configProject.isPreview === false
+        && this.$configProject.extras
+        && this.$configProject.extras.is_open_location === 'Y'
+      ) {
+        this.open = true;
+      }
+      else this.locationStatus = true;
       
       //切换页面之后数据清空
       this.uiErrorLogs = this.errorLogs;
@@ -461,6 +494,13 @@
         this.getSafeBottom();
       }
       
+      //初始化
+      getApp().globalData.$vm = getApp().globalData.$vm || this;
+      let xdApp = getApp().globalData.$xd = XdAppClass(this);
+      xdApp.xdInit((app) => {
+        console.log(app)
+      });
+      
     },
     mounted(){
       this.$nextTick(()=>{
@@ -485,6 +525,14 @@
     },
 
     methods: {
+      doneLayoutAndLocation(){
+        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})
+        }
+      },
+      
       /**
        * @description  获取胶囊相关数据
        */
@@ -629,8 +677,7 @@
       },
 
       doneEvent(){
-        this.$emit('onDone', this.getLayoutInfo);
-        this.$emit('done', this.getLayoutInfo);
+        this.layoutLoading = true;
       },
 
     }

package/src/utils/xdh5log.js

@@ -134,17 +134,7 @@ class Logs {
     }
 
     //减少上报
-    let reg = /^.+(_init)$/;
-    if(reg.test(eventName)) {
-      if(cookie.get('jfb_' + eventName)) return;
-      let status = __bl.custom({data: params, c1: eventName});
-      if(status) {
-        setTimeout(() => {
-          cookie.set('jfb_' + eventName, true);
-        }, 1000)
-      }
-    }
-    else __bl.custom({data: params, c1: eventName})
+    __bl.custom({data: params, c1: eventName})
   }
 
   setProject(pos, params){
@@ -155,7 +145,7 @@ class Logs {
       date: new Date().toLocaleString(),
       ...params
     }, 'project_init');
-    cookie.set('jfb_' + pos, true);
+    cookie.set('jfb_' + pos, true, {expires: 1/6});
   }
 
   getARMS(){