@conecli/cone-render 0.8.13-beta.6 → 0.8.15-alpha.1

package/dist/components/system/Banner/index.module.scss

@@ -23,15 +23,53 @@
 		}
 		.d-img {
 			width: 100%;
+			height: 100%;
 			position: relative;
 			overflow: hidden;
 		}
 	}
 
 	:global {
-		.swiper-pagination-bullet-active {
+		// h5 圆点选中样式
+		.swiper-pagination-bullet-active,
+		// 小程序圆点选中样式
+		.wx-swiper-dot-active {
 			width: 32px;
 			border-radius: 8px;
 		}
 	}
+
+	&.d-decorate-banner {
+		position: relative;
+
+		:global {
+			
+			.swiper-pagination {
+				position: absolute;
+				bottom: 10PX;
+				left: 0;
+				right: 0;
+				font-size: 0;
+				text-align: center;
+				z-index: 10;
+			}
+
+			
+			.swiper-pagination-bullet {
+				margin: 0 4PX;
+				width: 8PX;
+				height: 8PX;
+				display: inline-block;
+				border-radius: 50%;
+				background: #000;
+				background: rgba(0, 0, 0, .3);
+			}
+
+			.swiper-pagination-bullet-active {
+				width: 32px;
+				border-radius: 8px;
+				background: #fa2c19;
+			}
+		}
+	}
 }

package/dist/components/system/Banner/index.tsx

@@ -1 +1 @@
-import { ComponentInterFace } from '../../../interface/component'
+import { ComponentInterFace } from '../../../interface/component'

package/dist/components/system/PictureHotSpot/index.module.scss

@@ -5,6 +5,10 @@
 		width: 100%;
 		height: auto;
 		// height: 100%;
