@conecli/cone-render 0.9.1-shop2.9 → 0.10.1-beta.0

package/dist/components/debug/DebugLayout/index.module.scss

@@ -0,0 +1,67 @@
+
+.debug-layout-warp {
+  position: absolute;
+  border-radius: 12PX;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 50;
+
+	.debug-layout {
+		position: absolute;
+		border-radius: 12PX;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		border: 1PX solid #f50707;
+		background-color: rgba(219, 38, 38, 0.2);
+
+		&[data-module-type='JOINT'] {
+			border: 1PX solid #f507c9;
+			background-color: rgba(219, 38, 150, 0.2);
+		}
+
+		&.green {
+			border: 1PX solid #04a607;
+			background-color: rgba(38, 219, 71, 0.2);
+		}
+
+		.cd-version-list {
+			pointer-events: none;
+			position: absolute;
+			font-size: 0;
+			top: 0;
+			left: 0;
+			right: 0;
+			background-color: transparent;
+			text-align: center;
+			overflow: hidden;
+		}
+		
+		.cd-version-item {
+			display: inline-block;
+			background-color: #00c853;
+			font-size: 30px;
+			color: white;
+			padding: 1PX 3PX;
+			border-radius: 4PX;
+			margin: 0 5PX;
+			&[data-version='3.5.4'] {
+				background-color: #999;
+			}
+		}
+	}
+
+	.d-info {
+		position: relative;
+		cursor: pointer;
+		z-index: 3;
+		margin: 3PX 3PX;
+		width: 22PX;
+		height: 22PX;
+		background: url('../../../assets/icon_blue_info.svg') center center / 22PX 22PX no-repeat;
+	}
+}

package/dist/components/debug/DebugLayout/index.tsx

@@ -0,0 +1 @@
+import React from 'react'
  const { debug } = global.info.queryInfo
  const { floorData, index } = props
  if (debug != '1' || !floorData) {
    return null
  }
  const renderRemoteLayout = () => {
    const isRemote = isRemoteFloor(floorData)
    if (isRemote) {
      const moduleType = getModuleType(floorData)
      const packResult = floorData?.floorExtInfo?.modularPackResult
      const packResultObj = JSONParse(packResult)
      const taroVersionList = getTaroVersionList(packResultObj)
      const layoutClass = classNames(style['debug-layout'], {
        [style['green']]: taroVersionList.length >= 2,
      })
      return (
        <View data-module-type={moduleType} className={layoutClass}>
          <View className={style['cd-version-list']}>
            {taroVersionList.map(item => {
              return (
                <Text className={style['cd-version-item']} data-version={item}>
                  v{item}
                </Text>
              )
            })}
          </View>
        </View>
      )
    } else {
      return null
    }
  }
  return (
    <View className={style['debug-layout-warp']}>
      <View
        className={style['d-info']}
        onClick={() => {
          Messager && Messager.trigger('openDebugLayout', { floorData, index })
        }}
      />
      {renderRemoteLayout()}
    </View>
  )

package/dist/components/debug/DebugLayout/utils.ts

@@ -0,0 +1 @@
+import { RemoteLoadFloorList, FloorModuleType } from '../../../common/const'
  if (!packResultObj) {
    return []
  }
  const result: string[] = []
  if (packResultObj.bundleUrl) {
    result.push(packResultObj.taroVersion || '3.5.4')
  }
  if (packResultObj.bundleUrlV2) {
    result.push(packResultObj.taroVersionV2)
  }
  return result
  if (!floorData) {
    return false
  }
  const moduleFlag = floorData.floorExtInfo?.moduleFlag
  const floorLoadWay = floorData.floorExtInfo?.floorLoadWay
  return RemoteLoadFloorList.includes(moduleFlag) || floorLoadWay === 2
  if (!floorData) {
    return ''
  }
  const moduleFlag = floorData.floorExtInfo?.moduleFlag
  const floorLoadWay = floorData.floorExtInfo?.floorLoadWay
  if (moduleFlag === FloorModuleType.ISVDESIGNERH5MODULE) {
    return 'ISV'
  } else if (
    moduleFlag === FloorModuleType.JOINT_MODULE ||
    floorLoadWay === 2
  ) {
    return 'JOINT'
  } else {
    return 'SYSTEM'
  }

package/dist/components/decorate/EmptyFloorModule/index.tsx

