ts-glitter 13.8.35 → 13.8.53

package/lowcode/Entry.js

@@ -13,7 +13,7 @@ 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 { ShareDialog } from './glitterBundle/dialog/ShareDialog.js';
 export class Entry {
     static onCreate(glitter) {
         var _a;
@@ -49,12 +49,18 @@ export class Entry {
                     scroll-behavior: auto !important;
                 }
             }
+<<<<<<< HEAD
+            .hide-elem {
+                display: none !important;
+            }
+=======
               .hide-elem {
             display: none !important;
         }
         .hy-drawer-left {
         left:-1000px !important;
         }
+>>>>>>> d311c294 (update glitter version)
         `);
         if (glitter.getUrlParameter('appName')) {
             window.appName = glitter.getUrlParameter('appName');
@@ -62,8 +68,8 @@ 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.35";
-        glitter.share.start = (new Date());
+        glitter.share.editerVersion = 'V_13.8.53';
+        glitter.share.start = new Date();
         const vm = {
             appConfig: [],
         };
@@ -75,12 +81,14 @@ export class Entry {
         config.token = GlobalUser.saas_token;
         Entry.resourceInitial(glitter, vm, (dd) => __awaiter(this, void 0, void 0, function* () {
             glitter.addStyle(`
-            ${(parseInt(window.parent.glitter.share.bottom_inset, 10)) ? `
-             .update-bar-container {
-        padding-bottom:${window.parent.glitter.share.bottom_inset}px !important;
-        }
-            ` : ``}
-            
+                ${parseInt(window.parent.glitter.share.bottom_inset, 10)
+                ? `
+                              .update-bar-container {
+                                  padding-bottom: ${window.parent.glitter.share.bottom_inset}px !important;
+                              }
+                          `
+                : ``}
+
                 .editorParent .editorChild {
                     display: none;
                 }
@@ -105,11 +113,9 @@ export class Entry {
                     width: 100%;
                     height: 100%;
                     pointer-events: none;
-                    
                 }
- .editor_item.active {
-                 background:#DDD;
-                   
+                .editor_item.active {
+                    background: #ddd;
                 }
                 .editorItemActive {
                     display: block !important;
@@ -120,7 +126,6 @@ export class Entry {
                     width: 100%;
                     height: 100%;
                     position: absolute;
-                   
                 }
 
                 .editorItemActive > .badge_it {
@@ -143,29 +148,26 @@ export class Entry {
                     position: relative;
                 }
                 .sel_normal {
-    cursor: pointer;
-    border-radius: 7px;
-    border: 1px solid #ddd;
-    padding: 2px 14px;
-    background: #fff;
-    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-}
+                    cursor: pointer;
+                    border-radius: 7px;
+                    border: 1px solid #ddd;
+                    padding: 2px 14px;
+                    background: #fff;
+                    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+                }
 
-  ul {
-                                        list-style: none;
-                                      
-                                    }
-                                    li {
-                                      list-style: none;
-                                     
-                                    }
+                ul {
+                    list-style: none;
+                }
+                li {
+                    list-style: none;
+                }
             `);
             yield Entry.globalStyle(glitter, dd);
             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, () => {
@@ -220,9 +222,14 @@ export class Entry {
         glitter.share.evalPlace = (evals) => eval(evals);
         function running() {
             return __awaiter(this, void 0, void 0, function* () {
-                glitter.addStyleLink(['assets/vendor/boxicons/css/boxicons.min.css', 'assets/css/theme.css', 'css/editor.css', 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css',
+                glitter.addStyleLink([
+                    'assets/vendor/boxicons/css/boxicons.min.css',
+                    'assets/css/theme.css',
+                    'css/editor.css',
+                    'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css',
                     'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/monolith.min.css',
-                    'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css']);
+                    'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css',
+                ]);
                 yield new Promise((resolve, reject) => {
                     glitter.addMtScript([
                         'jslib/pickr.min.js',
@@ -253,7 +260,7 @@ export class Entry {
                         appName: config.appName,
                         tag: glitter.getUrlParameter('page'),
                     });
-                    if (data.response.result.length === 0 && (glitter.getUrlParameter('page') !== 'cms')) {
+                    if (data.response.result.length === 0 && glitter.getUrlParameter('page') !== 'cms') {
                         glitter.setUrlParameter('page', data.response.redirect);
                     }
                     glitter.setHome('jspage/main.js', glitter.getUrlParameter('page'), {
@@ -290,9 +297,7 @@ export class Entry {
             {
                 src: 'https://kit.fontawesome.com/cccedec0f8.js',
             },
-        ], () => {
-        }, () => {
-        });
+        ], () => { }, () => { });
         glitter.addStyle(`
             @media (prefers-reduced-motion: no-preference) {
                 :root {
@@ -326,9 +331,7 @@ 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;
@@ -392,8 +395,7 @@ export class Entry {
                 .map((dd) => {
                 return {
                     src: `${glitter.htmlGenerate.configureCDN(glitter.htmlGenerate.resourceHook(dd.js))}`,
-                    callback: () => {
-                    },
+                    callback: () => { },
                 };
             }));
             function authPass() {
@@ -449,17 +451,20 @@ export class Entry {
             glitter.share.initial_fonts = [];
             if (glitter.share.font_theme[0]) {
                 glitter.addStyle(`
-@charset "UTF-8";
-${glitter.share.font_theme.map((dd) => {
+                    @charset "UTF-8";
+                    ${glitter.share.font_theme
+                    .map((dd) => {
                     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;
-    font-style: normal;
-    color: #393939;
-}`);
+                })
+                    .join('\n')}
+                    body {
+                        font-family: '${glitter.share.font_theme[0].value}' !important;
+                        font-optical-sizing: auto;
+                        font-style: normal;
+                        color: #393939;
+                    }
+                `);
             }
             function loopCheckGlobalValue(array, tag) {
                 try {

package/lowcode/Entry.ts

@@ -1,16 +1,16 @@
 '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) {
-        glitter.share.top_inset = 0
-        glitter.share.bottom_inset = 0
+        glitter.share.top_inset = 0;
+        glitter.share.bottom_inset = 0;
         glitter.share.reload_code_hash = function () {
             const hashCode = (window as any).preloadData.eval_code_hash || {};
             Object.keys(hashCode).map((dd, index) => {
@@ -49,12 +49,18 @@ export class Entry {
                     scroll-behavior: auto !important;
                 }
             }
+<<<<<<< HEAD
+            .hide-elem {
+                display: none !important;
+            }
+=======
               .hide-elem {
             display: none !important;
         }
         .hy-drawer-left {
         left:-1000px !important;
         }
+>>>>>>> d311c294 (update glitter version)
         `);
         if (glitter.getUrlParameter('appName')) {
             (window as any).appName = glitter.getUrlParameter('appName');
@@ -62,8 +68,8 @@ 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.35";
-        glitter.share.start = (new Date());
+        glitter.share.editerVersion = 'V_13.8.53';
+        glitter.share.start = new Date();
         const vm: {
             appConfig: any;
         } = {
@@ -80,12 +86,16 @@ export class Entry {
         // 資源初始化
         Entry.resourceInitial(glitter, vm, async (dd) => {
             glitter.addStyle(`
-            ${(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;
-        }
-            ` : ``}
-            
+                ${
+                    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;
                 }
@@ -110,11 +120,9 @@ export class Entry {
                     width: 100%;
                     height: 100%;
                     pointer-events: none;
-                    
                 }
- .editor_item.active {
-                 background:#DDD;
-                   
+                .editor_item.active {
+                    background: #ddd;
                 }
                 .editorItemActive {
                     display: block !important;
@@ -125,7 +133,6 @@ export class Entry {
                     width: 100%;
                     height: 100%;
                     position: absolute;
-                   
                 }
 
                 .editorItemActive > .badge_it {
@@ -148,32 +155,29 @@ export class Entry {
                     position: relative;
                 }
                 .sel_normal {
-    cursor: pointer;
-    border-radius: 7px;
-    border: 1px solid #ddd;
-    padding: 2px 14px;
-    background: #fff;
-    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-}
+                    cursor: pointer;
+                    border-radius: 7px;
+                    border: 1px solid #ddd;
+                    padding: 2px 14px;
+                    background: #fff;
+                    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+                }
 
-  ul {
-                                        list-style: none;
-                                      
-                                    }
-                                    li {
-                                      list-style: none;
-                                     
-                                    }
+                ul {
+                    list-style: none;
+                }
+                li {
+                    list-style: none;
+                }
             `);
 
             // 載入全域資源
             await Entry.globalStyle(glitter, dd);
             if (glitter.getUrlParameter('type') === 'editor') {
-                const dialog = new ShareDialog(glitter)
-                dialog.dataLoading({visible: true, text: '後台載入中'})
+                const dialog = new ShareDialog(glitter);
+                dialog.dataLoading({ visible: true, text: '後台載入中' });
                 // 頁面編輯器
-                Entry.toBackendEditor(glitter, () => {
-                });
+                Entry.toBackendEditor(glitter, () => {});
             } else if (glitter.getUrlParameter('type') === 'htmlEditor') {
                 // Iframe預覽區塊
                 Entry.toHtmlEditor(glitter, vm, () => {
@@ -215,7 +219,6 @@ export class Entry {
 
     // 跳轉至頁面編輯器
     public static toBackendEditor(glitter: Glitter, callback: () => void) {
-
         glitter.addStyle(`
             @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) {
@@ -231,11 +234,15 @@ export class Entry {
         glitter.share.EditorMode = true;
         glitter.share.evalPlace = (evals: string) => eval(evals);
 
-
         async function running() {
-            glitter.addStyleLink(['assets/vendor/boxicons/css/boxicons.min.css', 'assets/css/theme.css', 'css/editor.css', 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css',
+            glitter.addStyleLink([
+                'assets/vendor/boxicons/css/boxicons.min.css',
+                'assets/css/theme.css',
+                'css/editor.css',
+                'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css',
                 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/monolith.min.css',
-                'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css']);
+                'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css',
+            ]);
             await new Promise((resolve, reject) => {
                 glitter.addMtScript(
                     [
@@ -263,7 +270,6 @@ export class Entry {
         (window as any).root.classList.add('light-mode');
 
         function toNext() {
-
             console.log(`to-next-time:`, (window as any).renderClock.stop());
             running().then(async () => {
                 {
@@ -273,7 +279,7 @@ export class Entry {
                         tag: glitter.getUrlParameter('page'),
                     });
                     // console.log(`data===>`,data)
-                    if (data.response.result.length === 0 && (glitter.getUrlParameter('page')!=='cms')) {
+                    if (data.response.result.length === 0 && glitter.getUrlParameter('page') !== 'cms') {
                         glitter.setUrlParameter('page', data.response.redirect);
                     }
 
@@ -319,10 +325,8 @@ export class Entry {
                     src: 'https://kit.fontawesome.com/cccedec0f8.js',
                 },
             ],
-            () => {
-            },
-            () => {
-            }
+            () => {},
+            () => {}
         );
         glitter.addStyle(`
             @media (prefers-reduced-motion: no-preference) {
@@ -363,11 +367,9 @@ export class Entry {
                     type: 'module',
                 };
             }),
-            () => {
-            },
-            () => {
-            },
-            [{key: 'async', value: 'true'}]
+            () => {},
+            () => {},
+            [{ key: 'async', value: 'true' }]
         );
 
         // Preload page script
@@ -388,22 +390,21 @@ export class Entry {
             return eval(evals);
         };
         setTimeout(() => {
-            (window.parent as any).glitter.share.loading_dialog.dataLoading({text: '', visible: false})
-        }, 2000)
+            (window.parent as any).glitter.share.loading_dialog.dataLoading({ text: '', visible: false });
+        }, 2000);
         glitter.htmlGenerate.setHome({
             app_config: vm.appConfig,
             page_config: (window.parent as any).page_config ?? {},
             get config() {
-                return (window.parent as any).editerData.setting
+                return (window.parent as any).editerData.setting;
             },
             get editMode() {
-                return (window.parent as any).editerData
+                return (window.parent as any).editerData;
             },
             data: {},
             tag: (window.parent as any).glitter.getUrlParameter('page'),
         });
 
-
         callback();
     }
 
@@ -444,8 +445,7 @@ export class Entry {
                     .map((dd: any) => {
                         return {
                             src: `${glitter.htmlGenerate.configureCDN(glitter.htmlGenerate.resourceHook(dd.js))}`,
-                            callback: () => {
-                            },
+                            callback: () => {},
                         };
                     })
             );
@@ -496,8 +496,8 @@ export class Entry {
             glitter.share.globalStyle = {};
             const config = glitter.share.appConfigresponse.response.data;
             config.color_theme = config.color_theme ?? [];
-            config.container_theme = config.container_theme ?? []
-            config.font_theme = config.font_theme ?? []
+            config.container_theme = config.container_theme ?? [];
+            config.font_theme = config.font_theme ?? [];
             config.globalValue = config.globalValue ?? [];
             config.globalStyleTag = config.globalStyleTag ?? [];
             config.color_theme.map((dd: any, index: number) => {
@@ -505,22 +505,25 @@ export class Entry {
                     glitter.share.globalValue[`theme_color.${index}.${d2.key}`] = dd[d2.key];
                 });
             });
-            glitter.share.font_theme = config.font_theme
-            glitter.share.global_container_theme = config.container_theme
-            glitter.share.initial_fonts = []
+            glitter.share.font_theme = config.font_theme;
+            glitter.share.global_container_theme = config.container_theme;
+            glitter.share.initial_fonts = [];
             if (glitter.share.font_theme[0]) {
                 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')}
-body {
-    font-family: "${glitter.share.font_theme[0].value}" !important;
-    font-optical-sizing: auto;
-    font-style: normal;
-    color: #393939;
-}`)
+                    @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')}
+                    body {
+                        font-family: '${glitter.share.font_theme[0].value}' !important;
+                        font-optical-sizing: auto;
+                        font-style: normal;
+                        color: #393939;
+                    }
+                `);
             }
 
             function loopCheckGlobalValue(array: any, tag: string) {