@conecli/cone-render 0.8.39 → 0.8.41

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

@@ -1 +1 @@
-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('')
    }
  })
+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/common/token/token.ts

@@ -1 +1 @@
-import global from '../../common'
  return window?.page_data?.pageChannel || ''
  return new Promise((resolve) => {
    const channel = getPageChannel()
    if (
      channel === PageChannel.TYPE_ISVDEV ||
      channel === PageChannel.TYPE_ISV_PACK_SAMPLE
    ) {
      getIsvToken().then((token) => {
        console.log('isLogin token：' + token)
        if (token) {
          resolve(true)
        } else {
          resolve(false)
        }
      })
    } else {
      global.checkLoginStatus().then(res => {
        resolve(res)
      }).catch(() => {
        resolve(false)
      })
    }
  })
  let token = ''
  const result: any = await getIsvTokenInner()
  if (!result.success) {
    const channel = getPageChannel()
    if (channel === PageChannel.TYPE_ISV_PACK_SAMPLE) {
      console.log('getIsvToken打包校验中获取token失败')
      if (window['isvTokenFailCallback']) {
        window['isvTokenFailCallback'](result.error)
        console.log('浏览器中调用isvTokenFailCallback结束')
      }
    }
  } else {
    token = result.data
  }
  return token
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      {},
    )
      .then((data: any) => {
        console.log('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve({
            success: true,
            data: data?.data?.token,
          })
        } else {
          resolve({
            success: false,
            error: data,
          })
        }
      })
      .catch((error: { message: any }) => {
        console.log('fetchGateway isvObfuscator error:' + error.message)
        resolve({
          success: false,
          error,
        })
      })
  })
  const defaultParams = {
    appid: '100',
    returnurl: window.location.href,
  }
  const params = Object.assign({}, defaultParams, options)
  params.returnurl = encodeURIComponent(params.returnurl)
  const loginUrl = `${domain.mobileLogin}/user/login.action?${serialize(
    params,
  )}`
  console.log('loginUrl:', loginUrl)
  window.location.href = loginUrl
+import global from '../../common'
  return window?.page_data?.pageChannel || ''
  return new Promise((resolve) => {
    const channel = getPageChannel()
    if (
      channel === PageChannel.TYPE_ISVDEV ||
      channel === PageChannel.TYPE_ISV_PACK_SAMPLE
    ) {
      getIsvToken().then((token) => {
        console.log('isLogin token：' + token)
        if (token) {
          resolve(true)
        } else {
          resolve(false)
        }
      })
    } else {
      global.checkLoginStatus().then(res => {
        resolve(res)
      }).catch(() => {
        resolve(false)
      })
    }
  })
  let token = ''
  const result: any = await getIsvTokenInner()
  if (!result.success) {
    const channel = getPageChannel()
    if (channel === PageChannel.TYPE_ISV_PACK_SAMPLE) {
      console.log('getIsvToken打包校验中获取token失败')
      if (window['isvTokenFailCallback']) {
        window['isvTokenFailCallback'](result.error)
        console.log('浏览器中调用isvTokenFailCallback结束')
      }
    }
  } else {
    token = result.data
  }
  return token
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      {},
    )
      .then((data: any) => {
        console.log('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve({
            success: true,
            data: data?.data?.token,
          })
        } else {
          resolve({
            success: false,
            error: data,
          })
        }
      })
      .catch((error: { message: any }) => {
        console.log('fetchGateway isvObfuscator error:' + error.message)
        resolve({
          success: false,
          error,
        })
      })
  })
  const defaultParams = {
    appid: '100',
    returnurl: window.location.href,
  }
  const params = Object.assign({}, defaultParams, options)
  params.returnurl = encodeURIComponent(params.returnurl)
  const loginUrl = `${domain.mobileLogin}/user/login.action?${serialize(
    params,
  )}`
  console.log('loginUrl:', loginUrl)
  window.location.href = loginUrl

package/dist/common/wxappApi.jd.ts

@@ -0,0 +1 @@
+import * as WXAPP_LOGIN from '../wxapp/common/login/login.js'

package/dist/components/ErrorBoundary.tsx

@@ -1 +1 @@
-import React from 'react'
      code: 'isvModuleError',
      msg: opt,
    })
      if(this.props.customErrorIsvFloorModule){
        return this.props.customErrorIsvFloorModule
      }
