ts-glitter 20.7.3 → 20.7.5

package/lowcode/backend-manager/splitPage.js

@@ -33,72 +33,47 @@ export class PageSplit {
                         return html `
               <nav class="d-flex my-3 justify-content-center">
                 <ul class="pagination pagination-rounded mb-0">
-                  <div
-                    class="page-item d-flex align-items-center justify-content-center ${nowPage - 1 > 0
-                            ? ''
-                            : 'd-none'}"
-                    style="height: 36px;width: 36px;cursor: pointer;"
-                  >
-                    <a
+                  <li class="page-item me-0">
+                    <div
+                      class="page-link-v2 page-link-prev"
+                      aria-label="Previous"
+                      style="cursor:pointer"
                       onclick="${gvc.event(() => {
                             nowPage - 1 > 0 && callback(nowPage - 1);
                         })}"
                     >
-                      <span aria-hidden="true">&laquo;</span>
-                    </a>
-                  </div>
+                      <i class="fa-solid fa-angle-left angle-style"></i>
+                    </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;
                         })}
-                  <div
-                    class="d-flex align-items-center justify-content-center fw-500"
-                    style="width: 36px; height: 36px; border-radius: 100%; cursor: pointer; ${(() => {
-                            if (glitter.share.globalValue['theme_color.0.solid-button-bg']) {
-                                return `
-                          background: ${glitter.share.globalValue['theme_color.0.solid-button-bg']};
-                          color: ${glitter.share.globalValue['theme_color.0.solid-button-text']};
-                        `;
-                            }
-                            else {
-                                return '';
-                            }
-                        })()};"
-                  >
-                    ${nowPage}
-                  </div>
+                  <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;
                         })}
-                  <div
-                    class="page-item d-flex align-items-center justify-content-center ${nowPage + 1 <= countPage
-                            ? ''
-                            : 'd-none'}"
-                    style="height: 36px; width: 36px; cursor: pointer;"
-                  >
-                    <a
+                  <li class="page-item ms-0">
+                    <div
+                      class="page-link-v2 page-link-next"
+                      aria-label="Next"
+                      style="cursor:pointer"
                       onclick="${gvc.event(() => {
                             nowPage + 1 <= countPage && callback(nowPage + 1);
                         })}"
                     >
-                      <span aria-hidden="true">&raquo;</span>
-                    </a>
-                  </div>
+                      <i class="fa-solid fa-angle-right angle-style"></i>
+                    </div>
+                  </li>
                 </ul>
               </nav>
               ${glitter.print(() => {

package/lowcode/backend-manager/splitPage.ts

@@ -41,67 +41,49 @@ export class PageSplit {
             return html`
               <nav class="d-flex my-3 justify-content-center">
                 <ul class="pagination pagination-rounded mb-0">
-                  <div
-                    class="page-item d-flex align-items-center justify-content-center ${nowPage - 1 > 0
-                      ? ''
-                      : 'd-none'}"
-                    style="height: 36px;width: 36px;cursor: pointer;"
-                  >
-                    <a
+                  <li class="page-item me-0">
+                    <div
+                      class="page-link-v2 page-link-prev"
+                      aria-label="Previous"
+                      style="cursor:pointer"
                       onclick="${gvc.event(() => {
                         nowPage - 1 > 0 && callback(nowPage - 1);
                       })}"
                     >
-                      <span aria-hidden="true">&laquo;</span>
-                    </a>
-                  </div>
+                      <i class="fa-solid fa-angle-left angle-style"></i>
+                    </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;
                   })}
-                  <div
-                    class="d-flex align-items-center justify-content-center fw-500"
-                    style="width: 36px; height: 36px; border-radius: 100%; cursor: pointer; ${(() => {
-                      if (glitter.share.globalValue['theme_color.0.solid-button-bg']) {
-                        return `
-                          background: ${glitter.share.globalValue['theme_color.0.solid-button-bg']};
-                          color: ${glitter.share.globalValue['theme_color.0.solid-button-text']};
-                        `;
-                      } else {
-                        return '';
-                      }
-                    })()};"
-                  >
-                    ${nowPage}
-                  </div>
+                  <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;
                   })}
-                  <div
-                    class="page-item d-flex align-items-center justify-content-center ${nowPage + 1 <= countPage
-                      ? ''
-                      : 'd-none'}"
-                    style="height: 36px; width: 36px; cursor: pointer;"
-                  >
-                    <a
+                  <li class="page-item ms-0">
+                    <div
+                      class="page-link-v2 page-link-next"
+                      aria-label="Next"
+                      style="cursor:pointer"
                       onclick="${gvc.event(() => {
                         nowPage + 1 <= countPage && callback(nowPage + 1);
                       })}"
                     >
