@conecli/cone-render 0.9.1-shop2.16 → 0.9.1-shop2.19

package/dist/components/decorate/DecorateFloorModule/index.module.scss

@@ -11,7 +11,18 @@
     display: none;
   }
 }
+.d-container-item-cover {
+  &:first-child {
+    z-index: 99;
+    top: 22px;
+    // top: 21px;
+    width: 98.5%;
+    left: 6px;
+	}
 
+ width: 100%;
+ position: absolute;
+}
 .d-container-item{
   &.d-container-item-active {
 		:global {

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 {
    moduleType,
    configEmpty,
    previewUri = null,
    uid,
    moduleFlag,
    moduleName,
  } = props.floorData
  let previewUrl = previewUri
  const newModuleFloorTypeList = [100, 101, 100000, 99999]
  const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
  if ((moduleType == 99999 || moduleType == 101) && !previewUri) {
    previewUrl = 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={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>
  )
+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.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/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
        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
    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[]