Commit 343e9fa4 authored by Leopoldthecoder's avatar Leopoldthecoder Committed by 杨奕

DatePicker: fix editable and readonly in range pick

parent 98bf5d7f
...@@ -247,7 +247,7 @@ Use `list-type` to change the fileList style. ...@@ -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>
......
...@@ -247,7 +247,7 @@ ...@@ -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>
......
...@@ -49,6 +49,7 @@ ...@@ -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 @@ ...@@ -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"
......
...@@ -205,18 +205,17 @@ describe('Popover', () => { ...@@ -205,18 +205,17 @@ 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="${trigger}" trigger="click"
@show="handleShow" @show="handleShow"
@hide="handleHide" @hide="handleHide"
content="content"> content="content">
<button slot="reference">trigger ${trigger}</button> <button slot="reference">trigger</button>
</el-popover> </el-popover>
</div> </div>
`, `,
...@@ -236,26 +235,16 @@ describe('Popover', () => { ...@@ -236,26 +235,16 @@ describe('Popover', () => {
}; };
} }
}, true); }, true);
};
it('show/hide', () => {
vm = createVM('click');
const compo = vm.$refs.popover;
vm.$el.querySelector('button').click(); vm.$el.querySelector('button').click();
expect(compo.showPopper).to.true;
expect(vm.trigger).to.false;
document.body.click();
expect(compo.showPopper).to.false;
setTimeout(_ => { setTimeout(_ => {
expect(vm.trigger).to.true; expect(vm.trigger).to.true;
document.body.click(); document.body.click();
setTimeout(_ => { setTimeout(_ => {
expect(vm.trigger).to.false; expect(vm.trigger).to.false;
}, 50);
done(); done();
}, 50); }, 50);
}); }, 50);
}); });
it('destroy event', () => { it('destroy event', () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment