ts-glitter 13.5.3 → 13.5.5

package/lowcode/Entry.js

@@ -59,7 +59,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.5.3";
+        glitter.share.editerVersion = "V_13.5.5";
         glitter.share.start = (new Date());
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -58,7 +58,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.5.3";
+        glitter.share.editerVersion = "V_13.5.5";
         glitter.share.start = (new Date());
         const vm: {
             appConfig: any;

package/lowcode/glitterBundle/GVController.js

@@ -455,6 +455,11 @@ export function init(metaURL, fun) {
                 lifeCycle.onDestroy();
             }
         };
+        PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
+        cf.pageConfig.carry_search.map((dd) => {
+            gvc.glitter.setUrlParameter(dd.key, dd.value);
+        });
+        gvc.glitter.setUrlParameter('page', cf.pageConfig.tag);
         if (cf.pageConfig.type === GVCType.Page) {
             $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;width:100vw;
 background: ${cf.pageConfig.backGroundColor};z-index: 9999;overflow: hidden;display:none;" class="page-box">
@@ -470,6 +475,5 @@ ${lifeCycle.onCreateView()}
         gvc.glitter.setAnimation(cf.pageConfig);
         lifeCycle.onCreate();
         gvc.glitter.defaultSetting.pageLoadingFinish();
-        PageManager.setHistory(cf.pageConfig.tag, cf.c_type);
     };
 }

package/lowcode/glitterBundle/GVController.ts

@@ -483,6 +483,11 @@ export function init(metaURL: string, fun: (gvc: GVC, glitter: Glitter, gBundle:
                 lifeCycle.onDestroy()
             }
         }
