Browse Source

Pull request #2612: 无JIRA任务 自定义翻页不加默认gap

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'd42de903be2815c62f1cd097b8b1e3a54dd8ee26':
  自定义内容不加默认gap
es6
windy 3 years ago
parent
commit
93c0629a36
  1. 26
      src/base/pager/pager.js

26
src/base/pager/pager.js

@ -83,9 +83,11 @@ BI.Pager = BI.inherit(BI.Widget, {
disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false) disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
}); });
} else { } else {
view.push(BI.extend({ view.push({
el: BI.extend({
disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false) disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
}, prev)); }, prev)
});
} }
} }
@ -110,6 +112,7 @@ BI.Pager = BI.inherit(BI.Widget, {
dict.start = dict.index > 1 ? curr - dict.poor : 1; dict.start = dict.index > 1 ? curr - dict.poor : 1;
dict.end = dict.index > 1 ? (function () { dict.end = dict.index > 1 ? (function () {
var max = curr + (groups - dict.poor - 1); var max = curr + (groups - dict.poor - 1);
return max > pages ? pages : max; return max > pages ? pages : max;
}()) : groups; }()) : groups;
if (dict.end - dict.start < groups - 1) { // 最后一组状态 if (dict.end - dict.start < groups - 1) { // 最后一组状态
@ -159,27 +162,34 @@ BI.Pager = BI.inherit(BI.Widget, {
if (pages === false) { if (pages === false) {
return { text: next, value: "next", disabled: o.hasNext(curr) === false }; return { text: next, value: "next", disabled: o.hasNext(curr) === false };
} }
return (dict.flow && curr === pages) return (dict.flow && curr === pages)
? ?
{ text: next, value: "next", disabled: true } { text: next, value: "next", disabled: true }
: :
{ text: next, value: "next", disabled: !(curr !== pages && next || dict.flow) }; { text: next, value: "next", disabled: !(curr !== pages && next || dict.flow) };
} }
return BI.extend({
disabled: pages === false ? o.hasNext(curr) === false : !(curr !== pages && next || dict.flow)
}, next);
return {
el: BI.extend({
disabled: pages === false ? o.hasNext(curr) === false : !(curr !== pages && next || dict.flow)
}, next)
};
}())); }()));
} }
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
element: this, element: this,
items: BI.createItems(view, { items: BI.map(view, function (idx, v) {
v = BI.extend({
cls: "bi-list-item-select bi-border-radius", cls: "bi-list-item-select bi-border-radius",
height: 23, height: 23,
hgap: 10, hgap: v.el ? 0 : 10,
stopPropagation: true stopPropagation: true
}, BI.stripEL(v));
return BI.formatEL(v);
}), }),
behaviors: o.behaviors, behaviors: o.behaviors,
layouts: o.layouts layouts: o.layouts
@ -233,6 +243,7 @@ BI.Pager = BI.inherit(BI.Widget, {
v || (v = 1); v || (v = 1);
var o = this.options; var o = this.options;
var pages = this.options.pages; var pages = this.options.pages;
return pages === false ? o.hasPrev(v) : v > 1; return pages === false ? o.hasPrev(v) : v > 1;
}, },
@ -240,6 +251,7 @@ BI.Pager = BI.inherit(BI.Widget, {
v || (v = 1); v || (v = 1);
var o = this.options; var o = this.options;
var pages = this.options.pages; var pages = this.options.pages;
return pages === false ? o.hasNext(v) : v < pages; return pages === false ? o.hasNext(v) : v < pages;
}, },

Loading…
Cancel
Save