Browse Source

Merge pull request #762 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '2ce12cec9f82321c6a0ea1ba1c84f6cf199333ea':
  无JIRA任务 alert层级
es6
windy 6 years ago
parent
commit
7a089b61b2
  1. 129
      dist/base.js
  2. 129
      dist/bundle.ie.js
  3. 52
      dist/bundle.ie.min.js
  4. 129
      dist/bundle.js
  5. 50
      dist/bundle.min.js
  6. 129
      dist/fineui.ie.js
  7. 52
      dist/fineui.ie.min.js
  8. 129
      dist/fineui.js
  9. 50
      dist/fineui.min.js
  10. 129
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 129
      src/base/foundation/message.js

129
dist/base.js vendored

@ -5181,57 +5181,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

129
dist/bundle.ie.js vendored

@ -40247,57 +40247,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

52
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

129
dist/bundle.js vendored

@ -40651,57 +40651,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

50
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

129
dist/fineui.ie.js vendored

@ -40489,57 +40489,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

52
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

129
dist/fineui.js vendored

@ -40893,57 +40893,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

50
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

129
dist/fineui_without_jquery_polyfill.js vendored

@ -28518,57 +28518,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

129
src/base/foundation/message.js

@ -49,57 +49,84 @@ BI.Msg = function () {
}, 5000); }, 5000);
}, },
_show: function (hasCancel, title, message, callback) { _show: function (hasCancel, title, message, callback) {
var name = BI.UUID(); $mask = BI.Widget._renderEngine.createElement("<div class=\"bi-z-index-mask\">").css({
BI.Popovers.create(name, { position: "absolute",
type: "bi.bar_popover", zIndex: BI.zIndex_tip - 2,
header: title, top: 0,
body: { left: 0,
type: "bi.center_adapt", right: 0,
items: [{ bottom: 0,
type: "bi.label", opacity: 0.5
text: message }).appendTo("body");
}] $pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
}, position: "absolute",
footer: hasCancel ? { zIndex: BI.zIndex_tip - 1,
type: "bi.right_vertical_adapt", top: 0,
lgap: 10, left: 0,
items: [{ right: 0,
type: "bi.button", bottom: 0
text: BI.i18nText("BI-Basic_Cancel"), }).appendTo("body");
level: "ignore", var close = function () {
handler: function () { messageShow.destroy();
BI.Popovers.remove(name); $mask.remove();
if (BI.isFunction(callback)) { };
callback.apply(null, [false]); var conf = {
} element: $pop,
} type: "bi.center_adapt",
}, { items: [
type: "bi.button", {
text: BI.i18nText("BI-Basic_Sure"), type: "bi.bar_popover",
handler: function () { header: title,
BI.Popovers.remove(name); body: {
if (BI.isFunction(callback)) { type: "bi.center_adapt",
callback.apply(null, [true]); items: [{
} type: "bi.label",
} text: message
}] }]
} : { },
type: "bi.right_vertical_adapt", footer: hasCancel ? {
lgap: 10, type: "bi.right_vertical_adapt",
items: [{ lgap: 10,
type: "bi.button", items: [{
text: BI.i18nText("BI-Basic_Cancel"), type: "bi.button",
level: "ignore", text: BI.i18nText("BI-Basic_Cancel"),
handler: function () { level: "ignore",
BI.Popovers.remove(name); handler: function () {
if (BI.isFunction(callback)) { close();
callback.apply(null, [false]); if (BI.isFunction(callback)) {
} callback.apply(null, [false]);
} }
}] }
}, }, {
size: "small" type: "bi.button",
}).open(name); text: BI.i18nText("BI-Basic_Sure"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
} : {
type: "bi.right_vertical_adapt",
lgap: 10,
items: [{
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}]
},
size: "small"
}
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}(); }();
Loading…
Cancel
Save