gxd-uni-library-editx 1.0.92 → 1.0.94

package/package.json

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

package/src/components/XdConfirm/XdConfirm.vue

@@ -21,6 +21,13 @@
         v-if="confirm.isHtml"
         :style="{color: confirm.contentColor}"
       >
+        <view class="xd-input-confirm__body-icon" v-if="confirm.msgIcon">
+          <xd-font-icon
+            :icon="confirm.msgIcon"
+            :color="confirm.msgIconColor||$currentStyle['$dangerColor']"
+            :size="confirm.msgIconSize"
+          ></xd-font-icon>
+        </view>
         <view v-html="confirm.content"></view>
       </scroll-view>
       <view
@@ -28,7 +35,16 @@
         class="xd-input-confirm__body-content"
         :style="{color: confirm.contentColor}"
       >
-        <slot>{{confirm.content}}</slot>
+        <view class="xd-input-confirm__body-icon" v-if="confirm.msgIcon">
+          <xd-font-icon
+            :icon="confirm.msgIcon"
+            :color="confirm.msgIconColor||$currentStyle['$dangerColor']"
+            :size="confirm.msgIconSize"
+          ></xd-font-icon>
+        </view>
+        <view>
+          <slot>{{confirm.content}}</slot>
+        </view>
       </view>
       <view class="xd-input-confirm__body-btn">
         <view v-if="confirm.cancel">
@@ -142,7 +158,9 @@
           confirmColorType: 'primary',
           radius: '10rpx',
           btnRadius: '',
-
+          msgIcon:'',
+          msgIconColor:'',
+          msgIconSize:'70',
         }
       }
     },
@@ -276,6 +294,14 @@
           padding: 0 unit(20, rpx);
         }
       }
+
+      &-icon {
+        margin-bottom: 20rpx;
+        height: 80rpx;
+        display:flex;
+        justify-content: center;
+        align-items: center;
+      }
     }
   }
 </style>

package/src/utils/helper.js

@@ -956,7 +956,9 @@ class Helpers {
   handleTo(obj = {}, redirect, type = true, notHistory = false) {
 
     //检查地址是否合法性
+    let reg = /^(http:\/\/|https:\/\/|\/\/).+$/;
     obj.url = this.checkValidateUrl(obj.url);
+
     //console.log(this.checkValidateUrl('//sandbox-website-05.jufubao.cn/apply06/main/cake/index?x-common=eyJidXNpbmVzc19jb2RlIjoiY2FrZSJ9&vs=1721740600007'))
     //console.log(this.checkValidateUrl('/main/cake/index1?x-common=eyJidXNpbmVzc19jb2RlIjoiY2FrZSJ9&vs=1721740600007'))
     //console.log(this.checkValidateUrl('//sandbox-website-05.jufubao.cn/apply/main/cake/index1?x-common=eyJidXNpbmVzc19jb2RlIjoiY2FrZSJ9&vs=1721740600007'))
@@ -1007,10 +1009,14 @@ class Helpers {
     obj.url = this.replacePathForDir(obj.url);
 
     //设置检查访问地址
-    let reg = /^(http:\/\/|https:\/\/|\/\/).+$/;
     //检查网络链接是不是当前应用中的一个路径
     if(reg.test(obj.url)) {
-      obj.url = this.parseUrlSameAppUrl(obj.url);
+      let newUrl = this.parseUrlSameAppUrl(obj.url);
+      //使用redirectTo时候并且是一个内容地址转化为使用navigateTo模式
+      if(!type && !reg.test(newUrl)) {
+        type = true;
+      }
+      obj.url = newUrl;
     }
     let isH5 = reg.test(obj.url);
 

package/src/utils/xdWxLog.js

@@ -20,6 +20,7 @@ import {
 
 const c1Id = randomChar(32);
 const extJson = uni.getExtConfigSync();
+console.warn(`logs.init.wx.mp: ${extJson}`);
 
 let Monitor = null;
 //开发环境处理
@@ -29,7 +30,7 @@ if(checkRunTimeENVIsOpenLog()) {
 else {
   Monitor = mpLogger.init({
     pid: settings.aliPid,
-    tag:extJson.appId || 'dev',
+    tag: extJson.appId || 'dev',
     environment: settings.aliEnvironment,
     sample: settings.aliSample,
     pvSample: settings.aliPvSample,