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

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
    title: '',
    message: null,
    className: '',
    maskCloseable: false, 
    show: true, 
    hasFooter: true,
    isCustom: false, 
    titleNode: null,
    bodyNode: null,
    footerNode: null,
    closeBtnText: '取消',
    closeBtnHideState: false,
    confirmBtnText: '确定',
    confirmBtnHideState: false,
    onBeforeConfirm: null,
    onConfirm: null,
    onClose: null,
    onBackground: null,
    onHide: null,
    onInit: null,
    isFormDialog: false,
    onFormSubmit: null,
    onFormReset: null,
    forbiddenBgScrollState: true, 
    const [dialogShowState, setDialogShowState] = useState(false)
    const [dialogConfig, setDialogConfig] =
        useState<ComponentInterFace.DialogConfigProps>({
            type: DialogType.BASE,
        })
    const dialogBackFnRef = useRef<ComponentInterFace.DialogConfigBackFn>({})
    useEffect(() => {
        
        Taro.eventCenter.on(TaroEventType.DIALOG, (res) => {
            res.show ? dialogInit(res) : setDialogShowState(false)
        })
        return () => {
            Taro.eventCenter.off(TaroEventType.DIALOG)
        }
    }, [])
    
    useEffect(() => {
        if (dialogConfig.forbiddenBgScrollState && taroJdBaseInfo.rootEleNode) {
            !dialogShowState ? taroJdBaseInfo.rootEleNode.classList.remove('over-hidden') : taroJdBaseInfo.rootEleNode.classList.add('over-hidden')
        }
    }, [dialogConfig, dialogShowState])
    const dialogInit = useCallback((opts) => {
        const {
            onBeforeConfirm,
            onConfirm,
            onClose,
            onBackground,
            onHide,
            onInit,
            onFormSubmit,
            onFormReset,
            ...otherOpts
        } = opts
        const dialogOpts = Object.assign(
            {},
            {
                ...dialogDefaultConfig,
                type: DialogType.BASE,
            },
            otherOpts,
        )
        dialogBackFnRef.current = {
            onInit,
            onBeforeConfirm,
            onConfirm,
            onClose,
            onBackground,
            onHide,
            onFormSubmit,
            onFormReset,
        }
        setDialogConfig(dialogOpts)
        setDialogShowState(true)
    }, [])
    const hideDialog = useCallback(() => {
        setDialogShowState(false)
    }, [])
    const closeDialog = useCallback(() => {
        hideDialog()
        dialogBackFnRef.current.onHide &&
        typeof dialogBackFnRef.current.onHide === 'function' &&
        dialogBackFnRef.current.onHide(dialogConfig)
    }, [dialogConfig])
    
    const updateDialogContentFn = (changeDialogConfig) => {
        setDialogConfig({
            ...dialogConfig,
            ...changeDialogConfig
        })
    }
    useEffect(() => {
        dialogShowState &&
        dialogBackFnRef.current.onInit &&
        typeof dialogBackFnRef.current.onInit === 'function' &&
        dialogBackFnRef.current.onInit(hideDialog, dialogConfig, updateDialogContentFn)
    }, [dialogShowState])
    
    const dialogConfirmFn = useCallback(
        (e) => {
            e.stopPropagation()
            if (
                dialogBackFnRef.current.onBeforeConfirm &&
                typeof dialogBackFnRef.current.onBeforeConfirm === 'function'
            ) {
                dialogBackFnRef.current.onBeforeConfirm(
                    hideDialog,
                    dialogConfig,
                )
            } else {
                closeDialog()
                dialogBackFnRef.current.onConfirm &&
                typeof dialogBackFnRef.current.onConfirm === 'function' &&
                dialogBackFnRef.current.onConfirm(dialogConfig)
            }
        },
        [dialogConfig],
    )
    const dialogCloseFn = useCallback(
        (e) => {
            e.stopPropagation()
            closeDialog()
            dialogBackFnRef.current.onClose &&
            typeof dialogBackFnRef.current.onClose === 'function' &&
            dialogBackFnRef.current.onClose(dialogConfig)
        },
        [dialogConfig],
    )
    const dialogBackgroundFn = useCallback(() => {
        if (dialogConfig.maskCloseable) {
            closeDialog()
        }
        if (
            dialogBackFnRef.current.onBackground &&
            typeof dialogBackFnRef.current.onBackground === 'function'
        ) {
            dialogBackFnRef.current.onBackground()
        }
    }, [dialogConfig])
    const dialogFormSubmit = useCallback((e) => {
        if (
            dialogBackFnRef.current.onFormSubmit &&
            typeof dialogBackFnRef.current.onFormSubmit === 'function'
        ) {
            dialogBackFnRef.current.onFormSubmit(e,hideDialog, dialogConfig)
        }
    }, [dialogConfig])
    const dialogFormReset = useCallback((e) => {
        if (
            dialogBackFnRef.current.onFormReset &&
            typeof dialogBackFnRef.current.onFormReset === 'function'
        ) {
            dialogBackFnRef.current.onFormReset(e,hideDialog, dialogConfig)
        }
    }, [dialogConfig])
    const renderCustomViewCompontent = (children) => {
        return dialogConfig.isFormDialog ?
            <Form className={classNames(dialogStyle['d-form-dialog'])} onSubmit={dialogFormSubmit}
                  onReset={dialogFormReset}>{children}</Form> : <>{children}</>
    }
    return dialogShowState ? renderCustomViewCompontent(
        <>
            <View
                className={classNames(dialogStyle['d-dialog-layout'],"J_customLayout")}
                onClick={dialogBackgroundFn}
            >
                <View
                    className={classNames(
                        dialogStyle['d-dialog-wrap'],
                        dialogStyle[`d-dialog-type-${dialogConfig.type}`],
                        {
                          [dialogStyle['d-dialog-jdapp-wrap']]: isJdApp
                        },
                        'flexible-center-box',
                        dialogConfig.className,
                    )}
                >
                    {dialogConfig.isCustom ? (
                        dialogConfig.bodyNode ? (
                            dialogConfig.bodyNode
                        ) : null
                    ) : (
                        <View
                            className={classNames(
                                dialogStyle['d-dialog-content'],
                                'd-dialog-content',
                            )}
                            onClick={(e) => e.stopPropagation()}
                        >
                            {dialogConfig.title && dialogConfig.title != '' && (
                                <View
                                    className={classNames(
                                        dialogStyle['d-dialog-header'],
                                        'd-dialog-header',
                                    )}
                                >
                                    {dialogConfig.title}
                                </View>
                            )}
                            {dialogConfig.message && (
                                <View
                                    className={classNames(
                                        dialogStyle['d-dialog-body'],
                                        'd-dialog-body',
                                    )}
                                    dangerouslySetInnerHTML={{
                                        __html: dialogConfig.message,
                                    }}
                                />
                            )}
                            {dialogConfig.bodyNode && (
                                <View
                                    className={classNames(
                                        dialogStyle['d-dialog-body'],
                                        'd-dialog-body',
                                    )}
                                >
                                    {dialogConfig.bodyNode
                                        ? dialogConfig.bodyNode
                                        : null}
                                </View>
                            )}
                            {dialogConfig.footerNode ? (
                                dialogConfig.footerNode
                            ) : dialogConfig.hasFooter ? (
                                <View
                                    className={classNames(
                                        dialogStyle['d-dialog-footer'],
                                        'd-dialog-footer',
                                        'flexible-box',
                                    )}
                                >
                                    {!dialogConfig.closeBtnHideState && (
                                        <Button
                                            className={classNames(
                                                dialogStyle['d-dialog-btn'],
                                                dialogStyle[
                                                    'd-dialog-cancel-btn'
                                                    ],
                                                'd-dialog-cancel-btn',
                                                'adaptive-box-flex',
                                            )}
                                            form-type={dialogConfig.isFormDialog ? 'reset' : ''}
                                            onClick={dialogCloseFn}
                                        >
                                            {dialogConfig.closeBtnText}
                                        </Button>
                                    )}
                                    {!dialogConfig.confirmBtnHideState && (
                                        <Button
                                            className={classNames(
                                                dialogStyle['d-dialog-btn'],
                                                dialogStyle[
                                                    'd-dialog-ensure-btn'
                                                    ],
                                                'd-dialog-ensure-btn',
                                                'adaptive-box-flex',
                                            )}
                                            onClick={dialogConfirmFn}
                                            form-type={dialogConfig.isFormDialog ? 'submit' : ''}
                                        >
                                            {dialogConfig.confirmBtnText}
                                        </Button>
                                    )}
                                </View>
                            ) : null}
                        </View>
                    )
                    }
                </View>
            </View>
        </>,
    ) : null

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
        (
            <View
                className={classNames(
                    exposureStyle['d-floor-exposure'],
                    className,
                    floorName,
                )}
                id={`J_floor_${floorName}`}
            />
        )
