gxd-uni-library-editx 1.0.3 → 1.0.5

package/package.json

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

package/src/install.js

@@ -102,9 +102,10 @@ const install = (Vue, options = {}) => {
   Vue.mixin({
     data() {
       return {
-        $mainColor: '',
-        $btnColor: '',
-        $subBtnColor: '',
+        /**editx去掉逻辑**/
+        // $mainColor: '',
+        // $btnColor: '',
+        // $subBtnColor: '',
         $pxNum: null, //px to rpx  (1px * $pxNum)rpx
         $rpxNum: null, //rpx to px (1rpx * $rpxNum)px
         $portrait: null,
@@ -137,15 +138,16 @@ const install = (Vue, options = {}) => {
       this.$isIpadCC = 1;
       // #endif
 
-      if (this.webSetting) {
-        this.$mainColor = this.webSetting['mainColor'] || options['mainColor'];
-        this.$btnColor = this.webSetting['btnColor'] || options['btnColor'];
-        this.$subBtnColor = this.webSetting['subBtnColor'] || options['subBtnColor'];
-      } else {
-        this.$mainColor = options['mainColor'] ? options['mainColor'] : '';
-        this.$btnColor = options['btnColor'] ? options['btnColor'] : '';
-        this.$subBtnColor = options['subBtnColor'] ? options['subBtnColor'] : '';
-      }
+      /**editx去掉逻辑**/
+      // if (this.webSetting) {
+      //   this.$mainColor = this.webSetting['mainColor'] || options['mainColor'];
+      //   this.$btnColor = this.webSetting['btnColor'] || options['btnColor'];
+      //   this.$subBtnColor = this.webSetting['subBtnColor'] || options['subBtnColor'];
+      // } else {
+      //   this.$mainColor = options['mainColor'] ? options['mainColor'] : '';
+      //   this.$btnColor = options['btnColor'] ? options['btnColor'] : '';
+      //   this.$subBtnColor = options['subBtnColor'] ? options['subBtnColor'] : '';
+      // }
 
       //横竖屏
       this.$portrait = 1.4;
@@ -155,9 +157,10 @@ const install = (Vue, options = {}) => {
     watch: {
       webSetting(value) {
         if (value !== null) {
-          if (value['mainColor']) this.$mainColor = value['mainColor'];
-          if (value['btnColor']) this.$btnColor = value['btnColor'];
-          if (value['subBtnColor']) this.$subBtnColor = value['subBtnColor'];
+          /**editx去掉逻辑**/
+          // if (value['mainColor']) this.$mainColor = value['mainColor'];
+          // if (value['btnColor']) this.$btnColor = value['btnColor'];
+          // if (value['subBtnColor']) this.$subBtnColor = value['subBtnColor'];
           this.$webSetting = value;
         }
       }

package/src/utils/xd.base.js

@@ -340,6 +340,7 @@ export function parseContainers (containers) {
     containers = [containers];
   }
   const handle = (str) => {
+    if(str === '') return {};
     if(baseCheckVarType(str) === 'object') return str;
     try {
       return JSON.parse(str)
@@ -477,3 +478,5 @@ export function getParentsStyle(parent, key) {
 
 
 
+
+

package/src/utils/xd.common.js

@@ -9,6 +9,7 @@ import {
   getSetting,
   baseIsEmpty
 } from "@/utils/xd.base";
+import store from "@/store";
 
 
 import storage from "@/common/storage";
@@ -129,10 +130,10 @@ export function handlePesponse(
     clog(`Fast Link:${request.url} ${useTime}ms`, 'green');
   }
 
+
   //200
   if (response['statusCode'] === 200) {
     resolve(response.data);
-    return;
   }
 
   //400
@@ -162,14 +163,58 @@ export function handlePesponse(
 
   //401
   else if (response['statusCode'] === 401) {
-    if (!$vm) {
-      reject(response);
-      throw new Error(response.data.message);
-    }
-    else {
+    //是否为刷新接口报错
+    if(request.url.indexOf(request.userRefreshToken) !== -1) {
+      console.log('request.userRefreshToken.401', request.userRefreshToken);
       reject(response);
       $vm.$xdHideLoading();
     }
+
+    //其他接口报错
+    else{
+      if (!$vm) {
+        reject(response);
+        throw new Error(response.data.message);
+      }
+      else {
+        //需要卡登陆页面
+        if(response.data.code === 'NeedCardLogin') {
+          //当前页面为卡登陆页面不处理
+          if($vm.$route.path === store.state.jfbAuthorize.cardPath) {
+            reject(response);
+            $vm.$xdHideLoading();
+          }
+          else store.state.jfbAuthorize.jumpToCardLogin($vm);
+        }
+
+        //用户登陆失效
+        else if(response.data.code === 'NeedLogin') {
+          if ($vm.$route.path === store.state.jfbAuthorize.LoginPath) {
+            reject(response);
+            $vm.$xdHideLoading();
+          }
+          else store.state.jfbAuthorize.jumpToUserLogin($vm);
+        }
+
+        //401去交换token
+        else if(response.data.code === 'Unauthorized') {
+          store.dispatch('userRefreshToken')
+            .then(status=>{
+              //交给store进行方法重新调用操作
+              reject('reLoadApi');
+            })
+            .catch(error=>{
+              store.state.jfbAuthorize.jumpToUserLogin($vm);
+            })
+        }
+        else {
+          reject(response);
+          $vm.$xdHideLoading();
+        }
+      }
+    }
+
+
   }
 
   //500

package/src/utils/xd.event.js

@@ -51,6 +51,25 @@ export function jfbRootExec(fnName, params) {
   }
 };
 
+/**
+ * @description 获得父级页面中的方法引用
+ * @param vm {Vue} 插件对象实例
+ * @param fnName {String} 方法名字
+ * @returns {Function} 返回方法调用
+ */
+export function jfbRootFnExec(vm, fnName) {
+  if(typeof vm.$root[fnName] === 'function') {
+    return vm.$root[fnName];
+  }
+  else {
+    throw new Error(JSON.stringify({
+      message: '访问的方法不存在',
+      fnName,
+      data: params
+    }))
+  }
+}
+
 
 
 /**

package/src/utils/xd.frame.js

@@ -75,7 +75,15 @@ class xdFrame {
    * @param fnName {String} 方法名字
    */
   getParentApi(fnName) {
-    return this.getParent()['$boardApi'][fnName];
+    if (window.parent['$boardApi']) {
+      return this.getParent()['$boardApi'][fnName];
+    } else {
+      return () => {
+        return new Promise((resolve) => {
+          resolve([]);
+        })
+      }
+    }
   }
 
   /**
@@ -83,7 +91,11 @@ class xdFrame {
    * @param attr {String} 属性名字
    */
   getParentData(attr) {
-    return this.getParent()['$boardData'][attr];
+    console.log('getParentData',)
+    if (window.parent['$boardData']) {
+      return this.getParent()['$boardData'][attr];
+    } else return [];
+
   }
 }
 

package/src/utils/xdh5log.js

@@ -269,7 +269,7 @@ class Logs {
    * @description vue全局报错
    */
   vueErrorHandler(){
-    Vue.config.errorHandler = (error, vm) => {
+    let  handle = (error, vm)=>{
       let messageStr = this.checkMessage(error);
       if (messageStr !== false) {
         this.push(
@@ -278,7 +278,13 @@ class Logs {
           'global'
         )
       }
+    }
+
+    Vue.config.errorHandler = handle;
+
 
+    Vue.config.errorCaptured = (error, vm) => {
+      console.error(error)
     };
   }