Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/price/price.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export const Price: FunctionComponent<Partial<TaroPriceProps>> = (props) => {

return (
<>
{harmony() ? (
{harmony() || process.env.TARO_ENV === 'dynamic' ? (
<Text
className={`${classPrefix} ${classPrefix}-${color} ${className}`}
style={style}
Expand Down
4 changes: 2 additions & 2 deletions src/packages/signature/signature.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const InternalSignature: ForwardRefRenderFunction<
const initCanvas = () => {
nextTick(() => {
setTimeout(() => {
if (getEnv() === 'WEAPP' || getEnv() === 'JD') {
if (['WEAPP', 'JD', 'ASCF'].includes(getEnv())) {
createSelectorQuery()
.select(`#${canvasId}`)
.fields(
Expand Down Expand Up @@ -186,7 +186,7 @@ const InternalSignature: ForwardRefRenderFunction<
return (
<View className={`${classPrefix} ${className}`} {...rest}>
<View className={`${classPrefix}-inner spcanvas_WEAPP`} ref={wrapRef}>
{getEnv() === 'WEAPP' || getEnv() === 'JD' ? (
{['WEAPP', 'JD', 'ASCF'].includes(getEnv()) ? (
<canvas
id={canvasId}
ref={canvasRef}
Expand Down
8 changes: 4 additions & 4 deletions src/packages/step/step.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@ export const Step: FunctionComponent<
if (!title && !description) return null

return (
<div className={`${classPrefix}-main`}>
<View className={`${classPrefix}-main`}>
{title && <View className={`${classPrefix}-title`}>{title}</View>}
{description && (
<View className={`${classPrefix}-description`}>{description}</View>
)}
</div>
</View>
)
}, [title, description])

return (
<div className={classes} style={style} onClick={handleClickStep}>
<View className={classes} style={style} onClick={handleClickStep}>
<View className={`${classPrefix}-head`}>
<View className={`${classPrefix}-head-${type || parentType}-wrap`}>
{renderHeadType}
Expand All @@ -106,7 +106,7 @@ export const Step: FunctionComponent<
<View className={`${classPrefix}-line-inner`} />
</View>
{renderContent}
</div>
</View>
)
}

Expand Down
5 changes: 3 additions & 2 deletions src/packages/steps/steps.taro.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { FunctionComponent } from 'react'
import classNames from 'classnames'
import { View } from '@tarojs/components'
import { DataContext } from './context'
import { ComponentDefaults } from '@/utils/typings'
import { TaroStepsProps } from '@/types'
Expand Down Expand Up @@ -48,7 +49,7 @@ export const Steps: FunctionComponent<
)
return (
<DataContext.Provider value={parentSteps}>
<div className={classes} {...restProps}>
<View className={classes}>
{React.Children.map(children, (child, index) => {
if (React.isValidElement(child)) {
return React.cloneElement(child, {
Expand All @@ -60,7 +61,7 @@ export const Steps: FunctionComponent<
}
return child
})}
</div>
</View>
</DataContext.Provider>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/packages/uploader/uploader.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ const InternalUploader: ForwardRefRenderFunction<
document.body.appendChild(obj)
}
}
if (['WEAPP', 'JD', 'WEB'].includes(env) && chooseMedia) {
if (['WEAPP', 'JD', 'WEB', 'ASCF'].includes(env) && chooseMedia) {
chooseMedia({
count: multiple ? (maxCount as number) * 1 - fileList.length : 1,
/** 文件类型 */
Expand Down
Loading