@conecli/cone-render 0.9.1-shop2.9 → 0.10.1-beta.1

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

@@ -1 +1 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
  TaroEventType,
  getQualityImage,
  isH5AndJdShopView,
  isJdApp,
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isAppStowShop
  getNativePageScrollRes,
  latestFromNativeMsgStorage,
  const {
    src,
    lazyLoad,
    imagRenderingSet,
    width,
    height,
    className,
    isSkuImage,
    hideErrorImage,
    style,
    backgroundColor,
    errorSrc,
    onLoad,
    onError,
    ...otherOption
  } = props
  getNetWorkType === NetWorkTypeQuality.default &&
  (getNetWorkType = taroJdBaseInfo.info.sysInfo.netWorkType)
  const [loadSuccess, setLoadSuccess] = useState(false)
  const [imageErrState, setImageErrState] = useState(false)
  const [componentShowState, setComponentShowState] = useState(false)
  const [imgSrc, setImgSrc] = useState(src)
  const componentLazyRef = useRef<HTMLElement | null>(null)
  const componentShowStateRef = useRef(false)
  const needShowHighVersion =
    isH5AndJdShopViewH5Scroll &&
    !(
      global.info.queryInfo?.downgraded &&
      global.info.queryInfo.downgraded === 'true'
    )
  const imageError = useCallback(
    (e) => {
      console.log('图片加载错误', e)
      errorSrc && setImgSrc(errorSrc)
      hideErrorImage && setImageErrState(true)
      typeof onError === 'function' && onError(e, src, props)
    },
    [src],
  )
  
  const imageLoad = useCallback(
    (_src, event) => {
      setLoadSuccess(true)
      typeof onLoad === 'function' && onLoad(event, src, props)
    },
    [src],
  )
  
  const changeStyleIncludeWidthAndHeightAndBgColor = () => {
    const changeStyle = {}
    width && (changeStyle['width'] = width)
    height && (changeStyle['height'] = height)
    backgroundColor && (changeStyle['backgroundColor'] = backgroundColor)
    return changeStyle
  }
  useEffect(() => {
    if(needShowHighVersion) return
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
    !componentShowStateRef.current && dealPageScrollInfo(latestRes)
    Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, (res) => {
      !componentShowStateRef.current && dealPageScrollInfo(res)
    })
  }, [])
  
  const dealPageScrollInfo = (res) => {
    const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
    if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined') return
    if (componentLazyRef.current) {
      const eleClientRect =
        componentLazyRef.current.getBoundingClientRect()
      const getContainerHeightOffSetY =
        displayHeight * 1.5 + offSetY   
      const eleOffsetTop = Math.ceil(eleClientRect.top)
      const eleOffsetHeight = Math.ceil(eleClientRect.height)
      if (!componentShowStateRef.current) {
        if (getContainerHeightOffSetY > eleOffsetTop) {
          componentShowStateRef.current = true
          setComponentShowState(true)
        }
      }
    }
  }
  return (
    (isH5AndJdShopView && global?.config?.needImageLazy !== false && !needShowHighVersion && !isAppStowShop) ? (
      <View
        ref={ componentLazyRef }
        className={classNames(
          imageStyle['d-app-lazy-image'],
          {
            [imageStyle['d-lazy-sku-image']]: isSkuImage,
          },
          {
            [imageStyle['d-hide-image-error']]: imageErrState,
          },
          {
            [imageStyle['d-load-completed']]: loadSuccess,
          },
          {
            'd-imag-rendering-crisp-edges':
              !taroJdBaseInfo.info.pageInfo.isVipShop &&
              imagRenderingSet,
          },
          'J_html5ImageBg',
          className,
        )}
        style={{
          ...style,
          ...changeStyleIncludeWidthAndHeightAndBgColor(),
        }}
        {...otherOption}
      >
        {(componentShowState || lazyLoad === false) && <img
          src={getQualityImage(
            imgSrc,
            taroJdBaseInfo.info.pageInfo.isVipShop
              ? NetWorkTypeQuality['perfect']
              : NetWorkTypeQuality[getNetWorkType],
          )}
          onLoad={imageLoad.bind(this, imgSrc)}
          onError={imageError}
        />}
      </View>
    ) : (
      <Image
        style={{
          ...style,
          ...changeStyleIncludeWidthAndHeightAndBgColor(),
        }}
        className={classNames(
          imageStyle['d-lazy-image'],
          {
            [imageStyle['d-lazy-sku-image']]: isSkuImage,
          },
          {
            [imageStyle['d-hide-image-error']]: imageErrState,
          },
          {
            [imageStyle['d-load-completed']]: loadSuccess,
          },
          {
            'd-imag-rendering-crisp-edges': imagRenderingSet,
          },
          className,
        )}
        src={getQualityImage(
          imgSrc,
          NetWorkTypeQuality[getNetWorkType],
        )}
        lazyLoad={isChartH5 ? false : lazyLoad}
        onError={imageError}
        onLoad={imageLoad.bind(this, imgSrc)}
        {...otherOption}
      />
    )
  )
  lazyLoad: true, 
  isSkuImage: false,
  hideErrorImage: false, 
  imagRenderingSet: true, 
  src: null,
  style: null, 
  width: null,
  height: null,
  backgroundColor: null, 
  className: null, 
  errorSrc: null, 
  onLoad: null, 
  onError: null, 
