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

package/dist/components/base/ShopLeGaoTag/index.module.scss

@@ -0,0 +1,33 @@
+
+// 默认标签高度14 部分特殊的16，因此设置最大高度16
+
+.d-shop-tag-list {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-content: flex-start;
+  align-items: center;
+  align-self: flex-start;
+  overflow: hidden;
+  font-size: 0;
+  line-height: 10px; // 解决换行后上下无间隙导致看到线条的问题
+  max-height: 32px;
+  
+  &.d-shop-sku-tag-list{
+    margin: -6px 8px 0 0;
+    display: inline-flex;
+    height: 28px;
+    line-height: 28px;
+    vertical-align: middle;
+  }
+  .d-tag-item{
+    display: inline-flex;
+    margin-right: 8px;
+    width: auto;
+    height: 28px;
+    &:last-child{
+      margin-right: 0;
+    }
+  }
+}

package/dist/components/base/ShopLeGaoTag/index.tsx

@@ -0,0 +1 @@
+import React from 'react';
  "tab_054": "https://m.360buyimg.com/cc/jfs/t1/88382/20/39502/894/64d36235Fc720ec9d/908e4378fec75555.png",
  "tab_054_home": "https://m.360buyimg.com/cc/jfs/t1/88382/20/39502/894/64d36235Fc720ec9d/908e4378fec75555.png",
  "tab_665": "https://m.360buyimg.com/cc/jfs/t1/252765/17/9937/2555/677c9155F246ead31/55243d94eb9ca8db.png",
  "tab_6209_dp": "https://m.360buyimg.com/cc/jfs/t1/252765/17/9937/2555/677c9155F246ead31/55243d94eb9ca8db.png",
  const { tagInfoList = [], className, itemClassName, isSkuBaseTag = false } = props;
  const getTagInfoList = Array.isArray(tagInfoList) ? tagInfoList : [];
  const getTagInfoListNum = getTagInfoList.length;
  return getTagInfoListNum > 0 ? (
    <View className={classNames(shopTagStyle['d-shop-tag-list'],{
      [shopTagStyle['d-shop-sku-tag-list']]: isSkuBaseTag
    }, className)}>
      {}
      <View style={{ width: '1px', height: '100%' }} />
      {getTagInfoList.map((item, index) => {
        const {  tabIconId,tagId, tabImageUrl,type, tabIconType} = item;
        const getTagId = tagId || tabIconId;
        const getTagType = type || tabIconType;
        const getUrl =
          typeof tabImageUrl === 'string' ? tabImageUrl : shopTagIconDefaultUrl[getTagId];
        return getUrl && getUrl !== "" ? (
          <Image
            key={index + getTagId + getTagType}
            className={classNames(shopTagStyle['d-tag-item'], itemClassName)}
            mode="heightFix"
            src={getUrl}
          />
        ) : null;
      })}
    </View>
  ) : null;

package/dist/components/base/Skeleton/index.tsx

@@ -1 +1 @@
-import React from 'react'
    <View className={blockStyle['skeleton-header']}>
        <Image
          className={blockStyle['skeleton-header-img']}
          src={ShopHeaderSvgUrl}
          mode='widthFix'
        />
    </View>
    <View className={blockStyle['skeleton-new-product']}>
        <ContentLoader viewBox='0 0 375 280' {...props}>
            <rect x='10' y='38' rx='5' ry='5' width='355' height='55' />
            <rect x='12' y='112' rx='3' ry='3' width='111' height='95' />
            <rect x='12' y='11' rx='3' ry='3' width='100' height='10' />
            <rect x='254' y='112' rx='3' ry='3' width='111' height='95' />
            <rect x='14' y='218' rx='0' ry='0' width='111' height='27' />
            <rect x='261' y='217' rx='0' ry='0' width='111' height='27' />
            <rect x='134' y='112' rx='3' ry='3' width='111' height='95' />
            <rect x='133' y='218' rx='0' ry='0' width='111' height='27' />
            <rect x='20' y='255' rx='0' ry='0' width='100' height='9' />
            <rect x='140' y='255' rx='0' ry='0' width='100' height='9' />
            <rect x='263' y='255' rx='0' ry='0' width='100' height='9' />
        </ContentLoader>
    </View>
+import React from 'react'
  <View className={blockStyle['skeleton-header']}>
    <Image
      className={blockStyle['skeleton-header-img']}
      src={ShopHeaderSvgUrl}
      mode="widthFix"
    />
  </View>

package/dist/components/debug/DebugLayout/index.module.scss

