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

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'  
    } = 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   
    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>,
                        smallPrice && !isHideSmallPrice ? <Text className={classNames(styles.childStyle, styles.smallPrice, sizeStyles['smallPrice'], styles.smallStyle, missColorStyle, childrenClassName, smallPriceClassName)} key="smallPrice" style={{...itemCommonStyle}}>¥{smallPrice}</Text> : null,
                        !isPriceDescInFront && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.smallStyle, styles.missPriceDesc, missColorStyle, childrenClassName, priceDescClassName)} key="descBack" style={{...itemCommonStyle}}>{priceText}</Text>
                    ]
                ]
            }
        </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, forceShowFinalPrice } = props;
  if (jdPrice && finalPrice) {
    const getLastPassValidateState = forceShowFinalPrice || Number(finalPrice) < Number(jdPrice);
    !getLastPassValidateState &&
      reportException({
        type: 'pricesCompareException',
        data: props,
        text: `身份/到手价必须小于松果价`,
      });
    return getLastPassValidateState;
  } 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 = '', 
    priceTextColor = '', 
    priceUnit = '', 
    priceType, 
    hitUserIdentity = false, 
    forceShowFinalPrice = false, 
    hideSmallPrice = false, 
    fallbackRender = null, 
    className = null, 
    style = {}, 
    childrenClassName = null, 
    bigNoPriceClassName = null, 
    bigSymbolClassName = null, 
    bigIntegerClassName = null, 
    bigDecimalClassName = null, 
    priceDescClassName = null, 
    smallPriceClassName = null, 
    smallPriceDescClassName = null, 
    lineNumber = 1, 
    size = 'M', 
    isDefaultRemoveSmallPrice = false, 
    useFontV2 = false, 
    useFontV2Bold = false, 
    useSmallFontV2 = false, 
    useSmallFontV2Bold = false, 
  } = props;
  let useBackstop = false; 
  const isShowPriceUnit = priceUnit && priceUnit !== '';
  if (isNull(props.priceType)) {
    useBackstop = true;
    reportException({
      type: 'paramMiss',
      data: props,
      text: '缺少必要入参：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 =
    hideSmallPrice || priceType === 14 || isDefaultRemoveSmallPrice || isNaN(Number(smallPrice)); 
  const isTextPrice = priceType === 4; 
  if (!isTextPrice && !useBackstop) {
    if (finalPrice && !numericPriceValidate(finalPrice, props)) {
      useBackstop = true;
    } else if (jdPrice && !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 priceTextStyle = priceTextColor ? { color: priceTextColor } : {};
  const needSizeStyles = [
    'bigNoPrice',
    'bigSymbol',
    'bigInteger',
    'bigDecimal',
    'priceDesc',
    'smallPrice',
    'priceUnit',
  ];
  const sizeStyles = needSizeStyles.reduce((acc, cur) => {
    acc[cur] = styles[cur + size];
    return acc;
  }, {});
  const finalFallbackText = global?.languageJsonData?.noPriceTip || '暂无报价';
  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,
              {
                [styles.fontV2]: useFontV2,
                [styles.fontV2Bold]: useFontV2Bold,
              },
            )}
            key="bigSymbol"
            style={{ ...itemCommonStyle }}
          >
            ¥
          </Text>,
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigInteger,
              sizeStyles['bigInteger'],
              hitColorStyle,
              !isOnlyShowBigPrice &&
                !isBigPriceHasDecimal &&
                !isPriceDescInFront &&
                !isShowPriceUnit
                ? styles.rightMargin
                : null,
              childrenClassName,
              bigIntegerClassName,
              {
                [styles.fontV2]: useFontV2,
                [styles.fontV2Bold]: useFontV2Bold,
              },
            )}
            key="bigInteger"
            style={{ ...itemCommonStyle }}
          >
            {integerPrice}
          </Text>,
          isBigPriceHasDecimal ? (
            <Text
              className={classNames(
                styles.childStyle,
                styles.bigStyle,
                styles.bigDecimal,
                sizeStyles['bigDecimal'],
                hitColorStyle,
                isPriceDescInFront || priceText === '' || isShowPriceUnit
                  ? null
                  : styles.rightMargin,
                childrenClassName,
                bigDecimalClassName,
                {
                  [styles.fontV2]: useFontV2,
                  [styles.fontV2Bold]: useFontV2Bold,
                },
              )}
              key="bigDecimal"
              style={{ ...itemCommonStyle }}
            >
              .{decimalPrice}
            </Text>
          ) : null,
          isShowPriceUnit ? (
            <Text
              className={classNames(
                styles.childStyle,
                styles.priceUnit,
                styles.rightMargin,
                sizeStyles['priceUnit'],
                styles.bigStyle,
                hitColorStyle,
                childrenClassName,
                priceDescClassName,
              )}
              key="descFrontUnit"
              style={{ ...itemCommonStyle }}
            >
              {priceUnit}
            </Text>
          ) : null,
          !isOnlyShowBigPrice && [
            isPriceDescInFront && (
              <Text
                className={classNames(
                  styles.childStyle,
                  styles.priceDesc,
                  {
                    [styles['priceEnDesc']]: isLanguageForEn,
                  },
                  {
                    [styles['priceHiddenDesc']]: priceText === '', 
                  },
                  sizeStyles['priceDesc'],
                  styles.bigStyle,
                  hitColorStyle,
                  isPriceDescInFront && !isShowPriceUnit && !isHideSmallPrice
                    ? styles.rightMargin
                    : null,
                  childrenClassName,
                  priceDescClassName,
                )}
                key="descFront"
                style={{ ...itemCommonStyle, ...priceTextStyle }}
              >
                {priceText === '' ? '_' : priceText}
              </Text>
            ),
            <View
              style={{
                display: 'inline-flex',
              }}
            >
              {smallPrice && !isHideSmallPrice ? (
                <Text
                  className={classNames(
                    styles.childStyle,
                    styles.smallPrice,
                    sizeStyles['smallPrice'],
                    styles.smallStyle,
                    missColorStyle,
                    childrenClassName,
                    smallPriceClassName,
                    {
                      [styles.fontV2]: useSmallFontV2Bold ? false : useSmallFontV2 || useFontV2,
                      [styles.fontV2Bold]: useSmallFontV2
                        ? false
                        : useSmallFontV2Bold || useFontV2Bold,
                    },
                  )}
                  key="smallPrice"
                  style={{ ...itemCommonStyle }}
                >
                  ¥{Number(smallPrice)}
                </Text>
              ) : null}
              {isShowPriceUnit && !isHideSmallPrice ? (
                <Text
                  className={classNames(
                    styles.childStyle,
                    styles.priceUnit,
                    sizeStyles['priceUnit'],
                    styles.smallStyle,
                    styles.missPriceDesc,
                    missColorStyle,
                    childrenClassName,
                    smallPriceDescClassName || priceDescClassName,
                  )}
                  key="descFrontUnit"
                  style={{ ...itemCommonStyle }}
                >
                  {priceUnit}
                </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,
                    smallPriceDescClassName || priceDescClassName,
                  )}
                  key="descBack"
                  style={{ ...itemCommonStyle }}
                >
                  {priceText === '' ? '_' : priceText}
                </Text>
              )}
            </View>,
          ],
        ]
      )}
    </View>
  );

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

