Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects 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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 110
      dist/base.js
  2. 110
      dist/bundle.ie.js
  3. 50
      dist/bundle.ie.min.js
  4. 110
      dist/bundle.js
  5. 52
      dist/bundle.min.js
  6. 110
      dist/fineui.ie.js
  7. 50
      dist/fineui.ie.min.js
  8. 110
      dist/fineui.js
  9. 50
      dist/fineui.min.js
  10. 110
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 110
      src/base/foundation/message.js

110
dist/base.js vendored
Unescape View File

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

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

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

110
dist/bundle.js vendored
Unescape View File

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

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

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

110
dist/fineui.js vendored
Unescape View File

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

110
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

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

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

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