Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: input\noticebar\range组件 event事件修改;divider组件demo优化 #365

Merged
merged 37 commits into from
Oct 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3405ccc
feat: toast组件props补齐+国际化,input组件issue问题修改
vickyYE Aug 11, 2022
83a5c3f
Merge branch 'jdf2e:main' into main
vickyYE Aug 11, 2022
ffb0322
Merge branch 'jdf2e:main' into main
vickyYE Aug 19, 2022
ba555f3
feat: toast review问题修改,增加toast单元测试
vickyYE Aug 19, 2022
560dd7f
feat: eslintrc合并冲突修改
vickyYE Aug 24, 2022
feeb31a
feat: textarea组件自定义高度问题修改
vickyYE Aug 24, 2022
171c497
feat: textarea添加单元测试
vickyYE Aug 26, 2022
86aa358
Merge branch 'main' of https://github.com/vickyYE/nutui-react
vickyYE Aug 26, 2022
bf89370
Merge branch 'jdf2e:main' into main
vickyYE Aug 30, 2022
2bef288
fix: 修改textare组件review问题
vickyYE Aug 30, 2022
60bb536
Merge branch 'main' of https://github.com/vickyYE/nutui-react
vickyYE Aug 30, 2022
d671e5e
Merge branch 'jdf2e:main' into main
vickyYE Aug 30, 2022
c01851a
Merge branch 'jdf2e:main' into main
vickyYE Aug 30, 2022
ebf721a
Merge branch 'jdf2e:main' into main
vickyYE Aug 30, 2022
37bff98
feat: range组件增加单元测试
vickyYE Aug 30, 2022
4ad9775
Merge branch 'main' of https://github.com/vickyYE/nutui-react
vickyYE Aug 30, 2022
6f6f702
Merge branch 'jdf2e:main' into main
vickyYE Sep 2, 2022
d3619fb
feat: 增加noticebar单元测试
vickyYE Sep 5, 2022
051a6ca
Merge branch 'main' of https://github.com/vickyYE/nutui-react
vickyYE Sep 5, 2022
888dffe
Merge branch 'jdf2e:main' into main
vickyYE Sep 5, 2022
3ba3802
Merge branch 'jdf2e:main' into main
vickyYE Sep 16, 2022
c554c84
feat: taro适配
vickyYE Sep 16, 2022
cbeb061
feat: 解决合并冲突
vickyYE Sep 16, 2022
be7e31c
feat: toast适配taro
vickyYE Sep 16, 2022
3cc6971
feat: 合并冲突修复
vickyYE Sep 19, 2022
49cc2ba
feat: 获取main分支代码,解决冲突
vickyYE Sep 23, 2022
dc74785
feat: toast报错修复
vickyYE Sep 23, 2022
175b2ee
feat: notify组件适配taro
vickyYE Sep 23, 2022
2e40da4
Merge branch 'jdf2e:main' into main
vickyYE Sep 23, 2022
cb30f1b
feat: mian代码获取,解决合并冲突
vickyYE Oct 24, 2022
fe5a94e
Merge branch 'jdf2e:main' into main
vickyYE Oct 24, 2022
cfd23f1
feat: input数据变化例子补充
vickyYE Oct 24, 2022
7ed9b42
Merge branch 'jdf2e:main' into main
vickyYE Oct 24, 2022
369c978
feat: input\noticebar\range组件 event事件修改;divider组件demo优化
vickyYE Oct 24, 2022
01594d2
feat: 获取主分支代码
vickyYE Oct 24, 2022
a1b05d9
feat: input\noticebar\range组件 event事件修改;divider组件demo优化
vickyYE Oct 24, 2022
f9094cb
feat: 解决合并冲突
vickyYE Oct 24, 2022
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
84 changes: 50 additions & 34 deletions src/packages/divider/demo.taro.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import Taro from '@tarojs/taro'
import { Divider } from '@/packages/nutui.react.taro'
import { Divider, Cell } from '@/packages/nutui.react.taro'
import { useTranslate } from '@/sites/assets/locale/taro'

