From f4b3608f96fdf0b9157b0e7d41acc68ea24971d7 Mon Sep 17 00:00:00 2001 From: MrErHu Date: Fri, 7 Dec 2018 11:28:41 +0800 Subject: [PATCH] =?UTF-8?q?BI-36673=20=E6=8C=89=E7=85=A7=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E7=9A=84=E6=84=8F=E6=80=9D=E6=98=AF=E7=8E=B0=E5=9C=A8=E5=8F=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84combo=E4=B8=AD=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=9C=89=E5=89=8D=E9=9D=A2=E6=9E=84=E5=8F=B7=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E3=80=82=20=E5=92=8Cwindy=E5=92=A8=E8=AF=A2=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E7=BB=84=E4=BB=B6=E5=90=8D=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0=E9=82=A3=E8=BE=B9=E5=85=88=E4=B8=8D?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E3=80=82=E5=8F=AA=E6=98=AF=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=92=A9=E5=8F=B7=E5=9B=BE=E6=A0=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.ie.js | 7 +++--- dist/bundle.js | 7 +++--- dist/case.js | 7 +++--- dist/demo.js | 25 +------------------ dist/fineui.ie.js | 7 +++--- dist/fineui.js | 7 +++--- dist/fineui_without_jquery_polyfill.js | 7 +++--- .../popup.textvaluecheck.js | 6 ++--- 8 files changed, 28 insertions(+), 45 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index e6d3b56d67..e44a88370e 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -54390,8 +54390,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -54412,7 +54412,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);/** +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); +/** * @class BI.TextValueCombo * @extend BI.Widget * combo : text + icon, popup : text diff --git a/dist/bundle.js b/dist/bundle.js index 82c369c1d4..6ad59acce5 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54794,8 +54794,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -54816,7 +54816,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);/** +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); +/** * @class BI.TextValueCombo * @extend BI.Widget * combo : text + icon, popup : text diff --git a/dist/case.js b/dist/case.js index e0dd35c529..fe857ddba3 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5178,8 +5178,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -5200,7 +5200,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);/** +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); +/** * @class BI.TextValueCombo * @extend BI.Widget * combo : text + icon, popup : text diff --git a/dist/demo.js b/dist/demo.js index 261bffefc0..d29af9c558 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -6126,30 +6126,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, { }; } }); -BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, { - props: { - baseCls: "demo-absolute" - }, - render: function () { - return { - type: "bi.inline_vertical_adapt", - items: [{ - type: "bi.label", - text: "绝对布局", - cls: "layout-bg1", - width: 300, - height: 200 - }, { - type: "bi.label", - text: "绝对布局", - cls: "layout-bg1", - width: 300, - height: 100 - }] - }; - } -}); -BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/** +BI.shortcut("demo.htape", Demo.HtapeLayout);/** * Created by User on 2017/3/22. */ Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 5eff9d5b49..227dabc21a 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54635,8 +54635,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -54657,7 +54657,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);/** +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); +/** * @class BI.TextValueCombo * @extend BI.Widget * combo : text + icon, popup : text diff --git a/dist/fineui.js b/dist/fineui.js index 603077bc8c..0f834e9527 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -55039,8 +55039,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -55061,7 +55061,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);/** +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); +/** * @class BI.TextValueCombo * @extend BI.Widget * combo : text + icon, popup : text diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 261a74e683..fa9446bb7f 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -38052,8 +38052,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -38074,7 +38074,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);/** +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); +/** * @class BI.TextValueCombo * @extend BI.Widget * combo : text + icon, popup : text diff --git a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js index 278b5a94e7..f5678d8709 100644 --- a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js @@ -37,8 +37,8 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, { _formatItems: function (items) { return BI.map(items, function (i, item) { return BI.extend({ - type: "bi.icon_text_item", - cls: "item-check-font bi-list-item", + type: "bi.single_select_item", + cls: "bi-list-item", height: 24 }, item); }); @@ -59,4 +59,4 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, { }); BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup); \ No newline at end of file +BI.shortcut("bi.text_value_check_combo_popup", BI.TextValueCheckComboPopup);