@conecli/cone-render 0.8.33 → 0.8.35-beta.0

package/dist/components/floorItem.tsx

@@ -1 +1 @@
-import React, { Suspense, lazy } from 'react'
  BUSINESS_TYPE,
  RemoteLoadFloorList,
  JD_PLACEHOLDER_IMG,
  DraJSAgentReportException,
  DraJSAgentReport,
  const {
    floorData,
    renderSourceType,
    builtInComponents = {},
    updateContainerFloorListDataFn,
  } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType: any = 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>
    )
  }
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200
    return getHeight > 0 ? getHeight : 200
  }
  if (floorModuleType && RemoteLoadFloorList.includes(floorModuleType)) {
    console.log(
      '>>>>>>>>>> floorModuleType === FloorModuleType.ISVDESIGNERH5MODULE >>>>>>>>>>',
    )
    const renderResult = (() => {
      try {
        console.log('>>>>>>>>>> 开始渲染1个isv模块 >>>>>>>>>>')
        console.log(
          '==========当前业务类型renderSourceType、楼层floorId: ',
          renderSourceType,
          floorData.uid,
        )
        const modularPackResult = floorData?.floorExtInfo?.modularPackResult
        const modularPackResultObj =
          typeof modularPackResult === 'string'
            ? JSON.parse(modularPackResult)
            : modularPackResult
        if (modularPackResultObj) {
          const { bundleUrl, bundleFileName } = modularPackResultObj
          if (bundleUrl && bundleFileName) {
            let ISVModule =
              taroJdBaseInfo?.renderedIsvComponents[
                `${floorData.uid}_${bundleFileName}`
              ] || null
            if (!ISVModule) {
              ISVModule = lazy(
                () => import(bundleFileName + '@@@@@@' + bundleUrl),
              )
              console.log(
                '1|加载isv模块==========走lazy import生成新的isv模块react组件',
                bundleFileName,
              )
              taroJdBaseInfo.renderedIsvComponents[
                `${floorData.uid}_${bundleFileName}`
              ] = ISVModule
              console.log(
                '2|渲染isv模块的react组件==========,window.taroJshopH5WebpackJsonp上的组件是否已就绪: ',
                bundleFileName,
                window['taroJshopH5WebpackJsonp'].find(
                  (item) => item[0][0] == bundleFileName,
                ),
              )
            } else {
              console.log(
                '1|加载isv模块==========不走lazy import生成新的isv模块react组件，从已加载中获取，taroJdBaseInfo: ',
                taroJdBaseInfo,
              )
              console.log(
                '2|渲染isv模块的react组件==========,taroJdBaseInfo.renderedIsvComponents上的组件是否已就绪: ',
                taroJdBaseInfo.renderedIsvComponents[
                  `${floorData.uid}_${bundleFileName}`
                ],
              )
            }
            const _floorHeight = getFloorSetHeight(floorData)
            return (
              <ErrorBoundary {...props}>
                <Suspense
                  fallback={
                    <View
                      style={{
                        position: 'relative',
                        background: `#ffffff url('${JD_PLACEHOLDER_IMG}')	center center no-repeat`,
                        height: `${_floorHeight}px`,
                      }}
                    ></View>
                  }
                >
                  <ISVFloor {...props} dataDefines={dataDefines}>
                    <ISVModule {...props} dataDefines={dataDefines}></ISVModule>
                  </ISVFloor>
                </Suspense>
              </ErrorBoundary>
            )
          } else {
            console.log(
              '3|isv模块渲染异常，modularPackResult中缺少bundleUrl或bundleFileName==========modularPackResult: ',
              modularPackResultObj,
            )
            DraJSAgentReport(
              `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
              {
                buildType,
                uid: floorData?.uid,
                floorIdx: floorData?.floorIdx,
                shopId: floorData?.floorExtInfo?.shopId,
                moduleId: floorData?.moduleId,
                moduleName: floorData?.moduleName,
                middleTemplateId: floorData?.middleTemplateId,
                modularPackResult: modularPackResult,
              },
            )
            return null
          }
        } else {
          console.log(
            '3|isv模块渲染异常，缺少modularPackResult==========modularPackResult: ',
            modularPackResultObj,
          )
          DraJSAgentReport(
            `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
            {
              buildType,
              uid: floorData?.uid,
              floorIdx: floorData?.floorIdx,
              shopId: floorData?.floorExtInfo?.shopId,
              moduleId: floorData?.moduleId,
              moduleName: floorData?.moduleName,
              middleTemplateId: floorData?.middleTemplateId,
              modularPackResult: modularPackResult,
            },
          )
          return null
        }
      } catch (err) {
        console.log('3|isv模块渲染异常，floorItem逻辑错误==========err: ', err)
        DraJSAgentReportException(err)
        return null
      }
    })()
    if (renderResult === null) {
      updateContainerFloorListDataFn &&
        updateContainerFloorListDataFn({
          type: 'filter',
          containerId: floorData?.uid,
        })
      console.log('renderResult === null: 命中了！')
      taroEventSendPageScrollInfo()
    } else {
      console.log('renderResult !== null: 没命中', renderResult)
    }
    return renderResult
  } 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
      }
    }
  })
