@conecli/cone-render 0.10.1-beta.8 → 0.10.1-beta.9

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

@@ -1 +1 @@
-import React, { useCallback, useState } from 'react'
  const {
    src = null,
    lazyLoad = true, 
    imagRenderingSet = true, 
    width = null,
    height = null,
    className = null, 
    isSkuImage = false,
    hideErrorImage = false, 
    style = null, 
    backgroundColor = null, 
    errorSrc = null, 
    onLoad = null, 
    onError = null, 
    ...otherOption
  } = props
  getNetWorkType === NetWorkTypeQuality.default &&
    (getNetWorkType = taroJdBaseInfo.info.sysInfo.netWorkType)
  const [loadSuccess, setLoadSuccess] = useState(false)
  const [imgSrc, setImgSrc] = useState(src)
  const [imageErrState, setImageErrState] = useState(false)
  const imageError = useCallback(
    (e) => {
      console.log('图片加载错误', e)
      errorSrc && setImgSrc(errorSrc)
      hideErrorImage && setImageErrState(true)
      typeof onError === 'function' && onError(e, src, props)
    },
    [src],
  )
  
  const imageLoad = useCallback(
    (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
  }
  return (
    <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={lazyLoad}
      onError={imageError}
      onLoad={imageLoad}
      {...otherOption}
    />
  )
+import React, {useCallback, useState} from 'react'

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 = false, 
    netWorkDataType = NETWORK_DATA_TYPE.NORMAL,
    netWorkImageType = NetWork_Image_Type.No_Data_Default_Tip,
    netWorkShowType = NetWorkShowType.FULL,
    refreshCallBackFn = null,
    viewMaxHeight = '',
    noPosition = false, 
  } = 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,
        },
        {
          [netWorkErrorStyle['d-shop-network-no-position']]: noPosition,
        },
        '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
+import { Button, View } from '@tarojs/components'
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  const {
    className,
    message,
    subMessage,
    btnLabel,
    backgroundColorWhite,
    netWorkDataType,
    netWorkShowType,
    netWorkImageType,
    refreshCallBackFn,
    viewMaxHeight,
    noPosition = false, 
  } = 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,
        },
        {
            [netWorkErrorStyle['d-shop-network-no-position']]: noPosition
        },
        '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: ''

package/dist/components/debug/DebugLayout/index.module.scss

@@ -6,7 +6,7 @@
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 9999;
+  z-index: 50;
 
 	.debug-layout {
 		position: absolute;
@@ -58,7 +58,7 @@
 	.d-info {
 		position: relative;
 		cursor: pointer;
-		z-index: 9999;
+		z-index: 3;
 		margin: 3PX 3PX;
 		width: 22PX;
 		height: 22PX;

package/dist/components/decorate/PlaceHolder/index.tsx

@@ -1 +1 @@
-import { View, Text } from '@tarojs/components'
+import { View, Text } from '@tarojs/components'

package/dist/components/floorItem.jd.tsx

@@ -1 +1 @@
-import React from 'react'
  const {
    floorData,
    renderSourceType = BUSINESS_TYPE.ONLINE, 
    builtInComponents = {},
    updateContainerFloorListDataFn,
  } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType = floorData?.floorExtInfo?.moduleFlag
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    )
  }
  return FloorContentItem ? (
    <FloorContentItem {...props} dataDefines={dataDefines} />
  ) : isDevMode ? (
    renderDecorateDefaultModule()
  ) : null
  switch (moduleId) {
    case 83158:
      return 'freeLayout'
    case 99654:
      return 'activeText'
    case 100382:
      return 'superGoods'
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null
    }
    const moduleFlag = item.floorExtInfo.moduleFlag
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag
      }
    }
  })
+import React from 'react'
    return FloorContentItem ? (
        <FloorContentItem {...props} dataDefines={dataDefines} />
    ) : isDevMode ? (
        renderDecorateDefaultModule()
    ) : null

package/dist/components/floorItem.tsx

