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

Jump to bottom

feat: new component Catalogue in v5 #389

Merged
merged 10 commits into from
Nov 9, 2023
Merged

feat: new component Catalogue in v5 #389

merged 10 commits into from
Nov 9, 2023

Conversation

OnlyFlyer
Copy link
Collaborator

@OnlyFlyer OnlyFlyer commented Sep 20, 2023 •
edited
Loading

#193

简介

  • 新增 Catalogue 组件

设计思路：

按照 设计稿，由 Header、TabsWithSearch、Tree 三个组件组成

  1. Header 组件，用于展示 头部文案 和 按钮组 信息，可通过 showHeader 控制隐藏，treeTit 控制文案，btnSlots 控制 按钮组
  2. TabsWithSearch 组件，控制 Tabs 和 Search 展示，支持传入 tabsProps 进行自定义，默认展示 tabs 还是 search 通过 defaultStatus、onStatusChange 控制
  3. Tree 组件，同 Antd 的 Tree 组件，其中 treeData 属性 增加了 contextMenuConfig 属性配置，用于配置 ContextMenu

image

@liuxy0551
Copy link
Collaborator

给个预览地址

@mumiao
Copy link
Collaborator

mumiao commented Oct 10, 2023

可以补充个Previewer

@mumiao mumiao requested review from liuxy0551 and removed request for mumiao and LuckyFBB October 10, 2023 08:47
@mumiao
Copy link
Collaborator

mumiao commented Oct 10, 2023

这个PR，你们两个重点看下，我看修能之前写过树形的，其次这个在开发这边试用。
@liuxy0551 @mortalYoung

@mumiao mumiao mentioned this pull request Oct 10, 2023
Closed
8 tasks
@OnlyFlyer
Copy link
Collaborator Author

预览地址：Reviewer

@liuxy0551
Copy link
Collaborator

拖动未响应
2023-10-12 17 10 57

@liuxy0551
Copy link
Collaborator

  1. tabs 需要叉掉搜索框才能看到
  2. 文字名称过长时宽度应该处理下
  3. 切换 tab 后，内容未变化

2023-10-12 17 14 04

@liuxy0551
Copy link
Collaborator

搜索后高亮，隐藏搜索再打开搜索，显示内容高亮异常

2023-10-12 17 16 58

@liuxy0551
Copy link
Collaborator

Content 和 tree 没有联动

2023-10-12 17 18 20

@mumiao mumiao changed the title Feat catalogue v5 WIP Feat catalogue v5 Oct 19, 2023
@mumiao
Copy link
Collaborator

mumiao commented Nov 1, 2023

@OnlyFlyer 这个近期跟进一下，我这边确定版本时间

@OnlyFlyer
Copy link
Collaborator Author

@OnlyFlyer 这个近期跟进一下，我这边确定版本时间

在修复中

@OnlyFlyer
Copy link
Collaborator Author

拖动未响应 2023-10-12 17 10 57 2023-10-12 17 10 57

可通过 onDrop 对数据进行处理，已补充，预览地址

@OnlyFlyer
Copy link
Collaborator Author

@liuxy0551 上面问题已修复，新增 defaultStatus 和 onStatusChange 属性，文档也一并更新