+import React from 'react'
  const { floorData, renderSourceType, builtInComponents = {} } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType: any = 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>
    )
  }
  if (floorModuleType && RemoteLoadFloorList.includes(floorModuleType)) {
    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/remoteFloorItem.tsx

@@ -0,0 +1 @@
+import React, { Suspense, lazy } from 'react'
  const { floorData, renderSourceType, updateContainerFloorListDataFn } = props
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200
    return getHeight > 0 ? getHeight : 200
  }
  console.log(
    '>>>>>>>>>> floorModuleType === FloorModuleType.ISVDESIGNERH5MODULE >>>>>>>>>>',
  )
  const renderResult = (() => {
    try {
      console.log('>>>>>>>>>> 开始渲染1个isv模块 >>>>>>>>>>')
      console.log(
        '==========当前业务类型renderSourceType、楼层floorId: ',
        renderSourceType,
        floorData.uid,
      )
      const modularPackResult = floorData?.floorExtInfo?.modularPackResult
      const modularPackResultObj =
        typeof modularPackResult === 'string'
          ? JSON.parse(modularPackResult)
          : modularPackResult
      const opt = {
        msg: `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
        buildType,
        uid: floorData?.uid,
        floorIdx: floorData?.floorIdx,
        shopId: floorData?.floorExtInfo?.shopId,
        moduleId: floorData?.moduleId,
        moduleName: floorData?.moduleName,
        middleTemplateId: floorData?.middleTemplateId,
        modularPackResult: modularPackResult,
      }
      if (modularPackResultObj) {
        const { bundleUrl, bundleFileName } = modularPackResultObj
        if (bundleUrl && bundleFileName) {
          let ISVModule =
            taroJdBaseInfo?.renderedIsvComponents[
              `${floorData.uid}_${bundleFileName}`
            ] || null
          if (!ISVModule) {
            ISVModule = lazy(
              () => import(bundleFileName + '@@@@@@' + bundleUrl),
            )
            console.log(
              '1|加载isv模块==========走lazy import生成新的isv模块react组件',
              bundleFileName,
            )
            taroJdBaseInfo.renderedIsvComponents[
              `${floorData.uid}_${bundleFileName}`
            ] = ISVModule
            console.log(
              '2|渲染isv模块的react组件==========,window.taroJshopH5WebpackJsonp上的组件是否已就绪: ',
              bundleFileName,
              window['taroJshopH5WebpackJsonp'].find(
                (item) => item[0][0] == bundleFileName,
              ),
            )
          } else {
            console.log(
              '1|加载isv模块==========不走lazy import生成新的isv模块react组件，从已加载中获取，taroJdBaseInfo: ',
              taroJdBaseInfo,
            )
            console.log(
              '2|渲染isv模块的react组件==========,taroJdBaseInfo.renderedIsvComponents上的组件是否已就绪: ',
              taroJdBaseInfo.renderedIsvComponents[
                `${floorData.uid}_${bundleFileName}`
              ],
            )
          }
          const _floorHeight = getFloorSetHeight(floorData)
          return (
            <ErrorBoundary {...props}>
              <Suspense
                fallback={
                  <View
                    style={{
                      position: 'relative',
                      background: `#ffffff url('${JD_PLACEHOLDER_IMG}')	center center no-repeat`,
                      height: `${_floorHeight}px`,
                    }}
                  ></View>
                }
              >
                <ISVFloor {...props} dataDefines={dataDefines}>
                  <ISVModule {...props} dataDefines={dataDefines}></ISVModule>
                </ISVFloor>
              </Suspense>
            </ErrorBoundary>
          )
        } else {
          console.log(
            '3|isv模块渲染异常，modularPackResult中缺少bundleUrl或bundleFileName==========modularPackResult: ',
            modularPackResultObj,
          )
          sgmCustomReport({
            code: 'isvModuleError',
            msg: opt,
          })
          return null
        }
      } else {
        console.log(
          '3|isv模块渲染异常，缺少modularPackResult==========modularPackResult: ',
          modularPackResultObj,
        )
        sgmCustomReport({
            code: 'isvModuleError',
            msg: opt,
          })
        return null
      }
    } catch (err) {
      console.log('3|isv模块渲染异常，floorItem逻辑错误==========err: ', err)
      sgmCustomReport({
        code: 'isvModuleError',
        msg: {
          msg: 'remoteFloorItem try catch 异常',
          err
        },
      })
      return null
    }
  })()
  if (renderResult === null) {
    updateContainerFloorListDataFn &&
      updateContainerFloorListDataFn({
        type: 'filter',
        containerId: floorData?.uid,
      })
    console.log('renderResult === null: 命中了！')
    taroEventSendPageScrollInfo()
  } else {
    console.log('renderResult !== null: 没命中', renderResult)
  }
  return renderResult

package/dist/interface/common.ts

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