ts-glitter 13.2.2 → 13.2.4

package/lowcode/Entry.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ApiUser } from './api/user.js';
 import { config } from './config.js';
 import { ApiPageConfig } from './api/pageConfig.js';
 import { BaseApi } from './glitterBundle/api/base.js';
@@ -57,7 +56,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.2.2";
+        glitter.share.editerVersion = "V_13.2.4";
         glitter.share.start = (new Date());
         const vm = {
             appConfig: [],
@@ -262,46 +261,23 @@ export class Entry {
                 }
             }));
         }
-        if (glitter.getUrlParameter('account')) {
-            ApiUser.login({
-                account: glitter.getUrlParameter('account'),
-                pwd: glitter.getUrlParameter('pwd'),
-            }).then((re) => {
-                if (re.result) {
-                    GlobalUser.token = re.response.userData.token;
-                    toNext();
-                }
-                else {
-                    const url = new URL(glitter.location.href);
-                    location.href = `${url.origin}/glitter/?page=signin`;
-                }
-            });
-        }
-        else {
-            if (!GlobalUser.saas_token) {
+        BaseApi.create({
+            url: config.url + `/api/v1/user/checkToken`,
+            type: 'GET',
+            timeout: 0,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: GlobalUser.saas_token,
+            },
+        }).then((d2) => {
+            if (!d2.result) {
                 const url = new URL(glitter.location.href);
-                location.href = `${url.origin}/glitter/?page=signin`;
+                location.href = `${url.origin}/${window.glitterBase}/login`;
             }
             else {
-                BaseApi.create({
-                    url: config.url + `/api/v1/user/checkToken`,
-                    type: 'GET',
-                    timeout: 0,
-                    headers: {
-                        'Content-Type': 'application/json',
-                        Authorization: GlobalUser.saas_token,
-                    },
-                }).then((d2) => {
-                    if (!d2.result) {
-                        const url = new URL(glitter.location.href);
-                        location.href = `${url.origin}/glitter/?page=signin`;
-                    }
-                    else {
-                        toNext();
-                    }
-                });
+                toNext();
             }
-        }
+        });
     }
     static toHtmlEditor(glitter, vm, callback) {
         var _a;

package/lowcode/Entry.ts

@@ -1,17 +1,17 @@
 'use strict';
 import {Glitter} from './glitterBundle/Glitter.js';
-import {ApiUser} from './api/user.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 {ApiUser} from "./glitter-base/route/user.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) => {
@@ -56,7 +56,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.2.2";
+        glitter.share.editerVersion = "V_13.2.4";
         glitter.share.start = (new Date());
         const vm: {
             appConfig: any;
@@ -73,11 +73,11 @@ 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;
@@ -161,8 +161,8 @@ export class Entry {
             // 載入全域資源
             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, () => {
                 });
@@ -210,6 +210,8 @@ export class Entry {
         if (!glitter.getUrlParameter('function')) {
             glitter.setUrlParameter('function', 'backend-manger');
         }
+
+
         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) {
@@ -282,42 +284,22 @@ export class Entry {
             });
         }
 
-        if (glitter.getUrlParameter('account')) {
-            ApiUser.login({
-                account: glitter.getUrlParameter('account'),
-                pwd: glitter.getUrlParameter('pwd'),
-            }).then((re) => {
-                if (re.result) {
-                    GlobalUser.token = re.response.userData.token;
-                    toNext();
-                } else {
-                    const url = new URL(glitter.location.href);
-                    location.href = `${url.origin}/glitter/?page=signin`;
-                }
-            });
-        } else {
-            if (!GlobalUser.saas_token) {
+        BaseApi.create({
+            url: config.url + `/api/v1/user/checkToken`,
+            type: 'GET',
+            timeout: 0,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: GlobalUser.saas_token,
+            },
+        }).then((d2) => {
+            if (!d2.result) {
                 const url = new URL(glitter.location.href);
-                location.href = `${url.origin}/glitter/?page=signin`;
+                location.href = `${url.origin}/${(window as any).glitterBase}/login`;
             } else {
-                BaseApi.create({
-                    url: config.url + `/api/v1/user/checkToken`,
-                    type: 'GET',
-                    timeout: 0,
-                    headers: {
-                        'Content-Type': 'application/json',
-                        Authorization: GlobalUser.saas_token,
-                    },
-                }).then((d2) => {
-                    if (!d2.result) {
-                        const url = new URL(glitter.location.href);
-                        location.href = `${url.origin}/glitter/?page=signin`;
-                    } else {
-                        toNext();
-                    }
-                });
+                toNext();
             }
-        }
+        });
     }
 
     // 跳轉至頁面編輯器Iframe顯示

package/lowcode/backend-manager/bg-customer-message.js

