@conecli/cone-render 0.8.20-shop.71 → 0.8.20-shop.73

package/dist/common/jssdk.ts

@@ -0,0 +1 @@
+import ready from '../utils/ready'
  return new Promise((resolve, reject) => {
    ready('jmfe', timeout)
      .then(() => {
        registerCode(JSSDK_APP_WEBVIEW_CODE)
        resolve(window.jmfe)
      })
      .catch(() => {
        console.log('window.jmfe不存在')
        reject(null)
      })
  })
  if (jmfe) {
    console.log('registerCode:', code)
    jmfe.registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }

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

@@ -1 +1 @@
-import { Button, View } from '@tarojs/components'
    NetWorkErrorSubTip,
        subMessage,
    backgroundColorWhite,
    const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType]
    const useErrorSubTip = subMessage? subMessage: NetWorkErrorSubTip[netWorkDataType]
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
    const maxHeight = latestRes.displayHeight || 546   
            style={{maxHeight: isMemberPage ? '100vh' : maxHeight}}
                {useErrorSubTip? <View className={netWorkErrorStyle['d-error-sub-tip']}>{useErrorSubTip}</View>: null}
                        <Button
                            onClick={refershInitData}
                            className={classNames(
                                netWorkErrorStyle['d-opt-btn'],
                                'd-button-no-border',
                            )}
                            plain
                            size="mini"
                        >
                            重新加载
                        </Button>
                    )}
    subMessage: '',
+import { Button, View } from '@tarojs/components'
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  const {
    className,
    message,
    subMessage,
    btnLabel,
    backgroundColorWhite,
    netWorkDataType,
    netWorkShowType,
    netWorkImageType,
    refreshCallBackFn,
  } = props
  const refershInitData = useCallback(() => {
    refreshCallBackFn && refreshCallBackFn(true)
  }, [])
  const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType]
  const useErrorSubTip = subMessage
    ? subMessage
    : NetWorkErrorSubTip[netWorkDataType]
  const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
  const maxHeight = latestRes.displayHeight || 546 
  return NetWorkErrorList.includes(netWorkDataType as NETWORK_DATA_TYPE) ? (
    <View
      style={{ maxHeight: isMemberPage ? '100vh' : maxHeight }}
      className={classNames(
        netWorkErrorStyle['d-shop-network'],
        {
          [netWorkErrorStyle['d-shop-network-white']]: backgroundColorWhite,
        },
        {
          [netWorkErrorStyle['d-shop-network-part']]:
            netWorkShowType === NetWorkShowType.PART,
        },
        {
          [netWorkErrorStyle['d-network-jd-shop-view']]: isH5AndJdShopView,
        },
        'flexible-center-box',
        className,
      )}
    >
      <View className={netWorkErrorStyle['d-error-content']}>
        <View
          className={classNames(
            netWorkErrorStyle['d-error-type'],
            netWorkErrorStyle[`d-${netWorkDataType}`],
            netWorkErrorStyle[`d-${netWorkImageType}`],
          )}
        />
        <View className={netWorkErrorStyle['d-error-tip']}>{useErrorTip}</View>
        {useErrorSubTip ? (
          <View className={netWorkErrorStyle['d-error-sub-tip']}>
            {useErrorSubTip}
          </View>
        ) : null}
        <View className={'flexible-horizontal-center-box'}>
          {refreshCallBackFn && (
            <Button
              onClick={refershInitData}
              className={classNames(
                netWorkErrorStyle['d-opt-btn'],
                'd-button-no-border',
              )}
              plain
              size="mini"
            >
              {btnLabel}
            </Button>
          )}
        </View>
      </View>
    </View>
  ) : null
  className: '',
  message: '',
  subMessage: '',
  btnLabel: '重新加载',
  backgroundColorWhite: false, 
  netWorkDataType: NETWORK_DATA_TYPE.NORMAL,
  netWorkImageType: NetWork_Image_Type.No_Data_Default_Tip,
  netWorkShowType: NetWorkShowType.FULL,
  refreshCallBackFn: null,

package/dist/interface/component.ts

@@ -1 +1 @@
-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
+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

package/dist/open/api/index.ts

@@ -1 +1 @@
-import * as device from './device'
  device,
  environment,
  jump,
  storage,
  util,
  moduleUtil,
  track,
  trackPromise,
  global,
  http,
  shopMember,
  userToken,
  TokenPlatform,
  requestServer,
  isvStorage,
+import * as device from './device'
  device,
  environment,
  jump,
  storage,
  util,
  moduleUtil,
  track,
  trackPromise,
  global,
  http,
  shopMember,
  userToken,
  TokenPlatform,
  requestServer,
  isvStorage,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@conecli/cone-render",
-	"version": "0.8.20-shop.71",
+	"version": "0.8.20-shop.73",
 	"private": false,
 	"files": [
 		"dist/"
@@ -61,7 +61,7 @@
 	],
 	"author": "conecli",
 	"dependencies": {
-		"@tarojs/cli": "^3.5.4",
+		"@tarojs/cli": "3.5.4",
 		"@tarojs/components": "3.5.4",
 		"@tarojs/plugin-framework-react": "3.5.4",
 		"@tarojs/react": "3.5.4",
@@ -115,6 +115,8 @@
 		"webpack": "5.69.0"
 	},
 	"resolutions": {
-		"@babel/runtime": "7.23.7"
+		"@babel/runtime": "7.23.7",
+		"@tarojs/cli": "3.5.4",
+		"@tarojs/helper": "3.5.4"
 	}
 }