@conecli/cone-render 0.10.1-beta.3 → 0.10.1-beta.5
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/api/index.ts +1 -1
- package/dist/common/const.ts +1 -1
- package/dist/common/index.h5.ts +1 -1
- package/dist/common/index.weapp.ts +1 -1
- package/dist/common/sgmCustomCode.ts +1 -1
- package/dist/components/ErrorBoundary.tsx +1 -1
- package/dist/components/base/CustomScrollView/index.tsx +1 -1
- package/dist/components/base/CustomVideo/index.tsx +1 -1
- package/dist/components/base/ExposureSmart/index.tsx +1 -1
- package/dist/components/base/InOrOutViewObserver/index.tsx +1 -1
- package/dist/components/base/InViewRender/index.weapp.tsx +1 -1
- package/dist/components/base/LazyLayoutLoad/index.tsx +1 -1
- package/dist/components/base/LazyLayoutLoad/index.weapp.tsx +1 -1
- package/dist/components/base/LazyLoadImage/index.h5.module.scss +3 -0
- package/dist/components/base/LazyLoadImage/index.h5.tsx +1 -1
- package/dist/components/base/MobileCommonHeader/index.module.scss +8 -0
- package/dist/components/base/MobileCommonHeader/index.tsx +1 -1
- package/dist/components/base/NetworkDataError/index.module.scss +3 -0
- package/dist/components/base/NetworkDataError/index.tsx +1 -1
- package/dist/components/decorate/DecorateFloorModule/index.module.scss +11 -0
- package/dist/components/decorate/DecorateFloorModule/index.tsx +1 -1
- package/dist/components/decorate/EmptyFloorModule/index.tsx +1 -1
- package/dist/components/decorate/PlaceHolder/index.tsx +1 -1
- package/dist/components/floorItem.tsx +1 -1
- package/dist/components/remoteFloorItem.tsx +1 -1
- package/dist/interface/common.ts +1 -1
- package/dist/interface/component.ts +1 -1
- package/dist/interface/jumpEventReport.ts +1 -1
- package/dist/interface/service.ts +1 -1
- package/dist/jumpEventReport/base.ts +1 -1
- package/dist/jumpEventReport/const.ts +1 -1
- package/dist/jumpEventReport/jdJumpJdApp.ts +1 -1
- package/dist/jumpEventReport/jumpUrlConfig/base.ts +1 -1
- package/dist/jumpEventReport/logEventConfig.ts +1 -1
- package/dist/jumpEventReport/web.base.ts +1 -1
- package/dist/jumpEventReport/web.jd.ts +1 -1
- package/dist/jumpEventReport/web.wxapp.ts +1 -1
- package/dist/modules/ContainerFloorList/index.h5.module.scss +1 -0
- package/dist/modules/ContainerFloorList/index.h5.tsx +1 -1
- package/dist/open/api/device.ts +1 -1
- package/dist/open/api/request.ts +1 -1
- package/dist/open/api/shopMember.ts +1 -1
- package/dist/open/api/util.ts +1 -1
- package/dist/open/components/index.ts +1 -1
- package/dist/sass/app.h5.scss +5 -0
- package/dist/sass/base.scss +45 -0
- package/dist/service/requestServer.ts +1 -1
- package/dist/utils/connectNativeJsBridge.ts +1 -1
- package/dist/utils/h5Utils.ts +1 -1
- package/dist/utils/index.h5.ts +1 -1
- package/dist/utils/index.ts +1 -1
- package/dist/utils/index.weapp.ts +1 -1
- package/dist/utils/sgmCodeUtils.ts +1 -1
- package/dist/utils/taroRenderUtil.ts +1 -1
- package/dist/utils/utils.ts +1 -1
- package/package.json +24 -23
package/dist/utils/h5Utils.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import {
|
|
2
1
|
isApp,
|
|
3
2
|
isIOS,
|
|
4
3
|
getAppVersion,
|
|
5
4
|
version,
|
|
6
5
|
getUUID,
|
|
7
6
|
getUrlQuery,
|
|
8
7
|
assign,
|
|
9
8
|
isString,
|
|
10
9
|
isObject,
|
|
11
10
|
serialize,
|
|
12
11
|
isAndroid,
|
|
13
12
|
versionCompare,
|
|
14
13
|
CHANNEL_TYPE,
|
|
15
14
|
JDShopViewBusinessPathType,
|
|
16
15
|
JDShopViewBusinessPathList,
|
|
17
16
|
SECTION_HOME_TAB_NAME_TYPE,
|
|
18
17
|
SECTION_HOME_TAB_TYPE,
|
|
19
18
|
parseQueryUrlObj,
|
|
20
19
|
if (window?.__sgm__) {
|
|
21
20
|
resolve(true)
|
|
22
21
|
} else {
|
|
23
22
|
if (isSgmReadyError) {
|
|
24
23
|
console.log("当前sgm初始化失败")
|
|
25
24
|
reject(false)
|
|
26
25
|
} else {
|
|
27
26
|
ready('__sgm__', 2000).then(() => {
|
|
28
27
|
isSgmReadyError = false
|
|
29
28
|
console.log("当前sgm初始化成功")
|
|
30
29
|
resolve(true)
|
|
31
30
|
}).catch(() => {
|
|
32
31
|
isSgmReadyError = true
|
|
33
32
|
console.log("当前sgm初始化失败")
|
|
34
33
|
reject(false)
|
|
35
34
|
})
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
37
|
try {
|
|
39
38
|
return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
|
|
40
39
|
} catch (e) {
|
|
41
40
|
return {}
|
|
42
41
|
}
|
|
43
42
|
isWxMiniH5View && urlCookie['wxapp_type'] == '1'
|
|
44
43
|
if (isH5AdnJxMini) {
|
|
45
44
|
return 'jxxcx'
|
|
46
45
|
} else if (isTJApp) {
|
|
47
46
|
return 'tjapp'
|
|
48
47
|
} else if (isTjM) {
|
|
49
48
|
return 'tjm'
|
|
50
49
|
} else if (isTjJxM) {
|
|
51
50
|
return 'jxh5'
|
|
52
51
|
}
|
|
53
52
|
return ''
|
|
54
53
|
if (isJdApp) {
|
|
55
54
|
isIosDevice
|
|
56
55
|
? e && e.stopPropagation()
|
|
57
56
|
: androidDeviceStopNativeScrollEvent(state)
|
|
58
57
|
}
|
|
59
58
|
isJdApp &&
|
|
60
59
|
isAndroidDevice &&
|
|
61
60
|
window?.JdAndroid &&
|
|
62
61
|
window?.JdAndroid.requestEvent(state)
|
|
63
62
|
if (isH5AndJdShopView) {
|
|
64
63
|
return (
|
|
65
64
|
CHANNEL_TYPE[currentChannel] ||
|
|
66
65
|
CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
|
|
67
66
|
)
|
|
68
67
|
}
|
|
69
68
|
return null
|
|
70
69
|
isH5 && isJdApp && ['/app/home', '/app/classify', '/member/shopcard','/favorite/list', '/favorite/home'].includes(urlPathname)
|
|
71
70
|
isH5 && isJdApp && !['/app/home'].includes(urlPathname)
|
|
72
71
|
return isJdApp ? versionCompare(nowVersion, compareVersion) : -2
|
|
73
72
|
getSgmReadyPromise().then(() => {
|
|
74
73
|
const getCustomObj = {
|
|
75
74
|
type: 1,
|
|
76
75
|
code: 'all',
|
|
77
76
|
cost1: 1,
|
|
78
77
|
...customObj
|
|
79
78
|
}
|
|
80
79
|
try {
|
|
81
80
|
window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
|
|
82
81
|
} catch (e) {
|
|
83
82
|
console.log("当前sgm上报异常, 原始数据为",JSON.stringify(customObj))
|
|
84
83
|
}
|
|
85
84
|
}).catch(() => {
|
|
86
85
|
console.error("当前页面sgm加载异常,无法进行异常上报, 原始数据为",JSON.stringify(customObj))
|
|
87
86
|
})
|
|
88
87
|
if(isJdAndAndroidDevice && typeof displayObj === 'object'){
|
|
89
88
|
const deviceRatio = window?.devicePixelRatio
|
|
90
89
|
Object.keys(displayObj).forEach(key => {
|
|
91
90
|
if(key === 'nativeHeaderHeight'){
|
|
92
91
|
displayObj[key] = Math.ceil(displayObj[key] / (deviceRatio * deviceRatio) - 2)
|
|
93
92
|
}else {
|
|
94
93
|
displayObj[key] = Math.ceil(displayObj[key] / deviceRatio)
|
|
95
94
|
}
|
|
96
95
|
})
|
|
97
96
|
}
|
|
98
97
|
return displayObj
|
|
98
|
+
import {
|
|
99
99
|
isApp,
|
|
100
100
|
isIOS,
|
|
101
101
|
getAppVersion,
|
|
102
102
|
version,
|
|
103
103
|
getUUID,
|
|
104
104
|
getUrlQuery,
|
|
105
105
|
assign,
|
|
106
106
|
isString,
|
|
107
107
|
isObject,
|
|
108
108
|
serialize,
|
|
109
109
|
isAndroid,
|
|
110
110
|
versionCompare,
|
|
111
111
|
CHANNEL_TYPE,
|
|
112
112
|
JDShopViewBusinessPathType,
|
|
113
113
|
JDShopViewBusinessPathList,
|
|
114
114
|
SECTION_HOME_TAB_NAME_TYPE,
|
|
115
115
|
SECTION_HOME_TAB_TYPE,
|
|
116
116
|
parseQueryUrlObj,
|
|
117
117
|
if (window?.__sgm__) {
|
|
118
118
|
resolve(true)
|
|
119
119
|
} else {
|
|
120
120
|
if (isSgmReadyError) {
|
|
121
121
|
console.log("当前sgm初始化失败")
|
|
122
122
|
reject(false)
|
|
123
123
|
} else {
|
|
124
124
|
ready('__sgm__', 2000).then(() => {
|
|
125
125
|
isSgmReadyError = false
|
|
126
126
|
console.log("当前sgm初始化成功")
|
|
127
127
|
resolve(true)
|
|
128
128
|
}).catch(() => {
|
|
129
129
|
isSgmReadyError = true
|
|
130
130
|
console.log("当前sgm初始化失败")
|
|
131
131
|
reject(false)
|
|
132
132
|
})
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
try {
|
|
136
136
|
return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
|
|
137
137
|
} catch (e) {
|
|
138
138
|
return {}
|
|
139
139
|
}
|
|
140
140
|
isWxMiniH5View && urlCookie['wxapp_type'] == '1'
|
|
141
141
|
if (isH5AdnJxMini) {
|
|
142
142
|
return 'jxxcx'
|
|
143
143
|
} else if (isTJApp) {
|
|
144
144
|
return 'tjapp'
|
|
145
145
|
} else if (isTjM) {
|
|
146
146
|
return 'tjm'
|
|
147
147
|
} else if (isTjJxM) {
|
|
148
148
|
return 'jxh5'
|
|
149
149
|
}
|
|
150
150
|
return ''
|
|
151
151
|
START: 'start',
|
|
152
152
|
MOVE: 'move',
|
|
153
153
|
END: 'end',
|
|
154
154
|
x: 0,
|
|
155
155
|
y: 0
|
|
156
156
|
const startX = startPos.x
|
|
157
157
|
const startY = startPos.y
|
|
158
158
|
const endX = touchEvent.clientX
|
|
159
159
|
const endY = touchEvent.clientY
|
|
160
160
|
const dy = startY - endY
|
|
161
161
|
const dx = endX - startX
|
|
162
162
|
let result = 0
|
|
163
163
|
if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
|
|
164
164
|
return result
|
|
165
165
|
}
|
|
166
166
|
const angle = Math.atan2(dy,dx) * 180 / Math.PI
|
|
167
167
|
if (angle >= -45 && angle < 45) {
|
|
168
168
|
result = 4
|
|
169
169
|
} else if (angle >= 45 && angle < 135) {
|
|
170
170
|
result = 1
|
|
171
171
|
} else if (angle >= -135 && angle < -45) {
|
|
172
172
|
result = 2
|
|
173
173
|
} else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
|
|
174
174
|
result = 3
|
|
175
175
|
}
|
|
176
176
|
return result
|
|
177
177
|
if (isJdApp && e) {
|
|
178
178
|
const touchEvent =
|
|
179
179
|
e?.originalEvent?.targetTouches[0] || e?.targetTouches[0]
|
|
180
180
|
let _touchState = touchType
|
|
181
181
|
let _getDirectionState = false
|
|
182
182
|
if(touchType === TouchType.START){
|
|
183
183
|
StopNativeScrollEventPos.x = touchEvent.clientX
|
|
184
184
|
StopNativeScrollEventPos.y = touchEvent.clientY
|
|
185
185
|
}else if(touchType === TouchType.MOVE){
|
|
186
186
|
_getDirectionState = [1,2].includes(touchMoveGetSlideDirection(StopNativeScrollEventPos,touchEvent))
|
|
187
187
|
if(_getDirectionState){
|
|
188
188
|
_touchState = TouchType.END
|
|
189
189
|
}
|
|
190
190
|
console.log("对外提供阻止横滑方法,当前touchType为move,设定1、2向上或向下方向,当前计算后的滑动是否为纵向", _getDirectionState)
|
|
191
191
|
}else if(touchType === TouchType.END){
|
|
192
192
|
StopNativeScrollEventPos.x = 0
|
|
193
193
|
StopNativeScrollEventPos.y = 0
|
|
194
194
|
}
|
|
195
195
|
isIosDevice
|
|
196
196
|
? iosDeviceStopNativeScrollEvent(e, _touchState, stopTouchDocumentScrollState)
|
|
197
197
|
: androidDeviceStopNativeScrollEvent(_touchState, stopTouchDocumentScrollState)
|
|
198
198
|
if(!isAppHomeForMarketPage && stopTouchDocumentScrollState && _touchState === TouchType.START){
|
|
199
199
|
rootEleNode && rootEleNode.classList.add('over-hidden')
|
|
200
200
|
}
|
|
201
201
|
if(_touchState === TouchType.MOVE && _getDirectionState){
|
|
202
202
|
rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
|
|
203
203
|
}else if (_touchState === TouchType.END) {
|
|
204
204
|
setTimeout(() => {
|
|
205
205
|
rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
|
|
206
206
|
},isAppHomeForMarketPage || _getDirectionState ? 0 : 200)
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
209
|
isJdApp &&
|
|
210
210
|
touchType !== TouchType.MOVE &&
|
|
211
211
|
isAndroidDevice &&
|
|
212
212
|
window?.JdAndroid &&
|
|
213
213
|
window?.JdAndroid.requestEvent(touchType === TouchType.START)
|
|
214
214
|
console.log("对外提供阻止安卓横滑方法,true-禁止外部事件H5可滑动,false-外部拦截h5事件,当前touchType为",touchType,"当前非move触发requestEvent状态为",touchType === TouchType.START,"当前stopTouchDocumentScrollState为",stopTouchDocumentScrollState)
|
|
215
215
|
e && e.stopPropagation();
|
|
216
216
|
console.log("对外提供阻止ios横滑方法,当前touchType为", touchType, "当前stopTouchDocumentScrollState为",stopTouchDocumentScrollState)
|
|
217
217
|
window?.webkit?.messageHandlers?.MobileNavi?.postMessage?.({
|
|
218
218
|
method: 'callRouterModuleWithParams',
|
|
219
219
|
params: {
|
|
220
220
|
routerURL: 'router://JDShopModule/processShoph5SlideState',
|
|
221
221
|
routerParam: {
|
|
222
222
|
slideDirection: 'horizontal',
|
|
223
223
|
state: touchType,
|
|
224
224
|
},
|
|
225
225
|
callBackId: new Date().getTime(),
|
|
226
226
|
},
|
|
227
227
|
})
|
|
228
228
|
if (isH5AndJdShopView) {
|
|
229
229
|
return (
|
|
230
230
|
CHANNEL_TYPE[currentChannel] ||
|
|
231
231
|
CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
|
|
232
232
|
)
|
|
233
233
|
}
|
|
234
234
|
return null
|
|
235
235
|
isH5 && isJdApp && ['/app/home', '/app/classify', '/member/shopcard','/favorite/list', '/favorite/home'].includes(urlPathname)
|
|
236
236
|
isH5 && isJdApp && !['/app/home'].includes(urlPathname)
|
|
237
237
|
return isJdApp ? versionCompare(nowVersion, compareVersion) : -2
|
|
238
238
|
getSgmReadyPromise().then(() => {
|
|
239
239
|
if (
|
|
240
240
|
customObj.hasOwnProperty('code') &&
|
|
241
241
|
customObj.code.indexOf(NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG) !== -1
|
|
242
242
|
) {
|
|
243
243
|
const originCode = customObj.code.substring(
|
|
244
244
|
NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG.length,
|
|
245
245
|
customObj.code.length,
|
|
246
246
|
)
|
|
247
247
|
customObj['code'] = getSgmCustomCode(handleSgmCodeTaroVersion(originCode))
|
|
248
248
|
}
|
|
249
249
|
const getCustomObj = {
|
|
250
250
|
type: 1,
|
|
251
251
|
code: 'all',
|
|
252
252
|
cost1: 1,
|
|
253
253
|
...customObj
|
|
254
254
|
}
|
|
255
255
|
try {
|
|
256
256
|
window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
|
|
257
257
|
} catch (e) {
|
|
258
258
|
console.log("当前sgm上报异常, 原始数据为",JSON.stringify(customObj))
|
|
259
259
|
}
|
|
260
260
|
}).catch(() => {
|
|
261
261
|
console.error("当前页面sgm加载异常,无法进行异常上报, 原始数据为",JSON.stringify(customObj))
|
|
262
262
|
})
|
|
263
263
|
if(isJdAndAndroidDevice && typeof displayObj === 'object'){
|
|
264
264
|
const deviceRatio = window?.devicePixelRatio
|
|
265
265
|
Object.keys(displayObj).forEach(key => {
|
|
266
266
|
if(key === 'nativeHeaderHeight'){
|
|
267
267
|
displayObj[key] = Math.ceil(displayObj[key] / (deviceRatio * deviceRatio) - 2)
|
|
268
268
|
}else {
|
|
269
269
|
displayObj[key] = Math.ceil(displayObj[key] / deviceRatio)
|
|
270
270
|
}
|
|
271
271
|
})
|
|
272
272
|
}
|
|
273
273
|
return displayObj
|