@@ -113,9 +113,18 @@ export class BgCustomerMessage {
                              class="rounded-circle border"
                              style="background: white;border-radius: 50%;width: 40px;height: 40px;" width="40"
                              alt="Albert Flores">
-                        <div class="d-flex flex-column px-1 text-white">
-                            <h6 class="mb-0 text-white d-flex">客服訊息</h6>
-                            <span class="fw-500 d-none" style="font-size:13px;">剩餘代幣:10</span>
+                        <div class="d-flex  px-1 text-white align-items-center" style="gap:8px;">
+                            <h6 class="mb-0 text-white " style="">一站式客服整合系統</h6>
+                            ${BgWidget.questionButton(gvc.event(() => {
+                                BgWidget.dialog({
+                                    gvc,
+                                    title: '提示',
+                                    innerHTML: () => {
+                                        return BgWidget.alertInfo([`<div class="fs-6 fw-500" style="white-space: normal;word-break: break-all;">請前往第三方整合設定，以同步Line與Facebook官方訊息。為確保訊息同步，請統一透過SHOPNEX後台發送訊息。</div>`].join('')) + ` <img class="w-100" src="https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/Screenshot 2024-10-22 at 4.58.00 PM.jpg">`;
+                                    },
+                                    width: 200
+                                });
+                            }))}
                         </div>
                         <div class="flex-fill" style="flex: 1;"></div>
                         <i class="fa-regular fa-circle-xmark text-white fs-3 " aria-hidden="true"

package/lowcode/backend-manager/bg-customer-message.ts

@@ -129,9 +129,20 @@ export class BgCustomerMessage {
                              class="rounded-circle border"
                              style="background: white;border-radius: 50%;width: 40px;height: 40px;" width="40"
                              alt="Albert Flores">
-                        <div class="d-flex flex-column px-1 text-white">
-                            <h6 class="mb-0 text-white d-flex">客服訊息</h6>
-                            <span class="fw-500 d-none" style="font-size:13px;">剩餘代幣:10</span>
+                        <div class="d-flex  px-1 text-white align-items-center" style="gap:8px;">
+                            <h6 class="mb-0 text-white " style="">一站式客服整合系統</h6>
+                            ${BgWidget.questionButton(
+                                gvc.event(() => {
+                                    BgWidget.dialog({
+                                        gvc,
+                                        title: '提示',
+                                        innerHTML: () => {
+                                            return BgWidget.alertInfo([`<div class="fs-6 fw-500" style="white-space: normal;word-break: break-all;">請前往第三方整合設定，以同步Line與Facebook官方訊息。為確保訊息同步，請統一透過SHOPNEX後台發送訊息。</div>`].join(''))+` <img class="w-100" src="https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/Screenshot 2024-10-22 at 4.58.00 PM.jpg">`
+                                        },
+                                        width: 200
+                                    });
+                                })
+                            )}
                         </div>
                         <div class="flex-fill" style="flex: 1;"></div>
                         <i class="fa-regular fa-circle-xmark text-white fs-3 " aria-hidden="true"
@@ -692,7 +703,8 @@ export class BgCustomerMessage {
             const listId = gvc.glitter.getUUID();
             let chatData: any = undefined;
             let unRead: any = undefined;
-            function loadData(){
+
+            function loadData() {
                 Chat.getChatRoom({
                     page: 0,
                     limit: 1000,
@@ -707,11 +719,13 @@ export class BgCustomerMessage {
                     });
                 });
             }
+
             let socket: any = undefined
             const url = new URL((window as any).glitterBackend)
             let vm = {
                 close: false
             }
+
             function connect() {
                 socket = (location.href.includes('https://')) ? new WebSocket(`wss://${url.hostname}/websocket`) : new WebSocket(`ws://${url.hostname}:9003`);
                 socket.addEventListener('open', function (event: any) {
@@ -726,7 +740,7 @@ export class BgCustomerMessage {
                     console.log(`update_message_count`)
                     const data = JSON.parse(event.data)
                     if (data.type === 'update_message_count') {
-                        vm.close=true
+                        vm.close = true
                         socket && socket.close()
                         loadData()
                     }
@@ -739,6 +753,7 @@ export class BgCustomerMessage {
                     }
                 });
             }
+
             loadData()
 
             return {
@@ -764,7 +779,7 @@ export class BgCustomerMessage {
                                                 dd.topMessage.text = dd.topMessage?.text ?? "圖片內容";
                                                 dd.user_data = dd.user_data ?? {}
                                                 if (dd.topMessage && dd.chat_id !== 'manager-preview') {
-                                                    console.log(`unRead==>`,unRead)
+                                                    console.log(`unRead==>`, unRead)
                                                     const unReadCount = unRead.filter((d2: any) => {
                                                         return dd.chat_id === d2.chat_id;
                                                     }).length;
@@ -891,15 +906,15 @@ export class BgCustomerMessage {
                     }
                 },
                 divCreate: {},
-                onCreate:()=>{
-                    setTimeout(()=>{
-                        vm.close=false
+                onCreate: () => {
+                    setTimeout(() => {
+                        vm.close = false
                         connect()
-                    },50)
+                    }, 50)
 
                 },
-                onDestroy:()=>{
-                    vm.close=true
+                onDestroy: () => {
+                    vm.close = true
                     socket && socket.close()
                 }
             };
@@ -1184,9 +1199,9 @@ export class BgCustomerMessage {
                                         document.querySelector(`#message-lines`).innerHTML += BgCustomerMessage.message_line(data, cf, vm.data.length - 1, vm, gvc);
                                         if (st + ofs >= sh - 50) {
                                             element.scrollTop = element.scrollHeight;
-                                            setTimeout(()=>{
+                                            setTimeout(() => {
                                                 element.scrollTop = element.scrollHeight;
-                                            },1000)
+                                            }, 1000)
                                         }
                                     }
                                 });