ts-glitter 16.1.4 → 16.1.6

package/lowcode/Entry.js

@@ -79,7 +79,7 @@ export class Entry {
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_16.1.4';
+        glitter.share.editerVersion = 'V_16.1.6';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],
@@ -265,10 +265,6 @@ export class Entry {
     }
     static toBackendEditor(glitter, callback) {
         const css = String.raw;
-        if (localStorage.getItem('on-pos') === 'true' && glitter.getUrlParameter('page') !== 'pos') {
-            localStorage.removeItem('on-pos');
-            location.href = glitter.root_path + 'pos?app-id=' + window.appName;
-        }
         glitter.addStyle(css `
             @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100..900&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');
             @media (prefers-reduced-motion: no-preference) {
@@ -331,11 +327,17 @@ export class Entry {
                             min-height: ${window.innerHeight}px !important;
                         }
                     `);
-                    glitter.setHome('jspage/main.js', glitter.getUrlParameter('page'), {
-                        appName: config.appName,
-                    }, {
-                        backGroundColor: `transparent;`,
-                    });
+                    if (localStorage.getItem('on-pos') === 'true' && glitter.getUrlParameter('page') !== 'pos' && (glitter.getUrlParameter('type') === 'editor')) {
+                        localStorage.removeItem('on-pos');
+                        location.href = glitter.root_path + 'pos?app-id=' + window.appName;
+                    }
+                    else {
+                        glitter.setHome('jspage/main.js', glitter.getUrlParameter('page'), {
+                            appName: config.appName,
+                        }, {
+                            backGroundColor: `transparent;`,
+                        });
+                    }
                 }
             }));
         }

package/lowcode/Entry.ts

@@ -78,7 +78,7 @@ export class Entry {
         }
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_16.1.4';
+        glitter.share.editerVersion = 'V_16.1.6';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;
@@ -273,10 +273,7 @@ export class Entry {
     // 跳轉至頁面編輯器
     public static toBackendEditor(glitter: Glitter, callback: () => void) {
         const css = String.raw
-        if (localStorage.getItem('on-pos') === 'true' && glitter.getUrlParameter('page') !== 'pos') {
-            localStorage.removeItem('on-pos');
-            location.href = glitter.root_path + 'pos?app-id='+(window as any).appName;
-        }
+
         glitter.addStyle(css`
             @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100..900&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');
             @media (prefers-reduced-motion: no-preference) {
@@ -346,16 +343,22 @@ export class Entry {
                             min-height: ${window.innerHeight}px !important;
                         }
                     `)
-                    glitter.setHome(
-                        'jspage/main.js',
-                        glitter.getUrlParameter('page'),
-                        {
-                            appName: config.appName,
-                        },
-                        {
-                            backGroundColor: `transparent;`,
-                        }
-                    );
+
+                    if (localStorage.getItem('on-pos') === 'true' && glitter.getUrlParameter('page') !== 'pos' && (glitter.getUrlParameter('type')==='editor')) {
+                        localStorage.removeItem('on-pos');
+                        location.href = glitter.root_path + 'pos?app-id='+(window as any).appName;
+                    }else{
+                        glitter.setHome(
+                            'jspage/main.js',
+                            glitter.getUrlParameter('page'),
+                            {
+                                appName: config.appName,
+                            },
+                            {
+                                backGroundColor: `transparent;`,
+                            }
+                        );
+                    }
                 }
             });
         }

package/package.json

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