@conecli/cone-render 0.9.1-shop2.13 → 0.9.1-shop2.14

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 (35) hide show
  1. package/dist/common/const.ts +1 -1
  2. package/dist/common/index.h5.ts +1 -1
  3. package/dist/common/index.weapp.ts +1 -1
  4. package/dist/common/sgmCustomCode.ts +1 -1
  5. package/dist/components/ErrorBoundary.tsx +1 -1
  6. package/dist/components/base/CustomVideo/index.tsx +1 -1
  7. package/dist/components/base/LazyLayoutLoad/index.tsx +1 -1
  8. package/dist/components/base/LazyLoadImage/index.h5.tsx +1 -1
  9. package/dist/components/base/MobileCommonHeader/index.tsx +1 -1
  10. package/dist/components/base/NetworkDataError/index.module.scss +3 -0
  11. package/dist/components/base/NetworkDataError/index.tsx +1 -1
  12. package/dist/components/remoteFloorItem.tsx +1 -1
  13. package/dist/interface/component.ts +1 -1
  14. package/dist/jumpEventReport/base.ts +1 -1
  15. package/dist/jumpEventReport/jdJumpJdApp.ts +1 -1
  16. package/dist/jumpEventReport/web.base.ts +1 -1
  17. package/dist/jumpEventReport/web.jd.ts +1 -1
  18. package/dist/modules/ContainerFloorList/index.h5.module.scss +1 -0
  19. package/dist/modules/ContainerFloorList/index.h5.tsx +1 -1
  20. package/dist/open/api/device.ts +1 -1
  21. package/dist/open/api/request.ts +1 -1
  22. package/dist/open/api/shopMember.ts +1 -1
  23. package/dist/open/api/util.ts +1 -1
  24. package/dist/open/components/index.ts +1 -1
  25. package/dist/sass/app.h5.scss +5 -0
  26. package/dist/service/requestServer.ts +1 -1
  27. package/dist/utils/connectNativeJsBridge.ts +1 -1
  28. package/dist/utils/h5Utils.ts +1 -1
  29. package/dist/utils/index.h5.ts +1 -1
  30. package/dist/utils/index.ts +1 -1
  31. package/dist/utils/index.weapp.ts +1 -1
  32. package/dist/utils/sgmCodeUtils.ts +1 -1
  33. package/dist/utils/taroRenderUtil.ts +1 -1
  34. package/dist/utils/utils.ts +1 -1
  35. package/package.json +1 -1
@@ -52,6 +52,7 @@
52
52
  width: 100%;
53
53
  z-index: 999;
54
54
  background: black;
55
+ margin-bottom: 16px;
55
56
  }
56
57
  .d-container-list-no-data {
57
58
  min-height: 400px;
@@ -1 +1 @@
1
- import React from 'react'
2
1
  isJdApp,
3
2
  isChartH5,
4
3
  NETWORK_DATA_TYPE,
5
4
  M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
6
5
  APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
7
6
  containerFloorListData: ComponentInterFace.ContainerItemData[]
8
7
  className?: string
9
8
  containerItemClass?: object
10
9
  style?: object
11
10
  hasGoodsFeeds?: boolean
12
11
  builtInComponents?: Object
13
12
  loadingEndComponentFn?: Function
14
13
  sectionType?: string
15
14
  updateShopFloorDataFn?: Function
16
15
  updateContainerFloorListDataFn?: Function
17
16
  customErrorIsvFloorModule?: React.ReactElement
18
17
  componentExtend?: React.ReactElement
19
18
  const { windowHeight } = taroJdBaseInfo.info.sysInfo
20
19
  const {
21
20
  className,
22
21
  style,
23
22
  containerItemClass = null,
24
23
  containerFloorListData,
25
24
  builtInComponents,
26
25
  loadingEndComponentFn,
27
26
  sectionType,
28
27
  updateShopFloorDataFn,
29
28
  updateContainerFloorListDataFn,
30
29
  customErrorIsvFloorModule,
31
30
  } = props
32
31
 
33
32
  const renderFloorItem = (
34
33
  item,
35
34
  floorItem,
36
35
  floorIndex,
37
36
  containerLayoutLeftRightMargin,
38
37
  lazyLoadState = false,
39
38
  ) => {
40
39
  return (
41
40
  <View
42
41
  className={classNames(shopContainerListStyle['d-floor-item'])}
43
42
  data-floor-uid={floorItem?.uid}
44
43
  data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
45
44
  data-lazy-load={lazyLoadState}
46
45
  key={floorItem.uid}
47
46
  id={`J_floor_${floorItem.uid}`}
48
47
  style={{
49
48
  borderRadius: `${item?.borderRadius || 0}px`,
50
49
  }}
51
50
  >
52
51
  {isChartH5 && (
53
52
  <View
54
53
  className={shopContainerListStyle['d-floor-chart-item']}
55
54
  id={`J_chart_floor_${floorItem?.uid}`}
56
55
  data-floor-uid={floorItem?.uid}
57
56
  data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
58
57
  />
59
58
  )}
60
59
  <FloorListItem
61
60
  floorIndex={floorIndex}
62
61
  floorData={floorItem}
63
62
  layoutLeftRightMargin={containerLayoutLeftRightMargin}
64
63
  containerBorderRadius={item?.borderRadius || 0}
65
64
  updateShopFloorDataFn={updateShopFloorDataFn}
66
65
  loadingEndComponentFn={loadingEndComponentFn}
67
66
  key={floorItem.uid}
68
67
  builtInComponents={builtInComponents}
69
68
  updateContainerFloorListDataFn={updateContainerFloorListDataFn}
70
69
  customErrorIsvFloorModule={customErrorIsvFloorModule}
71
70
  />
72
71
  </View>
73
72
  )
74
73
  }
75
74
 
76
75
  const getFloorSetHeight = (item) => {
77
76
  const getHeight = item?.floorExtInfo?.floorHeight
78
77
  ? Number(item?.floorExtInfo?.floorHeight)
79
78
  : 200
80
79
  return getHeight > 0 ? getHeight : 200
81
80
  }
82
81
  return (
83
82
  <View
84
83
  className={classNames(
85
84
  className,
86
85
  shopContainerListStyle['d-shop-container-list'],
87
86
  )}
88
87
  style={style}
89
88
  >
90
89
  <View id='J_shopContainerFloorList'>
91
90
  {containerFloorListData.length > 0 ? (
92
91
  containerFloorListData.map((item, index) => {
93
92
  const containerLayoutLeftRightMargin =
94
93
  (item.marginLeft || 0) + (item.marginRight || 0)
95
94
  const getContainerId = `J_container_${item.containerId}`
96
95
  return (
97
96
  <React.Fragment key={item.containerId + index}>
98
97
  {
99
98
  item.addLuxuryStyle ?
100
99
  <View
101
100
  className={
102
101
  shopContainerListStyle['d-luxury-header']
103
102
  }
104
103
  />
105
104
  : null
106
105
  }
107
106
  {
108
107
  item.addLuxuryBackupStyle ?
109
108
  <View
110
109
  style={{ height: taroJdBaseInfo?.info?.sysInfo?.jdNativeHeaderHeight + 'px' }}
111
110
  className={
112
111
  shopContainerListStyle['d-luxury-header-black']
113
112
  }
114
113
  />
115
114
  : null
116
115
  }
117
116
  {typeof item?.renderExtendComponent === 'function' ? item?.renderExtendComponent(item?.floorExtendData) : null}
118
117
  <View
119
118
  className={classNames(
120
119
  shopContainerListStyle['d-container-item'],
121
120
  containerItemClass,
122
121
  )}
123
122
  id={getContainerId}
124
123
  key={item.containerId}
125
124
  data-container-id={item?.containerId}
126
125
  data-container-type={item?.typeCode}
127
126
  style={{
128
127
  marginBottom: item.marginBottom
129
128
  ? `${item.marginBottom}px`
130
129
  : 0,
131
130
  marginTop: item.marginTop
132
131
  ? `${item.marginTop}px`
133
132
  : 0,
134
133
  marginLeft: item.marginLeft
135
134
  ? `${item.marginLeft}px`
136
135
  : 0,
137
136
  marginRight: item.marginRight
138
137
  ? `${item.marginRight}px`
139
138
  : 0,
140
139
  borderRadius: item.borderRadius
141
140
  ? `${item.borderRadius}px`
142
141
  : 0,
143
142
  }}
144
143
  >
145
144
  {item.floors &&
146
145
  item.floors.length > 0 &&
147
146
  item.floors?.map(
148
147
  (floorItem, floorIndex) => {
149
148
  return index > lazyLoadStartIndex ? (
150
149
  <LazyLayoutLoad
151
150
  key={item.containerId}
152
151
  sectionType={sectionType}
153
152
  containerId={getContainerId}
154
153
  height={getFloorSetHeight(
155
154
  floorItem,
156
155
  )}
157
156
  floorData={floorItem}
158
157
  >
159
158
  {renderFloorItem(
160
159
  item,
161
160
  floorItem,
162
161
  floorIndex,
163
162
  containerLayoutLeftRightMargin,
164
163
  true,
165
164
  )}
166
165
  </LazyLayoutLoad>
167
166
  ) : (
168
167
  renderFloorItem(
169
168
  item,
170
169
  floorItem,
171
170
  floorIndex,
172
171
  containerLayoutLeftRightMargin,
173
172
  )
174
173
  )
175
174
  },
176
175
  )}
177
176
  </View>
178
177
  </React.Fragment>
179
178
  )
180
179
  })
181
180
  ) : (
182
181
  <View
183
182
  className={
184
183
  shopContainerListStyle['d-container-list-no-data']
185
184
  }
186
185
  style={{
187
186
  height: `${
188
187
  windowHeight -
189
188
  (isJdApp
190
189
  ? APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT
191
190
  : M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT)
192
191
  }px`,
193
192
  }}
194
193
  >
195
194
  <NetworkDataError
196
195
  netWorkShowType={NetWorkShowType.PART}
197
196
  netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}
198
197
  />
199
198
  </View>
200
199
  )}
201
200
  </View>
202
201
  </View>
203
202
  )
