From db6772997154e82a98cc495fa44f243c313424cc Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Fri, 2 Jul 2021 10:35:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20style:?= =?UTF-8?q?=E4=BC=98=E5=85=88=E5=B1=95=E7=A4=BA=E5=88=86=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/pager/pager.all.count.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js index a63f1dc95..82387ed7c 100644 --- a/src/case/pager/pager.all.count.js +++ b/src/case/pager/pager.all.count.js @@ -96,12 +96,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, { }); BI.createWidget(o.showRowCount ? { - type: "bi.left_right_vertical_adapt", + type: "bi.htape", + columnSize: ["fill", 140], element: this, - items: { - left: [this._getRowCountObject()], - right: [this.editor, this.allPages, this.pager] - } + items: [ + this._getRowCountObject(), + { + type: "bi.right_vertical_adapt", + items: [this.editor, this.allPages, this.pager] + } + ] } : { type: "bi.vertical_adapt", element: this, From 54f5615a47a798f2ca40b4bd063f51c4a4b82eb6 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 5 Jul 2021 10:05:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20fix:?= =?UTF-8?q?=E4=BC=98=E5=85=88=E6=98=BE=E7=A4=BA=E7=BF=BB=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/pager/pager.all.count.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js index 82387ed7c..f428ccfce 100644 --- a/src/case/pager/pager.all.count.js +++ b/src/case/pager/pager.all.count.js @@ -92,20 +92,19 @@ BI.AllCountPager = BI.inherit(BI.Widget, { title: o.pages, text: "/" + o.pages, lgap: 5, + height: o.height, invisible: o.pages <= 1 }); BI.createWidget(o.showRowCount ? { - type: "bi.htape", - columnSize: ["fill", 140], + type: "bi.flex_horizontal", + columnSize: ["fill", ""], element: this, + scrollx: false, items: [ this._getRowCountObject(), - { - type: "bi.right_vertical_adapt", - items: [this.editor, this.allPages, this.pager] - } - ] + this.editor, this.allPages, this.pager + ], } : { type: "bi.vertical_adapt", element: this, From 3a5c5fc4318d8a2b8221731ecfe9569200157dfd Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 5 Jul 2021 13:30:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20style:?= =?UTF-8?q?=E4=BC=98=E5=85=88=E5=B1=95=E7=A4=BA=E5=88=86=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/pager/pager.all.count.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js index f428ccfce..6b6d75455 100644 --- a/src/case/pager/pager.all.count.js +++ b/src/case/pager/pager.all.count.js @@ -55,7 +55,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: "prev", title: BI.i18nText("BI-Previous_Page"), warningTitle: BI.i18nText("BI-Current_Is_First_Page"), - height: 22, + // height: 22, width: 22, cls: "bi-border bi-border-radius all-pager-prev bi-list-item-select2 " + pagerIconCls.preCls }, @@ -64,7 +64,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: "next", title: BI.i18nText("BI-Next_Page"), warningTitle: BI.i18nText("BI-Current_Is_Last_Page"), - height: 22, + // height: 22, width: 22, cls: "bi-border bi-border-radius all-pager-next bi-list-item-select2 " + pagerIconCls.nextCls }, @@ -92,12 +92,12 @@ BI.AllCountPager = BI.inherit(BI.Widget, { title: o.pages, text: "/" + o.pages, lgap: 5, - height: o.height, + // height: 24, invisible: o.pages <= 1 }); BI.createWidget(o.showRowCount ? { - type: "bi.flex_horizontal", + type: "bi.vertical_adapt", columnSize: ["fill", ""], element: this, scrollx: false, From 9d6b9b5e6d6fbf62241a99f91109803556a809f1 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 5 Jul 2021 13:32:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20style:?= =?UTF-8?q?=E4=BC=98=E5=85=88=E5=B1=95=E7=A4=BA=E5=88=86=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/pager/pager.all.count.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js index 6b6d75455..d087801d4 100644 --- a/src/case/pager/pager.all.count.js +++ b/src/case/pager/pager.all.count.js @@ -55,7 +55,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: "prev", title: BI.i18nText("BI-Previous_Page"), warningTitle: BI.i18nText("BI-Current_Is_First_Page"), - // height: 22, + height: 22, width: 22, cls: "bi-border bi-border-radius all-pager-prev bi-list-item-select2 " + pagerIconCls.preCls }, @@ -64,7 +64,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, { value: "next", title: BI.i18nText("BI-Next_Page"), warningTitle: BI.i18nText("BI-Current_Is_Last_Page"), - // height: 22, + height: 22, width: 22, cls: "bi-border bi-border-radius all-pager-next bi-list-item-select2 " + pagerIconCls.nextCls }, @@ -92,7 +92,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, { title: o.pages, text: "/" + o.pages, lgap: 5, - // height: 24, invisible: o.pages <= 1 });