+import React, { useCallback, useEffect, useRef, useState } from 'react'
  getQualityImage,
  isH5AndJdShopView,
  isJdApp,
  isChartH5,
  isH5AndJdShopViewH5Scroll,
  isAppStowShop,
  sgmCustomReport,
  isImageOptimizeEnable,
  getNativePageScrollRes,
  latestFromNativeMsgStorage,
  'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAAAeCAMAAABT0xOcAAAAe1BMVEUAAADx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fELy0NOAAAAKHRSTlMApwmfFtYm9rWveHDm70yJHYJaD2k8IeIr6pY2X0HHfsGRZDHdu1XNmO+CqgAAAu9JREFUSMfNlNmymzAQRAchkCUhdrMZbLze/v8vjIRMKN8kRR7ykFNeVIPV9Ewj039P1TR8+eILjL7RdLFFJUO8QMS7ZmyDJvZ0nDYGY+aKKDSJpY3OwWX6uFUEY/peCNEbY4Rp6AABixFYkLQRAK3VOmAjUrawMt1GrfWtXD7rlFF3uiA6HV/p0TF1tBECEVskYe+7qqW08mqT1jruneu21/72JfHoSZ7faj2bJu6mOlgEa3qjEXKeL/ACV1s5YSbqYP6stXUeX2FZnV3wuBSZqnVWqDNCIvaFRzZIiGAIw+CS/1brQCslgOQdUBoW10C2EFJei7AkygOlAnmGeMprJq/NjhZpAIrepOpOte2Oq9EXjupIMVoiXduQ9rTo7KsODhxJYaAGuJPjgRvdkRD1KP9CawRwettyF5SbVLZ49ZbuMJxGW93XisXPKA/oXNMDEReJT6N0OfZ2V4RqX4tFQPbOQbntwrl8oXCOQmu2hVosSr6j5QcW+uvukZJP37CWzL7tQs2lH8B53Nd6eq192N/72mdfa52XhdXPx6zcXKYgikLXbaNP66M27edoAO2X+RkQ9tVRhoWC6IZkCZAbHHa1SgDHNdHDsbrLr0ojKTkfDWp6+WPh1APakMAXbVrb6B/Mn+311zlETJZOCJYChttWxedUIyvyi9bLt+J4IPcLvVYypBNaDG5TguCzmct3rUkAPSdHJRLyDEjXQ6Un3GZQBamxaU09gJg+/r+4gqV0uzixXjBfLnDzixrjhDJGNoDXXqvK76OEJaO3L1bx/FQOCSxqcfJVUWiXCydEPowHeIqaZnf3wmvNRsBiC28ttEnS+1oy+lNtOMVAzayZCwsQ5ESNREgvKKuNjjI/ewNHr9Y4N5Is98llx2U8iOQXcKczhDwAM6ObayaanfWDDwhJcMvpU8ucr6+cPji5a8+UEVMCMNo97tLm0MU2uoMmi850yrc8s8Khyzuj7+Q6U7GPMCt8mOtGljP6l/wAUcBZ6lceL/8AAAAASUVORK5CYII='
  'https://img14.360buyimg.com/imagetools/jfs/t1/222907/25/7012/5824/61c4797cEbcd17c7f/6c76fc71e4fdb5a5.png'
  const {
    src,
    lazyLoad,
    imagRenderingSet,
    width,
    height,
    className,
    isSkuImage,
    hideErrorImage,
    style,
    backgroundColor,
    errorSrc,
    onLoad,
    onError,
    ...otherOption
  } = props
  getNetWorkType === NetWorkTypeQuality.default &&
    (getNetWorkType = taroJdBaseInfo.info.sysInfo.netWorkType)
  const [loadSuccess, setLoadSuccess] = useState(false)
  const [imageErrState, setImageErrState] = useState(false)
  const [componentShowState, setComponentShowState] = useState(false)
  const measureRef = useRef<HTMLElement | null>(null)
  const [measureComplete, setMeasureComplete] = useState(false)
  const [imgSrc, setImgSrc] = useState(src)
  const componentLazyRef = useRef<HTMLElement | null>(null)
  const componentShowStateRef = useRef(false)
  const requestSrcRef = useRef(src)
  const needShowHighVersion =
    isH5AndJdShopViewH5Scroll &&
    !(
      global.info.queryInfo?.downgraded &&
      global.info.queryInfo.downgraded === 'true'
    )
  const enableAvifOptimize = isImageOptimizeEnable()
  
  const getRequestSrc = useCallback(
    src => {
      const requestSrc = getQualityImage(imgSrc, {
        isSkuImage,
        size: measureRef?.current?.offsetWidth,
      })
      requestSrcRef.current = requestSrc
      return requestSrc
    },
    [src],
  )
  const imageError = useCallback(
    e => {
      console.log(' ==============> 图片加载错误', e)
      errorSrc && setImgSrc(errorSrc)
      hideErrorImage && setImageErrState(true)
      typeof onError === 'function' && onError(e, src, props)
      const { shopId, venderId } = global.info.queryInfo || {}
      sgmCustomReport({
        code: 'jshopViewImageLoadError',
        msg: {
          shopId,
          venderId,
          buildType,
          originSrc: src,
          requestSrc: requestSrcRef.current,
        },
      })
    },
    [src],
  )
  
  const imageLoad = useCallback(
    (_src, event) => {
      setLoadSuccess(true)
      typeof onLoad === 'function' && onLoad(event, src, props)
    },
    [src],
  )
  
  const changeStyleIncludeWidthAndHeightAndBgColor = () => {
    const changeStyle = {}
    width && (changeStyle['width'] = width)
    height && (changeStyle['height'] = height)
    backgroundColor && (changeStyle['backgroundColor'] = backgroundColor)
    return changeStyle
  }
  useEffect(() => {
    setMeasureComplete(true)
    if (needShowHighVersion) return
    const latestRes =
      latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
    !componentShowStateRef.current && dealPageScrollInfo(latestRes)
    Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, res => {
      !componentShowStateRef.current && dealPageScrollInfo(res)
    })
  }, [])
  
  const dealPageScrollInfo = res => {
    const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
    if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined')
      return
    if (measureRef.current) {
      const eleClientRect = measureRef.current.getBoundingClientRect()
      const getContainerHeightOffSetY = displayHeight * 1.5 + offSetY 
      const eleOffsetTop = Math.ceil(eleClientRect.top)
      const eleOffsetHeight = Math.ceil(eleClientRect.height)
      if (!componentShowStateRef.current) {
        if (getContainerHeightOffSetY > eleOffsetTop) {
          componentShowStateRef.current = true
          setComponentShowState(true)
        }
      }
    }
  }
  return isH5AndJdShopView &&
    global?.config?.needImageLazy !== false &&
    !needShowHighVersion &&
    !isAppStowShop ? (
    <View
      ref={measureRef}
      className={classNames(
        imageStyle['d-app-lazy-image'],
        {
          [imageStyle['d-lazy-sku-image']]: isSkuImage,
        },
        {
          [imageStyle['d-hide-image-error']]: imageErrState,
        },
        {
          [imageStyle['d-load-completed']]: loadSuccess,
        },
        {
          'd-imag-rendering-crisp-edges':
            !taroJdBaseInfo.info.pageInfo.isVipShop && imagRenderingSet,
        },
        'J_html5ImageBg',
        className,
      )}
      style={{
        ...style,
        ...changeStyleIncludeWidthAndHeightAndBgColor(),
      }}
      {...otherOption}
    >
      {(componentShowState || lazyLoad === false) && (
        <img
          src={getQualityImage(
            imgSrc,
            taroJdBaseInfo.info.pageInfo.isVipShop
              ? NetWorkTypeQuality['perfect']
              : NetWorkTypeQuality[getNetWorkType],
          )}
          onLoad={imageLoad.bind(this, imgSrc)}
          onError={imageError}
        />
      )}
    </View>
  ) : enableAvifOptimize ? (
    [
      measureComplete ? (
        <Image
          key={'realImage'}
          style={{
            ...style,
            ...changeStyleIncludeWidthAndHeightAndBgColor(),
          }}
          className={classNames(
            imageStyle['d-lazy-image'],
            {
              [imageStyle['d-lazy-sku-image']]: isSkuImage,
            },
            {
              [imageStyle['d-hide-image-error']]: imageErrState,
            },
            {
              [imageStyle['d-load-completed']]: loadSuccess,
            },
            {
              'd-imag-rendering-crisp-edges': imagRenderingSet,
            },
            className,
          )}
          src={getRequestSrc(imgSrc)}
          lazyLoad={isChartH5 ? false : lazyLoad}
          onError={imageError}
          onLoad={imageLoad.bind(this, imgSrc)}
          {...otherOption}
        />
      ) : (
        <Image
          key={'defaultImage'}
          style={{
            ...style,
            ...changeStyleIncludeWidthAndHeightAndBgColor(),
          }}
          className={classNames(
            imageStyle['d-lazy-image'],
            {
              [imageStyle['d-lazy-sku-image']]: isSkuImage,
            },
            {
              [imageStyle['d-hide-image-error']]: imageErrState,
            },
            {
              [imageStyle['d-load-completed']]: loadSuccess,
            },
            {
              'd-imag-rendering-crisp-edges': imagRenderingSet,
            },
            className,
          )}
          src={isSkuImage ? DEFAULT_SKU_SRC : DEFAULT_SRC}
        />
      ),
      loadSuccess ? null : <View key={'measureRef'} ref={measureRef}></View>,
    ]
  ) : (
    <Image
      style={{
        ...style,
        ...changeStyleIncludeWidthAndHeightAndBgColor(),
      }}
      className={classNames(
        imageStyle['d-lazy-image'],
        {
          [imageStyle['d-lazy-sku-image']]: isSkuImage,
        },
        {
          [imageStyle['d-hide-image-error']]: imageErrState,
        },
        {
          [imageStyle['d-load-completed']]: loadSuccess,
        },
        {
          'd-imag-rendering-crisp-edges': imagRenderingSet,
        },
        className,
      )}
      src={getQualityImage(imgSrc, NetWorkTypeQuality[getNetWorkType])}
      lazyLoad={isChartH5 ? false : lazyLoad}
      onError={imageError}
      onLoad={imageLoad.bind(this, imgSrc)}
      {...otherOption}
    />
  )
  lazyLoad: true, 
  isSkuImage: false,
  hideErrorImage: false, 
  imagRenderingSet: true, 
  src: null,
  style: null, 
  width: null,
  height: null,
  backgroundColor: null, 
  className: null, 
  errorSrc: null, 
  onLoad: null, 
  onError: null, 

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

