ts-glitter 21.4.0 → 21.4.2

package/lowcode/Entry.js

@@ -127,6 +127,23 @@ export class Entry {
             if (glitter.getUrlParameter('page') !== 'backend_manager') {
                 Entry.checkRedirectPage(glitter);
             }
+            if (['pages/', 'hidden/', 'shop/'].find((dd) => {
+                return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd));
+            })) {
+                const og_path = glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');
+                window.page_refer = og_path;
+                setInterval(() => {
+                    if (glitter.getUrlParameter('page') === 'index') {
+                        glitter.href = '/' + og_path;
+                    }
+                    else if (glitter.getUrlParameter('page') !== og_path) {
+                        glitter.setUrlParameter('page_refer', og_path);
+                    }
+                    else {
+                        glitter.setUrlParameter('page_refer', undefined);
+                    }
+                }, 100);
+            }
             glitter.share.logID = glitter.getUUID();
             glitter.addStyle(`
       @media (prefers-reduced-motion: no-preference) {
@@ -146,7 +163,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_21.4.0';
+            glitter.share.editerVersion = 'V_21.4.2';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -131,6 +131,24 @@ export class Entry {
       if (glitter.getUrlParameter('page') !== 'backend_manager') {
         Entry.checkRedirectPage(glitter);
       }
+
+      //紀錄初始載入頁面，後續會帶入query當中用與替換Header避免跳頁
+      if(['pages/','hidden/','shop/'].find((dd)=>{
+        return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd))
+      })){
+        const og_path=glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');
+        (window as any).page_refer=og_path;
+
+        setInterval(()=>{
+          if(glitter.getUrlParameter('page')==='index'){
+            glitter.href='/'+og_path
+          }else if(glitter.getUrlParameter('page')!==og_path){
+            glitter.setUrlParameter('page_refer',og_path)
+          }else{
+            glitter.setUrlParameter('page_refer',undefined)
+          }
+        },100)
+      }
       glitter.share.logID = glitter.getUUID();
       glitter.addStyle(`
       @media (prefers-reduced-motion: no-preference) {
@@ -150,7 +168,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_21.4.0';
+      glitter.share.editerVersion = 'V_21.4.2';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/api/pageConfig.js

@@ -11,6 +11,7 @@ import { config } from "../config.js";
 import { BaseApi } from "../glitterBundle/api/base.js";
 import { GlobalUser } from "../glitter-base/global/global-user.js";
 import { ShareDialog } from "../glitterBundle/dialog/ShareDialog.js";
+import { ApiUser } from '../glitter-base/route/user.js';
 export class ApiPageConfig {
     constructor() {
     }
@@ -114,6 +115,7 @@ export class ApiPageConfig {
                     (request.page_type) && (query.push(`page_type=${request.page_type}`));
                     (request.me) && (query.push(`me=${request.me}`));
                     (request.favorite) && (query.push(`favorite=${request.favorite}`));
+                    window.page_refer && query.push(`page_refer=${window.page_refer}`);
                     return query.join('&');
                 })(),
             "type": "GET",
@@ -163,16 +165,33 @@ export class ApiPageConfig {
         });
     }
     static setPage(data) {
-        return BaseApi.create({
-            "url": config.url + `/api/v1/template`,
-            "type": "PUT",
-            "timeout": 0,
-            "headers": {
-                "Content-Type": "application/json",
-                "Authorization": config.token
-            },
-            data: JSON.stringify(data)
-        });
+        if (data.tag === 'c_header' && ['pages/', 'hidden/', 'shop/'].find((dd) => {
+            return window.parent.glitter.getUrlParameter('page').startsWith(dd);
+        })) {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                data.config[0].is_customer_header = true;
+                yield ApiUser.setPublicConfig({
+                    key: 'c_header_' + window.parent.glitter.getUrlParameter('page'),
+                    value: data.config,
+                    user_id: 'manager',
+                });
+                resolve({
+                    result: true
+                });
+            }));
+        }
+        else {
+            return BaseApi.create({
+                "url": config.url + `/api/v1/template`,
+                "type": "PUT",
+                "timeout": 0,
+                "headers": {
+                    "Content-Type": "application/json",
+                    "Authorization": config.token
+                },
+                data: JSON.stringify(data)
+            });
+        }
     }
     static addPage(data) {
         return BaseApi.create({

package/lowcode/api/pageConfig.ts

@@ -3,6 +3,7 @@ import {BaseApi} from "../glitterBundle/api/base.js";
 import {GlobalUser} from "../glitter-base/global/global-user.js";
 import {EditorElem} from "../glitterBundle/plugins/editor-elem";
 import {ShareDialog} from "../glitterBundle/dialog/ShareDialog.js";
+import { ApiUser } from '../glitter-base/route/user.js';
 
 
 export class ApiPageConfig {
@@ -123,7 +124,8 @@ export class ApiPageConfig {
                     (request.type) && (query.push(`type=${request.type}`));
                     (request.page_type) && (query.push(`page_type=${request.page_type}`));
                     (request.me) && (query.push(`me=${request.me}`));
-                    (request.favorite) && (query.push(`favorite=${request.favorite}`))
+                    (request.favorite) && (query.push(`favorite=${request.favorite}`));
+                  (window as any).page_refer && query.push(`page_refer=${(window as any).page_refer}`);
                     return query.join('&')
                 })()
             ,
@@ -191,7 +193,7 @@ export class ApiPageConfig {
     public static setPage(data: {
         "id": number
         "appName": "lionDesign",
-        "tag": "home",
+        "tag"?: any,
         "group"?: "首頁相關",
         "name"?: "首頁",
         "config"?: [],
@@ -199,17 +201,47 @@ export class ApiPageConfig {
         "page_type"?: string,
         favorite?: number,
         preview_image?: string
-    }) {
+    }):Promise<{
+      result: boolean
+    }> {
+
+      if(data.tag==='c_header' && ['pages/','hidden/','shop/'].find((dd)=>{
+        return (window.parent as any).glitter.getUrlParameter('page').startsWith(dd)
+      })){
+       return  new Promise(async (resolve,reject)=>{
+         (data.config as any)[0].is_customer_header=true
+         await ApiUser.setPublicConfig({
+           key: 'c_header_'+(window.parent as any).glitter.getUrlParameter('page'),
+           value: data.config,
+           user_id: 'manager',
+         })
+         resolve({
+           result: true
+         })
+       })
+        // return BaseApi.create({
+        //   "url": config.url + `/api/v1/template`,
+        //   "type": "PUT",
+        //   "timeout": 0,
+        //   "headers": {
+        //     "Content-Type": "application/json",
+        //     "Authorization": config.token
+        //   },
+        //   data: JSON.stringify(data)
+        // })
+      }else{
         return BaseApi.create({
-            "url": config.url + `/api/v1/template`,
-            "type": "PUT",
-            "timeout": 0,
-            "headers": {
-                "Content-Type": "application/json",
-                "Authorization": config.token
-            },
-            data: JSON.stringify(data)
+          "url": config.url + `/api/v1/template`,
+          "type": "PUT",
+          "timeout": 0,
+          "headers": {
+            "Content-Type": "application/json",
+            "Authorization": config.token
+          },
+          data: JSON.stringify(data)
         })
+      }
+
     }
 
     public static addPage(data: {

package/lowcode/backend-manager/bg-blog.js

@@ -1132,6 +1132,11 @@ function detail(gvc, cf, vm, cVm, page_tab) {
         }, 400);
         function checkSwitchToUiEditor() {
             function next() {
+                Object.keys(window.glitterInitialHelper.share).map((dd) => {
+                    if (dd.startsWith('getPageData-')) {
+                        window.glitterInitialHelper.share[dd] = undefined;
+                    }
+                });
                 localStorage.setItem('preview_data', JSON.stringify(vm.data.content));
                 window.parent.glitter.setUrlParameter('page-id', vm.data.id);
                 window.parent.glitter.setUrlParameter('language', language);

package/lowcode/backend-manager/bg-blog.ts

@@ -1266,6 +1266,11 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
 
     function checkSwitchToUiEditor() {
       function next() {
+        Object.keys((window as any).glitterInitialHelper.share).map((dd)=>{
+          if(dd.startsWith('getPageData-')){
+            (window as any).glitterInitialHelper.share[dd]=undefined
+          }
+        })
         localStorage.setItem('preview_data', JSON.stringify(vm.data.content));
         (window.parent as any).glitter.setUrlParameter('page-id', vm.data.id);
         (window.parent as any).glitter.setUrlParameter('language', language);

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

@@ -12,6 +12,7 @@ export class MenusSetting {
             index: 0,
             dataList: undefined,
             query: '',
+            tab: 'menu'
         };
         const filterID = gvc.glitter.getUUID();
         let vmi = undefined;
@@ -46,12 +47,20 @@ export class MenusSetting {
                             }))
                             : ''}
               </div>
+              ${BgWidget.tab([
+                            { title: '主選單', key: 'menu' },
+                            { title: '頁腳', key: 'footer' }
+                        ], gvc, vm.tab, (text) => {
+                            vm.tab = text;
+                            gvc.notifyDataChange(id);
+                        }, `margin-bottom:0px !important;`)}
               ${BgWidget.container(BgWidget.mainCard(BgWidget.tableV3({
                             gvc: gvc,
                             getData: vmi => {
                                 vm.dataList = [
-                                    { tag: 'menu-setting', title: '主選單' },
-                                    { tag: 'footer-setting', title: '頁腳' },
+                                    { tag: vm.tab === 'menu' ? 'menu-setting' : 'footer-setting', title: `
+                       <div> ${vm.tab === 'menu' ? `頁首選單` : `頁腳選單`} <span style="font-size:12px;color:#36B;">系統預設</span></div>
+                        ` }
                                 ];
                                 vmi.pageSize = 1;
                                 vmi.originalData = vm.dataList;
@@ -90,8 +99,8 @@ export class MenusSetting {
                     }
                 },
                 divCreate: {
-                    class: `mx-auto `,
-                    style: `max-width:100%;width:960px;`,
+                    class: `w-100 `,
+                    style: `max-width:100%;`,
                 },
             };
         });
@@ -187,7 +196,7 @@ export class MenusSetting {
                 view: () => {
                     var _a;
                     const link = vm.link[vm.language];
-                    return html `<div class="title-container" style="width: 856px; max-width: 100%;">
+                    return html `<div class="title-container" style="width: 100%; max-width: 100%;">
               ${BgWidget.goBack(cf.gvc.event(() => {
                         cf.goBack();
                     }))}${BgWidget.title((_a = cf.title) !== null && _a !== void 0 ? _a : '選單設定')}
@@ -202,7 +211,7 @@ export class MenusSetting {
                     })}
             </div>
             ${BgWidget.container(html `<div
-                style="max-width:100%;width: 856px; padding: 20px; background: white; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.08); border-radius: 10px; overflow: hidden; justify-content: center; align-items: center; display: inline-flex"
+                style="max-width:100%;width: 100%; padding: 20px; background: white; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.08); border-radius: 10px; overflow: hidden; justify-content: center; align-items: center; display: inline-flex"
               >
                 <div style="width: 100%;  position: relative">
                   <div

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

@@ -23,11 +23,13 @@ export class MenusSetting {
       index: number;
       dataList: any;
       query?: string;
+      tab:'menu'|'footer'
     } = {
       type: 'list',
       index: 0,
       dataList: undefined,
       query: '',
+      tab:'menu'
     };
     const filterID = gvc.glitter.getUUID();
     let vmi: any = undefined;
@@ -48,6 +50,7 @@ export class MenusSetting {
       function refresh() {
         gvc.notifyDataChange(id);
       }
+
       return {
         bind: id,
         dataList: [{ obj: vm, key: 'type' }],
@@ -67,14 +70,28 @@ export class MenusSetting {
                     )
                   : ''}
               </div>
+              ${BgWidget.tab(
+                [
+                  { title: '主選單', key: 'menu' },
+                  { title: '頁腳', key: 'footer' }
+                ],
+                gvc,
+                vm.tab,
+                (text) => {
+                  vm.tab=text as any
+                  gvc.notifyDataChange(id);
+                },
+                `margin-bottom:0px !important;`
+              )}
               ${BgWidget.container(
                 BgWidget.mainCard(
                   BgWidget.tableV3({
                     gvc: gvc,
                     getData: vmi => {
                       vm.dataList = [
-                        { tag: 'menu-setting', title: '主選單' },
-                        { tag: 'footer-setting', title: '頁腳' },
+                        { tag: vm.tab==='menu' ? 'menu-setting':'footer-setting', title: `
+                       <div> ${vm.tab==='menu' ? `頁首選單`:`頁腳選單`} <span style="font-size:12px;color:#36B;">系統預設</span></div>
+                        ` }
                       ];
                       vmi.pageSize = 1;
                       vmi.originalData = vm.dataList;
@@ -117,8 +134,8 @@ export class MenusSetting {
           }
         },
         divCreate: {
-          class: `mx-auto `,
-          style: `max-width:100%;width:960px;`,
+          class: `w-100 `,
+          style: `max-width:100%;`,
         },
       };
     });
@@ -236,7 +253,7 @@ export class MenusSetting {
         bind: vm.id,
         view: () => {
           const link = vm.link[vm.language];
-          return html`<div class="title-container" style="width: 856px; max-width: 100%;">
+          return html`<div class="title-container" style="width: 100%; max-width: 100%;">
               ${BgWidget.goBack(
                 cf.gvc.event(() => {
                   cf.goBack();
@@ -254,7 +271,7 @@ export class MenusSetting {
             </div>
             ${BgWidget.container(
               html`<div
-                style="max-width:100%;width: 856px; padding: 20px; background: white; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.08); border-radius: 10px; overflow: hidden; justify-content: center; align-items: center; display: inline-flex"
+                style="max-width:100%;width: 100%; padding: 20px; background: white; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.08); border-radius: 10px; overflow: hidden; justify-content: center; align-items: center; display: inline-flex"
               >
                 <div style="width: 100%;  position: relative">
                   <div

package/lowcode/cms-plugin/module/user-excel.js

@@ -223,19 +223,25 @@ export class UserExcel {
                     const jsonData = yield Excel.parseExcelToJson(gvc, target.files[0]);
                     dialog.dataLoading({ visible: false });
                     const setUserEmails = [...new Set(jsonData.map(user => user['電子信箱']))];
-                    if (jsonData.length > setUserEmails.length) {
+                    if (jsonData.filter((user) => {
+                        return user['電子信箱'];
+                    }).length > setUserEmails.filter((dd) => {
+                        return dd;
+                    }).length) {
                         dialog.errorMessage({ text: '會員電子信箱不可重複' });
                         return;
                     }
                     const setUserPhones = [...new Set(jsonData.map(user => user['電話']))];
-                    if (jsonData.length > setUserPhones.length) {
+                    if (jsonData.filter((user) => {
+                        return user['電話'];
+                    }).length > setUserPhones.length) {
                         dialog.errorMessage({ text: '會員電話不可重複' });
                         return;
                     }
                     for (let i = 0; i < jsonData.length; i++) {
                         const user = jsonData[i];
-                        if (!user['電子信箱']) {
-                            dialog.errorMessage({ text: '會員電子信箱不可為空' });
+                        if (!user['電子信箱'] && !user['電話']) {
+                            dialog.errorMessage({ text: '電話或信箱擇一必填' });
                             return;
                         }
                         const userData = {
@@ -260,7 +266,7 @@ export class UserExcel {
                             rebate: user['購物金餘額'],
                         };
                         jsonData[i] = {
-                            account: userData.email,
+                            account: userData.email | userData.phone,
                             pwd: gvc.glitter.getUUID(),
                             userData: userData,
                         };

package/lowcode/cms-plugin/module/user-excel.ts

@@ -364,13 +364,19 @@ export class UserExcel {
         dialog.dataLoading({ visible: false });
 
         const setUserEmails = [...new Set(jsonData.map(user => user['電子信箱']))];
-        if (jsonData.length > setUserEmails.length) {
+        if (jsonData.filter((user)=>{
+          return user['電子信箱']
+        }).length > setUserEmails.filter((dd)=>{
+          return dd
+        }).length) {
           dialog.errorMessage({ text: '會員電子信箱不可重複' });
           return;
         }
 
         const setUserPhones = [...new Set(jsonData.map(user => user['電話']))];
-        if (jsonData.length > setUserPhones.length) {
+        if (jsonData.filter((user)=>{
+          return user['電話']
+        }).length > setUserPhones.length) {
           dialog.errorMessage({ text: '會員電話不可重複' });
           return;
         }
@@ -378,8 +384,8 @@ export class UserExcel {
         for (let i = 0; i < jsonData.length; i++) {
           const user = jsonData[i];
 
-          if (!user['電子信箱']) {
-            dialog.errorMessage({ text: '會員電子信箱不可為空' });
+          if (!user['電子信箱'] && !user['電話']) {
+            dialog.errorMessage({ text: '電話或信箱擇一必填' });
             return;
           }
 
@@ -406,7 +412,7 @@ export class UserExcel {
           };
 
           jsonData[i] = {
-            account: userData.email,
+            account: userData.email | userData.phone,
             pwd: gvc.glitter.getUUID(),
             userData: userData,
           };