caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1001 in VISUAL/fineui from ~DAILER/fineui:master to master 

* commit '3b07603932b00ccfab48b9acc90cd487001a3e9c':
  DEC-8615 jquery的版本返回改为1.12.4
es6
guy 5 years ago
parent
7c896e2d36 3b07603932
commit
baf84ce921
25 changed files with 349 additions and 216 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      dist/2.0/fineui.css
  2. 43
      dist/2.0/fineui.ie.js
  3. 48
      dist/2.0/fineui.ie.min.js
  4. 43
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.min.css
  6. 24
      dist/2.0/fineui.min.js
  7. 6
      dist/base.css
  8. 2
      dist/base.js
  9. 6
      dist/bundle.css
  10. 43
      dist/bundle.ie.js
  11. 48
      dist/bundle.ie.min.js
  12. 43
      dist/bundle.js
  13. 2
      dist/bundle.min.css
  14. 24
      dist/bundle.min.js
  15. 39
      dist/case.js
  16. 2
      dist/core.js
  17. 6
      dist/fineui.css
  18. 43
      dist/fineui.ie.js
  19. 46
      dist/fineui.ie.min.js
  20. 43
      dist/fineui.js
  21. 2
      dist/fineui.min.css
  22. 24
      dist/fineui.min.js
  23. 16
      dist/fineui_without_jquery_polyfill.js
  24. 2
      dist/utils.min.js
  25. 2
      src/core/platform/web/jquery/_jquery.js

6
dist/2.0/fineui.css vendored
Unescape View File

@ -2880,6 +2880,12 @@ body .bi-button,
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
} }
body .bi-button.hack,
#body .bi-button.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
body .bi-button.block, body .bi-button.block,
#body .bi-button.block { #body .bi-button.block {
font-size: inherit; font-size: inherit;

43
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -22725,7 +22725,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,
@ -38512,7 +38512,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -54256,13 +54256,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -54277,7 +54278,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -54421,7 +54422,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -54446,6 +54447,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -54486,9 +54499,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -55859,9 +55870,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -55951,7 +55966,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -55978,7 +55993,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -59331,7 +59346,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

48
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

43
dist/2.0/fineui.js vendored
Unescape View File

@ -22725,7 +22725,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,
@ -38916,7 +38916,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -54660,13 +54660,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -54681,7 +54682,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -54825,7 +54826,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -54850,6 +54851,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -54890,9 +54903,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -56263,9 +56274,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -56355,7 +56370,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -56382,7 +56397,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -59735,7 +59750,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

2
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/base.css vendored
Unescape View File

@ -725,6 +725,12 @@ body .bi-button,
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
} }
body .bi-button.hack,
#body .bi-button.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
body .bi-button.block, body .bi-button.block,
#body .bi-button.block { #body .bi-button.block {
font-size: inherit; font-size: inherit;

2
dist/base.js vendored
Unescape View File

@ -684,7 +684,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,

6
dist/bundle.css vendored
Unescape View File

@ -2880,6 +2880,12 @@ body .bi-button,
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
} }
body .bi-button.hack,
#body .bi-button.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
body .bi-button.block, body .bi-button.block,
#body .bi-button.block { #body .bi-button.block {
font-size: inherit; font-size: inherit;

43
dist/bundle.ie.js vendored
Unescape View File

@ -22725,7 +22725,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,
@ -38512,7 +38512,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -54256,13 +54256,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -54277,7 +54278,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -54421,7 +54422,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -54446,6 +54447,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -54486,9 +54499,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -55859,9 +55870,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -55951,7 +55966,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -55978,7 +55993,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -59331,7 +59346,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

48
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

43
dist/bundle.js vendored
Unescape View File

@ -22725,7 +22725,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,
@ -38916,7 +38916,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -54660,13 +54660,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -54681,7 +54682,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -54825,7 +54826,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -54850,6 +54851,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -54890,9 +54903,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -56263,9 +56274,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -56355,7 +56370,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -56382,7 +56397,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -59735,7 +59750,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

39
dist/case.js vendored
Unescape View File

@ -2314,13 +2314,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -2335,7 +2336,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -2479,7 +2480,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -2504,6 +2505,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -2544,9 +2557,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -3917,9 +3928,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -4009,7 +4024,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -4036,7 +4051,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -7389,7 +7404,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

2
dist/core.js vendored
Unescape View File

@ -22725,7 +22725,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,

6
dist/fineui.css vendored
Unescape View File

@ -2880,6 +2880,12 @@ body .bi-button,
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
} }
body .bi-button.hack,
#body .bi-button.hack {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
body .bi-button.block, body .bi-button.block,
#body .bi-button.block { #body .bi-button.block {
font-size: inherit; font-size: inherit;

43
dist/fineui.ie.js vendored
Unescape View File

@ -22970,7 +22970,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,
@ -38757,7 +38757,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -54501,13 +54501,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -54522,7 +54523,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -54666,7 +54667,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -54691,6 +54692,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -54731,9 +54744,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -56104,9 +56115,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -56196,7 +56211,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -56223,7 +56238,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -59576,7 +59591,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

46
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

43
dist/fineui.js vendored
Unescape View File

@ -22970,7 +22970,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,
@ -39161,7 +39161,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -54905,13 +54905,14 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 230, width: 230,
height: 145 height: 145,
simple: false // 简单模式, popup中没有自动和透明
}, },
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: o.simple ? "bi.simple_color_picker_editor" : "bi.color_picker_editor",
value: o.value, value: o.value,
cls: "bi-header-background bi-border-bottom", cls: "bi-header-background bi-border-bottom",
height: 30 height: 30
@ -54926,7 +54927,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.storeColors = BI.createWidget({ this.storeColors = BI.createWidget({
type: "bi.color_picker", type: "bi.color_picker",
cls: "bi-border-bottom bi-border-right", cls: "bi-border-bottom bi-border-right",
items: [this._digestStoreColors(BI.string2Array(BI.Cache.getItem("colors") || ""))], items: [this._digestStoreColors(this._getStoreColors())],
width: 210, width: 210,
height: 24, height: 24,
value: o.value value: o.value
@ -55070,7 +55071,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_dealStoreColors: function () { _dealStoreColors: function () {
var color = this.getValue(); var color = this.getValue();
var colors = BI.string2Array(BI.Cache.getItem("colors") || ""); var colors = this._getStoreColors();
var que = new BI.Queue(8); var que = new BI.Queue(8);
que.fromArray(colors); que.fromArray(colors);
que.remove(color); que.remove(color);
@ -55095,6 +55096,18 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
return items; return items;
}, },
_getStoreColors: function() {
var self = this, o = this.options;
var colorsArray = BI.string2Array(BI.Cache.getItem("colors") || "");
return BI.filter(colorsArray, function (idx, color) {
return o.simple ? self._isRGBColor(color) : true;
});
},
_isRGBColor: function (color) {
return BI.isNotEmptyString(color) && color !== "transparent";
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
this.storeColors.populate([this._digestStoreColors(colors)]); this.storeColors.populate([this._digestStoreColors(colors)]);
@ -55135,9 +55148,7 @@ BI.SimpleColorChooserPopup = BI.inherit(BI.Widget, {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
value: o.value, value: o.value,
element: this, element: this,
editor: { simple: true // 是否有自动
type: "bi.simple_color_picker_editor"
}
}); });
this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () { this.popup.on(BI.ColorChooserPopup.EVENT_CHANGE, function () {
self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments); self.fireEvent(BI.SimpleColorChooserPopup.EVENT_CHANGE, arguments);
@ -56508,9 +56519,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -56600,7 +56615,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -56627,7 +56642,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -59980,7 +59995,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -27539,7 +27539,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"), _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
value: "", value: "",
text: "", text: "",
stopEvent: false, stopEvent: false,
@ -39124,9 +39124,13 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BubblePopupBarView.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-bubble-bar-popup-view", extraCls: "bi-bubble-bar-popup-view",
buttons: [{ buttons: [{
value: BI.i18nText("BI-Basic_Cancel"), value: false,
text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, {value: BI.i18nText(BI.i18nText("BI-Basic_Sure"))}] }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")),
value: true
}]
}); });
}, },
_init: function () { _init: function () {
@ -39216,7 +39220,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
type: "bi.button", type: "bi.button",
height: 24, height: 24,
handler: function (v) { handler: function (v) {
self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); self.fireEvent(BI.TextBubblePopupBarView.EVENT_CHANGE, v);
} }
}, buttonOpt); }, buttonOpt);
@ -39243,7 +39247,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
this.text.setText(v || this.options.text); this.text.setText(v || this.options.text);
} }
}); });
BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON";
BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView);
/** /**
* Created by Young's on 2016/4/28. * Created by Young's on 2016/4/28.
@ -42596,7 +42600,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
value: this.list.getNotSelectedValue(), value: this.list.getNotSelectedValue(),
assist: this.list.getValue() assist: this.list.getValue()
}; };
}, },
empty: function () { empty: function () {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/core/platform/web/jquery/_jquery.js vendored
Unescape View File

@ -45,7 +45,7 @@ var
// List of deleted data cache ids, so we can reuse them // List of deleted data cache ids, so we can reuse them
core_deletedIds = [], core_deletedIds = [],
core_version = "1.9.1", core_version = "1.12.4",
// Save a reference to some core methods // Save a reference to some core methods
core_concat = core_deletedIds.concat, core_concat = core_deletedIds.concat,

Write Preview
Loading…
Cancel
Save