@conecli/cone-render 0.8.20 → 0.8.21-shop-beta.3

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

@@ -1 +1 @@
-import { View, Text } from '@tarojs/components'
+import { View, Text } from '@tarojs/components'
  '//img11.360buyimg.com/imagetools/jfs/t1/141506/22/31698/7923/637b6db9E2af80265/10e76e2c31e0e356.png'
  const newModuleFloorTypeList = [100, 101, 100000, 99999]
  const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
  if ((moduleType == 99999 || moduleType == 101) && !previewUri) {

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

@@ -0,0 +1 @@
+import { ComponentInterFace } from '../interface/component'
  const { floorData, builtInComponents = {} } = props
  const floorModuleType = floorData?.floorExtInfo?.moduleFlag
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  return FloorContentItem ? (
    <ErrorBoundary {...props}>
      <FloorContentItem {...props} dataDefines={dataDefines} />
    </ErrorBoundary>
  ) : 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.tsx

@@ -1 +1 @@
-import React, { Suspense, lazy } from 'react'
  style={{
+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/isv/Floor/index.tsx

@@ -1 +1 @@
-import React, { useCallback } from 'react'
+import React, { useCallback } from 'react'
      {floorData?.showCommonFloorHead === false ? null : (
        <CommonFloorHead dataDefines={dataDefines} floorData={floorData} />
      )}

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'

package/dist/interface/component.ts

@@ -1 +1 @@
-import React from 'react'
        subMessage?: string
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
+import React from 'react'
        subMessage?: string
    showCommonFloorHead?: boolean
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean

package/dist/interface/jumpEventReport.ts

@@ -1 +1 @@
-export declare namespace JumpEventReportInterFace {
+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
  }
  export interface jumpWebUrl {
    mshop: string
    pages: string
    couponSearch: string
    shopSecondActivity: string
    shopLight: string
    detail: string
    mobileHome: string
    rank: string
    wqShopMember: string
    wqShopDetail: string
    wqShopSearch: 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 
    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'
        mobileLogin: string
+import { ComponentInterFace } from './component'
        mobileLogin: string
    isLogin: string