ts-glitter 13.8.666 → 13.8.669

package/lowcode/Entry.js

@@ -64,7 +64,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_13.8.666';
+        glitter.share.editerVersion = 'V_13.8.669';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],
@@ -163,7 +163,8 @@ export class Entry {
             if (glitter.getUrlParameter('type') === 'editor') {
                 const dialog = new ShareDialog(glitter);
                 dialog.dataLoading({ visible: true, text: '後台載入中' });
-                Entry.toBackendEditor(glitter, () => { });
+                Entry.toBackendEditor(glitter, () => {
+                });
             }
             else if (glitter.getUrlParameter('type') === 'htmlEditor') {
                 Entry.toHtmlEditor(glitter, vm, () => {
@@ -202,7 +203,8 @@ export class Entry {
         }
     }
     static toBackendEditor(glitter, callback) {
-        if (localStorage.getItem('on-pos') === 'true') {
+        if ((localStorage.getItem('on-pos') === 'true') && glitter.getUrlParameter('page') !== 'pos') {
+            localStorage.removeItem('on-pos');
             location.href = glitter.root_path + 'pos?app-id=t_1725992531001';
         }
         glitter.addStyle(`
@@ -296,7 +298,9 @@ export class Entry {
             {
                 src: 'https://kit.fontawesome.com/cccedec0f8.js',
             },
-        ], () => { }, () => { });
+        ], () => {
+        }, () => {
+        });
         glitter.addStyle(`
             @media (prefers-reduced-motion: no-preference) {
                 :root {
@@ -330,7 +334,9 @@ export class Entry {
                 src: `${glitter.htmlGenerate.configureCDN(glitter.htmlGenerate.resourceHook(dd.js))}`,
                 type: 'module',
             };
-        }), () => { }, () => { }, [{ key: 'async', value: 'true' }]);
+        }), () => {
+        }, () => {
+        }, [{ key: 'async', value: 'true' }]);
         glitter.htmlGenerate.loadScript(glitter, window.parent.editerData.setting
             .filter((dd) => {
             return ['widget', 'container', 'code'].indexOf(dd.type) === -1;
@@ -394,7 +400,8 @@ export class Entry {
                 .map((dd) => {
                 return {
                     src: `${glitter.htmlGenerate.configureCDN(glitter.htmlGenerate.resourceHook(dd.js))}`,
-                    callback: () => { },
+                    callback: () => {
+                    },
                 };
             }));
             function authPass() {
@@ -425,6 +432,20 @@ export class Entry {
         });
     }
     static resourceInitial(glitter, vm, callback) {
+        glitter.runJsInterFace('getTopInset', {}, (response) => {
+            glitter.share.top_inset = (response.data);
+        }, {
+            webFunction: () => {
+                return { data: 0 };
+            },
+        });
+        glitter.runJsInterFace('getBottomInset', {}, (response) => {
+            glitter.share.bottom_inset = (response.data);
+        }, {
+            webFunction: () => {
+                return { data: 0 };
+            },
+        });
         window.glitterInitialHelper.getPlugin((dd) => {
             var _a, _b, _c, _d, _e;
             console.log(`getPlugin-time:`, window.renderClock.stop());
@@ -503,6 +524,35 @@ export class Entry {
     static globalStyle(glitter, dd) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            function loopVersion() {
+                ApiPageConfig.getGlitterVersion().then((res) => {
+                    console.log('glitterVersion:', res.response.result);
+                    if (!glitter.share.editerVersion.includes(res.response.result)) {
+                        const dialog = new ShareDialog(glitter);
+                        dialog.checkYesOrNot({
+                            text: '新版本已發佈，是否進行更新?',
+                            callback: (response) => {
+                                if (response) {
+                                    location.reload();
+                                }
+                                else {
+                                    setTimeout(() => {
+                                        loopVersion();
+                                    }, 1000 * 300);
+                                }
+                            }
+                        });
+                    }
+                    else {
+                        setTimeout(() => {
+                            loopVersion();
+                        }, 1000 * 300);
+                    }
+                });
+            }
+            if (glitter.getUrlParameter('type') === 'editor' || glitter.getUrlParameter('page') === 'pos') {
+                loopVersion();
+            }
             let countI = dd.response.data.initialList.length;
             const vm = {
                 get count() {

package/lowcode/Entry.ts

@@ -1,11 +1,11 @@
 'use strict';
-import { Glitter } from './glitterBundle/Glitter.js';
-import { config } from './config.js';
-import { ApiPageConfig } from './api/pageConfig.js';
-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 {Glitter} from './glitterBundle/Glitter.js';
+import {config} from './config.js';
+import {ApiPageConfig} from './api/pageConfig.js';
+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';
 
 export class Entry {
     public static onCreate(glitter: Glitter) {
@@ -64,7 +64,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_13.8.666';
+        glitter.share.editerVersion = 'V_13.8.669';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;
@@ -83,14 +83,14 @@ export class Entry {
         Entry.resourceInitial(glitter, vm, async (dd) => {
             glitter.addStyle(`
                 ${
-                    parseInt((window.parent as any).glitter.share.bottom_inset, 10)
-                        ? `
+                parseInt((window.parent as any).glitter.share.bottom_inset, 10)
+                    ? `
                               .update-bar-container {
                                   padding-bottom: ${(window.parent as any).glitter.share.bottom_inset}px !important;
                               }
                           `
-                        : ``
-                }
+                    : ``
+            }
 
                 .editorParent .editorChild {
                     display: none;
@@ -171,9 +171,10 @@ export class Entry {
             await Entry.globalStyle(glitter, dd);
             if (glitter.getUrlParameter('type') === 'editor') {
                 const dialog = new ShareDialog(glitter);
-                dialog.dataLoading({ visible: true, text: '後台載入中' });
+                dialog.dataLoading({visible: true, text: '後台載入中'});
                 // 頁面編輯器
-                Entry.toBackendEditor(glitter, () => {});
+                Entry.toBackendEditor(glitter, () => {
+                });
             } else if (glitter.getUrlParameter('type') === 'htmlEditor') {
                 // Iframe預覽區塊
                 Entry.toHtmlEditor(glitter, vm, () => {
@@ -215,7 +216,8 @@ export class Entry {
 
     // 跳轉至頁面編輯器
     public static toBackendEditor(glitter: Glitter, callback: () => void) {
-        if (localStorage.getItem('on-pos') === 'true') {
+        if ((localStorage.getItem('on-pos') === 'true') && glitter.getUrlParameter('page')!=='pos') {
+            localStorage.removeItem('on-pos')
             location.href = glitter.root_path + 'pos?app-id=t_1725992531001';
         }
         glitter.addStyle(`
@@ -324,8 +326,10 @@ export class Entry {
                     src: 'https://kit.fontawesome.com/cccedec0f8.js',
                 },
             ],
-            () => {},
-            () => {}
+            () => {
+            },
+            () => {
+            }
         );
         glitter.addStyle(`
             @media (prefers-reduced-motion: no-preference) {
@@ -366,9 +370,11 @@ export class Entry {
                     type: 'module',
                 };
             }),
-            () => {},
-            () => {},
-            [{ key: 'async', value: 'true' }]
+            () => {
+            },
+            () => {
+            },
+            [{key: 'async', value: 'true'}]
         );
 
         // Preload page script
@@ -389,7 +395,7 @@ export class Entry {
             return eval(evals);
         };
         setTimeout(() => {
-            (window.parent as any).glitter.share.loading_dialog.dataLoading({ text: '', visible: false });
+            (window.parent as any).glitter.share.loading_dialog.dataLoading({text: '', visible: false});
         }, 2000);
         glitter.htmlGenerate.setHome({
             app_config: vm.appConfig,
@@ -444,7 +450,8 @@ export class Entry {
                     .map((dd: any) => {
                         return {
                             src: `${glitter.htmlGenerate.configureCDN(glitter.htmlGenerate.resourceHook(dd.js))}`,
-                            callback: () => {},
+                            callback: () => {
+                            },
                         };
                     })
             );
@@ -484,6 +491,32 @@ export class Entry {
 
     // 資源初始化
     public static resourceInitial(glitter: Glitter, vm: any, callback: (data: any) => void) {
+        //取得APP的上間隔距離
+        glitter.runJsInterFace(
+            'getTopInset',
+            {},
+            (response: any) => {
+                glitter.share.top_inset=(response.data);
+            },
+            {
+                webFunction: () => {
+                    return {data: 0};
+                },
+            }
+        );
+        //取得APP的底部間隔距離
+        glitter.runJsInterFace(
+            'getBottomInset',
+            {},
+            (response: any) => {
+                glitter.share.bottom_inset=(response.data);
+            },
+            {
+                webFunction: () => {
+                    return {data: 0};
+                },
+            }
+        );
         (window as any).glitterInitialHelper.getPlugin((dd: any) => {
             console.log(`getPlugin-time:`, (window as any).renderClock.stop());
             (window as any).saasConfig.appConfig = dd.response.data;
@@ -511,11 +544,11 @@ export class Entry {
                 glitter.addStyle(`
                     @charset "UTF-8";
                     ${glitter.share.font_theme
-                        .map((dd: any) => {
-                            glitter.share.initial_fonts.push(dd.value);
-                            return `@import url('https://fonts.googleapis.com/css2?family=${dd.value}&display=swap');`;
-                        })
-                        .join('\n')}
+                    .map((dd: any) => {
+                        glitter.share.initial_fonts.push(dd.value);
+                        return `@import url('https://fonts.googleapis.com/css2?family=${dd.value}&display=swap');`;
+                    })
+                    .join('\n')}
                     body {
                         font-family: '${glitter.share.font_theme[0].value}' !important;
                         font-optical-sizing: auto;
@@ -563,20 +596,36 @@ export class Entry {
     // 載入全域資源
     public static globalStyle(glitter: Glitter, dd: any) {
         return new Promise(async (resolve, reject) => {
-            // Initial Global style
-            // if (glitter.getUrlParameter("type") !== 'editor') {
-            //     for (const data of (dd.response.data.initialStyleSheet ?? [])) {
-            //         try {
-            //             if (data.type === 'script') {
-            //                 glitter.addStyleLink(data.src.link)
-            //             } else {
-            //                 glitter.addStyle(data.src.official)
-            //             }
-            //         } catch (e) {
-            //             console.error(e)
-            //         }
-            //     }
-            // }
+            //定期確認版本號碼
+            function loopVersion() {
+                ApiPageConfig.getGlitterVersion().then((res) => {
+                    console.log('glitterVersion:', res.response.result);
+                    if (!glitter.share.editerVersion.includes(res.response.result)) {
+                        const dialog = new ShareDialog(glitter)
+                        dialog.checkYesOrNot({
+                            text: '新版本已發佈，是否進行更新?',
+                            callback: (response) => {
+                                if (response) {
+                                    location.reload()
+                                }else{
+                                    setTimeout(() => {
+                                        loopVersion()
+                                    }, 1000 * 300)
+                                }
+                            }
+                        })
+                    }else{
+                        setTimeout(() => {
+                            loopVersion()
+                        }, 1000 * 300)
+                    }
+
+                })
+            }
+            if (glitter.getUrlParameter('type')==='editor' || glitter.getUrlParameter('page')==='pos'){
+                loopVersion()
+            }
+
             let countI = dd.response.data.initialList.length;
             const vm = {
                 // @ts-ignore
@@ -635,6 +684,8 @@ export class Entry {
             glitter.setUrlParameter('page', 'login');
         }
     }
+
+
 }
 
 let clockF = () => {

package/lowcode/api/pageConfig.js

@@ -28,6 +28,16 @@ export class ApiPageConfig {
             }
         });
     }
+    static getGlitterVersion() {
+        return BaseApi.create({
+            "url": config.url + `/api/v1/app/version?library=ts-glitter`,
+            "type": "GET",
+            "timeout": 0,
+            "headers": {
+                "Content-Type": "application/json"
+            }
+        });
+    }
     static getTemplateList() {
         return BaseApi.create({
             "url": config.url + `/api/v1/app/template?template_from=all`,

package/lowcode/api/pageConfig.ts

@@ -25,6 +25,17 @@ export class ApiPageConfig {
         })
     }
 
+    public static getGlitterVersion() {
+        return BaseApi.create({
+            "url": config.url + `/api/v1/app/version?library=ts-glitter`,
+            "type": "GET",
+            "timeout": 0,
+            "headers": {
+                "Content-Type": "application/json"
+            }
+        })
+    }
+
     public static getTemplateList() {
         return BaseApi.create({
             "url": config.url + `/api/v1/app/template?template_from=all`,

package/lowcode/cms-plugin/POS-setting.js

@@ -156,7 +156,6 @@ height: 51px;
     }
     static main(gvc) {
         const glitter = gvc.glitter;
-        localStorage.setItem('on-pos', 'true');
         gvc.glitter.runJsInterFace("pos-device", {}, (res) => {
             PayConfig.deviceType = res.deviceType === 'neostra' ? 'pos' : 'web';
             if (PayConfig.deviceType === 'pos') {
@@ -315,14 +314,14 @@ height: 51px;
                     return html `
                             <div
                                     class="d-flex nav-top"
-                                    style="z-index:20;height: ${(() => {
+                                    style="z-index:20;min-height: ${(() => {
                         if (document.body.offsetWidth > 800) {
                             return `86px`;
                         }
                         else {
                             return `66px`;
                         }
-                    })()};width: 100%;background: #FFF;box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.10);position: fixed;left: 0;top: 0;"
+                    })()};padding-top:${glitter.share.top_inset}px;width: 100%;background: #FFF;box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.10);position: fixed;left: 0;top: 0;"
                             >
                                 <div
                                         class="POS-logo h-100 d-flex align-items-center ${document.body.offsetWidth < 800 ? `justify-content-center` : ``} mx-2 w-100"
@@ -612,7 +611,7 @@ cursor: pointer;
                         }),
                         divCreate: {
                             class: `h-100 ${document.body.clientWidth < 768 ? `` : `d-flex`}`,
-                            style: `background: #F7F7F7;`,
+                            style: `background: #F7F7F7;padding-top:${glitter.share.top_inset}px;`,
                         },
                     })}
                             ${gvc.bindView({

package/lowcode/cms-plugin/POS-setting.ts

@@ -184,7 +184,6 @@ height: 51px;
 
     public static main(gvc: GVC) {
         const glitter = gvc.glitter
-        localStorage.setItem('on-pos', 'true')
         // https://unpkg.com/html5-qrcode/minified/html5-qrcode.min.js
         //設定裝置類型
         gvc.glitter.runJsInterFace("pos-device", {}, (res) => {
@@ -356,13 +355,13 @@ height: 51px;
                         return html`
                             <div
                                     class="d-flex nav-top"
-                                    style="z-index:20;height: ${(() => {
+                                    style="z-index:20;min-height: ${(() => {
                                         if (document.body.offsetWidth > 800) {
                                             return `86px`
                                         } else {
                                             return `66px`
                                         }
-                                    })()};width: 100%;background: #FFF;box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.10);position: fixed;left: 0;top: 0;"
+                                    })()};padding-top:${glitter.share.top_inset}px;width: 100%;background: #FFF;box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.10);position: fixed;left: 0;top: 0;"
                             >
                                 <div
                                         class="POS-logo h-100 d-flex align-items-center ${document.body.offsetWidth < 800 ? `justify-content-center` : ``} mx-2 w-100"
@@ -655,7 +654,7 @@ cursor: pointer;
                                 },
                                 divCreate: {
                                     class: `h-100 ${document.body.clientWidth < 768 ? `` : `d-flex`}`,
-                                    style: `background: #F7F7F7;`,
+                                    style: `background: #F7F7F7;padding-top:${glitter.share.top_inset}px;`,
                                 },
                             })}
                             ${gvc.bindView({

package/lowcode/jspage/main.js

@@ -180,15 +180,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
             else {
                 dialog.dataLoading({ visible: true });
             }
-            glitter.share.top_inset = yield new Promise((resolve, reject) => {
-                glitter.runJsInterFace('getTopInset', {}, (response) => {
-                    resolve(response.data);
-                }, {
-                    webFunction: () => {
-                        return { data: 0 };
-                    },
-                });
-            });
             if (parseInt(glitter.share.top_inset, 10)) {
                 gvc.addStyle(css `
                 .scroll-in {
@@ -200,15 +191,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                 }
             `);
             }
-            glitter.share.bottom_inset = yield new Promise((resolve, reject) => {
-                glitter.runJsInterFace('getBottomInset', {}, (response) => {
-                    resolve(response.data);
-                }, {
-                    webFunction: () => {
-                        return { data: 0 };
-                    },
-                });
-            });
             const waitGetData = [
                 () => __awaiter(this, void 0, void 0, function* () {
                     return yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {

package/lowcode/jspage/main.ts

@@ -203,20 +203,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
         } else {
             dialog.dataLoading({visible: true})
         }
-        glitter.share.top_inset = await new Promise((resolve, reject) => {
-            glitter.runJsInterFace(
-                'getTopInset',
-                {},
-                (response: any) => {
-                    resolve(response.data);
-                },
-                {
-                    webFunction: () => {
-                        return {data: 0};
-                    },
-                }
-            )
-        })
+
         if (parseInt(glitter.share.top_inset, 10)) {
             gvc.addStyle(css`
                 .scroll-in {
@@ -229,20 +216,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
             `)
         }
 
-        glitter.share.bottom_inset = await new Promise((resolve, reject) => {
-            glitter.runJsInterFace(
-                'getBottomInset',
-                {},
-                (response: any) => {
-                    resolve(response.data);
-                },
-                {
-                    webFunction: () => {
-                        return {data: 0};
-                    },
-                }
-            )
-        })
 
 
         const waitGetData = [

package/package.json

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