github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #215 from QingWei-Li/fix/date-picker 

TimePicker: fix incorrectly hide panel,fixed #210
pull/225/head
杨奕 2016-10-03 10:29:27 +08:00 committed by GitHub
parent 74c7513f04 a8df9de2ee
commit 01c7b9aca2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
*2016-XX-XX* *2016-XX-XX*
- 修复 Tabs 切换后 Tab-panel 被销毁的问题 - 修复 Tabs 切换后 Tab-panel 被销毁的问题
- 修复 TimePicker 错误的隐藏面板
- 修复 Table Cell 的样式, #204 - 修复 Table Cell 的样式, #204
### 1.0.0-rc.5 ### 1.0.0-rc.5

2
packages/date-picker/src/panel/time.vue
View File

@ -28,7 +28,7 @@
</transition> </transition>
</template> </template>
<script type="text/ecmascript-6"> <script type="text/babel">
import { limitRange } from '../util'; import { limitRange } from '../util';
import Vue from 'vue'; import Vue from 'vue';

6
packages/date-picker/src/picker.vue
View File

@ -211,7 +211,7 @@ export default {
watch: { watch: {
pickerVisible(val) { pickerVisible(val) {
val === true ? this.showPicker() : this.hidePicker(); val ? this.showPicker() : this.hidePicker();
}, },
value(val) { value(val) {
this.dispatch('form-item', 'el.form.change'); this.dispatch('form-item', 'el.form.change');
@ -289,8 +289,8 @@ export default {
handleFocus() { handleFocus() {
const type = this.type; const type = this.type;
if (HAVE_TRIGGER_TYPES.indexOf(type) !== -1) { if (HAVE_TRIGGER_TYPES.indexOf(type) !== -1 && !this.pickerVisible) {
this.pickerVisible = !this.pickerVisible; this.pickerVisible = true;
} }
this.$emit('focus', this); this.$emit('focus', this);
}, },