@@ -0,0 +1,67 @@
+
+.debug-layout-warp {
+  position: absolute;
+  border-radius: 12PX;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 50;
+
+	.debug-layout {
+		position: absolute;
+		border-radius: 12PX;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		border: 1PX solid #f50707;
+		background-color: rgba(219, 38, 38, 0.2);
+
+		&[data-module-type='JOINT'] {
+			border: 1PX solid #f507c9;
+			background-color: rgba(219, 38, 150, 0.2);
+		}
+
+		&.green {
+			border: 1PX solid #04a607;
+			background-color: rgba(38, 219, 71, 0.2);
+		}
+
+		.cd-version-list {
+			pointer-events: none;
+			position: absolute;
+			font-size: 0;
+			top: 0;
+			left: 0;
+			right: 0;
+			background-color: transparent;
+			text-align: center;
+			overflow: hidden;
+		}
+		
+		.cd-version-item {
+			display: inline-block;
+			background-color: #00c853;
+			font-size: 30px;
+			color: white;
+			padding: 1PX 3PX;
+			border-radius: 4PX;
+			margin: 0 5PX;
+			&[data-version='3.5.4'] {
+				background-color: #999;
+			}
+		}
+	}
+
+	.d-info {
+		position: relative;
+		cursor: pointer;
+		z-index: 3;
+		margin: 3PX 3PX;
+		width: 22PX;
+		height: 22PX;
+		background: url('../../../assets/icon_blue_info.svg') center center / 22PX 22PX no-repeat;
+	}
+}

package/dist/components/debug/DebugLayout/index.tsx

@@ -0,0 +1 @@
+import React from 'react'
  const { debug } = global.info.queryInfo
  const { floorData, index } = props
  if (debug != '1' || !floorData) {
    return null
  }
  const renderRemoteLayout = () => {
    const isRemote = isRemoteFloor(floorData)
    if (isRemote) {
      const moduleType = getModuleType(floorData)
      const packResult = floorData?.floorExtInfo?.modularPackResult
      const packResultObj = JSONParse(packResult)
      const taroVersionList = getTaroVersionList(packResultObj)
      const layoutClass = classNames(style['debug-layout'], {
        [style['green']]: taroVersionList.length >= 2,
      })
      return (
        <View data-module-type={moduleType} className={layoutClass}>
          <View className={style['cd-version-list']}>
            {taroVersionList.map(item => {
              return (
                <Text className={style['cd-version-item']} data-version={item}>
                  v{item}
                </Text>
              )
            })}
          </View>
        </View>
      )
    } else {
      return null
    }
  }
  return (
    <View className={style['debug-layout-warp']}>
      <View
        className={style['d-info']}
        onClick={() => {
          Messager && Messager.trigger('openDebugLayout', { floorData, index })
        }}
      />
      {renderRemoteLayout()}
    </View>
  )

package/dist/components/debug/DebugLayout/utils.ts

@@ -0,0 +1 @@
+import { RemoteLoadFloorList, FloorModuleType } from '../../../common/const'
  if (!packResultObj) {
    return []
  }
  const result: string[] = []
  if (packResultObj.bundleUrl) {
    result.push(packResultObj.taroVersion || '3.5.4')
  }
  if (packResultObj.bundleUrlV2) {
    result.push(packResultObj.taroVersionV2)
  }
  return result
  if (!floorData) {
    return false
  }
  const moduleFlag = floorData.floorExtInfo?.moduleFlag
  const floorLoadWay = floorData.floorExtInfo?.floorLoadWay
  return RemoteLoadFloorList.includes(moduleFlag) || floorLoadWay === 2
  if (!floorData) {
    return ''
  }
  const moduleFlag = floorData.floorExtInfo?.moduleFlag
  const floorLoadWay = floorData.floorExtInfo?.floorLoadWay
  if (moduleFlag === FloorModuleType.ISVDESIGNERH5MODULE) {
    return 'ISV'
  } else if (
    moduleFlag === FloorModuleType.JOINT_MODULE ||
    floorLoadWay === 2
  ) {
    return 'JOINT'
  } else {
    return 'SYSTEM'
  }

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

@@ -1,12 +1,30 @@
 
-.d-container-item {
+.d-container-item, .d-container-item-trusteeship {
 	position: relative;
 	overflow: hidden;
 	z-index: 3;
 	&:first-child {
 		z-index: 1;
 	}
-	&.d-container-item-active {
+
+  &.d-container-item-hide{
+    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 {
 			.d-decorate-floor-item {
 				.d-floor-selected-border {
@@ -16,3 +34,15 @@
 		}
 	}
 }
+
+.d-container-item-trusteeship{
+  &.d-container-item-active {
+		:global {
+			.d-decorate-floor-item {
+				.d-floor-selected-border {
+					border: 4px solid #4A82F2 !important;
+				}
+			}
+		}
+	}
+}

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

@@ -1 +1 @@
-import { View } from '@tarojs/components'
    selectContainerId,
    placeHolderPreContainerId,
    containerData,
    children,
    style,
    shopTotalInfo,
  } = props;
    return children ? children : null;
  }, [containerData, shopTotalInfo]);
+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'
+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

@@ -0,0 +1 @@
+import React from 'react'
    return FloorContentItem ? (
        <FloorContentItem {...props} dataDefines={dataDefines} />
    ) : isDevMode ? (
        renderDecorateDefaultModule()
    ) : null

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 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'
+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,