ts-glitter 20.2.2 → 20.2.4

package/lowcode/Entry.js

@@ -143,7 +143,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.2.2';
+            glitter.share.editerVersion = 'V_20.2.4';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -25,7 +25,6 @@ export class Entry {
         return originalReplaceState.apply(history, arguments);
       }
     };
-
     function next(){
       //判斷結帳成功清空購物車紀錄
       if (glitter.getUrlParameter('EndCheckout') === '1') {
@@ -145,7 +144,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.2.2';
+      glitter.share.editerVersion = 'V_20.2.4';
 
       glitter.share.start = new Date();
       const vm = { appConfig: [] };

package/lowcode/glitterBundle/Glitter.js

@@ -567,7 +567,7 @@ export class Glitter {
                 link.searchParams.set('appName', this.getUrlParameter('appName'));
             }
             this.waiting_push_state = () => {
-                window.history.replaceState({}, document.title, link.href);
+                window.history.pushState({}, document.title, link.href);
             };
             this.getModule(new URL('../official_event/page/change-page.js', import.meta.url).href, (cl) => {
                 cl.changePage(link.searchParams.get('page') || link.pathname.substring(1), 'page', {});

package/lowcode/glitterBundle/Glitter.ts

@@ -83,7 +83,7 @@ export class Glitter {
                 link.searchParams.set('appName',this.getUrlParameter('appName'))
             }
             this.waiting_push_state=()=>{
-                window.history.replaceState({}, document.title, link.href);
+                window.history.pushState({}, document.title, link.href);
             }
             this.getModule(new URL('../official_event/page/change-page.js', import.meta.url).href, (cl) => {
                 cl.changePage(link.searchParams.get('page') || link.pathname.substring(1), 'page', {})

package/lowcode/glitterBundle/module/PageManager.js

@@ -236,17 +236,18 @@ export class PageManager {
     }
     static setHistory(tag, type) {
         const glitter = Glitter.glitter;
-        const search = glitter.root_path + Language.getLanguageLinkPrefix() + tag + glitter.window.location.search;
         try {
             if (['home', 'page'].find((dd) => {
                 return dd === type;
             })) {
-                window.history.pushState({}, glitter.document.title, search);
-                glitter.pageConfig[glitter.pageConfig.length - 1].search = search;
                 if (glitter.waiting_push_state) {
                     glitter.waiting_push_state();
                     glitter.waiting_push_state = undefined;
                 }
+                else {
+                    window.history.pushState({}, glitter.document.title, (glitter.root_path + Language.getLanguageLinkPrefix() + tag + glitter.window.location.search));
+                }
+                glitter.pageConfig[glitter.pageConfig.length - 1].search = glitter.root_path + Language.getLanguageLinkPrefix() + tag + glitter.window.location.search;
             }
         }
         catch (e) {

package/lowcode/glitterBundle/module/PageManager.ts

@@ -316,17 +316,17 @@ export class PageManager {
 
     public static setHistory(tag: string, type: string) {
         const glitter = Glitter.glitter;
-        const search = glitter.root_path + Language.getLanguageLinkPrefix()+tag + glitter.window.location.search;
         try {
             if (['home', 'page'].find((dd) => {
                 return dd === type
             })) {
-                window.history.pushState({}, glitter.document.title, search);
-                glitter.pageConfig[glitter.pageConfig.length - 1].search = search;
                 if(glitter.waiting_push_state){
                     glitter.waiting_push_state()
                     glitter.waiting_push_state=undefined
+                }else {
+                    window.history.pushState({}, glitter.document.title, (glitter.root_path + Language.getLanguageLinkPrefix()+tag + glitter.window.location.search));
                 }
+                glitter.pageConfig[glitter.pageConfig.length - 1].search = glitter.root_path + Language.getLanguageLinkPrefix()+tag + glitter.window.location.search;
             }
 
         } catch (e) {

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

@@ -2402,8 +2402,7 @@ HtmlGenerate.changePage = (obj) => {
     var _a, _b;
     const glitter = Glitter.glitter;
     if (obj.tag === 'backend_manager') {
-        glitter.setUrlParameter('page', 'backend_manager');
-        location.reload();
+        location.href = glitter.root_path + 'backend_manager';
         return;
     }
     console.log(`changePage-time:`, window.renderClock.stop());

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

@@ -592,8 +592,8 @@ export class HtmlGenerate {
         const glitter = Glitter.glitter;
         //複寫back_manager的頁面，避免堆棧問題
         if(obj.tag==='backend_manager'){
-            glitter.setUrlParameter('page','backend_manager')
-            location.reload()
+
+            location.href=glitter.root_path+'backend_manager'
             return
         }
 

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

@@ -2972,7 +2972,7 @@ export class CheckoutIndex {
                                                                 const urlObject = new URL(originalUrl);
                                                                 urlObject.searchParams.set('EndCheckout', '1');
                                                                 const newUrl = urlObject.toString();
-                                                                if (ApplicationConfig.device_type === 'ios') {
+                                                                if ((ApplicationConfig.device_type === 'ios') && ['jkopay', 'line_pay'].includes(vm.cartData.customer_info.payment_select)) {
                                                                     return `${ApplicationConfig.bundle_id}://?path=${encodeURIComponent(newUrl)}`;
                                                                 }
                                                                 else {

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

@@ -92,7 +92,6 @@ export class CheckoutIndex {
         width: obj?.circle?.width ?? 20,
         borderSize: obj?.circle?.borderSize ?? 16,
       };
-
       const textAttr = {
         value: obj?.text?.value ?? Language.text('loading'),
         visible: obj?.text?.visible === false ? false : true,
@@ -3220,7 +3219,7 @@ export class CheckoutIndex {
                                                       const urlObject = new URL(originalUrl);
                                                       urlObject.searchParams.set('EndCheckout', '1');
                                                       const newUrl = urlObject.toString();
-                                                      if (ApplicationConfig.device_type === 'ios') {
+                                                      if ((ApplicationConfig.device_type === 'ios') && ['jkopay','line_pay'].includes(vm.cartData.customer_info.payment_select)) {
                                                         return `${ApplicationConfig.bundle_id}://?path=${encodeURIComponent(newUrl)}`;
                                                       } else {
                                                         return newUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "20.2.2",
+  "version": "20.2.4",
   "description": "",
   "main": "index.js",
   "scripts": {