From 311f6838548a68b1eb96aaab8d55dd190b1e3153 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 13 Jun 2022 14:43:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=20colorchooser=20simple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/colorchooser/colorchooser.js | 1 + src/case/colorchooser/colorchooser.simple.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index 737b3a189..d6a6e7481 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -30,6 +30,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, { isNeedAdjustHeight: false, el: BI.extend({ type: o.width <= 24 ? "bi.color_chooser_trigger" : "bi.long_color_chooser_trigger", + simple: o.simple, ref: function (_ref) { self.trigger = _ref; }, diff --git a/src/case/colorchooser/colorchooser.simple.js b/src/case/colorchooser/colorchooser.simple.js index b360efbf3..0b3f7bea3 100644 --- a/src/case/colorchooser/colorchooser.simple.js +++ b/src/case/colorchooser/colorchooser.simple.js @@ -20,6 +20,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.color_chooser", + simple: o.simple, element: this, container: o.container, value: o.value, From 8b758e76036e8251bf11ef3904b8f88ceab60890 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 14 Jun 2022 16:01:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20downlist?= =?UTF-8?q?=20popup=E7=9A=84=E5=88=86=E5=89=B2=E7=BA=BF=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/downlist/popup.downlist.js | 3 +-- src/widget/multilayerdownlist/popup.downlist.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index 35d395334..0e802a695 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -153,8 +153,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", vgap: 5, - lgap: 10, - rgap: 0 + hgap: 12 }); result.push(spliter_container); } diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index fa222005d..7483349de 100644 --- a/src/widget/multilayerdownlist/popup.downlist.js +++ b/src/widget/multilayerdownlist/popup.downlist.js @@ -150,7 +150,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", vgap: 5, - lgap: 10 + hgap: 12, }); result.push(spliter_container); }