-                      <span aria-hidden="true">&raquo;</span>
-                    </a>
-                  </div>
+                      <i class="fa-solid fa-angle-right angle-style"></i>
+                    </div>
+                  </li>
                 </ul>
               </nav>
               ${glitter.print(() => {

package/lowcode/cms-plugin/app-release.js

@@ -203,6 +203,18 @@ export class AppRelease {
                                                             postMD.name = text;
                                                         },
                                                     }),
+                                                    BgWidget.editeInput({
+                                                        gvc: gvc,
+                                                        title: html ` <div class="d-flex flex-column" style="gap:3px;">
+                                  App 專案包名 ${BgWidget.grayNote('為空則預設為網域路徑')}
+                                </div>`,
+                                                        default: postMD.ios_app_bundle_id || '',
+                                                        placeHolder: `${window.parent.glitter.share.editorViewModel.domain}`,
+                                                        callback: text => {
+                                                            postMD.ios_app_bundle_id = text;
+                                                            gvc.notifyDataChange(id);
+                                                        },
+                                                    }),
                                                     html ` <div class="w-100">
                               <div class="d-flex flex-column mb-2" style="gap:3px;">
                                 APP Logo ${BgWidget.grayNote('圖片上傳尺寸為1024 * 1024')}
@@ -376,18 +388,6 @@ export class AppRelease {
                                                 bind: id,
                                                 view: () => {
                                                     return [
-                                                        BgWidget.editeInput({
-                                                            gvc: gvc,
-                                                            title: html ` <div class="d-flex flex-column" style="gap:3px;">
-                                  App 專案包名 ${BgWidget.grayNote('為空則預設為網域路徑')}
-                                </div>`,
-                                                            default: postMD.ios_app_bundle_id || '',
-                                                            placeHolder: `${window.parent.glitter.share.editorViewModel.domain}`,
-                                                            callback: text => {
-                                                                postMD.ios_app_bundle_id = text;
-                                                                gvc.notifyDataChange(id);
-                                                            },
-                                                        }),
                                                         `<div
                                                         onclick="${gvc.event(() => {
                                                             const dialog = new ShareDialog(gvc.glitter);
@@ -421,6 +421,54 @@ export class AppRelease {
                         ${BgWidget.save(gvc.event(() => {
                                             save(false, postMD, result => { });
                                         }), '儲存')}
+                      </div>`,
+                                    ].join(``);
+                                })(),
+                            },
+                            {
+                                title: 'Android應用設定',
+                                editor: (() => {
+                                    let postMD = postMDRefer;
+                                    const id = gvc.glitter.getUUID();
+                                    return [
+                                        gvc.bindView(() => {
+                                            return {
+                                                bind: id,
+                                                view: () => {
+                                                    return [
+                                                        `<div
+                                                        onclick="${gvc.event(() => {
+                                                            const dialog = new ShareDialog(gvc.glitter);
+                                                            navigator.clipboard.writeText(postMD.ios_app_bundle_id ||
+                                                                window.parent.glitter.share.editorViewModel
+                                                                    .domain);
+                                                            dialog.successMessage({ text: '已複製至剪貼簿' });
+                                                        })}"
+                                                    >
+                                                        ${BgWidget.editeInput({
+                                                            readonly: true,
+                                                            gvc: gvc,
+                                                            title: html ` <div class="d-flex flex-column" style="gap:5px;">
+                                                            LINE登入
+                                                            ${BgWidget.grayNote('點擊複製專案ID至LINE開發者後台的『 Android Package Names 』欄位')}
+                                                          </div>`,
+                                                            default: postMD.ios_app_bundle_id ||
+                                                                window.parent.glitter.share.editorViewModel.domain,
+                                                            placeHolder: '',
+                                                            callback: text => { },
+                                                        })}
+                                                    </div>`,
+                                                    ].join(`<div class="my-3"></div>`);
+                                                },
+                                                divCreate: {
+                                                    class: ``,
+                                                },
+                                            };
+                                        }),
+                                        html ` <div class="mt-3 w-100 d-flex align-items-center justify-content-end">
+                        ${BgWidget.save(gvc.event(() => {
+                                            save(false, postMD, result => { });
+                                        }), '儲存')}
                       </div>`,
                                     ].join(``);
                                 })(),
@@ -570,7 +618,9 @@ export class AppRelease {
                                     }
                                 });
                             }
-                        }))}
+                        }), {
+                            class: 'd-none'
+                        })}
                 ${BgWidget.save(gvc.event(() => {
                             save(true, postMDRefer, () => { });
                         }), '將APP提交審查')}

package/lowcode/cms-plugin/app-release.ts

@@ -232,6 +232,18 @@ export class AppRelease {
                                 postMD.name = text;
                               },
                             }),
+                            BgWidget.editeInput({
+                              gvc: gvc,
+                              title: html` <div class="d-flex flex-column" style="gap:3px;">
+                                  App 專案包名 ${BgWidget.grayNote('為空則預設為網域路徑')}
+                                </div>`,
+                              default: postMD.ios_app_bundle_id || '',
+                              placeHolder: `${(window.parent as any).glitter.share.editorViewModel.domain}`,
+                              callback: text => {
+                                postMD.ios_app_bundle_id = text;
+                                gvc.notifyDataChange(id);
+                              },
+                            }),
                             html` <div class="w-100">
                               <div class="d-flex flex-column mb-2" style="gap:3px;">
                                 APP Logo ${BgWidget.grayNote('圖片上傳尺寸為1024 * 1024')}