@@ -1 +1 @@
-import React from 'react'
  const {
    floorData,
    renderSourceType = BUSINESS_TYPE.ONLINE, 
    builtInComponents = {},
  } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const specificModuleFlag = ['mHeaderVideo']
  const frontEndSpecificModuleFlag = ['header_mVideo']
  const luxuryContainerPosition = 'luxuryFixed'
  const floorPosition = floorData?.floorPosition
  let floorModuleType: any = floorData?.floorExtInfo?.moduleFlag
  specificModuleFlag.includes(floorModuleType) &&
    floorPosition === luxuryContainerPosition &&
    (floorModuleType = frontEndSpecificModuleFlag)
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    )
  }
  if (
    floorModuleType &&
    (RemoteLoadFloorList.includes(floorModuleType) ||
      floorData?.floorExtInfo?.floorLoadWay === 2)
  ) {
    return (
      <RemoteFloorItem {...props} dataDefines={dataDefines}></RemoteFloorItem>
    )
  } else {
    return FloorContentItem ? (
      <ErrorBoundary {...props}>
        <FloorContentItem {...props} dataDefines={dataDefines} />
      </ErrorBoundary>
    ) : isDevMode ? (
      renderDecorateDefaultModule()
    ) : null
  }
  switch (moduleId) {
    case 83158:
      return 'freeLayout'
    case 99654:
      return 'activeText'
    case 100382:
      return 'superGoods'
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null
    }
    const moduleFlag = item.floorExtInfo.moduleFlag
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag
      }
    }
  })
+import React from 'react'
  const { floorData, renderSourceType, builtInComponents = {} } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const specificModuleFlag = ['mHeaderVideo']
  const frontEndSpecificModuleFlag = ['header_mVideo']
  const luxuryContainerPosition = 'luxuryFixed'
  const floorPosition = floorData?.floorPosition
  let floorModuleType: any = floorData?.floorExtInfo?.moduleFlag
  specificModuleFlag.includes(floorModuleType) &&
    floorPosition === luxuryContainerPosition &&
    (floorModuleType = frontEndSpecificModuleFlag)
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    )
  }
  if (
    floorModuleType &&
    (RemoteLoadFloorList.includes(floorModuleType) ||
      floorData?.floorExtInfo?.floorLoadWay === 2)
  ) {
    return (
      <RemoteFloorItem {...props} dataDefines={dataDefines}></RemoteFloorItem>
    )
  } else {
    return FloorContentItem ? (
      <ErrorBoundary {...props}>
        <FloorContentItem {...props} dataDefines={dataDefines} />
      </ErrorBoundary>
    ) : isDevMode ? (
      renderDecorateDefaultModule()
    ) : null
  }
  renderSourceType: BUSINESS_TYPE.ONLINE, 
  switch (moduleId) {
    case 83158:
      return 'freeLayout'
    case 99654:
      return 'activeText'
    case 100382:
      return 'superGoods'
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null
    }
    const moduleFlag = item.floorExtInfo.moduleFlag
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag
      }
    }
  })

package/dist/components/floorItem.weapp.tsx

@@ -1 +1 @@
-import React from 'react'
  const { floorData, renderSourceType, builtInComponents = {} } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType = floorData?.floorExtInfo?.moduleFlag
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    )
  }
  return FloorContentItem ? (
    <ErrorBoundary {...props}>
      <FloorContentItem {...props} dataDefines={dataDefines} />
    </ErrorBoundary>
  ) : isDevMode ? (
    renderDecorateDefaultModule()
  ) : null
  renderSourceType: BUSINESS_TYPE.ONLINE, 
  switch (moduleId) {
    case 83158:
      return 'freeLayout'
    case 99654:
      return 'activeText'
    case 100382:
      return 'superGoods'
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null
    }
    const moduleFlag = item.floorExtInfo.moduleFlag
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag
      }
    }
  })
+import React from 'react';
  const { floorData, renderSourceType, builtInComponents = {} } = props;
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE;
  const floorModuleType = floorData?.floorExtInfo?.moduleFlag;
  const FloorContentItem = (floorModuleType && builtInComponents[floorModuleType]) || null;
  const dataDefines = getFloorDataToDataDefines(floorData);
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    );
  };
  return FloorContentItem ? <FloorContentItem {...props} dataDefines={dataDefines} /> : isDevMode ? (
    renderDecorateDefaultModule()
  ) : null;
  renderSourceType: BUSINESS_TYPE.ONLINE, 
  switch (moduleId) {
    case 83158:
      return 'freeLayout';
    case 99654:
      return 'activeText';
    case 100382:
      return 'superGoods';
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null;
    }
    const moduleFlag = item.floorExtInfo.moduleFlag;
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId);
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag;
      }
    }
  });