gxd-uni-library-editx 1.0.70 → 1.0.71

package/package.json

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

package/src/components/XdConfirm/XdConfirm.vue

@@ -82,11 +82,14 @@
       ]),
       ...mapState({
         currentStyle:(state)=>{
-          let style = {};
-          Object.keys(state.currentStyle).map(key=>{
-            style[`$${key}`] = state.currentStyle[key];
-          });
-          return style
+          if(state.currentStyle !== null) {
+            let style = {};
+            Object.keys(state.currentStyle).map(key=>{
+              style[`$${key}`] = state.currentStyle[key];
+            });
+            return style
+          }
+          return {}
         }
       })
 

package/src/utils/StyleForm.js

@@ -318,7 +318,7 @@ class StyleForm {
         type: 'number',
         valueKey: borderWidth,
         value: data[borderWidth] || '',
-        placeholder: '请输入边框颜色',
+        placeholder: '请输入边框大小',
         className: 'input80',
       },
     ].filter(i=>i).map(item=>{

package/src/utils/helper.js

@@ -812,6 +812,13 @@ class Helpers {
   }
 
   replacePathForDir(url){
+    //#ifndef H5
+    return url
+    //#endif
+
+
+
+    //#ifdef H5
     let siteDomain = `${window.location.protocol}//${window.location.host}`;
     let dir = '';
     if(store.state.brandInfo && store.state.brandInfo.deploy_dir) {
@@ -830,6 +837,7 @@ class Helpers {
       else return `${siteDomain}${url.replace(reg, '')}`;
     }
     return url;
+    //#endif
   }
 
   /**

package/src/utils/xd.common.js

@@ -209,12 +209,12 @@ export function handlePesponse(
   /**
    * @type {Vue}
    */
-  let $vm = (getApp().globalData && getApp().globalData.$vm) || null;
+  let $vm = (getApp() && getApp().globalData && getApp().globalData.$vm) || null;
   let useTime = new Date().getTime() - request.start;
   let requestInfo = xdGetPesponseParams(request, response);
 
   //长连接（耗时连接）
-  if (getApp().globalData
+  if (getApp() && getApp().globalData
     && getApp().globalData.$store
     && typeof getApp().saveLogs === 'function'
     && !checkNotLogs(request.options)
@@ -261,7 +261,7 @@ export function handlePesponse(
     }
 
     //记录错误日志
-    if (typeof getApp().saveLogs === 'function'
+    if (getApp() && typeof getApp().saveLogs === 'function'
       && !checkNotLogs(request.options)
     ) {
       getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -342,7 +342,7 @@ export function handlePesponse(
     }
 
     //记录错误日志
-    if (typeof getApp().saveLogs === 'function'
+    if (getApp() && typeof getApp().saveLogs === 'function'
       && !checkNotLogs(request.options)
     ) {
       getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -360,7 +360,7 @@ export function handlePesponse(
     }
 
     //记录错误日志
-    if (typeof getApp().saveLogs === 'function'
+    if (getApp() && typeof getApp().saveLogs === 'function'
       && !checkNotLogs(request.options)
     ) {
       getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -392,7 +392,7 @@ export function handlePesponse(
     //记录错误日志
     //statusCode === undefined 并且 忽略：.json静态文件和请求返沪时间小雨15秒的
     if(!uriIgnoreErrors(request.options.url, useTime)) {
-      if (typeof getApp().saveLogs === 'function'
+      if (getApp() && typeof getApp().saveLogs === 'function'
         && !checkNotLogs(request.options)
       ) {
         getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -402,7 +402,7 @@ export function handlePesponse(
 
     if (!$vm) {
       reject(response);
-      throw new Error(message);
+      console.warn(message)
     } else {
       $vm.$xdHideLoading();
       reject(response);

package/src/utils/xdWxLog.js

@@ -5,7 +5,7 @@ import {runtime} from "@/common/runtime";
 const settings = require('./../../settings');
 const md5 = require('md5');
 import Vue from 'vue';
-import store from "@/store";
+import store from "@/store/index";
 import {
   baseIsEmpty,
   baseJsDateToTime,
@@ -46,6 +46,18 @@ class Logs {
     return typeof uni.setStorageSync === 'function';
   }
 
+  setProject(pos, params){
+    console.warn(`${pos}:${JSON.stringify(params)}`)
+  }
+
+  getParams(data){
+    return {}
+  }
+
+  setARMSError(error){
+    console.error(error)
+  }
+
 
   checkApiHost() {
     if (typeof getApp !== 'function') return false;

package/src/utils/xdWxLog.js.tpl

@@ -0,0 +1,302 @@
+'use strict';
+import {Base64} from 'js-base64';
+import {runtime} from "@/common/runtime";
+
+const settings = require('./../../settings');
+const md5 = require('md5');
+import Vue from 'vue';
+import store from "@/store";
+import {
+  baseIsEmpty,
+  baseJsDateToTime,
+  baseGetHost
+} from "@/utils/xd.base";
+
+
+let logInstance = null;
+
+
+class Logs {
+  constructor() {
+    this.initDone = false; //是否已加载uni.request和brandInfo['api_host']完成
+    this.checkcount = 0; //最大检查1000次
+    this.startcount = 0; //最大检查可以上传日志次数
+    this.checkMaxWaitTime = 1000;
+    //this.check();
+    this.saveUploadedLog = [];
+    this.onUpdateKeyword = [
+      '$vm', //跟uniApp uni.createSelectorQuery() 有关
+      "e.x", //跟uniApp滚动组件有关
+      'null is not an object (evaluating', //跟uniApp滚动组件有关
+      "Cannot read property 'x' of ",// 跟uniApp滚动组件有关
+    ];
+
+    //#ifdef H5
+    this.initH5GlobalEvent()
+    //#endif
+  }
+
+  checkUniRequest() {
+    if (typeof uni === 'undefined') return false;
+    return typeof uni.request === 'function';
+  }
+
+  checkUniSetStorage() {
+    if (typeof uni === 'undefined') return false;
+    return typeof uni.setStorageSync === 'function';
+  }
+
+
+  checkApiHost() {
+    if (typeof getApp !== 'function') return false;
+    if (typeof getApp().globalData === "undefined") return false;
+    if (typeof getApp().globalData.$xd === 'undefined') return false;
+    if (typeof getApp().globalData.$xd['brandInfo'] === 'undefined') return false;
+    return typeof getApp().globalData.$xd['brandInfo']['api_host'] !== 'undefined';
+  }
+
+  check() {
+    let timer = setInterval(() => {
+      if ((this.checkUniRequest() && this.checkApiHost())
+        || this.checkcount > this.checkMaxWaitTime
+      ) {
+        this.initDone = true;
+        if (this.checkUniRequest() && this.checkApiHost()) {
+          setTimeout(() => {
+            this.checkBeforeStart();
+          }, 2000)
+        }
+        clearInterval(timer);
+      } else {
+        this.checkcount++;
+      }
+    }, 10)
+  }
+
+  checkBeforeStart() {
+    let timer = setInterval(() => {
+      if (this.startcount > this.checkMaxWaitTime) {
+        clearTimeout(timer);
+        return;
+      }
+      if (getApp().globalData.$xd['userInfo'] !== undefined
+        && !baseIsEmpty(getApp().globalData.$xd['userInfo'])
+      ) {
+        this.goBeforeUploadLogs();
+        clearTimeout(timer);
+      } else {
+        this.startcount++;
+      }
+    }, 10)
+  }
+
+  goBeforeUploadLogs() {
+    let logsSave = uni.getStorageInfoSync();
+    let logs = [];
+    logsSave.keys.map((key) => {
+      if (key.indexOf('xd.log.') === 0) {
+        logs.push(key);
+      }
+    });
+    logs.map((key) => {
+      let logStorage = uni.getStorageSync(key);
+      let system = this.getSystemInfo();
+
+      this.ajaxLogs({
+        baseApi: getApp().globalData.$xd.brandInfo['api_host'],
+        level: logStorage.level,
+        content: JSON.stringify({
+          ...system,
+          date: baseJsDateToTime(new Date().getTime() / 1000),
+          ...logStorage.logs
+        })
+      })
+      uni.removeStorageSync(key);
+    })
+
+  }
+
+  getSystemInfo() {
+    console.log(getApp().globalData.$xd.userInfo);
+    let userInfo = {};
+    let ext = {};
+    if (getApp().globalData
+      && getApp().globalData.$xd
+      && getApp().globalData.$xd.userInfo
+    ) {
+      userInfo = Base64.encodeURI(JSON.stringify(getApp().globalData.$xd.userInfo));
+    }
+
+    //#ifdef MP-WEIXIN
+    if (!baseIsEmpty(uni.getExtConfigSync())) {
+      ext = Base64.encodeURI(JSON.stringify(uni.getExtConfigSync()));
+    }
+    //#endif
+
+    const {
+      SDKVersion,
+      model,
+      system,
+      version,
+      deviceOrientation
+    } = uni.getSystemInfoSync();
+
+    console.log(userInfo, ext, uni.getSystemInfoSync());
+    return {
+      platform: 'weixin',
+      project: settings.system,
+      SDKVersion,
+      model,
+      system,
+      version,
+      deviceOrientation,
+      userInfo,
+      ext,
+    }
+  }
+
+
+  /**
+   * @description 上报日志
+   * @param log {Object} 上报日志内容
+   * @param type {String} 上报日志内容类型
+   * type = global(全局错误)
+   * type = onerror(系统捕获全局错误信息)
+   * type = promise(异步请求全局捕获错误)
+   * type = info(普通日志上报错误)
+   * type = debug(上报调试日志)
+   * type = ajax(返回异步请求字符串错误)
+   * type = unkown(返回异步请求字符串错误)
+   * tyoe = setting.error (项目配置错误)
+   * type = entry.index (记录访问首页入口来源)
+   * type = ajax.default {记录异步请求不知道的code的值}
+   * @param level {String} 上报级别 alert|info|debug
+   */
+  push(log, level = 'alert', type = "info") {
+    if (level === 'debug') {
+      if (settings.isDebug) {
+        level = 'info';
+        type = 'debug';
+      } else return;
+    }
+    type = `handle.${type}`;
+    if (!this.initDone) {
+      this.saveLog({log, type, level});
+    } else {
+      this.updateLog(log, type, level);
+    }
+  }
+
+  ajaxLogs(data) {
+    store['dispatch']('saveLogs', data)
+      .then(res => {
+      })
+      .catch(res => {
+      })
+  }
+
+  /**
+   * @description 上报日志
+   * @param log
+   * @param type
+   * @param level
+   */
+  updateLog(log, type, level) {
+    console.log(log, type, level);
+    let system = this.getSystemInfo();
+    if (level === 'info') system = {}
+    let logs = {...system, type, ...log};
+    let key = 'xd.log.' + md5(JSON.stringify(logs));
+    if (!this.saveUploadedLog.includes(key)) {
+      this.ajaxLogs({
+        baseApi: getApp().globalData.$xd.brandInfo['api_host'],
+        level: level,
+        content: JSON.stringify({
+          date: baseJsDateToTime(new Date().getTime() / 1000),
+          ...logs
+        }),
+      });
+      this.saveUploadedLog.push(key);
+    }
+  }
+
+  saveLog({log, type, level}) {
+    let logs = {type, before: true, ...log};
+    let key = 'xd.log.' + md5(JSON.stringify(logs));
+    if (this.checkUniSetStorage()) {
+      uni.setStorageSync(key, {logs, level});
+    }
+  }
+
+  checkMessage(error) {
+    let errorStr = error;
+    if (Object.prototype.toString.call(error) === '[object Error]') {
+      errorStr = JSON.stringify(runtime().getErrorInfo(error));
+    }
+    if (Object.prototype.toString.call(error) === '[object String]') {
+      errorStr = error;
+    }
+    if (Object.prototype.toString.call(error) === '[object Object]') {
+      errorStr = JSON.stringify(error);
+    }
+
+    let isUpdate = true;
+    this.onUpdateKeyword.map((keyword) => {
+      if (errorStr.indexOf(keyword) !== -1) {
+        isUpdate = false
+      }
+    });
+    return isUpdate === false ? isUpdate : Base64.encodeURI(errorStr);
+  }
+
+  initH5GlobalEvent() {
+    /**vue捕获全局错误**/
+    this.vueErrorHandler();
+  }
+
+  /**
+   * @description vue全局报错
+   */
+  vueErrorHandler() {
+    Vue.config.errorHandler = (error, vm) => {
+      let messageStr = this.checkMessage(error);
+      if (messageStr !== false) {
+        this.push(
+          {error: messageStr},
+          'alert',
+          'global'
+        )
+      }
+
+    };
+  }
+
+  /**
+   * @description 统一Promise catch处理
+   * @param error {Error|String} 错误对象（new Error（））|字符串当为字符串时候，全局捕获不会处理
+   * @param callback 回调事件
+   */
+  catch(error, callback = null) {
+    let messageStr = logInstance.checkMessage(error);
+    if (messageStr !== false) {
+      logInstance.push(
+        {error: messageStr},
+        'alert',
+        'catch'
+      );
+    }
+    if (typeof callback === 'function') callback()
+  }
+}
+
+function xdWxlog() {
+  if (logInstance === null) {
+    logInstance = new Logs();
+  }
+  return logInstance;
+}
+
+
+export default xdWxlog();
+
+