ts-glitter 18.2.6 → 18.2.8

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

@@ -75,21 +75,32 @@ interface ViewModel {
     filter_type: 'normal' | 'block' | 'pos';
 }
 
+interface EcCashFlow {
+    HandlingCharge: string,
+    PaymentType: 'ATM_CHINATRUST' | 'Credit_CreditCard',
+    PaymentDate: string,
+    TradeStatus: '0' | '1' | '10200095',
+    TradeAmt: string,
+    TradeNo: string,
+    credit_receipt: any
+}
+
+interface PayNowCashFlow {
+    amount: number,
+    status: string,
+    payment: {
+        paymentMethod: 'ATM' | 'CreditCard' | 'ConvenienceStore',
+        paidAt: string
+    }
+}
+
 interface OrderData {
     id: number;
     cart_token: string;
     status: number;
     email: string;
     orderData: {
-        cash_flow?: {
-            HandlingCharge: string,
-            PaymentType: 'ATM_CHINATRUST' | 'Credit_CreditCard',
-            PaymentDate: string,
-            TradeStatus: '0' | '1' | '10200095',
-            TradeAmt: string,
-            TradeNo: string,
-            credit_receipt: any
-        },
+        cash_flow?: EcCashFlow | PayNowCashFlow,
         distribution_info?: {
             code: string;
             condition: number;
@@ -150,7 +161,7 @@ interface OrderData {
             CVSAddress: string;
             note?: string;
             code_note?: string;
-            shipment_detail?:any;
+            shipment_detail?: any;
         };
         custom_receipt_form?: any;
         custom_form_format?: any;
@@ -1543,9 +1554,21 @@ export class ShoppingOrderManager {
                                                                                             },
                                                                                         ],
                                                                                         callback: (text) => {
-                                                                                            if (text && text !== `${orderData.status}`) {
-                                                                                                orderData.status = parseInt(text, 10);
-                                                                                            }
+                                                                                            const dialog=new ShareDialog(gvc.glitter)
+                                                                                            dialog.checkYesOrNot({
+                                                                                                text:'是否確認變更付款狀態?',
+                                                                                                callback:(response)=>{
+                                                                                                    if(response){
+                                                                                                        if (text && text !== `${orderData.status}`) {
+                                                                                                            orderData.status = parseInt(text, 10);
+                                                                                                            saveEvent();
+                                                                                                        }
+                                                                                                    }else{
+                                                                                                        gvc.notifyDataChange(mainViewID)
+                                                                                                    }
+                                                                                                }
+                                                                                            })
+                                                                                           
                                                                                         },
                                                                                     })}
                                                                                 </div>