+import React from 'react'
    const floorLoadWay = floorData?.floorExtInfo?.floorLoadWay
    const isRemoteLoadFloor = floorLoadWay === 2
        msg: `店铺h5楼层隐藏不显示。原因：模块js执行异常，楼层过滤。`,
        floorIdx: floorData?.floorIdx,
        moduleDesignerType: floorData?.floorExtInfo?.moduleDesignerType,
        floorLoadWay, 
        floorKind: floorData?.floorExtInfo?.floorKind, 
    }
      code: getSgmCustomCode(isRemoteLoadFloor ? SgmCustomCode.REMOTEMODULE_JS : SgmCustomCode.SYSTEMMODULE_JS),
      msg: opt,
    })
      if(this.props.customErrorIsvFloorModule){
        return this.props.customErrorIsvFloorModule
      }

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
    showDayToSecondState,

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

@@ -0,0 +1 @@
+import React from 'react'
    return (
        <ScrollView
            scrollX
            enhanced
            showScrollbar={false}
            {...otherProps}
            className={classNames(
                className,
                {
                    [customScrollViewStyle[
                        'd-custom-ios-mini-extend-border-radius'
                    ]]:
                        isIosDevice &&
                        isJdMin &&
                        scrollX &&
                        style['borderRadius'],
                },
                {
                    [customScrollViewStyle[
                        'd-custom-ios-h5-extend-border-radius'
                    ]]: isIosDevice,
                },
                {
                    [customScrollViewStyle['d-custom-mini-hide-scroll']]:
                        isJdMin,
                },
            )}
            style={style}
        >
            {children}
        </ScrollView>
    )

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

@@ -16,3 +16,10 @@
 		width: 0;
 	}
 }
+
+.d-custom-mini-hide-scroll {
+	&::-webkit-scrollbar {
+		display: none;
+		width: 0;
+	}
+}

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

