ts-glitter 13.8.65 → 13.8.71

package/lowcode/cms-plugin/pos-pages/payment-page.js

@@ -1192,11 +1192,7 @@ text-transform: uppercase;" onclick="${gvc.event(() => {
         gvc.glitter.innerDialog((gvc) => {
             gvc.glitter.runJsInterFace('credit_card', {
                 amount: `${orderDetail.total}`,
-                memo: orderDetail.lineItems
-                    .map((data) => {
-                    return `${data.title} * ${data.count}`;
-                })
-                    .join(','),
+                memo: `訂單ID:${orderDetail.id}`,
             }, (res) => {
                 if (res.result) {
                     gvc.closeDialog();
@@ -1637,7 +1633,7 @@ text-transform: uppercase;" onclick="${gvc.event(() => {
                                         setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                                             yield IminPrintInstance.printAndFeedPaper(5);
                                             yield IminPrintInstance.setQrCodeSize(2);
-                                            yield IminPrintInstance.setDoubleQRSize(3);
+                                            yield IminPrintInstance.setDoubleQRSize(4);
                                             yield IminPrintInstance.setDoubleQR1MarginLeft(10);
                                             yield IminPrintInstance.setDoubleQR2MarginLeft(520);
                                             const ba = (new Blob([invoice.qrcode_0]).size - (new Blob([invoice.qrcode_1]).size)) * 1.1;

package/lowcode/cms-plugin/pos-pages/payment-page.ts

@@ -1238,18 +1238,13 @@ text-transform: uppercase;" onclick="${gvc.event(() => {
         function next() {
             PaymentPage.selectInvoice(gvc, orderDetail, vm, passData);
         }
-
         gvc.glitter.innerDialog(
             (gvc: GVC) => {
                 gvc.glitter.runJsInterFace(
                     'credit_card',
                     {
                         amount: `${orderDetail.total}`,
-                        memo: orderDetail.lineItems
-                            .map((data: any) => {
-                                return `${data.title} * ${data.count}`;
-                            })
-                            .join(','),
+                        memo: `訂單ID:${orderDetail.id}`,
                     },
                     (res: any) => {
                         if (res.result) {
@@ -1735,7 +1730,7 @@ text-transform: uppercase;" onclick="${gvc.event(() => {
                                     setTimeout(async ()=>{
                                         await IminPrintInstance.printAndFeedPaper(5)
                                         await IminPrintInstance.setQrCodeSize(2);
-                                        await IminPrintInstance.setDoubleQRSize(3)
+                                        await IminPrintInstance.setDoubleQRSize(4)
                                         await IminPrintInstance.setDoubleQR1MarginLeft(10)
                                         await IminPrintInstance.setDoubleQR2MarginLeft(520)
                                         const ba=(new Blob([invoice.qrcode_0]).size - (new Blob([invoice.qrcode_1]).size))*1.1

package/lowcode/config.js

@@ -2,7 +2,9 @@ var _a;
 export const config = {
     url: (_a = window.glitterBackend) !== null && _a !== void 0 ? _a : location.origin,
     token: '',
-    appName: window.appName,
+    get appName() {
+        return window.appName;
+    },
     is_omo: true,
     shop_type: 'retail'
 };

package/lowcode/config.ts

@@ -1,7 +1,9 @@
 export const config = {
     url: (window as any).glitterBackend ?? location.origin,
     token: '',
-    appName: (window as any).appName,
+    get appName(){
+        return (window as any).appName
+    },
     //判斷是否為線上或線下整合方案
     is_omo:true,
     //商店類型，零售或食品

package/lowcode/glitterBundle/GVController.js

@@ -456,7 +456,9 @@ export function init(metaURL, fun) {
             }
         };
         if (cf.pageConfig.type === GVCType.Page) {
-            PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
+            if (cf.pageConfig.push_stack) {
+                PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
+            }
             cf.pageConfig.carry_search.map((dd) => {
                 gvc.glitter.setUrlParameter(dd.key, dd.value);
             });

package/lowcode/glitterBundle/GVController.ts

@@ -485,7 +485,9 @@ export function init(metaURL: string, fun: (gvc: GVC, glitter: Glitter, gBundle:
         }
 
         if (cf.pageConfig.type === GVCType.Page) {
-            PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
+            if(cf.pageConfig.push_stack){
+                PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
+            }
             cf.pageConfig.carry_search.map((dd)=>{
                 gvc.glitter.setUrlParameter(dd.key,dd.value)
             })

package/lowcode/glitterBundle/module/PageManager.js

@@ -21,6 +21,7 @@ export var GVCType;
 export class PageConfig {
     constructor(par) {
         this.scrollTop = 0;
+        this.push_stack = par.push_stack;
         this.carry_search = par.carry_search || [];
         this.initial = false;
         this.search = par.search || '';
@@ -133,6 +134,7 @@ export class PageManager {
                             id: glitter.getUUID(),
                             obj: obj,
                             goBack: true,
+                            push_stack: false,
                             src: url,
                             tag: tag,
                             carry_search: option.carry_search,
@@ -262,6 +264,7 @@ export class PageManager {
                 goBack: goBack,
                 src: url,
                 tag: tag,
+                push_stack: true,
                 deleteResource: () => {
                 },
                 createResource: () => {
@@ -320,6 +323,7 @@ export class PageManager {
             goBack: true,
             src: url,
             tag: tag,
+            push_stack: false,
             deleteResource: () => {
             },
             createResource: () => {

package/lowcode/glitterBundle/module/PageManager.ts

@@ -40,6 +40,7 @@ export class PageConfig {
     public goBack: boolean;
     public src: string;
     public tag: string;
+    public push_stack:boolean;
     public createResource: () => void;
     public deleteResource: (destroy: boolean) => void;
     public type: GVCType;
@@ -63,6 +64,7 @@ export class PageConfig {
         goBack: boolean,
         src: string,
         tag: string,
+        push_stack:boolean,
         createResource: () => void,
         deleteResource: (destroy: boolean) => void,
         type: GVCType,
@@ -73,6 +75,7 @@ export class PageConfig {
         search?: string,
         carry_search?: {key:string,value:string}[]
     }) {
+        this.push_stack=par.push_stack;
         this.carry_search=par.carry_search || []
         this.initial = false
         this.search = par.search || '';
@@ -190,8 +193,10 @@ export class PageManager {
                             id: glitter.getUUID(),
                             obj: obj,
                             goBack: true,
+                            push_stack:false,
                             src: url,
                             tag: tag,
+
                             carry_search: option.carry_search,
                             deleteResource: () => {
                             },
@@ -345,6 +350,7 @@ export class PageManager {
                 goBack: goBack,
                 src: url,
                 tag: tag,
+                push_stack:true,
                 deleteResource: () => {
                 },
                 createResource: () => {
@@ -421,6 +427,7 @@ export class PageManager {
             goBack: true,
             src: url,
             tag: tag,
+            push_stack:false,
             deleteResource: () => {
             },
             createResource: () => {

package/lowcode/glitterBundle/module/html-generate.js

@@ -2383,6 +2383,11 @@ HtmlGenerate.renameWidgetID = (dd) => {
 HtmlGenerate.setHome = (obj) => {
     var _a, _b;
     const glitter = Glitter.glitter;
+    if (obj.tag === 'backend_manager') {
+        glitter.setUrlParameter('page', 'backend_manager');
+        location.reload();
+        return;
+    }
     glitter.setHome('glitterBundle/plugins/html-render.js', obj.tag, {
         app_config: obj.app_config,
         page_config: (_a = obj.page_config) !== null && _a !== void 0 ? _a : {},
@@ -2394,6 +2399,11 @@ HtmlGenerate.setHome = (obj) => {
 HtmlGenerate.changePage = (obj) => {
     var _a, _b;
     const glitter = Glitter.glitter;
+    if (obj.tag === 'backend_manager') {
+        glitter.setUrlParameter('page', 'backend_manager');
+        location.reload();
+        return;
+    }
     console.log(`changePage-time:`, window.renderClock.stop());
     glitter.changePage('glitterBundle/plugins/html-render.js', obj.tag, obj.goBack, {
         app_config: obj.app_config,

package/lowcode/glitterBundle/module/html-generate.ts

@@ -573,6 +573,12 @@ export class HtmlGenerate {
 
     public static setHome = (obj: { page_config?: any; app_config?: any; config: any; editMode?: any; data: any; tag: string; option?: any }) => {
         const glitter = Glitter.glitter;
+        //複寫back_manager的頁面，避免堆棧問題
+        if(obj.tag==='backend_manager'){
+            glitter.setUrlParameter('page','backend_manager')
+            location.reload()
+            return
+        }
 
         glitter.setHome(
             'glitterBundle/plugins/html-render.js',
@@ -589,6 +595,13 @@ export class HtmlGenerate {
     };
     public static changePage = (obj: { page_config?: any; config: any; editMode?: any; data: any; tag: string; goBack: boolean; option?: any; app_config?: any }) => {
         const glitter = Glitter.glitter;
+        //複寫back_manager的頁面，避免堆棧問題
+        if(obj.tag==='backend_manager'){
+            glitter.setUrlParameter('page','backend_manager')
+            location.reload()
+            return
+        }
+
         console.log(`changePage-time:`, (window as any).renderClock.stop());
         glitter.changePage(
             'glitterBundle/plugins/html-render.js',

package/lowcode/jspage/main.js

@@ -180,15 +180,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
             else {
                 dialog.dataLoading({ visible: true });
             }
-            glitter.share.top_inset = yield new Promise((resolve, reject) => {
-                glitter.runJsInterFace('getTopInset', {}, (response) => {
-                    resolve(response.data);
-                }, {
-                    webFunction: () => {
-                        return { data: 0 };
-                    },
-                });
-            });
             if (parseInt(glitter.share.top_inset, 10)) {
                 gvc.addStyle(css `
                 .scroll-in {
@@ -200,15 +191,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                 }
             `);
             }
-            glitter.share.bottom_inset = yield new Promise((resolve, reject) => {
-                glitter.runJsInterFace('getBottomInset', {}, (response) => {
-                    resolve(response.data);
-                }, {
-                    webFunction: () => {
-                        return { data: 0 };
-                    },
-                });
-            });
             const waitGetData = [
                 () => __awaiter(this, void 0, void 0, function* () {
                     return yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {

package/lowcode/jspage/main.ts

@@ -203,20 +203,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
         } else {
             dialog.dataLoading({visible: true})
         }
-        glitter.share.top_inset = await new Promise((resolve, reject) => {
-            glitter.runJsInterFace(
-                'getTopInset',
-                {},
-                (response: any) => {
-                    resolve(response.data);
-                },
-                {
-                    webFunction: () => {
-                        return {data: 0};
-                    },
-                }
-            )
-        })
+
         if (parseInt(glitter.share.top_inset, 10)) {
             gvc.addStyle(css`
                 .scroll-in {
@@ -229,20 +216,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
             `)
         }
 
-        glitter.share.bottom_inset = await new Promise((resolve, reject) => {
-            glitter.runJsInterFace(
-                'getBottomInset',
-                {},
-                (response: any) => {
-                    resolve(response.data);
-                },
-                {
-                    webFunction: () => {
-                        return {data: 0};
-                    },
-                }
-            )
-        })
 
 
         const waitGetData = [

package/lowcode/official_event/page/change-page.ts

@@ -6,7 +6,6 @@ import {GVC} from "../../glitterBundle/GVController.js";
 const html = String.raw
 class ChangePage {
     public static changePage(link: string, type: 'home' | 'page', subData: any) {
-
         $('.new_page_loading').removeClass('d-none')
         const glitter=(window as any).glitter;
         return new Promise(async (resolve, reject) => {

package/lowcode/public-components/product/pd-card-01.js

@@ -134,7 +134,21 @@ export class ProductCard01 {
                 letter-spacing: -0.98px;
             }
         `);
-        return html `<div class="card mb-7 card-border">
+        return html `<div
+            class="card mb-7 card-border"
+            onclick="${gvc.event(() => {
+            let path = '';
+            if (!(prod.seo && prod.seo.domain)) {
+                glitter.setUrlParameter('product_id', subData.id);
+                path = 'products';
+            }
+            else {
+                glitter.setUrlParameter('product_id', undefined);
+                path = `products/${prod.seo.domain}`;
+            }
+            changePage(path, 'page', {});
+        })}"
+        >
             <div
                 class="card-img-top parent card-image"
                 style="background-image: url('${(() => {
@@ -149,18 +163,6 @@ export class ProductCard01 {
             }
             return rela_link;
         })()}')"
-                onclick="${gvc.event(() => {
-            let path = '';
-            if (!(prod.seo && prod.seo.domain)) {
-                glitter.setUrlParameter('product_id', subData.id);
-                path = 'products';
-            }
-            else {
-                glitter.setUrlParameter('product_id', undefined);
-                path = `products/${prod.seo.domain}`;
-            }
-            changePage(path, 'page', {});
-        })}"
             >
                 <div class="child add-cart-child">
                     <div
@@ -206,7 +208,8 @@ export class ProductCard01 {
             </div>
             <div
                 class="wishBt wish-button"
-                onclick="${gvc.event(() => {
+                onclick="${gvc.event((e, event) => {
+            event.stopPropagation();
             if (CheckInput.isEmpty(GlobalUser.token)) {
                 changePage('login', 'page', {});
                 return;
@@ -265,8 +268,7 @@ export class ProductCard01 {
             return `NT.$ ${minPrice.toLocaleString()}`;
         })()}
                             </div>
-                            <div class="text-decoration-line-through d-none card-cost-price">
-                                ${(() => {
+                            ${(() => {
             var _a, _b;
             const minPrice = Math.min(...prod.variants.map((dd) => {
                 return dd.sale_price;
@@ -274,9 +276,11 @@ export class ProductCard01 {
             const comparePrice = (_b = ((_a = prod.variants.find((dd) => {
                 return dd.sale_price === minPrice;
             })) !== null && _a !== void 0 ? _a : {}).compare_price) !== null && _b !== void 0 ? _b : 0;
-            return `NT.$ ${(minPrice < comparePrice ? comparePrice : minPrice).toLocaleString()}`;
+            if (comparePrice > 0 && minPrice < comparePrice) {
+                return html `<div class="text-decoration-line-through card-cost-price">NT.$ ${comparePrice.toLocaleString()}</div>`;
+            }
+            return '';
         })()}
-                            </div>
                         </div>
                     </div>
                 </div>

package/lowcode/public-components/product/pd-card-01.ts

@@ -138,7 +138,20 @@ export class ProductCard01 {
             }
         `);
 
-        return html`<div class="card mb-7 card-border">
+        return html`<div
+            class="card mb-7 card-border"
+            onclick="${gvc.event(() => {
+                let path = '';
+                if (!(prod.seo && prod.seo.domain)) {
+                    glitter.setUrlParameter('product_id', subData.id);
+                    path = 'products';
+                } else {
+                    glitter.setUrlParameter('product_id', undefined);
+                    path = `products/${prod.seo.domain}`;
+                }
+                changePage(path, 'page', {});
+            })}"
+        >
             <div
                 class="card-img-top parent card-image"
                 style="background-image: url('${(() => {
@@ -153,17 +166,6 @@ export class ProductCard01 {
                     }
                     return rela_link;
                 })()}')"
-                onclick="${gvc.event(() => {
-                    let path = '';
-                    if (!(prod.seo && prod.seo.domain)) {
-                        glitter.setUrlParameter('product_id', subData.id);
-                        path = 'products';
-                    } else {
-                        glitter.setUrlParameter('product_id', undefined);
-                        path = `products/${prod.seo.domain}`;
-                    }
-                    changePage(path, 'page', {});
-                })}"
             >
                 <div class="child add-cart-child">
                     <div
@@ -209,7 +211,8 @@ export class ProductCard01 {
             </div>
             <div
                 class="wishBt wish-button"
-                onclick="${gvc.event(() => {
+                onclick="${gvc.event((e, event) => {
+                    event.stopPropagation();
                     if (CheckInput.isEmpty(GlobalUser.token)) {
                         changePage('login', 'page', {});
                         return;
@@ -269,22 +272,23 @@ export class ProductCard01 {
                                     return `NT.$ ${minPrice.toLocaleString()}`;
                                 })()}
                             </div>
-                            <div class="text-decoration-line-through d-none card-cost-price">
-                                ${(() => {
-                                    const minPrice = Math.min(
-                                        ...prod.variants.map((dd: { sale_price: number }) => {
-                                            return dd.sale_price;
-                                        })
-                                    );
-                                    const comparePrice =
-                                        (
-                                            prod.variants.find((dd: { sale_price: number }) => {
-                                                return dd.sale_price === minPrice;
-                                            }) ?? {}
-                                        ).compare_price ?? 0;
-                                    return `NT.$ ${(minPrice < comparePrice ? comparePrice : minPrice).toLocaleString()}`;
-                                })()}
-                            </div>
+                            ${(() => {
+                                const minPrice = Math.min(
+                                    ...prod.variants.map((dd: { sale_price: number }) => {
+                                        return dd.sale_price;
+                                    })
+                                );
+                                const comparePrice =
+                                    (
+                                        prod.variants.find((dd: { sale_price: number }) => {
+                                            return dd.sale_price === minPrice;
+                                        }) ?? {}
+                                    ).compare_price ?? 0;
+                                if (comparePrice > 0 && minPrice < comparePrice) {
+                                    return html`<div class="text-decoration-line-through card-cost-price">NT.$ ${comparePrice.toLocaleString()}</div>`;
+                                }
+                                return '';
+                            })()}
                         </div>
                     </div>
                 </div>

package/lowcode/public-components/product/pd-card-02.js

@@ -15,18 +15,20 @@ import { Tool } from '../../modules/tool.js';
 const html = String.raw;
 export class ProductCard02 {
     static main(gvc, widget, subData) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const glitter = gvc.glitter;
         const wishId = glitter.getUUID();
         const prod = subData.content;
         const titleFontColor = (_a = glitter.share.globalValue['theme_color.0.title']) !== null && _a !== void 0 ? _a : '#333333';
+        const borderButtonBgr = (_b = glitter.share.globalValue['theme_color.0.border-button-bg']) !== null && _b !== void 0 ? _b : '#fff';
+        const borderButtonText = (_c = glitter.share.globalValue['theme_color.0.border-button-text']) !== null && _c !== void 0 ? _c : '#333333';
         const vm = {
             quantity: '1',
             data: prod,
             specs: prod.specs.map((spec) => {
                 return spec.option[0].title;
             }),
-            wishStatus: ((_b = glitter.share.wishList) !== null && _b !== void 0 ? _b : []).some((item) => {
+            wishStatus: ((_d = glitter.share.wishList) !== null && _d !== void 0 ? _d : []).some((item) => {
                 return item.id === prod.id;
             }),
         };
@@ -73,8 +75,10 @@ export class ProductCard02 {
                 display: flex;
                 align-items: center;
                 justify-content: center;
-                background: #322b25;
-                color: #ffffff;
+                background: #fff;
+                color: ${borderButtonText};
+                border: 1px solid ${borderButtonBgr};
+                border-radius: 10px;
             }
             .wish-button {
                 cursor: pointer;
@@ -131,7 +135,22 @@ export class ProductCard02 {
                 letter-spacing: -0.98px;
             }
         `);
-        return html `<div class="card mb-7 card-border">
+        return html `<div
+            class="card mb-7 card-border"
+            style="cursor: pointer"
+            onclick="${gvc.event(() => {
+            let path = '';
+            if (!(prod.seo && prod.seo.domain)) {
+                glitter.setUrlParameter('product_id', subData.id);
+                path = 'products';
+            }
+            else {
+                glitter.setUrlParameter('product_id', undefined);
+                path = `products/${prod.seo.domain}`;
+            }
+            changePage(path, 'page', {});
+        })}"
+        >
             <div
                 class="card-img-top parent card-image"
                 style="background-image: url('${(() => {
@@ -146,22 +165,11 @@ export class ProductCard02 {
             }
             return rela_link;
         })()}')"
-                onclick="${gvc.event(() => {
-            let path = '';
-            if (!(prod.seo && prod.seo.domain)) {
-                glitter.setUrlParameter('product_id', subData.id);
-                path = 'products';
-            }
-            else {
-                glitter.setUrlParameter('product_id', undefined);
-                path = `products/${prod.seo.domain}`;
-            }
-            changePage(path, 'page', {});
-        })}"
             ></div>
             <div
                 class="wishBt wish-button"
-                onclick="${gvc.event(() => {
+                onclick="${gvc.event((e, event) => {
+            event.stopPropagation();
             if (CheckInput.isEmpty(GlobalUser.token)) {
                 changePage('login', 'page', {});
                 return;
@@ -220,8 +228,7 @@ export class ProductCard02 {
             return `NT.$ ${minPrice.toLocaleString()}`;
         })()}
                             </div>
-                            <div class="text-decoration-line-through d-none card-cost-price">
-                                ${(() => {
+                            ${(() => {
             var _a, _b;
             const minPrice = Math.min(...prod.variants.map((dd) => {
                 return dd.sale_price;
@@ -229,9 +236,11 @@ export class ProductCard02 {
             const comparePrice = (_b = ((_a = prod.variants.find((dd) => {
                 return dd.sale_price === minPrice;
             })) !== null && _a !== void 0 ? _a : {}).compare_price) !== null && _b !== void 0 ? _b : 0;
-            return `NT.$ ${(minPrice < comparePrice ? comparePrice : minPrice).toLocaleString()}`;
+            if (comparePrice > 0 && minPrice < comparePrice) {
+                return html `<div class="text-decoration-line-through card-cost-price">NT.$ ${comparePrice.toLocaleString()}</div>`;
+            }
+            return '';
         })()}
-                            </div>
                         </div>
                     </div>
                     <div class="add-cart-child">