ts-glitter 15.7.87 → 15.8.1

package/lowcode/Entry.js

@@ -18,7 +18,6 @@ import { Language } from './glitter-base/global/language.js';
 export class Entry {
     static onCreate(glitter) {
         var _a;
-        Language.getLanguage();
         if (window.language !== Language.getLanguage()) {
             const url = new URL(`${glitter.root_path}${Language.getLanguageLinkPrefix()}${window.glitter_page}${new URL(location.href).search}`);
             if (glitter.getUrlParameter('appName')) {
@@ -80,7 +79,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_15.7.87';
+        glitter.share.editerVersion = 'V_15.8.1';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -10,7 +10,7 @@ import { Language } from './glitter-base/global/language.js';
 
 export class Entry {
     public static onCreate(glitter: Glitter) {
-        Language.getLanguage();
+
         if ((window as any).language !== Language.getLanguage()) {
             const url = new URL(`${glitter.root_path}${Language.getLanguageLinkPrefix()}${(window as any).glitter_page}${new URL(location.href).search}`);
             if (glitter.getUrlParameter('appName')) {
@@ -82,7 +82,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_15.7.87';
+        glitter.share.editerVersion = 'V_15.8.1';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

package/lowcode/backend-manager/bg-recommend.js

@@ -747,7 +747,7 @@ export class BgRecommend {
                                                 }, { single: true, readonly: vm.readonly })}`,
                                             ].join(BgWidget.mbContainer(18))),
                                             BgWidget.mainCard([
-                                                html ` <div class="tx_700">分潤商品</div>`,
+                                                html ` <div class="tx_700 mb-3">分潤商品</div>`,
                                                 gvc.bindView({
                                                     bind: 'listProduct',
                                                     view: () => {

package/lowcode/backend-manager/bg-recommend.ts

@@ -874,7 +874,7 @@ export class BgRecommend {
                                                     ),
                                                     BgWidget.mainCard(
                                                         [
-                                                            html` <div class="tx_700">分潤商品</div>`,
+                                                            html` <div class="tx_700 mb-3">分潤商品</div>`,
                                                             gvc.bindView({
                                                                 bind: 'listProduct',
                                                                 view: () => {

package/lowcode/cms-plugin/module/delivery-html.js

@@ -0,0 +1,27 @@
+import { BgWidget } from '../../backend-manager/bg-widget.js';
+const html = String.raw;
+export class DeliveryHTML {
+    static print(ogvc) {
+        return BgWidget.fullDialog({
+            gvc: ogvc,
+            title: (gvc) => {
+                return '列印出貨單';
+            },
+            innerHTML: (gvc) => {
+                return html ` <div>123</div>`;
+            },
+            footer_html: (gvc) => {
+                return [
+                    BgWidget.cancel(gvc.event(() => {
+                        gvc.closeDialog();
+                    })),
+                    BgWidget.save(gvc.event(() => {
+                        gvc.closeDialog();
+                        console.log('開始列印出貨單');
+                    })),
+                ].join('');
+            },
+            closeCallback: () => { },
+        });
+    }
+}

package/lowcode/cms-plugin/module/delivery-html.ts

@@ -0,0 +1,34 @@
+import { BgWidget } from '../../backend-manager/bg-widget.js';
+import { GVC } from '../../glitterBundle/GVController.js';
+
+const html = String.raw;
+
+export class DeliveryHTML {
+    static print(ogvc: GVC) {
+        return BgWidget.fullDialog({
+            gvc: ogvc,
+            title: (gvc) => {
+                return '列印出貨單';
+            },
+            innerHTML: (gvc) => {
+                return html` <div>123</div>`;
+            },
+            footer_html: (gvc: GVC) => {
+                return [
+                    BgWidget.cancel(
+                        gvc.event(() => {
+                            gvc.closeDialog();
+                        })
+                    ),
+                    BgWidget.save(
+                        gvc.event(() => {
+                            gvc.closeDialog();
+                            console.log('開始列印出貨單');
+                        })
+                    ),
+                ].join('');
+            },
+            closeCallback: () => {},
+        });
+    }
+}

package/lowcode/cms-plugin/module/product-setting.js

@@ -6,7 +6,6 @@ export class ProductSetting {
             return img || BgWidget.noImageURL;
         }
         const selected = obj.selected;
-        console.log("selected", selected);
         const html = String.raw;
         let postMD = obj.postMD;
         let topGVC = window.parent.glitter.pageConfig[window.parent.glitter.pageConfig.length - 1].gvc;

package/lowcode/cms-plugin/module/product-setting.ts

@@ -13,7 +13,6 @@ export class ProductSetting {
             return img || BgWidget.noImageURL;
         }
         const selected = obj.selected;
-        console.log("selected", selected);
         const html = String.raw;
         let postMD = obj.postMD
         let topGVC = (window.parent as any).glitter.pageConfig[(window.parent as any).glitter.pageConfig.length - 1].gvc

package/lowcode/cms-plugin/shopping-information.js

@@ -467,12 +467,13 @@ export class ShoppingInformation {
                                                         type="checkbox"
                                                         onchange="${gvc.event((e, event) => {
                             vm.data.multi_currency = !vm.data.multi_currency;
+                            gvc.notifyDataChange('basic');
                         })}"
                                                         ${vm.data.multi_currency ? `checked` : ``}
                                                 />
                                             </div>
                                         </div>
-                                        <div class="d-flex flex-column " style="gap:8px;">
+                                        ${vm.data.multi_currency ? `<div class="d-flex flex-column " style="gap:8px;">
                                             <div style="color: #393939;font-size: 16px;">啟用貨幣切換</div>
                                             <div style="color: #8D8D8D;font-size:13px;">
                                                 是否開放用戶於前台自行切換幣別進行顯示
@@ -488,7 +489,7 @@ export class ShoppingInformation {
                                                         ${vm.data.switch_currency ? `checked` : ``}
                                                 />
                                             </div>
-                                        </div>
+                                        </div>` : ``}
                                     </div>
                                 </div>
                             `, ``);

package/lowcode/cms-plugin/shopping-information.ts

@@ -496,12 +496,13 @@ export class ShoppingInformation {
                                                         type="checkbox"
                                                         onchange="${gvc.event((e, event) => {
                                                             vm.data.multi_currency = !vm.data.multi_currency
+                                                            gvc.notifyDataChange('basic')
                                                         })}"
                                                         ${vm.data.multi_currency ? `checked` : ``}
                                                 />
                                             </div>
                                         </div>
-                                        <div class="d-flex flex-column " style="gap:8px;">
+                                        ${vm.data.multi_currency ? `<div class="d-flex flex-column " style="gap:8px;">
                                             <div style="color: #393939;font-size: 16px;">啟用貨幣切換</div>
                                             <div style="color: #8D8D8D;font-size:13px;">
                                                 是否開放用戶於前台自行切換幣別進行顯示
@@ -512,12 +513,12 @@ export class ShoppingInformation {
                                                         class="form-check-input m-0"
                                                         type="checkbox"
                                                         onchange="${gvc.event((e, event) => {
-                                                            vm.data.switch_currency = !vm.data.switch_currency
-                                                        })}"
+                                            vm.data.switch_currency = !vm.data.switch_currency
+                                        })}"
                                                         ${vm.data.switch_currency ? `checked` : ``}
                                                 />
                                             </div>
-                                        </div>
+                                        </div>`:``}
                                     </div>
                                 </div>
                             `, ``)

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -20,50 +20,9 @@ import { ApiDelivery } from '../glitter-base/route/delivery.js';
 import { ShoppingInvoiceManager } from './shopping-invoice-manager.js';
 import { BgRecommend } from '../backend-manager/bg-recommend.js';
 import { ApiRecommend } from '../glitter-base/route/recommend.js';
+import { DeliveryHTML } from './module/delivery-html.js';
 const html = String.raw;
 export class ShoppingOrderManager {
-    static supportShipmentMethod() {
-        return [
-            {
-                title: '門市立即取貨',
-                value: 'now',
-                name: '',
-            },
-            {
-                title: '一般宅配',
-                value: 'normal',
-                name: '',
-            },
-            {
-                title: '全家店到店',
-                value: 'FAMIC2C',
-                name: '',
-            },
-            {
-                title: '萊爾富店到店',
-                value: 'HILIFEC2C',
-                name: '',
-            },
-            {
-                title: 'OK超商店到店',
-                value: 'OKMARTC2C',
-                name: '',
-            },
-            {
-                title: '7-ELEVEN超商交貨便',
-                value: 'UNIMARTC2C',
-                name: '',
-            },
-            {
-                title: '實體門市取貨',
-                value: 'shop',
-                name: '',
-            },
-        ].map((dd) => {
-            dd.name = dd.title;
-            return dd;
-        });
-    }
     static main(gvc, query) {
         const glitter = gvc.glitter;
         const dialog = new ShareDialog(gvc.glitter);
@@ -608,6 +567,48 @@ export class ShoppingOrderManager {
             },
         });
     }
+    static supportShipmentMethod() {
+        return [
+            {
+                title: '門市立即取貨',
+                value: 'now',
+                name: '',
+            },
+            {
+                title: '一般宅配',
+                value: 'normal',
+                name: '',
+            },
+            {
+                title: '全家店到店',
+                value: 'FAMIC2C',
+                name: '',
+            },
+            {
+                title: '萊爾富店到店',
+                value: 'HILIFEC2C',
+                name: '',
+            },
+            {
+                title: 'OK超商店到店',
+                value: 'OKMARTC2C',
+                name: '',
+            },
+            {
+                title: '7-ELEVEN超商交貨便',
+                value: 'UNIMARTC2C',
+                name: '',
+            },
+            {
+                title: '實體門市取貨',
+                value: 'shop',
+                name: '',
+            },
+        ].map((dd) => {
+            dd.name = dd.title;
+            return dd;
+        });
+    }
     static replaceOrder(gvc, vm, passOrderData, backCallback) {
         var _a, _b;
         const glitter = gvc.glitter;
@@ -1011,6 +1012,18 @@ export class ShoppingOrderManager {
                                                     }),
                                                 })
                                                 : ''}
+                                                                    ${BgWidget.customButton({
+                                                button: {
+                                                    color: 'gray',
+                                                    size: 'sm',
+                                                },
+                                                text: {
+                                                    name: '列印出貨單',
+                                                },
+                                                event: gvc.event(() => {
+                                                    DeliveryHTML.print(gvc);
+                                                }),
+                                            })}
                                                                 </div>`,
                                             html ` ${['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C', 'normal'].includes(orderData.orderData.user_info.shipment)
                                                 ? html ` <div class="tx_700">配送資訊</div>
@@ -1453,7 +1466,6 @@ export class ShoppingOrderManager {
                                         BgWidget.mainCard(html `
                                                             <div class="tx_700 mb-2 fs-6 text-info">自訂顧客資料表單</div>
                                                             <div class="px-2 py-1 border-start" style="color: #393939;font-size: 16px;">
-                                                               
                                                                 ${orderData.orderData.custom_form_format
                                             .filter((dd) => {
                                             return orderData.orderData.custom_form_data[dd.key];
@@ -1480,7 +1492,7 @@ export class ShoppingOrderManager {
                                     }).length > 0) {
                                     return (html ` <div style="margin-top: 24px;"></div>` +
                                         BgWidget.mainCard(html `
-                                                                <div class="tx_700 mb-2 fs-6 text-info">自訂收件人資料表單</div>
+                                                            <div class="tx_700 mb-2 fs-6 text-info">自訂收件人資料表單</div>
                                                             <div class="px-2 py-1 border-start" style="color: #393939;font-size: 16px;">
                                                                 ${orderData.orderData.custom_receipt_form
                                             .filter((dd) => {
@@ -1501,7 +1513,11 @@ export class ShoppingOrderManager {
                                     return ``;
                                 }
                             })(),
-                        ].filter((dd) => { return dd; }).join(BgWidget.mbContainer(24))}
+                        ]
+                            .filter((dd) => {
+                            return dd;
+                        })
+                            .join(BgWidget.mbContainer(24))}
                                     </div>`,
                         ratio: 25,
                     })}

package/lowcode/cms-plugin/shopping-order-manager.ts

@@ -12,6 +12,7 @@ import { ApiDelivery } from '../glitter-base/route/delivery.js';
 import { ShoppingInvoiceManager } from './shopping-invoice-manager.js';
 import { BgRecommend } from '../backend-manager/bg-recommend.js';
 import { ApiRecommend } from '../glitter-base/route/recommend.js';
+import { DeliveryHTML } from './module/delivery-html.js';
 
 interface VoucherData {
     id: number;
@@ -70,48 +71,6 @@ interface ViewModel {
 const html = String.raw;
 
 export class ShoppingOrderManager {
-    public static supportShipmentMethod() {
-        return [
-            {
-                title: '門市立即取貨',
-                value: 'now',
-                name: '',
-            },
-            {
-                title: '一般宅配',
-                value: 'normal',
-                name: '',
-            },
-            {
-                title: '全家店到店',
-                value: 'FAMIC2C',
-                name: '',
-            },
-            {
-                title: '萊爾富店到店',
-                value: 'HILIFEC2C',
-                name: '',
-            },
-            {
-                title: 'OK超商店到店',
-                value: 'OKMARTC2C',
-                name: '',
-            },
-            {
-                title: '7-ELEVEN超商交貨便',
-                value: 'UNIMARTC2C',
-                name: '',
-            },
-            {
-                title: '實體門市取貨',
-                value: 'shop',
-                name: '',
-            },
-        ].map((dd) => {
-            dd.name = dd.title;
-            return dd;
-        });
-    }
     public static main(
         gvc: GVC,
         query: {
@@ -708,6 +667,49 @@ export class ShoppingOrderManager {
         });
     }
 
+    public static supportShipmentMethod() {
+        return [
+            {
+                title: '門市立即取貨',
+                value: 'now',
+                name: '',
+            },
+            {
+                title: '一般宅配',
+                value: 'normal',
+                name: '',
+            },
+            {
+                title: '全家店到店',
+                value: 'FAMIC2C',
+                name: '',
+            },
+            {
+                title: '萊爾富店到店',
+                value: 'HILIFEC2C',
+                name: '',
+            },
+            {
+                title: 'OK超商店到店',
+                value: 'OKMARTC2C',
+                name: '',
+            },
+            {
+                title: '7-ELEVEN超商交貨便',
+                value: 'UNIMARTC2C',
+                name: '',
+            },
+            {
+                title: '實體門市取貨',
+                value: 'shop',
+                name: '',
+            },
+        ].map((dd) => {
+            dd.name = dd.title;
+            return dd;
+        });
+    }
+
     public static replaceOrder(gvc: GVC, vm: any, passOrderData?: any, backCallback?: () => any) {
         const glitter = gvc.glitter;
         const origData = JSON.parse(JSON.stringify(passOrderData ?? vm.data));
@@ -774,7 +776,7 @@ export class ShoppingOrderManager {
                     note?: string;
                     code_note?: string;
                 };
-                custom_receipt_form?:any;
+                custom_receipt_form?: any;
                 custom_form_format?: any;
                 custom_form_data?: any;
                 proof_purchase: any;
@@ -1029,7 +1031,7 @@ export class ShoppingOrderManager {
                                                                             ${dd.is_gift ? `<div class="">${BgWidget.successInsignia('贈品')}</div>` : ``}
                                                                         </div>
                                                                         <div class="d-flex flex-column" style="gap:2px;">
-                                                                            ${dd.is_hidden ? `<div style="width:auto;">${BgWidget.secondaryInsignia('隱形商品')}</div>`:``}
+                                                                            ${dd.is_hidden ? `<div style="width:auto;">${BgWidget.secondaryInsignia('隱形商品')}</div>` : ``}
                                                                             <div class="tx_700">${dd.title}</div>
                                                                             ${dd.spec.length > 0 ? BgWidget.grayNote(dd.spec.join(', ')) : ''}
                                                                             ${BgWidget.grayNote(`存貨單位 (SKU)：${dd.sku && dd.sku.length > 0 ? dd.sku : '無'}`)}
@@ -1230,6 +1232,18 @@ export class ShoppingOrderManager {
                                                                               }),
                                                                           })
                                                                         : ''}
+                                                                    ${BgWidget.customButton({
+                                                                        button: {
+                                                                            color: 'gray',
+                                                                            size: 'sm',
+                                                                        },
+                                                                        text: {
+                                                                            name: '列印出貨單',
+                                                                        },
+                                                                        event: gvc.event(() => {
+                                                                            DeliveryHTML.print(gvc);
+                                                                        }),
+                                                                    })}
                                                                 </div>`,
                                                             html` ${['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C', 'normal'].includes(orderData.orderData.user_info.shipment)
                                                                     ? html` <div class="tx_700">配送資訊</div>
@@ -1457,9 +1471,9 @@ export class ShoppingOrderManager {
                                                                         class="d-flex align-items-center"
                                                                         style="color: #4D86DB;font-weight: 400; gap:8px;cursor:pointer;"
                                                                         onclick="${gvc.event(() => {
-                                                                            if(userData.userID){
+                                                                            if (userData.userID) {
                                                                                 child_vm.userID = userData.userID;
-                                                                                child_vm.type = 'user';   
+                                                                                child_vm.type = 'user';
                                                                             }
                                                                         })}"
                                                                     >
@@ -1690,7 +1704,6 @@ export class ShoppingOrderManager {
                                                         BgWidget.mainCard(html`
                                                             <div class="tx_700 mb-2 fs-6 text-info">自訂顧客資料表單</div>
                                                             <div class="px-2 py-1 border-start" style="color: #393939;font-size: 16px;">
-                                                               
                                                                 ${orderData.orderData.custom_form_format
                                                                     .filter((dd: any) => {
                                                                         return (orderData.orderData.custom_form_data as any)[dd.key];
@@ -1702,7 +1715,7 @@ export class ShoppingOrderManager {
                                                                             </div>
                                                                             <div style="color: #393939;font-weight: 400;">${(orderData.orderData.custom_form_data as any)[dd.key]}</div>`;
                                                                     })
-                                                                        .join('<div class="my-2 w-100 border-top"></div>')}
+                                                                    .join('<div class="my-2 w-100 border-top"></div>')}
                                                             </div>
                                                         `)
                                                     );
@@ -1712,15 +1725,15 @@ export class ShoppingOrderManager {
                                             })(),
                                             (() => {
                                                 if (
-                                                        orderData.orderData.custom_receipt_form &&
-                                                        orderData.orderData.custom_receipt_form.filter((dd: any) => {
-                                                            return (orderData.orderData.user_info as any)[dd.key];
-                                                        }).length > 0
+                                                    orderData.orderData.custom_receipt_form &&
+                                                    orderData.orderData.custom_receipt_form.filter((dd: any) => {
+                                                        return (orderData.orderData.user_info as any)[dd.key];
+                                                    }).length > 0
                                                 ) {
                                                     return (
-                                                            html` <div style="margin-top: 24px;"></div>` +
-                                                            BgWidget.mainCard(html`
-                                                                <div class="tx_700 mb-2 fs-6 text-info">自訂收件人資料表單</div>
+                                                        html` <div style="margin-top: 24px;"></div>` +
+                                                        BgWidget.mainCard(html`
+                                                            <div class="tx_700 mb-2 fs-6 text-info">自訂收件人資料表單</div>
                                                             <div class="px-2 py-1 border-start" style="color: #393939;font-size: 16px;">
                                                                 ${orderData.orderData.custom_receipt_form
                                                                     .filter((dd: any) => {
@@ -1733,7 +1746,7 @@ export class ShoppingOrderManager {
                                                                             </div>
                                                                             <div style="color: #393939;font-weight: 400;">${(orderData.orderData.user_info as any)[dd.key]}</div>`;
                                                                     })