+		// 在h5中父级有高度，子元素img不设置高度自适应或有精度丢失
+		img {
+			height: 100%;
+		}
 	}
 	.d-sku-price {
 		position: absolute;

package/dist/components/system/PictureHotSpot/index.old.tsx

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/components/system/PictureHotSpot/index.tsx

@@ -1 +1 @@
-import React, { useRef } from 'react'
+import React, { useRef } from 'react'

package/dist/components/system/Video/index.tsx

@@ -1 +1 @@
-import React, { useCallback, useEffect, useRef } from 'react'
+import React, { useCallback, useEffect, useRef } from 'react'

package/dist/config/env.ts

@@ -1 +1 @@
-const buildCopyType = process.env.BUILD_COPY_TYPE || 'none'
+const buildCopyType = process.env.BUILD_COPY_TYPE || 'none'
  isPublishToWxapp || (!isBetaServer && !isDev)
    ? 'https:'
    : isH5
      ? ''
      : 'http:'

package/dist/config/shop.ts

@@ -1 +1 @@
-import { isProd, isPublishToWxapp } from '../config/env'
+import { isProd, isPublishToWxapp } from '../config/env'

package/dist/customHooks/useDocumentVisibilitychange.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/interface/common.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/interface/component.ts

@@ -1 +1 @@
-import React from 'react'
+import React from 'react'

package/dist/interface/index.ts

@@ -0,0 +1 @@
+import { CommonInterFace } from './common'

package/dist/interface/jumpEventReport.ts

@@ -1 +1 @@
-export declare namespace JumpEventReportInterFace {
+export declare namespace JumpEventReportInterFace {

package/dist/interface/service.ts

@@ -1 +1 @@
-import { ComponentInterFace } from './component'
+import { ComponentInterFace } from './component'

package/dist/interface/utils.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/jumpEventReport/base.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/jumpEventReport/const.ts

@@ -1 +1 @@
-export enum LinkConfigType {
+import { isH5 } from '../utils'

package/dist/jumpEventReport/createReportFloorData.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../common'
+import global from '../common'

package/dist/jumpEventReport/index.h5.ts

@@ -1 +1 @@
-import { isApp, getUrlQuery } from '../utils/jm-common'
+import { isApp, getUrlQuery } from '../utils/jm-common'

package/dist/jumpEventReport/index.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/jumpEventReport/index.weapp.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
            if(global){
                if(global.miniAppLogInstance){
                }else{
                    console.log('global.miniAppLogInstance为空！')
                }
            }else{
                console.log('global为空！')
            }

package/dist/jumpEventReport/jdJumpJdApp.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'

package/dist/jumpEventReport/jumpUrlConfig/base.ts

@@ -1 +1 @@
-import { domain } from '../../api'
+import { domain } from '../../api'

package/dist/jumpEventReport/logEventConfig.ts

@@ -1 +1 @@
-export enum LogPnameInfo {
+export enum LogPnameInfo {

package/dist/jumpEventReport/web/report.ts

@@ -1 +1 @@
-const pageName = window.location.origin + window.location.pathname
+const pageName = window.location.origin + window.location.pathname

package/dist/jumpEventReport/web.base.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../common'
+import global from '../common'

package/dist/jumpEventReport/web.jd.ts

@@ -1 +1 @@
-import { JdJumpJdApp } from './jdJumpJdApp'
+import { JdJumpJdApp } from './jdJumpJdApp'

package/dist/jumpEventReport/web.wxapp.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../common'
+import global from '../common'

package/dist/modules/ContainerFloorList/index.h5.tsx

@@ -1 +1 @@
-import React from 'react'
+import React from 'react'

package/dist/modules/ContainerFloorList/index.tsx

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
  className={classNames(
  id={`J_floor_${floorItem?.uid}`}
  key={floorItem.uid}
  data-floor-uid={floorItem?.uid}
  data-floor-type={floorItem?.floorExtInfo?.moduleFlag || ''}
  floorIndex={floorIndex}
  floorData={floorItem}
  layoutLeftRightMargin={containerLayoutLeftRightMargin}
  containerBorderRadius={item?.borderRadius || 0}
  updateShopFloorDataFn={updateShopFloorDataFn}
  loadingEndComponentFn={loadingEndComponentFn}
  key={floorItem.uid}
  changeScrollTopFn={changeContainerFloorListScrollTop}
  builtInComponents={builtInComponents}
  className={
  style={{
  netWorkShowType={NetWorkShowType.PART}
  netWorkDataType={NETWORK_DATA_TYPE.DATA_ERROR}

package/dist/modules/DecorateContainerFloorList/index.module.scss

@@ -1,38 +1,5 @@
 
 
-
-:global {
-	html,
-	body {
-		overflow: hidden;
-		::-webkit-scrollbar {
-			display: none;
-			width: 0;
-		}
-	}
-	.taro_router,
-	.taro_page {
-		height: auto!important;
-		max-height: inherit!important;
-		overflow: auto!important;
-	}
-	
-	.taro_router {
-		min-height: 800PX;
-		padding-bottom: 50PX;
-		.taro_page {
-			position: static!important;
-		}
-	}
-}
-
-page {
-	background: #f2f2f2;
-}
-body {
-	background-size: 100% auto;
-	background-repeat: repeat-y;
-}
 .d-shop-home {
 	.d-decorate-floor {
 		position: relative;

package/dist/modules/DecorateContainerFloorList/index.tsx

@@ -1 +1 @@
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'

package/dist/open/api/global.ts

@@ -0,0 +1 @@
+import global from "../../common";

package/dist/open/api/index.ts

@@ -1 +1 @@
-import * as device from './device'
+import * as device from './device'

package/dist/open/api/jump.ts

@@ -1 +1 @@
-import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
+import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'

package/dist/open/api/track.ts

@@ -1 +1 @@
-import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
+import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
        initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
        updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),

package/dist/open/api/util.ts

@@ -1 +1 @@
-import { dateFormat, showSuccessToast, showFailToast } from '../../utils'
+import { dateFormat, showSuccessToast, showFailToast,showNormalToast } from '../../utils'

package/dist/open/components/index.ts

@@ -1 +1 @@
-import CountDown from '../../components/base/CountDown'
+import CountDown from '../../components/base/CountDown'
    LazyLayoutLoad,
    ExposureSmart

package/dist/open/index.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../common'
+import taroJdBaseInfo from '../common'
    const result = document.domain.match(/jd\.\w+$/)    
    if(result){
        document.domain = result[0]
    }

package/dist/sass/app.h5.scss

@@ -1,5 +1,6 @@
 
-@import '~normalize.css';
+//@import '~normalize.css';
+@import './normalize';
 @import './base';
 
 

package/dist/sass/decorate.h5.scss

@@ -0,0 +1,33 @@
+:global {
+	html,
+	body {
+		overflow: hidden;
+		::-webkit-scrollbar {
+			display: none;
+			width: 0;
+		}
+	}
+	.taro_router,
+	.taro_page {
+		height: auto !important;
+		max-height: inherit !important;
+		overflow: auto !important;
+	}
+	
+	.taro_router {
+		min-height: 800PX;
+		// TODO: 这里的全局样式，用于本地开发工具装修端。但经打包后会影响浏览端样式，使得多出一段间距。暂时屏蔽处理
+		padding-bottom: 50PX;
+		.taro_page {
+			position: static!important;
+		}
+	}
+}
+
+page {
+	background: #f2f2f2;
+}
+body {
+	background-size: 100% auto;
+	background-repeat: repeat-y;
+}

package/dist/sass/normalize.scss

@@ -0,0 +1,261 @@
+
+
+
+
+
+
+html {
+  line-height: 1.15; 
+  -webkit-text-size-adjust: 100%; 
+}
+
+
+
+
+
+body {
+  margin: 0;
+}
+
+
+
+main {
+  display: block;
+}
+
+
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+
+
+
+
+hr {
+  box-sizing: content-box; 
+  height: 0; 
+  overflow: visible; 
+}
+
+
+
+pre {
+  font-family: monospace, monospace; 
+  font-size: 1em; 
+}
+
+
+
+
+
+a {
+  background-color: transparent;
+}
+
+
+
+abbr[title] {
+  border-bottom: none; 
+  text-decoration: underline; 
+  text-decoration: underline dotted; 
+}
+
+
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; 
+  font-size: 1em; 
+}
+
+
+
+small {
+  font-size: 80%;
+}
+
+
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+
+
+
+
+img {
+  border-style: none;
+}
+
+
+
+
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit; 
+  font-size: 100%; 
+  line-height: 1.15; 
+  margin: 0; 
+}
+
+
+
+button,
+input { 
+  overflow: visible;
+}
+
+
+
+button,
+select { 
+  text-transform: none;
+}
+
+
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+
+
+legend {
+  box-sizing: border-box; 
+  color: inherit; 
+  display: table; 
+  max-width: 100%; 
+  padding: 0; 
+  white-space: normal; 
+}
+
+
+
+progress {
+  vertical-align: baseline;
+}
+
+
+
+textarea {
+  overflow: auto;
+}
+
+
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; 
+  padding: 0; 
+}
+
+
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+
+
+[type="search"] {
+  -webkit-appearance: textfield; 
+  outline-offset: -2px; 
+}
+
+
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; 
+  font: inherit; 
+}
+
+
+
+
+
+details {
+  display: block;
+}
+
+
+
+summary {
+  display: list-item;
+}
+
+
+
+
+
+template {
+  display: none;
+}
+
+
+
+[hidden] {
+  display: none;
+}

package/dist/utils/connectNativeJsBridge.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
        displayHeight: 1920,
        offSetY: 0
    }
    console.log('>>>>>>>>>>>>>>>>>>> render taroEventSendPageScrollInfo origin time:', Date.now(), 'res:', options)
    if(options){
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
    }
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}

package/dist/utils/draExceptionHandle.ts

@@ -0,0 +1 @@
+import DraException from "../utils/jm-js-agent";

package/dist/utils/h5Utils.ts

@@ -1 +1 @@
-import {
+import {
  isApp,
  isIOS,
  getAppVersion,
  version,
  getUUID,
  getUrlQuery,
  assign,
  isString,
  isObject,
  serialize,
  isAndroid,
  CHANNEL_TYPE,
  JDShopViewBusinessPathType,
  JDShopViewBusinessPathList,
  SECTION_HOME_TAB_NAME_TYPE,
  parseQueryUrlString(window?.location?.href?? ''),
  if (isJdApp) {
    isIosDevice
      ? e && e.stopPropagation()
      : androidDeviceStopNativeScrollEvent(state)
  }
  isJdApp &&
  isAndroidDevice &&
  window?.JdAndroid &&
  window?.JdAndroid.requestEvent(state)
  if (isH5AndJdShopView) {
    return (
      CHANNEL_TYPE[currentChannel] ||
      CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
    )
  }
  return null
  isH5 &&
  urlPathname === '/app/home' &&
  JDShopViewBusinessPathList.includes(currentChannel)