diff --git a/src/components/input/input.vue b/src/components/input/input.vue index 5a1516ac..0af953b7 100644 --- a/src/components/input/input.vue +++ b/src/components/input/input.vue @@ -141,9 +141,7 @@ default: false }, autocomplete: { - validator (value) { - return oneOf(value, ['on', 'off']); - }, + type: String, default: 'off' }, clearable: { diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue index 429d5519..61308669 100644 --- a/src/components/modal/modal.vue +++ b/src/components/modal/modal.vue @@ -5,7 +5,7 @@
-
+
@@ -140,6 +140,7 @@ dragging: false }, modalIndex: this.handleGetModalIndex(), // for Esc close the top modal + isMouseTriggerIn: false, // #5800 }; }, computed: { @@ -243,10 +244,17 @@ } }, handleWrapClick (event) { + if (this.isMouseTriggerIn) { + this.isMouseTriggerIn = false; + return; + } // use indexOf,do not use === ,because ivu-modal-wrap can have other custom className const className = event.target.getAttribute('class'); if (className && className.indexOf(`${prefixCls}-wrap`) > -1) this.handleMask(); }, + handleMousedown () { + this.isMouseTriggerIn = true; + }, cancel () { this.close(); }, diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 75349e20..8c350e46 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -437,6 +437,8 @@ if (query === null) { this.onQueryChange(''); this.values = []; + // #5620,修复清空搜索关键词后,重新搜索相同的关键词没有触发远程搜索 + this.lastRemoteQuery = ''; } }, clearSingleSelect(){ // PUBLIC API diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue index e1b2a664..7c791ae2 100644 --- a/src/components/table/table-head.vue +++ b/src/components/table/table-head.vue @@ -16,7 +16,7 @@ {{ column.title || '' }} - +
- + @@ -121,6 +121,12 @@ } else { return [this.columns]; } + }, + isSelectDisabled () { + let isSelectDisabled = false; + if (!this.data.length) isSelectDisabled = true; + if (!this.data.find(item => !item._disabled)) isSelectDisabled = true; + return isSelectDisabled; } }, methods: { diff --git a/src/styles/components/table.less b/src/styles/components/table.less index b686080d..343f99af 100644 --- a/src/styles/components/table.less +++ b/src/styles/components/table.less @@ -161,6 +161,8 @@ &-tooltip{ width: 100%; + display: flex; + align-items: center; &-content{ display: block; overflow: hidden;