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: develop modal #401

Merged
merged 9 commits into from
Nov 7, 2023
Merged

feat: develop modal #401

merged 9 commits into from
Nov 7, 2023

Conversation

mortalYoung
Copy link
Collaborator

简介

  • 新增 Modal 组件

Changes

和 Ant Design 的区别在于,更符合袋鼠云的设计规范

  • 限制最大高度
  • 尺寸对应的宽度
  • 支持 banner 属性

@mumiao mumiao self-requested a review November 2, 2023 01:59
dependabot bot and others added 4 commits November 2, 2023 10:02
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

* feat: improve Hljs types
@mortalYoung
Copy link
Collaborator Author

Previewer

@mortalYoung mortalYoung changed the title WIP: feat: develop modal feat: develop modal Nov 2, 2023
@mumiao
Copy link
Collaborator

mumiao commented Nov 3, 2023

Previewer

image

bannersize属性,组件文档没有出现

@mumiao
Copy link
Collaborator

mumiao commented Nov 3, 2023

这个组件是基于之前Modal.Form改造而来的,你link到资产那边测试看看,对于原先组件有没有影响, 再Review一下 @LuckyFBB

@mumiao mumiao requested review from LuckyFBB and removed request for liuxy0551 November 3, 2023 02:24
@mortalYoung
Copy link
Collaborator Author

这个组件是基于之前Modal.Form改造而来的,你link到资产那边测试看看,对于原先组件有没有影响, 再Review一下 @LuckyFBB

不是的 理解错了 文档更新了 再看一样文档呗

@mumiao mumiao changed the base branch from master to feat_5.x November 6, 2023 05:48
@mumiao mumiao added this to the Next Version(5.0.0) milestone Nov 6, 2023

export interface IModalProps extends ModalProps {
size?: 'small' | 'default' | 'large';
banner?: AlertProps['message'] | Omit<AlertProps, 'banner'>;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥将 alert 改名为了 banner,看到那个样式第一眼就是 alert 的组件,也方便去看 AlertProps

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

回头看看,感觉叫alert会不会确实好点

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

因为从设计师的角度来说,这个叫做 banner,并且基本上是用 alert 的 banner 模式,所以我这里直接叫 banner 我认为会更好一些。

@mumiao
Copy link
Collaborator

mumiao commented Nov 7, 2023

+1

@mumiao mumiao merged commit 737530e into DTStack:feat_5.x Nov 7, 2023
1 check passed
@mumiao mumiao mentioned this pull request Nov 7, 2023
8 tasks
@mortalYoung mortalYoung deleted the feat/modal branch November 14, 2023 03:13
mumiao pushed a commit that referenced this pull request Nov 14, 2023
* 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>
mumiao added a commit that referenced this pull request Nov 14, 2023
* 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
* 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>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
* 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>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
* 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>
mumiao pushed a commit that referenced this pull request Nov 15, 2023
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants