From ec0605f17f8c003c53b41b26de572e0659f48bf3 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 9 Feb 2021 08:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=A7=BB=E5=8A=A8=E7=AB=AFre?= =?UTF-8?q?m=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/item.singleselect.radio.js | 8 +-- .../search/singleselect.search.loader.js | 4 +- src/widget/singleselect/singleselect.item.js | 65 ------------------- .../singleselect/singleselect.loader.js | 2 +- 4 files changed, 6 insertions(+), 73 deletions(-) delete mode 100644 src/widget/singleselect/singleselect.item.js diff --git a/src/case/button/item.singleselect.radio.js b/src/case/button/item.singleselect.radio.js index fc73d2c7b..a07ac09fe 100644 --- a/src/case/button/item.singleselect.radio.js +++ b/src/case/button/item.singleselect.radio.js @@ -10,7 +10,6 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - hgap: 10, height: 24 }); }, @@ -18,8 +17,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, { BI.SingleSelectRadioItem.superclass._init.apply(this, arguments); var self = this, o = this.options; this.radio = BI.createWidget({ - type: "bi.radio", - once: o.once + type: "bi.radio" }); this.text = BI.createWidget({ type: "bi.label", @@ -41,7 +39,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.radio], - width: 16 + width: 26 }, this.text) })))); }, @@ -70,4 +68,4 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, { }); BI.SingleSelectRadioItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.single_select_radio_item", BI.SingleSelectRadioItem); \ No newline at end of file +BI.shortcut("bi.single_select_radio_item", BI.SingleSelectRadioItem); diff --git a/src/widget/singleselect/search/singleselect.search.loader.js b/src/widget/singleselect/search/singleselect.search.loader.js index 6886ec602..6bb72bf76 100644 --- a/src/widget/singleselect/search/singleselect.search.loader.js +++ b/src/widget/singleselect/search/singleselect.search.loader.js @@ -84,7 +84,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, { _createItems: function (items) { return BI.createItems(items, { - type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", + type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_radio_item", cls: "bi-list-item-active", logic: { dynamic: false @@ -150,4 +150,4 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, { }); BI.SingleSelectSearchLoader.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.single_select_search_loader", BI.SingleSelectSearchLoader); \ No newline at end of file +BI.shortcut("bi.single_select_search_loader", BI.SingleSelectSearchLoader); diff --git a/src/widget/singleselect/singleselect.item.js b/src/widget/singleselect/singleselect.item.js deleted file mode 100644 index 4c581201b..000000000 --- a/src/widget/singleselect/singleselect.item.js +++ /dev/null @@ -1,65 +0,0 @@ -BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { - _defaultConfig: function () { - return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-single-select-radio-item", - logic: { - dynamic: false - }, - height: 24 - }); - }, - _init: function () { - BI.SingleSelectComboItem.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.radio = BI.createWidget({ - type: "bi.radio" - }); - this.text = BI.createWidget({ - type: "bi.label", - cls: "list-item-text", - textAlign: "left", - whiteSpace: "nowrap", - textHeight: o.height, - height: o.height, - hgap: o.hgap, - text: o.text, - keyword: o.keyword, - value: o.value, - py: o.py - }); - - BI.createWidget(BI.extend({ - element: this - }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { - items: BI.LogicFactory.createLogicItemsByDirection("left", { - type: "bi.center_adapt", - items: [this.radio], - width: 26 - }, this.text) - })))); - }, - - doRedMark: function () { - this.text.doRedMark.apply(this.text, arguments); - }, - - unRedMark: function () { - this.text.unRedMark.apply(this.text, arguments); - }, - - doClick: function () { - BI.SingleSelectComboItem.superclass.doClick.apply(this, arguments); - this.radio.setSelected(this.isSelected()); - if (this.isValid()) { - this.fireEvent(BI.SingleSelectComboItem.EVENT_CHANGE, this.isSelected(), this); - } - }, - - setSelected: function (v) { - BI.SingleSelectComboItem.superclass.setSelected.apply(this, arguments); - this.radio.setSelected(v); - - } -}); -BI.SingleSelectComboItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.single_select_combo_item", BI.SingleSelectComboItem); \ No newline at end of file diff --git a/src/widget/singleselect/singleselect.loader.js b/src/widget/singleselect/singleselect.loader.js index f2cebd488..e1362eb89 100644 --- a/src/widget/singleselect/singleselect.loader.js +++ b/src/widget/singleselect/singleselect.loader.js @@ -105,7 +105,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { _createItems: function (items) { return BI.createItems(items, { - type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", + type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_radio_item", logic: this.options.logic, cls: "bi-list-item-active", height: 24,