From d42de903be2815c62f1cd097b8b1e3a54dd8ee26 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 31 Mar 2022 15:23:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E9=BB=98=E8=AE=A4gap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/pager/pager.js | 44 ++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js
index 5967271b2..6b78a8d02 100644
--- a/src/base/pager/pager.js
+++ b/src/base/pager/pager.js
@@ -37,7 +37,7 @@ BI.Pager = BI.inherit(BI.Widget, {
                 return 1;
             },
             hasPrev: BI.emptyFn, // pages不可用时有效
-            hasNext: BI.emptyFn  // pages不可用时有效
+            hasNext: BI.emptyFn // pages不可用时有效
         });
     },
 
@@ -83,9 +83,11 @@ BI.Pager = BI.inherit(BI.Widget, {
                     disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
                 });
             } else {
-                view.push(BI.extend({
-                    disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
-                }, prev));
+                view.push({
+                    el: BI.extend({
+                        disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
+                    }, prev)
+                });
             }
         }
 
@@ -110,6 +112,7 @@ BI.Pager = BI.inherit(BI.Widget, {
         dict.start = dict.index > 1 ? curr - dict.poor : 1;
         dict.end = dict.index > 1 ? (function () {
             var max = curr + (groups - dict.poor - 1);
+
             return max > pages ? pages : max;
         }()) : groups;
         if (dict.end - dict.start < groups - 1) { // 最后一组状态
@@ -157,29 +160,36 @@ BI.Pager = BI.inherit(BI.Widget, {
             view.push((function () {
                 if (BI.isKey(next)) {
                     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)
                         ?
-                        {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({
             type: "bi.button_group",
             element: this,
-            items: BI.createItems(view, {
-                cls: "bi-list-item-select bi-border-radius",
-                height: 23,
-                hgap: 10,
-                stopPropagation: true
+            items: BI.map(view, function (idx, v) {
+                v = BI.extend({
+                    cls: "bi-list-item-select bi-border-radius",
+                    height: 23,
+                    hgap: v.el ? 0 : 10,
+                    stopPropagation: true
+                }, BI.stripEL(v));
+
+                return BI.formatEL(v);
             }),
             behaviors: o.behaviors,
             layouts: o.layouts
@@ -233,6 +243,7 @@ BI.Pager = BI.inherit(BI.Widget, {
         v || (v = 1);
         var o = this.options;
         var pages = this.options.pages;
+
         return pages === false ? o.hasPrev(v) : v > 1;
     },
 
@@ -240,6 +251,7 @@ BI.Pager = BI.inherit(BI.Widget, {
         v || (v = 1);
         var o = this.options;
         var pages = this.options.pages;
+
         return pages === false ? o.hasNext(v) : v < pages;
     },
 
@@ -268,7 +280,7 @@ BI.Pager = BI.inherit(BI.Widget, {
                 return BI.MIN;
             case "last":
                 return BI.MAX;
-            default :
+            default:
                 return val;
         }
     },