ts-glitter 14.2.8 → 14.3.0

package/lowcode/glitterBundle/plugins/editor-elem.ts

@@ -2059,7 +2059,12 @@ ${obj.gvc.bindView(() => {
         readonly?: boolean;
     }) {
         const viewId = obj.gvc.glitter.getUUID();
-        const def = () => ({ num: obj.default, min: obj.min, max: obj.max });
+        const def = () => ({
+            gvc: obj.gvc,
+            num: obj.default,
+            min: obj.min,
+            max: obj.max,
+        });
         return html`${obj.title ? EditorElem.h3(obj.title) : ``}
             <div class="d-flex align-items-center">
                 ${obj.gvc.bindView({
@@ -2071,7 +2076,7 @@ ${obj.gvc.bindView(() => {
                             type="number"
                             placeholder="${obj.placeHolder}"
                             onchange="${obj.gvc.event((e) => {
-                                const n = this.numberInterval({
+                                const n = this.floatInterval({
                                     ...def(),
                                     num: e.value,
                                 });
@@ -2079,14 +2084,14 @@ ${obj.gvc.bindView(() => {
                                 obj.callback(n);
                                 obj.gvc.notifyDataChange(viewId);
                             })}"
-                            value="${obj.default !== undefined ? this.numberInterval(def()) : ''}"
+                            value="${obj.default !== undefined ? this.floatInterval(def()) : ''}"
                             ${obj.readonly ? `readonly` : ``}
                         />`;
                     },
                     divCreate: { class: 'w-100' },
                     onCreate: () => {
                         if (!this.checkNumberMinMax(def())) {
-                            obj.callback(this.numberInterval(def()));
+                            obj.callback(this.floatInterval(def()));
                         }
                     },
                 })}
@@ -2094,8 +2099,38 @@ ${obj.gvc.bindView(() => {
             </div> `;
     }
 
-    public static numberInterval(obj: { num: number | string; min?: number; max?: number }): number {
+    public static floatInterval(obj: { gvc: GVC; num: number | string; min?: number; max?: number; precision?: number }): number {
+        const dialog = new ShareDialog(obj.gvc.glitter);
+        let n = parseFloat(`${obj.num}`);
+
+        // 驗證是否為有效數字
+        if (isNaN(n)) {
+            dialog.errorMessage({ text: '請輸入數字' });
+        }
+
+        // 限制小數位數（如果指定了 precision）
+        if (obj.precision !== undefined && obj.precision >= 0) {
+            n = parseFloat(n.toFixed(obj.precision));
+        }
+
+        // 檢查範圍
+        if (obj.max !== undefined && n > obj.max) {
+            return obj.max;
+        }
+        if (obj.min !== undefined && n < obj.min) {
+            return obj.min;
+        }
+
+        return n;
+    }
+
+    public static numberInterval(obj: { gvc: GVC; num: number | string; min?: number; max?: number }): number {
+        const dialog = new ShareDialog(obj.gvc.glitter);
         const n = parseInt(`${obj.num}`, 10);
+
+        if (isNaN(n)) {
+            dialog.errorMessage({ text: '請輸入數字' });
+        }
         if (obj.max !== undefined && n > obj.max) {
             return obj.max;
         }
@@ -2453,17 +2488,12 @@ ${obj.gvc.bindView(() => {
     public static editerDialog(par: { gvc: GVC; dialog: (gvc: GVC) => string; width?: string; editTitle?: string; callback?: () => void }) {
         return html` <button
             type="button"
-            class="btn btn-primary-c  w-100"
-            style=""
+            class="btn btn-primary-c w-100"
             onclick="${par.gvc.event(() => {
                 const gvc = par.gvc;
                 NormalPageEditor.toggle({
                     visible: true,
-                    view: `
-                    <div class="p-2"
-                             style="overflow-y:auto;">
-                            ${par.dialog(gvc)}
-                        </div>`,
+                    view: html` <div class="p-2" style="overflow-y:auto;">${par.dialog(gvc)}</div>`,
                     title: par.editTitle || '',
                 });
                 par.callback && (NormalPageEditor.closeEvent = par.callback);

package/lowcode/public-components/checkout/index.js

@@ -18,6 +18,7 @@ import { FormWidget } from "../../official_view_component/official/form.js";
 import { ShareDialog } from "../../glitterBundle/dialog/ShareDialog.js";
 import { PdClass } from "../product/pd-class.js";
 import { Ad } from "../public/ad.js";
+import { ApiWallet } from '../../glitter-base/route/wallet.js';
 const html = String.raw;
 const css = String.raw;
 export class CheckoutIndex {
@@ -952,6 +953,9 @@ export class CheckoutIndex {
                     "bank_user": "陳女士",
                     "bank_account": "888800004567"
                 }
+            },
+            rebateConfig: {
+                title: '購物金'
             }
         };
         const noImageURL = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg';
@@ -1392,16 +1396,22 @@ export class CheckoutIndex {
                     }));
                 })).then((data) => {
                     vm.cartData = data;
-                    gvc.addMtScript([
-                        {
-                            src: `https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js`,
-                        },
-                    ], () => {
-                        loadings.page = false;
-                        dialog.dataLoading({ visible: false });
-                        gvc.notifyDataChange(['js-cart-count', ids.page]);
-                    }, () => {
-                    });
+                    ApiWallet.getRebateConfig({ type: 'me' }).then((res) => __awaiter(this, void 0, void 0, function* () {
+                        if (res.result && res.response.data) {
+                            vm.rebateConfig = res.response.data;
+                        }
+                        vm.rebateConfig.title = CheckInput.isEmpty(vm.rebateConfig.title) ? '購物金' : vm.rebateConfig.title;
+                        gvc.addMtScript([
+                            {
+                                src: `https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js`,
+                            },
+                        ], () => {
+                            loadings.page = false;
+                            dialog.dataLoading({ visible: false });
+                            gvc.notifyDataChange(['js-cart-count', ids.page]);
+                        }, () => {
+                        });
+                    }));
                 });
             }
             else {
@@ -1900,7 +1910,7 @@ export class CheckoutIndex {
                                                 let tempRebate = 0;
                                                 const dialog = new ShareDialog(gvc.glitter);
                                                 return `<div class="${gClass(['price-row', 'text-2'])}">
-                                                                    <div>購物金折抵</div>
+                                                                                <div>${vm.rebateConfig.title}折抵</div>
                                                                     <div>- NT. ${vm.cartData.use_rebate.toLocaleString()}</div>
                                                                 </div>
                                                               
@@ -1914,7 +1924,7 @@ export class CheckoutIndex {
                                                                     >
                                                                         <input
                                                                                     class="flex-fill ${gClass('group-input')}"
-                                                                                    placeholder="請輸入購物金"
+                                                                                    placeholder="請輸入${vm.rebateConfig.title}"
                                                                                     style="${document.body.clientWidth < 800 ? `width:calc(100% - 150px) !important;` : ``}"
                                                                                     value="${vm.cartData.use_rebate || ''}"
                                                                                     onchange="${gvc.event((e, event) => {
@@ -1941,20 +1951,18 @@ export class CheckoutIndex {
                                                         }));
                                                     });
                                                     const limit = vm.cartData.total - vm.cartData.shipment_fee + vm.cartData.use_rebate;
-                                                    console.log({
-                                                        total: vm.cartData.total,
-                                                        use_rebate: vm.cartData.use_rebate,
-                                                        shipment_fee: vm.cartData.shipment_fee,
-                                                    });
+                                                    if (sum === 0) {
+                                                        dialog.errorMessage({ text: `您的 ${vm.rebateConfig.title} 為 0 點，無法折抵` });
+                                                        return;
+                                                    }
                                                     if (tempRebate > Math.min(sum, limit)) {
                                                         dialog.errorMessage({ text: `請輸入 0 到 ${Math.min(sum, limit)} 的數值` });
+                                                        return;
                                                     }
-                                                    else {
-                                                        ApiCart.setCart((cartItem) => {
-                                                            cartItem.use_rebate = tempRebate;
-                                                            refreshCartData();
-                                                        });
-                                                    }
+                                                    ApiCart.setCart((cartItem) => {
+                                                        cartItem.use_rebate = tempRebate;
+                                                        refreshCartData();
+                                                    });
                                                 }))}">
                                                                                 套用
                                                                             </div>
@@ -1984,13 +1992,13 @@ export class CheckoutIndex {
                                                             }
                                                             const info = vm.cartData.useRebateInfo;
                                                             if (info.condition) {
-                                                                return `還差$ ${info.condition.toLocaleString()} 即可使用購物金折抵`;
+                                                                return `還差$ ${info.condition.toLocaleString()} 即可使用 ${vm.rebateConfig.title} 折抵`;
                                                             }
                                                             if (info.limit) {
-                                                                return `您目前剩餘 ${sum || 0} 點購物金<br />此份訂單最多可折抵 ${info.limit.toLocaleString()} 點購物金`;
+                                                                return `您目前剩餘 ${sum || 0} 點 ${vm.rebateConfig.title}<br />此份訂單最多可折抵 ${info.limit.toLocaleString()} 點 ${vm.rebateConfig.title}`;
                                                             }
                                                             else {
-                                                                return `您目前剩餘 ${sum || 0} 點購物金`;
+                                                                return `您目前剩餘 ${sum || 0} 點 ${vm.rebateConfig.title}`;
                                                             }
                                                         })
                                                     };
@@ -2417,7 +2425,7 @@ export class CheckoutIndex {
                                 ].join('');
                             }
                             catch (e) {
-                                console.log(e);
+                                console.error(e);
                                 return ``;
                             }
                         })()}

package/lowcode/public-components/checkout/index.ts

@@ -14,6 +14,7 @@ import {Voucher as OriginVoucher, VoucherContent} from '../user-manager/um-vouch
 import {PdClass} from "../product/pd-class.js";
 import * as vm from "node:vm";
 import {Ad} from "../public/ad.js";
+import { ApiWallet } from '../../glitter-base/route/wallet.js';
 
 const html = String.raw;
 const css = String.raw;
@@ -958,7 +959,10 @@ export class CheckoutIndex {
                     "bank_user": "陳女士",
                     "bank_account": "888800004567"
                 }
-            }
+            }as any,
+            rebateConfig: {
+                title: '購物金'
+            } as any
         };
         const noImageURL = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg';
         const classPrefix = Tool.randomString(6);
@@ -1436,22 +1440,29 @@ export class CheckoutIndex {
                     });
                 }).then((data) => {
                     vm.cartData = data;
-                    gvc.addMtScript(
-                        [
-                            {
-                                src: `https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js`,
-                            },
-                        ],
-                        () => {
-                            loadings.page = false;
-                            dialog.dataLoading({visible: false})
-                            gvc.notifyDataChange(['js-cart-count', ids.page])
-                        },
-                        () => {
+                    ApiWallet.getRebateConfig({ type: 'me' }).then(async (res) => {
+                        if (res.result && res.response.data) {
+                            vm.rebateConfig = res.response.data;
                         }
-                    );
+                        vm.rebateConfig.title = CheckInput.isEmpty(vm.rebateConfig.title) ? '購物金' : vm.rebateConfig.title;
+                        gvc.addMtScript(
+                            [
+                                {
+                                    src: `https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js`,
+                                },
+                            ],
+                            () => {
+                                loadings.page = false;
+                                dialog.dataLoading({visible:false})
+                                gvc.notifyDataChange(['js-cart-count', ids.page])
+                            },
+                            () => {
+                            }
+                        );
+                    })
+                    
                 });
-            } else {
+            }else{
                 gvc.addMtScript(
                     [
                         {
@@ -1996,7 +2007,7 @@ function getBadgeClass(){
                                                                                 let tempRebate: number = 0;
                                                                                 const dialog = new ShareDialog(gvc.glitter);
                                                                                 return `<div class="${gClass(['price-row', 'text-2'])}">
-                                                                    <div>購物金折抵</div>
+                                                                                <div>${vm.rebateConfig.title}折抵</div>
                                                                     <div>- NT. ${vm.cartData.use_rebate.toLocaleString()}</div>
                                                                 </div>
                                                               
@@ -2010,8 +2021,8 @@ function getBadgeClass(){
                                                                     >
                                                                         <input
                                                                                     class="flex-fill ${gClass('group-input')}"
-                                                                                    placeholder="請輸入購物金"
-                                                                                    style="${document.body.clientWidth < 800 ? `width:calc(100% - 150px) !important;` : ``}"
+                                                                                    placeholder="請輸入${vm.rebateConfig.title}"
+                                                                                    style="${document.body.clientWidth<800 ? `width:calc(100% - 150px) !important;`:``}"
                                                                                     value="${vm.cartData.use_rebate || ''}"
                                                                                     onchange="${gvc.event((e, event) => {
                                                                                     if (CheckInput.isNumberString(e.value)) {
@@ -2035,24 +2046,19 @@ function getBadgeClass(){
                                                                                         })
                                                                                     });
                                                                                     const limit = vm.cartData.total - vm.cartData.shipment_fee + vm.cartData.use_rebate;
-
-                                                                                    // const subtotal = data.total - data.shipment_fee + data.use_rebate;
-                                                                                    //
-                                                                                    // if (subtotal > 0 && useRebate >= 0 && subtotal >= useRebate && remainRebate >= useRebate) {
-
-                                                                                    console.log({
-                                                                                        total: vm.cartData.total,
-                                                                                        use_rebate: vm.cartData.use_rebate,
-                                                                                        shipment_fee: vm.cartData.shipment_fee,
-                                                                                    })
-                                                                                    if (tempRebate > Math.min(sum, limit)) {
-                                                                                        dialog.errorMessage({text: `請輸入 0 到 ${Math.min(sum, limit)} 的數值`})
-                                                                                    } else {
-                                                                                        ApiCart.setCart((cartItem) => {
-                                                                                            cartItem.use_rebate = tempRebate
-                                                                                            refreshCartData()
-                                                                                        })
+                                                                                    if(sum === 0){
+                                                                                        dialog.errorMessage({text:  `您的 ${vm.rebateConfig.title} 為 0 點，無法折抵` })
+                                                                                        return;
                                                                                     }
+                                                                                    if(tempRebate > Math.min(sum, limit) ){
+                                                                                        dialog.errorMessage({text:  `請輸入 0 到 ${ Math.min(sum, limit) } 的數值` })
+                                                                                        return;
+                                                                                    }
+                                                                                    
+                                                                                    ApiCart.setCart((cartItem)=>{
+                                                                                        cartItem.use_rebate=tempRebate
+                                                                                        refreshCartData()
+                                                                                    })
                                                                                 })}">
                                                                                 套用
                                                                             </div>
