ts-glitter 14.5.7 → 14.5.9

package/lowcode/Entry.js

@@ -14,7 +14,7 @@ import { BaseApi } from './glitterBundle/api/base.js';
 import { GlobalUser } from './glitter-base/global/global-user.js';
 import { EditorConfig } from './editor-config.js';
 import { ShareDialog } from './glitterBundle/dialog/ShareDialog.js';
-import { Language } from "./glitter-base/global/language.js";
+import { Language } from './glitter-base/global/language.js';
 export class Entry {
     static onCreate(glitter) {
         var _a;
@@ -61,26 +61,26 @@ export class Entry {
         }
         glitter.share.logID = glitter.getUUID();
         glitter.addStyle(`
-        @media (prefers-reduced-motion: no-preference) {
+            @media (prefers-reduced-motion: no-preference) {
                 :root {
                     scroll-behavior: auto !important;
                 }
             }
-            
-        .hide-elem {
-            display: none !important;
-        }
-        
-        .hy-drawer-left {
-           left:-1000px !important;
-        }
+
+            .hide-elem {
+                display: none !important;
+            }
+
+            .hy-drawer-left {
+                left: -1000px !important;
+            }
         `);
         if (glitter.getUrlParameter('appName')) {
             window.appName = glitter.getUrlParameter('appName');
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_14.5.7';
+        glitter.share.editerVersion = 'V_14.5.9';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],
@@ -470,8 +470,8 @@ export class Entry {
                     });
                     callback();
                 }
-                const login_config = (window.login_config);
-                if (login_config.password_to_see && (localStorage.getItem('password_to_see') !== login_config.shop_pwd)) {
+                const login_config = window.login_config;
+                if (login_config.password_to_see && localStorage.getItem('password_to_see') !== login_config.shop_pwd) {
                     const pwd = window.prompt('請輸入網站密碼', '');
                     localStorage.setItem('password_to_see', pwd !== null && pwd !== void 0 ? pwd : '');
                     if (login_config.shop_pwd === pwd) {
@@ -480,9 +480,12 @@ export class Entry {
                     else {
                         glitter.closeDiaLog();
                         const dialog = new ShareDialog(glitter);
-                        dialog.checkYesOrNot({ text: '網站密碼輸入錯誤', callback: () => {
+                        dialog.checkYesOrNot({
+                            text: '網站密碼輸入錯誤',
+                            callback: () => {
                                 authPass();
-                            } });
+                            },
+                        });
                     }
                 }
                 else {
@@ -602,7 +605,7 @@ export class Entry {
             function loopVersion() {
                 ApiPageConfig.getGlitterVersion().then((res) => {
                     console.log('glitterVersion:', res.response.result);
-                    if (res.result && (!glitter.share.editerVersion.includes(res.response.result))) {
+                    if (res.result && !glitter.share.editerVersion.includes(res.response.result)) {
                         const dialog = new ShareDialog(glitter);
                         dialog.checkYesOrNot({
                             text: '新版本已發佈，是否進行更新?',

package/lowcode/Entry.ts

@@ -6,19 +6,18 @@ import { BaseApi } from './glitterBundle/api/base.js';
 import { GlobalUser } from './glitter-base/global/global-user.js';
 import { EditorConfig } from './editor-config.js';
 import { ShareDialog } from './glitterBundle/dialog/ShareDialog.js';
-import {EditorElem} from "./glitterBundle/plugins/editor-elem.js";
-import {Language} from "./glitter-base/global/language.js";
+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}`)
-            if(glitter.getUrlParameter('appName')){
-                url.searchParams.set('appName',glitter.getUrlParameter('appName'))
+        Language.getLanguage();
+        if ((window as any).language !== Language.getLanguage()) {
+            const url = new URL(`${glitter.root_path}${Language.getLanguageLinkPrefix()}${(window as any).glitter_page}`);
+            if (glitter.getUrlParameter('appName')) {
+                url.searchParams.set('appName', glitter.getUrlParameter('appName'));
             }
-            location.href=url.href;
-            return
+            location.href = url.href;
+            return;
         }
         glitter.share.reload = (page: string, app_name: string) => {
             (window as any).appName = app_name || (window as any).appName;
@@ -63,26 +62,27 @@ Language.getLanguage()
 
         glitter.share.logID = glitter.getUUID();
         glitter.addStyle(`
-        @media (prefers-reduced-motion: no-preference) {
+            @media (prefers-reduced-motion: no-preference) {
                 :root {
                     scroll-behavior: auto !important;
                 }
             }
-            
-        .hide-elem {
-            display: none !important;
-        }
-        
-        .hy-drawer-left {
-           left:-1000px !important;
-        }
+
+            .hide-elem {
+                display: none !important;
+            }
+
+            .hy-drawer-left {
+                left: -1000px !important;
+            }
         `);
         if (glitter.getUrlParameter('appName')) {
             (window as any).appName = glitter.getUrlParameter('appName');
         }
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_14.5.7';
+        glitter.share.editerVersion = 'V_14.5.9';
+
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;
@@ -511,7 +511,7 @@ Language.getLanguage()
             );
 
             function authPass() {
-                function next(){
+                function next() {
                     glitter.htmlGenerate.setHome({
                         app_config: vm.appConfig,
                         page_config: data.response.result[0].page_config,
@@ -521,23 +521,25 @@ Language.getLanguage()
                     });
                     callback();
                 }
-                const login_config=((window as any).login_config)
-                if(login_config.password_to_see && (localStorage.getItem('password_to_see') !== login_config.shop_pwd)){
+                const login_config = (window as any).login_config;
+                if (login_config.password_to_see && localStorage.getItem('password_to_see') !== login_config.shop_pwd) {
                     const pwd = window.prompt('請輸入網站密碼', '');
-                    localStorage.setItem('password_to_see',pwd ?? '');
-                    if(login_config.shop_pwd===pwd){
-                        next()
-                    }else{
-                        glitter.closeDiaLog()
-                        const dialog=new ShareDialog(glitter)
-                        dialog.checkYesOrNot({text:'網站密碼輸入錯誤',callback:()=>{
-                                authPass()
-                            }})
+                    localStorage.setItem('password_to_see', pwd ?? '');
+                    if (login_config.shop_pwd === pwd) {
+                        next();
+                    } else {
+                        glitter.closeDiaLog();
+                        const dialog = new ShareDialog(glitter);
+                        dialog.checkYesOrNot({
+                            text: '網站密碼輸入錯誤',
+                            callback: () => {
+                                authPass();
+                            },
+                        });
                     }
-                }else{
-                    next()
+                } else {
+                    next();
                 }
-
             }
 
             function authError(message: string) {
@@ -673,7 +675,7 @@ Language.getLanguage()
             function loopVersion() {
                 ApiPageConfig.getGlitterVersion().then((res) => {
                     console.log('glitterVersion:', res.response.result);
-                    if (res.result && (!glitter.share.editerVersion.includes(res.response.result))) {
+                    if (res.result && !glitter.share.editerVersion.includes(res.response.result)) {
                         const dialog = new ShareDialog(glitter);
                         dialog.checkYesOrNot({
                             text: '新版本已發佈，是否進行更新?',

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

@@ -1508,7 +1508,7 @@ export class BgGuide {
                             }, 500);
                             return ``;
                         }
-                        return this.drawSecondRowBG(BG, vm, `.guide6-2`, viewID, '商店訊息', 5);
+                        return this.drawSecondRowBG(BG, vm, `.guide6-2`, viewID, '商店訊息', 4);
                     }
                     case 3: {
                         let target = this.findIframeDom(`.guide6-3`);
@@ -1521,7 +1521,7 @@ export class BgGuide {
                                 }
                             }, 400);
                         }
-                        return this.drawBGwithBelowWindow(BG, vm, '.guide6-3', viewID, 3, 5, {
+                        return this.drawBGwithBelowWindow(BG, vm, '.guide6-3', viewID, 3, 4, {
                             width: 332,
                             height: 209,
                             title: '商店基本資訊',
@@ -1530,6 +1530,20 @@ export class BgGuide {
                         });
                     }
                     case 4: {
+                        let target = this.findIframeDom(`.guide6-5`);
+                        target.parentElement.scrollIntoView({});
+                        return this.drawBGwithBelowWindow(BG, vm, '.guide6-5', viewID, 4, 4, {
+                            width: 332,
+                            height: 209,
+                            title: '網域設定',
+                            content: '您可以選擇使用免費的子網域，或是額外付費申請獨立網域',
+                            btnText: '完成',
+                        }, () => {
+                            this.leaveGuide(vm, 0);
+                            this.finGuide('shop_information');
+                        });
+                    }
+                    case -4: {
                         let target = this.findIframeDom(`.guide6-4`);
                         if (!target) {
                             const timer = setInterval(() => {
@@ -1547,22 +1561,8 @@ export class BgGuide {
                             content: '完善SEO系統，提升網站的曝光度。',
                         });
                     }
-                    case 5: {
-                        let target = this.findIframeDom(`.guide6-5`);
-                        target.parentElement.scrollIntoView({});
-                        return this.drawBGwithBelowWindow(BG, vm, '.guide6-5', viewID, 5, 5, {
-                            width: 332,
-                            height: 209,
-                            title: '網域設定',
-                            content: '您可以選擇使用免費的子網域，或是額外付費申請獨立網域',
-                            btnText: '完成',
-                        }, () => {
-                            this.leaveGuide(vm, 0);
-                            this.finGuide('shop_information');
-                        });
-                    }
                     default: {
-                        return this.drawMainRowBG(BG, vm, `.mainRow1`, viewID, 5);
+                        return this.drawMainRowBG(BG, vm, `.mainRow1`, viewID, 4);
                     }
                 }
             },

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

@@ -1726,7 +1726,7 @@ export class BgGuide {
                             }, 500);
                             return ``
                         }
-                        return this.drawSecondRowBG(BG, vm, `.guide6-2`, viewID, '商店訊息', 5);
+                        return this.drawSecondRowBG(BG, vm, `.guide6-2`, viewID, '商店訊息', 4);
                     }
                     case 3: {
                         let target = this.findIframeDom(`.guide6-3`);
@@ -1746,7 +1746,7 @@ export class BgGuide {
                             '.guide6-3',
                             viewID,
                             3,
-                            5,
+                            4,
                             {
                                 width: 332,
                                 height: 209,
@@ -1758,24 +1758,6 @@ export class BgGuide {
                         );
                     }
                     case 4: {
-                        let target = this.findIframeDom(`.guide6-4`);
-                        if (!target) {
-                            const timer = setInterval(() => {
-                                if (this.findIframeDom(`.guide6-4`)) {
-                                    clearInterval(timer);
-                                    gvc.notifyDataChange(viewID);
-                                }
-                            }, 400);
-                        }
-                        target.parentElement.parentElement.scrollIntoView();
-                        return this.drawBGwithBelowWindow(BG, vm, '.guide6-4', viewID, 4, 5, {
-                            width: 332,
-                            height: 209,
-                            title: 'SEO設定',
-                            content: '完善SEO系統，提升網站的曝光度。',
-                        });
-                    }
-                    case 5: {
                         let target = this.findIframeDom(`.guide6-5`);
                         target.parentElement.scrollIntoView({});
 
@@ -1784,8 +1766,8 @@ export class BgGuide {
                             vm,
                             '.guide6-5',
                             viewID,
-                            5,
-                            5,
+                            4,
+                            4,
                             {
                                 width: 332,
                                 height: 209,
@@ -1800,8 +1782,26 @@ export class BgGuide {
                             }
                         );
                     }
+                    case -4: {
+                        let target = this.findIframeDom(`.guide6-4`);
+                        if (!target) {
+                            const timer = setInterval(() => {
+                                if (this.findIframeDom(`.guide6-4`)) {
+                                    clearInterval(timer);
+                                    gvc.notifyDataChange(viewID);
+                                }
+                            }, 400);
+                        }
+                        target.parentElement.parentElement.scrollIntoView();
+                        return this.drawBGwithBelowWindow(BG, vm, '.guide6-4', viewID, 4, 5, {
+                            width: 332,
+                            height: 209,
+                            title: 'SEO設定',
+                            content: '完善SEO系統，提升網站的曝光度。',
+                        });
+                    }
                     default: {
-                        return this.drawMainRowBG(BG, vm, `.mainRow1`, viewID, 5);
+                        return this.drawMainRowBG(BG, vm, `.mainRow1`, viewID, 4);
                     }
                 }
             },

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

@@ -1786,9 +1786,9 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
     static card(htmlString, classStyle = 'p-3 bg-white rounded-3 shadow border w-100') {
         return this.mainCard(htmlString);
     }
-    static mainCard(htmlString) {
+    static mainCard(htmlString, customerClass) {
         return html `
-            <div class="main-card">${htmlString}</div>`;
+            <div class="main-card ${customerClass !== null && customerClass !== void 0 ? customerClass : ''}">${htmlString}</div>`;
     }
     static summaryCard(htmlString) {
         return html `

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

@@ -2162,9 +2162,9 @@ ${obj.default ?? ''}</textarea
         return this.mainCard(htmlString);
     }
 
-    static mainCard(htmlString: string) {
+    static mainCard(htmlString: string , customerClass?:string) {
         return html`
-            <div class="main-card">${htmlString}</div>`;
+            <div class="main-card ${customerClass??''}">${htmlString}</div>`;
     }
 
     static summaryCard(htmlString: string) {

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

@@ -204,7 +204,7 @@ export class ShoppingInformation {
                             });
                         };
                         return BgWidget.mainCard(html `
-                                <div class="d-flex flex-column" style="gap:18px;">
+                                <div class="d-flex flex-column " style="gap:18px;">
                                     <div style="font-size: 16px;font-weight: 700;">商店基本資訊</div>
                                     <div class="d-flex w-100" style="gap:24px;">
                                         ${BgWidget.editeInput({
@@ -229,7 +229,6 @@ export class ShoppingInformation {
                             style: 'width:100%;margin: 8px 0;',
                         })}
                                         </div>
-
                                     </div>
                                     <div class="d-flex w-100" style="gap:24px;">
                                         ${BgWidget.editeInput({
@@ -420,7 +419,7 @@ export class ShoppingInformation {
                         })}
                                     </div>
                                 </div>
-                            `);
+                            `, `guide6-3`);
                     }, divCreate: {}
                 })}
                     <div style="margin-top: 24px;"></div>
@@ -592,7 +591,7 @@ ${BgWidget.title('GoDaddy DNS 設定指南')}
                             }), '申請')}
                                         </div>
                                     </div>
-                                `);
+                                `, 'guide6-5');
                         }
                     };
                 })}

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

@@ -211,7 +211,7 @@ export class ShoppingInformation {
                                 })
                             }
                             return BgWidget.mainCard(html`
-                                <div class="d-flex flex-column" style="gap:18px;">
+                                <div class="d-flex flex-column " style="gap:18px;">
                                     <div style="font-size: 16px;font-weight: 700;">商店基本資訊</div>
                                     <div class="d-flex w-100" style="gap:24px;">
                                         ${BgWidget.editeInput({
@@ -236,7 +236,6 @@ export class ShoppingInformation {
                                                 style: 'width:100%;margin: 8px 0;',
                                             })}
                                         </div>
-
                                     </div>
                                     <div class="d-flex w-100" style="gap:24px;">
                                         ${BgWidget.editeInput({
@@ -435,7 +434,7 @@ export class ShoppingInformation {
                                         })}
                                     </div>
                                 </div>
-                            `)
+                            `,`guide6-3`)
                         }, divCreate: {}
                     })}
                     <div style="margin-top: 24px;"></div>
@@ -606,7 +605,7 @@ ${BgWidget.title('GoDaddy DNS 設定指南')}
                                             }), '申請')}
                                         </div>
                                     </div>
-                                `)
+                                `,'guide6-5')
 
                             }
                         }

