From 6cabd38b050bb9ad37f4a03a542c6bd90808a531 Mon Sep 17 00:00:00 2001 From: Treecat Date: Fri, 2 Sep 2022 15:33:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BI-112711=20fix:=E5=8D=95=E9=80=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E9=80=89=E4=B8=AD=E8=A7=86=E8=A7=89=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/input/radio/radio.js | 8 ++++---- src/less/base/single/input/radio.less | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/base/single/input/radio/radio.js b/src/base/single/input/radio/radio.js index f17e79e9e..52386feb9 100644 --- a/src/base/single/input/radio/radio.js +++ b/src/base/single/input/radio/radio.js @@ -9,10 +9,10 @@ BI.Radio = BI.inherit(BI.BasicButton, { baseCls: "bi-radio", selected: false, handler: BI.emptyFn, - width: 14, - height: 14, - iconWidth: 14, - iconHeight: 14 + width: 16, + height: 16, + iconWidth: 16, + iconHeight: 16 }, render: function () { diff --git a/src/less/base/single/input/radio.less b/src/less/base/single/input/radio.less index 8e48818e7..0a3345e42 100644 --- a/src/less/base/single/input/radio.less +++ b/src/less/base/single/input/radio.less @@ -18,13 +18,13 @@ border-color: @color-bi-border-hover-active-radio; background-color: @color-bi-background-active-radio; &:after { - width: 6px; - height: 6px; + width: 8px; + height: 8px; display: table; position: absolute; top: 50%; left: 50%; - .border-radius(3px); + .border-radius(4px); background-color: @color-bi-background-active-radio-content; .transform(translate(-50%, -50%)); @transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s; From 9d94d01f095289a37eaad5162c3a76104f10403b Mon Sep 17 00:00:00 2001 From: windy Date: Tue, 6 Sep 2022 12:25:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BI-113579=20=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.loader.js | 3 ++- src/widget/multiselectlist/multiselectlist.insert.js | 1 + src/widget/multiselectlist/multiselectlist.js | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 3bcde5823..2aa22aad5 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -20,6 +20,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { itemFormatter: BI.emptyFn, onLoaded: BI.emptyFn, itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + isDefaultInit: false, }); }, @@ -45,7 +46,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { onLoaded: opts.onLoaded, el: { type: "bi.multi_select_inner_loader", - isDefaultInit: false, + isDefaultInit: opts.isDefaultInit, } }, opts.el), itemsCreator: function (op, callback) { diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js index 277ee20a9..3311d3536 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.js +++ b/src/widget/multiselectlist/multiselectlist.insert.js @@ -34,6 +34,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { }, // onLoaded: o.onLoaded, el: {}, + isDefaultInit: true, value: o.value }); this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { diff --git a/src/widget/multiselectlist/multiselectlist.js b/src/widget/multiselectlist/multiselectlist.js index eccc18581..eb0baaed1 100644 --- a/src/widget/multiselectlist/multiselectlist.js +++ b/src/widget/multiselectlist/multiselectlist.js @@ -31,6 +31,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, { logic: { dynamic: false }, + isDefaultInit: true, // onLoaded: o.onLoaded, el: {} }); From fa75b87fbcd545245fe67272ef7f736361c01144 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Tue, 6 Sep 2022 14:29:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81=20feat?= =?UTF-8?q?:=20=E7=BB=99=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E8=87=AA=E7=94=B1=E6=8E=A7=E5=88=B6=E7=9A=84?= =?UTF-8?q?tooltip=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo/textvaluecombo/combo.textvalue.js | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index dc39d1b1e..b9aaac2ba 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -14,7 +14,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { value: "", defaultText: "", allowClear: false, - status: "success", // success | warning | error + status: "success", // success | warning | error, + title: null, }); }, @@ -35,6 +36,21 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { const o = this.options; + const title = () => { + if (BI.isFunction(o.title)) { + return o.title(); + } + if (this.options.status === "error") { + return { + level: "warning", + text: o.warningTitle, + }; + } + return { + level: "success", + }; + }; + const trigger = { type: "bi.select_text_trigger", ref: ref => this.trigger = ref, @@ -43,17 +59,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { height: o.height, text: o.text, value: o.value, - title: () => { - if (this.options.status === "error") { - return { - level: "warning", - text: o.warningTitle, - }; - } - return { - level: "success", - }; - }, + title, allowClear: o.allowClear, defaultText: o.defaultText, listeners: [