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.

Sign up for GitHub

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

fix: 修复cellgroup组件描述判断错误问题 #389

Merged
merged 56 commits into from
Nov 1, 2022
Merged

fix: 修复cellgroup组件描述判断错误问题 #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
7c6154c
feat: cell 单元测试完成
irisSong Jun 9, 2022
4854280
feat: cellgroup 组件单元测试完成
irisSong Jun 9, 2022
3c99bcd
feat: cellgroup 组件单元测试完成
irisSong Jun 9, 2022
8bafbf0
feat: 修改cell 和cellgroup 单元测试文件夹名字
irisSong Jun 9, 2022
08bd32b
feat: card 组件单元测试完成
irisSong Jun 9, 2022
0d848bc
feat: price 组件单元测试完成
irisSong Jun 9, 2022
15527c5
Merge remote-tracking branch 'upstream/main'
irisSong Jun 30, 2022
81cede0
Merge remote-tracking branch 'upstream/main'
irisSong Jul 13, 2022
5121fd3
fix: cell组件props补全+demo和文档国际化+单元测试修改
irisSong Jul 14, 2022
3bdee36
fix: cell Pr修改
irisSong Jul 18, 2022
d2c5285
Merge remote-tracking branch 'upstream/main'
irisSong Jul 18, 2022
7541f66
fix: cell 用例修改
irisSong Jul 18, 2022
e8629e4
Merge remote-tracking branch 'upstream/main'
irisSong Jul 27, 2022
27e4410
Merge remote-tracking branch 'upstream/main'
irisSong Jul 28, 2022
3e615ef
Merge remote-tracking branch 'upstream/main'
irisSong Aug 1, 2022
07f9437
fix: animatingnumbers eslint 报错修改
irisSong Aug 2, 2022
f61e1a3
Merge remote-tracking branch 'upstream/main'
irisSong Aug 3, 2022
8c7b1c6
Merge remote-tracking branch 'upstream/main'
irisSong Aug 8, 2022
8760918
Merge remote-tracking branch 'upstream/main'
irisSong Aug 31, 2022
af5b914
fix: elevator组件支持pc端
irisSong Aug 31, 2022
661e91f
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Sep 5, 2022
e1a21d0
fix: elevator 事件名修改 + taro版本同步修改
irisSong Sep 5, 2022
2f2130f
fix: elevator 组件增加事件名废弃版本号
irisSong Sep 5, 2022
23c11ac
Merge remote-tracking branch 'upstream/main'
irisSong Sep 5, 2022
7153b26
fix: elevator 国际化文档同步修改
irisSong Sep 5, 2022
b7c6449
fix: card\drag组件国际化文档和demo修改, cell组件英文文档修改
irisSong Sep 6, 2022
95a1262
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Sep 6, 2022
924fbff
feat: drag组件增加单元测试
irisSong Sep 8, 2022
3e62d8e
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Sep 8, 2022
975fdda
fix: countdown 组件 props能力不全、demo和文档国际化
irisSong Sep 9, 2022
1142efc
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Sep 9, 2022
b886f22
fix: countdown 组件 文档修改
irisSong Sep 9, 2022
cf7114a
feat: countdown增加单元测试
irisSong Sep 9, 2022
907840e
Merge remote-tracking branch 'upstream/main'
irisSong Sep 21, 2022
70db548
Merge branch 'main' into main-gesture
irisSong Sep 21, 2022
4ca399b
fix: AnimatingNumber 组件 Taro 适配完成
irisSong Sep 22, 2022
e59e5c9
fix: 恢复elevator修改
irisSong Sep 22, 2022
b82caf3
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Sep 22, 2022
b125db5
fix: signature 组件 Taro 适配完成
irisSong Sep 23, 2022
39b43ea
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Sep 23, 2022
5587e64
fix: drag 组件适配完成，elevator组件适配60%，使用taro组件报错，暂停
irisSong Sep 26, 2022
4570054
fix: 修改elevator 样式 + 修改drag taro 组件被覆盖问题
irisSong Sep 26, 2022
30d39fe
fix: taro适配pr修改
irisSong Sep 27, 2022
8d164e2
fix: taro适配pr修改
irisSong Sep 27, 2022
c5e08bd
fix: 合并主分支
irisSong Oct 19, 2022
9993676
fix: signature 组件修改taro demo文案
irisSong Oct 19, 2022
9c4fab3
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Oct 24, 2022
079c831
feat: 合并主分支
irisSong Oct 25, 2022
b5d9db7
fix: cell和signature组件，修改事件名
irisSong Oct 25, 2022
cda5cc8
fix: cell和signature组件，测试用例更新
irisSong Oct 25, 2022
c25b585
fix: 修改文档样式覆盖问题+增加查看日志入口
irisSong Oct 25, 2022
43c6460
fix: elevator组件taro版本适配完成
irisSong Oct 25, 2022
381b096
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Oct 26, 2022
78a4b08
fix: 删除elevator demo 多余标题
irisSong Nov 1, 2022
25158f0
fix: 修改cellgroup组件描述判断
irisSong Nov 1, 2022
4c25ede
Merge remote-tracking branch 'upstream/main' into main-gesture
irisSong Nov 1, 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
4 changes: 1 addition & 3 deletions src/packages/cellgroup/cellgroup.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ export const CellGroup: FunctionComponent<Partial<CellGroupProps>> = (
{titleSlot || (
<>{title ? <div className={b('title')}>{title}</div> : null}</>
)}
{descSlot || (
<>{title ? <div className={b('desc')}>{desc}</div> : null}</>
)}
{descSlot || <>{desc ? <div className={b('desc')}>{desc}</div> : null}</>}

<div className={b('wrap')}>{children}</div>
</div>
Expand Down
4 changes: 1 addition & 3 deletions src/packages/cellgroup/cellgroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ export const CellGroup: FunctionComponent<Partial<CellGroupProps>> = (
{titleSlot || (
<>{title ? <div className={b('title')}>{title}</div> : null}</>
)}
{descSlot || (
<>{title ? <div className={b('desc')}>{desc}</div> : null}</>
)}
{descSlot || <>{desc ? <div className={b('desc')}>{desc}</div> : null}</>}

<div className={b('wrap')}>{children}</div>
</div>
Expand Down