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

V5 feat/cubic edge,cubic horizon edge,cubic vertical edge #4669

Merged
merged 26 commits into from
Jun 26, 2023
Merged

V5 feat/cubic edge,cubic horizon edge,cubic vertical edge #4669

merged 26 commits into from
Jun 26, 2023

Conversation

liaodalin19903
Copy link
Contributor

@liaodalin19903 liaodalin19903 commented Jun 22, 2023

Checklist
  • [v] npm test passes
  • [v] tests and/or benchmarks are included
  • [v] commit message follows commit guidelines
Description of change
  • [v] upgrade the dependencies of G6/packages/g6's packages.json.
  • [v] replace deprecated libraries to advanced ones.
    • replace awesome-typescript-loader -> ts-loader
    • jest-electron -> @kayahr/jest-electron-runner
    • rollup-plugin-uglify -> @rollup/plugin-terser
  • [v] feat: v5/cubic-edge
  • [v] feat: v5/cubic-horizon-edge
  • [v] feat: v5/cubic-vertical-edge
Test snapshots
  • cubic

20230625125605

20230625125624

20230625142233

20230625142257

20230625142311

  • cubic-horizon

20230625142425

20230625142443

20230625142455

20230625142536

20230625142545

  • cubic-vertical

20230625142902

20230625142914

20230625142925

20230625142935

20230625142943

* update jest.config.js for using `@kayahr/jest-electron-runner`
* update rollup.config.js for using `@rollup/plugin-terser`
chore: add integration test

chore: add unit test(but there have several tests TODO )
*feat: v5-cubic-horizon-edge

*chore: test/unit/v5-cubic-horizon-edge

*chore: test/integration/v5-cubic-horizon-edge
*feat: v5-cubic-horizon-edge

*chore: test/unit/v5-cubic-horizon-edge

*chore: test/integration/v5-cubic-horizon-edge

fix: curve bug
packages/g6/src/stdlib/item/edge/cubic-horizon.ts Outdated Show resolved Hide resolved
packages/g6/src/stdlib/item/edge/cubic-horizon.ts Outdated Show resolved Hide resolved
packages/g6/src/stdlib/item/edge/cubic.ts Outdated Show resolved Hide resolved
packages/g6/package.json Show resolved Hide resolved
@Yanyan-Wang
Copy link
Contributor

感谢 PR ~~ 感觉问题不大了,有两个冲突可以 rebase 一下 v5 分支解决一下。另外是否能贴一些效果截图

package-lock.json Outdated Show resolved Hide resolved
packages/g6/src/stdlib/item/edge/cubic-vertical.ts Outdated Show resolved Hide resolved
liaodalin19903 and others added 17 commits June 26, 2023 10:18
* fix: support position config:'topRight'

* add demo to reproduce bug
* update: update demo for bug reproduce

* fix: fix the bug
* feat: add RectNode

* add: add rect test demo

* add: add rect test demo

* update: update RectNode with less override

* update: remove 'console.log'

* update: remove comment

* update: remove cn comment

* add: add rect-spec.ts for unit test

---------

Co-authored-by: Yanyan Wang <[email protected]>
* fix: implement onZoom as empty function for 3d node

* chore: refine

* chore: lint
* add: add a test demo

* feat: add quadratic

* add: add unit test demo

* fix: add seItemState(selected、active、highlight、inactive、disable) test into spec.
chore: add integration test

chore: add unit test(but there have several tests TODO )
*feat: v5-cubic-horizon-edge

*chore: test/unit/v5-cubic-horizon-edge

*chore: test/integration/v5-cubic-horizon-edge
*feat: v5-cubic-horizon-edge

*chore: test/unit/v5-cubic-horizon-edge

*chore: test/integration/v5-cubic-horizon-edge

fix: curve bug
*chore: use relative import path

*chore: delete unused imports

*fix: fix the rebase imports
@Yanyan-Wang
Copy link
Contributor

合并啦~

@Yanyan-Wang Yanyan-Wang merged commit 8a520b2 into antvis:v5 Jun 26, 2023
@Yanyan-Wang Yanyan-Wang mentioned this pull request Jun 26, 2023
1 task
@liaodalin19903 liaodalin19903 deleted the v5-feat/cubic-edge,cubic-horizon-edge,cubic-vertical-edge branch June 26, 2023 08:59
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.

4 participants