204
203
  updateShopDataFn: null,
204
+ import React from 'react'
205
205
  isJdApp,
206
206
  isChartH5,
207
207
  NETWORK_DATA_TYPE,
208
208
  M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
209
209
  APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT,
210
210
  containerFloorListData: ComponentInterFace.ContainerItemData[]
211
211
  className?: string
212
212
  containerItemClass?: object
213
213
  style?: object
214
214
  hasGoodsFeeds?: boolean
215
215
  builtInComponents?: Object
216
216
  loadingEndComponentFn?: Function
217
217
  sectionType?: string
218
218
  updateShopFloorDataFn?: Function
219
219
  updateContainerFloorListDataFn?: Function
220
220
  refreshFloorListDataFn?: Function
221
221
  refreshFloorListDataBtnLabel?: string
222
222
  customErrorIsvFloorModule?: React.ReactElement
223
223
  componentExtend?: React.ReactElement
224
224
  const { windowHeight } = taroJdBaseInfo.info.sysInfo
225
225
  const {
226
226
  className,
227
227
  style,
228
228
  containerItemClass = null,
229
229
  containerFloorListData,
230
230
  builtInComponents,
231
231
  loadingEndComponentFn,
232
232
  sectionType,
233
233
  updateShopFloorDataFn,
234
234
  updateContainerFloorListDataFn,
235
235
  refreshFloorListDataFn,
236
236
  refreshFloorListDataBtnLabel,
237
237
  customErrorIsvFloorModule,
238
238
  } = props
239
239
 
240
240
  const renderFloorItem = (
241
241
  item,
242
242
  floorItem,
243
243
  floorIndex,
244
244
  containerLayoutLeftRightMargin,
245
245
  lazyLoadState = false,
246
246
  ) => {
247
247
  return (
248
248
  <View
249
249
  className={classNames(shopContainerListStyle['d-floor-item'])}
250
250
  data-floor-uid={floorItem?.uid}
251
251
  data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
252
252
  data-lazy-load={lazyLoadState}
253
253
  key={floorItem.uid}
254
254
  id={`J_floor_${floorItem.uid}`}
255
255
  style={{
256
256
  borderRadius: `${item?.borderRadius || 0}px`,
257
257
  }}
258
258
  >
259
259
  {isChartH5 && (
260
260
  <View
261
261
  className={shopContainerListStyle['d-floor-chart-item']}
262
262
  id={`J_chart_floor_${floorItem?.uid}`}
263
263
  data-floor-uid={floorItem?.uid}
264
264
  data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
265
265
  />
266
266
  )}
267
267
  <FloorListItem
268
268
  floorIndex={floorIndex}
269
269
  floorData={floorItem}
270
270
  layoutLeftRightMargin={containerLayoutLeftRightMargin}
271
271
  containerBorderRadius={item?.borderRadius || 0}
272
272
  updateShopFloorDataFn={updateShopFloorDataFn}
273
273
  loadingEndComponentFn={loadingEndComponentFn}
274
274
  key={floorItem.uid}
275
275
  builtInComponents={builtInComponents}
276
276
  updateContainerFloorListDataFn={updateContainerFloorListDataFn}
277
277
  customErrorIsvFloorModule={customErrorIsvFloorModule}
278
278
  />
279
279
  </View>
280
280
  )
281
281
  }
282
282
 
283
283
  const getFloorSetHeight = (item) => {
284
284
  const getHeight = item?.floorExtInfo?.floorHeight
285
285
  ? Number(item?.floorExtInfo?.floorHeight)
286
286
  : 200
287
287
  return getHeight > 0 ? getHeight : 200
288
288
  }
289
289
  return (
290
290
  <View
291
291
  className={classNames(
292
292
  className,
293
293
  shopContainerListStyle['d-shop-container-list'],
294
294
  )}
295
295
  style={style}
296
296
  >
297
297
  <View id='J_shopContainerFloorList'>
298
298
  {containerFloorListData.length > 0 ? (
299
299
  containerFloorListData.map((item, index) => {
300
300
  const containerLayoutLeftRightMargin =
301
301
  (item.marginLeft || 0) + (item.marginRight || 0)
302
302
  const getContainerId = `J_container_${item.containerId}`
303
303
  return (
304
304
  <React.Fragment key={item.containerId + index}>
305
305
  {
306
306
  item.addLuxuryStyle ?
307
307
  <View
308
308
  className={
309
309
  shopContainerListStyle['d-luxury-header']
310
310
  }
311
311
  />
312
312
  : null
313
313
  }
314
314
  {
315
315
  item.addLuxuryBackupStyle ?
316
316
  <View
317
317
  style={{ height: taroJdBaseInfo?.info?.sysInfo?.jdNativeHeaderHeight + 'px' }}
318
318
  className={
319
319
  shopContainerListStyle['d-luxury-header-black']
320
320
  }
321
321
  />
322
322
  : null
323
323
  }
324
324
  {typeof item?.renderExtendComponent === 'function' ? item?.renderExtendComponent(item?.floorExtendData) : null}
325
325
  <View
326
326
  className={classNames(
327
327
  shopContainerListStyle['d-container-item'],
328
328
  containerItemClass,
329
329
  )}
330
330
  id={getContainerId}
331
331
  key={item.containerId}
332
332
  data-container-id={item?.containerId}
333
333
  data-container-type={item?.typeCode}
334
334
  style={{
335
335
  marginBottom: item.marginBottom
336
336
  ? `${item.marginBottom}px`
337
337
  : 0,
338
338
  marginTop: item.marginTop
339
339
  ? `${item.marginTop}px`
340
340
  : 0,
341
341
  marginLeft: item.marginLeft
342
342
  ? `${item.marginLeft}px`
343
343
  : 0,
344
344
  marginRight: item.marginRight
345
345
  ? `${item.marginRight}px`
346
346
  : 0,
347
347
  borderRadius: item.borderRadius
348
348
  ? `${item.borderRadius}px`
349
349
  : 0,
350
350
  }}
351
351
  >
352
352
  {typeof item?.insertContainerStartComponent === 'function' ? item?.insertContainerStartComponent(item) : null}
353
353
  {item.floors &&
354
354
  item.floors.length > 0 &&
355
355
  item.floors?.map(
356
356
  (floorItem, floorIndex) => {
357
357
  return index > lazyLoadStartIndex ? (
358
358
  <LazyLayoutLoad
359
359
  key={item.containerId}
360
360
  sectionType={sectionType}
361
361
  containerId={getContainerId}
362
362
  height={getFloorSetHeight(
363
363
  floorItem,
364
364
  )}
365
365
  floorData={floorItem}
366
366
  >
367
367
  {renderFloorItem(
368
368
  item,
369
369
  floorItem,
370
370
  floorIndex,
371
371
  containerLayoutLeftRightMargin,
372
372
  true,
373
373
  )}
374
374
  </LazyLayoutLoad>
375
375
  ) : (
376
376
  renderFloorItem(
377
377
  item,
378
378
  floorItem,
379
379
  floorIndex,
380
380
  containerLayoutLeftRightMargin,
381
381
  )
382
382
  )
383
383
  },
384
384
  )}
385
385
  </View>
386
386
  </React.Fragment>
387
387
  )
388
388
  })
389
389
  ) : (
390
390
  <View
391
391
  className={
392
392
  shopContainerListStyle['d-container-list-no-data']
393
393
  }
394
394
  style={{
395
395
  height: `${
396
396
  windowHeight -
397
397
  (isJdApp
398
398
  ? APP_SHOP_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT
399
399
  : M_SHOP_DOWNLOAD_HEADER_NAV_BAR_BOTTOM_MENU_HEIGHT)
400
400
  }px`,
401
401
  }}
402
402
  >
403
403
  <NetworkDataError
404
404
  netWorkShowType={NetWorkShowType.PART}
405
405
  netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}
406
406
  refreshCallBackFn={refreshFloorListDataFn ? refreshFloorListDataFn : null}
407
407
  btnLabel={refreshFloorListDataBtnLabel || ""}
408
408
  />
409
409
  </View>
410
410
  )}
