@conecli/cone-render 0.8.20-beta.0 → 0.8.20-beta.2

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 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 isOfficlialMemberFloorPreview =
    getPageType() === PageType.M_PREVIEW && memberDefaultTypeList.includes(floorModuleType);
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    );
  };
  
  const renderMemberFixedFloor = (floorData) => {
    return (
      <View>
        {floorData?.previewUri ? (
          <img
            src={floorData.previewUri}
            style={{ width: '100%', display: 'block' }}
            alt="会员楼层占位图"
          />
        ) : null}
      </View>
    );
  };
  if (
    floorModuleType &&
    (RemoteLoadFloorList.includes(floorModuleType) || floorData?.floorExtInfo?.floorLoadWay === 2)
  ) {
    return <RemoteFloorItem {...props} dataDefines={dataDefines}></RemoteFloorItem>;
  } else {
    return isOfficlialMemberFloorPreview ? (
      renderMemberFixedFloor(floorData)
    ) : 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'
    return FloorContentItem ? (
        <FloorContentItem {...props} dataDefines={dataDefines} />
    ) : isDevMode ? (
        renderDecorateDefaultModule()
    ) : null
+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;
      }
    }
  });

package/dist/components/isv/Floor/index.tsx

@@ -1 +1 @@
-import React, { useCallback } from 'react'
      {floorData?.showCommonFloorHead === false ? null : (
        <CommonFloorHead dataDefines={dataDefines} floorData={floorData} />
      )}
+import React, { useCallback } from 'react'
  const {
    style,
    dataDefines,
    containerBorderRadius,
    floorData,
    isRealTimeRender,
    forceRenderTime,
  } = props
  const getRenderRealTimeKeyObj = {
    key: isRealTimeRender ? Date.now() : forceRenderTime,
  }
  console.log('远程加载楼层渲染key信息', getRenderRealTimeKeyObj)
  return (
    <View className={floorStyle['wrap']} style={style}>
      {floorData?.showCommonFloorHead === false ? null : (
        <CommonFloorHead
          dataDefines={dataDefines}
          floorData={floorData}
          {...getRenderRealTimeKeyObj}
        />
      )}
      <View
        className={floorStyle['wrap']}
        style={
          typeof containerBorderRadius === 'number'
            ? {
                borderRadius: containerBorderRadius + 'px',
              }
            : containerBorderRadius
        }
      >
        {}
        {props.children &&
          React.cloneElement(props.children, {
            dataDefines: dataDefines,
            ...getRenderRealTimeKeyObj,
          })}
      </View>
    </View>
  )
  isRealTimeRender: false, 
  forceRenderTime: 1, 

package/dist/components/remoteFloorItem.tsx

@@ -0,0 +1 @@
+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'
+import Taro from '@tarojs/taro';
  export interface BaseConfigInfo {
    abTestLabels: {
      [key: string]: any;
    };
    nonSellableSkuids: {
      [key: string]: number;
    };
    loginState: boolean;
    cookiesStr: string;
    isImmersive: boolean;
    isJingGouMiniViewState?: boolean;
    isJingxiMiniViewState?: boolean;
    shopInfo: {
      shopId?: string | number;
      venderId?: string | number;
    };
    pageInfo: {
      appId?: string;
      shopId?: string | number;
      venderId?: string | number;
      logoSquare?: string;
      logoUrl?: string;
      address?: string | null;
      addressCommaStr?: string | null;
      un_area?: string | null;
      userLbsAddress?: string; 
      shopName?: string;
      jumpTab?: string;
      sourceType?: string;
      sourceValue?: string;
      moduleId?: string;
      entrance?: string;
      EA_PTAG?: string;
      ptag?: string;
      originReferer?: string;
      recBroker?: string;
      rcmdRelateSkuId?: string;
      tabSpm?: string;
      skuId?: string;
      keywords?: string;
      sceneId?: string;
      miniScrollInfo?: {
        scrollLeft: number;
        scrollTop: number;
        scrollHeight: number;
        scrollWidth: number;
        deltaX: number;
        deltaY: number;
      };
      tabsLoadAllDataInfo: {
        [key: string]: boolean;
      };
      wxBusinessType: string;
      vapptype: string;
      pageType: string;
      dataType: string;
      floorExposureInfo: object;
      floorVideInfo: object;
      isExposureState?: boolean;
      appLazyContainerList?: string[];
      appLazyFinishContainerList?: [];
      shopStickyAndToTopInfo?: {
        toTop: boolean;
        sticky: boolean;
      };
      isVipShop?: boolean;
      updateShopInfosState?: boolean;
      pageScrollTop: number;
      shopNavBarHeight: number;
      isFloorInfoDataByPage?: boolean;
    };
    lazyContainer?: {
      wellChosen: {
        appLazyContainerList?: string[];
        appLazyFinishContainerList?: string[];
      };
    };
    queryLogInfo?: {
      sourceType: string;
      sourceValue: string;
      moduleId?: string;
      entrance?: string;
    };
    queryInfo: {
      shopId?: string | number;
      venderId?: string | number;
      shopName?: string;
      [key: string]: any;
    };
    originQueryInfo: {
      shopId?: string | number;
      venderId?: string | number;
      shopName?: string;
      [key: string]: any;
    };
    sysInfo: {
      [key: string]: any;
    };
    userInfo: {
      pin?: string;
      encodePin?: string;
      ptkey?: string;
      wqCookie?: string | null;
      wxappVersion?: string;
      wqAuthToken?: string; 
      wqVisitkey?: string; 
    };
    openAppData?: {
      [key: string]: any;
    };
  }
  
  export interface OneKeyJoinMemberParamInfo {
    title?: string;
    shopId?: string | number;
    venderId?: string | number;
    businessSource?: keyof OneKeyJoinMemberBusinessSource;
  }
  export interface OneKeyJoinMemberBusinessSource {
    isv;
    lv0;
  }
  export type lazyContainer = {
    [key in 'string']?: {
      appLazyFinishContainerList: any[];
      appLazyContainerList: any[];
    };
  };
  export type renderedIsvComponents = {
    [key in 'string']?: any;
  };
  export type MiniApplogUtil = any;
  export type MiniAppLog = any;
  export type WxAppLogin = any;
  export type WxAppUserInfo = any;
  export type wxAppReportManage = any;
  export type WxAppReportGDT = any;
  export type WxAppNavigator = any;
  export type wxAppParamsSign = any;
  export type wxAppFingerReportInstance = any;
  export type wxAppSubsGuider = any;
  export type wxAppAddressV2api = any;
  [key: string]: any;