From c92fde6798248bdc201163c116575929541cc0cb Mon Sep 17 00:00:00 2001 From: bitqiang Date: Thu, 17 Jan 2019 22:09:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=A8=E9=83=A8=E4=B8=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=89=EF=BC=8C=E8=A1=A8=E5=A4=B4=E7=9A=84=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B9=9F=E7=A6=81=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/table/table-head.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue index 006e9b14..56211f61 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: { From c9977535bee03e863e4a4b2874dee8157314753c Mon Sep 17 00:00:00 2001 From: msidolphin Date: Tue, 9 Apr 2019 10:05:37 +0800 Subject: [PATCH 2/7] fix #5472 --- src/styles/components/table.less | 2 ++ 1 file changed, 2 insertions(+) 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; From 0d9cc2e41ca0a9177a43b1bc9bffb6721d512507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 12 Apr 2019 15:45:49 +0800 Subject: [PATCH 3/7] feat(Input): remove prop :autocomplete value validation --- src/components/input/input.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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: { From 1ca8841c4c36a654ba2f36fec8b282a7cc374f46 Mon Sep 17 00:00:00 2001 From: yJs Date: Fri, 12 Apr 2019 18:35:57 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E8=AF=8D=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=90=9C=E7=B4=A2=E7=9B=B8=E5=90=8C=E7=9A=84?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/select/select.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index fe17c090..46e659f6 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -437,6 +437,8 @@ if (query === null) { this.onQueryChange(''); this.values = []; + //修复清空搜索关键词后，重新搜索相同的关键词没有触发远程搜索 + this.lastRemoteQuery=''; } }, clearSingleSelect(){ // PUBLIC API From 0ffbd0675ebeadbad09b5be806c655b75e4de948 Mon Sep 17 00:00:00 2001 From: Aresn Date: Tue, 21 May 2019 10:14:20 +0800 Subject: [PATCH 5/7] Update select.vue --- src/components/select/select.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 46e659f6..dbe69ec4 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -437,8 +437,8 @@ if (query === null) { this.onQueryChange(''); this.values = []; - //修复清空搜索关键词后，重新搜索相同的关键词没有触发远程搜索 - this.lastRemoteQuery=''; + // #5620,修复清空搜索关键词后，重新搜索相同的关键词没有触发远程搜索 + this.lastRemoteQuery = ''; } }, clearSingleSelect(){ // PUBLIC API From bb060b98bcfd6b0f52d1a33a9989a93b23137cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 21 May 2019 10:53:27 +0800 Subject: [PATCH 6/7] fix #5800, close #5647 --- src/components/modal/modal.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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(); }, From 52e49907f5b5683a428add32d28269c8650cd0f3 Mon Sep 17 00:00:00 2001 From: Aresn Date: Tue, 21 May 2019 11:18:04 +0800 Subject: [PATCH 7/7] Update table-head.vue --- src/components/table/table-head.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue index 56211f61..c767c824 100644 --- a/src/components/table/table-head.vue +++ b/src/components/table/table-head.vue @@ -125,7 +125,7 @@ isSelectDisabled () { let isSelectDisabled = false; if (!this.data.length) isSelectDisabled = true; - if(!this.data.find(item => !item._disabled)) isSelectDisabled = true; + if (!this.data.find(item => !item._disabled)) isSelectDisabled = true; return isSelectDisabled; } },