@@ -1 +1 @@
-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>
+import React, { useRef, useEffect } from 'react'
  isH5AndJdShopView,
  isAndroidDevice,
  isJdAndAndroidDevice,
  isJdAndIosDevice,
  isIosDevice,
  isJdApp,
  isWxMin,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isH5,
  isAppClassifyPage,
  lodashThrottle,
  START: 'start',
  MOVE: 'move',
  END: 'end',
  const rootEleNode = isH5 && document ? document.querySelector('body') : null
  const needShowHighVersion = isH5AndJdShopViewH5Scroll && !(global.info.queryInfo?.downgraded && global.info.queryInfo.downgraded === "true")
  const isJdAndH5ScrollState = needShowHighVersion || isH5AndJdShopH5CustomScrollView
  
  const touchstartEventBubbleFunc = (e) => {
    const isH5SwiperCustomEle = e?.target?.closest('.J_h5SwiperCustom')
    if(!isH5SwiperCustomEle){
      const hasCustomEle = e ? (e?.target?.closest('.J_customScroll') || e?.target?.closest('.J_customLayout')) : false
      if (isJdAndAndroidDevice && !hasCustomEle) {
        window.JdAndroid && window.JdAndroid.requestEvent(false)
      }
      !hasCustomEle && rootEleNode && rootEleNode.classList.contains('over-hidden')  && rootEleNode.classList.remove('over-hidden')
      console.log("customScrollView所在页面document touch start事件是否有J_customScroll元素",hasCustomEle,"根元素是否有over-hidden",rootEleNode.classList)
    }
  }
  const touchstartEventCaptureFunc = (e) => {
    if (e && !e?.target?.closest('.J_h5SwiperCustom') && !e?.target?.closest('.J_customLayout')){
      rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
      console.log("customScrollView所在页面document touch start事件捕获阶段移除根元素是否有over-hidden",rootEleNode.classList)
    }
  }
  useEffect(() => {
    isJdApp && !window.JDJshopViewInfo.getAndroidTouchSlopState &&
    nativePageGetScaledTouchSlop((res) => {
      console.log('获取安卓系统滑动阈值', res)
      window.JDJshopViewInfo.androidTouchSlop = res
      window.JDJshopViewInfo.getAndroidTouchSlopState = true
    })
    if(isJdAndH5ScrollState && rootEleNode && !rootEleAddEventListenerState){
      global?.removeJdAndroidRquestEventForTouchStart && global.removeJdAndroidRquestEventForTouchStart()
      rootEleNode.addEventListener(
        'touchstart',
        touchstartEventBubbleFunc,
        false,
      )
      
      rootEleNode.addEventListener(
        'touchstart',
        touchstartEventCaptureFunc,
        true,
      )
      rootEleAddEventListenerState = true
      console.warn("customScrollView 初始化document监听完成")
    }
    return () => {
      if(isJdAndH5ScrollState && rootEleNode && rootEleAddEventListenerState){
        console.warn("customScrollView document监听取消完成")
        rootEleNode.removeEventListener(
          'touchstart',
          touchstartEventBubbleFunc,
          false,
        )
        rootEleNode.removeEventListener(
          'touchstart',
          touchstartEventCaptureFunc,
          true,
        )
      }
    }
  }, [])
    console.log("触发window?.JdAndroid.requestEvent",touchType === TouchType.START,touchType)
  const iosDeviceStopNativeScrollEvent = (e, touchType, sendIosState = true) => {
    e && e.stopPropagation()
    sendIosState && iosDeviceSendRouter(touchType)
  }
  const iosDeviceSendRouter = (state) => {
    window?.webkit?.messageHandlers?.MobileNavi?.postMessage?.({
      method: 'callRouterModuleWithParams',
      params: {
        routerURL: 'router://JDShopModule/processShoph5SlideState',
        routerParam: {
          slideDirection: 'horizontal',
          needDisableVertical: `${iosNeedDisableVertical}`,
          state,
        },
        callBackId: new Date().getTime(),
      },
    })
  }
      isAndroidDevice && androidDeviceStopNativeScrollEvent(touchType)
      console.log("当前customScrollView touch事件", touchType, e, "是否是e instanceof CustomEvent", e instanceof CustomEvent)
  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
  }
    if(isJdApp){
      stopNativeScrollEvent(e, TouchType.START, !iosNeedDisableVertical)
      if (isH5AndJdShopView || isH5AndJdShopH5CustomScrollView) {
        isJdAndH5ScrollState && rootEleNode &&  rootEleNode.classList.add('over-hidden')
        console.info("customScrollView touchstart 当前根元素是否添加还是删除over-hidden",TouchType.START,rootEleNode.classList)
        const touchEvent =
          e?.originalEvent?.targetTouches[0] || e?.targetTouches[0]
        mLastClientPosRef.current.mLastClientX = touchEvent.clientX
        mLastClientPosRef.current.mLastClientY = touchEvent.clientY
        console.log('ustomScrollView touchstart 获取mLastClientPosRef', mLastClientPosRef)
      }
    }
    stopNativeScrollEvent(e,TouchType.END)
    mLastClientPosRef.current.mLastClientX = 0
    mLastClientPosRef.current.mLastClientY = 0
    console.log('ustomScrollView touchend 获取mLastClientPosRef', mLastClientPosRef)
  const triggerIosTouchMove = () => {
    isJdAndIosDevice && iosDeviceStopNativeScrollEvent(null,TouchType.START, true)
  }
  
  const lodashThrottleTriggerIosTouchMove = lodashThrottle(
    triggerIosTouchMove,
    500,
  )
  
  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')
    }
    console.log("获取当前滚动方向,向上向下1、2",direction,'根元素的classList',rootEleNode.classList,'mLastClientPosRef.current.mLastClientX',mLastClientPosRef.current.mLastClientX)
  }
      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(isJdApp) {
        if (xDiff >= window.JDJshopViewInfo.androidTouchSlop) {
          console.log(
            '横向滚动触发',
            xDiff,
            touchEvent,
            window.JDJshopViewInfo.androidTouchSlop,
            "iosNeedDisableVertical",
            iosNeedDisableVertical
          )
          iosNeedDisableVertical && isJdApp && lodashThrottleTriggerIosTouchMove()
        } else if (yDiff > window.JDJshopViewInfo.androidTouchSlop) {
          console.log(
            '纵向滚动触发',
            yDiff,
            touchEvent,
            window.JDJshopViewInfo.androidTouchSlop,
          )
          stopNativeScrollEvent(e,TouchType.END)
        }
      }
      isJdAndH5ScrollState && recoverRootEleVerticalScroll(touchEvent)
      <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>
    )
  }
  iosNeedDisableVertical: false,