From 63acc5c4ae6418d816dab13a578aed209c3941a2 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 25 Sep 2019 12:13:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=A6=81=E5=8F=91=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselectlist/multiselectlist.insert.js | 1 + src/widget/multiselectlist/multiselectlist.insert.nobar.js | 1 + src/widget/multiselectlist/multiselectlist.js | 1 + 3 files changed, 3 insertions(+) diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js index 9d8aff81d..ea51fbf92 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.js +++ b/src/widget/multiselectlist/multiselectlist.insert.js @@ -137,6 +137,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { self.adapter.setValue(self.storeValue); assertShowValue(); } + self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE); }); } } diff --git a/src/widget/multiselectlist/multiselectlist.insert.nobar.js b/src/widget/multiselectlist/multiselectlist.insert.nobar.js index 5254fbf93..fbeed11a5 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.nobar.js +++ b/src/widget/multiselectlist/multiselectlist.insert.nobar.js @@ -142,6 +142,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { self.adapter.setValue(self.storeValue); assertShowValue(); } + self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE); }); } } diff --git a/src/widget/multiselectlist/multiselectlist.js b/src/widget/multiselectlist/multiselectlist.js index f6b368a2e..aa64218da 100644 --- a/src/widget/multiselectlist/multiselectlist.js +++ b/src/widget/multiselectlist/multiselectlist.js @@ -120,6 +120,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, { self.adapter.setValue(self.storeValue); assertShowValue(); } + self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE); }); } } From 998bd223a14e640dfc7ecefc4f44b16c29c2aeab Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 25 Sep 2019 12:14:50 +0800 Subject: [PATCH 2/5] update --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 035217856..272f1c211 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2019-09) +- 文本列表通过复制粘贴的形式选中值的时候发送事件 - 修复tree_value_chooser选中节点的唯一子节点后搜索该子节点，无法取消选中的问题 - button的bubble创建的popup在收起的时候会destroy - 修复了dynamic_date_pane在切换静态时间和动态时间的时候不会发事件的问题 From fa61b8871d61e71bb0b09b27c0e3518874f83c02 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 25 Sep 2019 12:16:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?update:=20=E4=BA=8B=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselectlist/multiselectlist.insert.nobar.js | 2 +- src/widget/multiselectlist/multiselectlist.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/multiselectlist/multiselectlist.insert.nobar.js b/src/widget/multiselectlist/multiselectlist.insert.nobar.js index fbeed11a5..136aa51c5 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.nobar.js +++ b/src/widget/multiselectlist/multiselectlist.insert.nobar.js @@ -142,7 +142,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { self.adapter.setValue(self.storeValue); assertShowValue(); } - self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE); + self.fireEvent(BI.MultiSelectInsertNoBarList.EVENT_CHANGE); }); } } diff --git a/src/widget/multiselectlist/multiselectlist.js b/src/widget/multiselectlist/multiselectlist.js index aa64218da..d364b6336 100644 --- a/src/widget/multiselectlist/multiselectlist.js +++ b/src/widget/multiselectlist/multiselectlist.js @@ -120,7 +120,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, { self.adapter.setValue(self.storeValue); assertShowValue(); } - self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE); + self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); }); } } From 19c8e5dde61b007ea7974ce9d005ba0088a03165 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 25 Sep 2019 13:53:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?BI-52452=20refactor:=20=E5=8A=A0=E5=9C=86?= =?UTF-8?q?=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 1 + src/base/layer/layer.popover.js | 3 ++- src/css/base/view/popover.css | 3 +++ src/less/base/view/popover.less | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 272f1c211..ac301c032 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2019-09) +- [视觉]popover弹出框增加圆角 - 文本列表通过复制粘贴的形式选中值的时候发送事件 - 修复tree_value_chooser选中节点的唯一子节点后搜索该子节点，无法取消选中的问题 - button的bubble创建的popup在收起的时候会destroy diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index 35c895ffd..9a17cba61 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -15,7 +15,7 @@ BI.Popover = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.Popover.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-popover bi-card", + baseCls: "bi-popover bi-card bi-border-radius", // width: 600, // height: 500, size: "normal", // small, normal, big @@ -63,6 +63,7 @@ BI.Popover = BI.inherit(BI.Widget, { cls: "bi-font-bold", height: this._constant.HEADER_HEIGHT, text: o.header, + title: o.header, textAlign: "left" }, left: 20, diff --git a/src/css/base/view/popover.css b/src/css/base/view/popover.css index e69de29bb..3882aa373 100644 --- a/src/css/base/view/popover.css +++ b/src/css/base/view/popover.css @@ -0,0 +1,3 @@ +.bi-popover { + border: 1px solid transparent; +} diff --git a/src/less/base/view/popover.less b/src/less/base/view/popover.less index 4396636cf..4600d797c 100644 --- a/src/less/base/view/popover.less +++ b/src/less/base/view/popover.less @@ -1,4 +1,5 @@ @import "../../index"; .bi-popover { + border: 1px solid transparent; } \ No newline at end of file From b3a1f142b36c8400eb81c07ef94ebda1c153032d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 25 Sep 2019 18:11:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=98=BB=E6=AD=A2?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BA=8B=E4=BB=B6=E5=86=92=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/popup.bubble.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js index c722d9d56..177aab304 100644 --- a/src/case/combo/bubblecombo/popup.bubble.js +++ b/src/case/combo/bubblecombo/popup.bubble.js @@ -110,9 +110,11 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, { buttons: [{ level: "ignore", value: false, + stopPropagation: true, text: BI.i18nText("BI-Basic_Cancel") }, { value: true, + stopPropagation: true, text: BI.i18nText("BI-Basic_Sure") }] };