@conecli/cone-render 0.9.1-shop2.2 → 0.9.1-shop2.4

package/dist/common/token/index.h5.ts

@@ -1 +1 @@
-import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    if (platform === TokenPlatform.TYPE_JDAPP) {
      ready('jmfe', 3000)
        .then(() => {
          console.log('window.jmfe已经存在：', jmfe)
          import('./token.jd')
            .then((data) => {
              console.log('data:', data)
              resolve(data)
            })
            .catch((err) => {
              reject(err)
            })
        })
        .catch((e) => {
          console.log('window.jmfe不存在')
          reject(e)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  console.log(e);
  return {}
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.isLogin) {
          proxy?.isLogin().then((data: boolean) => {
            resolve(data)
          })
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.getIsvToken) {
          proxy?.getIsvToken().then((data: string) => {
            resolve(data)
          })
        } else {
          resolve('')
        }
      })
      .catch((err) => {
        resolve('')
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.toLogin) {
          proxy?.toLogin(options)
          resolve(true)
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
  let platform = getPlatform()
  let source = platform
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP
  }
  return source
  return window?.page_data?.pageChannel || ''
+import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    if (platform === TokenPlatform.TYPE_JDAPP) {
      ready('jmfe', 3000)
        .then(() => {
          console.log('window.jmfe已经存在：', window['jmfe'])
          import('./token.jd')
            .then((data) => {
              console.log('data:', data)
              resolve(data)
            })
            .catch((err) => {
              reject(err)
            })
        })
        .catch((e) => {
          console.log('window.jmfe不存在')
          reject(e)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  console.log(e)
  return {}
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.isLogin) {
          proxy?.isLogin().then((data: boolean) => {
            resolve(data)
          })
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.getIsvToken) {
          proxy?.getIsvToken().then((data: string) => {
            resolve(data)
          })
        } else {
          resolve('')
        }
      })
      .catch((err) => {
        resolve('')
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.toLogin) {
          proxy?.toLogin(options)
          resolve(true)
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
  let platform = getPlatform()
  let source = platform
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP
  }
  return source
  return window?.page_data?.pageChannel || ''

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,
  isH5AndJdShopH5CustomScrollView,
  isH5,
  isAppClassifyPage,
  START: 'start',
  END: 'end',
  const { scrollX, children, style = {}, className, ...otherProps } = props
  const rootEleNode = isH5 && document ? document.querySelector('body') : null
  const needShowHighVersion = isH5AndJdShopViewH5Scroll && !(global.info.queryInfo?.downgraded && global.info.queryInfo.downgraded === 'true')
  const mLastClientPosRef = useRef({
    mLastClientX: 0,
    mLastClientY: 0,
  })
  const touchstartEventCaptureFunc = () => {
    console.log('捕获阶段优先判断body上有没有over-hidden，有则取消')
    rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
  }
  useEffect(() => {
    !window.JDJshopViewInfo.getAndroidTouchSlopState &&
    nativePageGetScaledTouchSlop((res) => {
      console.log('获取安卓系统滑动阈值', res)
      window.JDJshopViewInfo.androidTouchSlop = res
      window.JDJshopViewInfo.getAndroidTouchSlopState = true
    })
    
    rootEleNode && rootEleNode.addEventListener(
      'touchstart',
      touchstartEventCaptureFunc,
      true,
    )
    return () => {
      rootEleNode && rootEleNode.removeEventListener(
        'touchstart',
        touchstartEventCaptureFunc,
        true,
      )
    }
  }, [])
  
  const androidDeviceStopNativeScrollEvent = (touchType) => {
    isJdApp &&
    isAndroidDevice &&
    window?.JdAndroid &&
    window?.JdAndroid.requestEvent(touchType === TouchType.START)
  }
  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(),
      },
    })
  }
  const stopNativeScrollEvent = (e: Event, touchType) => {
    if (isJdApp) {
      isIosDevice && !isAppClassifyPage && iosDeviceStopNativeScrollEvent(e, touchType)
      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
  }
  const changeTouchStart = (e) => {
    stopNativeScrollEvent(e, TouchType.START)
    if (isH5AndJdShopView || isH5AndJdShopH5CustomScrollView) {
      (needShowHighVersion || isH5AndJdShopH5CustomScrollView) && rootEleNode && rootEleNode.classList.add('over-hidden')
      const touchEvent =
        e?.originalEvent?.targetTouches[0] || e?.targetTouches[0]
      mLastClientPosRef.current.mLastClientX = touchEvent.clientX
      mLastClientPosRef.current.mLastClientY = touchEvent.clientY
      console.log('TouchStart获取mLastClientPosRef', mLastClientPosRef)
    }
  }
  const changeTouchEnd = (e) => {
    console.log('触发touchend事件')
    stopNativeScrollEvent(e, TouchType.END)
  }
  
  const recoverRootEleVerticalScroll = (touchEvent) => {
    const direction = GetSlideDirection(mLastClientPosRef.current.mLastClientX, mLastClientPosRef.current.mLastClientY, touchEvent.clientX, touchEvent.clientY)
    if (direction === 1 || direction === 2) {
      rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
    }
  }
  const changeTouchMove = (e) => {
    if (isH5AndJdShopView || isH5AndJdShopH5CustomScrollView) {
      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)
      console.log(
        '滑动触发结果  xDiff yDiff window.JDJshopViewInfo.androidTouchSlop',
        xDiff,
        yDiff,
        window.JDJshopViewInfo.androidTouchSlop,
      )
      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)
        }
      }
      (needShowHighVersion || isH5AndJdShopH5CustomScrollView) && recoverRootEleVerticalScroll(touchEvent)
    }
  }
  if (scrollX && (isH5AndJdShopView || isH5AndJdShopH5CustomScrollView)) {
    return (
      <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>
    )
  } else {
    return (
      <ScrollView
        scrollX
        enhanced
        showScrollbar={false}
        {...otherProps}
        className={classNames(
          className,
          {
            [customScrollViewStyle[
              'd-custom-ios-mini-extend-border-radius'
              ]]:
            isIosDevice &&
            isWxMin &&
            scrollX &&
            style['borderRadius'],
          },
          {
            [customScrollViewStyle[
              'd-custom-ios-h5-extend-border-radius'
              ]]: isIosDevice,
          },
          {
            [customScrollViewStyle['d-custom-mini-hide-scroll']]:
            isWxMin,
          },
        )}
        style={style}
      >
        {children}
      </ScrollView>
    )
  }
  style: {},
  scrollX: false,
  scrollY: false,
  scrollWithAnimation: true,
  className: null,

package/dist/components/base/Exposure/index.h5.tsx

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
        (
            <View
                className={classNames(
                    exposureStyle['d-floor-exposure'],
                    className,
                    floorName,
                )}
                id={`J_floor_${floorName}`}
            />
        )
+import Taro from '@tarojs/taro'
  const { windowHeight } = taroJdBaseInfo.info.sysInfo
        (
            <View
                className={classNames(
                    exposureStyle['d-floor-exposure'],
                    className,
                    floorName,
                )}
                id={`J_floor_${floorName}`}
            />
        )