@@ -421,18 +433,6 @@ export class AppRelease {
                           bind: id,
                           view: () => {
                             return [
-                              BgWidget.editeInput({
-                                gvc: gvc,
-                                title: html` <div class="d-flex flex-column" style="gap:3px;">
-                                  App 專案包名 ${BgWidget.grayNote('為空則預設為網域路徑')}
-                                </div>`,
-                                default: postMD.ios_app_bundle_id || '',
-                                placeHolder: `${(window.parent as any).glitter.share.editorViewModel.domain}`,
-                                callback: text => {
-                                  postMD.ios_app_bundle_id = text;
-                                  gvc.notifyDataChange(id);
-                                },
-                              }),
                               `<div
                                                         onclick="${gvc.event(() => {
                                                           const dialog = new ShareDialog(gvc.glitter);
@@ -478,6 +478,62 @@ export class AppRelease {
                     ].join(``);
                   })(),
                 },
+                {
+                  title: 'Android應用設定',
+                  editor: (() => {
+                    let postMD = postMDRefer;
+                    const id = gvc.glitter.getUUID();
+                    return [
+                      gvc.bindView(() => {
+                        return {
+                          bind: id,
+                          view: () => {
+                            return [
+                              `<div
+                                                        onclick="${gvc.event(() => {
+                                const dialog = new ShareDialog(gvc.glitter);
+                                navigator.clipboard.writeText(
+                                  postMD.ios_app_bundle_id ||
+                                  (window.parent as any).glitter.share.editorViewModel
+                                    .domain
+                                );
+                                dialog.successMessage({ text: '已複製至剪貼簿' });
+                              })}"
+                                                    >
+                                                        ${BgWidget.editeInput({
+                                readonly: true,
+                                gvc: gvc,
+                                title: html` <div class="d-flex flex-column" style="gap:5px;">
+                                                            LINE登入
+                                                            ${BgWidget.grayNote(
+                                  '點擊複製專案ID至LINE開發者後台的『 Android Package Names 』欄位'
+                                )}
+                                                          </div>`,
+                                default:
+                                  postMD.ios_app_bundle_id ||
+                                  (window.parent as any).glitter.share.editorViewModel.domain,
+                                placeHolder: '',
+                                callback: text => {},
+                              })}
+                                                    </div>`,
+                            ].join(`<div class="my-3"></div>`);
+                          },
+                          divCreate: {
+                            class: ``,
+                          },
+                        };
+                      }),
+                      html` <div class="mt-3 w-100 d-flex align-items-center justify-content-end">
+                        ${BgWidget.save(
+                          gvc.event(() => {
+                            save(false, postMD, result => {});
+                          }),
+                          '儲存'
+                        )}
+                      </div>`,
+                    ].join(``);
+                  })(),
+                },
                 {
                   title: '聯絡資訊',
                   editor: (() => {
@@ -620,6 +676,7 @@ export class AppRelease {
               html` <div class="update-bar-container">
                 ${BgWidget.grayButton(
                   '下載IOS專案原始檔案',
+                  
                   gvc.event(() => {
                     const dialog = new ShareDialog(gvc.glitter);
                     if (postMDRefer.status === 'no') {
@@ -636,7 +693,10 @@ export class AppRelease {
                       });
                     }
                     // save(true, postMDRefer, () => {});
-                  })
+                  }),
+                  {
+                    class:'d-none'
+                  }
                 )}
                 ${BgWidget.save(
                   gvc.event(() => {

package/lowcode/cms-plugin/auto-fcm-advertise.js

@@ -169,7 +169,7 @@ export class AutoFcmAdvertise {
                         ApiUser.getUserList({
                             page: 0,
                             limit: 99999,
-                            only_id: true
+                            only_id: true,
                         }).then(dd => {
                             dd.response.data.map((user) => {
                                 postData.userList.push({
@@ -420,17 +420,17 @@ export class AutoFcmAdvertise {
             return {
                 bind: vm.containerId,
                 view: () => {
-                    return [
+                    return ([
                         BgWidget.mainCard([
                             html ` <div class="tx_700">選擇收件對象</div>`,
                             html ` <div class="tx_normal fw-normal mt-3">根據</div>`,
                             html ` <div
-                      style="display: flex; ${document.body.clientWidth > 768
+                        style="display: flex; ${document.body.clientWidth > 768
                                 ? 'gap: 18px;'
                                 : 'flex-direction: column;'}"
-                    >
-                      <div style="width: ${document.body.clientWidth > 768 ? '400px' : '100%'};">
-                        ${BgWidget.select({
+                      >
+                        <div style="width: ${document.body.clientWidth > 768 ? '400px' : '100%'};">
+                          ${BgWidget.select({
                                 gvc: gvc,
                                 default: postData.tag,
                                 callback: key => {
@@ -441,9 +441,9 @@ export class AutoFcmAdvertise {
                                 options: FilterOptions.emailOptions,
                                 style: 'margin: 8px 0;',
                             })}
-                      </div>
-                      <div style="width: 100%; display: flex; align-items: center;">
-                        ${gvc.bindView({
+                        </div>
+                        <div style="width: 100%; display: flex; align-items: center;">
+                          ${gvc.bindView({
                                 bind: vm.id,
                                 view: () => {
                                     const getDefault = (def) => {
@@ -469,7 +469,7 @@ export class AutoFcmAdvertise {
                                                 ApiUser.getUserList({
                                                     page: 0,
                                                     limit: 99999,
-                                                    only_id: true
+                                                    only_id: true,
                                                 }).then(dd => {
                                                     if (dd.response.data) {
                                                         const ids = [];
@@ -521,7 +521,7 @@ export class AutoFcmAdvertise {
                                                                 page: 0,
                                                                 limit: 99999,
                                                                 only_id: true,
-                                                                search: data.query
+                                                                search: data.query,
                                                             }).then(dd => {
                                                                 if (dd.response.data) {
                                                                     vm.dataList = dd.response.data
@@ -587,8 +587,8 @@ export class AutoFcmAdvertise {
                                     }
                                 },
                             })}
-                      </div>
-                    </div>`,
+                        </div>
+                      </div>`,
                             gvc.bindView({
                                 bind: vm.tagsId,
                                 view: () => getTagsHTML(),
@@ -629,7 +629,7 @@ export class AutoFcmAdvertise {
                                             callback: text => {
                                                 postData.link = text;
                                             },
-                                        })
+                                        }),
                                     ].join('');
                                 },
                                 divCreate: {
@@ -638,7 +638,7 @@ export class AutoFcmAdvertise {
                             }),
                         ].join('')),
                         BgWidget.mainCard(html ` <div class="tx_700 mb-3">發送時間</div>
-                    ${EditorElem.radio({
+                      ${EditorElem.radio({
                             gvc: gvc,
                             title: '',
                             def: postData.sendTime === undefined ? 'now' : 'set',
@@ -651,10 +651,10 @@ export class AutoFcmAdvertise {
                                     title: '排定發送時間',
                                     value: 'set',
                                     innerHtml: html ` <div
-                            class="d-flex mt-3 ${document.body.clientWidth < 768 ? 'flex-column' : ''}"
-                            style="gap: 12px"
-                          >
-                            ${EditorElem.editeInput({
+                              class="d-flex mt-3 ${document.body.clientWidth < 768 ? 'flex-column' : ''}"
+                              style="gap: 12px"
+                            >
+                              ${EditorElem.editeInput({
                                         gvc: gvc,
                                         title: '',
                                         type: 'date',
@@ -669,7 +669,7 @@ export class AutoFcmAdvertise {
                                             };
                                         },
                                     })}
-                            ${EditorElem.editeInput({
+                              ${EditorElem.editeInput({
                                         gvc: gvc,
                                         title: '',
                                         type: 'time',
@@ -684,7 +684,7 @@ export class AutoFcmAdvertise {
                                             };
                                         },
                                     })}
-                          </div>`,
+                            </div>`,
                                 },
                             ],
                             callback: text => {
@@ -696,12 +696,11 @@ export class AutoFcmAdvertise {
                                 }
                             },
                         })}`),
-                    ].join(BgWidget.mbContainer(16));
+                    ].join(BgWidget.mbContainer(16)) + BgWidget.mbContainer(240));
                 },
-                divCreate: {},
             };
         }))}
-      ${BgWidget.mbContainer(240)}
+      ${BgWidget.mbContainer(480)}
       <div class="update-bar-container">
         ${BgWidget.save(gvc.event(() => {
             function isLater(dateTimeObj) {