@@ -1 +1 @@
-import { View, Text } from '@tarojs/components'
  '//img11.360buyimg.com/imagetools/jfs/t1/141506/22/31698/7923/637b6db9E2af80265/10e76e2c31e0e356.png'
  const newModuleFloorTypeList = [100, 101, 100000, 99999]
  const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
  if ((moduleType == 99999 || moduleType == 101) && !previewUri) {
  if (moduleFlag && TRUSTEESHIP_MODULE_FLAG_LIST.indexOf(moduleFlag) !== -1) return null
+import { View, Text } from '@tarojs/components'
  '//img11.360buyimg.com/imagetools/jfs/t1/141506/22/31698/7923/637b6db9E2af80265/10e76e2c31e0e356.png'
  const {
    moduleType,
    configEmpty,
    previewUri = null,
    uid,
    moduleFlag,
    moduleName,
  } = props.floorData
  let previewUrl = previewUri
  const newModuleFloorTypeList = [100, 101, 100000, 99999]
  const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
  if ((moduleType == 99999 || moduleType == 101) && !previewUri) {
    previewUrl = decorateModulePrevDefaultUrl
  }
  const loadImageErr = e => {
    e.target.src = decorateModulePrevDefaultUrl
  }
  if (moduleFlag && TRUSTEESHIP_MODULE_FLAG_LIST.indexOf(moduleFlag) !== -1)
    return null
  return isNewFloorState && configEmpty && previewUrl ? (
    <View
      className={emptyModuleStyle['d-empty-module']}
      data-floor-uid={uid}
      data-floor-type={moduleFlag}
      data-floor-modulename={moduleName}
    >
      {}
      {}
      {}
      {}
      {}
      {}
      {}
      <View className={classNames(emptyModuleStyle['d-empty-img'])}>
        <img
          width={355}
          className={classNames('J_floorEmptyDataImg')}
          src={previewUrl}
          onError={loadImageErr.bind(this)}
        />
      </View>
    </View>
  ) : (
    <View
      className={classNames(
        emptyModuleStyle['d-empty-module'],
        emptyModuleStyle['d-empty-text-warp'],
      )}
      data-floor-uid={uid}
      data-floor-type={moduleFlag}
      data-floor-modulename={moduleName}
    >
      <Text className={emptyModuleStyle['d-empty-text']}>
        该楼层还未配置数据
      </Text>
    </View>
  )

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

@@ -1 +1 @@
-import React, { useCallback } from 'react'
  const getRenderRealTimeKeyObj = {
    key:  isRealTimeRender ? Date.now() : forceRenderTime
  }
  console.log("远程加载楼层渲染key信息", getRenderRealTimeKeyObj)
      {floorData?.showCommonFloorHead === false ? null : <CommonFloorHead dataDefines={dataDefines} floorData={floorData} {...getRenderRealTimeKeyObj}  />}
          ...getRenderRealTimeKeyObj
  isRealTimeRender: false, 
  forceRenderTime: 1, 
+import React, { useCallback } from 'react'
  const {
    style,
    dataDefines,
    containerBorderRadius,
    floorData,
    isRealTimeRender,
    forceRenderTime,
  } = props
  const getRenderRealTimeKeyObj = {
    key: isRealTimeRender ? Date.now() : forceRenderTime,
  }
  console.log('远程加载楼层渲染key信息', getRenderRealTimeKeyObj)
  return (
    <View className={floorStyle['wrap']} style={style}>
      {floorData?.showCommonFloorHead === false ? null : (
        <CommonFloorHead
          dataDefines={dataDefines}
          floorData={floorData}
          {...getRenderRealTimeKeyObj}
        />
      )}
      <View
        className={floorStyle['wrap']}
        style={
          containerBorderRadius
            ? {
                borderRadius: containerBorderRadius + 'px',
              }
            : {}
        }
      >
        {}
        {props.children &&
          React.cloneElement(props.children, {
            dataDefines: dataDefines,
            ...getRenderRealTimeKeyObj,
          })}
      </View>
    </View>
  )
  isRealTimeRender: false, 
  forceRenderTime: 1, 

package/dist/interface/component.ts

@@ -1 +1 @@
-import React from 'react'
    subMessage?: string
    viewMaxHeight?: string
      floorLoadWay?: number
      floorKind?: number
      shopId?: string
      moduleDesignerType?: string
    showCommonFloorHead?: boolean
    borderRadius: number
    borderTopLeftRadius?: number
    borderTopRightRadius?: number
    borderBottomLeftRadius?: number
    borderBottomRightRadius?: number
    marginTop?: number
    marginBottom?: number
    marginLeft?: number
    marginRight?: number
    paddingTop?: number
    paddingBottom?: number
    paddingLeft?: number
    paddingRight?: number
    containerId: string
    background?: string
    containerPosition?: string
    key?: string
    floors: floorItemData[]
    includeUids: string[]
    typeCn: string
    typeCode?: string
    addLuxuryStyle?: boolean
    addLuxuryBackupStyle?: boolean
    renderExtendComponent?: Function
    floorExtendData?: any
  }
    isRealTimeRender: boolean
    forceRenderTime: number
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    showDayToSecondState?: boolean 
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean
    evenList:  any[]
    oddList: any[]
+import React from 'react'
    subMessage?: string
    viewMaxHeight?: string
      floorLoadWay?: number
      floorKind?: number
      shopId?: string
      moduleDesignerType?: string
    showCommonFloorHead?: boolean
    borderRadius: number
    borderTopLeftRadius?: number
    borderTopRightRadius?: number
    borderBottomLeftRadius?: number
    borderBottomRightRadius?: number
    marginTop?: number
    marginBottom?: number
    marginLeft?: number
    marginRight?: number
    paddingTop?: number
    paddingBottom?: number
    paddingLeft?: number
    paddingRight?: number
    containerId: string
    background?: string
    containerPosition?: string
    key?: string
    floors: floorItemData[]
    includeUids: string[]
    typeCn: string
    typeCode?: string
    addLuxuryStyle?: boolean
    addLuxuryBackupStyle?: boolean
    renderExtendComponent?: Function
    floorExtendData?: any
  }
    isRealTimeRender: boolean
    forceRenderTime: number
    customErrorIsvFloorModule?: React.ReactElement | undefined
    containerIndex?: number
    containerData?: any
    shopTotalInfo?: any
    selectContainerFn?: Function
    selectContainerId?: string
    placeHolderPreContainerId?: string
    children?: any
    style?: {
      [key: string]: any
    };
    layoutLeftRightMargin?: number
  }
    showDayToSecondState?: boolean 
    onFormSubmit?: Function
    onFormReset?: Function
    isFormDialog?: boolean
    forbiddenBgScrollState?: boolean
    evenList:  any[]
    oddList: any[]