@dolphinweex/weex-vue-render 0.2.38 → 0.2.39
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.
- package/dist/index.common.js +35 -17
- package/package.json +1 -1
package/dist/index.common.js
CHANGED
|
@@ -3367,7 +3367,14 @@ function watchAppear (context, fireNow) {
|
|
|
3367
3367
|
var el = watchAppearList[i];
|
|
3368
3368
|
var appearOffset = getAppearOffset(el);
|
|
3369
3369
|
var visibleData = isElementVisible(el, container, dir, appearOffset);
|
|
3370
|
-
|
|
3370
|
+
/**
|
|
3371
|
+
* BUG2025052771230
|
|
3372
|
+
* triggerAppearEvent 执行过快可能会导致AI对话聊天窗口重叠问题
|
|
3373
|
+
* 此处延时执行是临时规避措施,后续需要优化
|
|
3374
|
+
*/
|
|
3375
|
+
setTimeout(() => {
|
|
3376
|
+
detectAppear(el, visibleData, dir);
|
|
3377
|
+
}, i);
|
|
3371
3378
|
}
|
|
3372
3379
|
};
|
|
3373
3380
|
container.addEventListener('scroll', throttle(scrollHandler, 100, true));
|
|
@@ -6095,7 +6102,6 @@ var scrollable$1 = {
|
|
|
6095
6102
|
if (!this.scrollable) {
|
|
6096
6103
|
return
|
|
6097
6104
|
}
|
|
6098
|
-
|
|
6099
6105
|
var tp = this._touchParams;
|
|
6100
6106
|
if (!tp) { return }
|
|
6101
6107
|
|
|
@@ -6115,19 +6121,7 @@ var scrollable$1 = {
|
|
|
6115
6121
|
// 如果是水平滚动,并且手势是水平方向,则阻止冒泡
|
|
6116
6122
|
// 如果是垂直滚动,并且手势是垂直方向,则阻止冒泡
|
|
6117
6123
|
var isScrollHorizontal = this.$el.classList.value.indexOf("weex-scroller-horizontal") > -1 || this.$el.classList.value.indexOf("weex-recycle-horizontal") > -1
|
|
6118
|
-
|
|
6119
|
-
if (isScrollHorizontal) {
|
|
6120
|
-
if (!isV) {
|
|
6121
|
-
// 水平
|
|
6122
|
-
event.stopPropagation();
|
|
6123
|
-
return;
|
|
6124
|
-
}
|
|
6125
|
-
return;
|
|
6126
|
-
}else {
|
|
6127
|
-
if (!isV) {
|
|
6128
|
-
return;
|
|
6129
|
-
}
|
|
6130
|
-
}
|
|
6124
|
+
|
|
6131
6125
|
|
|
6132
6126
|
if (!this._refresh && !this._loading) {
|
|
6133
6127
|
return
|
|
@@ -6148,6 +6142,23 @@ var scrollable$1 = {
|
|
|
6148
6142
|
}
|
|
6149
6143
|
else if (this._loading && (dir === 'up') && reachBottom) {
|
|
6150
6144
|
this._loading.pullingUp(-offsetY);
|
|
6145
|
+
var wrapper = this.$refs.wrapper;
|
|
6146
|
+
if (wrapper) {
|
|
6147
|
+
// 增加 1 像素,强制 scroll 区域“撑开”
|
|
6148
|
+
wrapper.scrollTop = wrapper.scrollTop + 5;
|
|
6149
|
+
}
|
|
6150
|
+
}
|
|
6151
|
+
}
|
|
6152
|
+
if (isScrollHorizontal) {
|
|
6153
|
+
if (!isV) {
|
|
6154
|
+
// 水平
|
|
6155
|
+
event.stopPropagation();
|
|
6156
|
+
return;
|
|
6157
|
+
}
|
|
6158
|
+
return;
|
|
6159
|
+
}else {
|
|
6160
|
+
if (!isV) {
|
|
6161
|
+
return;
|
|
6151
6162
|
}
|
|
6152
6163
|
}
|
|
6153
6164
|
},
|
|
@@ -7044,7 +7055,6 @@ function getLoading () {
|
|
|
7044
7055
|
methods: {
|
|
7045
7056
|
pulling: function pulling (offsetY) {
|
|
7046
7057
|
if ( offsetY === void 0 ) offsetY = 0;
|
|
7047
|
-
|
|
7048
7058
|
this.height = offsetY;
|
|
7049
7059
|
},
|
|
7050
7060
|
pullingUp: function pullingUp (offsetY) {
|
|
@@ -7053,7 +7063,7 @@ function getLoading () {
|
|
|
7053
7063
|
},
|
|
7054
7064
|
pullingEnd: function pullingEnd () {
|
|
7055
7065
|
this.$el && (this.$el.style.transition = "height .2s");
|
|
7056
|
-
if (this.height >= this.viewHeight) {
|
|
7066
|
+
if ( this.height >= Math.max(this.viewHeight, 150)) {
|
|
7057
7067
|
this.pulling(this.viewHeight);
|
|
7058
7068
|
if (this.$el) {
|
|
7059
7069
|
dispatchNativeEvent(this.$el, 'loading');
|
|
@@ -7145,6 +7155,7 @@ function getRefresh (weex) {
|
|
|
7145
7155
|
},
|
|
7146
7156
|
watch: {
|
|
7147
7157
|
height: function height (val) {
|
|
7158
|
+
if(val >150) val = 150
|
|
7148
7159
|
this.$el.style.height = val + "px";
|
|
7149
7160
|
},
|
|
7150
7161
|
display: function display (val) {
|
|
@@ -10437,6 +10448,13 @@ var dom = {
|
|
|
10437
10448
|
var offset = (isWindow ? 0 : ct[("scroll" + dSuffix)]) + elRect[dir] - ctRect[dir];
|
|
10438
10449
|
if (options) {
|
|
10439
10450
|
offset += options.offset && options.offset * weex.config.env.scale || 0;
|
|
10451
|
+
/**
|
|
10452
|
+
* 计算出的 offset 不适配 小美 AI 聊天框消息滑到底部; 通过传入的标志, 把计算出的 offset 重置为 0
|
|
10453
|
+
* 此为临时方案,后续需要优化
|
|
10454
|
+
*/
|
|
10455
|
+
if(options.isReset){
|
|
10456
|
+
offset = 0
|
|
10457
|
+
}
|
|
10440
10458
|
}
|
|
10441
10459
|
else {}
|
|
10442
10460
|
if (options && options.animated === false) {
|
package/package.json
CHANGED