gxd-uni-library-editx 1.0.185 → 1.0.187

package/package.json

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

package/src/utils/helper.js

@@ -18,6 +18,12 @@ import {
   baseInArray
 } from "@/utils/xd.base";
 
+import {
+  codeForGetAppId,
+  toThirdMP,
+  checkMpUrl
+} from './JumpTo';
+
 class Helpers {
 
   constructor(){
@@ -47,9 +53,9 @@ class Helpers {
    * @param obj
    * @returns {*}
    */
-	checkVarType(obj){
-	  return baseCheckVarType(obj)
-	}
+  checkVarType(obj){
+    return baseCheckVarType(obj)
+  }
 
   /**
    * @description 获取最近某时间断内的时间
@@ -1292,14 +1298,56 @@ class Helpers {
     else cb(obj);
   }
 
+  /**
+   * @description 跨平台处理
+   */
+  handleCrossPlatform(obj,cb){
+
+    //检查是否为第三方小程序
+    if(checkMpUrl(obj.url)) {
+      toThirdMP(obj.url);
+      return;
+    }
+
+    //目标为微信小程序时候处理
+    if(obj['jfb-platform'] && obj['jfb-platform']['appType'] === 'wxmp'){
+      let {deploy_dir, host} = store.state.brandInfo;
+      let dir = obj['jfb-platform']['dir'];
+
+      //不同应用处理
+      if(deploy_dir !== dir) {
+        codeForGetAppId(
+          obj['jfb-platform']['aopen_app_code'],
+          obj['jfb-platform']['appType'],
+          obj.url,
+          '',
+          dir
+        );
+        return
+      }
+
+      //相同应用跳转
+      else {
+        delete obj['jfb-platform'];
+        obj.url = obj.url.replace(`@site_domain@/${dir}`,'')
+        if(typeof cb === 'function') cb();
+      }
+    }
+
+    //其他情况
+    if(typeof cb === 'function') cb();
+  }
+
   /**
    * @description 保留当前页面，跳转到应用内的某个页面  https://uniapp.dcloud.io/api/router?id=navigateto
    * @param obj 与uni.navigateTo的Object参数相同
    * @param redirect 是否添加当前页面地址路径最为回调地址
    */
   navigateTo(obj = {}, redirect) {
-    this.specialApiTransform(obj,(res)=>{
-      this.handleTo(res, redirect);
+    this.handleCrossPlatform(obj,()=>{
+      this.specialApiTransform(obj,(res)=>{
+        this.handleTo(res, redirect);
+      })
     })
   }
 
@@ -1356,9 +1404,11 @@ class Helpers {
    * @param notHistory h5使用window.location.replace() H5生效
    */
   redirectTo(obj, redirect, notHistory=false) {
-    this.specialApiTransform(obj,(res)=>{
-      this.handleTo(res, redirect, false, notHistory);
-    })
+    this.handleCrossPlatform(obj,()=>{
+      this.specialApiTransform(obj,(res)=>{
+        this.handleTo(res, redirect, false, notHistory);
+      })
+    });
   }
 
   /**

package/src/utils/xd.base.js

@@ -850,7 +850,8 @@ export function getContainerPropsValue(
         // }
 
         //是对象需要合并属性选项
-        if(isMerge) return handleMerge(propsData,dDataValue )
+        let version = isDefStatus(container,props,true);
+        if(isMerge) return handleMerge(propsData,version?dDataValue:lastValue)
         //是对象需要合并属性选项
 
         //普通默认值