@conecli/cone-render 0.8.38-beta.0 → 0.8.39

package/dist/common/token/token.jd.ts

@@ -1 +1 @@
-console.log('load token.jd')
  return new Promise((resolve) => {
    if (jmfe) {
      jmfe.isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (jmfe) {
    jmfe.toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  if (jmfe) {
    console.log('registerCode:', code)
    jmfe.registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (jmfe) {
      jmfe
        .requestIsvToken(url)
        .then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result))
          const { status, data, msg } = result
          if (status === '0') {
            resolve(data || '')
          } else {
            resolve('')
          }
        })
        .catch((e: any) => {
          console.log('requestIsvToken error:' + JSON.stringify(e))
          resolve('')
        })
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
      resolve('')
    }
  })
+console.log('load token.jd')
  return new Promise((resolve) => {
    if (window['jmfe']) {
      window['jmfe'].isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (window['jmfe']) {
    window['jmfe'].toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  if (window['jmfe']) {
    console.log('registerCode:', code)
    window['jmfe'].registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (window['jmfe']) {
      window['jmfe']
        .requestIsvToken(url)
        .then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result))
          const { status, data, msg } = result
          if (status === '0') {
            resolve(data || '')
          } else {
            resolve('')
          }
        })
        .catch((e: any) => {
          console.log('requestIsvToken error:' + JSON.stringify(e))
          resolve('')
        })
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
      resolve('')
    }
  })

package/dist/components/base/CustomScrollView/index.tsx

@@ -1 +1 @@
-import React, {useRef, useEffect} from 'react'
  isH5AndJdShopView,
  isAndroidDevice,
  isIosDevice,
  isJdApp,
  isWxMin,
  isH5AndJdShopViewH5Scroll,
  isH5,
  const rootEleNode = isH5 && document ? document.querySelector('body') : null
  const needShowHighVersion = isH5AndJdShopViewH5Scroll && !(global.info.queryInfo?.downgraded && global.info.queryInfo.downgraded === "true")
  const GetSlideAngle = (dx,dy) => {
    return Math.atan2(dy,dx) * 180 / Math.PI;
  }
  const GetSlideDirection = (startX,startY,endX,endY) => {
    const dy = startY - endY;
    const dx = endX - startX;
    let result = 0;
    if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
      return result;
    }
    const angle = GetSlideAngle(dx, dy);
    if (angle >= -45 && angle < 45) {
      result = 4;
    }else if (angle >= 45 && angle < 135) {
      result = 1;
    }else if (angle >= -135 && angle < -45) {
      result = 2;
    }else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
      result = 3;
    }
    return result;
  }
      needShowHighVersion && rootEleNode &&  rootEleNode.classList.add('over-hidden')
      const touchEvent =
        e?.originalEvent?.targetTouches[0] || e?.targetTouches[0]
      const xDiff = Math.abs(
        touchEvent.clientX - mLastClientPosRef.current.mLastClientX,
      ).toFixed(2)
      const yDiff = Math.abs(
        touchEvent.clientY - mLastClientPosRef.current.mLastClientY,
      ).toFixed(2)
      if(isAndroidDevice) {
        if (xDiff >= window.JDJshopViewInfo.androidTouchSlop) {
          console.log(
            '横向滚动触发',
            xDiff,
            touchEvent,
            window.JDJshopViewInfo.androidTouchSlop,
          )
        } else if (yDiff > window.JDJshopViewInfo.androidTouchSlop) {
          console.log(
            '纵向滚动触发',
            yDiff,
            touchEvent,
            window.JDJshopViewInfo.androidTouchSlop,
          )
          androidDeviceStopNativeScrollEvent(false)
        }
      }
      if(needShowHighVersion) {
        const direction = GetSlideDirection(mLastClientPosRef.current.mLastClientX, mLastClientPosRef.current.mLastClientY, touchEvent.clientX, touchEvent.clientY);
        if(direction === 1 || direction === 2) {
          rootEleNode &&  rootEleNode.classList.remove('over-hidden')
        }
      }
      <ScrollView
        scrollX
        onTouchStart={changeTouchStart}
        onTouchEnd={changeTouchEnd}
        onTouchCancel={changeTouchEnd}
        onTouchMove={changeTouchMove}
        enhanced
        showScrollbar={false}
        style={style}
        className={classNames(className, {
          [customScrollViewStyle[
            'd-custom-ios-h5-extend-border-radius'
            ]]: isIosDevice,
        },'J_customScroll')}
        {...otherProps}
      >
        {children}
      </ScrollView>
