DatePicker: fix editable and readonly in range pick

pull/7926/head
Leopoldthecoder 2017-11-01 11:16:37 +08:00 committed by 杨奕
parent 98bf5d7f28
commit 343e9fa438
4 changed files with 35 additions and 44 deletions

View File

@ -247,7 +247,7 @@ Use `list-type` to change the fileList style.
:on-remove="handleRemove"> :on-remove="handleRemove">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
<el-dialog v-model="dialogVisible" size="tiny"> <el-dialog :visible.sync="dialogVisible" size="tiny">
<img width="100%" :src="dialogImageUrl" alt=""> <img width="100%" :src="dialogImageUrl" alt="">
</el-dialog> </el-dialog>
<script> <script>

View File

@ -247,7 +247,7 @@
:on-remove="handleRemove"> :on-remove="handleRemove">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
<el-dialog v-model="dialogVisible" size="tiny"> <el-dialog :visible.sync="dialogVisible" size="tiny">
<img width="100%" :src="dialogImageUrl" alt=""> <img width="100%" :src="dialogImageUrl" alt="">
</el-dialog> </el-dialog>
<script> <script>

View File

@ -49,6 +49,7 @@
:value="displayValue && displayValue[0]" :value="displayValue && displayValue[0]"
:disabled="disabled" :disabled="disabled"
:id="id && id[0]" :id="id && id[0]"
:readonly="!editable || readonly"
:name="name && name[0]" :name="name && name[0]"
@input="handleStartInput" @input="handleStartInput"
@change="handleStartChange" @change="handleStartChange"
@ -60,6 +61,7 @@
:value="displayValue && displayValue[1]" :value="displayValue && displayValue[1]"
:disabled="disabled" :disabled="disabled"
:id="id && id[1]" :id="id && id[1]"
:readonly="!editable || readonly"
:name="name && name[1]" :name="name && name[1]"
@input="handleEndInput" @input="handleEndInput"
@change="handleEndChange" @change="handleEndChange"

View File

@ -205,57 +205,46 @@ describe('Popover', () => {
}); });
}); });
describe('event', (done) => { it('show/hide events', done => {
const createVM = (trigger) => { vm = createVue({
return createVue({ template: `
template: ` <div>
<div> <el-popover
<el-popover ref="popover"
ref="popover" trigger="click"
trigger="${trigger}" @show="handleShow"
@show="handleShow" @hide="handleHide"
@hide="handleHide" content="content">
content="content"> <button slot="reference">trigger</button>
<button slot="reference">trigger ${trigger}</button> </el-popover>
</el-popover> </div>
</div> `,
`,
methods: { methods: {
handleShow() { handleShow() {
this.trigger = true; this.trigger = true;
},
handleHide() {
this.trigger = false;
}
}, },
handleHide() {
data() { this.trigger = false;
return {
trigger: false
};
} }
}, true); },
};
it('show/hide', () => { data() {
vm = createVM('click'); return {
const compo = vm.$refs.popover; trigger: false
};
}
}, true);
vm.$el.querySelector('button').click(); vm.$el.querySelector('button').click();
expect(compo.showPopper).to.true; setTimeout(_ => {
expect(vm.trigger).to.false; expect(vm.trigger).to.true;
document.body.click(); document.body.click();
expect(compo.showPopper).to.false;
setTimeout(_ => { setTimeout(_ => {
expect(vm.trigger).to.true; expect(vm.trigger).to.false;
document.body.click();
setTimeout(_ => {
expect(vm.trigger).to.false;
}, 50);
done(); done();
}, 50); }, 50);
}); }, 50);
}); });
it('destroy event', () => { it('destroy event', () => {