@conecli/cone-render 0.9.1-shop2.4 → 0.9.1-shop2.40

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

@@ -1 +1 @@
-import { View } from '@tarojs/components'
  const {
    selectContainerId,
    placeHolderPreContainerId,
    containerData,
    children,
    style,
    shopTotalInfo,
    urlQueryData
  } = props;
  const { isTrusteeship = false } = urlQueryData || {}
  const selectContainerState = selectContainerId == containerData?.containerId
  const ChildrenComponent = useCallback(() => {
    return children ? children : null;
  }, [containerData, shopTotalInfo]);
  const isHideFloor = isTrusteeship && containerData?.floors?.[0]?.status === -1
  return (
    <View
      className={classNames(
        decorateModuleStyle[isTrusteeship ? 'd-container-item-trusteeship' : 'd-container-item'],
        'J_container',
        {
          [decorateModuleStyle['d-container-item-active']]:
            selectContainerState,
        },
        {
          J_floorItemActive: selectContainerState,
        },
        {
          [decorateModuleStyle['d-container-item-hide']]:
            isHideFloor,
        }
      )}
      id={`J_container_${containerData?.containerId}`}
      data-container-id={containerData?.containerId}
      data-container-type={containerData?.typeCode}
      data-container-cn={containerData?.typeCn}
      data-container-floorFlag={containerData?.extInfo?.floorFlag || ''}
      data-container-moduleInstanceType={containerData?.extInfo?.moduleInstanceType || ''}
      data-container-position={containerData?.containerPosition}
      data-container-alias={
        containerData?.containerAlias
          ? containerData?.containerAlias
          : ''
      }
      data-container-empty={containerData?.floors?.[0]?.configEmpty || 'false'}
      style={
        containerData?.typeCode !== ContainerShopHeaderType ? style : {}
      }
    >
      <input
        type="hidden"
        value={`container_${containerData?.containerId}`}
      />
      <ChildrenComponent />
      <PlaceHolder
        placeHolderPreContainerId={placeHolderPreContainerId}
        containerId={containerData?.containerId}
      />
    </View>
  )
+import { View } from '@tarojs/components'
  const {
    selectContainerId,
    placeHolderPreContainerId,
    containerData,
    children,
    style,
    shopTotalInfo,
    urlQueryData,
    containerIndex = -1,
    luxuryFixed = false
  } = props;
  const { isTrusteeship = false } = urlQueryData || {}
  const selectContainerState = selectContainerId == containerData?.containerId
  const ChildrenComponent = useCallback(() => {
    return children ? children : null;
  }, [containerData, shopTotalInfo]);
  const isHideFloor = isTrusteeship && containerData?.floors?.[0]?.status === -1
  return (
    <View
      className={classNames(
        decorateModuleStyle[isTrusteeship ? 'd-container-item-trusteeship' : 'd-container-item'],
        'J_container',
        {
          [decorateModuleStyle['d-container-item-active']]:
            selectContainerState,
        },
        {
          J_floorItemActive: selectContainerState,
        },
        {
          [decorateModuleStyle['d-container-item-hide']]:
            isHideFloor,
        },
        {
          [decorateModuleStyle['d-container-item-cover']]:
          containerIndex === 0 && luxuryFixed && !isTrusteeship,
        },
      )}
      id={`J_container_${containerData?.containerId}`}
      data-container-id={containerData?.containerId}
      data-container-type={containerData?.typeCode}
      data-container-cn={containerData?.typeCn}
      data-container-floorFlag={containerData?.extInfo?.floorFlag || ''}
      data-container-moduleInstanceType={containerData?.extInfo?.moduleInstanceType || ''}
      data-container-position={containerData?.containerPosition}
      data-container-alias={
        containerData?.containerAlias
          ? containerData?.containerAlias
          : ''
      }
      data-container-empty={containerData?.floors?.[0]?.configEmpty || 'false'}
      style={
        containerData?.typeCode !== ContainerShopHeaderType ? style : {}
      }
    >
      <input
        type="hidden"
        value={`container_${containerData?.containerId}`}
      />
      <ChildrenComponent />
      <PlaceHolder
        placeHolderPreContainerId={placeHolderPreContainerId}
        containerId={containerData?.containerId}
        {...(selectContainerId === "luxuryHeader-isUpperHalf" && { isShowPlaceHolder: false })}
      />
    </View>
  )

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

@@ -1 +1 @@
-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) {
  if (moduleFlag && TRUSTEESHIP_MODULE_FLAG_LIST.indexOf(moduleFlag) !== -1) return null
+import { View, Text } from '@tarojs/components'
  '//img11.360buyimg.com/imagetools/jfs/t1/141506/22/31698/7923/637b6db9E2af80265/10e76e2c31e0e356.png'
  '//img14.360buyimg.com/imagetools/jfs/t1/247708/11/19310/58975/66ecefa4Fe36ade02/370c18c961aceef1.png'
  const {
    moduleType,
    configEmpty,
    previewUri = null,
    uid,
    moduleFlag,
    moduleName,
  } = props.floorData
  const { luxuryFixed = false } = props
  let previewUrl = previewUri
  const newModuleFloorTypeList = [100, 101, 100000, 99999]
  const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
  if ((moduleType == 99999 || moduleType == 101) && !previewUri) {
    previewUrl = luxuryFixed ? luxuryDecorateModulePrevDefaultUrl : decorateModulePrevDefaultUrl
  }
  const loadImageErr = e => {
    e.target.src = decorateModulePrevDefaultUrl
  }
  if (moduleFlag && TRUSTEESHIP_MODULE_FLAG_LIST.indexOf(moduleFlag) !== -1)
    return null
  return isNewFloorState && configEmpty && previewUrl ? (
    <View
      className={emptyModuleStyle['d-empty-module']}
      data-floor-uid={uid}
      data-floor-type={moduleFlag}
      data-floor-modulename={moduleName}
    >
      {}
      {}
      {}
      {}
      {}
      {}
      {}
      <View className={classNames(emptyModuleStyle['d-empty-img'])}>
        <img
          width={luxuryFixed ? 375 : 355}
          className={classNames('J_floorEmptyDataImg')}
          src={previewUrl}
          onError={loadImageErr.bind(this)}
        />
      </View>
    </View>
  ) : (
    <View
      className={classNames(
        emptyModuleStyle['d-empty-module'],
        emptyModuleStyle['d-empty-text-warp'],
      )}
      data-floor-uid={uid}
      data-floor-type={moduleFlag}
      data-floor-modulename={moduleName}
    >
      <Text className={emptyModuleStyle['d-empty-text']}>
        该楼层还未配置数据
      </Text>
    </View>
  )

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 { 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
      }
    }
  })
+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, 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) || 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
      }
    }
  })
+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'
    return FloorContentItem ? (
        <FloorContentItem {...props} dataDefines={dataDefines} />
    ) : isDevMode ? (
        renderDecorateDefaultModule()
    ) : null
+import { View } from '@tarojs/components';
  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;
      }
    }
  });

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

@@ -1 +1 @@
-import React, { useCallback } from 'react'
  const getRenderRealTimeKeyObj = {
    key:  isRealTimeRender ? Date.now() : forceRenderTime
  }
  console.log("远程加载楼层渲染key信息", getRenderRealTimeKeyObj)
      {floorData?.showCommonFloorHead === false ? null : <CommonFloorHead dataDefines={dataDefines} floorData={floorData} {...getRenderRealTimeKeyObj}  />}
          ...getRenderRealTimeKeyObj
  isRealTimeRender: false, 
  forceRenderTime: 1, 
+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,