+import React, {useRef, useEffect} from 'react'
  isH5AndJdShopView,
  isAndroidDevice,
  isIosDevice,
  isJdApp,
  isWxMin,
  isH5AndJdShopViewH5Scroll,
  isH5,
  START: 'start',
  END: 'end'
  const rootEleNode = isH5 && document ? document.querySelector('body') : null
  const needShowHighVersion = isH5AndJdShopViewH5Scroll && !(global.info.queryInfo?.downgraded && global.info.queryInfo.downgraded === "true")
  const iosDeviceStopNativeScrollEvent = (e, touchType) => {
    e && e.stopPropagation()
    iosDeviceSendRouter(touchType)
  }
  const iosDeviceSendRouter = (state) => {
    window.webkit.messageHandlers.MobileNavi.postMessage?.({
      method: 'callRouterModuleWithParams',
      params: {
        routerURL: 'router://JDShopModule/processShoph5SlideState',
        routerParam: { slideDirection: 'horizontal', state },
        callBackId: new Date().getTime(),
      }
    });
  }
      isAndroidDevice && androidDeviceStopNativeScrollEvent(touchType)
  const GetSlideAngle = (dx,dy) => {
    return Math.atan2(dy,dx) * 180 / Math.PI;
  }
  const GetSlideDirection = (startX,startY,endX,endY) => {
    const dy = startY - endY;
    const dx = endX - startX;
    let result = 0;
    if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
      return result;
    }
    const angle = GetSlideAngle(dx, dy);
    if (angle >= -45 && angle < 45) {
      result = 4;
    }else if (angle >= 45 && angle < 135) {
      result = 1;
    }else if (angle >= -135 && angle < -45) {
      result = 2;
    }else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
      result = 3;
    }
    return result;
  }
      needShowHighVersion && rootEleNode &&  rootEleNode.classList.add('over-hidden')
    stopNativeScrollEvent(e,TouchType.END)
      const touchEvent =
        e?.originalEvent?.targetTouches[0] || e?.targetTouches[0]
      const xDiff = Math.abs(
        touchEvent.clientX - mLastClientPosRef.current.mLastClientX,
      ).toFixed(2)
      const yDiff = Math.abs(
        touchEvent.clientY - mLastClientPosRef.current.mLastClientY,
      ).toFixed(2)
      if(isAndroidDevice) {
        if (xDiff >= window.JDJshopViewInfo.androidTouchSlop) {
          console.log(
            '横向滚动触发',
            xDiff,
            touchEvent,
            window.JDJshopViewInfo.androidTouchSlop,
          )
        } else if (yDiff > window.JDJshopViewInfo.androidTouchSlop) {
          console.log(
            '纵向滚动触发',
            yDiff,
            touchEvent,
            window.JDJshopViewInfo.androidTouchSlop,
          )
          stopNativeScrollEvent(e,TouchType.END)
        }
      }
      if(needShowHighVersion) {
        const direction = GetSlideDirection(mLastClientPosRef.current.mLastClientX, mLastClientPosRef.current.mLastClientY, touchEvent.clientX, touchEvent.clientY);
        if(direction === 1 || direction === 2) {
          rootEleNode &&  rootEleNode.classList.remove('over-hidden')
        }
      }
      <ScrollView
        scrollX
        onTouchStart={changeTouchStart}
        onTouchEnd={changeTouchEnd}
        onTouchCancel={changeTouchEnd}
        onTouchMove={changeTouchMove}
        enhanced
        showScrollbar={false}
        style={style}
        className={classNames(className, {
          [customScrollViewStyle[
            'd-custom-ios-h5-extend-border-radius'
            ]]: isIosDevice,
        },'J_customScroll')}
        {...otherProps}
      >
        {children}
      </ScrollView>