+import Taro from '@tarojs/taro'
  const { windowHeight } = taroJdBaseInfo.info.sysInfo
        (
            <View
                className={classNames(
                    exposureStyle['d-floor-exposure'],
                    className,
                    floorName,
                )}
                id={`J_floor_${floorName}`}
            />
        )

package/dist/components/base/ExposureSmart/const.ts

@@ -0,0 +1 @@
+export const TrackType = {
  point: 0, 
  floor: 1, 

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

@@ -1,8 +1,32 @@
 
-.root {
-    position: absolute;
-    width: 1PX;
-	height: 0;
-	opacity: 0;
-	pointer-events: none;
+//坑位曝光
+.d-report-point {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  opacity: 0;
+  pointer-events: none;
+  z-index: -1;
 }
+//楼层曝光
+.d-report-floor {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+  pointer-events: none;
+  z-index: -1;
+}
+
+:global{
+  .d-report-exposure-jd-point{
+    &:not(:empty){
+      opacity: 1;
+      z-index: 20;
+    }
+  }
+}
+

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    const inViewCallback = () => {
        console.log('埋点收到进入可视区域的回到啦！', reportData)
        addReportData(reportData)
    }
            exposureStyle.root,
            className,
        )} height={'100%'} inViewCallback={inViewCallback}></InViewRender>
+import React, { useMemo } from 'react';
  const {
    type,
    className,
    reportData,
    customReportDataKey,
    customReportDataFn,
    trackCallback,
    markPoint,
    innerRef,
  } = props;
  const isCustomReport = customReportDataKey && customReportDataFn;
  const isViewOnlineState = taroJdBaseInfo.info.pageInfo.dataType === BUSINESS_TYPE.ONLINE;
  const showRenderState = isCustomReport ? true : reportData;
  const inViewCallback = () => {
    const getInsertFlowMapEle =
      innerRef?.current?.querySelector('.d-report-exposure-point') || createDefaultFlowMapEle;
    if (!isCustomReport) {
      addReportData(reportData, getInsertFlowMapEle);
      typeof trackCallback === 'function' && trackCallback(reportData);
    } else {
      if (typeof customReportDataFn === 'function') {
        const getReportData = customReportDataFn(customReportDataKey);
        getReportData &&
          getReportData?.eventId &&
          getReportData?.jsonParam &&
          track.reportExposureEventLog({
            ...getReportData,
            target: getInsertFlowMapEle,
          });
      }
    }
  };
  let chartPointClassName = '';
  
  if (isChartH5 && markPoint && Array.isArray(reportData)) {
    const [floorData, mInfo] = reportData;
    if (floorData && mInfo && mInfo.hasOwnProperty('pos')) {
      chartPointClassName = track.getFloorPointIndexClassName(floorData, mInfo.pos);
    }
  } else if (isCustomReport) {
    chartPointClassName = `J_custom_${customReportDataKey}`;
  }
  return isViewOnlineState && showRenderState ? (
    <InViewRender
      className={classNames(
        'd-report-exposure-point',
        {
          [exposureStyle['d-report-point']]: type === TrackType.point,
        },
        {
          [exposureStyle['d-report-floor']]: type === TrackType.floor,
        },
        {
          'd-report-exposure-jd-point': isJdApp,
        },
        className,
        chartPointClassName,
      )}
      height={'100%'}
      inViewCallback={inViewCallback}
    ></InViewRender>
  ) : null;
  return useMemo(() => {
    return <Exposure {...props} />;
  }, []);
  reportData: null, 
  trackCallback: null, 
  type: TrackType.point,
  markPoint: false, 

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

