@conecli/cone-render 0.10.1-beta.5 → 0.10.1-beta.7

package/dist/components/base/Price/Base/index.tsx

@@ -1 +1 @@
-import React from 'react'
  priceLabelText: "到手价" 
+import React from 'react'
    if(/^\d+(\.\d+)?[eE][+-]?\d+$/.test(value)){
      sgmCustomReport({
        code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_basePrice`),
        msg: {
          price: value,
          originalPrice: initValue,
          msg: "当前价格为科学计数数据，上报关注该价格"
        },
      })
    }
    if(value === "NaN"){
      sgmCustomReport({
        code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_basePrice`),
        msg: {
          price: value,
          originalPrice: initValue,
          msg: "价格转换异常，兜底展示暂无报价"
        },
      })
      value = "暂无报价"
    }
  priceLabelText: "到手价" 

package/dist/components/base/Price/Double/index.module.scss

@@ -93,6 +93,14 @@
 .priceDesc {
   margin-left: 4px;
   font-family: PingFang SC;
+  &.priceHiddenDesc {
+    width: 0;
+    visibility: hidden;
+  }
+  &.priceEnDesc {
+    width: 0;
+    visibility: hidden;
+  }
 }
 .priceDescXL {
   font-size: 28px;

package/dist/components/base/Price/Double/index.tsx

@@ -1 +1 @@
-import React from 'react';
    const result = String(strPrice).match(/(-?\d+)\.?(\d+)?/);
    if(result && Number(result[0]) > 0){
        return {
            integerPrice: result[1],
            decimalPrice: (result[2] || '').replace(/0+$/, '')  
        }
    }else{
        return null;
    }
    const {
        jdPrice,    
        finalPrice, 
        priceText = '',   
        priceType, 
        hitUserIdentity = false,    
        isAuctionWare,  
        fallbackRender = null, 
        className = null,   
        style = {}, 
        childrenClassName = null,   
        bigNoPriceClassName = null, 
        bigSymbolClassName = null, 
        bigIntegerClassName = null, 
        bigDecimalClassName = null, 
        priceDescClassName = null, 
        smallPriceClassName = null, 
        lineNumber = 1,  
        size = 'M',  
        isDefaultRemoveSmallPrice = false 
    } = props
    const especialHitStyleType = {
        7: 'plusStyle',
        9: 'samStyle'
    }
    const especialMissStyleType = {
        7: 'plusStyle',
        8: 'fansStyle',
        9: 'samStyle',
        10: 'studentStyle',
        12: 'yhdStyle',
        13: 'memberStyle'
    }
    const isNoPrice = priceType === 4 
    const isUseFinalPriceAsBigPrice = [1, 2, 6, 14, 16, 17, 18].includes(priceType)    
    const isEquivalentHit = isUseFinalPriceAsBigPrice || hitUserIdentity    
    const bigPriceObj = getDeconstructPrice(isEquivalentHit? finalPrice: jdPrice)
    if(isAuctionWare || (!isNoPrice && bigPriceObj === null)){
        return fallbackRender
    }
    const {integerPrice, decimalPrice = ''} = bigPriceObj || {}
    const isOnlyShowBigPrice = priceType === 3   
    const isHideSmallPrice = priceType === 14 || isDefaultRemoveSmallPrice 
    const smallPrice = isEquivalentHit? jdPrice: finalPrice 
    const isPriceDescInFront = isEquivalentHit  
    const hitColorStyle = isEquivalentHit? styles[especialHitStyleType[priceType]]: null    
    const missColorStyle = isEquivalentHit? null: styles[especialMissStyleType[priceType]]    
    const isBigPriceHasDecimal = decimalPrice !== '' && !/^0+$/.test(decimalPrice)    
    const sizeLineHeight = {
        'XS': 28,
        'S': 34,
        'M': 40,
        'L': 46,
        'XL': 52
    }
    const lineHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25)
    const wrapHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25 * lineNumber)
    const computedHeightStyle = {
        height: wrapHeight
    }
    const itemCommonStyle = {
        height: lineHeight
    }
    const needSizeStyles = ['bigNoPrice', 'bigSymbol', 'bigInteger', 'bigDecimal', 'priceDesc', 'smallPrice']
    const sizeStyles = needSizeStyles.reduce((acc, cur) => {
        acc[cur] = styles[cur + size]
        return acc
    }, {})
    const noPriceShowText = priceText || (/^[\u4e00-\u9fa5]+$/.test(jdPrice)? jdPrice: '')  
    return (
        <View className={classNames(styles.wrap, className)} style={{...computedHeightStyle, ...style}}>
            {isNoPrice?
                <Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigNoPrice, sizeStyles['bigNoPrice'], childrenClassName, bigNoPriceClassName)} style={{...itemCommonStyle}}>{noPriceShowText}</Text>
                :
                [
                    <Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigSymbol, sizeStyles['bigSymbol'], hitColorStyle, childrenClassName, bigSymbolClassName)} key="bigSymbol" style={{...itemCommonStyle}}>¥</Text>,
                    <Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigInteger, sizeStyles['bigInteger'], hitColorStyle, !isOnlyShowBigPrice && !isBigPriceHasDecimal && !isPriceDescInFront ? styles.rightMargin : null, childrenClassName, bigIntegerClassName)} key="bigInteger" style={{...itemCommonStyle}}>{integerPrice}</Text>,
                    isBigPriceHasDecimal?
                        <Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigDecimal, sizeStyles['bigDecimal'], hitColorStyle, isPriceDescInFront ? null : styles.rightMargin, childrenClassName, bigDecimalClassName)} key="bigDecimal" style={{...itemCommonStyle}}>.{decimalPrice}</Text>
                        :
                        null
                    ,
                    !isOnlyShowBigPrice && [
                        isPriceDescInFront && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.bigStyle, hitColorStyle, isPriceDescInFront ? styles.rightMargin : null, childrenClassName, priceDescClassName)} key="descFront" style={{...itemCommonStyle}}>{priceText}</Text>,
                        <view style={{
                            display: 'inline-flex'
                        }}>
                            {smallPrice && !isHideSmallPrice ? <Text className={classNames(styles.childStyle, styles.smallPrice, sizeStyles['smallPrice'], styles.smallStyle, missColorStyle, childrenClassName, smallPriceClassName)} key="smallPrice" style={{...itemCommonStyle}}>¥{smallPrice}</Text> : null}
                            {!isPriceDescInFront && !isHideSmallPrice && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.smallStyle, styles.missPriceDesc, missColorStyle, childrenClassName, priceDescClassName)} key="descBack" style={{...itemCommonStyle}}>{priceText}</Text>}
                        </view>
                    ]
                ]
            }
        </View>
    )