package/dist/components/base/ExposureSmart/reporter.tsx

@@ -1 +1 @@
-import track from '../../../open/api/track'
    const {arr : arrTask, startWaitTime} = floorTask
    const isTimeout = startWaitTime != 0 && (Date.now() - startWaitTime >= 1000)    
    const arrTaskNum = arrTask.length;
    const isOverMax = arrTaskNum >= 10  
    const hasData = arrTaskNum > 0
    if(hasData && (isTimeout || isOverMax)){
        const reduceData = connactData(arrTask)
        track.reportExposureEventLog(reduceData)
        floorTask.arr = []
        floorTask.startWaitTime = 0
        clearTimeout(floorTask.timer)
    }
    const initData = JSON.parse(JSON.stringify(arr[0]))
    if(initData.jsonParam.etModelInfo) {
      initData.jsonParam.logBaseInfo = []
      initData.jsonParam.etModelInfo.lstms = []
      return arr.reduce((acc, cur) => {
        acc.jsonParam.logBaseInfo.push(cur.jsonParam.logBaseInfo)
        return acc
      }, initData)
    } else {
      return arr.reduce((acc) => {
        return acc
      })
    }
    if(!Array.isArray(data)){
        console.log('坑位曝光埋点原始数据参类型错误，期望是数组，实际是：', data)
        return
    }
    const [floorData, mInfo, etModelInfo] = data
    if(floorData && mInfo && etModelInfo){
      const isIsvReportModule = isvReportModuleTypeList.includes(floorData?.floorExtInfo?.moduleFlag)
        try {
          const reportJson = track.getExposureInfo(floorData, mInfo, etModelInfo,true, isIsvReportModule)
          console.log(`${floorData?.floorExtInfo?.moduleFlag}===reportJson===`,reportJson)
          const { floorIdx } = floorData
          if(!task[floorIdx]){
            task[floorIdx] = {
              arr: [],
              startWaitTime: 0,
              timer : 0
            }
          }
          const floorTask = task[floorIdx]
          if(floorTask.arr.length === 0){
            floorTask.startWaitTime = Date.now()
          }
          if(reportJson){
            floorTask.arr.push(reportJson)
            clearTimeout(floorTask.timer)
            floorTask.timer = setTimeout(() => {
              check(floorTask)
            }, 1000)
            check(floorTask)
          }
        }catch (e) {
         {
            console.log('坑位曝光埋点出错啦',e)
          }
        }
    }else{
        console.log('坑位曝光埋点原始数据参数缺失，期望是[floorData, mInfo, etModelInfo]，实际是：', data)
    }