@@ -1,11 +1,22 @@
 
-.d-floor-exposure {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	height: 1px;
-	width: 100%;
-	opacity: 0;
-	pointer-events: none;
+//坑位曝光
+.d-report-point {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  opacity: 0;
+  pointer-events: none;
+  z-index: -1;
+}
+//楼层曝光
+.d-report-floor {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 1px;
+  pointer-events: none;
+  z-index: -1;
 }

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
  const { type, className, reportData, customReportDataKey, customReportDataFn, trackCallback } = props
  const isViewOnlineState =
    taroJdBaseInfo.info.pageInfo.dataType === BUSINESS_TYPE.ONLINE
  const isCustomReport = customReportDataKey && customReportDataFn
  const checkReportData = Array.isArray(reportData)
  const [floorData, mInfo] = checkReportData ? reportData : []
  const showRenderState = isCustomReport ? true : floorData && mInfo
  const getFloorPointClassName =  isCustomReport ? `J_custom_${customReportDataKey}` : `J_floor_${floorData?.uid}_index_${mInfo?.pos}`
  const getTaroSelector = isCustomReport ? `#J_miniShopRoot >>> .${getFloorPointClassName}` : `#J_floor_${floorData?.uid} >>> .${getFloorPointClassName}`
  useEffect(() => {
    if (isViewOnlineState && reportData) {
      Taro.nextTick(() => {
        if (
          !taroJdBaseInfo.info.pageInfo.floorExposureInfo[
            getFloorPointClassName
            ]
        ){
          const createIntersectionObserver = new intersectionObserver({
            selector: getTaroSelector,
            context: this,
            onFinal: (res) => {
              taroJdBaseInfo.info.pageInfo.floorExposureInfo[
                getFloorPointClassName
                ] = true
              console.log('小程序曝光埋点收到进入可视区域啦！', getFloorPointClassName, reportData, res)
              if(!isCustomReport){
                addReportData(reportData)
                typeof trackCallback === 'function' && trackCallback(reportData)
              }else {
                typeof customReportDataFn === 'function' && customReportDataFn(customReportDataKey)
              }
              createIntersectionObserver.disconnect()
            },
          })
          createIntersectionObserver.connect()
        }
      })
    }
  }, [])
  return (showRenderState ? (
      <View
        className={classNames(
          {
            [exposureStyle['d-report-point']]: type === TrackType.point,
          },
          {
            [exposureStyle['d-report-floor']]: type === TrackType.floor,
          },
          getFloorPointClassName,
          className,
        )}
      />
    ) : null
  )
  return useMemo(() => {
    return <ExposureFloor {...props} />
  }, [])
  reportData: null, 
  trackCallback: null, 
  type: TrackType.point,

package/dist/components/base/ExposureSmart/reporter.tsx

@@ -1 +1 @@
-import track from '../../../open/api/track'
    const {arr : arrTask, startWaitTime} = floorTask
    const isTimeout = startWaitTime != 0 && (Date.now() - startWaitTime >= 1000)    
    const isOverMax = arrTask.length >= 10  
    const hasData = arrTask.length > 0
    if(hasData && (isTimeout || isOverMax)){
        const reduceData = connactData(arrTask)
        track.reportExposureEventLog(reduceData)
        floorTask.arr = []
        floorTask.startWaitTime = 0
        clearTimeout(floorTask.timer)
    }
    const initData = JSON.parse(JSON.stringify(arr[0]))
    initData.jsonParam.logBaseInfo = []
    initData.jsonParam.etModelInfo.lstms = []
    return arr.reduce((acc, cur) => {
        cur.jsonParam.etModelInfo.lstms[0].la_p = cur.jsonParam.logBaseInfo.mInfo.pos
        acc.jsonParam.logBaseInfo.push(cur.jsonParam.logBaseInfo)
        acc.jsonParam.etModelInfo.lstms.push(cur.jsonParam.etModelInfo.lstms)
        return acc
    }, initData)
    if(!Array.isArray(data)){
        console.log('坑位曝光埋点原始数据参类型错误，期望是数组，实际是：', data)
        return 
    }
    const [floorData, mInfo, etModelInfo] = data
    if(floorData && mInfo && etModelInfo){
        const reportJson = track.getIsvExposureInfo(floorData, mInfo, etModelInfo)
        const { floorIdx } = floorData
        if(!task[floorIdx]){
            task[floorIdx] = {
                arr: [],
                startWaitTime: 0,
                timer : 0
            }
        }
        const floorTask = task[floorIdx]
        if(floorTask.arr.length === 0){
            floorTask.startWaitTime = Date.now()
        }
        if(reportJson){
            floorTask.arr.push(reportJson)
            clearTimeout(floorTask.timer)
            floorTask.timer = setTimeout(() => {
                check(floorTask)
            }, 1000)
            check(floorTask)
        }
    }else{
        console.log('坑位曝光埋点原始数据参数缺失，期望是[floorData, mInfo, etModelInfo]，实际是：', data)
    }
+import track from '../../../open/api/track';
  const { arr: arrTask, startWaitTime } = floorTask;
  const isTimeout = startWaitTime != 0 && Date.now() - startWaitTime >= 1000; 
  const arrTaskNum = arrTask.length;
  const isOverMax = arrTaskNum >= 10; 
  const hasData = arrTaskNum > 0;
  if (hasData && (isTimeout || isOverMax)) {
    const reduceData = connactData(arrTask);
    track.reportExposureEventLog(reduceData);
    floorTask.arr = [];
    floorTask.startWaitTime = 0;
    clearTimeout(floorTask.timer);
  }
  const initData = JSON.parse(JSON.stringify(arr[0]));
  if (initData.jsonParam.etModelInfo) {
    initData.jsonParam.logBaseInfo = [];
    initData.jsonParam.etModelInfo.lstms = [];
    return arr.reduce((acc, cur) => {
      acc.jsonParam.logBaseInfo.push(cur.jsonParam.logBaseInfo);
      return acc;
    }, initData);
  } else {
    return arr.reduce((acc) => {
      return acc;
    });
  }
  if (!Array.isArray(data)) {
    console.log('坑位曝光埋点原始数据参类型错误，期望是数组，实际是：', data);
    return;
  }
  const [floorData, mInfo, etModelInfo] = data;
  if (floorData && mInfo && etModelInfo) {
    const isIsvReportModule = isvReportModuleTypeList.includes(floorData?.floorExtInfo?.moduleFlag);
    try {
      const reportJson = track.getExposureInfo(
        floorData,
        mInfo,
        etModelInfo,
        true,
        isIsvReportModule,
      );
      console.log(`${floorData?.floorExtInfo?.moduleFlag}===reportJson===`, reportJson);
      const { floorIdx } = floorData;
      if (!task[floorIdx]) {
        task[floorIdx] = {
          arr: [],
          startWaitTime: 0,
          timer: 0,
        };
      }
      const floorTask = task[floorIdx];
      if (floorTask.arr.length === 0) {
        floorTask.startWaitTime = Date.now();
      }
      if (reportJson) {
        floorTask.arr.push(reportJson);
        clearTimeout(floorTask.timer);
        floorTask.timer = setTimeout(() => {
          check(floorTask);
        }, 1000);
        check(floorTask);
      }
    } catch (e) {
      {
        console.log('坑位曝光埋点出错啦', e);
      }
    }
  } else {
    console.log(
      '坑位曝光埋点原始数据参数缺失，期望是[floorData, mInfo, etModelInfo]，实际是：',
      data,
    );
  }