ts-glitter 20.2.0 → 20.2.3

package/lowcode/Entry.js

@@ -22,7 +22,6 @@ import { ApplicationConfig } from './application-config.js';
 export class Entry {
     static onCreate(glitter) {
         const originalReplaceState = history.replaceState;
-        let count = 0;
         let last_replace = '';
         window.history.replaceState = function (data, unused, url) {
             if (last_replace !== url) {
@@ -144,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.0';
+            glitter.share.editerVersion = 'V_20.2.3';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -16,7 +16,6 @@ export class Entry {
   // 建立初始函式
   public static onCreate(glitter: Glitter) {
     const originalReplaceState = history.replaceState
-    let count=0
     let last_replace=''
     window.history.replaceState = function(data: any, unused: string, url?: string | URL | null) {
       if(last_replace!==url){
@@ -146,7 +145,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.0';
+      glitter.share.editerVersion = 'V_20.2.3';
 
       glitter.share.start = new Date();
       const vm = { appConfig: [] };

package/lowcode/glitterBundle/Glitter.js

@@ -52,6 +52,7 @@ export class Glitter {
         this.elementCallback = {};
         this.html = String.raw;
         this.promiseValueMap = {};
+        this.waiting_push_state = () => { };
         this.hidePageView = PageManager.hidePageView;
         this.showPageView = PageManager.showPageView;
         this.setHome = PageManager.setHome;
@@ -565,6 +566,9 @@ export class Glitter {
             if (this.getUrlParameter('appName')) {
                 link.searchParams.set('appName', this.getUrlParameter('appName'));
             }
+            this.waiting_push_state = () => {
+                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

@@ -66,7 +66,7 @@ export class Glitter {
     } = {}
     public html = String.raw
     public promiseValueMap: any = {}
-
+    public waiting_push_state?:(()=>void) = ()=>{}
     get href() {
         return location.href
     }
@@ -82,7 +82,9 @@ export class Glitter {
             if(this.getUrlParameter('appName')){
                 link.searchParams.set('appName',this.getUrlParameter('appName'))
             }
-            // window.history.pushState({}, document.title, link.href);
+            this.waiting_push_state=()=>{
+                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,13 +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,16 +316,19 @@ 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/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.0",
+  "version": "20.2.3",
   "description": "",
   "main": "index.js",
   "scripts": {