+import track from '../../../open/api/track'
    const {arr : arrTask, startWaitTime} = floorTask
    const isTimeout = startWaitTime != 0 && (Date.now() - startWaitTime >= 1000)    
    const arrTaskNum = arrTask.length;
    const isOverMax = arrTaskNum >= 10  
    const hasData = arrTaskNum > 0
    if(hasData && (isTimeout || isOverMax)){
        const reduceData = connactData(arrTask)
        track.reportExposureEventLog(reduceData)
        floorTask.arr = []
        floorTask.startWaitTime = 0
        clearTimeout(floorTask.timer)
    }
    const initData = JSON.parse(JSON.stringify(arr[0]))
    if(initData.jsonParam.etModelInfo) {
      initData.jsonParam.logBaseInfo = []
      initData.jsonParam.etModelInfo.lstms = []
      return arr.reduce((acc, cur) => {
        acc.jsonParam.logBaseInfo.push(cur.jsonParam.logBaseInfo)
        return acc
      }, initData)
    } else {
      return arr.reduce((acc) => {
        return acc
      })
    }
    if(!Array.isArray(data)){
        console.log('坑位曝光埋点原始数据参类型错误，期望是数组，实际是：', data)
        return
    }
    const [floorData, mInfo, etModelInfo] = data
    if(floorData && mInfo && etModelInfo){
      const isIsvReportModule = isvReportModuleTypeList.includes(floorData?.floorExtInfo?.moduleFlag)
        try {
          const reportJson = track.getExposureInfo(floorData, mInfo, etModelInfo,true, isIsvReportModule)
          console.log(`${floorData?.floorExtInfo?.moduleFlag}===reportJson===`,reportJson)
          const { floorIdx } = floorData
          if(!task[floorIdx]){
            task[floorIdx] = {
              arr: [],
              startWaitTime: 0,
              timer : 0
            }
          }
          const floorTask = task[floorIdx]
          if(floorTask.arr.length === 0){
            floorTask.startWaitTime = Date.now()
          }
          if(reportJson){
            floorTask.arr.push(reportJson)
            clearTimeout(floorTask.timer)
            floorTask.timer = setTimeout(() => {
              check(floorTask)
            }, 1000)
            check(floorTask)
          }
        }catch (e) {
         {
            console.log('坑位曝光埋点出错啦',e)
          }
        }
    }else{
        console.log('坑位曝光埋点原始数据参数缺失，期望是[floorData, mInfo, etModelInfo]，实际是：', data)
    }

package/dist/components/base/MobileCommonHeader/index.module.scss

@@ -0,0 +1,9 @@
+
+.d-mobile-header-layout {
+	position: relative;
+	z-index: 12;
+	.d-mobile-common-tip,
+	.d-mobile-common-header {
+		position: relative;
+	}
+}

package/dist/components/base/MobileCommonHeader/index.tsx

@@ -0,0 +1 @@
+import React, { useEffect, useContext, useState } from 'react'
  const { title, openAppParams, style, hasCommonHeader = true, hasDownloadTips = true, headerParams } = props
  useEffect(() => {
    hasCommonHeader && initCommonHeader()
    hasDownloadTips && initDownloadAppLayerConfigData()
  }, [])
  const initCommonHeader = () => {
    if (window?.MCommonHeaderBottom) {
      const mchb = new MCommonHeaderBottom()
      const headerArg = {
        moduleName: 'shop',
        hrederId: 'm_common_header',
        title,
        stype: 1,
        onClickJdkey: function () {
          console.log('==>m_common_header jdkey click.')
        },
        ...headerParams
      }
      mchb.header(headerArg)
    }
  }
  const initDownloadAppLayerConfigData = () => {
    const getEle = document.getElementById('m_common_tip')
    getEle &&
      window.$ &&
      window.$.downloadAppLayerConfigData &&
      window.$.downloadAppLayerConfigData({
        tipId: 'm_common_tip',
        M_sourceFrom: 'jshop',
        bottom: 74,
        onClickTipX: () => {
          Taro.eventCenter.trigger(
            TaroEventType.DOWN_LOAD_APP_CLOSE_CHANGE,
            true,
          )
        },
        downloadAppPlugIn: {
          M_sourceFrom: 'jshop',
          openAppBtnId: 'download_openapp',
          downAppURl: '//conecli.com/downloadApp/download.html?channel=jd-m',
          inteneUrl: 'openapp.jdmobile://virtual?',
          inteneUrlParams: {
            category: 'jump',
            des: 'jshopMain',
            shopId: `${global.info.queryInfo.shopId || ''}`,
            venderId: `${global.info.queryInfo.venderId || ''}`,
            sourceType: global.info.queryInfo?.sourceType || 'M-H5',
            sourceValue: global.info.queryInfo?.sourceValue || 'Mshop',
            ...openAppParams,
          },
        },
      })
  }
  return !isWxMiniH5View && !isJdApp ? (
    <View
      className={mobileCommonHeaderStyle['d-mobile-header-layout']}
      style={style}
    >
      <View
        id="m_common_tip"
        className={mobileCommonHeaderStyle['d-mobile-common-tip']}
      />
      {hasCommonHeader && (
        <View
          id="m_common_header"
          className={mobileCommonHeaderStyle['d-mobile-common-header']}
        />
      )}
    </View>
  ) : null
  title: '店铺',
  openAppParams: {},