-                                                                        .join('<div class="my-2 w-100 border-top"></div>')}
+                                                                    .join('<div class="my-2 w-100 border-top"></div>')}
                                                             </div>
                                                         `)
                                                     );
@@ -1741,7 +1754,11 @@ export class ShoppingOrderManager {
                                                     return ``;
                                                 }
                                             })(),
-                                        ].filter((dd)=>{return dd}).join(BgWidget.mbContainer(24))}
+                                        ]
+                                            .filter((dd) => {
+                                                return dd;
+                                            })
+                                            .join(BgWidget.mbContainer(24))}
                                     </div>`,
                                     ratio: 25,
                                 }
@@ -3498,7 +3515,7 @@ export class ShoppingOrderManager {
                         });
                     }
 
-                    if(!['atm','line'].includes(orderData.customer_info.payment_select)){
+                    if (!['atm', 'line'].includes(orderData.customer_info.payment_select)) {
                         if (orderData.proof_purchase === undefined || orderData.proof_purchase.paymentForm === undefined) {
                             return '尚未回傳付款證明';
                         }
@@ -3507,7 +3524,7 @@ export class ShoppingOrderManager {
                         const paymentFormList = orderData.proof_purchase.paymentForm.list ?? [];
                         paymentFormList.map((item: any) => {
                             array.push(`${item.title} : ${orderData.proof_purchase[item.key]}`);
-                        });   
+                        });
                     }
 
                     return array.join(BgWidget.mbContainer(8)) || '尚未回傳付款證明';
@@ -3515,7 +3532,7 @@ export class ShoppingOrderManager {
             </div>`;
     }
 
-    static printStoreOrderInfo(obj: { gvc: GVC; cart_token: string }) {
+    public static printStoreOrderInfo(obj: { gvc: GVC; cart_token: string }) {
         const gvc = obj.gvc;
         const glitter = gvc.glitter;
         const dialog = new ShareDialog(gvc.glitter);