@conecli/cone-render 0.10.1-shop-beta.16 → 0.10.1-shop-beta.18

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

@@ -1 +1 @@
-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, 
    useFontV2 = false, 
    useFontV2Bold = false, 
    useFontV2ForMain = false, 
    useFontV2BoldForMain = 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 needSizeStyles = [
    'bigNoPrice',
    'bigSymbol',
    'bigInteger',
    'bigDecimal',
    'priceDesc',
    'smallPrice',
  ];
  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={{ ...style }}
    >
      {isTextPrice || useBackstop ? (
        <Text
          className={classNames(
            styles.childStyle,
            styles.bigStyle,
            styles.bigNoPrice,
            sizeStyles['bigNoPrice'],
            childrenClassName,
            bigNoPriceClassName,
          )}
        >
          {useBackstop ? finalFallbackText : noPriceShowText}
        </Text>
      ) : (
        [
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigSymbol,
              sizeStyles['bigSymbol'],
              hitColorStyle,
              childrenClassName,
              bigSymbolClassName,
              {
                [styles.fontV2]: useFontV2 || useFontV2ForMain,
                [styles.fontV2Bold]: useFontV2Bold || useFontV2BoldForMain,
              },
            )}
            key="bigSymbol"
          >
            ¥
          </Text>,
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigInteger,
              sizeStyles['bigInteger'],
              hitColorStyle,
              !isOnlyShowBigPrice && !isBigPriceHasDecimal && !isPriceDescInFront
                ? styles.rightMargin
                : null,
              childrenClassName,
              bigIntegerClassName,
              {
                [styles.fontV2]: useFontV2 || useFontV2ForMain,
                [styles.fontV2Bold]: useFontV2Bold || useFontV2BoldForMain,
              },
            )}
            key="bigInteger"
          >
            {integerPrice}
          </Text>,
          isBigPriceHasDecimal ? (
            <Text
              className={classNames(
                styles.childStyle,
                styles.bigStyle,
                styles.bigDecimal,
                sizeStyles['bigDecimal'],
                hitColorStyle,
                isPriceDescInFront ? null : styles.rightMargin,
                childrenClassName,
                bigDecimalClassName,
                {
                  [styles.fontV2]: useFontV2 || useFontV2ForMain,
                  [styles.fontV2Bold]: useFontV2Bold || useFontV2BoldForMain,
                },
              )}
              key="bigDecimal"
            >
              .{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"
              >
                {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]: useFontV2,
                      [styles.fontV2Bold]: useFontV2Bold,
                    },
                  )}
                  key="smallPrice"
                >
                  ¥{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"
                >
                  {priceText === '' ? '_' : 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, 
    useFontV2 = false, 
    useFontV2Bold = false, 
    useFontV2ForMain = false, 
    useFontV2BoldForMain = 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 needSizeStyles = [
    'bigNoPrice',
    'bigSymbol',
    'bigInteger',
    'bigDecimal',
    'priceDesc',
    'smallPrice',
  ];
  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={{ ...style }}
    >
      {isTextPrice || useBackstop ? (
        <Text
          className={classNames(
            styles.childStyle,
            styles.bigStyle,
            styles.bigNoPrice,
            sizeStyles['bigNoPrice'],
            childrenClassName,
            bigNoPriceClassName,
          )}
        >
          {useBackstop ? finalFallbackText : noPriceShowText}
        </Text>
      ) : (
        [
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigSymbol,
              sizeStyles['bigSymbol'],
              hitColorStyle,
              childrenClassName,
              bigSymbolClassName,
              {
                [styles.fontV2]: useFontV2 || useFontV2ForMain,
                [styles.fontV2Bold]: useFontV2Bold || useFontV2BoldForMain,
              },
            )}
            key="bigSymbol"
          >
            ¥
          </Text>,
          <Text
            className={classNames(
              styles.childStyle,
              styles.bigStyle,
              styles.bigInteger,
              sizeStyles['bigInteger'],
              hitColorStyle,
              !isOnlyShowBigPrice && !isBigPriceHasDecimal && !isPriceDescInFront
                ? styles.rightMargin
                : null,
              childrenClassName,
              bigIntegerClassName,
              {
                [styles.fontV2]: useFontV2 || useFontV2ForMain,
                [styles.fontV2Bold]: useFontV2Bold || useFontV2BoldForMain,
              },
            )}
            key="bigInteger"
          >
            {integerPrice}
          </Text>,
          isBigPriceHasDecimal ? (
            <Text
              className={classNames(
                styles.childStyle,
                styles.bigStyle,
                styles.bigDecimal,
                sizeStyles['bigDecimal'],
                hitColorStyle,
                isPriceDescInFront ? null : styles.rightMargin,
                childrenClassName,
                bigDecimalClassName,
                {
                  [styles.fontV2]: useFontV2 || useFontV2ForMain,
                  [styles.fontV2Bold]: useFontV2Bold || useFontV2BoldForMain,
                },
              )}
              key="bigDecimal"
            >
              {'.' + 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"
              >
                {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]: useFontV2,
                      [styles.fontV2Bold]: useFontV2Bold,
                    },
                  )}
                  key="smallPrice"
                >
                  {'¥' + 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"
                >
                  {priceText === '' ? '_' : priceText}
                </Text>
              )}
            </View>,
          ],
        ]
      )}
    </View>
  );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conecli/cone-render",
-  "version": "0.10.1-shop-beta.16",
+  "version": "0.10.1-shop-beta.18",
   "private": false,
   "files": [
     "dist/"
@@ -102,8 +102,10 @@
     "@tarojs/plugin-framework-react": "4.1.2",
     "@tarojs/react": "4.1.2",
     "@tarojs/service": "4.1.2",
-    "@jdtaro/ui": "^3.0.17",
-    "@jdtaro/ui-themes": "^3.0.17",
+    "@jdtaro/ui": "4.0.2-beta.6",
+    "@jdtaro/ui-themes": "4.0.2-beta.6",
+    "@jdtaro/inject-jd-platform-styles": "4.0.2-beta.6",
+    "@jdtaro/inject-ui-styles": "4.0.2-beta.6",
     "@jdtaro/dynamic-types": "^0.0.1",
     "react-dom": "^18.2.0",
     "react": "^18.2.0",