@conecli/cone-render 0.9.1-shop2.1 → 0.9.1-shop2.2

package/dist/common/index.h5.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    urlCookie
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
    this.config = {}
      pin: cookie.get('pin') || ''
    })
    if(!this.checkStatusAndLoginPromise){
      this.checkStatusAndLoginPromise = new Promise(async (resolve, reject) => {
       try {
         const getLoginState = await this.doCheckLoginStateAndForApiCheck()
         if(getLoginState){
           resolve(true)
         }else {
           this.toLogin(options)
           reject(false)
         }
       }catch (e) {
         this.toLogin(options)
         reject(false)
       }
      })
      return this.checkStatusAndLoginPromise
    }else {
      return this.checkStatusAndLoginPromise.then(() => {
        return Promise.resolve(true)
      }).catch (() => {
        this.toLogin(options)
        return Promise.reject(true)
      })
    }
   
  doCheckLoginStateAndForApiCheck() {
    if(this.info.loginState){
      return Promise.resolve(true)
    }else {
      return new Promise((resolve, reject) => {
        if(this.info.isJingGouMiniViewState){
          const getWqAuthToken = cookie.get("wq_auth_token")
          if(getWqAuthToken){
            this.info.loginState = true
            resolve(true)
          }else {
            reject(false)
          }
        }else{
          Taro.request({
            url: api.isLogin,
            jsonp:true,
            timeout: 3000,
            success: (res) => {
              const {statusCode,data} = res
              if (statusCode === 200 && data?.islogin && Number(data.islogin) === 1) {
                this.info.loginState = true
                resolve(true);
              } else {
                reject(false)
              }
            },
            fail:(err) => {
              console.log("登录检查异常", err)
              reject(false)
            }
          })
        }
      })
    }
  }
  
      try {
        const getLoginState = await this.doCheckLoginStateAndForApiCheck()
        if(getLoginState){
          const { pin } = await this.getLoginCookie();
          this.info.userInfo = {
            pin,
            encodePin: encodeURIComponent(pin),
            ptkey: '',
          }
          resolve(true)
        }else {
          reject(false)
        }
      }catch (e) {
        reject(false)
      }
    })
    if(un_area && un_area.length > 0){
      this.info.pageInfo.address = un_area
      this.info.pageInfo.un_area = un_area
      this.info.pageInfo.addressCommaStr = un_area.replace(/_/g, ',')
    }
+import Taro from '@tarojs/taro'
    urlCookie
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
    this.config = {}
      ...info,
    let getFullUrl = loginUrl + '?' + serialize(params)
    if(isPc) {
      getFullUrl = getFullUrl.replace(/returnurl/,'ReturnUrl')
    }
      pin: cookie.get('pin') || ''
    })
    if(!this.checkStatusAndLoginPromise){
      this.checkStatusAndLoginPromise = new Promise(async (resolve, reject) => {
       try {
         const getLoginState = await this.doCheckLoginStateAndForApiCheck()
         if(getLoginState){
           resolve(true)
         }else {
           this.toLogin(options)
           reject(false)
         }
       }catch (e) {
         this.toLogin(options)
         reject(false)
       }
      })
      return this.checkStatusAndLoginPromise
    }else {
      return this.checkStatusAndLoginPromise.then(() => {
        return Promise.resolve(true)
      }).catch (() => {
        this.toLogin(options)
        return Promise.reject(true)
      })
    }
   
  doCheckLoginStateAndForApiCheck() {
    if(this.info.loginState){
      return Promise.resolve(true)
    }else {
      return new Promise((resolve, reject) => {
        if(this.info.isJingGouMiniViewState){
          const getWqAuthToken = cookie.get("wq_auth_token")
          if(getWqAuthToken){
            this.info.loginState = true
            resolve(true)
          }else {
            reject(false)
          }
        }else{
          Taro.request({
            url: api.isLogin,
            jsonp:true,
            timeout: 3000,
            success: (res) => {
              const {statusCode,data} = res
              if (statusCode === 200 && data?.islogin && Number(data.islogin) === 1) {
                this.info.loginState = true
                resolve(true);
              } else {
                reject(false)
              }
            },
            fail:(err) => {
              console.log("登录检查异常", err)
              reject(false)
            }
          })
        }
      })
    }
  }
  
      try {
        const getLoginState = await this.doCheckLoginStateAndForApiCheck()
        if(getLoginState){
          const { pin } = await this.getLoginCookie();
          this.info.userInfo = {
            pin,
            encodePin: encodeURIComponent(pin),
            ptkey: '',
          }
          resolve(true)
        }else {
          reject(false)
        }
      }catch (e) {
        reject(false)
      }
    })
    const changeArea = un_area && un_area.length > 0 ? un_area : (ipLoc_djd ? ipLoc_djd : '')
    if(changeArea){
      this.info.pageInfo.address = changeArea
      this.info.pageInfo.un_area = changeArea
      this.info.pageInfo.addressCommaStr = changeArea.replace(/_/g, ',')
    }

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

