gxd-uni-library-editx 1.0.91 → 1.0.93

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/XdFormItem/XdFormItem.vue +12 -1
  3. package/src/utils/helper.js +8 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gxd-uni-library-editx",
3
- "version": "1.0.91",
3
+ "version": "1.0.93",
4
4
  "private": false,
5
5
  "description": "聚福宝基础插件专用库",
6
6
  "main": "index.js",
package/src/components/XdFormItem/XdFormItem.vue CHANGED
@@ -35,6 +35,7 @@
35
35
  <view v-if="label" class="label-seat"></view>
36
36
  </slot>
37
37
  </view>
38
+ <view v-if="subTitle" class="uni-forms-item__sub-title">{{ subTitle }}</view>
38
39
  <view class="uni-forms-item__content" :class="{ 'is-input-error-border': msg }"><slot></slot></view>
39
40
  </view>
40
41
  <view
@@ -138,7 +139,11 @@ export default {
138
139
  default() {
139
140
  return [];
140
141
  }
141
- }
142
+ },
143
+ subTitle: {
144
+ type: String,
145
+ default: ''
146
+ }
142
147
  },
143
148
  data() {
144
149
  return {
@@ -499,6 +504,12 @@ export default {
499
504
  }
500
505
  }
501
506
 
507
+ .uni-forms-item__sub-title{
508
+ color: #979797;
509
+ font-size: 20rpx;
510
+ margin: -10rpx 0 10rpx 32rpx;
511
+ }
512
+
502
513
  .uni-forms-item__content {
503
514
  /* #ifndef APP-NVUE */
504
515
  width: 100%;
package/src/utils/helper.js CHANGED
@@ -956,7 +956,9 @@ class Helpers {
956
956
  handleTo(obj = {}, redirect, type = true, notHistory = false) {
957
957
 
958
958
  //检查地址是否合法性
959
+ let reg = /^(http:\/\/|https:\/\/|\/\/).+$/;
959
960
  obj.url = this.checkValidateUrl(obj.url);
961
+
960
962
  //console.log(this.checkValidateUrl('//sandbox-website-05.jufubao.cn/apply06/main/cake/index?x-common=eyJidXNpbmVzc19jb2RlIjoiY2FrZSJ9&vs=1721740600007'))
961
963
  //console.log(this.checkValidateUrl('/main/cake/index1?x-common=eyJidXNpbmVzc19jb2RlIjoiY2FrZSJ9&vs=1721740600007'))
962
964
  //console.log(this.checkValidateUrl('//sandbox-website-05.jufubao.cn/apply/main/cake/index1?x-common=eyJidXNpbmVzc19jb2RlIjoiY2FrZSJ9&vs=1721740600007'))
@@ -1007,10 +1009,14 @@ class Helpers {
1007
1009
  obj.url = this.replacePathForDir(obj.url);
1008
1010
 
1009
1011
  //设置检查访问地址
1010
- let reg = /^(http:\/\/|https:\/\/|\/\/).+$/;
1011
1012
  //检查网络链接是不是当前应用中的一个路径
1012
1013
  if(reg.test(obj.url)) {
1013
- obj.url = this.parseUrlSameAppUrl(obj.url);
1014
+ let newUrl = this.parseUrlSameAppUrl(obj.url);
1015
+ //使用redirectTo时候并且是一个内容地址转化为使用navigateTo模式
1016
+ if(!type && !reg.test(newUrl)) {
1017
+ type = true;
1018
+ }
1019
+ obj.url = newUrl;
1014
1020
  }
1015
1021
  let isH5 = reg.test(obj.url);
1016
1022