diff --git a/src/packages/input/demos/taro/demo13.tsx b/src/packages/input/demos/taro/demo13.tsx index e5182a427c..a0c271a84a 100644 --- a/src/packages/input/demos/taro/demo13.tsx +++ b/src/packages/input/demos/taro/demo13.tsx @@ -2,7 +2,6 @@ import React from 'react' import { Button, Input } from '@nutui/nutui-react-taro' import { Tips } from '@nutui/icons-react-taro' import { Text, View } from '@tarojs/components' -import { harmonyAndRn } from '@/utils/platform-taro' import pxTransform from '@/utils/px-transform' const Demo13 = () => { @@ -17,9 +16,7 @@ const Demo13 = () => { backgroundColor: '#ffffff', }} > - {!harmonyAndRn() ? ( - - ) : null} + { return ( @@ -13,7 +12,7 @@ const Demo6 = () => { /> : null} + clearIcon={} placeholder="显示清除图标" placeholderTextColor="#757575" /> diff --git a/src/packages/input/demos/taro/demo9.tsx b/src/packages/input/demos/taro/demo9.tsx index 9ce28d752a..4b2c972000 100644 --- a/src/packages/input/demos/taro/demo9.tsx +++ b/src/packages/input/demos/taro/demo9.tsx @@ -2,7 +2,6 @@ import React, { useState } from 'react' import { Input } from '@nutui/nutui-react-taro' import { View } from '@tarojs/components' import { Eye, Marshalling } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' import pxTransform from '@/utils/px-transform' const Demo9 = () => { @@ -35,12 +34,10 @@ const Demo9 = () => { > {/* eslint-disable-next-line no-nested-ternary */} {inputType === 'text' ? ( - !harmonyAndRn() ? ( - - ) : null - ) : !harmonyAndRn() ? ( + + ) : ( - ) : null} + )} diff --git a/src/packages/input/input.scss b/src/packages/input/input.scss index 0ea8e68691..e6db531f8a 100644 --- a/src/packages/input/input.scss +++ b/src/packages/input/input.scss @@ -47,3 +47,7 @@ -webkit-text-fill-color: $input-disabled-color; } } + +.nut-input-clear { + flex: 0; +} diff --git a/src/packages/input/input.taro.tsx b/src/packages/input/input.taro.tsx index 1f70556385..8a696cce53 100644 --- a/src/packages/input/input.taro.tsx +++ b/src/packages/input/input.taro.tsx @@ -18,7 +18,6 @@ import { formatNumber } from './utils' import { useConfig, useRtl } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' -import { harmonyAndRn } from '@/utils/platform-taro' export type InputAlign = 'left' | 'center' | 'right' export type InputFormatTrigger = 'onChange' | 'onBlur' @@ -241,8 +240,7 @@ export const Input = forwardRef( onBlur={handleBlur} onFocus={handleFocus} onInput={(e: any) => { - console.log('eeeeee', e.detail.value) - handleInput((e.currentTarget || e.detail).value) + handleInput((e.detail || e.currentTarget).value) }} /> - {clearIcon || - (!harmonyAndRn() ? ( - - ) : null)} + {clearIcon || } )