fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit 'd86f8d3ac336f685f2e2c4f4419916cfa773421c':
  DEC-5224  BI.Ｍsg.confirm()的弹窗有问题,不能用bar_popover
es6
Dailer 6 years ago
parent
b6d622afd0 d86f8d3ac3
commit
a5563d7efd
12 changed files with 739 additions and 487 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. 146
      dist/base.js
  2. 146
      dist/bundle.ie.js
  3. 50
      dist/bundle.ie.min.js
  4. 146
      dist/bundle.js
  5. 52
      dist/bundle.min.js
  6. 146
      dist/fineui.ie.js
  7. 50
      dist/fineui.ie.min.js
  8. 146
      dist/fineui.js
  9. 50
      dist/fineui.min.js
  10. 146
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 146
      src/base/foundation/message.js

146
dist/base.js vendored
Unescape View File

@ -5226,69 +5226,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

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

@ -40312,69 +40312,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

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

File diff suppressed because one or more lines are too long

146
dist/bundle.js vendored
Unescape View File

@ -40716,69 +40716,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

52
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -40554,69 +40554,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

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

File diff suppressed because one or more lines are too long

146
dist/fineui.js vendored
Unescape View File

@ -40958,69 +40958,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

50
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

146
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -28567,69 +28567,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -70,69 +70,105 @@ BI.Msg = function () {
messageShow.destroy(); messageShow.destroy();
$mask.remove(); $mask.remove();
}; };
var controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_Cancel"),
level: "ignore",
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
}
controlItems.push({
el: {
type: "bi.button",
text: BI.i18nText("BI-Basic_OK"),
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [true]);
}
}
}
});
var conf = { var conf = {
element: $pop, element: $pop,
type: "bi.center_adapt", type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.bar_popover", type: "bi.border",
header: title, cls: "bi-card",
body: { items: {
type: "bi.center_adapt", north: {
items: [{ el: {
type: "bi.label", type: "bi.border",
text: message cls: "bi-message-title bi-background",
}] items: {
}, center: {
footer: hasCancel ? { el: {
type: "bi.right_vertical_adapt", type: "bi.label",
lgap: 10, cls: "bi-font-bold",
items: [{ text: title || BI.i18nText("BI-Basic_Prompt"),
type: "bi.button", textAlign: "left",
text: BI.i18nText("BI-Basic_Cancel"), hgap: 20,
level: "ignore", height: 40
handler: function () { }
close(); },
if (BI.isFunction(callback)) { east: {
callback.apply(null, [false]); el: {
} type: "bi.icon_button",
} cls: "bi-message-close close-font",
}, { // height: 50,
type: "bi.button", handler: function () {
text: BI.i18nText("BI-Basic_Sure"), close();
handler: function () { if (BI.isFunction(callback)) {
close(); callback.apply(null, [false]);
if (BI.isFunction(callback)) { }
callback.apply(null, [true]); }
} },
} width: 60
}] }
} : {
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",
listeners: [
{
eventName: "EVENT_CLOSE",
action: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
} }
},
height: 40
},
center: {
el: {
type: "bi.center_adapt",
items: [{
type: "bi.label",
text: message
}]
} }
},
south: {
el: {
type: "bi.absolute",
items: [{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems
},
top: 0,
left: 20,
right: 20,
bottom: 0
}]
},
height: 44
} }
] },
width: 450,
height: 200
} }
] ]
}; };

Write Preview
Loading…
Cancel
Save