interface T {
Expand Down Expand Up @@ -40,46 +40,62 @@ const DividerDemo = () => {
<>
<div className="demo">
<h2>{translated.basic}</h2>
<Divider />
<Cell>
<Divider />
</Cell>
<h2>{translated.withText}</h2>
<Divider>{translated.text}</Divider>
<Cell>
<Divider>{translated.text}</Divider>
</Cell>
<h2>{translated.withText}</h2>
<Divider contentPosition="left">{translated.text}</Divider>
<Divider contentPosition="right">{translated.text}</Divider>
<Cell>
<Divider contentPosition="left">{translated.text}</Divider>
</Cell>
<Cell>
<Divider contentPosition="right">{translated.text}</Divider>
</Cell>
<h2>{translated.dashed}</h2>
<Divider dashed>{translated.text}</Divider>
<Cell>
<Divider dashed>{translated.text}</Divider>
</Cell>
<h2>{translated.customStyle}</h2>
<Divider
styles={{
color: '#1989fa',
borderColor: '#1989fa',
padding: '0 16px',
}}
>
{translated.text}
</Divider>
<h2>{translated.verticalDivider}</h2>
<div style={{ fontSize: '14px', marginLeft: '27px', color: '#909ca4' }}>
{translated.text}
<Divider direction="vertical" />
<span
onClick={() => {
Taro.navigateTo({ url: '/pages/index/index' })
<Cell>
<Divider
styles={{
color: '#1989fa',
borderColor: '#1989fa',
padding: '0 16px',
}}
style={{ color: '#1989fa', display: 'inline-block' }}
>
{translated.link}
</span>
<Divider direction="vertical" />
<span
onClick={() => {
Taro.navigateTo({ url: '/pages/index/index' })
}}
style={{ color: '#1989fa', display: 'inline-block' }}
{translated.text}
</Divider>
</Cell>
<h2>{translated.verticalDivider}</h2>
<Cell>
<div
style={{ fontSize: '14px', marginLeft: '27px', color: '#909ca4' }}
>
{translated.link}
</span>
</div>
{translated.text}
<Divider direction="vertical" />
<span
onClick={() => {
Taro.navigateTo({ url: '/pages/index/index' })
}}
style={{ color: '#1989fa', display: 'inline-block' }}
>
{translated.link}
</span>
<Divider direction="vertical" />
<span
onClick={() => {
Taro.navigateTo({ url: '/pages/index/index' })
}}
style={{ color: '#1989fa', display: 'inline-block' }}
>
{translated.link}
</span>
</div>
</Cell>
</div>
</>
)
Expand Down
71 changes: 46 additions & 25 deletions src/packages/divider/demo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react'
import { Divider } from './divider'
import { useTranslate } from '../../sites/assets/locale'
import Cell from '@/packages/cell'

interface T {
basic: string
Expand Down Expand Up @@ -39,36 +40,56 @@ const DividerDemo = () => {
<>
<div className="demo">
<h2>{translated.basic}</h2>
<Divider />
<Cell>
<Divider />
</Cell>

<h2>{translated.withText}</h2>
<Divider>{translated.text}</Divider>
<Cell>
<Divider>{translated.text}</Divider>
</Cell>

<h2>{translated.withText}</h2>
<Divider contentPosition="left">{translated.text}</Divider>
<Divider contentPosition="right">{translated.text}</Divider>
<Cell>
<Divider contentPosition="left">{translated.text}</Divider>
</Cell>
<Cell>
<Divider contentPosition="right">{translated.text}</Divider>
</Cell>
<h2>{translated.dashed}</h2>
<Divider dashed>{translated.text}</Divider>
<Cell>
<Divider dashed>{translated.text}</Divider>
</Cell>

<h2>{translated.customStyle}</h2>
<Divider
styles={{
color: '#1989fa',
borderColor: '#1989fa',
padding: '0 16px',
}}
>
{translated.text}
</Divider>
<Cell>
<Divider
styles={{
color: '#1989fa',
borderColor: '#1989fa',
padding: '0 16px',
}}
>
{translated.text}
</Divider>
</Cell>
<h2>{translated.verticalDivider}</h2>
<div style={{ fontSize: '14px', marginLeft: '27px', color: '#909ca4' }}>
{translated.text}
<Divider direction="vertical" />
<a href="#/Divider" style={{ color: '#1989fa' }}>
{translated.link}
</a>
<Divider direction="vertical" />
<a href="#/Divider" style={{ color: '#1989fa' }}>
{translated.link}
</a>
</div>
<Cell>
<div
style={{ fontSize: '14px', marginLeft: '27px', color: '#909ca4' }}
>
{translated.text}

<Divider direction="vertical" />
<a href="#/Divider" style={{ color: '#1989fa' }}>
{translated.link}
</a>
<Divider direction="vertical" />
<a href="#/Divider" style={{ color: '#1989fa' }}>
{translated.link}
</a>
</div>
</Cell>
</div>
</>
)
Expand Down
3 changes: 2 additions & 1 deletion src/packages/divider/divider.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
font-size: $divider-text-font-size;
color: $divider-text-color;
margin: $divider-margin;
// width: 100%;
width: 100%;

&::before,
&::after {
Expand Down Expand Up @@ -59,5 +59,6 @@
height: $divider-vertical-height;
border-left: 1px solid $divider-vertical-border-left;
margin: $divider-vertical-margin;
width: auto;
}
}
16 changes: 8 additions & 8 deletions src/packages/input/__test__/input.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ test('clearable and clear event test', () => {
defaultValue="清除文本"
clearable
clearSize="14"
clear={handleClear}
onClear={handleClear}
/>
)
const inputEl = container.querySelector('.nut-input-inner') as Element
Expand Down Expand Up @@ -179,13 +179,13 @@ test('clearable and clear event test', () => {
clearSize="14"
leftIcon="dongdong"
rightIcon="ask2"
change={handleChange}
focus={handleFocus}
blur={handleBlur}
click={handleClick}
clickInput={handleClickInput}
clickLeftIcon={handleClickLeftIcon}
clickRightIcon={handleClickRightIcon}
onChange={handleChange}
onFocus={handleFocus}
onBlur={handleBlur}
onClick={handleClick}
onClickInput={handleClickInput}
onClickLeftIcon={handleClickLeftIcon}
onClickRightIcon={handleClickRightIcon}
/>
)
const inputEl = container.querySelector('.input-text') as Element
Expand Down
16 changes: 8 additions & 8 deletions src/packages/input/demo.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,14 @@ const InputDemo = () => {
leftIcon="dongdong"
rightIcon="ask2"
clearable
change={change}
focus={focus}
blur={blur}
clear={clear}
click={click}
clickInput={clickInput}
clickLeftIcon={clickLeftIcon}
clickRightIcon={clickRightIcon}
onChange={change}
onFocus={focus}
onBlur={blur}
onClear={clear}
onClick={click}
onClickInput={clickInput}
onClickLeftIcon={clickLeftIcon}
onClickRightIcon={clickRightIcon}
/>
</div>
</>
Expand Down
16 changes: 8 additions & 8 deletions src/packages/input/demo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,14 @@ const InputDemo = () => {
leftIcon="dongdong"
rightIcon="ask2"
clearable
change={change}
focus={focus}
blur={blur}
clear={clear}
click={click}
clickInput={clickInput}
clickLeftIcon={clickLeftIcon}
clickRightIcon={clickRightIcon}
onChange={change}
onFocus={focus}
onBlur={blur}
onClear={clear}
onClick={click}
onClickInput={clickInput}
onClickLeftIcon={clickLeftIcon}
onClickRightIcon={clickRightIcon}
/>
</div>
</>
Expand Down
32 changes: 16 additions & 16 deletions src/packages/input/doc.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,14 +406,14 @@ const App = () => {
leftIcon="dongdong"
rightIcon="ask2"
clearable
change={change}
focus={focus}
blur={blur}
clear={clear}
click={click}
clickInput={clickInput}
clickLeftIcon={clickLeftIcon}
clickRightIcon={clickRightIcon}
onChange={change}
onFocus={focus}
onBlur={blur}
onClear={clear}
onClick={click}
onClickInput={clickInput}
onClickLeftIcon={clickLeftIcon}
onClickRightIcon={clickRightIcon}
/>
</>
)
Expand Down Expand Up @@ -458,14 +458,14 @@ export default App;

| Event | Description | Arguments |
|--------|----------------|-------------|
| change | Emitted when input value changed | val ,event |
| focus | Emitted when input is focused | val ,event |
| blur | Emitted when input is blurred | val ,event |
| clear | Emitted when the clear icon is clicked | val ,event |
| click | Emitted when component is clicked | val ,event |
| clickInput | Emitted when the input is clicked | val ,event |
| clickLeftIcon | Emitted when the left icon is clicked | val ,event |
| clickRightIcon | Emitted when the right icon is clicked | val ,event |
| onChange `v1.3.8` | Emitted when input value changed | val ,event |
| onFocus `v1.3.8` | Emitted when input is focused | val ,event |
| onBlur `v1.3.8` | Emitted when input is blurred | val ,event |
| onClear `v1.3.8` | Emitted when the clear icon is clicked | val ,event |
| onClick `v1.3.8` | Emitted when component is clicked | val ,event |
| onClickInput `v1.3.8` | Emitted when the input is clicked | val ,event |
| onClickLeftIcon `v1.3.8` | Emitted when the left icon is clicked | val ,event |
| onClickRightIcon `v1.3.8` | Emitted when the right icon is clicked | val ,event |

### Slots

Expand Down
34 changes: 17 additions & 17 deletions src/packages/input/doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,14 +400,14 @@ const App = () => {
leftIcon="dongdong"
rightIcon="ask2"
clearable
change={change}
focus={focus}
blur={blur}
clear={clear}
click={click}
clickInput={clickInput}
clickLeftIcon={clickLeftIcon}
clickRightIcon={clickRightIcon}
onChange={change}
onFocus={focus}
onblur={blur}
onClear={clear}
onClick={click}
onClickInput={clickInput}
onClickLeftIcon={clickLeftIcon}
onClickRightIcon={clickRightIcon}
/>
</>
)
Expand All @@ -419,7 +419,7 @@ export default App;

| 参数 | 说明 | 类型 | 默认值 |
| ------------ | -------------------------------------- | -------------- | ------- |
| defaultValue | 初始默认值 | String | - |
| defaultValue | 初始默认值 | String | - |
| type | 输入框类型,支持原生 `input` 标签的所有 `type` 属性,另外还支持 `textarea` `number` `digit` | String | `text` |
| placeholder | 输入框为空时占位符 | String | - |
| label | 左侧文本 | String | - |
Expand Down Expand Up @@ -451,14 +451,14 @@ export default App;

| 名称 | 说明 | 回调参数 |
|--------|----------------|-------------|
| change | 输入框内容变化时触发 | val ,event |
| focus | 输入框聚焦时触发 | val ,event |
| blur | 输入框失焦时触发 | val ,event |
| clear | 点击清除按钮时触发 | val ,event |
| click`v1.2.1` | 点击组件时触发 | val ,event |
| clickInput`v1.2.1` | 点击输入区域时触发 | val ,event |
| clickLeftIcon`v1.2.1` | 点击左侧图标时触发 | val ,event |
| clickRightIcon`v1.2.1` | 点击右侧图标时触发 | val ,event |
| onChange `v1.3.8` | 输入框内容变化时触发 | val ,event |
| onFocus `v1.3.8` | 输入框聚焦时触发 | val ,event |
| onBlur `v1.3.8` | 输入框失焦时触发 | val ,event |
| onClear `v1.3.8` | 点击清除按钮时触发 | val ,event |
| onClick `v1.3.8` | 点击组件时触发 | val ,event |
| onClickInput `v1.3.8` | 点击输入区域时触发 | val ,event |
| onClickLeftIcon `v1.3.8` | 点击左侧图标时触发 | val ,event |
| onClickRightIcon `v1.3.8` | 点击右侧图标时触发 | val ,event |

### Slots
| 名称 | 说明 |
Expand Down
Loading