+        PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
+        cf.pageConfig.carry_search.map((dd)=>{
+            gvc.glitter.setUrlParameter(dd.key,dd.value)
+        })
+        gvc.glitter.setUrlParameter('page',cf.pageConfig.tag)
         if (cf.pageConfig.type === GVCType.Page) {
             $('#glitterPage').append(`<div id="page${cf.pageConfig.id}" style="min-width: 100vw;min-height: 100vh;left: 0;top: 0;width:100vw;
 background: ${cf.pageConfig!.backGroundColor};z-index: 9999;overflow: hidden;display:none;" class="page-box">
@@ -498,6 +503,5 @@ ${lifeCycle.onCreateView()}
         gvc.glitter.setAnimation(cf.pageConfig)
         lifeCycle.onCreate()
         gvc.glitter.defaultSetting.pageLoadingFinish()
-        PageManager.setHistory(cf.pageConfig.tag, cf.c_type)
     }
 }

package/lowcode/glitterBundle/GlitterInitial.js

@@ -212,6 +212,7 @@ Entry.onCreate(glitter);
 function glitterInitial() {
     if (glitter.deviceType !== glitter.deviceTypeEnum.Android) {
         window.addEventListener('popstate', function (e) {
+            console.log(`popstate=>>`);
             glitter.goBack();
         });
     }

package/lowcode/glitterBundle/GlitterInitial.ts

@@ -242,6 +242,7 @@ Entry.onCreate(glitter);
 function glitterInitial() {
     if (glitter.deviceType !== glitter.deviceTypeEnum.Android) {
         window.addEventListener('popstate', function (e) {
+            console.log(`popstate=>>`)
             glitter.goBack();
         });
     }

package/lowcode/glitterBundle/module/PageManager.js

@@ -21,6 +21,7 @@ export var GVCType;
 export class PageConfig {
     constructor(par) {
         this.scrollTop = 0;
+        this.carry_search = par.carry_search || [];
         this.initial = false;
         this.search = par.search || '';
         this.tag = par.tag;
@@ -89,7 +90,7 @@ export class PageManager {
             (PageManager.hiddenElement[glitter.pageConfig[index].id] &&
                 document.getElementById('glitterPage').appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
             glitter.pageConfig[index].createResource();
-            glitter.setUrlParameter('page', glitter.pageConfig[index].tag);
+            window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
         }
         catch (e) {
         }
@@ -110,7 +111,9 @@ export class PageManager {
     }
     static setHome(url, tag, obj, option = {}) {
         const glitter = Glitter.glitter;
-        const now_page = glitter.pageConfig.filter((dd) => { return dd.type === GVCType.Page; }).reverse()[1];
+        const now_page = glitter.pageConfig.filter((dd) => {
+            return dd.type === GVCType.Page;
+        }).reverse()[1];
         glitter.htmlGenerate.loadScript(glitter, [
             {
                 src: PageManager.getRelativeUrl(url),
@@ -130,6 +133,7 @@ export class PageManager {
                             goBack: true,
                             src: url,
                             tag: tag,
+                            carry_search: option.carry_search,
                             deleteResource: () => {
                             },
                             createResource: () => {
@@ -152,7 +156,10 @@ export class PageManager {
                         glitter.pageConfig.push(pageConfig);
                         glitter.defaultSetting.pageLoading();
                         if (window.gtag && GVC.initial) {
-                            window.gtag('event', 'page_view', { 'page_title': document.title, page_location: document.location.href });
+                            window.gtag('event', 'page_view', {
+                                'page_title': document.title,
+                                page_location: document.location.href
+                            });
                         }
                         GVC.initial = true;
                         gvFunction({
@@ -239,7 +246,10 @@ export class PageManager {
     static changePage(url, tag, goBack, obj, option = {}) {
         const glitter = Glitter.glitter;
         console.log(`changePage-time:`, window.renderClock.stop());
-        const now_page = glitter.pageConfig.filter((dd) => { return dd.type === GVCType.Page; }).reverse()[0];
+        const now_page = glitter.pageConfig.filter((dd) => {
+            return dd.type === GVCType.Page;
+        }).reverse()[0];
+        now_page.search = location.href;
         now_page && (now_page.scrollTop = window.scrollY);
         glitter.window.history.replaceState({}, glitter.document.title, location.href);
         setTimeout(() => {
@@ -260,7 +270,8 @@ export class PageManager {
                 dismiss: (_b = option.dismiss) !== null && _b !== void 0 ? _b : (() => {
                 }),
                 renderFinish: () => {
-                }
+                },
+                carry_search: option.carry_search
             });
             glitter.pageConfig.push(pageConfig);
             glitter.defaultSetting.pageLoading();
@@ -268,7 +279,6 @@ export class PageManager {
                 {
                     src: PageManager.getRelativeUrl(url),
                     callback: (gvFunction) => {
-                        glitter.setUrlParameter('page', tag);
                         if (glitter.pageConfig.find((dd) => {
                             return dd === pageConfig;
                         })) {
@@ -279,7 +289,10 @@ export class PageManager {
                             });
                         }
                         if (window.gtag) {
-                            window.gtag('event', 'page_view', { 'page_title': document.title, page_location: document.location.href });
+                            window.gtag('event', 'page_view', {
+                                'page_title': document.title,
+                                page_location: document.location.href
+                            });
                         }
                     }
                 }
@@ -314,7 +327,8 @@ export class PageManager {
             animation: (_b = option.animation) !== null && _b !== void 0 ? _b : glitter.defaultSetting.dialogAnimation,
             dismiss: (_c = option.dismiss) !== null && _c !== void 0 ? _c : (() => {
             }),
-            renderFinish: () => { }
+            renderFinish: () => {
+            }
         });
         glitter.pageConfig.push(pageConfig);
         glitter.defaultSetting.pageLoading();

package/lowcode/glitterBundle/module/PageManager.ts

@@ -33,8 +33,8 @@ export enum GVCType {
 }
 
 export class PageConfig {
-    public initial:boolean;
-    public search:string;
+    public initial: boolean;
+    public search: string;
     public id: string;
     public obj: any;
     public goBack: boolean;
@@ -47,21 +47,35 @@ export class PageConfig {
     public backGroundColor: string;
     public scrollTop: number = 0;
     public dismiss: () => void;
-    public renderFinish:()=> void
-    public static rootPath=''
+    public renderFinish: () => void
+    public static rootPath = ''
+    public carry_search: {key:string,value:string}[];
 
     public getElement(): any {
         return Glitter.glitter.$(`#page${this.id}`);
     }
 
-    public gvc?:GVC
+    public gvc?: GVC
+
     constructor(par: {
-        id: string, obj: any, goBack: boolean, src: string, tag: string, createResource: () => void, deleteResource: (destroy: boolean) => void,
-        type: GVCType, animation: AnimationConfig, backGroundColor: string, dismiss: () => void,renderFinish:()=>void,
-        search?:string
+        id: string,
+        obj: any,
+        goBack: boolean,
+        src: string,
+        tag: string,
+        createResource: () => void,
+        deleteResource: (destroy: boolean) => void,
+        type: GVCType,
+        animation: AnimationConfig,
+        backGroundColor: string,
+        dismiss: () => void,
+        renderFinish: () => void,
+        search?: string,
+        carry_search?: {key:string,value:string}[]
     }) {
-        this.initial=false
-        this.search=par.search || '';
+        this.carry_search=par.carry_search || []
+        this.initial = false
+        this.search = par.search || '';
         this.tag = par.tag;
         this.id = par.id;
         this.obj = par.obj;
@@ -73,7 +87,7 @@ export class PageConfig {
         this.animation = par.animation;
         this.backGroundColor = par.backGroundColor;
         this.dismiss = par.dismiss
-        this.renderFinish= par.renderFinish
+        this.renderFinish = par.renderFinish
     }
 }
 
@@ -83,21 +97,21 @@ export class PageManager {
     public static hidePageView(id: string, del: boolean = false) {
         const glitter = Glitter.glitter;
         try {
-            const pageConfig=glitter.pageConfig.find((dd)=>{
-                return dd.id===id
+            const pageConfig = glitter.pageConfig.find((dd) => {
+                return dd.id === id
             })
-            if(pageConfig){
-                if(del){
+            if (pageConfig) {
+                if (del) {
                     pageConfig.dismiss()
                     pageConfig.deleteResource(true)
                     glitter.$(`#page` + pageConfig.id).remove();
                     glitter.$(`#` + pageConfig.id).remove();
                     PageManager.hiddenElement[`page${pageConfig.id}`] = undefined
                     PageManager.hiddenElement[`${pageConfig.id}`] = undefined
-                    glitter.pageConfig=glitter.pageConfig.filter((dd)=>{
-                        return dd.id!==pageConfig.id
+                    glitter.pageConfig = glitter.pageConfig.filter((dd) => {
+                        return dd.id !== pageConfig.id
                     })
-                }else{
+                } else {
                     const pageElement = document.getElementById(`page${pageConfig.id}`)
                     const dialogElement = document.getElementById(`${pageConfig.id}`)
                     if (pageElement) {
@@ -122,12 +136,11 @@ export class PageManager {
                 return data.id;
             }).indexOf(id);
             (PageManager.hiddenElement[`page` + glitter.pageConfig[index].id] &&
-            document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[`page` + glitter.pageConfig[index].id]));
+                document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[`page` + glitter.pageConfig[index].id]));
             (PageManager.hiddenElement[glitter.pageConfig[index].id] &&
                 document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
-
             glitter.pageConfig[index].createResource();
-            glitter.setUrlParameter('page', glitter.pageConfig[index].tag);
+            window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
         } catch (e) {
         }
     }
@@ -147,28 +160,37 @@ export class PageManager {
         }
     }
 
-    public static setHome(url: string, tag: string, obj: any, option: { animation?: AnimationConfig, backGroundColor?: string, dismiss?: () => void } = {}) {
+    public static setHome(url: string, tag: string, obj: any, option: {
+        animation?: AnimationConfig,
+        backGroundColor?: string,
+        dismiss?: () => void,
+        carry_search?: {key:string,value:string}[]
+    } = {}) {
         const glitter = Glitter.glitter;
         //當頁面有第二頁時則先返回首頁在做跳轉。
-        const now_page=glitter.pageConfig.filter((dd)=>{return dd.type===GVCType.Page}).reverse()[1];
-        glitter.htmlGenerate.loadScript(glitter,[
+        const now_page = glitter.pageConfig.filter((dd) => {
+            return dd.type === GVCType.Page
+        }).reverse()[1];
+        glitter.htmlGenerate.loadScript(glitter, [
             {
-                src:PageManager.getRelativeUrl(url),
-                callback:(gvFunction)=>{
+                src: PageManager.getRelativeUrl(url),
+                callback: (gvFunction) => {
                     const original = new URL(glitter.root_path + tag + window.location.search)
-                    function switchFunction(){
-                        glitter.page=tag
+
+                    function switchFunction() {
+                        glitter.page = tag
                         try {
                             window.history.replaceState({}, document.title, original.href);
-                        }catch (e) {
+                        } catch (e) {
 
                         }
-                        const pageConfig=new PageConfig({
+                        const pageConfig = new PageConfig({
                             id: glitter.getUUID(),
                             obj: obj,
                             goBack: true,
                             src: url,
                             tag: tag,
+                            carry_search: option.carry_search,
                             deleteResource: () => {
                             },
                             createResource: () => {
@@ -178,40 +200,44 @@ export class PageManager {
                             animation: option.animation ?? glitter.animation.none,
                             dismiss: option.dismiss ?? (() => {
                             }),
-                            renderFinish:()=>{
+                            renderFinish: () => {
                                 //僅保留首頁和彈跳視窗。
-                                glitter.pageConfig=glitter.pageConfig.filter((dd)=>{
-                                    const isHome=(dd.id===pageConfig.id)
-                                    if(!isHome){
+                                glitter.pageConfig = glitter.pageConfig.filter((dd) => {
+                                    const isHome = (dd.id === pageConfig.id)
+                                    if (!isHome) {
                                         glitter.hidePageView(dd.id, true);
                                     }
-                                    return isHome || (dd.type===GVCType.Dialog)
+                                    return isHome || (dd.type === GVCType.Dialog)
                                 })
                             }
                         })
                         glitter.pageConfig.push(pageConfig)
                         glitter.defaultSetting.pageLoading();
-                        if((window as any).gtag && GVC.initial){
-                            (window as any).gtag('event', 'page_view', {'page_title': document.title, page_location: document.location.href});
+                        if ((window as any).gtag && GVC.initial) {
+                            (window as any).gtag('event', 'page_view', {
+                                'page_title': document.title,
+                                page_location: document.location.href
+                            });
                         }
-                        GVC.initial=true
+                        GVC.initial = true
                         gvFunction({
-                            pageConfig:pageConfig,
-                            c_type:'home'
+                            pageConfig: pageConfig,
+                            c_type: 'home'
                         })
                     }
-                    if(now_page){
+
+                    if (now_page) {
                         glitter.goMenu()
-                        glitter.share.menu_switch=setTimeout(()=>{
+                        glitter.share.menu_switch = setTimeout(() => {
                             switchFunction()
-                        },100)
-                    }else{
+                        }, 100)
+                    } else {
                         switchFunction()
                     }
 
                 }
             }
-        ],'GVControllerList')
+        ], 'GVControllerList')
 
     };
 
@@ -240,6 +266,7 @@ export class PageManager {
 
     public static setAnimation(page: PageConfig) {
         const glitter = Glitter.glitter;
+
         function closePreviousPage() {
             console.log(`closePreviousPage`)
             //Only hidden page view
@@ -280,29 +307,37 @@ export class PageManager {
         }
     };
 
-    public static setHistory(tag:string,type:string){
+    public static setHistory(tag: string, type: string) {
         const glitter = Glitter.glitter;
-        const search = glitter.root_path+tag+glitter.window.location.search;
+        const search = glitter.root_path + tag + glitter.window.location.search;
         try {
 
-            if(['home','page'].find((dd)=>{
-                return dd===type
-            })){
+            if (['home', 'page'].find((dd) => {
+                return dd === type
+            })) {
                 window.history.pushState({}, glitter.document.title, search);
-                glitter.pageConfig[glitter.pageConfig.length-1].search=search
+                glitter.pageConfig[glitter.pageConfig.length - 1].search = search
             }
         } catch (e) {
         }
     }
-    public static changePage(url: string, tag: string, goBack: boolean, obj: any, option: { animation?: AnimationConfig, backGroundColor?: string, dismiss?: () => void } = {}) {
+
+    public static changePage(url: string, tag: string, goBack: boolean, obj: any, option: {
+        animation?: AnimationConfig,
+        backGroundColor?: string,
+        dismiss?: () => void,
+        carry_search?: {key:string,value:string}[]
+    } = {}) {
         const glitter = Glitter.glitter;
         console.log(`changePage-time:`, (window as any).renderClock.stop());
-        const now_page=glitter.pageConfig.filter((dd)=>{return dd.type===GVCType.Page}).reverse()[0];
-        now_page && (now_page.scrollTop=window.scrollY);
+        const now_page = glitter.pageConfig.filter((dd) => {
+            return dd.type === GVCType.Page
+        }).reverse()[0];
+        now_page.search=location.href
+        now_page && (now_page.scrollTop = window.scrollY);
         glitter.window.history.replaceState({}, glitter.document.title, location.href);
-        setTimeout(()=>{
-
-            const pageConfig=new PageConfig({
+        setTimeout(() => {
+            const pageConfig = new PageConfig({
                 id: glitter.getUUID(),
                 obj: obj,
                 goBack: goBack,
@@ -317,33 +352,36 @@ export class PageManager {
                 animation: option.animation || glitter.defaultSetting.pageAnimation || glitter.animation.none,
                 dismiss: option.dismiss ?? (() => {
                 }),
-                renderFinish:()=>{
+                renderFinish: () => {
 
-                }
+                },
+                carry_search: option.carry_search
             })
             glitter.pageConfig.push(pageConfig);
             glitter.defaultSetting.pageLoading();
-            glitter.htmlGenerate.loadScript(glitter,[
+            glitter.htmlGenerate.loadScript(glitter, [
                 {
-                    src:PageManager.getRelativeUrl(url),
-                    callback:(gvFunction)=>{
-                        glitter.setUrlParameter('page',tag)
-                        if(glitter.pageConfig.find((dd)=>{
-                            return dd===pageConfig
-                        })){
-                            glitter.page=tag
+                    src: PageManager.getRelativeUrl(url),
+                    callback: (gvFunction) => {
+                        if (glitter.pageConfig.find((dd) => {
+                            return dd === pageConfig
+                        })) {
+                            glitter.page = tag
                             gvFunction({
-                                pageConfig:pageConfig,
-                                c_type:'page'
+                                pageConfig: pageConfig,
+                                c_type: 'page'
                             })
                         }
-                        if((window as any).gtag){
-                            (window as any).gtag('event', 'page_view', {'page_title': document.title, page_location: document.location.href});
+                        if ((window as any).gtag) {
+                            (window as any).gtag('event', 'page_view', {
+                                'page_title': document.title,
+                                page_location: document.location.href
+                            });
                         }
 
                     }
                 }
-            ],'GVControllerList')
+            ], 'GVControllerList')
         })
 
     }
@@ -356,17 +394,26 @@ export class PageManager {
             this.hidePageView(pg.id, true);
         }
     };
-    public static innerDialog = (html: (gvc: GVC) => string | Promise<string>, tag: string, option: { animation?: AnimationConfig, backGroundColor?: string, dismiss?: () => void } = {}) => {
+
+    public static innerDialog = (html: (gvc: GVC) => string | Promise<string>, tag: string, option: {
+        animation?: AnimationConfig,
+        backGroundColor?: string,
+        dismiss?: () => void
+    } = {}) => {
         const glitter = Glitter.glitter;
         glitter.openDiaLog(new URL('../dialog/dialog_inner.js', import.meta.url).href, tag, {
             getView: html
         }, option)
     }
 
-    public static openDiaLog(url: string, tag: string, obj: any, option: { animation?: AnimationConfig, backGroundColor?: string, dismiss?: () => void } = {}) {
+    public static openDiaLog(url: string, tag: string, obj: any, option: {
+        animation?: AnimationConfig,
+        backGroundColor?: string,
+        dismiss?: () => void
+    } = {}) {
         const glitter = Glitter.glitter;
         console.log(`openDiaLog-time:`, (window as any).renderClock.stop());
-        const pageConfig=new PageConfig({
+        const pageConfig = new PageConfig({
             id: glitter.getUUID(),
             obj: obj,
             goBack: true,
@@ -381,24 +428,25 @@ export class PageManager {
             animation: option.animation ?? glitter.defaultSetting.dialogAnimation,
             dismiss: option.dismiss ?? (() => {
             }),
-            renderFinish:()=>{}
+            renderFinish: () => {
+            }
         })
         glitter.pageConfig.push(pageConfig);
         glitter.defaultSetting.pageLoading();
-        glitter.htmlGenerate.loadScript(glitter,[
+        glitter.htmlGenerate.loadScript(glitter, [
             {
-                src:PageManager.getRelativeUrl(url),
-                callback:(gvFunction)=>{
-                    if(glitter.pageConfig.find((dd)=>{
-                        return dd===pageConfig
-                    })){
+                src: PageManager.getRelativeUrl(url),
+                callback: (gvFunction) => {
+                    if (glitter.pageConfig.find((dd) => {
+                        return dd === pageConfig
+                    })) {
                         gvFunction({
-                            pageConfig:pageConfig
+                            pageConfig: pageConfig
                         })
                     }
                 }
             }
-        ],'GVControllerList')
+        ], 'GVControllerList')
     };
 
     public static closeDiaLog(tag?: string) {
@@ -453,7 +501,7 @@ export class PageManager {
     };
 
     public static goMenu() {
-        (window as any).glitter.share.to_menu=true;
+        (window as any).glitter.share.to_menu = true;
         window.history.back()
 
         // const glitter = Glitter.glitter;

package/lowcode/jspage/main.js

@@ -727,33 +727,36 @@ ${Storage.page_setting_item === `${da.index}` ? `background:${EditorConfig.edito
         },
         onResume: () => {
             setTimeout(() => {
-                glitter.setUrlParameter('function', EditorConfig.backend_page());
-                setTimeout(() => {
-                    if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
-                        glitter.setUrlParameter('page', 'cms');
-                    }
-                }, 100);
                 gvc.notifyDataChange('MainEditorLeft');
-            }, 250);
+            }, 100);
         }
     };
 });
 function initialEditor(gvc, viewModel) {
     var _a;
     const glitter = gvc.glitter;
-    if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
-        setTimeout(() => {
-            glitter.setUrlParameter('page', 'cms');
-        }, 100);
-    }
-    glitter.setUrlParameter('function', EditorConfig.backend_page());
+    setTimeout(() => {
+        if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
+            setTimeout(() => {
+                glitter.setUrlParameter('page', 'cms');
+            }, 100);
+        }
+        glitter.setUrlParameter('function', EditorConfig.backend_page());
+    }, 50);
     glitter.share.switch_to_web_builder = (page, device) => {
-        glitter.setUrlParameter('device', device);
-        glitter.setUrlParameter('function', 'user-editor');
+        glitter.closeDrawer();
         glitter.changePage('jspage/main.js', page, true, {
             appName: window.parent.glitter.getUrlParameter('appName'),
         }, {
             backGroundColor: `transparent;`,
+            carry_search: [
+                {
+                    key: 'device', value: device
+                },
+                {
+                    key: 'function', value: 'user-editor'
+                }
+            ]
         });
     };
     glitter.share.subscription = (title) => __awaiter(this, void 0, void 0, function* () {

package/lowcode/jspage/main.ts

@@ -804,30 +804,27 @@ ${Storage.page_setting_item === `${da.index}` ? `background:${EditorConfig.edito
         },
         onResume: () => {
             setTimeout(() => {
-                glitter.setUrlParameter('function', EditorConfig.backend_page())
-                setTimeout(() => {
-                    if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
-                        glitter.setUrlParameter('page', 'cms')
-                    }
-                }, 100)
                 gvc.notifyDataChange('MainEditorLeft')
-            }, 250)
+            }, 100)
         }
     };
 });
 
 function initialEditor(gvc: GVC, viewModel: any) {
     const glitter = gvc.glitter;
-    if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
-        setTimeout(() => {
-            glitter.setUrlParameter('page', 'cms')
-        }, 100)
-    }
-    glitter.setUrlParameter('function', EditorConfig.backend_page())
+    setTimeout(()=>{
+        if (EditorConfig.backend_page() === 'backend-manger' && (glitter.getUrlParameter('page') !== 'cms')) {
+            setTimeout(() => {
+                glitter.setUrlParameter('page', 'cms')
+            }, 100)
+        }
+        glitter.setUrlParameter('function', EditorConfig.backend_page())
+    },50)
+
+
     //跳轉至編輯器頁面功能
     glitter.share.switch_to_web_builder = (page: string,device:string) => {
-        glitter.setUrlParameter('device', device);
-        glitter.setUrlParameter('function', 'user-editor');
+        glitter.closeDrawer()
         glitter.changePage(
             'jspage/main.js',
             page,
@@ -837,6 +834,14 @@ function initialEditor(gvc: GVC, viewModel: any) {
             },
             {
                 backGroundColor: `transparent;`,
+                carry_search:[
+                    {
+                        key:'device',value:device
+                    },
+                    {
+                        key:'function',value:'user-editor'
+                    }
+                ]
             }
         )
     }

package/lowcode/official_view_component/official/form.js

@@ -625,8 +625,6 @@ export class FormWidget {
                                                 });
                                             }
                                             loop(viewConfig);
-                                            console.log(`formPage==>`, dd.page);
-                                            console.log(`viewConfig===>`, viewConfig);
                                             return new glitter.htmlGenerate(viewConfig, [], {
                                                 root_form_data: obj.widget && obj.widget.formData,
                                                 root_widget: obj.widget,

package/lowcode/official_view_component/official/form.ts

@@ -705,8 +705,6 @@ export class FormWidget {
                                                             });
                                                         }
                                                         loop(viewConfig);
-                                                        console.log(`formPage==>`,(dd as any).page)
-                                                        console.log(`viewConfig===>`,viewConfig)
                                                         return new glitter.htmlGenerate(viewConfig, [], {
                                                             root_form_data: obj.widget && obj.widget.formData,
                                                             root_widget: obj.widget,

package/lowcode/view-model/saas-view-model.js

@@ -1110,7 +1110,7 @@ export class SaasViewModel {
                     };
                 })());
             },
-            footer_html: () => {
+            footer_html: (gvc) => {
                 return [
                     BgWidget.cancel(gvc.event(() => {
                         gvc.closeDialog();

package/lowcode/view-model/saas-view-model.ts

@@ -1156,7 +1156,7 @@ export class SaasViewModel {
                     })()
                 );
             },
-            footer_html: () => {
+            footer_html: (gvc) => {
                 return [
                     BgWidget.cancel(
                         gvc.event(() => {

package/package.json

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