+import React from 'react';
  console.warn('🚗 ~~ file: index.tsx:22 ~~ reportException() ~~ {type, detail, text}:', {
    type,
    data,
    text,
  });
  sgmCustomReport({
    code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_${type}`),
    msg: {
      type,
      data,
      text: '[双价格组件]' + text,
    },
  });
  return rest.some((item) => item === undefined || item === '');
  const numPrice = Number(strPrice);
  if (isNaN(numPrice)) {
    reportException({
      type: 'isNotNumericType',
      data: props,
      text: `传入价格字段值“${strPrice}”转换数字报错`,
    });
    return false;
  }
  else if (numPrice <= 0) {
    reportException({
      type: 'isNotPositiveNumber',
      data: props,
      text: `传入价格字段值“${strPrice}”不是一个正数`,
    });
    return false;
  }
  const result = numPrice.toString().match(/(\d+)(\.(\d+))?/);
  if (result && result[3]?.length > 2) {
    reportException({
      type: 'decimalPlaceTooLong',
      data: props,
      text: `传入价格字段值“${strPrice}”小数位不能超过2位`,
    });
    return false;
  }
  if (/^\d+(\.\d+)?[eE][+-]?\d+$/.test(strPrice)) {
    reportException({
      type: 'findScientificNotation',
      data: props,
      text: `传入价格字段值“${strPrice}”是一个科学计数法格式`,
    });
  }
  return true;
  const { jdPrice, finalPrice } = props;
  if (jdPrice && finalPrice && Number(jdPrice) <= Number(finalPrice)) {
    reportException({
      type: 'pricesCompareException',
      data: props,
      text: `身份/到手价必须小于松果价`,
    });
    return false;
  } else {
    return true;
  }
  const numPrice = Number(strPrice);
  const result = numPrice.toString().match(/(\d+)(\.(\d+))?/);
  if (result) {
    return {
      integerPrice: result[1],
      decimalPrice: (result[3] || '').replace(/0+$/, ''), 
    };
  } else {
    reportException({
      type: 'deconstructException',
      data: props,
      text: `解构传入价格字段值“${strPrice}”解构发生异常`,
    });
    return null;
  }
  const {
    jdPrice, 
    finalPrice, 
    priceText = '', 
    priceType, 
    hitUserIdentity = false, 
    fallbackRender = null, 
    className = null, 
    style = {}, 
    childrenClassName = null, 
    bigNoPriceClassName = null, 
    bigSymbolClassName = null, 
    bigIntegerClassName = null, 
    bigDecimalClassName = null, 
    priceDescClassName = null, 
    smallPriceClassName = null, 
    lineNumber = 1, 
    size = 'M', 
    isDefaultRemoveSmallPrice = false, 
  } = props;
  let useBackstop = false; 
  if (isNull(props.jdPrice, props.priceType)) {
    useBackstop = true;
    reportException({
      type: 'paramMiss',
      data: props,
      text: '缺少必要入参：jdPrice、priceType',
    });
  } else if (
    !allowedNoHitUserIdentityTypes.includes(props.priceType) &&
    props.hitUserIdentity === undefined
  ) {
    useBackstop = true;
    reportException({
      type: 'paramMiss',
      data: props,
      text: `价格类型${props.priceType}缺少必要入参：hitUserIdentity`,
    });
  }
  const especialHitStyleType = {
    7: 'plusStyle',
    9: 'samStyle',
  };
  const especialMissStyleType = {
    7: 'plusStyle',
    8: 'fansStyle',
    9: 'samStyle',
    10: 'studentStyle',
    12: 'yhdStyle',
    13: 'memberStyle',
  };
  const isUseFinalPriceAsBigPrice = allowedNoHitUserIdentityTypes.includes(priceType); 
  const isEquivalentHit = isUseFinalPriceAsBigPrice || hitUserIdentity; 
  const isOnlyShowBigPrice = priceType === 3 || isNull(finalPrice); 
  const smallPrice = isEquivalentHit ? jdPrice : finalPrice; 
  const isHideSmallPrice =
    priceType === 14 || isDefaultRemoveSmallPrice || isNaN(Number(smallPrice)); 
  const isTextPrice = priceType === 4; 
  if (!isTextPrice && !useBackstop) {
    if (finalPrice && !numericPriceValidate(finalPrice, props)) {
      useBackstop = true;
    } else if (!numericPriceValidate(jdPrice, props)) {
      useBackstop = true;
    }
    if (!useBackstop && !isOnlyShowBigPrice && !isHideSmallPrice && !pricesCompareValidate(props)) {
      useBackstop = true;
    }
  }
  const bigPriceObj =
    isTextPrice || useBackstop
      ? {}
      : getDeconstructPrice(isEquivalentHit && !isNull(finalPrice) ? finalPrice : jdPrice, props);
  const { integerPrice = '', decimalPrice = '' } = bigPriceObj || {};
  const isPriceDescInFront = isEquivalentHit; 
  const hitColorStyle = isEquivalentHit ? styles[especialHitStyleType[priceType]] : null; 
  const missColorStyle = isEquivalentHit ? null : styles[especialMissStyleType[priceType]]; 
  const isBigPriceHasDecimal = decimalPrice !== '' && !/^0+$/.test(decimalPrice); 
  const sizeLineHeight = {
    XS: 28,
    S: 34,
    M: 40,
    L: 46,
    XL: 52,
  };
  const lineHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25);
  const wrapHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25 * lineNumber);
  const computedHeightStyle = {
    height: wrapHeight,
  };
  const itemCommonStyle = {
    height: lineHeight,
  };
  const needSizeStyles = [
    'bigNoPrice',
    'bigSymbol',
    'bigInteger',
    'bigDecimal',
    'priceDesc',
    'smallPrice',
  ];
  const sizeStyles = needSizeStyles.reduce((acc, cur) => {
    acc[cur] = styles[cur + size];
    return acc;
  }, {});
  const finalFallbackText = !isLanguageForEn ? '暂无报价' : 'Unpriced'; 
  const noPriceShowText =
    priceText || (/^[\u4e00-\u9fa5]+$/.test(jdPrice) ? jdPrice : finalFallbackText); 
  if (useBackstop && fallbackRender) {
    return fallbackRender;
  }
  return (
    <View
      className={classNames(styles.wrap, className)}
      style={{ ...computedHeightStyle, ...style }}
    >
      {isTextPrice || useBackstop ? (
        <Text
          className={classNames(
            styles.childStyle,
            styles.bigStyle,
            styles.bigNoPrice,
            sizeStyles['bigNoPrice'],
            childrenClassName,
            bigNoPriceClassName,
          )}
          style={{ ...itemCommonStyle }}
        >
          {useBackstop ? finalFallbackText : noPriceShowText}
        </Text>
      ) : (
        [
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigSymbol,
              sizeStyles['bigSymbol'],
              hitColorStyle,
              childrenClassName,
              bigSymbolClassName,
            )}
            key="bigSymbol"
            style={{ ...itemCommonStyle }}
          >
            ¥
          </Text>,
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigInteger,
              sizeStyles['bigInteger'],
              hitColorStyle,
              !isOnlyShowBigPrice && !isBigPriceHasDecimal && !isPriceDescInFront
                ? styles.rightMargin
                : null,
              childrenClassName,
              bigIntegerClassName,
            )}
            key="bigInteger"
            style={{ ...itemCommonStyle }}
          >
            {integerPrice}
          </Text>,
          isBigPriceHasDecimal ? (
            <Text
              className={classNames(
                styles.childStyle,
                styles.bigStyle,
                styles.bigDecimal,
                sizeStyles['bigDecimal'],
                hitColorStyle,
                isPriceDescInFront ? null : styles.rightMargin,
                childrenClassName,
                bigDecimalClassName,
              )}
              key="bigDecimal"
              style={{ ...itemCommonStyle }}
            >
              .{decimalPrice}
            </Text>
          ) : null,
          !isOnlyShowBigPrice && [
            isPriceDescInFront && (
              <Text
                className={classNames(
                  styles.childStyle,
                  styles.priceDesc,
                  {
                    [styles['priceEnDesc']]: isLanguageForEn,
                  },
                  {
                    [styles['priceHiddenDesc']]: priceText === '', 
                  },
                  sizeStyles['priceDesc'],
                  styles.bigStyle,
                  hitColorStyle,
                  isPriceDescInFront ? styles.rightMargin : null,
                  childrenClassName,
                  priceDescClassName,
                )}
                key="descFront"
                style={{ ...itemCommonStyle }}
              >
                {priceText === '' ? '_' : priceText}
              </Text>
            ),
            <View
              style={{
                display: 'inline-flex',
              }}
            >
              {smallPrice && !isHideSmallPrice ? (
                <Text
                  className={classNames(
                    styles.childStyle,
                    styles.smallPrice,
                    sizeStyles['smallPrice'],
                    styles.smallStyle,
                    missColorStyle,
                    childrenClassName,
                    smallPriceClassName,
                  )}
                  key="smallPrice"
                  style={{ ...itemCommonStyle }}
                >
                  ¥{Number(smallPrice)}
                </Text>
              ) : null}
              {!isPriceDescInFront && !isHideSmallPrice && (
                <Text
                  className={classNames(
                    styles.childStyle,
                    styles.priceDesc,
                    {
                      [styles['priceEnDesc']]: isLanguageForEn,
                    },
                    {
                      [styles['priceHiddenDesc']]: priceText === '', 
                    },
                    sizeStyles['priceDesc'],
                    styles.smallStyle,
                    styles.missPriceDesc,
                    missColorStyle,
                    childrenClassName,
                    priceDescClassName,
                  )}
                  key="descBack"
                  style={{ ...itemCommonStyle }}
                >
                  {priceText === '' ? '_' : priceText}
                </Text>
              )}
            </View>,
          ],
        ]
      )}
    </View>
  );

package/dist/components/floorItem.tsx

@@ -1 +1 @@
-import React from 'react'
  const {
    floorData,
    renderSourceType = BUSINESS_TYPE.ONLINE, 
    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
  }
  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 = BUSINESS_TYPE.ONLINE, 
    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
  }
  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
      }
    }
  })