@conecli/cone-render 0.10.1-isv2.1 → 0.10.1-isv2.2

package/dist/components/remoteFloorItem.tsx

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  getBundleUrl,
  getBundleFileName,
  formatPackResult,
  const { floorData, renderSourceType, updateContainerFloorListDataFn } = props
  const dataDefines = getFloorDataToDataDefines(floorData)
  const [forceRenderTime,setForceRenderTime] = useState(1)
  useEffect(() => {
    isJdAndAndroidDevice && Taro.eventCenter.on(TaroEventType.FORCE_UPDATE_PAGE_LAYOUT, (_result) => {
      setForceRenderTime(Date.now())
    })
    return () => {
      isJdAndAndroidDevice && Taro.eventCenter.off(TaroEventType.FORCE_UPDATE_PAGE_LAYOUT)
    }
  },[])
  
  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 = formatPackResult(modularPackResult)
      const bundleUrl = getBundleUrl(modularPackResultObj)
      const bundleFileName = getBundleFileName(modularPackResultObj)
      const opt = {
        msg: `店铺h5楼层隐藏不显示。原因：模块数据不完备，楼层过滤。`,
        floorIdx: floorData?.floorIdx,
        uid: floorData?.uid,
        shopId: floorData?.floorExtInfo?.shopId,
        moduleId: floorData?.moduleId,
        moduleDesignerType: floorData?.floorExtInfo?.moduleDesignerType,
        floorLoadWay: floorData?.floorExtInfo?.floorLoadWay, 
        floorKind: floorData?.floorExtInfo?.floorKind, 
        middleTemplateId: floorData?.middleTemplateId,
        modularPackResult: modularPackResult,
      }
      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} forceRenderTime={forceRenderTime} isRealTimeRender={realTimerRenderTypeList.includes(taroJdBaseInfo.info.pageInfo.dataType)}>
                  <ISVModule {...props} dataDefines={dataDefines}></ISVModule>
                </ISVFloor>
              </Suspense>
            </ErrorBoundary>
          )
        } else {
          console.log(
            '3|isv模块渲染异常，modularPackResult中缺少bundleUrl或bundleFileName==========modularPackResult: ',
            modularPackResultObj,
          )
          sgmCustomReport({
            code: getSgmCustomCode(SgmCustomCode.REMOTEMODULE_DATA),
            msg: opt,
          })
          return null
        }
    } catch (err) {
      console.log('3|isv模块渲染异常，floorItem逻辑错误==========err: ', 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
+import Taro from '@tarojs/taro'
  getBundleUrl,
  getBundleFileName,
  formatPackResult,
  getTaroVersion
  const { floorData, renderSourceType, updateContainerFloorListDataFn } = props
  const dataDefines = getFloorDataToDataDefines(floorData)
  const [forceRenderTime,setForceRenderTime] = useState(1)
  useEffect(() => {
    isJdAndAndroidDevice && Taro.eventCenter.on(TaroEventType.FORCE_UPDATE_PAGE_LAYOUT, (_result) => {
      setForceRenderTime(Date.now())
    })
    return () => {
      isJdAndAndroidDevice && Taro.eventCenter.off(TaroEventType.FORCE_UPDATE_PAGE_LAYOUT)
    }
  },[])
  
  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 = formatPackResult(modularPackResult)
      const bundleUrl = getBundleUrl(modularPackResultObj)
      const bundleFileName = getBundleFileName(modularPackResultObj)
      const taroVersion = getTaroVersion(modularPackResultObj)
      const opt = {
        msg: `店铺h5楼层隐藏不显示。原因：模块数据不完备，楼层过滤。`,
        floorIdx: floorData?.floorIdx,
        uid: floorData?.uid,
        shopId: floorData?.floorExtInfo?.shopId,
        moduleId: floorData?.moduleId,
        moduleDesignerType: floorData?.floorExtInfo?.moduleDesignerType,
        floorLoadWay: floorData?.floorExtInfo?.floorLoadWay, 
        floorKind: floorData?.floorExtInfo?.floorKind,
        middleTemplateId: floorData?.middleTemplateId,
        modularPackResult: {
          bundleUrl,
          taroVersion
        }
      }
      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} forceRenderTime={forceRenderTime} isRealTimeRender={realTimerRenderTypeList.includes(taroJdBaseInfo.info.pageInfo.dataType)}>
                  <ISVModule {...props} dataDefines={dataDefines}></ISVModule>
                </ISVFloor>
              </Suspense>
            </ErrorBoundary>
          )
        } else {
          console.log(
            '3|isv模块渲染异常，modularPackResult中缺少bundleUrl或bundleFileName==========modularPackResult: ',
            modularPackResultObj,
          )
          sgmCustomReport({
            code: getSgmCustomCode(handleSgmCodeTaroVersion(floorData?.floorExtInfo?.floorKind === FLOOR_KIND.PDC_SYSTEM_MODULE ? SgmCustomCode.SYSTEMPDCMODULE_DATA : SgmCustomCode.REMOTEMODULE_DATA)),
            msg: opt,
          })
          return null
        }
    } catch (err) {
      console.log('3|isv模块渲染异常，floorItem逻辑错误==========err: ', 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'
    isJingxiMiniViewState?: boolean
      floorVideInfo: object
        originQueryInfo: {
    openAppData?: {
      [key: string]: any
    }
+import Taro from '@tarojs/taro'
    isJingxiMiniViewState?: boolean
      floorVideInfo: object
      isFloorInfoDataByPage?: boolean
        originQueryInfo: {
    openAppData?: {
      [key: string]: any
    }

package/dist/interface/component.ts

@@ -1 +1 @@
-import React from 'react'
    subMessage?: string
    viewMaxHeight?: string
      floorLoadWay?: number
      floorKind?: number
      shopId?: string
      moduleDesignerType?: string
    showCommonFloorHead?: boolean
    borderRadius: number
    borderTopLeftRadius?: number
    borderTopRightRadius?: number
    borderBottomLeftRadius?: number
    borderBottomRightRadius?: number
    marginTop?: number
    marginBottom?: number
    marginLeft?: number
    marginRight?: number
    paddingTop?: number
    paddingBottom?: number
    paddingLeft?: number
    paddingRight?: number
    containerId: string
    background?: string
    containerPosition?: string
    key?: string
    floors: floorItemData[]
    includeUids: string[]
    typeCn: string
    typeCode?: string
    addLuxuryStyle?: boolean
    addLuxuryBackupStyle?: boolean
    renderExtendComponent?: Function
    floorExtendData?: any
  }
    isRealTimeRender: boolean
    forceRenderTime: number
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    showDayToSecondState?: boolean 
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean
    evenList:  any[]
    oddList: any[]
+import React from 'react'
    subMessage?: string
    viewMaxHeight?: string
        noPosition?: boolean
      floorLoadWay?: number
      floorKind?: number
      shopId?: string
      moduleDesignerType?: string
    showCommonFloorHead?: boolean
    borderRadius: number
    borderTopLeftRadius?: number
    borderTopRightRadius?: number
    borderBottomLeftRadius?: number
    borderBottomRightRadius?: number
    marginTop?: number
    marginBottom?: number
    marginLeft?: number
    marginRight?: number
    paddingTop?: number
    paddingBottom?: number
    paddingLeft?: number
    paddingRight?: number
    containerId: string
    background?: string
    containerPosition?: string
    key?: string
    floors: floorItemData[]
    includeUids: string[]
    typeCn: string
    typeCode?: string
    addLuxuryStyle?: boolean
    addLuxuryBackupStyle?: boolean
    renderExtendComponent?: Function
    insertContainerStartComponent?: Function
    floorExtendData?: any
  }
    isRealTimeRender: boolean
    forceRenderTime: number
    luxuryFixed?: boolean
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    luxuryFixed?: boolean
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    isShowPlaceHolder?: boolean
    showDayToSecondState?: boolean 
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean
    evenList:  any[]
    oddList: any[]

package/dist/interface/jumpEventReport.ts

@@ -1 +1 @@
-export declare namespace JumpEventReportInterFace {
  export interface ShopIdsInfo {
    shopId?: number | string
    venderId?: number | string
    logEventInfo?: object
    type?: string
  }
  export interface RouterInfo {
    params: any
    pageParamStr?: string
    [key: string]: any
  }
  export interface JumpMiniPath {
    shop: string
    shopx: string
    detail: string
    searchCoupon: string
    h5: string
    jingGouHome: string
    shopFans: string 
    shopLight: string 
    couponSearch: string
    shopSearch: string
    jxCouponSearch: string
    jxDetail: string
  }
  export interface jumpWebUrl {
    mshop: string
    pages: string
    pcCoupon: string
    couponSearch: string
    jxCouponSearch: string
    pcCouponSearch: string
    shopSecondActivity: string
    shopLight: string
    detail: string
    jxDetail: string
    tjDetail: string
    pcDetail: string
    mobileHome: string
    rank: string
    wqShopMember: string
    wqShopDetail: string
    wqShopSearch: string
    myCouponList: string
    myRedPacketList: string
    memberHome: string
    memberCard: string
    memberPoints: string
    memberBenefit: string
    shopMember: string
    shopMemberPointDetail: string
    shopMemberBenefit: string
    shopMemberRule: string
    shopMemberCloseAccount: string
    shopMemberPointExchange: string
    shopMemberBonusPurchase: string
    shopMemberGood: string
    beanDetail: string
    totalPromotion: string
    mLive: string 
    shopHome: string 
    shopIntroduce: string 
    shopSearch: string 
    shopLottery: string 
    shopCoupon: string
    shopWares: string 
    shopFastShopping: string 
    shopSpeciSeckill: string
    shopVideos: string 
    shopMoreGoods:string
    shopUseShareOrderUgcContent: string 
    dongDongChat: string 
    samCenter: string 
    samCard: string 
    shopH5MemberCardAPP: string 
    shopH5MemberCardM: string 
  }
  export interface EventReportConfig {
    routerInfo: RouterInfo
    nativeEvent: any
  }
  export interface OptEventLogParams {
    eventId?: string
    eventParam?: string | object
    pTag?: string 
    jsonParam?: {
      [key: string]: any
    }
    skuId?: string | number
    eventLevel?: string
    exposureState?: boolean
    otherParams?: object
  }
  
  export interface JumpH5ReportConfig {
    shopId?: number | string
    venderId?: number | string
    sourceValue?: string
    sourceType?: string
  }
  export interface JumpEventReportInit extends EventReportConfig {
    getConfig(opt): EventReportConfig
    updateInfo(routerInfo, logPname): void
  }
  export interface CouponUrlParams {
    batchId: number
    bindType: number
    startTime?: number
    endTime?: number
    quangoufrom?: number
    sceneId?: number
  }
  export interface JdMiniJumpParams {
    param: string | object
    sourceValue?: string
    sourceType?: string
    des?: any
    logEventInfo?: object
  }
  export interface LinkMiniParams {
    param?: {
      pageType?: string
    }
    appId?: string | number
    path?: string
  }
  export interface JdJumpWxappReportConfig {
    wxApiVersion: string
    wxApiUrl: string
    wqReportUrl: string
  }
+export declare namespace JumpEventReportInterFace {
  export interface ShopIdsInfo {
    shopId?: number | string
    venderId?: number | string
    logEventInfo?: object
    type?: string
  }
  export interface RouterInfo {
    params: any
    pageParamStr?: string
    [key: string]: any
  }
  export interface JumpMiniPath {
    shop: string
    shopx: string
    detail: string
    searchCoupon: string
    h5: string
    jingGouHome: string
    shopFans: string 
    shopLight: string 
    couponSearch: string
    shopSearch: string
    jxCouponSearch: string
    jxDetail: string
  }
  export interface jumpWebUrl {
    mshop: string
    pages: string
    pcCoupon: string
    couponSearch: string
    jxCouponSearch: string
    pcCouponSearch: string
    shopSecondActivity: string
    shopLight: string
    detail: string
    jxDetail: string
    tjDetail: string
    pcDetail: string
    mobileHome: string
    rank: string
    wqShopMember: string
    wqShopDetail: string
    wqShopSearch: string
    myCouponList: string
    myRedPacketList: string
    memberHome: string
    memberCard: string
    memberPoints: string
    memberBenefit: string
    memberScores: string
    memberScoreRule: string
    memberProduct: string
    shopMember: string
    shopMemberPointDetail: string
    shopMemberBenefit: string
    shopMemberRule: string
    shopMemberCloseAccount: string
    shopMemberPointExchange: string
    shopMemberBonusPurchase: string
    shopMemberGood: string
    beanDetail: string
    totalPromotion: string
    mLive: string 
    shopHome: string 
    shopIntroduce: string 
    shopSearch: string 
    shopLottery: string 
    shopCoupon: string
    shopWares: string 
    shopFastShopping: string 
    shopSpeciSeckill: string
    shopVideos: string 
    shopMoreGoods:string
    shopUseShareOrderUgcContent: string 
    dongDongChat: string 
    samCenter: string 
    samCard: string 
    shopH5MemberCardAPP: string 
    shopH5MemberCardM: string 
  }
  export interface EventReportConfig {
    routerInfo: RouterInfo
    nativeEvent: any
  }
  export interface OptEventLogParams {
    eventId?: string
    eventParam?: string | object
    pTag?: string 
    jsonParam?: {
      [key: string]: any
    }
    skuId?: string | number
    eventLevel?: string
    exposureState?: boolean
    otherParams?: object
  }
  
  export interface JumpH5ReportConfig {
    shopId?: number | string
    venderId?: number | string
    sourceValue?: string
    sourceType?: string
  }
  export interface JumpEventReportInit extends EventReportConfig {
    getConfig(opt): EventReportConfig
    updateInfo(routerInfo, logPname): void
  }
  export interface CouponUrlParams {
    batchId: number
    bindType: number
    startTime?: number
    endTime?: number
    quangoufrom?: number
    sceneId?: number
  }
  export interface JdMiniJumpParams {
    param: string | object
    sourceValue?: string
    sourceType?: string
    des?: any
    logEventInfo?: object
  }
  export interface LinkMiniParams {
    param?: {
      pageType?: string
    }
    appId?: string | number
    path?: string
  }
  export interface JdJumpWxappReportConfig {
    wxApiVersion: string
    wxApiUrl: string
    wqReportUrl: string
  }

package/dist/interface/service.ts

@@ -1 +1 @@
-import { ComponentInterFace } from './component'
    pcCoupon: string
    pcSo: string
        mobileLogin: string
    kpl: string
    jxDomain: string
    isLogin: string 
+import { ComponentInterFace } from './component'
    pcCoupon: string
    api: string
    hkApi: string
    pcSo: string
        mobileLogin: string
    kpl: string
    jxDomain: string
    hkApiFunc: string
    isLogin: string 
    statusCode: number
    resTimeoutState?: boolean
    errMsg?: string
    msg?: string
    data?: any
    status?: string
    requestType?: string
  }
  }
  export interface FloorInfoPageRequestParam {
    snapVersion?: string 
    projectId?: string
    pageId?: string 
    lastFloorIdInPrePage?: string 
  }