ts-glitter 13.5.7 → 13.5.8

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.7";
+        glitter.share.editerVersion = "V_13.5.8";
         glitter.share.start = (new Date());
         const vm = {
             appConfig: [],
@@ -250,6 +250,9 @@ export class Entry {
                         appName: config.appName,
                         tag: glitter.getUrlParameter('page'),
                     });
+                    if (data.response.result.length === 0 && (glitter.getUrlParameter('page') !== 'cms')) {
+                        glitter.setUrlParameter('page', data.response.redirect);
+                    }
                     glitter.setHome('jspage/main.js', glitter.getUrlParameter('page'), {
                         appName: config.appName,
                     }, {

package/lowcode/Entry.ts

@@ -9,6 +9,7 @@ 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.reload_code_hash = function () {
@@ -40,6 +41,7 @@ export class Entry {
         };
         glitter.page = (window as any).glitter_page;
         glitter.share.GlobalUser = GlobalUser;
+
         Entry.checkRedirectPage(glitter);
         glitter.share.logID = glitter.getUUID();
         glitter.addStyle(`
@@ -58,7 +60,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.7";
+        glitter.share.editerVersion = "V_13.5.8";
         glitter.share.start = (new Date());
         const vm: {
             appConfig: any;
@@ -72,6 +74,7 @@ export class Entry {
         };
         // 設定SAAS管理員請求API
         config.token = GlobalUser.saas_token;
+
         // 資源初始化
         Entry.resourceInitial(glitter, vm, async (dd) => {
             glitter.addStyle(`
@@ -160,6 +163,7 @@ export class Entry {
                                      
                                     }
             `);
+
             // 載入全域資源
             await Entry.globalStyle(glitter, dd);
             if (glitter.getUrlParameter('type') === 'editor') {
@@ -209,6 +213,7 @@ 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) {
@@ -256,6 +261,7 @@ 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 () => {
                 {
@@ -265,9 +271,9 @@ export class Entry {
                         tag: glitter.getUrlParameter('page'),
                     });
                     // console.log(`data===>`,data)
-                    // if (data.response.result.length === 0) {
-                    //     glitter.setUrlParameter('page', data.response.redirect);
-                    // }
+                    if (data.response.result.length === 0 && (glitter.getUrlParameter('page')!=='cms')) {
+                        glitter.setUrlParameter('page', data.response.redirect);
+                    }
 
                     glitter.setHome(
                         'jspage/main.js',

package/lowcode/glitterBundle/GVController.js

@@ -455,12 +455,12 @@ 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) {
+            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);
             $('#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">
 ${lifeCycle.onCreateView()}

package/lowcode/glitterBundle/GVController.ts

@@ -483,12 +483,13 @@ 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) {
+            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)
             $('#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">
 ${lifeCycle.onCreateView()}

package/lowcode/glitterBundle/module/PageManager.js

@@ -90,7 +90,9 @@ export class PageManager {
             (PageManager.hiddenElement[glitter.pageConfig[index].id] &&
                 document.getElementById('glitterPage').appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
             glitter.pageConfig[index].createResource();
-            window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
+            if (glitter.pageConfig[index].type === GVCType.Page) {
+                window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
+            }
         }
         catch (e) {
         }

package/lowcode/glitterBundle/module/PageManager.ts

@@ -140,7 +140,9 @@ export class PageManager {
             (PageManager.hiddenElement[glitter.pageConfig[index].id] &&
                 document.getElementById('glitterPage')!.appendChild(PageManager.hiddenElement[glitter.pageConfig[index].id]));
             glitter.pageConfig[index].createResource();
-            window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
+            if(glitter.pageConfig[index].type === GVCType.Page){
+                window.history.replaceState({}, document.title, glitter.pageConfig[index].search);
+            }
         } catch (e) {
         }
     }

package/lowcode/jspage/main.ts

@@ -17,20 +17,15 @@ import {SetGlobalValue} from '../editor/set-global-value.js';
 import {PageCodeSetting} from '../editor/page-code-setting.js';
 import {NormalPageEditor} from '../editor/normal-page-editor.js';
 import {EditorConfig} from '../editor-config.js';
-import {all} from 'underscore/index.js';
 import {BgCustomerMessage} from '../backend-manager/bg-customer-message.js';
 import {BgGuide} from "../backend-manager/bg-guide.js";
 import {ApiShop} from "../glitter-base/route/shopping.js";
-import {StepManager} from "../modules/step-manager.js";
 import {ShareDialog} from "../glitterBundle/dialog/ShareDialog.js";
-import {EditorElem} from "../glitterBundle/plugins/editor-elem.js";
 import {SearchIdea} from "../editor/search-idea.js";
 import {AiMessage} from "../cms-plugin/ai-message.js";
 import {GlobalWidget} from "../glitterBundle/html-component/global-widget.js";
 import {BgWidget} from "../backend-manager/bg-widget.js";
 import {ApiUser} from "../glitter-base/route/user.js";
-import {AiPointsApi} from "../glitter-base/route/ai-points-api.js";
-import {ApiCart} from "../glitter-base/route/api-cart.js";
 import {BaseApi} from "../glitterBundle/api/base.js";
 import {GlobalUser} from "../glitter-base/global/global-user.js";
 import {Article} from "../glitter-base/route/article.js";
@@ -39,6 +34,7 @@ const html = String.raw;
 //
 const editorContainerID = `HtmlEditorContainer`;
 init(import.meta.url, (gvc, glitter, gBundle) => {
+
     glitter.share.ai_message = AiMessage
     glitter.share.loading_dialog = (new ShareDialog(gvc.glitter))
 

package/package.json

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