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

Cascader: Fix disable status and close button issue (#16209)

pull/17047/head
Inside 2019-08-14 19:55:24 +08:00 committed by luckyCao
parent 0bff072fa7
commit 27398103c4
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/cascader/src/cascader.vue
View File

@ -300,6 +300,9 @@ export default {
}, },
watch: { watch: {
disabled() {
this.computePresentContent();
},
value(val) { value(val) {
if (!isEqual(val, this.checkedValue)) { if (!isEqual(val, this.checkedValue)) {
this.checkedValue = val; this.checkedValue = val;

8
test/unit/specs/cascader.spec.js
View File

@ -50,6 +50,7 @@ const options = [{
const getMenus = el => el.querySelectorAll('.el-cascader-menu'); const getMenus = el => el.querySelectorAll('.el-cascader-menu');
const getOptions = (el, menuIndex) => getMenus(el)[menuIndex].querySelectorAll('.el-cascader-node'); const getOptions = (el, menuIndex) => getMenus(el)[menuIndex].querySelectorAll('.el-cascader-node');
const selectedValue = ['zhejiang', 'hangzhou', 'xihu']; const selectedValue = ['zhejiang', 'hangzhou', 'xihu'];
const getCloseButton = el => el.querySelectorAll('i.el-tag__close');
describe('Cascader', () => { describe('Cascader', () => {
let vm; let vm;
@ -242,12 +243,14 @@ describe('Cascader', () => {
<el-cascader <el-cascader
v-model="value" v-model="value"
:options="options" :options="options"
:disabled="disabled"
:props="props"></el-cascader> :props="props"></el-cascader>
`, `,
data() { data() {
return { return {
value: [], value: [],
options, options,
disabled: false,
props: { props: {
multiple: true multiple: true
} }
@ -258,6 +261,7 @@ describe('Cascader', () => {
getOptions(document.body, 0)[0].querySelector('.el-checkbox input').click(); getOptions(document.body, 0)[0].querySelector('.el-checkbox input').click();
await waitImmediate(); await waitImmediate();
expect(vm.value.length).to.equal(3); expect(vm.value.length).to.equal(3);
expect(getCloseButton(vm.$el).length).to.equal(3);
const tags = vm.$el.querySelectorAll('.el-tag'); const tags = vm.$el.querySelectorAll('.el-tag');
const closeBtn = tags[0].querySelector('.el-tag__close'); const closeBtn = tags[0].querySelector('.el-tag__close');
@ -267,6 +271,10 @@ describe('Cascader', () => {
await waitImmediate(); await waitImmediate();
expect(vm.value.length).to.equal(2); expect(vm.value.length).to.equal(2);
expect(vm.$el.querySelectorAll('.el-tag').length).to.equal(2); expect(vm.$el.querySelectorAll('.el-tag').length).to.equal(2);
vm.disabled = true;
await waitImmediate();
expect(getCloseButton(vm.$el).length).to.equal(0);
}); });
it('clearable in multiple mode', async() => { it('clearable in multiple mode', async() => {