@@ -1558,75 +1581,123 @@ export class ShoppingOrderManager {
                                                                                 </div>
                                                                                 ${ShoppingOrderManager.getProofPurchaseString(orderData.orderData, gvc)}
                                                                             </div>`,
-                                                                        (orderData.orderData.customer_info.payment_select === 'ecPay') ? html`
-                                                                            <div style="display: flex;flex-direction: column;align-items: flex-start;gap: 12px;align-self: stretch;">
-                                                                                <div class="tx_700">金流對帳</div>
-                                                                                <div> ${
-                                                                                        (orderData.orderData.cash_flow?.TradeStatus === '1' ? [
-                                                                                            `<div class="d-flex align-items-center">
-金流交易結果: ${(orderData.orderData.cash_flow?.credit_receipt && orderData.orderData.cash_flow?.credit_receipt.status) || '已付款'}  <button class="btn btn-gray rounded-2 ms-2 ${(orderData.orderData.cash_flow?.PaymentType.toLowerCase().includes('credit') && (orderData.orderData.cash_flow?.credit_receipt && orderData.orderData.cash_flow?.credit_receipt.status === '已授權')) ? `` : `d-none`}" type="button" style="height:22px;" onclick="${gvc.event(() => {
-                                                                                                const doalog = new ShareDialog(gvc.glitter)
-                                                                                                doalog.checkYesOrNot({
-                                                                                                    text: '是否確認退刷交易?',
-                                                                                                    callback: (response) => {
-                                                                                                        if (response) {
-                                                                                                            doalog.dataLoading({visible: true})
-                                                                                                            ApiShop.ecPayBrushOrders({
-                                                                                                                tradNo: orderData.orderData.cash_flow!.TradeNo,
-                                                                                                                orderID: orderData.cart_token,
-                                                                                                                total: orderData.orderData.cash_flow!.TradeAmt
-                                                                                                            }).then((res) => {
-                                                                                                                doalog.dataLoading({visible: false})
-                                                                                                                orderData.status = -2;
-                                                                                                                saveEvent()
-                                                                                                            })
-                                                                                                        }
-                                                                                                    }
-                                                                                                })
+                                                                        (() => {
+                                                                            if ((orderData.orderData.customer_info.payment_select === 'ecPay')) {
+                                                                                const cash_flow = orderData.orderData.cash_flow as EcCashFlow
+                                                                                return html`
+                                                                                    <div style="display: flex;flex-direction: column;align-items: flex-start;gap: 12px;align-self: stretch;">
+                                                                                        <div class="tx_700">金流對帳
+                                                                                        </div>
+                                                                                        <div> ${
+                                                                                                (cash_flow.TradeStatus === '1' ? [
+                                                                                                    `<div class="d-flex align-items-center">
+金流交易結果: ${(cash_flow.credit_receipt && cash_flow.credit_receipt.status) || '已付款'}  <button class="btn btn-gray rounded-2 ms-2 ${(cash_flow.PaymentType.toLowerCase().includes('credit') && (cash_flow.credit_receipt && cash_flow.credit_receipt.status === '已授權')) ? `` : `d-none`}" type="button" style="height:22px;" onclick="${gvc.event(() => {
+                                                                                                        const doalog = new ShareDialog(gvc.glitter)
+                                                                                                        doalog.checkYesOrNot({
+                                                                                                            text: '是否確認退刷交易?',
+                                                                                                            callback: (response) => {
+                                                                                                                if (response) {
+                                                                                                                    doalog.dataLoading({visible: true})
+                                                                                                                    ApiShop.ecPayBrushOrders({
+                                                                                                                        tradNo: cash_flow.TradeNo,
+                                                                                                                        orderID: orderData.cart_token,
+                                                                                                                        total: cash_flow.TradeAmt
+                                                                                                                    }).then((res) => {
+                                                                                                                        doalog.dataLoading({visible: false})
+                                                                                                                        orderData.status = -2;
+                                                                                                                        saveEvent()
+                                                                                                                    })
+                                                                                                                }
+                                                                                                            }
+                                                                                                        })
 
-                                                                                            })}">
+                                                                                                    })}">
                 <span class=" tx_700" style="font-size:13px;">退刷</span>
             </button>
 </div>`,
-                                                                                            `金流交易方式: ${
-                                                                                                    [
-                                                                                                        {
-                                                                                                            title: 'WebATM',
-                                                                                                            key: 'WebATM'
-                                                                                                        },
-                                                                                                        {
-                                                                                                            title: 'ATM',
-                                                                                                            key: 'ATM'
-                                                                                                        },
-                                                                                                        {
-                                                                                                            title: '超商代碼',
-                                                                                                            key: 'CVS'
-                                                                                                        },
-                                                                                                        {
-                                                                                                            title: '超商條碼',
-                                                                                                            key: 'BARCODE'
-                                                                                                        },
-                                                                                                        {
-                                                                                                            title: '信用卡',
-                                                                                                            key: 'Credit'
-                                                                                                        },
-                                                                                                        {
-                                                                                                            title: '未知付款方式',
-                                                                                                            key: ''
-                                                                                                        }
-                                                                                                    ].find((dd) => {
-                                                                                                        return orderData.orderData.cash_flow?.PaymentType.toLowerCase().includes(dd.key.toLowerCase())
-                                                                                                    })?.title
-                                                                                            }`,
-                                                                                            `交易手續費: ${orderData.orderData.cash_flow?.HandlingCharge}`,
-                                                                                            `交易總金額: ${orderData.orderData.cash_flow?.TradeAmt}`,
-                                                                                            `交易時間: ${orderData.orderData.cash_flow?.PaymentDate}`
-                                                                                        ] : [
-                                                                                            `金流交易結果: 未付款`
-                                                                                        ]).join(`<div class="my-2"></div>`)
-                                                                                }
-                                                                                </div>
-                                                                            </div>` : ``
+                                                                                                    `金流交易方式: ${
+                                                                                                            [
+                                                                                                                {
+                                                                                                                    title: 'WebATM',
+                                                                                                                    key: 'WebATM'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: 'ATM',
+                                                                                                                    key: 'ATM'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: '超商代碼',
+                                                                                                                    key: 'CVS'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: '超商條碼',
+                                                                                                                    key: 'BARCODE'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: '信用卡',
+                                                                                                                    key: 'Credit'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: '未知付款方式',
+                                                                                                                    key: ''
+                                                                                                                }
+                                                                                                            ].find((dd) => {
+                                                                                                                return cash_flow.PaymentType.toLowerCase().includes(dd.key.toLowerCase())
+                                                                                                            })?.title
+                                                                                                    }`,
+                                                                                                    `交易手續費: ${cash_flow.HandlingCharge}`,
+                                                                                                    `交易總金額: ${cash_flow.TradeAmt}`,
+                                                                                                    `交易時間: ${cash_flow.PaymentDate}`
+                                                                                                ] : [
+                                                                                                    `金流交易結果: 未付款`
+                                                                                                ]).join(`<div class="my-2"></div>`)
+                                                                                        }
+                                                                                        </div>
+                                                                                    </div>`
+                                                                            } else if (orderData.orderData.customer_info.payment_select === 'paynow') {
+                                                                                const cash_flow = orderData.orderData.cash_flow as PayNowCashFlow
+
+                                                                                return html`
+                                                                                    <div style="display: flex;flex-direction: column;align-items: flex-start;gap: 12px;align-self: stretch;">
+                                                                                        <div class="tx_700">金流對帳
+                                                                                        </div>
+                                                                                        <div> ${
+                                                                                                (cash_flow.status === 'success' ? [
+                                                                                                    html`
+                                                                                                        <div class="d-flex align-items-center">
+                                                                                                            金流交易結果: 已付款
+                                                                                                        </div>`,
+                                                                                                    html`金流交易方式: ${
+                                                                                                            [
+                                                                                                                {
+                                                                                                                    title: 'ATM',
+                                                                                                                    key: 'ATM'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: '信用卡',
+                                                                                                                    key: 'CreditCard'
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    title: '超商代碼',
+                                                                                                                    key: 'ConvenienceStore'
+                                                                                                                }
+                                                                                                            ].find((dd) => {
+                                                                                                                return cash_flow.payment.paymentMethod === dd.key
+                                                                                                            })?.title
+                                                                                                    }`,
+                                                                                                    `交易總金額: ${cash_flow.amount}`,
+                                                                                                    `交易時間: ${gvc.glitter.ut.dateFormat(new Date(cash_flow.payment.paidAt),'yyyy-MM-dd hh:mm:ss')}`
+                                                                                                ] : [
+                                                                                                    `金流交易結果: 未付款`
+                                                                                                ]).join(`<div class="my-2"></div>`)
+                                                                                        }
+                                                                                        </div>
+                                                                                    </div>
+                                                                                `
+                                                                            } else {
+                                                                                return ``
+                                                                            }
+                                                                        })()
                                                                     ].filter((dd) => {
                                                                         return dd
                                                                     }).join(BgWidget.mbContainer(18))