@@ -1 +1 @@
-import { Button, View } from '@tarojs/components'
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  const {
    className,
    message,
    subMessage,
    btnLabel,
    backgroundColorWhite,
    netWorkDataType,
    netWorkShowType,
    netWorkImageType,
    refreshCallBackFn,
    viewMaxHeight
  } = 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: viewMaxHeight !== '' ? viewMaxHeight : 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={classNames(netWorkErrorStyle['d-error-content'],'d-error-content')}>
        <View
          className={classNames(
            netWorkErrorStyle['d-error-type'],
            netWorkErrorStyle[`d-${netWorkDataType}`],
            netWorkErrorStyle[`d-${netWorkImageType}`],
            'd-error-type'
          )}
        />
        <View className={classNames(netWorkErrorStyle['d-error-tip'],'d-error-tip')}>
          {useErrorTip}
        </View>
        {useErrorSubTip ? <View className={classNames(netWorkErrorStyle['d-error-sub-tip'],'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',
                'd-opt-btn'
              )}
              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,
  viewMaxHeight: ''
+import { Button, View } from "@tarojs/components";
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  const {
    className,
    message,
    subMessage,
    btnLabel,
    backgroundColorWhite,
    netWorkDataType,
    netWorkShowType,
    netWorkImageType,
    refreshCallBackFn,
    viewMaxHeight,
  } = 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:
          viewMaxHeight !== ""
            ? viewMaxHeight
            : isMemberPage || isAppStowShop
            ? "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={classNames(
          netWorkErrorStyle["d-error-content"],
          "d-error-content"
        )}
      >
        <View
          className={classNames(
            netWorkErrorStyle["d-error-type"],
            netWorkErrorStyle[`d-${netWorkDataType}`],
            netWorkErrorStyle[`d-${netWorkImageType}`],
            "d-error-type"
          )}
        />
        <View
          className={classNames(
            netWorkErrorStyle["d-error-tip"],
            "d-error-tip"
          )}
        >
          {useErrorTip}
        </View>
        {useErrorSubTip ? (
          <View
            className={classNames(
              netWorkErrorStyle["d-error-sub-tip"],
              "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",
                "d-opt-btn"
              )}
              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,
  viewMaxHeight: "",