ts-glitter 21.5.2 → 21.5.4

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

@@ -78,9 +78,7 @@ export class UMInfo {
                             >
                               <div style="color: white; font-size: 14px;  font-weight: 700; word-wrap: break-word">
                                 ${(() => {
-                            const mem = vm.data.member.find(d => {
-                                return d.trigger;
-                            });
+                            const mem = vm.data.member.find(d => d.trigger);
                             return mem ? mem.tag_name : Language.text('normal_member');
                         })()}
                               </div>
@@ -264,7 +262,6 @@ export class UMInfo {
                                         </div>`;
                                                 }
                                             },
-                                            divCreate: {},
                                             onCreate: () => {
                                                 if (loading) {
                                                     glitter.addMtScript([
@@ -441,18 +438,18 @@ export class UMInfo {
                             },
                         ]
                             .map(dd => {
-                            return `<div
-                        style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; display: inline-flex"
-                      >
-                        ${dd.value}
-                        <div
-                          style="align-self: stretch; text-align: center; color: #393939; font-size: 16px;  font-weight: 400; line-height: 22.40px; word-wrap: break-word"
-                        >
-                          ${dd.title}
-                        </div>
-                      </div>`;
+                            return html `<div
+                            style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; display: inline-flex"
+                          >
+                            ${dd.value}
+                            <div
+                              style="align-self: stretch; text-align: center; color: #393939; font-size: 16px;  font-weight: 400; line-height: 22.40px; word-wrap: break-word"
+                            >
+                              ${dd.title}
+                            </div>
+                          </div>`;
                         })
-                            .join(`<div class="border-end" style="width:1px;height: 30px;"></div>`)}
+                            .join(html `<div class="border-end" style="width:1px;height: 30px;"></div>`)}
                     </div>
                   </div>
                 </div>
@@ -491,19 +488,17 @@ export class UMInfo {
                             },
                         ]
                             .map((dd) => {
-                            return `
-                    <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(() => {
+                            return html `
+                          <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.icon}
-                      <div
-                        style="font-size:16px;" class="fw-500">
-                        ${dd.title}
-                      </div>
-                    </div>
-                 `;
+                            })}"
+                          >
+                            ${dd.icon}
+                            <div style="font-size:16px;" class="fw-500">${dd.title}</div>
+                          </div>
+                        `;
                         })
                             .join('')}
                   </div>
@@ -517,7 +512,6 @@ export class UMInfo {
                     }
                 }
             },
-            divCreate: {},
             onCreate: () => {
                 if (loadings.view) {
                     UmClass.getUserData(gvc).then((resp) => {
@@ -738,23 +732,30 @@ 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(() => {
+                        html ` <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(() => {
+                        })}"
+              ></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>
-                </div>`,
-                        `<div style="height:5px;"></div>`,
+                        })}"
+              >
+                <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>
+            </div>`,
+                        html `<div style="height:5px;"></div>`,
                         FormWidget.editorView({
                             gvc: gvc,
                             array: form_array.map((dd) => {
@@ -781,7 +782,7 @@ export class UMInfo {
                             },
                             formData: update_userData,
                         }),
-                        html ` <div
+                        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`

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

@@ -156,9 +156,7 @@ export class UMInfo {
                             >
                               <div style="color: white; font-size: 14px;  font-weight: 700; word-wrap: break-word">
                                 ${(() => {
-                                  const mem = vm.data.member.find(d => {
-                                    return d.trigger;
-                                  });
+                                  const mem = vm.data.member.find(d => d.trigger);
                                   return mem ? mem.tag_name : Language.text('normal_member');
                                 })()}
                               </div>
@@ -351,7 +349,6 @@ export class UMInfo {
                                         </div>`;
                                       }
                                     },
-                                    divCreate: {},
                                     onCreate: () => {
                                       if (loading) {
                                         glitter.addMtScript(
@@ -542,18 +539,18 @@ export class UMInfo {
                         },
                       ]
                         .map(dd => {
-                          return `<div
-                        style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; display: inline-flex"
-                      >
-                        ${dd.value}
-                        <div
-                          style="align-self: stretch; text-align: center; color: #393939; font-size: 16px;  font-weight: 400; line-height: 22.40px; word-wrap: break-word"
-                        >
-                          ${dd.title}
-                        </div>
-                      </div>`;
+                          return html`<div
+                            style="flex: 1 1 0; flex-direction: column; justify-content: flex-start; align-items: center; display: inline-flex"
+                          >
+                            ${dd.value}
+                            <div
+                              style="align-self: stretch; text-align: center; color: #393939; font-size: 16px;  font-weight: 400; line-height: 22.40px; word-wrap: break-word"
+                            >
+                              ${dd.title}
+                            </div>
+                          </div>`;
                         })
-                        .join(`<div class="border-end" style="width:1px;height: 30px;"></div>`)}
+                        .join(html`<div class="border-end" style="width:1px;height: 30px;"></div>`)}
                     </div>
                   </div>
                 </div>
@@ -601,19 +598,17 @@ export class UMInfo {
                       },
                     ]
                       .map((dd: any) => {
-                        return `
-                    <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.icon}
-                      <div
-                        style="font-size:16px;" class="fw-500">
-                        ${dd.title}
-                      </div>
-                    </div>
-                 `;
+                        return html`
+                          <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.icon}
+                            <div style="font-size:16px;" class="fw-500">${dd.title}</div>
+                          </div>
+                        `;
                       })
                       .join('')}
                   </div>
@@ -626,7 +621,6 @@ export class UMInfo {
           }
         }
       },
-      divCreate: {},
       onCreate: () => {
         if (loadings.view) {
           UmClass.getUserData(gvc).then((resp: any) => {
@@ -865,34 +859,38 @@ export class UMInfo {
               classDataType: 'static',
             };
           });
-          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', {});
-                        }
-                      );
+          return [
+            html` <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', {});
-                          }
-                        );
-                      }
-                    )}">
-                   <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>
-                </div>`,
-            `<div style="height:5px;"></div>`,
+                  );
+                })}"
+              ></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>
+            </div>`,
+            html`<div style="height:5px;"></div>`,
             FormWidget.editorView({
               gvc: gvc,
               array: form_array.map((dd: any) => {
@@ -919,7 +917,7 @@ export class UMInfo {
               },
               formData: update_userData,
             }),
-            html` <div
+            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`

package/lowcode/public-components/user-manager/um-login.js

@@ -160,7 +160,7 @@ export class UMLogin {
                           type="${item.form_config.type}"
                           id="reg-${item.key}"
                           ${item.form_config.type === 'date'
-                                ? ``
+                                ? ''
                                 : ` placeholder="${placeholder}"
                                                 data-placeholder="${placeholder}"`}
                           onchange="${gvc.event(e => {
@@ -320,8 +320,8 @@ export class UMLogin {
           </section>`;
                 }
                 catch (e) {
-                    console.log(`error==>`, e);
-                    return ``;
+                    console.error(`error==>`, e);
+                    return '';
                 }
             },
             divCreate: {},
@@ -362,7 +362,7 @@ export class UMLogin {
     }
     static addStyle(gvc, prefix) {
         const isPhone = document.body.clientWidth < 768;
-        gvc.addStyle(css `
+        gvc.addStyle(`
       .${prefix}-container {
         box-sizing: border-box;
         display: flex;
@@ -537,7 +537,7 @@ export class UMLogin {
                 return '';
             }
             if (gvc.glitter.deviceType === gvc.glitter.deviceTypeEnum.Android && item.type === 'apple') {
-                return ``;
+                return '';
             }
             const event = loginEvents.find(data => data.key === item.type);
             if (!event) {
@@ -634,11 +634,9 @@ export class UMLogin {
                     else {
                         const redirect_url = location.origin + location.pathname;
                         widget.share.line.support_scope = (_a = widget.share.line.support_scope) !== null && _a !== void 0 ? _a : [];
-                        gvc.glitter.href = `https://access.line.me/oauth2/v2.1/authorize?response_type=code&client_id=${widget.share.line.id}&redirect_uri=${encodeURI(redirect_url)}&state=line_login&scope=${[
-                            'profile',
-                            'openid',
-                            'email'
-                        ].concat(widget.share.line.support_scope).join('%20')}&nonce=09876xyz`;
+                        gvc.glitter.href = `https://access.line.me/oauth2/v2.1/authorize?response_type=code&client_id=${widget.share.line.id}&redirect_uri=${encodeURI(redirect_url)}&state=line_login&scope=${['profile', 'openid', 'email']
+                            .concat(widget.share.line.support_scope)
+                            .join('%20')}&nonce=09876xyz`;
                     }
                 }
                 return {
@@ -672,7 +670,7 @@ export class UMLogin {
                             });
                         }
                         else {
-                            ApiUser.getPublicConfig('login_line_setting', 'manager').then((dd) => {
+                            ApiUser.getPublicConfig('login_line_setting', 'manager').then(dd => {
                                 widget.share.line = dd.response.value || {};
                                 if (gvc.glitter.getUrlParameter('line_liff') === 'true') {
                                     callLogin();
@@ -774,8 +772,7 @@ export class UMLogin {
                     });
                 },
                 call: () => {
-                    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                        console.log('call fb', widget.share.fb);
+                    return new Promise(() => __awaiter(this, void 0, void 0, function* () {
                         if (glitter.deviceType !== glitter.deviceTypeEnum.Web) {
                             gvc.glitter.runJsInterFace('facebook_login', {
                                 app_id: widget.share.fb.id,

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

@@ -173,7 +173,7 @@ export class UMLogin {
                           type="${item.form_config.type}"
                           id="reg-${item.key}"
                           ${item.form_config.type === 'date'
-                            ? ``
+                            ? ''
                             : ` placeholder="${placeholder}"
                                                 data-placeholder="${placeholder}"`}
                           onchange="${gvc.event(e => {
@@ -335,8 +335,8 @@ export class UMLogin {
             </div>
           </section>`;
         } catch (e) {
-          console.log(`error==>`, e);
-          return ``;
+          console.error(`error==>`, e);
+          return '';
         }
       },
       divCreate: {},