@@ -1830,31 +1901,31 @@ export class ShoppingOrderManager {
                                                                                     })}
 </div>
 
-                                                                         ${(()=>{
-                                                                             try {
+                                                                         ${(() => {
+                                                                                        try {
 
-                                                                                 if(ShipmentConfig.supportPrintList.includes(orderData.orderData.user_info.shipment) && ((orderData.orderData.user_info.shipment_number && orderData.orderData.user_info.shipment_refer === 'paynow'))){
-                                                                                     return  html`
-                                                                                                ${BgWidget.mbContainer(12)}
-                                                                                                <div class="tx_700 d-flex align-items-end"
-                                                                                                     style="gap:5px;">
-                                                                                                    物流追蹤
-                                                                                                </div>
-                                                                                                ${BgWidget.mbContainer(12)}
-                                                                                                ${
-                                                                                             [
-                                                                                                 `狀態: ${orderData.orderData.user_info.shipment_detail.Detail_Status_Description ?? '追蹤異常'}`,
-                                                                                                 `追蹤碼: ${orderData.orderData.user_info.shipment_detail.paymentno ?? '尚未生成'}`
-                                                                                             ].join(`<div class="w-100  my-1"></div>`)
-                                                                                     }
-                                                                                            `
-                                                                                 }else {
-                                                                                     return ``
-                                                                                 }
-                                                                             }catch (e) {
-                                                                                 console.log(e)
-                                                                                 return  `${e}`
-                                                                             }
+                                                                                            if (ShipmentConfig.supportPrintList.includes(orderData.orderData.user_info.shipment) && ((orderData.orderData.user_info.shipment_number && orderData.orderData.user_info.shipment_refer === 'paynow'))) {
+                                                                                                return html`
+                                                                                                    ${BgWidget.mbContainer(12)}
+                                                                                                    <div class="tx_700 d-flex align-items-end"
+                                                                                                         style="gap:5px;">
+                                                                                                        物流追蹤
+                                                                                                    </div>
+                                                                                                    ${BgWidget.mbContainer(12)}
+                                                                                                    ${
+                                                                                                            [
+                                                                                                                `狀態: ${orderData.orderData.user_info.shipment_detail.Detail_Status_Description ?? '追蹤異常'}`,
+                                                                                                                `追蹤碼: ${orderData.orderData.user_info.shipment_detail.paymentno ?? '尚未生成'}`
+                                                                                                            ].join(`<div class="w-100  my-1"></div>`)
+                                                                                                    }
+                                                                                                `
+                                                                                            } else {
+                                                                                                return ``
+                                                                                            }
+                                                                                        } catch (e) {
+                                                                                            console.log(e)
+                                                                                            return `${e}`
+                                                                                        }
                                                                                     })()}
                                                                         `,
                                                                                     html` ${['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C', 'normal', 'UNIMARTFREEZE', 'black_cat', 'black_cat_freezing'].includes(orderData.orderData.user_info.shipment)
@@ -4423,6 +4494,10 @@ export class ShoppingOrderManager {
             `
         }
         switch (orderData.customer_info.payment_select) {
+            case 'jkopay':
+                return '街口支付'
+            case 'paynow':
+                return `PayNow立吉富`
             case 'off_line':
                 return `線下付款`;
             case 'newWebPay':

package/lowcode/glitter-base/global/language.js

@@ -135,6 +135,7 @@ export class Language {
             { key: 'country', tw: '國家', cn: '国家', en: `Country` },
             { key: 'select_country', tw: '選擇國家', cn: '选择国家', en: `Select country` },
             { key: 'stock_count', tw: '商品庫存', cn: '商品库存', en: `Stock quantity` },
+            { key: 'can_buy', tw: '可售數量', cn: '可售数量', en: `Available quantity` },
             { key: 'login_in_to_checkout', tw: '登入後結帳', cn: '登入后结帐', en: `Log in and checkout` },
             { key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
             { key: 'buy_it_now', tw: '立即購買', cn: '立即购买', en: `Buy it now` },
@@ -839,6 +840,11 @@ export class Language {
             { key: 'search_article', tw: '搜尋文章', cn: '搜寻文章', en: 'Search articles' },
             { key: 'blog_list', tw: '網誌列表', cn: '网志列表', en: 'Blog list' },
             { key: 'all_article', tw: '所有文章', cn: '所有文章', en: 'All articles' },
+            { key: 'share', tw: '分享', cn: '分享', en: 'share' },
+            { key: 'copy_link_success', tw: '已成功複製連結', cn: '已成功复制连结', en: 'Link copied successfully' },
+            { key: 'chat', tw: '聊聊', cn: '聊聊', en: 'chat' },
+            { key: 'collect', tw: '收藏', cn: '收藏', en: 'collect' },
+            { key: 'h_collect', tw: '已收藏', cn: '已收藏', en: 'collected' },
         ];
     }
     static getLanguageCustomText(text) {

package/lowcode/glitter-base/global/language.ts

@@ -142,6 +142,7 @@ export class Language {
             { key: 'country', tw: '國家', cn: '国家', en: `Country` },
             { key: 'select_country', tw: '選擇國家', cn: '选择国家', en: `Select country` },
             { key: 'stock_count', tw: '商品庫存', cn: '商品库存', en: `Stock quantity` },
+            { key: 'can_buy', tw: '可售數量', cn: '可售数量', en: `Available quantity` },
             { key: 'login_in_to_checkout', tw: '登入後結帳', cn: '登入后结帐', en: `Log in and checkout` },
             { key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
             { key: 'buy_it_now', tw: '立即購買', cn: '立即购买', en: `Buy it now` },
@@ -847,6 +848,11 @@ export class Language {
             { key: 'search_article', tw: '搜尋文章', cn: '搜寻文章', en: 'Search articles' },
             { key: 'blog_list', tw: '網誌列表', cn: '网志列表', en: 'Blog list' },
             { key: 'all_article', tw: '所有文章', cn: '所有文章', en: 'All articles' },
+            { key: 'share', tw: '分享', cn: '分享', en: 'share' },
+            { key: 'copy_link_success', tw: '已成功複製連結', cn: '已成功复制连结', en: 'Link copied successfully' },
+            { key: 'chat', tw: '聊聊', cn: '聊聊', en: 'chat' },
+            { key: 'collect', tw: '收藏', cn: '收藏', en: 'collect' },
+            { key: 'h_collect', tw: '已收藏', cn: '已收藏', en: 'collected' },
         ];
     }
 

package/lowcode/glitterBundle/GVController.js

@@ -471,8 +471,8 @@ ${lifeCycle.onCreateView()}
             document.querySelector('html').scrollTop = 1;
         }
         else {
-            $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;
-background: ${cf.pageConfig.backGroundColor};display: none;z-index:99999;overflow: hidden;position: fixed;width:100vw;height: 100vh;" class="page-box">
+            $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: ${window.innerHeight}px;left: 0;top: 0;
+background: ${cf.pageConfig.backGroundColor};display: none;z-index:99999;overflow: hidden;position: fixed;width:100vw;height:  ${window.innerHeight}px;" class="page-box glitter-dialog">
 ${lifeCycle.onCreateView()}
 </div>`);
         }

package/lowcode/glitterBundle/GVController.ts

@@ -500,8 +500,8 @@ ${lifeCycle.onCreateView()}
             document.querySelector('html')!.scrollTop=1
         } else {
 
-            $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;
-background: ${cf.pageConfig!.backGroundColor};display: none;z-index:99999;overflow: hidden;position: fixed;width:100vw;height: 100vh;" class="page-box">
+            $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: ${window.innerHeight}px;left: 0;top: 0;
+background: ${cf.pageConfig!.backGroundColor};display: none;z-index:99999;overflow: hidden;position: fixed;width:100vw;height:  ${window.innerHeight}px;" class="page-box glitter-dialog">
 ${lifeCycle.onCreateView()}
 </div>`)
         }

package/lowcode/glitterBundle/dialog/dialog_inner.js

@@ -19,9 +19,12 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                 return {
                     bind: id,
                     view: () => {
-                        return html ` <div class="vw-100 vh-100 position-absolute" style="background: rgba(0,0,0,0.7); z-index: 0;"></div>
-                            <div class="vw-100 vh-100 d-flex align-items-center justify-content-center position-relative" style="z-index: 1;">${view}</div>`;
+                        return html ` <div class="vw-100 h-100 position-absolute" style="background: rgba(0,0,0,0.7); z-index: 0;"></div>
+                            <div class="vw-100 h-100 d-flex align-items-center justify-content-center position-relative" style="z-index: 1;">${view}</div>`;
                     },
+                    divCreate: {
+                        class: `h-100 w-100`
+                    }
                 };
             });
         },

package/lowcode/glitterBundle/dialog/dialog_inner.ts

@@ -19,9 +19,12 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                 return {
                     bind: id,
                     view: () => {
-                        return html` <div class="vw-100 vh-100 position-absolute" style="background: rgba(0,0,0,0.7); z-index: 0;"></div>
-                            <div class="vw-100 vh-100 d-flex align-items-center justify-content-center position-relative" style="z-index: 1;">${view}</div>`;
+                        return html` <div class="vw-100 h-100 position-absolute" style="background: rgba(0,0,0,0.7); z-index: 0;"></div>
+                            <div class="vw-100 h-100 d-flex align-items-center justify-content-center position-relative" style="z-index: 1;">${view}</div>`;
                     },
+                    divCreate:{
+                        class:`h-100 w-100`
+                    }
                 };
             });
         },

package/lowcode/glitterBundle/module/Animation.js

@@ -132,3 +132,62 @@ Animation.topToBottom = new AnimationConfig((pageConfig, finish) => {
         finish();
     }, 250);
 });
+Animation.popup = new AnimationConfig((pageConfig, finish) => {
+    Glitter.glitter.addStyle(`.popup{
+    animation:PopToUp 0.3s ; /*IE*/
+    -moz-animation:PopToUp 0.3s; /*FireFox*/
+    -webkit-animation:PopToUp 0.3s ; /*Chrome, Safari*/
+}
+
+@keyframes PopToUp{
+    from {bottom:-100%;}
+    to {bottom:0%;}
+}
+
+@-moz-keyframes PopToUp{
+    from {bottom:-100%;}
+    to {bottom:0%;}
+}
+
+@-webkit-keyframes PopToUp{
+    from {bottom:-100%;}
+    to {bottom:0%;}
+}`);
+    Glitter.glitter.addStyle(`.popupDismiss{
+    animation:PopToUpD 0.3s ; /*IE*/
+    -moz-animation:PopToUpD 0.3s; /*FireFox*/
+    -webkit-animation:PopToUpD 0.3s ; /*Chrome, Safari*/
+}
+
+@keyframes PopToUpD{
+    from {bottom:0%;}
+    to {bottom:-100%;}
+}
+
+@-moz-keyframes PopToUpD{
+    from {bottom:0%;}
+    to {bottom:-100%;}
+}
+
+@-webkit-keyframes PopToUpD{
+    from {bottom:0%;}
+    to {bottom:-100%;}
+}`);
+    pageConfig.getElement()[0].style.top = '';
+    pageConfig.getElement()[0].style.bottom = '0px';
+    pageConfig.getElement().addClass(`d-none`);
+    setTimeout(() => {
+        pageConfig.getElement().removeClass(`d-none`);
+        pageConfig.getElement().addClass(`popup`);
+    }, 100);
+    setTimeout(() => {
+        pageConfig.getElement().removeClass('popup');
+        finish();
+    }, 400);
+}, (pageConfig, finish) => {
+    pageConfig.getElement().addClass('position-fixed');
+    pageConfig.getElement().addClass(`popupDismiss`);
+    setTimeout(() => {
+        finish();
+    }, 250);
+});

package/lowcode/glitterBundle/module/Animation.ts

@@ -141,6 +141,68 @@ export class Animation {
         }, 250)
     })
 
+    public static popup = new AnimationConfig((pageConfig, finish) => {
+        Glitter.glitter.addStyle(`.popup{
+    animation:PopToUp 0.3s ; /*IE*/
+    -moz-animation:PopToUp 0.3s; /*FireFox*/
+    -webkit-animation:PopToUp 0.3s ; /*Chrome, Safari*/
+}
+
+@keyframes PopToUp{
+    from {bottom:-100%;}
+    to {bottom:0%;}
+}
+
+@-moz-keyframes PopToUp{
+    from {bottom:-100%;}
+    to {bottom:0%;}
+}
+
+@-webkit-keyframes PopToUp{
+    from {bottom:-100%;}
+    to {bottom:0%;}
+}`)
+        Glitter.glitter.addStyle(`.popupDismiss{
+    animation:PopToUpD 0.3s ; /*IE*/
+    -moz-animation:PopToUpD 0.3s; /*FireFox*/
+    -webkit-animation:PopToUpD 0.3s ; /*Chrome, Safari*/
+}
+
+@keyframes PopToUpD{
+    from {bottom:0%;}
+    to {bottom:-100%;}
+}
+
+@-moz-keyframes PopToUpD{
+    from {bottom:0%;}
+    to {bottom:-100%;}
+}
+
+@-webkit-keyframes PopToUpD{
+    from {bottom:0%;}
+    to {bottom:-100%;}
+}`)
+        // console.log(`pageConfig.getElement()=>`,pageConfig.getElement())
+        pageConfig.getElement()[0].style.top='';
+        pageConfig.getElement()[0].style.bottom='0px';
+        pageConfig.getElement().addClass(`d-none`)
+        setTimeout(()=>{
+            pageConfig.getElement().removeClass(`d-none`)
+            pageConfig.getElement().addClass(`popup`)
+        },100)
+
+        setTimeout(() => {
+            pageConfig.getElement().removeClass('popup')
+            finish()
+        }, 400)
+    }, (pageConfig: PageConfig, finish: () => void) => {
+        pageConfig.getElement().addClass('position-fixed')
+        pageConfig.getElement().addClass(`popupDismiss`)
+        setTimeout(() => {
+            finish()
+        }, 250)
+    })
+
 
 
 }

package/lowcode/glitterBundle/module/PageManager.js

@@ -124,7 +124,7 @@ export class PageManager {
                 callback: (gvFunction) => {
                     const original = new URL(glitter.root_path + Language.getLanguageLinkPrefix() + tag + location.hash + window.location.search);
                     function switchFunction() {
-                        var _a, _b, _c;
+                        var _a, _b;
                         glitter.page = tag;
                         try {
                             window.history.replaceState({}, document.title, original.href);
@@ -145,8 +145,8 @@ export class PageManager {
                             },
                             backGroundColor: (_a = option.backGroundColor) !== null && _a !== void 0 ? _a : 'transparent',
                             type: GVCType.Page,
-                            animation: (_b = option.animation) !== null && _b !== void 0 ? _b : glitter.animation.none,
-                            dismiss: (_c = option.dismiss) !== null && _c !== void 0 ? _c : (() => {
+                            animation: option.animation || glitter.defaultSetting.pageAnimation || glitter.animation.none,
+                            dismiss: (_b = option.dismiss) !== null && _b !== void 0 ? _b : (() => {
                             }),
                             renderFinish: () => {
                                 glitter.pageConfig = glitter.pageConfig.filter((dd) => {

package/lowcode/glitterBundle/module/PageManager.ts

@@ -204,7 +204,7 @@ export class PageManager {
                             },
                             backGroundColor: option.backGroundColor ?? 'transparent',
                             type: GVCType.Page,
-                            animation: option.animation ?? glitter.animation.none,
+                            animation: option.animation || glitter.defaultSetting.pageAnimation || glitter.animation.none,
                             dismiss: option.dismiss ?? (() => {
                             }),
                             renderFinish: () => {

package/lowcode/index.html

@@ -246,6 +246,7 @@
             left: 0%;
         }
     }
+
 </style>
 <script>
     function preload(data) {