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

Table: add summary row, fixed #1307, fixed #4451 #4484

Merged
merged 1 commit into from
Apr 28, 2017

Conversation

Leopoldthecoder
Copy link
Contributor

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

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

测试还没写,等发完 beta 再写。

Copy link
Contributor

@QingWei-Li QingWei-Li left a comment

Choose a reason for hiding this comment

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

太长不看

@liril-net
Copy link
Contributor

所以,等写完测试再合嘛

@Leopoldthecoder
Copy link
Contributor Author

@liril-net 先合再写测试🌚

@@ -78,6 +78,8 @@ export default {
: ''
]
).concat(
this._self.$parent.$slots.append ? this._self.$parent.$slots.append : ''
Copy link
Contributor

Choose a reason for hiding this comment

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

this._self.$parent.$slots.append 不就完了么为啥还要判断

Copy link
Contributor Author

Choose a reason for hiding this comment

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

说好不看的呢!

@liril-net liril-net merged commit 349894d into ElemeFE:dev Apr 28, 2017
@Leopoldthecoder Leopoldthecoder deleted the table-summary branch May 5, 2017 00:49
bluejfox added a commit to setariajs/setaria-ui that referenced this pull request May 25, 2017
* commit '3c590edbab561819ec78b842d38ddf9a27cd733f': (35 commits)
  [release] 1.3.0-beta.1
  [build] 1.3.0-beta.1
  update docs vue version
  Changelog: update for 1.3.0-beta.1
  Transfer (ElemeFE#4337)
  Table: add summary row, fixed ElemeFE#1307, fixed ElemeFE#4451 (ElemeFE#4484)
  Update date.vue
  Update date.vue
  DatePicker: 当format不包括秒时,时间下拉菜单不展示ss
  update dependencies
  Radio: fix radio-button style when nested in a form-item
  DatePicker: make type responsive(ElemeFE#4417)
  Transition: update docs
  doc: add DatePicker default-value
  DatePicker: supports default value
  i18n: update doc about vue-i18n@6.x (ElemeFE#4471)
  support use transitiongroup in el-col (ElemeFE#4483)
  Switch:feat support number value
  Switch: feature add-expand-value
  fix upload can't select the same file
  ...

# Conflicts:
#	CHANGELOG.zh-CN.md
#	README.md
#	build/bin/version.js
#	build/deploy-ci.sh
#	examples/docs/zh-CN/dialog.md
#	examples/docs/zh-CN/upload.md
#	examples/versions.json
#	package.json
#	packages/date-picker/src/basic/time-spinner.vue
#	packages/date-picker/src/panel/date.vue
#	packages/dialog/src/component.vue
#	packages/upload/src/index.vue
#	packages/upload/src/upload.vue
#	src/index.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants