@conecli/cone-render 0.10.1-isv2.1 → 0.10.1-isv2.2

package/dist/common/pageType.ts

@@ -1 +1 @@
-export const getPageType = () => {
  return process.env.BUILD_TYPE || ''
  
  M_DECORATE = 'm-decorate', 
  M_RENDER_MODULE = 'm-render-module', 
  M_PREVIEW = 'm-preview', 
  M_ISV_PREVIEW = 'm-isv-preview', 
  MARKETING_PREVIEW = 'marketing-preview', 
  
  APP_VIEW = 'app-view', 
  APP_MEMBER = 'app-member', 
  APP_INTRODUCE = 'app-introduce', 
  APP_PROMOTION = 'app-promotion', 
  APP_CLASSIFY = 'app-classify', 
  APP_PRODUCT = 'app-product', 
  
  
  PC_VIEW = 'pc-view', 
  PC_VIEW1 = 'pc-view1', 
  PC_VIEW2 = 'pc-view2', 
  M_VIEW = 'm-view', 
  M_BSC_VIEW = 'm-bsc-view', 
  SALE_VIEW = 'sale-view', 
  VIP_VIEW = 'vip-view', 
  M_SEARCH = 'm-search', 
  M_INTRODUCE = 'm-introduce', 
  
  MEMBER_SHOPCARD = 'member-shopcard', 
  M_MEMBER = 'm-member', 
  M_MEMBER_SAM_BIND_CARD = 'm-member-sam-bind-card', 
  M_MEMBER_WATSONS_BIND_CARD = 'm-member-watsons-bind-card', 
  M_SAM_CARD = 'm-sam-card', 
  M_SAM_CENTER = 'm-sam-center', 
  M_WATSONS_CARD = 'm-watsons-card', 
  
  M_LOTTERY = 'm-lottery', 
  M_COUPON = 'm-coupon', 
  M_WARES = 'm-wares', 
  M_FAST_SHOPPING = 'm-fast-shopping', 
  M_SPECIAL_SECKILL = 'm-special-seckill', 
  WEAPP_SHOP = 'weapp-shop', 
  WEAPP_PROMOTION = 'weapp-promotion', 
  M_VIDEOS = 'm-videos', 
+export const getPageType = () => {
  return process.env.BUILD_TYPE || ''
  
  M_DECORATE = 'm-decorate', 
  M_RENDER_MODULE = 'm-render-module', 
  M_PREVIEW = 'm-preview', 
  M_ISV_PREVIEW = 'm-isv-preview', 
  MARKETING_PREVIEW = 'marketing-preview', 
  
  APP_VIEW = 'app-view', 
  APP_MEMBER = 'app-member', 
  APP_INTRODUCE = 'app-introduce', 
  APP_PROMOTION = 'app-promotion', 
  APP_CLASSIFY = 'app-classify', 
  APP_PRODUCT = 'app-product', 
  MEMBER_HOME = 'member-home', 
  
  
  PC_VIEW = 'pc-view', 
  PC_VIEW1 = 'pc-view1', 
  PC_VIEW2 = 'pc-view2', 
  M_VIEW = 'm-view', 
  M_BSC_VIEW = 'm-bsc-view', 
  SALE_VIEW = 'sale-view', 
  VIP_VIEW = 'vip-view', 
  M_SEARCH = 'm-search', 
  M_INTRODUCE = 'm-introduce', 
  
  MEMBER_SHOPCARD = 'member-shopcard', 
  M_MEMBER = 'm-member', 
  M_MEMBER_SAM_BIND_CARD = 'm-member-sam-bind-card', 
  M_MEMBER_WATSONS_BIND_CARD = 'm-member-watsons-bind-card', 
  M_SAM_CARD = 'm-sam-card', 
  M_SAM_CENTER = 'm-sam-center', 
  M_WATSONS_CARD = 'm-watsons-card', 
  
  M_LOTTERY = 'm-lottery', 
  M_COUPON = 'm-coupon', 
  M_WARES = 'm-wares', 
  M_FAST_SHOPPING = 'm-fast-shopping', 
  M_SPECIAL_SECKILL = 'm-special-seckill', 
  WEAPP_SHOP = 'weapp-shop', 
  WEAPP_PROMOTION = 'weapp-promotion', 
  M_VIDEOS = 'm-videos', 

package/dist/common/sgmCustomCode.ts

@@ -1 +1 @@
-export const NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG = 'noType_'
  IMAGE_LOAD = 'imageLazyLoadError', 
  REMOTEMODULE_DATA = 'remoteModule_interface_dataError', 
  REMOTEMODULE_JS = 'remoteModule_render_jsError', 
  SYSTEMMODULE_JS = 'systemModule_render_jsError', 
  FLOORLAZYLOAD_DATA = 'floorLazyLoad_render_dataError', 
+export const NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG = 'noType_'
  IMAGE_LOAD = 'imageLazyLoadError', 
  PRICE_RENDER = 'priceRenderError', 
  GRAYSCALE = 'grayscale', 
  REMOTEMODULE_DATA = 'remoteModule_interface_dataError', 
  REMOTEMODULE_JS = 'remoteModule_render_jsError', 
  SYSTEMMODULE_JS = 'systemModule_render_jsError', 
  SYSTEMPDCMODULE_DATA = 'systemPdcModule_interface_dataError', 
  SYSTEMPDCMODULE_JS = 'systemPdcModule_render_jsError', 
  FLOORLAZYLOAD_DATA = 'floorLazyLoad_render_dataError', 

package/dist/components/ErrorBoundary.tsx

@@ -1 +1 @@
-import React from 'react'
    const floorLoadWay = floorData?.floorExtInfo?.floorLoadWay
    const isRemoteLoadFloor = floorLoadWay === 2
        msg: `店铺h5楼层隐藏不显示。原因：模块js执行异常，楼层过滤。`,
        floorIdx: floorData?.floorIdx,
        moduleDesignerType: floorData?.floorExtInfo?.moduleDesignerType,
        floorLoadWay, 
        floorKind: floorData?.floorExtInfo?.floorKind, 
    }
      code: getSgmCustomCode(isRemoteLoadFloor ? SgmCustomCode.REMOTEMODULE_JS : SgmCustomCode.SYSTEMMODULE_JS),
      msg: opt,
    })
      if(this.props.customErrorIsvFloorModule){
        return this.props.customErrorIsvFloorModule
      }
