Browse Source

Merge pull request #797 in VISUAL/fineui from ~LEI.WANG/fineui:master to master

* commit 'f4b3608f96fdf0b9157b0e7d41acc68ea24971d7':
  BI-36673 按照视觉的意思是现在可编辑的combo中不应该有前面构号图标。 和windy咨询了一下组件名涉及到平台那边先不改名。只是取消钩号图标。
es6
lei.wang 6 years ago
parent
commit
74e644b9e1
  1. 7
      dist/bundle.ie.js
  2. 7
      dist/bundle.js
  3. 7
      dist/case.js
  4. 25
      dist/demo.js
  5. 7
      dist/fineui.ie.js
  6. 7
      dist/fineui.js
  7. 7
      dist/fineui_without_jquery_polyfill.js
  8. 6
      src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js

7
dist/bundle.ie.js vendored

@ -54390,8 +54390,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -54412,7 +54412,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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 * @class BI.TextValueCombo
* @extend BI.Widget * @extend BI.Widget
* combo : text + icon, popup : text * combo : text + icon, popup : text

7
dist/bundle.js vendored

@ -54794,8 +54794,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -54816,7 +54816,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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 * @class BI.TextValueCombo
* @extend BI.Widget * @extend BI.Widget
* combo : text + icon, popup : text * combo : text + icon, popup : text

7
dist/case.js vendored

@ -5178,8 +5178,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -5200,7 +5200,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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 * @class BI.TextValueCombo
* @extend BI.Widget * @extend BI.Widget
* combo : text + icon, popup : text * combo : text + icon, popup : text

25
dist/demo.js vendored

@ -6126,30 +6126,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, { BI.shortcut("demo.htape", Demo.HtapeLayout);/**
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);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

7
dist/fineui.ie.js vendored

@ -54635,8 +54635,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -54657,7 +54657,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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 * @class BI.TextValueCombo
* @extend BI.Widget * @extend BI.Widget
* combo : text + icon, popup : text * combo : text + icon, popup : text

7
dist/fineui.js vendored

@ -55039,8 +55039,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -55061,7 +55061,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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 * @class BI.TextValueCombo
* @extend BI.Widget * @extend BI.Widget
* combo : text + icon, popup : text * combo : text + icon, popup : text

7
dist/fineui_without_jquery_polyfill.js vendored

@ -38052,8 +38052,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -38074,7 +38074,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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 * @class BI.TextValueCombo
* @extend BI.Widget * @extend BI.Widget
* combo : text + icon, popup : text * combo : text + icon, popup : text

6
src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js

@ -37,8 +37,8 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
_formatItems: function (items) { _formatItems: function (items) {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: "bi.icon_text_item", type: "bi.single_select_item",
cls: "item-check-font bi-list-item", cls: "bi-list-item",
height: 24 height: 24
}, item); }, item);
}); });
@ -59,4 +59,4 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
}); });
BI.TextValueCheckComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; 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);

Loading…
Cancel
Save