ts-glitter 20.5.1 → 20.5.3

package/lowcode/public-components/user-manager/um-info.ts

@@ -119,7 +119,8 @@ export class UMInfo {
               <div class="row">
                 <div class="col-12  align-items-center d-none d-lg-flex" style="gap:10px;">
                   <div style="background: #FF9705;width:4px;height: 20px;"></div>
-                  <div class="um-info-title fw-bold" style="font-size: 24px;">${Language.text('account_user_info')}
+                  <div class="um-info-title fw-bold" style="font-size: 24px;">
+                    ${Language.text('account_user_info')}
                   </div>
                 </div>
                 <div style="margin-top:24px;" class="col-12">
@@ -170,12 +171,11 @@ export class UMInfo {
                         >
                           <div class="w-100">
                             ${(() => {
-                              if (!vm.memberNext) {
+                              if (!vm.memberNext || !vm.memberNext.leak) {
                                 return '';
                               }
                               const solidButtonBgr = `#FF9705`;
-                              return html`
-                                <div class="um-title mb-1 mt-2">
+                              return html` <div class="um-title mb-1 mt-2">
                                   ${Language.text('current_accumulated_spending_amount')}
                                 </div>
                                 <div class="w-100 um-linebar-container">
@@ -183,7 +183,7 @@ export class UMInfo {
                                     <div class="um-content">NT. ${(vm.memberNext.sum ?? 0).toLocaleString()}</div>
                                     <div class="um-content um-text-danger">
                                       ${Language.text('distance_from_target_amount')}
-                                        NT.${vm.memberNext.leak.toLocaleString()} ${Language.text('can_upgrade')}
+                                      NT.${vm.memberNext.leak.toLocaleString()} ${Language.text('can_upgrade')}
                                     </div>
                                   </div>
                                   <div class="w-100 um-linebar">
@@ -194,10 +194,10 @@ export class UMInfo {
                                         const sum = vm.memberNext.sum;
                                         const leak = vm.memberNext.leak;
                                         return `
-                                                            background: ${solidButtonBgr};
-                                                            width: ${sum ? (sum * 100) / (leak + sum) : 0}%;
-                                                            z-index:10;
-                                                        `;
+                                          background: ${solidButtonBgr};
+                                          width: ${sum ? (sum * 100) / (leak + sum) : 0}%;
+                                          z-index: 10;
+                                        `;
                                       })()}"
                                     ></div>
                                   </div>
@@ -253,8 +253,7 @@ export class UMInfo {
                             ]
                               .map(str => {
                                 return str.length > 0
-                                  ? html`
-                                    <div class="um-info-note" style="font-size: 14px;">${str}</div> `
+                                  ? html` <div class="um-info-note" style="font-size: 14px;">${str}</div> `
                                   : '';
                               })
                               .join('')}
@@ -268,8 +267,7 @@ export class UMInfo {
                                   tag: 'level-of-detail',
                                   title: Language.text('rules_explanation'),
                                   innerHTML: (gvc: GVC) => {
-                                    return html`
-                                      <div
+                                    return html` <div
                                         class="mt-1 pb-2 ${vm.data.member.length > 0 ? 'border-bottom' : ''}"
                                       >
                                         <div class="um-title">${Language.text('membership_level_rules')}</div>
@@ -348,10 +346,9 @@ export class UMInfo {
                                           },
                                         });
                                       } else {
-                                        return html`
-                                          <div style="text-align: center; vertical-align: middle;">
-                                            <img src="${img}" />
-                                          </div>`;
+                                        return html` <div style="text-align: center; vertical-align: middle;">
+                                          <img src="${img}" />
+                                        </div>`;
                                       }
                                     },
                                     divCreate: {},
@@ -387,8 +384,7 @@ export class UMInfo {
                                               }
                                             }, 300);
                                           },
-                                          () => {
-                                          }
+                                          () => {}
                                         );
                                       }
                                     },
@@ -423,7 +419,6 @@ export class UMInfo {
                                 gvc.glitter.addMtScript(
                                   [`https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js`],
                                   () => {
-
                                     //@ts-ignore
                                     JsBarcode(document.querySelector('#barcode'), `user-${vm.data.userID}`, {
                                       format: 'CODE128', // 條碼格式，可根據需求更換
@@ -433,8 +428,7 @@ export class UMInfo {
                                       displayValue: true, // 是否顯示條碼值
                                     });
                                   },
-                                  () => {
-                                  }
+                                  () => {}
                                 );
                               },
                             };
@@ -445,109 +439,109 @@ export class UMInfo {
                     <div
                       style="align-self: stretch; justify-content: flex-start; align-items: center; gap: 12px; display: inline-flex"
                     >
-                      ${
-                        [
-                          {
-                            title: glitter.share.rebateConfig.title || Language.text('shopping_credit'),
-                            value: gvc.bindView(() => {
-                              const id = glitter.getUUID();
-                              let sum: string = '-';
-                              ApiShop.getRebate({}).then(res => {
-                                sum = res.response.sum.toLocaleString();
-                                gvc.notifyDataChange(id);
-                              });
-                              return {
-                                bind: id,
-                                view: () => {
-                                  return sum;
-                                },
-                                divCreate: {
-                                  style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
-                                },
-                              };
-                            })
-                          },
-                          {
-                            title: Language.text('coupons'),
-                            value: gvc.bindView(() => {
-                              const id = glitter.getUUID();
-                              let sum: string = '-';
-                              ApiShop.getVoucher({
-                                page: 0,
-                                limit: 10000,
-                                data_from: 'user',
-                              }).then(res => {
-                                sum = res.response.data
-                                  .filter((item: Voucher) => item.content.trigger === 'code')
-                                  .length.toLocaleString();
-                                gvc.notifyDataChange(id);
-                              });
-                              return {
-                                bind: id,
-                                view: () => {
-                                  return sum;
-                                },
-                                divCreate: {
-                                  style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
-                                },
-                              };
-                            })
-                          },
-                          {
-                            title: Language.text('wait_ship'),
-                            value: gvc.bindView(() => {
-                              const id = glitter.getUUID();
-                              let sum: string = '-';
-                              ApiShop.getOrder({
-                                limit: 1,
-                                page: 0,
-                                filter: {
-                                  progress: ['in_stock', 'wait'],
-                                },
-                                data_from: 'user',
-                              }).then((res: any) => {
-                                sum = res.response.total.toLocaleString();
-                                gvc.notifyDataChange(id);
-                              });
-                              return {
-                                bind: id,
-                                view: () => {
-                                  return sum;
-                                },
-                                divCreate: {
-                                  style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
-                                },
-                              };
-                            })
-                          },
-                          {
-                            title: Language.text('shipped'),
-                            value: gvc.bindView(() => {
-                              const id = glitter.getUUID();
-                              let sum: string = '-';
-                              ApiShop.getOrder({
-                                limit: 1,
-                                page: 0,
-                                filter: {
-                                  progress: ['shipping'],
-                                },
-                                data_from: 'user',
-                              }).then((res: any) => {
-                                sum = res.response.total.toLocaleString();
-                                gvc.notifyDataChange(id);
-                              });
-                              return {
-                                bind: id,
-                                view: () => {
-                                  return sum;
-                                },
-                                divCreate: {
-                                  style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
-                                },
-                              };
-                            })
-                          }
-                        ].map((dd) => {
+                      ${[
+                        {
+                          title: glitter.share.rebateConfig.title || Language.text('shopping_credit'),
+                          value: gvc.bindView(() => {
+                            const id = glitter.getUUID();
+                            let sum: string = '-';
+                            ApiShop.getRebate({}).then(res => {
+                              sum = res.response.sum.toLocaleString();
+                              gvc.notifyDataChange(id);
+                            });
+                            return {
+                              bind: id,
+                              view: () => {
+                                return sum;
+                              },
+                              divCreate: {
+                                style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
+                              },
+                            };
+                          }),
+                        },
+                        {
+                          title: Language.text('coupons'),
+                          value: gvc.bindView(() => {
+                            const id = glitter.getUUID();
+                            let sum: string = '-';
+                            ApiShop.getVoucher({
+                              page: 0,
+                              limit: 10000,
+                              data_from: 'user',
+                            }).then(res => {
+                              sum = res.response.data
+                                .filter((item: Voucher) => item.content.trigger === 'code')
+                                .length.toLocaleString();
+                              gvc.notifyDataChange(id);
+                            });
+                            return {
+                              bind: id,
+                              view: () => {
+                                return sum;
+                              },
+                              divCreate: {
+                                style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
+                              },
+                            };
+                          }),
+                        },
+                        {
+                          title: Language.text('wait_ship'),
+                          value: gvc.bindView(() => {
+                            const id = glitter.getUUID();
+                            let sum: string = '-';
+                            ApiShop.getOrder({
+                              limit: 1,
+                              page: 0,
+                              filter: {
+                                progress: ['in_stock', 'wait'],
+                              },
+                              data_from: 'user',
+                            }).then((res: any) => {
+                              sum = res.response.total.toLocaleString();
+                              gvc.notifyDataChange(id);
+                            });
+                            return {
+                              bind: id,
+                              view: () => {
+                                return sum;
+                              },
+                              divCreate: {
+                                style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
+                              },
+                            };
+                          }),
+                        },
+                        {
+                          title: Language.text('shipped'),
+                          value: gvc.bindView(() => {
+                            const id = glitter.getUUID();
+                            let sum: string = '-';
+                            ApiShop.getOrder({
+                              limit: 1,
+                              page: 0,
+                              filter: {
+                                progress: ['shipping'],
+                              },
+                              data_from: 'user',
+                            }).then((res: any) => {
+                              sum = res.response.total.toLocaleString();
+                              gvc.notifyDataChange(id);
+                            });
+                            return {
+                              bind: id,
+                              view: () => {
+                                return sum;
+                              },
+                              divCreate: {
+                                style: `align-self: stretch; text-align: center; color: #393939; font-size: 20px;  font-weight: 700; line-height: 28px; word-wrap: break-word`,
+                              },
+                            };
+                          }),
+                        },
+                      ]
+                        .map(dd => {
                           return `<div
                         style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; display: inline-flex"
                       >
@@ -557,9 +551,9 @@ export class UMInfo {
                         >
                           ${dd.title}
                         </div>
-                      </div>`
-                        }).join(`<div class="border-end" style="width:1px;height: 30px;"></div>`)
-                      }
+                      </div>`;
+                        })
+                        .join(`<div class="border-end" style="width:1px;height: 30px;"></div>`)}
                     </div>
                   </div>
                 </div>
@@ -573,28 +567,37 @@ export class UMInfo {
                         title: Language.text('member_info'),
                         icon: '<i class="fa-solid fa-address-book fs-3"></i>',
                         event: () => {
-                          gvc.glitter.getModule(new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href, (cl) => {
-                            cl.changePage('account_edit', 'page', {})
-                          })
-                        }
+                          gvc.glitter.getModule(
+                            new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href,
+                            cl => {
+                              cl.changePage('account_edit', 'page', {});
+                            }
+                          );
+                        },
                       },
                       {
                         title: Language.text('order_history'),
                         icon: `<i class="fa-solid fa-square-list fs-3"></i>`,
                         event: () => {
-                          gvc.glitter.getModule(new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href, (cl) => {
-                            cl.changePage('order_list', 'home', {})
-                          })
-                        }
+                          gvc.glitter.getModule(
+                            new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href,
+                            cl => {
+                              cl.changePage('order_list', 'home', {});
+                            }
+                          );
+                        },
                       },
                       {
                         title: Language.text('wishlist'),
                         icon: `<i class="fa-solid fa-heart fs-3"></i>`,
                         event: () => {
-                          gvc.glitter.getModule(new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href, (cl) => {
-                            cl.changePage('wishlist', 'home', {})
-                          })
-                        }
+                          gvc.glitter.getModule(
+                            new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href,
+                            cl => {
+                              cl.changePage('wishlist', 'home', {});
+                            }
+                          );
+                        },
                       },
                     ]
                       .map((dd: any) => {
@@ -602,8 +605,8 @@ export class UMInfo {
                     <div
                       style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; gap: 8px; display: inline-flex;cursor:pointer;"
                       onclick="${gvc.event(() => {
-                          dd.event()
-                        })}">
+                        dd.event();
+                      })}">
                      ${dd.icon}
                       <div
                         style="font-size:16px;" class="fw-500">
@@ -642,11 +645,9 @@ export class UMInfo {
     });
   }
 
-  static edit(gvc:GVC){
+  static edit(gvc: GVC) {
     const vm = {
-      data: {
-
-      } as User,
+      data: {} as User,
       memberNext: {} as Member | undefined,
       resetPassword: false,
     };
@@ -663,27 +664,30 @@ export class UMInfo {
         form_array: [],
         login_config: {},
       };
-      let update_userData:any = {};
+      let update_userData: any = {};
 
       async function loadConfig() {
         try {
           vm_info.loading = true;
 
-          const [res, data, userSeeting,userData] = await Promise.all([
+          const [res, data, userSeeting, userData] = await Promise.all([
             ApiUser.getPublicConfig('custom_form_register', 'manager'),
             ApiUser.getPublicConfig('login_config', 'manager'),
             ApiUser.getPublicConfig('customer_form_user_setting', 'manager'),
-            UmClass.getUserData(gvc)
+            UmClass.getUserData(gvc),
           ]);
 
           // 設定回傳結果
           const defaultList = { list: [] };
           vm_info.login_config = data.response.value ?? {};
-          vm_info.list = [...(res.response.value?.list ?? defaultList.list), ...(userSeeting.response.value?.list ?? defaultList.list)];
+          vm_info.list = [
+            ...(res.response.value?.list ?? defaultList.list),
+            ...(userSeeting.response.value?.list ?? defaultList.list),
+          ];
           vm_info.form_array = FormCheck.initialRegisterForm(vm_info.list).filter((dd: any) => !dd.hidden);
           vm.data = userData as any;
           vm_info.loading = false;
-          update_userData=JSON.parse(JSON.stringify(vm.data.userData));
+          update_userData = JSON.parse(JSON.stringify(vm.data.userData));
           gvc.notifyDataChange(id);
         } catch (error) {
           console.error('載入設定時發生錯誤:', error);
@@ -825,7 +829,8 @@ export class UMInfo {
               list: [
                 {
                   class: 'um-content mb-2',
-                  style: 'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
+                  style:
+                    'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
                   stylist: [],
                   dataType: 'code',
                   style_from: 'code',
@@ -863,16 +868,26 @@ export class UMInfo {
           return [
             ` <div class="w-100  align-items-center d-flex py-3 pb-lg-3 pt-lg-0" style="gap:10px;">
 
-                  <div  class="d-none d-lg-flex" style="background: #FF9705;background: #FF9705;width:4px;height: 20px;" onclick="${gvc.event(()=>{
-              gvc.glitter.getModule(new URL(gvc.glitter.root_path+'official_event/page/change-page.js', import.meta.url).href, (cl) => {
-                cl.changePage('account_userinfo', 'home', {})
-              })
-            })}"></div>
-                    <div class="d-flex d-lg-none align-items-center justify-content-center" style="width:20px;height: 20px;" onclick="${gvc.event(()=>{
-              gvc.glitter.getModule(new URL(gvc.glitter.root_path+'official_event/page/change-page.js', import.meta.url).href, (cl) => {
-                cl.changePage('account_userinfo', 'home', {})
-              })
-            })}">
+                  <div  class="d-none d-lg-flex" style="background: #FF9705;background: #FF9705;width:4px;height: 20px;" onclick="${gvc.event(
+                    () => {
+                      gvc.glitter.getModule(
+                        new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href,
+                        cl => {
+                          cl.changePage('account_userinfo', 'home', {});
+                        }
+                      );
+                    }
+                  )}"></div>
+                    <div class="d-flex d-lg-none align-items-center justify-content-center" style="width:20px;height: 20px;" onclick="${gvc.event(
+                      () => {
+                        gvc.glitter.getModule(
+                          new URL(gvc.glitter.root_path + 'official_event/page/change-page.js', import.meta.url).href,
+                          cl => {
+                            cl.changePage('account_userinfo', 'home', {});
+                          }
+                        );
+                      }
+                    )}">
                    <i class="fa-solid fa-angle-left fs-4"></i>
 </div>
                   <div class="um-info-title fw-bold " style="font-size: 24px;">${Language.text('member_info')}</div>
@@ -899,60 +914,60 @@ export class UMInfo {
               }),
               refresh: () => {
                 setTimeout(() => {
-
                   gvc.notifyDataChange(id);
                 });
               },
               formData: update_userData,
             }),
             html` <div
-                                                        class="mt-2 w-100 d-flex align-items-center justify-content-end ${JSON.stringify(update_userData) === JSON.stringify(vm.data.userData)
-              ? `d-none`
-              : ``}"
-                                                    >
-                                                        <div
-                                                            class="um-nav-btn um-nav-btn-active d-flex align-items-center justify-content-center fw-bold"
-                                                            onclick="${gvc.event(() => {
-              const dialog = new ShareDialog(gvc.glitter);
-              const leak = form_array.find((dd: any) => {
-                return `${dd.require}` === 'true' && !update_userData[dd.key];
-              });
-              if (leak) {
-                dialog.errorMessage({ text: `${Language.text('not_filled_in_yet')} ${leak.title}` });
-                return;
-              }
-              dialog.dataLoading({ visible: true });
-              ApiUser.updateUserData({
-                userData: update_userData,
-              }).then((res) => {
-                dialog.dataLoading({ visible: false });
-                if (!res.result && res.response.data.msg === 'email-verify-false') {
-                  dialog.errorMessage({ text: Language.text('email_verification_code_incorrect') });
-                } else if (!res.result && res.response.data.msg === 'phone-verify-false') {
-                  dialog.errorMessage({ text: Language.text('sms_verification_code_incorrect') });
-                } else if (!res.result && res.response.data.msg === 'phone-exists') {
-                  dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
-                } else if (!res.result && res.response.data.msg === 'email-exists') {
-                  dialog.errorMessage({ text: Language.text('email_already_exists') });
-                } else if (!res.result) {
-                  dialog.errorMessage({ text: Language.text('update_exception') });
-                } else {
-                  dialog.successMessage({ text: Language.text('change_success') });
-                  gvc.recreateView();
-                }
-              });
-            })}"
-                                                        >
-                                                            ${Language.text('confirm_reset')}
-                                                        </div>
-                                                    </div>`,
+              class="mt-2 w-100 d-flex align-items-center justify-content-end ${JSON.stringify(update_userData) ===
+              JSON.stringify(vm.data.userData)
+                ? `d-none`
+                : ``}"
+            >
+              <div
+                class="um-nav-btn um-nav-btn-active d-flex align-items-center justify-content-center fw-bold"
+                onclick="${gvc.event(() => {
+                  const dialog = new ShareDialog(gvc.glitter);
+                  const leak = form_array.find((dd: any) => {
+                    return `${dd.require}` === 'true' && !update_userData[dd.key];
+                  });
+                  if (leak) {
+                    dialog.errorMessage({ text: `${Language.text('not_filled_in_yet')} ${leak.title}` });
+                    return;
+                  }
+                  dialog.dataLoading({ visible: true });
+                  ApiUser.updateUserData({
+                    userData: update_userData,
+                  }).then(res => {
+                    dialog.dataLoading({ visible: false });
+                    if (!res.result && res.response.data.msg === 'email-verify-false') {
+                      dialog.errorMessage({ text: Language.text('email_verification_code_incorrect') });
+                    } else if (!res.result && res.response.data.msg === 'phone-verify-false') {
+                      dialog.errorMessage({ text: Language.text('sms_verification_code_incorrect') });
+                    } else if (!res.result && res.response.data.msg === 'phone-exists') {
+                      dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
+                    } else if (!res.result && res.response.data.msg === 'email-exists') {
+                      dialog.errorMessage({ text: Language.text('email_already_exists') });
+                    } else if (!res.result) {
+                      dialog.errorMessage({ text: Language.text('update_exception') });
+                    } else {
+                      dialog.successMessage({ text: Language.text('change_success') });
+                      gvc.recreateView();
+                    }
+                  });
+                })}"
+              >
+                ${Language.text('confirm_reset')}
+              </div>
+            </div>`,
           ].join('');
         },
         divCreate: {
           class: `w-100`,
         },
       };
-    })
+    });
   }
 }