Browse Source

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

* commit '0cd32645135fa36e19e531d8c8a7106905a49afb':
  BI-40839 feat: popover可配置右上角的X是否显示
es6
windy 6 years ago
parent
commit
5b2fe44ae2
  1. 7
      dist/base.js
  2. 7
      dist/bundle.ie.js
  3. 4
      dist/bundle.ie.min.js
  4. 7
      dist/bundle.js
  5. 10
      dist/bundle.min.js
  6. 7
      dist/fineui.ie.js
  7. 4
      dist/fineui.ie.min.js
  8. 7
      dist/fineui.js
  9. 10
      dist/fineui.min.js
  10. 7
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 7
      src/base/layer/layer.popover.js

7
dist/base.js vendored

@ -5763,7 +5763,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -5809,13 +5810,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

7
dist/bundle.ie.js vendored

@ -40887,7 +40887,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -40933,13 +40934,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -41291,7 +41291,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -41337,13 +41338,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.ie.js vendored

@ -41132,7 +41132,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -41178,13 +41179,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -41536,7 +41536,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -41582,13 +41583,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui_without_jquery_polyfill.js vendored

@ -29127,7 +29127,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -29173,13 +29174,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

7
src/base/layer/layer.popover.js

@ -24,7 +24,8 @@ BI.Popover = BI.inherit(BI.Widget, {
}, },
header: null, header: null,
body: null, body: null,
footer: null footer: null,
closable: true // BI-40839 是否显示右上角的关闭按钮
}); });
}, },
render: function () { render: function () {
@ -70,13 +71,15 @@ BI.Popover = BI.inherit(BI.Widget, {
bottom: 0 bottom: 0
}] }]
}, { }, {
el: { el: o.closable ? {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-message-close close-font", cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { handler: function () {
self.close(); self.close();
} }
} : {
type: "bi.layout"
}, },
width: 56 width: 56
}], }],

Loading…
Cancel
Save