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

Update Tree drag & drop logic. #10372

Merged
merged 1 commit into from
Mar 28, 2018
Merged

Update Tree drag & drop logic. #10372

merged 1 commit into from
Mar 28, 2018

Conversation

furybean
Copy link
Contributor

@furybean furybean commented Mar 26, 2018 •
edited
Loading

Please make sure these boxes are checked before submitting your PR, thank you!

  • Make sure you follow Element's contributing guide (中文 | English | Español).
  • Make sure you are merging your commits to dev branch.
  • Add some descriptions and refer relative issues for you PR.

@Leopoldthecoder
Copy link
Contributor

感觉应该加一些测试

elfman
elfman reviewed Mar 27, 2018
View reviewed changes
Copy link
Contributor

@elfman elfman left a comment

Choose a reason for hiding this comment

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

tree.md的1068行那里，把后半句删了吧，你已经允许node放置到不同的level上了

@furybean furybean force-pushed the update-tree-drag-logic branch from 7354ac6 to d1cf1be Compare March 27, 2018 07:05
@furybean
Copy link
Contributor Author

furybean commented Mar 27, 2018 •
edited
Loading

@Leopoldthecoder 没找到拖拽的单测，只有一个 Slider 是靠传参模拟的。看了下同类组件的项目，也都是简单测试事件是否触发，没判断整个拖拽逻辑是否符合预期。感觉这块的测试暂时还属于比较初级的领域。

@Leopoldthecoder Leopoldthecoder merged commit 4fe58a3 into ElemeFE:dev Mar 28, 2018
bluejfox added a commit to setariajs/setaria-ui that referenced this pull request Apr 16, 2018
@bluejfox
同步至ElementUI 2.3.0版本
ef06e71 
Merge commit '3a37a74127aafcc15deac45782644715009194bb' into current

* commit '3a37a74127aafcc15deac45782644715009194bb': (119 commits)
  [release] 2.3.0
  [build] 2.3.0
  Changelog: update for 2.3.0 (ElemeFE#10398)
  Tree: update drag and drop docs (ElemeFE#10396)
  Tree: update drag and drop logic (ElemeFE#10372)
  Dropdown: fix arrow offset (ElemeFE#10394)
  Input: add inheritAttrs (ElemeFE#10391)
  Table: fix filter panel reference element to the trigger span (ElemeFE#10384)
  Input: bind native attrs to input and textarea element (ElemeFE#10382)
  TimePicker: fix missing dependency style files (ElemeFE#10381)
  Button: add circle attribute (ElemeFE#10359)
  Table: filter-panel should hide when new one shows (ElemeFE#10373)
  TimePicker: remove unnecessary margin-left (ElemeFE#10371)
  Chore: misc updates (ElemeFE#10370)
  MessageBox: allow showInput when message is empty (ElemeFE#10337)
  Input: bind id only when given (ElemeFE#10360)
  Progress: update docs for color prop (ElemeFE#10358)
  Input: add blur method (ElemeFE#10356)
  Progress: add color attribute (ElemeFE#10352)
  Form: add validate event (ElemeFE#10351)
  ...

# Conflicts:
#	CHANGELOG.zh-CN.md
#	README.md
#	build/bin/version.js
#	build/deploy-ci.sh
#	examples/app.vue
#	examples/docs/zh-CN/quickstart.md
#	examples/versions.json
#	package.json
#	packages/color-picker/src/components/picker-dropdown.vue
#	packages/date-picker/src/panel/date-range.vue
#	packages/date-picker/src/panel/date.vue
#	packages/menu/src/menu.vue
#	packages/select/src/select.vue
#	packages/tree/src/tree.vue
#	src/index.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elfman elfman elfman approved these changes

@Leopoldthecoder Leopoldthecoder Awaiting requested review from Leopoldthecoder

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@furybean @Leopoldthecoder @elfman