@@ -1 +1 @@
-import React, { useMemo } from 'react'
+import React, { useMemo } from 'react'
  key: 1, 

package/dist/components/floorItem.tsx

@@ -1 +1 @@
-import React from 'react'
  const { floorData, renderSourceType, builtInComponents = {} } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType: any = floorData?.floorExtInfo?.moduleFlag
  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)) {
    return (
      <RemoteFloorItem {...props} dataDefines={dataDefines}></RemoteFloorItem>
    )
  } else {
    return FloorContentItem ? (
      <ErrorBoundary {...props}>
        <FloorContentItem {...props} dataDefines={dataDefines} />
      </ErrorBoundary>
    ) : isDevMode ? (
      renderDecorateDefaultModule()
    ) : null
  }
  renderSourceType: BUSINESS_TYPE.ONLINE, 
  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, builtInComponents = {} } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType: any = floorData?.floorExtInfo?.moduleFlag
  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
  }
  renderSourceType: BUSINESS_TYPE.ONLINE, 
  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
      }
    }
  })

package/dist/components/isv/Floor/index.tsx

@@ -1 +1 @@
-import React, { useCallback } from 'react'
      {floorData?.showCommonFloorHead === false ? null : (
        <CommonFloorHead dataDefines={dataDefines} floorData={floorData} />
      )}
+import React, { useCallback } from 'react'
  const getRenderRealTimeKeyObj = isRealTimeRender ? {
    key:  Date.now()
  } : {}
      {floorData?.showCommonFloorHead === false ? null : <CommonFloorHead dataDefines={dataDefines} floorData={floorData} {...getRenderRealTimeKeyObj}  />}
          ...getRenderRealTimeKeyObj
  isRealTimeRender: false, 

package/dist/components/remoteFloorItem.tsx

@@ -1 +1 @@
-import React, { Suspense, lazy } from 'react'
  getBundleUrl,
  getBundleFileName,
  formatPackResult,
  const { floorData, renderSourceType, updateContainerFloorListDataFn } = props
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200
    return getHeight > 0 ? getHeight : 200
  }
  console.log(
    '>>>>>>>>>> floorModuleType === FloorModuleType.ISVDESIGNERH5MODULE >>>>>>>>>>',
  )
  const renderResult = (() => {
    try {
      console.log('>>>>>>>>>> 开始渲染1个isv模块 >>>>>>>>>>')
      console.log(
        '==========当前业务类型renderSourceType、楼层floorId: ',
        renderSourceType,
        floorData.uid,
      )
      const modularPackResult = floorData?.floorExtInfo?.modularPackResult
      const modularPackResultObj = formatPackResult(modularPackResult)
      const bundleUrl = getBundleUrl(modularPackResultObj)
      const bundleFileName = getBundleFileName(modularPackResultObj)
      const opt = {
        msg: `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
        buildType,
        uid: floorData?.uid,
        floorIdx: floorData?.floorIdx,
        shopId: floorData?.floorExtInfo?.shopId,
        moduleId: floorData?.moduleId,
        moduleName: floorData?.moduleName,
        middleTemplateId: floorData?.middleTemplateId,
        modularPackResult: modularPackResult,
      }
      if (bundleUrl && bundleFileName) {
        let ISVModule =
          taroJdBaseInfo?.renderedIsvComponents[
            `${floorData.uid}_${bundleFileName}`
          ] || null
        if (!ISVModule) {
          ISVModule = lazy(() => import(bundleFileName + '@@@@@@' + bundleUrl))
          console.log(
            '1|加载isv模块==========走lazy import生成新的isv模块react组件',
            bundleFileName,
          )
          taroJdBaseInfo.renderedIsvComponents[
            `${floorData.uid}_${bundleFileName}`
          ] = ISVModule
          console.log(
            '2|渲染isv模块的react组件==========,window.taroJshopH5WebpackJsonp上的组件是否已就绪: ',
            bundleFileName,
            window['taroJshopH5WebpackJsonp'].find(
              (item) => item[0][0] == bundleFileName,
            ),
          )
        } else {
          console.log(
            '1|加载isv模块==========不走lazy import生成新的isv模块react组件，从已加载中获取，taroJdBaseInfo: ',
            taroJdBaseInfo,
          )
          console.log(
            '2|渲染isv模块的react组件==========,taroJdBaseInfo.renderedIsvComponents上的组件是否已就绪: ',
            taroJdBaseInfo.renderedIsvComponents[
              `${floorData.uid}_${bundleFileName}`
            ],
          )
        }
        const _floorHeight = getFloorSetHeight(floorData)
        return (
          <ErrorBoundary {...props}>
            <Suspense
              fallback={
                <View
                  style={{
                    position: 'relative',
                    background: `#ffffff url('${JD_PLACEHOLDER_IMG}')	center center no-repeat`,
                    height: `${_floorHeight}px`,
                  }}
                ></View>
              }
            >
              <ISVFloor {...props} dataDefines={dataDefines}>
                <ISVModule {...props} dataDefines={dataDefines}></ISVModule>
              </ISVFloor>
            </Suspense>
          </ErrorBoundary>
        )
      } else {
        console.log(
          '3|isv模块渲染异常，modularPackResult中缺少bundleUrl或bundleFileName==========modularPackResult: ',
          modularPackResultObj,
        )
        sgmCustomReport({
          code: 'isvModuleError',
          msg: opt,
        })
        return null
      }
    } catch (err) {
      console.log('3|isv模块渲染异常，floorItem逻辑错误==========err: ', err)
      sgmCustomReport({
        code: 'isvModuleError',
        msg: {
          msg: 'remoteFloorItem try catch 异常',
          err,
        },
      })
      return null
    }
  })()
  if (renderResult === null) {
    updateContainerFloorListDataFn &&
      updateContainerFloorListDataFn({
        type: 'filter',
        containerId: floorData?.uid,
      })
    console.log('renderResult === null: 命中了！')
    taroEventSendPageScrollInfo()
  } else {
    console.log('renderResult !== null: 没命中', renderResult)
  }
  return renderResult