@@ -376,7 +376,7 @@ export class UMLogin {
 
   static addStyle(gvc: GVC, prefix: string) {
     const isPhone = document.body.clientWidth < 768;
-    gvc.addStyle(css`
+    gvc.addStyle(`
       .${prefix}-container {
         box-sizing: border-box;
         display: flex;
@@ -556,7 +556,7 @@ export class UMLogin {
 
             //Android版本不需要有APPLE登入
             if (gvc.glitter.deviceType === gvc.glitter.deviceTypeEnum.Android && item.type === 'apple') {
-              return ``;
+              return '';
             }
             const event = loginEvents.find(data => data.key === item.type);
             if (!event) {
@@ -660,16 +660,12 @@ export class UMLogin {
             );
           } else {
             const redirect_url = location.origin + location.pathname;
-            widget.share.line.support_scope=widget.share.line.support_scope??[]
+            widget.share.line.support_scope = widget.share.line.support_scope ?? [];
             gvc.glitter.href = `https://access.line.me/oauth2/v2.1/authorize?response_type=code&client_id=${widget.share.line.id}&redirect_uri=${encodeURI(
               redirect_url
-            )}&state=line_login&scope=${
-              [
-                'profile',
-                'openid',
-                'email'
-              ].concat(widget.share.line.support_scope).join('%20')
-            }&nonce=09876xyz`;
+            )}&state=line_login&scope=${['profile', 'openid', 'email']
+              .concat(widget.share.line.support_scope)
+              .join('%20')}&nonce=09876xyz`;
           }
         }
 
@@ -701,13 +697,13 @@ export class UMLogin {
                 }
               });
             } else {
-              ApiUser.getPublicConfig('login_line_setting', 'manager').then((dd) => {
+              ApiUser.getPublicConfig('login_line_setting', 'manager').then(dd => {
                 widget.share.line = dd.response.value || {};
                 if (gvc.glitter.getUrlParameter('line_liff') === 'true') {
                   callLogin();
                 }
-              })
-              }
+              });
+            }
           },
           call: () => {
             callLogin();
@@ -809,9 +805,7 @@ export class UMLogin {
           });
         },
         call: () => {
-          return new Promise(async (resolve, reject) => {
-            console.log('call fb', widget.share.fb);
-
+          return new Promise(async () => {
             if (glitter.deviceType !== glitter.deviceTypeEnum.Web) {
               gvc.glitter.runJsInterFace(
                 'facebook_login',
@@ -1025,7 +1019,6 @@ export class UMLogin {
         return;
       }
 
-
       vm.resetEmail = email;
     }
 
@@ -1047,17 +1040,16 @@ export class UMLogin {
 
   static sendVerifyEmailCode(widget: any, id: string) {
     const email = this.checkValue(id);
-    //
     if (!email) {
       widget.event('error', { title: Language.text('email_placeholder') });
       return;
     }
-    //
+
     if (!CheckInput.isEmail(email)) {
       widget.event('error', { title: Language.text('enter_valid_email') });
       return;
     }
-    //
+
     ApiUser.emailVerify(email).then(r => {
       if (r.result && r.response.result) {
         widget.event('success', { title: Language.text('verification_code_sent') });