package/lowcode/index.html

@@ -13,6 +13,7 @@
 
 <style id="style_base" style="">
     .selectComponentHover {
+
         border: 4px solid dodgerblue !important;
         border-radius: 5px !important;
         box-sizing: border-box !important;

package/lowcode/landing-page/about-us.ts

@@ -5,6 +5,7 @@ const html = String.raw
 export class AboutUs {
     public static main(gvc: GVC) {
         const css = String.raw
+
         gvc.addStyle(css`
             .f_40 {
                 color: #393939;

package/lowcode/modules/image-library.js

@@ -1003,7 +1003,6 @@ export class imageLibrary {
                 return html `
                     <div class="w-100 d-flex flex-column">
                         <div style="font-size: 13px;">您只能選擇圖片當作子類媒體</div>
-
                         <div class="d-flex flex-wrap w-100" style="gap: 0.5rem;margin-top:1rem;">
                             ${gvc.bindView({
                     bind: "imageArray",

package/lowcode/modules/image-library.ts

@@ -1159,7 +1159,6 @@ export class imageLibrary {
                 return html`
                     <div class="w-100 d-flex flex-column">
                         <div style="font-size: 13px;">您只能選擇圖片當作子類媒體</div>
-
                         <div class="d-flex flex-wrap w-100" style="gap: 0.5rem;margin-top:1rem;">
                             ${gvc.bindView({
                                 bind: "imageArray",

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

@@ -2319,16 +2319,15 @@ export class CheckoutIndex {
                                 give_away: ApiCart.cart.give_away,
                             }).then((res) => {
                                 dialog.dataLoading({ visible: false });
-                                console.log('res -- ', res);
                                 if (res.response.off_line || res.response.is_free) {
                                     ApiCart.clearCart();
                                     location.href = res.response.return_url;
                                 }
                                 else {
                                     ApiCart.clearCart();
-                                    if (res.response.form.returnCode == "0000") {
-                                        console.log("res.response.form.info.paymentUrl.web -- ", res.response.form.info.paymentUrl.web);
-                                        location.href = res.response.form.info.paymentUrl.web;
+                                    if (res.response.returnCode == "0000" && vm.cartData.customer_info.payment_select == "line_pay") {
+                                        console.log("res.response.form.info.paymentUrl.web -- ", res.response.info.paymentUrl.web);
+                                        location.href = res.response.info.paymentUrl.web;
                                     }
                                     else if (res.response.approveLink) {
                                         location.href = res.response.approveLink;

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

@@ -2423,7 +2423,9 @@ export class CheckoutIndex {
                                                             }
                                                         });
                                                         const dialog = new ShareDialog(gvc.glitter);
+                                                        
                                                         dialog.dataLoading({visible: true});
+                                                        
                                                         ApiShop.toCheckout({
                                                             line_items: vm.cartData.lineItems.map((dd: any) => {
                                                                 return {
@@ -2449,18 +2451,16 @@ export class CheckoutIndex {
                                                             give_away: ApiCart.cart.give_away,
                                                         }).then((res) => {
                                                             dialog.dataLoading({visible: false});
-                                                            console.log('res -- ', res);
-
                                                             if (res.response.off_line || res.response.is_free) {
                                                                 ApiCart.clearCart();
                                                                 location.href = res.response.return_url;
                                                             } else {
-                                                              
+                                                                
                                                                 ApiCart.clearCart();
                                                                 // todo if 他是paypal的key值 上面應該有select之類的
-                                                                if (res.response.form.returnCode == "0000"){
-                                                                    console.log("res.response.form.info.paymentUrl.web -- " , res.response.form.info.paymentUrl.web)
-                                                                    location.href = res.response.form.info.paymentUrl.web;
+                                                                if (res.response.returnCode == "0000" && vm.cartData.customer_info.payment_select == "line_pay"){
+                                                                    console.log("res.response.form.info.paymentUrl.web -- " , res.response.info.paymentUrl.web)
+                                                                    location.href = res.response.info.paymentUrl.web;
                                                                     // todo 手機跳轉用這個
                                                                     //     location.href = res.response.form.info.paymentUrl.app;
                                                                 }else if (res.response.approveLink) {
@@ -2477,7 +2477,6 @@ export class CheckoutIndex {
                                                                 //     if (res.response.form.approveLink || 付款方式是PayPal){
                                                                 //         location.href = res.response.form.approveLink;
                                                                 //     }else{
-                                                               
                                                             }
                                                         });
                                                     })}"

package/lowcode/public-components/footer/footer-01.js

@@ -1,12 +1,12 @@
-import { FtClass } from './ft-class.js';
+import { Color } from '../public/color.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { LanguageView } from '../public/language-view.js';
-import { Language } from "../../glitter-base/global/language.js";
+import { Language } from '../../glitter-base/global/language.js';
 const html = String.raw;
 export class Footer01 {
     static main(gvc, widget, subData) {
         const formData = widget.formData;
-        const colors = FtClass.getColor(gvc, formData);
+        const colors = Color.getTheme(gvc, formData);
         const footer = {
             list: [],
         };

package/lowcode/public-components/footer/footer-01.ts

@@ -1,8 +1,8 @@
 import { GVC } from '../../glitterBundle/GVController.js';
-import { FtClass } from './ft-class.js';
+import { Color } from '../public/color.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { LanguageView } from '../public/language-view.js';
-import {Language} from "../../glitter-base/global/language.js";
+import { Language } from '../../glitter-base/global/language.js';
 
 const html = String.raw;
 
@@ -20,7 +20,7 @@ type FooterItem = {
 export class Footer01 {
     static main(gvc: GVC, widget: any, subData: any) {
         const formData = widget.formData;
-        const colors = FtClass.getColor(gvc, formData);
+        const colors = Color.getTheme(gvc, formData);
         const footer = {
             list: [],
         };

package/lowcode/public-components/footer/footer-02.js

@@ -1,12 +1,13 @@
-import { FtClass } from './ft-class.js';
+import { Color } from '../public/color.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
-import { Language } from "../../glitter-base/global/language.js";
+import { Language } from '../../glitter-base/global/language.js';
+import { LanguageView } from '../public/language-view.js';
 const html = String.raw;
 export class Footer02 {
     static main(gvc, widget, subData) {
         var _a;
         const formData = widget.formData;
-        const colors = FtClass.getColor(gvc, formData);
+        const colors = Color.getTheme(gvc, formData);
         const footer = {
             list: [],
         };
@@ -155,7 +156,13 @@ export class Footer02 {
             }
         })()}
                         </div>
+                        ${window.store_info.language_setting.support.length > 1 && document.body.clientWidth < 800
+            ? html `<div class="col-12 d-flex justify-content-center mb-3">${LanguageView.selectLanguage(gvc, colors)}</div>`
+            : ``}
                         <div class="col-12 col-md-3 col-lg-6 f-title-container d-flex flex-column ms-auto">
+                            ${window.store_info.language_setting.support.length > 1 && document.body.clientWidth >= 800
+            ? html `<div class="d-flex justify-content-end mb-3">${LanguageView.selectLanguage(gvc, colors)}</div>`
+            : ``}
                             <div class="d-flex gap-2 p-0 pb-3 justify-content-${document.body.clientWidth > 768 ? 'end' : 'center'}">
                                 ${(() => {
             try {