ts-glitter 20.7.4 → 20.7.5

package/lowcode/public-components/blogs/list.js

@@ -336,29 +336,21 @@ BlogList.pageSplitV2 = (gvc, countPage, nowPage, callback) => {
                   </div>
                 </li>
                 ${glitter.print(() => {
-                    if (nowPage - 2 > 0) {
-                        return generator(nowPage - 2) + generator(nowPage - 1);
-                    }
-                    else if (nowPage - 1 > 0) {
-                        return generator(nowPage - 1);
-                    }
-                    else {
-                        return ``;
+                    let result = '';
+                    for (let i = Math.max(1, nowPage - 4); i < nowPage; i++) {
+                        result += generator(i);
                     }
+                    return result;
                 })}
                 <li class="page-item active mx-0" style="border-radius: 100%">
                   <div class="page-link-v2 page-link-active">${nowPage}</div>
                 </li>
                 ${glitter.print(() => {
-                    if (nowPage + 2 <= countPage) {
-                        return generator(nowPage + 1) + generator(nowPage + 2);
-                    }
-                    else if (nowPage + 1 <= countPage) {
-                        return generator(nowPage + 1);
-                    }
-                    else {
-                        return ``;
+                    let result = '';
+                    for (let i = nowPage + 1; i <= Math.min(nowPage + 4, countPage); i++) {
+                        result += generator(i);
                     }
+                    return result;
                 })}
                 <li class="page-item ms-0">
                   <div

package/lowcode/public-components/blogs/list.ts

@@ -85,25 +85,23 @@ export class BlogList {
                   </div>
                 </li>
                 ${glitter.print(() => {
-                  if (nowPage - 2 > 0) {
-                    return generator(nowPage - 2) + generator(nowPage - 1);
-                  } else if (nowPage - 1 > 0) {
-                    return generator(nowPage - 1);
-                  } else {
-                    return ``;
+                  let result = '';
+                  // 產生前面四頁的按鈕
+                  for (let i = Math.max(1, nowPage - 4); i < nowPage; i++) {
+                    result += generator(i);
                   }
+                  return result;
                 })}
                 <li class="page-item active mx-0" style="border-radius: 100%">
                   <div class="page-link-v2 page-link-active">${nowPage}</div>
                 </li>
                 ${glitter.print(() => {
-                  if (nowPage + 2 <= countPage) {
-                    return generator(nowPage + 1) + generator(nowPage + 2);
-                  } else if (nowPage + 1 <= countPage) {
-                    return generator(nowPage + 1);
-                  } else {
-                    return ``;
+                  let result = '';
+                  // 產生後面四頁的按鈕
+                  for (let i = nowPage + 1; i <= Math.min(nowPage + 4, countPage); i++) {
+                    result += generator(i);
                   }
+                  return result;
                 })}
                 <li class="page-item ms-0">
                   <div

package/lowcode/public-components/product/product-list.js

@@ -755,29 +755,21 @@ ProductList.pageSplitV2 = (gvc, countPage, nowPage, callback) => {
                   </div>
                 </li>
                 ${glitter.print(() => {
-                    if (nowPage - 2 > 0) {
-                        return generator(nowPage - 2) + generator(nowPage - 1);
-                    }
-                    else if (nowPage - 1 > 0) {
-                        return generator(nowPage - 1);
-                    }
-                    else {
-                        return ``;
+                    let result = '';
+                    for (let i = Math.max(1, nowPage - 4); i < nowPage; i++) {
+                        result += generator(i);
                     }
+                    return result;
                 })}
                 <li class="page-item active mx-0" style="border-radius: 100%">
                   <div class="page-link-v2 page-link-active">${nowPage}</div>
                 </li>
                 ${glitter.print(() => {
-                    if (nowPage + 2 <= countPage) {
-                        return generator(nowPage + 1) + generator(nowPage + 2);
-                    }
-                    else if (nowPage + 1 <= countPage) {
-                        return generator(nowPage + 1);
-                    }
-                    else {
-                        return ``;
+                    let result = '';
+                    for (let i = nowPage + 1; i <= Math.min(nowPage + 4, countPage); i++) {
+                        result += generator(i);
                     }
+                    return result;
                 })}
                 <li class="page-item ms-0">
                   <div

package/lowcode/public-components/product/product-list.ts

@@ -264,25 +264,23 @@ export class ProductList {
                   </div>
                 </li>
                 ${glitter.print(() => {
-                  if (nowPage - 2 > 0) {
-                    return generator(nowPage - 2) + generator(nowPage - 1);
-                  } else if (nowPage - 1 > 0) {
-                    return generator(nowPage - 1);
-                  } else {
-                    return ``;
+                  let result = '';
+                  // 產生前面四頁的按鈕
+                  for (let i = Math.max(1, nowPage - 4); i < nowPage; i++) {
+                    result += generator(i);
                   }
+                  return result;
                 })}
                 <li class="page-item active mx-0" style="border-radius: 100%">
                   <div class="page-link-v2 page-link-active">${nowPage}</div>
                 </li>
                 ${glitter.print(() => {
-                  if (nowPage + 2 <= countPage) {
-                    return generator(nowPage + 1) + generator(nowPage + 2);
-                  } else if (nowPage + 1 <= countPage) {
-                    return generator(nowPage + 1);
-                  } else {
-                    return ``;
+                  let result = '';
+                  // 產生後面四頁的按鈕
+                  for (let i = nowPage + 1; i <= Math.min(nowPage + 4, countPage); i++) {
+                    result += generator(i);
                   }
+                  return result;
                 })}
                 <li class="page-item ms-0">
                   <div