fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
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
8d148af0b9 2ce12cec9f
commit
7a089b61b2
12 changed files with 649 additions and 460 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. 45
      dist/base.js
  2. 45
      dist/bundle.ie.js
  3. 52
      dist/bundle.ie.min.js
  4. 45
      dist/bundle.js
  5. 50
      dist/bundle.min.js
  6. 45
      dist/fineui.ie.js
  7. 52
      dist/fineui.ie.min.js
  8. 45
      dist/fineui.js
  9. 50
      dist/fineui.min.js
  10. 45
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 45
      src/base/foundation/message.js

45
dist/base.js vendored
Unescape View File

@ -5181,8 +5181,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -5200,7 +5224,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -5209,7 +5233,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -5220,18 +5244,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

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

@ -40247,8 +40247,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -40266,7 +40290,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -40275,7 +40299,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -40286,18 +40310,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

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

File diff suppressed because one or more lines are too long

45
dist/bundle.js vendored
Unescape View File

@ -40651,8 +40651,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -40670,7 +40694,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -40679,7 +40703,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -40690,18 +40714,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

50
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -40489,8 +40489,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -40508,7 +40532,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -40517,7 +40541,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -40528,18 +40552,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

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

File diff suppressed because one or more lines are too long

45
dist/fineui.js vendored
Unescape View File

@ -40893,8 +40893,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -40912,7 +40936,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -40921,7 +40945,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -40932,18 +40956,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

50
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -28518,8 +28518,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -28537,7 +28561,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -28546,7 +28570,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -28557,18 +28581,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}();/** }();/**

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
src/base/foundation/message.js
Unescape View File

@ -49,8 +49,32 @@ 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",
zIndex: BI.zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5
}).appendTo("body");
$pop = BI.Widget._renderEngine.createElement("<div class=\"bi-message-depend\">").css({
position: "absolute",
zIndex: BI.zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0
}).appendTo("body");
var close = function () {
messageShow.destroy();
$mask.remove();
};
var conf = {
element: $pop,
type: "bi.center_adapt",
items: [
{
type: "bi.bar_popover", type: "bi.bar_popover",
header: title, header: title,
body: { body: {
@ -68,7 +92,7 @@ BI.Msg = function () {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore", level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [false]);
} }
@ -77,7 +101,7 @@ BI.Msg = function () {
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Sure"), text: BI.i18nText("BI-Basic_Sure"),
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [true]); callback.apply(null, [true]);
} }
@ -88,18 +112,21 @@ BI.Msg = function () {
lgap: 10, lgap: 10,
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_OK"),
level: "ignore",
handler: function () { handler: function () {
BI.Popovers.remove(name); close();
if (BI.isFunction(callback)) { if (BI.isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
} }
} }
}] }]
}, },
size: "small" size: "small"
}).open(name); }
]
};
messageShow = BI.createWidget(conf);
} }
}; };
}(); }();
Write Preview
Loading…
Cancel
Save