Browse Source

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

* commit '24fc6f5dd5a7df56405cf2b4a5b706a89fc533b8':
  BI-63029 fix: 大整数输入pager会回到第一页 && 单测
es6
windy 5 years ago
parent
commit
0944ff3b21
  1. 2
      src/base/pager/pager.js
  2. 2
      src/case/pager/pager.js
  3. 131
      src/core/__test__/base.test.js
  4. 1
      src/core/base.js

2
src/base/pager/pager.js

@ -244,7 +244,7 @@ BI.Pager = BI.inherit(BI.Widget, {
setValue: function (v) {
var o = this.options;
v = v | 0;
v = v || 0;
v = v < 1 ? 1 : v;
if (o.pages === false) {
var lastPage = BI.result(o, "lastPage"), firstPage = 1;

2
src/case/pager/pager.js

@ -244,7 +244,7 @@ BI.DetailPager = BI.inherit(BI.Widget, {
setValue: function (v) {
var o = this.options;
v = v | 0;
v = v || 0;
v = v < 1 ? 1 : v;
if (o.pages === false) {
var lastPage = BI.result(o, "lastPage"), firstPage = 1;

131
src/core/__test__/base.test.js

@ -129,4 +129,135 @@ describe("baseFunctionTest", function () {
c: 3
});
});
/**
* test_author_windy
*/
it("assert-warning", function () {
expect(BI.assert("a", "a")).to.equal(true);
expect(BI.assert("a", function (v) {
return v === "a";
})).to.equal(true);
var test = "";
try {
BI.assert("a", function (v) {
return v === "c";
});
} catch (e) {
test = true;
}
expect(test).to.equal(true);
});
/**
* test_author_windy
*/
it("packageItems", function () {
expect(BI.packageItems([{
type: "a",
text: "b"
}, {
type: "b",
text: "c"
}], [{
type: "bi.vertical"
}, {
type: "bi.center_adapt"
}])).to.deep.equal([{
type: "bi.vertical",
items: [{
el: {
type: "bi.center_adapt",
items: [{
el: {
type: "a",
text: "b"
}
}]
}
}]
}, {
type: "bi.vertical",
items: [{
el: {
type: "bi.center_adapt",
items: [{
el: {
type: "b",
text: "c"
}
}]
}
}]
}]);
});
/**
* test_author_windy
*/
it("inverse", function () {
expect(BI.inverse(7, 1)).to.equal(6);
});
/**
* test_author_windy
*/
it("key", function () {
var a = {
c: 1,
d: 2
};
expect(BI.firstKey(a)).to.equal("c");
expect(BI.lastKey(a)).to.equal("d");
expect(BI.firstObject(a)).to.equal(1);
expect(BI.lastObject(a)).to.equal(2);
});
/**
* test_author_windy
*/
it("back", function () {
var a = [{
c: 1,
d: 2
}, {
c: 3,
d: 4
}, {
c: 5,
d: 6
}];
var c = [];
BI.backEach(a, function (idx, v) {
c.push(v.d);
});
expect(c).to.deep.equal([6, 4, 2]);
expect(BI.backEvery(a, function (idx, v) {
return v.c = 1;
})).to.equal(true);
expect(BI.backFindKey({
c: 5,
d: 6
}, function (value, key) {
return key === "c";
})).to.equal("c");
expect(BI.backFind({
c: 5,
d: 6
}, function (v, key) {
return v === 5;
})).to.deep.equal(5);
});
/**
* test_author_windy
*/
it("abc", function () {
expect(BI.abc2Int("B")).to.equal(2);
expect(BI.int2Abc(2)).to.equal("B");
});
});

1
src/core/base.js

@ -52,6 +52,7 @@ if (!_global.BI) {
if (!this.deepContains(is, v)) {
throw new Error(v + " error");
}
return true;
},
warn: function (message) {

Loading…
Cancel
Save