411
411
  </View>
412
412
  </View>
413
413
  )
414
414
  updateShopDataFn: null,
@@ -1 +1 @@
1
- import taroJdBaseInfo from '../../common'
1
+ import global from '../../common'
2
2
  return global.info.sysInfo.screenWidth
3
3
  return global.info.sysInfo.screenHeight
4
4
  return global.info.sysInfo.headerHeight
5
5
  return global.info.sysInfo.tabBarHeight
6
6
  return global.info.sysInfo.safeContentHeight
7
7
  const result =
8
8
  global.info.sysInfo.screenHeight - global.info.sysInfo.jdBottomBarHeight + 8
9
9
  console.log('result:', result)
10
10
  return result
11
11
  getScreenWidth,
12
12
  getScreenHeight,
13
13
  getHeaderHeight,
14
14
  getFooterHeight,
15
15
  getSafeContentHeight,
16
16
  getFullscreenCropHeight,
17
17
  TaroEventType,
18
18
  SHOP_NAV_BAR_HEIGHT,
@@ -1 +1 @@
1
- import requestServer from '../../service/requestServer'
2
1
  return requestServer.receiveCoupon(param, clientParams)
3
2
  return requestServer.batchAddCart(skuIdList, num, showToast)
4
3
  return requestServer.bMallGetUserInfo()
5
4
  return requestServer.bMallGetSkuNumApi(needRequest, bMallTag)
6
5
  return requestServer.bMallCartHandle(goodItem, num)
7
6
  receiveCoupon,
8
7
  bMallGetUserInfo,
9
8
  bMallGetSkuNumApi,
10
9
  bMallCartHandle,
11
10
  batchAddCart
11
+ import requestServer from '../../service/requestServer'
12
12
  return requestServer.receiveCoupon(param, clientParams)
13
13
  return requestServer.batchAddCart(skuIdList, num, showToast)
14
14
  return requestServer.bMallGetUserInfo()
15
15
  return requestServer.bMallGetSkuNumApi(needRequest, bMallTag)
16
16
  return requestServer.bMallCartHandle(goodItem, num)
17
17
  receiveCoupon,
18
18
  bMallGetUserInfo,
19
19
  bMallGetSkuNumApi,
20
20
  bMallCartHandle,
21
21
  batchAddCart