ts-glitter 13.8.676 → 13.8.677

package/lowcode/Entry.js

@@ -20,7 +20,7 @@ export class Entry {
         glitter.share.reload = (page, app_name) => {
             window.appName = app_name || window.appName;
             window.glitter_page = page;
-            Entry.onCreate(glitter);
+            location.reload();
         };
         glitter.share.top_inset = 0;
         glitter.share.bottom_inset = 0;
@@ -68,7 +68,7 @@ export class Entry {
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_13.8.676';
+        glitter.share.editerVersion = 'V_13.8.677';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -13,7 +13,7 @@ export class Entry {
         glitter.share.reload = (page: string, app_name: string) => {
             (window as any).appName = app_name || (window as any).appName;
             (window as any).glitter_page = page;
-            Entry.onCreate(glitter)
+            location.reload();
         }
         glitter.share.top_inset = 0;
         glitter.share.bottom_inset = 0;
@@ -69,7 +69,7 @@ export class Entry {
         }
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_13.8.676';
+        glitter.share.editerVersion = 'V_13.8.677';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

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

@@ -8,51 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ApiUser } from '../../glitter-base/route/user.js';
+import { GlobalUser } from '../../glitter-base/global/global-user.js';
 const html = String.raw;
 export class UmClass {
     static nav(gvc) {
-        gvc.addStyle(`
-            .um-nav-container {
-                width: 1000px;
-                max-width: 100%;
-            }
-            .um-nav-title {
-                font-weight: 700;
-                font-size: 36px;
-                color: #292218;
-            }
-            .um-nav-btn {
-                white-space: nowrap;
-                text-align: center;
-                border: 2px solid #232323;
-                align-items: center;
-                border-radius: 22px;
-                height: 44px;
-                cursor: pointer;
-                width: 120px;
-                font-size: 16px;
-            }
-            .um-nav-btn.um-nav-btn-active {
-                background: #292218;
-                color: #ffffff;
-                font-weight: 600;
-            }
-            .um-nav-mobile-tags-container {
-                gap: 10px;
-                overflow-x: auto;
-                align-items: center;
-            }
-            @media (max-width: 768px) {
-                .um-nav-btn {
-                    width: 110px;
-                    font-size: 14px;
-                    height: 40px;
-                }
-                .um-nav-title {
-                    font-size: 30px;
-                }
-            }
-        `);
+        this.addStyle(gvc);
+        let changePage = (index, type, subData) => { };
+        gvc.glitter.getModule(new URL('./official_event/page/change-page.js', gvc.glitter.root_path).href, (cl) => {
+            changePage = cl.changePage;
+        });
         const pageName = gvc.glitter.getUrlParameter('page');
         const buttonHTML = [
             {
@@ -64,13 +28,17 @@ export class UmClass {
                 title: '商店購物金',
             },
             {
-                key: 'orderlist',
+                key: 'order_list',
                 title: '訂單記錄',
             },
             {
-                key: 'wishlist',
+                key: 'wish_container',
                 title: '心願單',
             },
+            {
+                key: 'reset_password',
+                title: '修改密碼',
+            },
             {
                 key: 'logout',
                 title: '登出',
@@ -81,7 +49,16 @@ export class UmClass {
                     <div
                         class="option px-4 d-flex justify-content-center um-nav-btn ${pageName === item.key ? 'um-nav-btn-active' : ''}"
                         onclick="${gvc.event(() => {
-                console.log(item.key);
+                if (item.key === 'reset_password') {
+                    console.log('修改密碼事件');
+                }
+                else if (item.key === 'logout') {
+                    GlobalUser.token = '';
+                    changePage('index', 'home', {});
+                }
+                else {
+                    changePage(item.key, 'page', {});
+                }
             })}"
                     >
                         ${item.title}
@@ -103,7 +80,7 @@ export class UmClass {
         </div>`;
     }
     static spinner() {
-        return html `<div class="d-flex align-items-center justify-content-center flex-column w-100 mx-auto">
+        return html `<div class="d-flex align-items-center justify-content-center flex-column w-100 mx-auto" style="height: 100vh">
             <div class="spinner-border" role="status"></div>
             <span class="mt-3">載入中</span>
         </div>`;
@@ -171,4 +148,240 @@ export class UmClass {
             });
         });
     }
+    static addStyle(gvc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const css = String.raw;
+            gvc.addStyle(css `
+            .um-nav-title {
+                font-weight: 700;
+                font-size: 36px;
+                color: #292218;
+            }
+            .um-nav-btn {
+                white-space: nowrap;
+                text-align: center;
+                border: 2px solid #232323;
+                align-items: center;
+                border-radius: 22px;
+                height: 44px;
+                cursor: pointer;
+                width: 120px;
+                font-size: 16px;
+            }
+            .um-nav-btn.um-nav-btn-active {
+                background: #292218;
+                color: #ffffff;
+                font-weight: 600;
+            }
+            .um-nav-mobile-tags-container {
+                gap: 10px;
+                overflow-x: auto;
+                align-items: center;
+            }
+            .um-info-title {
+                color: #000000;
+                font-size: 28px;
+            }
+            .um-info-insignia {
+                border-radius: 20px;
+                height: 32px;
+                padding: 8px 16px;
+                font-size: 14px;
+                display: inline-block;
+                font-weight: 500;
+                line-height: 1;
+                text-align: center;
+                white-space: nowrap;
+                vertical-align: baseline;
+                background: #7e7e7e;
+                color: #fff;
+            }
+            .um-info-note {
+                color: #393939;
+                font-size: 16px;
+            }
+            .um-info-event {
+                color: #3564c0;
+                font-size: 16px;
+                cursor: pointer;
+            }
+            .um-title {
+                text-align: start;
+                font-size: 16px;
+                font-weight: 700;
+                line-height: 25.2px;
+                word-wrap: break-word;
+                color: #292218;
+            }
+            .um-content {
+                text-align: start;
+                font-size: 14px;
+                font-weight: 400;
+                line-height: 25.2px;
+                word-wrap: break-word;
+                color: #292218;
+            }
+            .um-linebar-container {
+                flex-direction: column;
+                justify-content: flex-start;
+                align-items: flex-start;
+                gap: 8px;
+                display: flex;
+            }
+            .um-text-danger {
+                color: #aa4b4b;
+            }
+            .um-linebar {
+                border-radius: 40px;
+                flex-direction: column;
+                justify-content: flex-start;
+                align-items: flex-start;
+                display: flex;
+                position: relative;
+                overflow: hidden;
+            }
+            .um-linebar-behind {
+                position: absolute;
+                width: 100%;
+                height: 100%;
+                opacity: 0.4;
+                background: #292218;
+            }
+            .um-linebar-fill {
+                padding: 10px;
+                border-radius: 10px;
+                height: 100%;
+            }
+
+            .bgw-input {
+                flex-grow: 1;
+                padding: 9px 12px;
+                border-radius: 10px;
+                border: 1px solid #393939;
+                background-color: #ffffff;
+                appearance: none;
+                width: 100%;
+            }
+
+            .bgw-input:focus {
+                outline: 0;
+            }
+
+            .bgw-input-readonly:focus-visible {
+                outline: 0;
+            }
+
+            .um-rb-bgr {
+                background: whitesmoke;
+                justify-content: space-between;
+                gap: 18px;
+            }
+
+            .um-rb-amount {
+                display: flex;
+                align-items: center;
+                font-size: 36px;
+                line-height: 36px;
+            }
+
+            .um-container {
+                display: flex;
+                justify-content: center;
+                margin: 2rem auto;
+                width: 100%;
+            }
+
+            .um-th-bar {
+                justify-content: space-around;
+                align-items: center;
+                height: 40px;
+            }
+            .um-th {
+                text-align: start;
+                font-size: 18px;
+                font-style: normal;
+                font-weight: 700;
+                color: #292218;
+            }
+
+            .um-td-bar {
+                justify-content: space-around;
+                align-items: center;
+                height: 40px;
+                border-bottom: 1px solid #e2d6cd;
+            }
+
+            .um-td {
+                text-align: start;
+                font-size: 18px;
+                font-style: normal;
+                font-weight: 400;
+                color: #292218;
+            }
+
+            .um-mobile-area {
+                padding: 28px;
+                margin-top: 12px;
+                background: white;
+                border-radius: 20px;
+                overflow: hidden;
+                border: 1px solid;
+                justify-content: center;
+                align-items: flex-start;
+                display: flex;
+                flex-direction: column;
+                gap: 12px;
+                border: 1px solid #292218;
+            }
+
+            .um-mobile-text {
+                text-align: start;
+                font-size: 16px;
+                font-weight: 400;
+                line-height: 22.4px;
+                letter-spacing: 0.64px;
+                word-wrap: break-word;
+                color: #292218;
+            }
+
+            @media (min-width: 576px) {
+                .um-container {
+                    max-width: 540px;
+                }
+            }
+
+            @media (min-width: 768px) {
+                .um-container {
+                    max-width: 720px;
+                }
+                .um-nav-btn {
+                    width: 110px;
+                    font-size: 14px;
+                    height: 40px;
+                }
+                .um-nav-title {
+                    font-size: 30px;
+                }
+            }
+
+            @media (min-width: 992px) {
+                .um-container {
+                    max-width: 800px;
+                }
+            }
+
+            @media (min-width: 1200px) {
+                .um-container {
+                    max-width: 860px;
+                }
+            }
+
+            @media (min-width: 1400px) {
+                .um-container {
+                    max-width: 960px;
+                }
+            }
+        `);
+        });
+    }
 }