@OnlyFlyer OnlyFlyer changed the title WIP Feat catalogue v5 feat: new component Catalogue in v5 Nov 2, 2023
@mumiao mumiao added this to the Next Version(5.0.0） milestone Nov 6, 2023
@mumiao mumiao requested a review from Cythia828 November 7, 2023 09:53
@OnlyFlyer
Copy link
Collaborator Author

所有问题均已修复

@liuxy0551 liuxy0551 merged commit a18112a into DTStack:feat_5.x Nov 9, 2023
1 check passed
mumiao pushed a commit that referenced this pull request Nov 14, 2023
@OnlyFlyer @mumiao
feat: new component Catalogue in v5 (#389)
72dc747 
* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>
mumiao added a commit that referenced this pull request Nov 14, 2023
@mumiao @LuckyFBB
@mortalYoung @dependabot @HaydenOrz @Cythia828 @JackWang032 @OnlyFlyer
React Component v5.x (#410)
8490b24 
* Feat update slide pane (#385)

* feat: update slidePane for mask

* feat(slidepane): add tabs for slidepane

* feat(slidepane): update motion for slidePane

* feat(slidepane): update ts error and style

* feat(slidepane): update doc and unit test

* fix(slidepane): update props name and edit showMask to mask

* fix(unittest): update unit test

* fix(slidepane): update ts type

* feat: add tinyTag (#396)

* feat: add tinyTag

* feat: support HTMLSpanElement's Attributes and color

* docs: update docs

* Feat image (#395)

* feat(intersectionobserver): add IntersectionObserver hook

* feat(intersectionobserver): update IntersectionObserver unit test

* feat(useintersectionobserver): use ref and add freezeOnceVisible

* feat(useintersectionobserver): update test unit

* feat(image): add image component

* feat(image): update review comment and mock window.Image

* feat(image): add image test

* feat(contentlayout): add contentLayout (#384)

* feat(contentlayout): add contentLayout

* feat(contentlayout): update contentLayout export table/header

* feat(contentlayout): update contentLayout info

* feat: update contentLayout md

* feat(contengtlayout): update contentLayout md

* feat(contentlayout): update some props

* feat: develop modal (#401)

* fix(useList): initialParams suppport function type (#393)

* build(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 (#399)

Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](browserify/browserify-sign@v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: import highlight core only (#402)

* feat: import highlight core only

* feat: improve Hljs types

* feat: add sideEffects field to improve treeShaking (#403)

* fix: upgrade SpreadSheet component for can be binded ref (#404)

Co-authored-by: zhaoge <>

* feat: add search component on sidebar (#405)

* feat: develop modal

* feat(Modal): improve banner check

* test: add test cases

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Hayden <hayden9653@gmail.com>
Co-authored-by: XCynthia <942884029@qq.com>

* Feat utils (#409)

* build(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 (#399)

Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](browserify/browserify-sign@v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: remove inner utils and add dt-utils dependence

* fix: fix pnpm-lock antd/icon patch version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jialan <jialan@dtstack.com>

* feat: new component Catalogue in v5 (#389)

* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>

* feat(filterrules): add FilterRules (#407)

* feat(filterrules): add FilterRules

* feat(filterrules): update some example

* feat(filterrules): add some example and props type and use weakMap to save height/lineheight

* feat(filterrules): update ts and add comment

* feat(filterrules): update FilterRules props and formitem name

* feat(filterrules): add comment and unit test

* feat(filterrrules): update contants file and style

* test(filterrules): update test unit

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: 霜序 <38368040+LuckyFBB@users.noreply.github.com>
Co-authored-by: 野迂迂 <yangwei1@outlook.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Hayden <hayden9653@gmail.com>
Co-authored-by: XCynthia <942884029@qq.com>
Co-authored-by: JackWang032 <64318393+JackWang032@users.noreply.github.com>
Co-authored-by: jialan <jialan@dtstack.com>
Co-authored-by: Frank <scofield90.email@gmail.com>
Co-authored-by: dilu <dilu@dtstack.com>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
@OnlyFlyer @mumiao
feat: new component Catalogue in v5 (#389)
cd861a1 
* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
@OnlyFlyer @mumiao
feat: new component Catalogue in v5 (#389)
d28d3a7 
* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
@OnlyFlyer @mumiao
feat: new component Catalogue in v5 (#389)
68f35d0 
* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
@OnlyFlyer @mumiao
feat: new component Catalogue in v5 (#389)
aa1ba93 
* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
@OnlyFlyer @mumiao
feat: new component Catalogue in v5 (#389)
2e5d6f9 
* feat(Catalogue): new component, catalogue initial

* chore(Catalogue): lint

* docs: update demo docs

* feat: clear searchStr when close search

* docs: update demo docs

* feat: add defaultStatus & onStatusChange props in Catalogue.DtTree

* chore: rename dtTree、dtTreeSelect to Tree、TreeSelect

* chore: update demos and docs

* chore: treeTit prop exchange to treeTitle

---------

Co-authored-by: dilu <dilu@dtstack.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liuxy0551 liuxy0551 liuxy0551 left review comments

@mortalYoung mortalYoung mortalYoung approved these changes

@Cythia828 Cythia828 Cythia828 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Next Version(5.0.0）
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@OnlyFlyer @liuxy0551 @mumiao @mortalYoung @Cythia828