+import React from 'react'
  getBundleUrl,
  formatPackResult,
  getTaroVersion
    const floorLoadWay = floorData?.floorExtInfo?.floorLoadWay
    const floorKind = floorData?.floorExtInfo?.floorKind
    const isRemoteLoadFloor = floorLoadWay === 2
    const modularPackResult = floorData?.floorExtInfo?.modularPackResult
    const modularPackResultObj = formatPackResult(modularPackResult)
    const bundleUrl = getBundleUrl(modularPackResultObj)
    const taroVersion = getTaroVersion(modularPackResultObj)
        msg: `店铺h5楼层隐藏不显示。原因：模块js执行异常，楼层过滤。`,
        floorIdx: floorData?.floorIdx,
        moduleDesignerType: floorData?.floorExtInfo?.moduleDesignerType,
        floorLoadWay, 
        floorKind,
        modularPackResult: {
          bundleUrl,
          taroVersion
        },
    }
    const sgmCode = isRemoteLoadFloor ? (floorKind === FLOOR_KIND.PDC_SYSTEM_MODULE ? SgmCustomCode.SYSTEMPDCMODULE_JS : SgmCustomCode.REMOTEMODULE_JS) : SgmCustomCode.SYSTEMMODULE_JS
      code: getSgmCustomCode(handleSgmCodeTaroVersion(sgmCode)),
      msg: opt,
    })
      if(this.props.customErrorIsvFloorModule){
        return this.props.customErrorIsvFloorModule
      }

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

@@ -1,47 +1,52 @@
 
 .d-count-down {
-	position: relative;
-	z-index: 2;
-	padding-top: 1px;
-	line-height: 28px;
-	font-size: 24px;
-	font-weight: bolder;
-	color: #fff;
-	text-align: center;
-	&.d-ios-10-count-down {
-		padding-top: 9px;
-	}
-	:global {
-		.d-count-down-title {
-			// position: relative;
-			// top: -2px;
-			display: inline-block;
-			padding-right: 5px;
-			height: 24px;
-			line-height: 24px;
-			font-size: 20px;
-		}
-		.d-count-down-time {
-			display: inline-block;
-			//margin: 0 2px;
-			min-width: 24px;
-			line-height: 28px;
-			font-size: 20px;
-			text-align: center;
-		}
-		.d-time-space-text {
-			display: inline-block;
-			//margin: 0 2px;
-			font-size: 20px;
-		}
-		// .d-count-from-end {
-		// 	margin-right: 4px;
-		// 	font-size: 9px;
-		// }
-	}
-	:global(.d-count-down-time) {
-		&:global(.d-day-time) {
-			min-width: 12px;
-		}
-	}
+  position: relative;
+  z-index: 2;
+  padding-top: 1px;
+  line-height: 28px;
+  font-size: 24px;
+  font-weight: bolder;
+  color: #fff;
+  text-align: center;
+  &.d-ios-10-count-down {
+    padding-top: 9px;
+  }
+  :global {
+    .d-count-down-title {
+      // position: relative;
+      // top: -2px;
+      display: inline-block;
+      padding-right: 5px;
+      height: 24px;
+      line-height: 24px;
+      font-size: 20px;
+    }
+    .d-count-down-time {
+      display: inline-block;
+      //margin: 0 2px;
+      min-width: 24px;
+      line-height: 28px;
+      font-size: 20px;
+      text-align: center;
+    }
+    .d-time-space-text {
+      display: inline-block;
+      //margin: 0 2px;
+      font-size: 20px;
+    }
+    .d-day-time {
+      min-width: 12px;
+    }
+    // .d-count-from-end {
+    // 	margin-right: 4px;
+    // 	font-size: 9px;
+    // }
+  }
+  &.d-en-count-down {
+    :global {
+      .d-day-space-text {
+        padding-right: 4px;
+      }
+    }
+  }
 }

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    showDayToSecondState,
+import Taro from '@tarojs/taro';
  const {
    residueTime,
    serverTime,
    startTime,
    endTime,
    className,
    info,
    endTimeEndCallBack,
    startTimeEndCallBack,
    startTitleText,
    endTitleText,
    timeNumSpaceTextState,
    showDaytimeNumSpaceTextState,
    getDaysToHours,
    onlyShowDayState,
    showDayState,
    showHourState,
    showMinuteState,
    showSecondState,
    showDayToSecondState,
    fromStartText,
    fromEndText,
    numTextColor,
    textColor,
    numTextBgColor,
  } = props;
  const [endTimeFormat, setEndTimeFormat] = useState<{
    day: string | number;
    hour: string | number;
    minute: string | number;
    second: string | number;
  }>({
    day: 0,
    hour: 0,
    minute: 0,
    second: 0,
  });
  const countDownTimer = useRef<NodeJS.Timer | null>();
  const countDownTypeText = useRef<ComponentInterFace.CountDownTimerRef>({
    type: 'end',
    text: endTitleText,
    time: null,
  });
  
  const diffTimerRef = useRef({
    stopDocumentTime: 0,
    recoverDocumentTime: 0,
    diffTime: 0,
  });
  
  useEffect(() => {
    Taro.eventCenter.on(TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE, (state) => {
      if (state) {
        if (diffTimerRef.current.stopDocumentTime && diffTimerRef.current.stopDocumentTime > 0) {
          diffTimerRef.current.recoverDocumentTime = Date.now();
          diffTimerRef.current.diffTime =
            diffTimerRef.current.recoverDocumentTime - diffTimerRef.current.stopDocumentTime;
          changeTimerSetInterval(true);
        }
      } else {
        diffTimerRef.current.stopDocumentTime = Date.now();
        if (countDownTimer.current) {
          clearInterval(countDownTimer.current);
          countDownTimer.current = null;
        }
      }
    });
  }, []);
  useEffect(() => {
    if (serverTime > 0 || residueTime > 0) {
      let getNowEndTime = residueTime > 0 ? residueTime : endTime - serverTime;
      if (startTime && endTime) {
        if (serverTime <= startTime) {
          getNowEndTime = startTime - serverTime;
          countDownTypeText.current = {
            type: 'start',
            text: startTitleText,
            time: null,
          };
        } else {
          getNowEndTime = endTime - serverTime;
          countDownTypeText.current = {
            type: 'end',
            text: endTitleText,
            time: null,
          };
        }
      } else {
        countDownTypeText.current = {
          type: 'end',
          text: endTitleText,
          time: null,
        };
      }
      if (getNowEndTime > 0) {
        countDownTimeFormat(getNowEndTime);
        countDownTypeText.current.time = getNowEndTime;
        countDownTypeText.current.type === 'start' &&
          (countDownTypeText.current.endTime = endTime - serverTime);
        changeTimerSetInterval();
      } else {
        countDownTypeText.current = {
          type: 'end',
          text: endTitleText,
          time: 0,
        };
      }
    }
    return () => {
      countDownTimer.current && clearInterval(countDownTimer.current);
    };
  }, [serverTime]);
  
  const changeTimerSetInterval = (recoverState = false) => {
    countDownTimer.current && clearInterval(countDownTimer.current);
    recoverState && changeTimerFunc();
    countDownTimer.current = setInterval(changeTimerFunc, 1000);
  };
  const changeTimerFunc = () => {
    if (countDownTypeText.current.time && diffTimerRef.current.diffTime > 0) {
      countDownTypeText.current.time -= diffTimerRef.current.diffTime;
      countDownTypeText.current.type === 'start' &&
        countDownTypeText.current.endTime &&
        (countDownTypeText.current.endTime -= diffTimerRef.current.diffTime);
      console.log(
        '当前id倒计时获取倒计时息屏时间计算差值',
        countDownTimer.current,
        diffTimerRef.current,
        countDownTypeText.current,
      );
      diffTimerRef.current.stopDocumentTime = 0;
      diffTimerRef.current.recoverDocumentTime = 0;
      diffTimerRef.current.diffTime = 0;
    }
    if (countDownTypeText.current.time && countDownTypeText.current.time > 1000) {
      countDownTypeText.current.time -= 1000;
      countDownTypeText.current.type === 'start' &&
        countDownTypeText.current.endTime &&
        (countDownTypeText.current.endTime -= 1000);
      countDownTimeFormat(countDownTypeText.current.time);
    } else {
      countDownTypeText.current.time = 0;
      countDownTimeFormat(countDownTypeText.current.time);
      countDownTimer.current && clearInterval(countDownTimer.current);
      if (countDownTypeText.current.type === 'start') {
        let triggerStartTimeEndCallBackState = true;
        countDownTypeText.current = Object.assign({}, countDownTypeText.current, {
          type: 'end',
          text: endTitleText,
        });
        countDownTypeText.current.time = countDownTypeText.current.endTime;
        countDownTypeText.current.time && (countDownTypeText.current.time -= 1000);
        if (countDownTypeText.current.time && countDownTypeText.current.time > 0) {
          countDownTimer.current = setInterval(() => {
            if (countDownTypeText.current.time && diffTimerRef.current.diffTime > 0) {
              countDownTypeText.current.time -= diffTimerRef.current.diffTime;
              diffTimerRef.current.stopDocumentTime = 0;
              diffTimerRef.current.recoverDocumentTime = 0;
              diffTimerRef.current.diffTime = 0;
            }
            if (triggerStartTimeEndCallBackState && startTimeEndCallBack) {
              startTimeEndCallBack({
                type: 'start',
                endState: true,
                ...info,
              });
              triggerStartTimeEndCallBackState = false;
            }
            if (countDownTypeText.current.time && countDownTypeText.current.time > 1000) {
              countDownTypeText.current.time -= 1000;
              countDownTimeFormat(countDownTypeText.current.time);
            } else {
              endTimeEndCallBack &&
                endTimeEndCallBack({
                  type: 'end',
                  endState: true,
                  ...info,
                });
            }
          }, 1000);
        }
      } else {
        endTimeEndCallBack &&
          endTimeEndCallBack({
            type: 'end',
            endState: true,
            ...info,
          });
      }
    }
  };
  const countDownTimeFormat = (nowEndTime) => {
    let day = Math.floor(nowEndTime / 1000 / 86400);
    let hour = Math.floor((nowEndTime / 1000 / 3600) % 24);
    const minute = Math.floor((nowEndTime / 1000 / 60) % 60);
    const second = Math.floor((nowEndTime / 1000) % 60);
    if (getDaysToHours && day > 0) {
      hour = hour + day * 24;
      day = 0;
    }
    setEndTimeFormat({
      day,
      hour: `${hour}`.padStart(2, '0'),
      minute: `${minute}`.padStart(2, '0'),
      second: `${second}`.padStart(2, '0'),
    });
  };
  const numCustomStyle = numTextColor
    ? useRef({ color: numTextColor, backgroundColor: numTextBgColor })
    : useRef({});
  const textCustomStyle = textColor ? useRef({ color: textColor }) : useRef({});
  return (
    <View
      className={classNames(
        countDownStyle['d-count-down'],
        {
          [countDownStyle['d-ios-10-count-down']]: ios10State && !devToolPlatformState,
        },
        {
          [countDownStyle['d-en-count-down']]: isLanguageForEn,
        },
        className,
      )}
    >
      {countDownTypeText.current && countDownTypeText.current.text && (
        <Text className={classNames('d-count-down-title', 'font-jdzht')}>
          {countDownTypeText.current.text}
        </Text>
      )}
      <View className="display-inline-block">
        {fromStartText && <Text className="d-count-from-start">{fromStartText}</Text>}
        {onlyShowDayState && endTimeFormat.day > 0 ? (
          <>
            <Text
              className={classNames('d-count-down-time', 'd-day-time', 'font-jdzht')}
              style={numCustomStyle.current}
            >
              {endTimeFormat.day}
            </Text>
            <Text className="d-time-space-text d-day-space-text" style={textCustomStyle.current}>
              {showDaytimeNumSpaceTextState ? countDownTimeDay : ':'}
            </Text>
          </>
        ) : (
          <>
            {(showDayState || showDayToSecondState) && endTimeFormat.day > 0 && (
              <>
                <Text
                  className={classNames('d-count-down-time', 'd-day-time', 'font-jdzht')}
                  style={numCustomStyle.current}
                >
                  {endTimeFormat.day}
                </Text>
                <Text
                  className="d-time-space-text d-day-space-text"
                  style={textCustomStyle.current}
                >
                  {showDaytimeNumSpaceTextState ? countDownTimeDay : ':'}
                </Text>
              </>
            )}
            {showHourState && (
              <>
                <Text
                  className={classNames('d-count-down-time', 'd-hour-time', 'font-jdzht')}
                  style={numCustomStyle.current}
                >
                  {endTimeFormat.hour}
                </Text>
                <Text className="d-time-space-text" style={textCustomStyle.current}>
                  {(endTimeFormat.day > 0 && showDaytimeNumSpaceTextState) || timeNumSpaceTextState
                    ? countDownTimeHour
                    : ':'}
                </Text>
              </>
            )}
            {showMinuteState && (
              <>
                <Text
                  className={classNames('d-count-down-time', 'd-minute-time', 'font-jdzht')}
                  style={numCustomStyle.current}
                >
                  {endTimeFormat.minute}
                </Text>
                <Text className="d-time-space-text" style={textCustomStyle.current}>
                  {(endTimeFormat.day > 0 && showDaytimeNumSpaceTextState) || timeNumSpaceTextState
                    ? countDownTimeMin
                    : endTimeFormat.day > 0
                      ? ''
                      : ':'}
                </Text>
              </>
            )}
            {showSecondState && (endTimeFormat.day <= 0 || showDayToSecondState) && (
              <>
                <Text
                  className={classNames('d-count-down-time', 'd-second-time', 'font-jdzht')}
                  style={numCustomStyle.current}
                >
                  {endTimeFormat.second}
                </Text>
                {(timeNumSpaceTextState ||
                  (showDayToSecondState && showDaytimeNumSpaceTextState)) && (
                  <Text className="d-time-space-text" style={textCustomStyle.current}>
                    秒
                  </Text>
                )}
              </>
            )}
          </>
        )}
        {fromEndText && <Text className="d-count-from-end">{fromEndText}</Text>}
      </View>
    </View>
  );
  return useMemo(() => {
    return <CountDownTimer {...props} />;
  }, []);
  residueTime: -1, 
  serverTime: null,
  className: null,
  startTime: null,
  endTime: null,
  info: null, 
  startTitleText: '距活动开始',
  endTitleText: '距活动结束',
  fromEndText: null,
  startTimeEndCallBack: null,
  endTimeEndCallBack: null,
  timeNumSpaceTextState: false, 
  showDaytimeNumSpaceTextState: true, 
  onlyShowDayState: false, 
  showDayState: false, 
  showDayToSecondState: false, 
  getDaysToHours: false, 
  showHourState: true,
  showMinuteState: true,
  showSecondState: true,
  numTextColor: null,
  textColor: null,
  numTextBgColor: null,