@@ -2080,17 +2086,16 @@ function getBadgeClass(){
                                                                                                 return '';
                                                                                             }
 
-                                                                                            const info = vm.cartData.useRebateInfo;
-                                                                                            if (info.condition) {
-                                                                                                return `還差$ ${info.condition.toLocaleString()} 即可使用購物金折抵`
-                                                                                            }
-                                                                                            if (info.limit) {
-                                                                                                return `您目前剩餘 ${sum || 0} 點購物金<br />此份訂單最多可折抵 ${info.limit.toLocaleString()} 點購物金`
-                                                                                            } else {
-                                                                                                return `您目前剩餘 ${sum || 0} 點購物金`
-                                                                                            }
+                                                                                        const info = vm.cartData.useRebateInfo;
+                                                                                        if(info.condition){
+                                                                                            return `還差$ ${info.condition.toLocaleString()} 即可使用 ${vm.rebateConfig.title} 折抵`
                                                                                         }
-                                                                                    }
+                                                                                        if(info.limit){
+                                                                                            return `您目前剩餘 ${sum || 0} 點 ${vm.rebateConfig.title}<br />此份訂單最多可折抵 ${info.limit.toLocaleString()} 點 ${vm.rebateConfig.title}`
+                                                                                        }else{
+                                                                                            return `您目前剩餘 ${sum || 0} 點 ${vm.rebateConfig.title}`
+                                                                                        }
+                                                                                    }}
                                                                                 })
                                                                             })()}
                                                                 </div>`
@@ -2468,67 +2473,67 @@ function getBadgeClass(){
                                                     })()}</span>
                                                 </button>
                                             </div>
-                                            ${(() => {
-                                                try {
-                                                    vm.cartData.user_info.custom_form_delivery = vm.cartData.user_info.custom_form_delivery ?? {};
-                                                    const form_array = JSON.parse(JSON.stringify(this.getShipmentMethod(vm.cartData).find((dd: any) => {
-                                                        return vm.cartData.user_info.shipment === dd.value
-                                                    }).form));
-                                                    form_array.map((dd: any) => {
-                                                        dd.col = '4';
-                                                        dd.form_config.title_style = {
-                                                            list: [
-                                                                {
-                                                                    class: gClass('label') + ' mb-2',
-                                                                    style: 'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
-                                                                    stylist: [],
-                                                                    dataType: 'code',
-                                                                    style_from: 'code',
-                                                                    classDataType: 'static',
-                                                                },
-                                                            ],
-                                                            class: 'form-label',
-                                                            style: 'font-size: 20px;font-style: normal;font-weight: 400;line-height: 140%; color:#393939 !important;',
-                                                            stylist: [],
-                                                            version: 'v2',
-                                                            dataType: 'static',
-                                                            style_from: 'code',
-                                                            classDataType: 'static',
-                                                        };
-                                                        dd.form_config.input_style = {
-                                                            list: [
-                                                                {
-                                                                    class: gClass('input'),
-                                                                    style: 'return `border-radius: ${widget.formData.radius}px !important;`',
-                                                                    stylist: [],
-                                                                    dataType: 'code',
-                                                                    style_from: 'code',
-                                                                    classDataType: 'static',
-                                                                },
-                                                            ],
-                                                            class: ' mb-3',
-                                                            style: 'background: #FFF;',
-                                                            stylist: [],
-                                                            version: 'v2',
-                                                            dataType: 'static',
-                                                            style_from: 'code',
-                                                            classDataType: 'static',
-                                                        };
-                                                    });
-                                                    return [
-                                                        FormWidget.editorView({
-                                                            gvc: gvc,
-                                                            array: form_array,
-                                                            refresh: () => {
-                                                                this.storeLocalData(vm.cartData)
-                                                            },
-                                                            formData: vm.cartData.user_info.custom_form_delivery,
-                                                        })
-                                                    ].join('');
-                                                } catch (e) {
-                                                    console.log(e)
-                                                    return ``
-                                                }
+                                            ${(()=>{
+                                             try {
+                                                 vm.cartData.user_info.custom_form_delivery=vm.cartData.user_info.custom_form_delivery??{};
+                                                 const form_array = JSON.parse(JSON.stringify(this.getShipmentMethod(vm.cartData).find((dd:any)=>{
+                                                     return vm.cartData.user_info.shipment === dd.value
+                                                 }).form));
+                                                 form_array.map((dd: any) => {
+                                                     dd.col = '4';
+                                                     dd.form_config.title_style = {
+                                                         list: [
+                                                             {
+                                                                 class: gClass('label') + ' mb-2',
+                                                                 style: 'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
+                                                                 stylist: [],
+                                                                 dataType: 'code',
+                                                                 style_from: 'code',
+                                                                 classDataType: 'static',
+                                                             },
+                                                         ],
+                                                         class: 'form-label',
+                                                         style: 'font-size: 20px;font-style: normal;font-weight: 400;line-height: 140%; color:#393939 !important;',
+                                                         stylist: [],
+                                                         version: 'v2',
+                                                         dataType: 'static',
+                                                         style_from: 'code',
+                                                         classDataType: 'static',
+                                                     };
+                                                     dd.form_config.input_style = {
+                                                         list: [
+                                                             {
+                                                                 class: gClass('input'),
+                                                                 style: 'return `border-radius: ${widget.formData.radius}px !important;`',
+                                                                 stylist: [],
+                                                                 dataType: 'code',
+                                                                 style_from: 'code',
+                                                                 classDataType: 'static',
+                                                             },
+                                                         ],
+                                                         class: ' mb-3',
+                                                         style: 'background: #FFF;',
+                                                         stylist: [],
+                                                         version: 'v2',
+                                                         dataType: 'static',
+                                                         style_from: 'code',
+                                                         classDataType: 'static',
+                                                     };
+                                                 });
+                                                 return [
+                                                     FormWidget.editorView({
+                                                         gvc: gvc,
+                                                         array: form_array,
+                                                         refresh: () => {
+                                                             this.storeLocalData(vm.cartData)
+                                                         },
+                                                         formData: vm.cartData.user_info.custom_form_delivery,
+                                                     })
+                                                 ].join('');
+                                             }catch (e) {
+                                                 console.error(e)
+                                                 return ``
+                                             }
                                             })()}
                                         </div>
                                     </section>