From 5371ae9116fcbcab0baa6b230d1b13c875a62eb3 Mon Sep 17 00:00:00 2001 From: "Wilson.Zhang" Date: Mon, 11 Apr 2022 11:02:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?BI-103548=20fix:=20groups=E4=B8=BApage-1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=B1=95?= =?UTF-8?q?=E7=9C=81=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pager/pager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js index 6b78a8d02..85a926615 100644 --- a/src/base/pager/pager.js +++ b/src/base/pager/pager.js @@ -98,7 +98,7 @@ BI.Pager = BI.inherit(BI.Widget, { value: "first", disabled: !(dict.index > 1 && groups !== 0) }); - if (dict.index > 1 && groups !== 0) { + if (dict.index > 1 && groups !== 0 && groups !== pages - 1) { view.push({ type: "bi.label", cls: "page-ellipsis", @@ -140,7 +140,7 @@ BI.Pager = BI.inherit(BI.Widget, { // 总页数大于连续分页数，且当前组最大页小于总页，输出尾页 if (((!o.dynamicShow && !o.dynamicShowFirstLast) || (pages > groups && dict.end < pages && groups !== 0)) && last) { - if (pages > groups && dict.end < pages && groups !== 0) { + if (pages > groups && dict.end < pages && groups !== 0 && groups !== pages - 1) { view.push({ type: "bi.label", cls: "page-ellipsis", From d48bf3b3aaf23f6365891913f39e1cea47182665 Mon Sep 17 00:00:00 2001 From: "Wilson.Zhang" Date: Mon, 11 Apr 2022 11:54:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?BI-103548=20fix:=E9=87=8D=E6=96=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0showEllipsis=E4=B8=BAtrue?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=9C=81=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pager/pager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js index 85a926615..c39a9b2ad 100644 --- a/src/base/pager/pager.js +++ b/src/base/pager/pager.js @@ -26,7 +26,7 @@ BI.Pager = BI.inherit(BI.Widget, { }, // 初始化当前页 groups: 0, // 连续显示分页数 jump: BI.emptyFn, // 分页的回调函数 - + showEllipsis: true, first: false, // 是否显示首页 last: false, // 是否显示尾页 prev: "上一页", @@ -98,7 +98,7 @@ BI.Pager = BI.inherit(BI.Widget, { value: "first", disabled: !(dict.index > 1 && groups !== 0) }); - if (dict.index > 1 && groups !== 0 && groups !== pages - 1) { + if (dict.index > 1 && groups !== 0 && o.showEllipsis) { view.push({ type: "bi.label", cls: "page-ellipsis", @@ -140,7 +140,7 @@ BI.Pager = BI.inherit(BI.Widget, { // 总页数大于连续分页数，且当前组最大页小于总页，输出尾页 if (((!o.dynamicShow && !o.dynamicShowFirstLast) || (pages > groups && dict.end < pages && groups !== 0)) && last) { - if (pages > groups && dict.end < pages && groups !== 0 && groups !== pages - 1) { + if (pages > groups && dict.end < pages && groups !== 0 && o.showEllipsis) { view.push({ type: "bi.label", cls: "page-ellipsis", From 229333b8a2595c7fbfd8cc1c9b3eeeccea5717a5 Mon Sep 17 00:00:00 2001 From: "Wilson.Zhang" Date: Mon, 11 Apr 2022 15:02:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?BI-103548=20fix:=E6=B7=BB=E5=8A=A0setGroups?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=AE=BE=E7=BD=AEpager=E8=BF=9E=E7=BB=AD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=86=E9=A1=B5=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pager/pager.js | 9 ++++++--- typescript/base/pager/pager.ts | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js index c39a9b2ad..15e3fe44f 100644 --- a/src/base/pager/pager.js +++ b/src/base/pager/pager.js @@ -26,7 +26,6 @@ BI.Pager = BI.inherit(BI.Widget, { }, // 初始化当前页 groups: 0, // 连续显示分页数 jump: BI.emptyFn, // 分页的回调函数 - showEllipsis: true, first: false, // 是否显示首页 last: false, // 是否显示尾页 prev: "上一页", @@ -98,7 +97,7 @@ BI.Pager = BI.inherit(BI.Widget, { value: "first", disabled: !(dict.index > 1 && groups !== 0) }); - if (dict.index > 1 && groups !== 0 && o.showEllipsis) { + if (dict.index > 1 && groups !== 0) { view.push({ type: "bi.label", cls: "page-ellipsis", @@ -140,7 +139,7 @@ BI.Pager = BI.inherit(BI.Widget, { // 总页数大于连续分页数，且当前组最大页小于总页，输出尾页 if (((!o.dynamicShow && !o.dynamicShowFirstLast) || (pages > groups && dict.end < pages && groups !== 0)) && last) { - if (pages > groups && dict.end < pages && groups !== 0 && o.showEllipsis) { + if (pages > groups && dict.end < pages && groups !== 0) { view.push({ type: "bi.label", cls: "page-ellipsis", @@ -239,6 +238,10 @@ BI.Pager = BI.inherit(BI.Widget, { this.options.pages = pages; }, + setGroups: function(groups) { + this.options.groups = groups; + }, + hasPrev: function (v) { v || (v = 1); var o = this.options; diff --git a/typescript/base/pager/pager.ts b/typescript/base/pager/pager.ts index 655f00092..ebf843325 100644 --- a/typescript/base/pager/pager.ts +++ b/typescript/base/pager/pager.ts @@ -17,5 +17,7 @@ export declare class Pager extends Widget { setAllPages(v: number): void; + setGroups(v: number): void; + populate(): void; } From 7116a29f349dbaa715833d0371e3f338341674a9 Mon Sep 17 00:00:00 2001 From: "Wilson.Zhang" Date: Mon, 11 Apr 2022 20:45:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?BI-103548=20fix:=20groups=E4=B8=BApage-1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9C=81=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pager/pager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js index 15e3fe44f..9b4c08682 100644 --- a/src/base/pager/pager.js +++ b/src/base/pager/pager.js @@ -97,7 +97,7 @@ BI.Pager = BI.inherit(BI.Widget, { value: "first", disabled: !(dict.index > 1 && groups !== 0) }); - if (dict.index > 1 && groups !== 0) { + if (dict.index > 1 && groups !== 0 && groups !== pages - 1) { view.push({ type: "bi.label", cls: "page-ellipsis", @@ -139,7 +139,7 @@ BI.Pager = BI.inherit(BI.Widget, { // 总页数大于连续分页数，且当前组最大页小于总页，输出尾页 if (((!o.dynamicShow && !o.dynamicShowFirstLast) || (pages > groups && dict.end < pages && groups !== 0)) && last) { - if (pages > groups && dict.end < pages && groups !== 0) { + if (pages > groups && dict.end < pages && groups !== 0 && groups !== pages - 1) { view.push({ type: "bi.label", cls: "page-ellipsis", From 6ce73cf9483c2cd2527c2ecf0655f74550fed5e2 Mon Sep 17 00:00:00 2001 From: "Wilson.Zhang" Date: Mon, 11 Apr 2022 20:50:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?BI-103548=20fix:=20=E5=88=A0=E9=99=A4setGro?= =?UTF-8?q?ups?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pager/pager.js | 4 ---- typescript/base/pager/pager.ts | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js index 9b4c08682..64ea9a942 100644 --- a/src/base/pager/pager.js +++ b/src/base/pager/pager.js @@ -238,10 +238,6 @@ BI.Pager = BI.inherit(BI.Widget, { this.options.pages = pages; }, - setGroups: function(groups) { - this.options.groups = groups; - }, - hasPrev: function (v) { v || (v = 1); var o = this.options; diff --git a/typescript/base/pager/pager.ts b/typescript/base/pager/pager.ts index ebf843325..655f00092 100644 --- a/typescript/base/pager/pager.ts +++ b/typescript/base/pager/pager.ts @@ -17,7 +17,5 @@ export declare class Pager extends Widget { setAllPages(v: number): void; - setGroups(v: number): void; - populate(): void; }