package/dist/components/base/NetworkDataError/index.tsx

@@ -1 +1 @@
-import { Button, View } from '@tarojs/components'
    NetWorkErrorSubTip,
        subMessage,
    backgroundColorWhite,
    const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType]
    const useErrorSubTip = subMessage? subMessage: NetWorkErrorSubTip[netWorkDataType]
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
    const maxHeight = latestRes.displayHeight || 546   
            style={{maxHeight: isMemberPage ? '100vh' : maxHeight}}
                {useErrorSubTip? <View className={netWorkErrorStyle['d-error-sub-tip']}>{useErrorSubTip}</View>: null}
                        <Button
                            onClick={refershInitData}
                            className={classNames(
                                netWorkErrorStyle['d-opt-btn'],
                                'd-button-no-border',
                            )}
                            plain
                            size="mini"
                        >
                            重新加载
                        </Button>
                    )}
    subMessage: '',
+import { Button, View } from '@tarojs/components'
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  const {
    className,
    message,
    subMessage,
    btnLabel,
    backgroundColorWhite,
    netWorkDataType,
    netWorkShowType,
    netWorkImageType,
    refreshCallBackFn,
  } = props
  const refershInitData = useCallback(() => {
    refreshCallBackFn && refreshCallBackFn(true)
  }, [])
  const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType]
  const useErrorSubTip = subMessage
    ? subMessage
    : NetWorkErrorSubTip[netWorkDataType]
  const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
  const maxHeight = latestRes.displayHeight || 546 
  return NetWorkErrorList.includes(netWorkDataType as NETWORK_DATA_TYPE) ? (
    <View
      style={{ maxHeight: isMemberPage ? '100vh' : maxHeight }}
      className={classNames(
        netWorkErrorStyle['d-shop-network'],
        {
          [netWorkErrorStyle['d-shop-network-white']]: backgroundColorWhite,
        },
        {
          [netWorkErrorStyle['d-shop-network-part']]:
            netWorkShowType === NetWorkShowType.PART,
        },
        {
          [netWorkErrorStyle['d-network-jd-shop-view']]: isH5AndJdShopView,
        },
        'flexible-center-box',
        className,
      )}
    >
      <View className={netWorkErrorStyle['d-error-content']}>
        <View
          className={classNames(
            netWorkErrorStyle['d-error-type'],
            netWorkErrorStyle[`d-${netWorkDataType}`],
            netWorkErrorStyle[`d-${netWorkImageType}`],
          )}
        />
        <View className={netWorkErrorStyle['d-error-tip']}>{useErrorTip}</View>
        {useErrorSubTip ? (
          <View className={netWorkErrorStyle['d-error-sub-tip']}>
            {useErrorSubTip}
          </View>
        ) : null}
        <View className={'flexible-horizontal-center-box'}>
          {refreshCallBackFn && (
            <Button
              onClick={refershInitData}
              className={classNames(
                netWorkErrorStyle['d-opt-btn'],
                'd-button-no-border',
              )}
              plain
              size="mini"
            >
              {btnLabel}
            </Button>
          )}
        </View>
      </View>
    </View>
  ) : null
  className: '',
  message: '',
  subMessage: '',
  btnLabel: '重新加载',
  backgroundColorWhite: false, 
  netWorkDataType: NETWORK_DATA_TYPE.NORMAL,
  netWorkImageType: NetWork_Image_Type.No_Data_Default_Tip,
  netWorkShowType: NetWorkShowType.FULL,
  refreshCallBackFn: null,