@@ -1 +1 @@
-import React from 'react'
        <BasePrice {...props}/>
        :
        <DoublePrice {...props} />
+import React from 'react'
  if (props.priceType === undefined) {
    if (props.value === undefined) {
      if (props.jdPrice === undefined) {
        return null
      } else {
        return <BasePrice {...props} value={props.jdPrice} />
      }
    } else {
      return <BasePrice {...props} />
    }
  } else {
    return <DoublePrice {...props} />
  }

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

@@ -0,0 +1,35 @@
+
+// 默认标签高度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: 16PX;
+  
+  &.d-shop-sku-tag-list{
+    margin: -2PX 8px 0 0;
+    display: inline-flex;
+    //height: 14PX;
+    //line-height: 14PX;
+    vertical-align: middle;
+  }
+  
+  .d-tag-item{
+    margin-right: 8px;
+    &:last-child{
+      margin-right: 0;
+    }
+    .d-tag-item-canvas{
+      display: inline-flex;
+      height: 100%;
+    }
+  }
+}

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

@@ -0,0 +1 @@
+import React, { useMemo } from 'react';
  const getThisLeGaoTagKey = `${tagId}-${tagText}}`;
  const getLeGaoTagCacheNode = shopLeGaoTagNodeMap.get(getThisLeGaoTagKey) || false;
  return getLeGaoTagCacheNode
    ? getLeGaoTagCacheNode
    : useMemo(() => {
        const createCanVasTag = (
          <canvas-tag
            className={classNames(shopTagStyle['d-tag-item-canvas'])}
            tagId={tagId}
            text={tagText}
            appVersion={getJdAppVersionStr}
            lang={languageNowType}
          />
        );
        shopLeGaoTagNodeMap.set(getThisLeGaoTagKey, createCanVasTag);
        return createCanVasTag;
      }, [tagId, tagText]);
  const {
    tagInfoList = [],
    className,
    itemClassName,
    isSkuBaseTag = false,
    itemClickCallback,
  } = props;
  const getTagInfoList = Array.isArray(tagInfoList) ? tagInfoList : [];
  const getTagInfoListNum = getTagInfoList.length;
  const isCallBackFn = typeof itemClickCallback === 'function';
  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 { tagId, tabIconId, tagText, type, tabIconType, tabText } = item;
        const getTagId = tagId || tabIconId;
        const getTagType = type || tabIconType;
        const getTagText = tagText || tabText;
        return getTagId ? (
          <View
            key={getTagId + getTagType + index}
            className={classNames(shopTagStyle['d-tag-item'], itemClassName)}
            onClick={isCallBackFn && itemClickCallback.bind(this, item, index)}
          >
            <LeGaoTagComponent tagId={getTagId} tagText={getTagText} />
          </View>
        ) : null;
      })}
    </View>
  ) : null;

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;