+import React, { Suspense, lazy } from 'react'
  getBundleUrl,
  getBundleFileName,
  formatPackResult,
  const { floorData, renderSourceType, updateContainerFloorListDataFn } = props
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const getFloorSetHeight = (item) => {
    const getHeight = item?.floorExtInfo?.floorHeight
      ? Number(item?.floorExtInfo?.floorHeight)
      : 200
    return getHeight > 0 ? getHeight : 200
  }
  console.log(
    '>>>>>>>>>> floorModuleType === FloorModuleType.ISVDESIGNERH5MODULE >>>>>>>>>>',
  )
  const renderResult = (() => {
    try {
      console.log('>>>>>>>>>> 开始渲染1个isv模块 >>>>>>>>>>')
      console.log(
        '==========当前业务类型renderSourceType、楼层floorId: ',
        renderSourceType,
        floorData.uid,
      )
      const modularPackResult = floorData?.floorExtInfo?.modularPackResult
      const modularPackResultObj = formatPackResult(modularPackResult)
      const bundleUrl = getBundleUrl(modularPackResultObj)
      const bundleFileName = getBundleFileName(modularPackResultObj)
      const opt = {
        msg: `店铺首页isv h5楼层隐藏不显示。原因：modularPackResult数据不完备。页面类型-buildType: ${buildType}。楼层顺序-floorIdx: ${floorData?.floorIdx}`,
        buildType,
        uid: floorData?.uid,
        floorIdx: floorData?.floorIdx,
        shopId: floorData?.floorExtInfo?.shopId,
        moduleId: floorData?.moduleId,
        moduleName: floorData?.moduleName,
        middleTemplateId: floorData?.middleTemplateId,
        modularPackResult: modularPackResult,
      }
      if (bundleUrl && bundleFileName) {
        let ISVModule =
          taroJdBaseInfo?.renderedIsvComponents[
            `${floorData.uid}_${bundleFileName}`
          ] || null
        if (!ISVModule) {
          ISVModule = lazy(() => import(bundleFileName + '@@@@@@' + bundleUrl))
          console.log(
            '1|加载isv模块==========走lazy import生成新的isv模块react组件',
            bundleFileName,
          )
          taroJdBaseInfo.renderedIsvComponents[
            `${floorData.uid}_${bundleFileName}`
          ] = ISVModule
          console.log(
            '2|渲染isv模块的react组件==========,window.taroJshopH5WebpackJsonp上的组件是否已就绪: ',
            bundleFileName,
            window['taroJshopH5WebpackJsonp'].find(
              (item) => item[0][0] == bundleFileName,
            ),
          )
        } else {
          console.log(
            '1|加载isv模块==========不走lazy import生成新的isv模块react组件，从已加载中获取，taroJdBaseInfo: ',
            taroJdBaseInfo,
          )
          console.log(
            '2|渲染isv模块的react组件==========,taroJdBaseInfo.renderedIsvComponents上的组件是否已就绪: ',
            taroJdBaseInfo.renderedIsvComponents[
              `${floorData.uid}_${bundleFileName}`
            ],
          )
        }
        const _floorHeight = getFloorSetHeight(floorData)
        return (
          <ErrorBoundary {...props}>
            <Suspense
              fallback={
                <View
                  style={{
                    position: 'relative',
                    background: `#ffffff url('${JD_PLACEHOLDER_IMG}')	center center no-repeat`,
                    height: `${_floorHeight}px`,
                  }}
                ></View>
              }
            >
              <ISVFloor {...props} dataDefines={dataDefines} isRealTimeRender={realTimerRenderTypeList.includes(taroJdBaseInfo.info.pageInfo.dataType)}>
                <ISVModule {...props} dataDefines={dataDefines}></ISVModule>
              </ISVFloor>
            </Suspense>
          </ErrorBoundary>
        )
      } else {
        console.log(
          '3|isv模块渲染异常，modularPackResult中缺少bundleUrl或bundleFileName==========modularPackResult: ',
          modularPackResultObj,
        )
        sgmCustomReport({
          code: 'isvModuleError',
          msg: opt,
        })
        return null
      }
    } catch (err) {
      console.log('3|isv模块渲染异常，floorItem逻辑错误==========err: ', err)
      sgmCustomReport({
        code: 'isvModuleError',
        msg: {
          msg: 'remoteFloorItem try catch 异常',
          err,
        },
      })
      return null
    }
  })()
  if (renderResult === null) {
    updateContainerFloorListDataFn &&
      updateContainerFloorListDataFn({
        type: 'filter',
        containerId: floorData?.uid,
      })
    console.log('renderResult === null: 命中了！')
    taroEventSendPageScrollInfo()
  } else {
    console.log('renderResult !== null: 没命中', renderResult)
  }
  return renderResult

package/dist/interface/component.ts

@@ -1 +1 @@
-import React from 'react'
        subMessage?: string
    showCommonFloorHead?: boolean
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean
+import React from 'react'
        subMessage?: string
      floorLoadWay?: number
    showCommonFloorHead?: boolean
    isRealTimeRender: boolean
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean