ts-glitter 21.4.6 → 21.4.8

package/lowcode/public-components/headers/sy-03.ts

@@ -9,6 +9,7 @@ import { LanguageView } from '../public/language-view.js';
 import { HeaderClass } from './header-class.js';
 import { HeadInitial } from './head-initial.js';
 import { HeaderMobile } from './header-mobile.js';
+import { PdClass } from '../product/pd-class.js';
 
 const html = String.raw;
 
@@ -40,7 +41,7 @@ export class Sy03 {
                 >
                   <!--手機版選單-->
                   <div
-                    class="d-flex align-items-center justify-content-center d-md-none"
+                    class=" align-items-center justify-content-center ${PdClass.isShoppingPage() ? `d-none`:`d-flex d-lg-none`} "
                     style="width:45px !important;height:40px !important;"
                     onclick="${gvc.event(() => {
                       gvc.glitter.setDrawer(
@@ -103,7 +104,7 @@ export class Sy03 {
                                     const vm = {
                                       data: [],
                                     };
-                                    ApiUser.getPublicConfig('menu-setting', 'manager', (window as any).appName).then(
+                                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', (window as any).appName).then(
                                       res => {
                                         vm.data = res.response.value[Language.getLanguage()];
                                         gvc.notifyDataChange(id);
@@ -124,6 +125,9 @@ export class Sy03 {
                                         }
 
                                         function loopItems(data: any, show_border: boolean) {
+                                          if(PdClass.isShoppingPage()){
+                                            return  ``
+                                          }
                                           return data
                                             .map((dd: any) => {
                                               return html`
@@ -240,7 +244,7 @@ background: ${colors.bgr ?? '#000'};overflow-x: hidden;`,
                     const vm = {
                       data: [],
                     };
-                    ApiUser.getPublicConfig('menu-setting', 'manager', (window as any).appName).then(res => {
+                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', (window as any).appName).then(res => {
                       vm.data = res.response.value[Language.getLanguage()];
                       gvc.notifyDataChange(id);
                     });
@@ -248,6 +252,9 @@ background: ${colors.bgr ?? '#000'};overflow-x: hidden;`,
                       bind: id,
                       view: () => {
                         function loopItems(data: any) {
+                          if(PdClass.isShoppingPage()){
+                            return  ``
+                          }
                           return data
                             .map((dd: any) => {
                               return html` <li class="nav-item dropdown">
@@ -342,6 +349,9 @@ padding-bottom: 2px;
                                   return {
                                     bind: vm.id,
                                     view: () => {
+                                      if(PdClass.isShoppingPage()){
+                                        return  ``
+                                      }
                                       if (!vm.toggle) {
                                         return html`<i
                                           class="fa-regular fa-magnifying-glass"

package/lowcode/public-components/headers/sy-04.js

@@ -8,6 +8,7 @@ import { LanguageView } from '../public/language-view.js';
 import { HeaderClass } from './header-class.js';
 import { HeadInitial } from './head-initial.js';
 import { HeaderMobile } from './header-mobile.js';
+import { PdClass } from '../product/pd-class.js';
 const html = String.raw;
 export class Sy04 {
     static main(gvc, widget, subData) {
@@ -30,7 +31,7 @@ export class Sy04 {
               <div class="d-flex align-items-center justify-content-center h-100 gap-2">
                 <!--手機版選單-->
                 <div
-                  class="d-flex d-lg-none align-items-center justify-content-center"
+                  class="${PdClass.isShoppingPage() ? `d-none` : `d-flex d-lg-none`} align-items-center justify-content-center"
                   style="width:40px !important;height:40px !important;"
                   onclick="${gvc.event(() => {
                     gvc.glitter.setDrawer(gvc.bindView(() => {
@@ -105,7 +106,7 @@ export class Sy04 {
                                     const vm = {
                                         data: [],
                                     };
-                                    ApiUser.getPublicConfig('menu-setting', 'manager', window.appName).then(res => {
+                                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', window.appName).then(res => {
                                         vm.data = res.response.value[Language.getLanguage()];
                                         gvc.notifyDataChange(id);
                                     });
@@ -123,6 +124,9 @@ export class Sy04 {
                                                 loop(vm.data);
                                             }
                                             function loopItems(data, show_border) {
+                                                if (PdClass.isShoppingPage()) {
+                                                    return ``;
+                                                }
                                                 return data
                                                     .map((dd) => {
                                                     var _a, _b, _c, _d, _e;
@@ -251,7 +255,7 @@ background: ${(_a = colors.bgr) !== null && _a !== void 0 ? _a : '#000'};overflo
                     const vm = {
                         data: [],
                     };
-                    ApiUser.getPublicConfig('menu-setting', 'manager', window.appName).then(res => {
+                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', window.appName).then(res => {
                         vm.data = res.response.value[Language.getLanguage()];
                         gvc.notifyDataChange(id);
                     });
@@ -259,6 +263,9 @@ background: ${(_a = colors.bgr) !== null && _a !== void 0 ? _a : '#000'};overflo
                         bind: id,
                         view: () => {
                             function loopItems(data) {
+                                if (PdClass.isShoppingPage()) {
+                                    return ``;
+                                }
                                 return data
                                     .map((dd) => {
                                     var _a, _b;
@@ -347,6 +354,9 @@ padding-bottom: 2px;
                             bind: vm.id,
                             view: () => {
                                 var _a, _b;
+                                if (PdClass.isShoppingPage()) {
+                                    return ``;
+                                }
                                 if (!vm.toggle) {
                                     return html `<i
                                           class="fa-regular fa-magnifying-glass"

package/lowcode/public-components/headers/sy-04.ts

@@ -9,6 +9,7 @@ import { LanguageView } from '../public/language-view.js';
 import { HeaderClass } from './header-class.js';
 import { HeadInitial } from './head-initial.js';
 import { HeaderMobile } from './header-mobile.js';
+import { PdClass } from '../product/pd-class.js';
 
 const html = String.raw;
 
@@ -33,7 +34,7 @@ export class Sy04 {
               <div class="d-flex align-items-center justify-content-center h-100 gap-2">
                 <!--手機版選單-->
                 <div
-                  class="d-flex d-lg-none align-items-center justify-content-center"
+                  class="${PdClass.isShoppingPage() ? `d-none`:`d-flex d-lg-none`} align-items-center justify-content-center"
                   style="width:40px !important;height:40px !important;"
                   onclick="${gvc.event(() => {
                     gvc.glitter.setDrawer(
@@ -107,7 +108,7 @@ export class Sy04 {
                                   const vm = {
                                     data: [],
                                   };
-                                  ApiUser.getPublicConfig('menu-setting', 'manager', (window as any).appName).then(
+                                  ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', (window as any).appName).then(
                                     res => {
                                       vm.data = res.response.value[Language.getLanguage()];
 
@@ -129,6 +130,9 @@ export class Sy04 {
                                       }
 
                                       function loopItems(data: any, show_border: boolean) {
+                                        if(PdClass.isShoppingPage()){
+                                          return  ``
+                                        }
                                         return data
                                           .map((dd: any) => {
                                             return html`
@@ -258,7 +262,7 @@ background: ${colors.bgr ?? '#000'};overflow-x: hidden;`,
                     const vm = {
                       data: [],
                     };
-                    ApiUser.getPublicConfig('menu-setting', 'manager', (window as any).appName).then(res => {
+                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', (window as any).appName).then(res => {
                       vm.data = res.response.value[Language.getLanguage()];
                       gvc.notifyDataChange(id);
                     });
@@ -266,6 +270,9 @@ background: ${colors.bgr ?? '#000'};overflow-x: hidden;`,
                       bind: id,
                       view: () => {
                         function loopItems(data: any) {
+                          if(PdClass.isShoppingPage()){
+                            return  ``
+                          }
                           return data
                             .map((dd: any) => {
                               return html` <li class="nav-item dropdown">
@@ -353,6 +360,9 @@ padding-bottom: 2px;
                                   return {
                                     bind: vm.id,
                                     view: () => {
+                                      if(PdClass.isShoppingPage()){
+                                        return  ``
+                                      }
                                       if (!vm.toggle) {
                                         return html`<i
                                           class="fa-regular fa-magnifying-glass"

package/lowcode/public-components/headers/sy-05.js

@@ -4,6 +4,7 @@ import { LanguageView } from "../public/language-view.js";
 import { Color } from "../public/color.js";
 import { HeadInitial } from './head-initial.js';
 import { HeaderMobile } from './header-mobile.js';
+import { PdClass } from '../product/pd-class.js';
 const html = String.raw;
 export class Sy05 {
     static main(gvc, widget, subData) {
@@ -27,7 +28,7 @@ export class Sy05 {
                 <div class="d-flex align-items-center justify-content-center h-100 w-100 gap-2">
                   <!--手機版選單-->
                   <div
-                    class="d-flex align-items-center justify-content-center"
+                    class="${PdClass.isShoppingPage() ? `d-none` : `d-flex d-lg-none`} align-items-center justify-content-center"
                     style="width:40px !important;height:40px !important;"
                     onclick="${gvc.event(() => {
                     gvc.glitter.setDrawer(gvc.bindView(() => {
@@ -78,7 +79,7 @@ export class Sy05 {
                                     const vm = {
                                         data: [],
                                     };
-                                    ApiUser.getPublicConfig('menu-setting', 'manager', window.appName).then((res) => {
+                                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', window.appName).then((res) => {
                                         vm.data = res.response.value[Language.getLanguage()];
                                         gvc.notifyDataChange(id);
                                     });
@@ -96,6 +97,9 @@ export class Sy05 {
                                                 loop(vm.data);
                                             }
                                             function loopItems(data, show_border) {
+                                                if (PdClass.isShoppingPage()) {
+                                                    return ``;
+                                                }
                                                 return data
                                                     .map((dd) => {
                                                     var _a, _b, _c, _d, _e;
@@ -198,7 +202,7 @@ background: ${(_a = widget.formData.theme_color['background']) !== null && _a !=
                     const vm = {
                         data: [],
                     };
-                    ApiUser.getPublicConfig('menu-setting', 'manager', window.appName).then((res) => {
+                    ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', window.appName).then((res) => {
                         vm.data = res.response.value[Language.getLanguage()];
                         gvc.notifyDataChange(id);
                     });
@@ -206,6 +210,9 @@ background: ${(_a = widget.formData.theme_color['background']) !== null && _a !=
                         bind: id,
                         view: () => {
                             function loopItems(data) {
+                                if (PdClass.isShoppingPage()) {
+                                    return ``;
+                                }
                                 return data
                                     .map((dd) => {
                                     var _a, _b;

package/lowcode/public-components/headers/sy-05.ts

@@ -9,6 +9,7 @@ import { HeaderClass } from './header-class.js';
 import { getCheckoutCount } from '../../official_event/e-commerce/get-count.js';
 import { GlobalUser } from '../../glitter-base/global/global-user.js';
 import { HeaderMobile } from './header-mobile.js';
+import { PdClass } from '../product/pd-class.js';
 
 const html = String.raw;
 
@@ -34,7 +35,7 @@ export class Sy05 {
                 <div class="d-flex align-items-center justify-content-center h-100 w-100 gap-2">
                   <!--手機版選單-->
                   <div
-                    class="d-flex align-items-center justify-content-center"
+                    class="${PdClass.isShoppingPage() ? `d-none`:`d-flex d-lg-none`} align-items-center justify-content-center"
                     style="width:40px !important;height:40px !important;"
                     onclick="${gvc.event(() => {
                       gvc.glitter.setDrawer(
@@ -85,7 +86,7 @@ export class Sy05 {
                                   const vm = {
                                     data: [],
                                   };
-                                  ApiUser.getPublicConfig('menu-setting', 'manager', (window as any).appName).then((res) => {
+                                  ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', (window as any).appName).then((res) => {
                                     vm.data = res.response.value[Language.getLanguage()];
                                     gvc.notifyDataChange(id);
                                   });
@@ -104,6 +105,9 @@ export class Sy05 {
                                       }
 
                                       function loopItems(data: any, show_border: boolean) {
+                                        if(PdClass.isShoppingPage()){
+                                          return  ``
+                                        }
                                         return data
                                           .map((dd: any) => {
                                             return html`
@@ -208,7 +212,7 @@ background: ${widget.formData.theme_color['background'] ?? '#000'};overflow-x: h
                       const vm = {
                         data: [],
                       };
-                      ApiUser.getPublicConfig('menu-setting', 'manager', (window as any).appName).then((res) => {
+                      ApiUser.getPublicConfig(widget.formData.menu_refer || 'menu-setting', 'manager', (window as any).appName).then((res) => {
                         vm.data = res.response.value[Language.getLanguage()];
                         gvc.notifyDataChange(id);
                       });
@@ -216,6 +220,9 @@ background: ${widget.formData.theme_color['background'] ?? '#000'};overflow-x: h
                         bind: id,
                         view: () => {
                           function loopItems(data: any) {
+                            if(PdClass.isShoppingPage()){
+                              return  ``
+                            }
                             return data
                               .map((dd: any) => {
                                 return html` <li class="nav-item dropdown">

package/lowcode/public-components/product/pd-card-01.js

@@ -154,7 +154,17 @@ export class ProductCard01 {
         return html ` <div
       class="card mb-7 card-border"
       onclick="${gvc.event(() => {
-            PdClass.changePage(prod, gvc);
+            if (PdClass.isShoppingPage()) {
+                PdClass.addCartAction({
+                    gvc: gvc,
+                    titleFontColor: titleFontColor,
+                    prod: prod,
+                    vm: vm,
+                });
+            }
+            else {
+                PdClass.changePage(prod, gvc);
+            }
         })}"
     >
       <div

package/lowcode/public-components/product/pd-card-01.ts

@@ -172,7 +172,16 @@ export class ProductCard01 {
     return html` <div
       class="card mb-7 card-border"
       onclick="${gvc.event(() => {
-        PdClass.changePage(prod, gvc);
+        if(PdClass.isShoppingPage()){
+          PdClass.addCartAction({
+            gvc: gvc,
+            titleFontColor: titleFontColor,
+            prod: prod,
+            vm: vm,
+          })
+        }else{
+          PdClass.changePage(prod, gvc)
+        }
       })}"
     >
       <div

package/lowcode/public-components/product/pd-card-02.js

@@ -142,7 +142,19 @@ export class ProductCard02 {
         return html `<div
       class="card mb-7 card-border"
       style="cursor: pointer"
-      onclick="${gvc.event(() => PdClass.changePage(prod, gvc))}"
+      onclick="${gvc.event(() => {
+            if (PdClass.isShoppingPage()) {
+                PdClass.addCartAction({
+                    gvc: gvc,
+                    titleFontColor: titleFontColor,
+                    prod: prod,
+                    vm: vm,
+                });
+            }
+            else {
+                PdClass.changePage(prod, gvc);
+            }
+        })}"
     >
       <div
         class="card-img-top parent card-image position-relative"

package/lowcode/public-components/product/pd-card-02.ts

@@ -161,7 +161,18 @@ export class ProductCard02 {
     return html`<div
       class="card mb-7 card-border"
       style="cursor: pointer"
-      onclick="${gvc.event(() => PdClass.changePage(prod, gvc))}"
+      onclick="${gvc.event(() => {
+        if(PdClass.isShoppingPage()){
+          PdClass.addCartAction({
+            gvc: gvc,
+            titleFontColor: titleFontColor,
+            prod: prod,
+            vm: vm,
+          })
+        }else{
+          PdClass.changePage(prod, gvc)
+        }
+      })}"
     >
       <div
         class="card-img-top parent card-image position-relative"

package/lowcode/public-components/product/pd-card-03.js

@@ -148,7 +148,19 @@ export class ProductCard03 {
         return html ` <div
       class="card mb-7 card-border"
       style="cursor: pointer"
-      onclick="${gvc.event(() => PdClass.changePage(prod, gvc))}"
+      onclick="${gvc.event(() => {
+            if (PdClass.isShoppingPage()) {
+                PdClass.addCartAction({
+                    gvc: gvc,
+                    titleFontColor: titleFontColor,
+                    prod: prod,
+                    vm: vm,
+                });
+            }
+            else {
+                PdClass.changePage(prod, gvc);
+            }
+        })}"
     >
       <div
         class="card-img-top parent card-image position-relative"

package/lowcode/public-components/product/pd-card-03.ts

@@ -166,7 +166,18 @@ export class ProductCard03 {
     return html` <div
       class="card mb-7 card-border"
       style="cursor: pointer"
-      onclick="${gvc.event(() => PdClass.changePage(prod, gvc))}"
+      onclick="${gvc.event(() => {
+        if(PdClass.isShoppingPage()){
+          PdClass.addCartAction({
+            gvc: gvc,
+            titleFontColor: titleFontColor,
+            prod: prod,
+            vm: vm,
+          })
+        }else{
+          PdClass.changePage(prod, gvc)
+        }
+      })}"
     >
       <div
         class="card-img-top parent card-image position-relative"

package/lowcode/public-components/product/pd-class.js

@@ -410,6 +410,12 @@ export class PdClass {
             };
         });
     }
+    static isShoppingPage() {
+        const glitter = window.glitter;
+        return ['hidden/', 'shop/'].find((dd) => {
+            return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd));
+        }) || glitter.share.is_shop;
+    }
     static changePage(prod, gvc) {
         const glitter = gvc.glitter;
         let path = '';
@@ -961,8 +967,8 @@ export class PdClass {
                             }));
                         }
                         viewMap.push(html `<button
-                  class="add-cart-btn fw-bold fs-sm"
-                  style=" flex: 1;height:44px;"
+                  class="${PdClass.isShoppingPage() ? `add-cart-imd-btn` : `add-cart-btn`} fw-bold fs-sm"
+                  style="flex: 1;height:44px;"
                   onclick="${gvc.event(() => {
                             if (document.body.clientWidth < 800) {
                                 this.addProductPopUp(obj, 'addCart', () => refreshAll());
@@ -998,35 +1004,37 @@ export class PdClass {
                 >
                   ${isOutOfStock ? Language.text('preorder_item') : Language.text('add_to_cart')}
                 </button>`);
-                        viewMap.push(html `<button
+                        if (!PdClass.isShoppingPage()) {
+                            viewMap.push(html `<button
                   class="add-cart-imd-btn fw-bold fs-sm"
                   style="cursor: pointer; flex: 1;height:44px;"
                   onclick="${gvc.event(() => {
-                            if (document.body.clientWidth < 800) {
-                                this.addProductPopUp(obj, 'buyNow', () => {
-                                    refreshAll();
+                                if (document.body.clientWidth < 800) {
+                                    this.addProductPopUp(obj, 'buyNow', () => {
+                                        refreshAll();
+                                    });
+                                    return;
+                                }
+                                const buy_it = new ApiCart(ApiCart.buyItNow);
+                                buy_it.clearCart();
+                                buy_it.addToCart(`${prod.id}`, vm.specs, vm.quantity);
+                                ApiCart.toCheckOutPage(ApiCart.buyItNow);
+                                gvc.closeDialog();
+                                ApiTrack.track({
+                                    event_name: 'AddToCart',
+                                    custom_data: {
+                                        currency: 'TWD',
+                                        value: variant.sale_price,
+                                        content_ids: [variant.sku || `${prod.id}-${vm.specs.join('-')}`],
+                                        content_name: prod.title,
+                                        content_type: 'product',
+                                    },
                                 });
-                                return;
-                            }
-                            const buy_it = new ApiCart(ApiCart.buyItNow);
-                            buy_it.clearCart();
-                            buy_it.addToCart(`${prod.id}`, vm.specs, vm.quantity);
-                            ApiCart.toCheckOutPage(ApiCart.buyItNow);
-                            gvc.closeDialog();
-                            ApiTrack.track({
-                                event_name: 'AddToCart',
-                                custom_data: {
-                                    currency: 'TWD',
-                                    value: variant.sale_price,
-                                    content_ids: [variant.sku || `${prod.id}-${vm.specs.join('-')}`],
-                                    content_name: prod.title,
-                                    content_type: 'product',
-                                },
-                            });
-                        })}"
+                            })}"
                 >
                   ${Language.text('buy_it_now')}
                 </button>`);
+                        }
                         return viewMap.join('');
                     },
                     divCreate: {

package/lowcode/public-components/product/pd-class.ts

@@ -575,6 +575,13 @@ export class PdClass {
     });
   }
 
+  static isShoppingPage(){
+    const glitter = (window as any).glitter;
+   return ['hidden/','shop/'].find((dd)=>{
+     return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd))
+   }) || glitter.share.is_shop;
+  }
+  // document.querySelector('.check_out_cart_data').scrollIntoView()
   static changePage(prod: any, gvc: GVC) {
     const glitter = gvc.glitter;
     let path = '';
@@ -1178,8 +1185,8 @@ export class PdClass {
               }
               viewMap.push(
                 html`<button
-                  class="add-cart-btn fw-bold fs-sm"
-                  style=" flex: 1;height:44px;"
+                  class="${PdClass.isShoppingPage() ? `add-cart-imd-btn`:`add-cart-btn`} fw-bold fs-sm"
+                  style="flex: 1;height:44px;"
                   onclick="${gvc.event(() => {
                     if (document.body.clientWidth < 800) {
                       this.addProductPopUp(obj, 'addCart', () => refreshAll());
@@ -1215,8 +1222,9 @@ export class PdClass {
                   ${isOutOfStock ? Language.text('preorder_item') : Language.text('add_to_cart')}
                 </button>`
               );
-              viewMap.push(
-                html`<button
+              if(!PdClass.isShoppingPage()){
+                viewMap.push(
+                  html`<button
                   class="add-cart-imd-btn fw-bold fs-sm"
                   style="cursor: pointer; flex: 1;height:44px;"
                   onclick="${gvc.event(() => {
@@ -1245,7 +1253,9 @@ export class PdClass {
                 >
                   ${Language.text('buy_it_now')}
                 </button>`
-              );
+                );
+              }
+             
               return viewMap.join('');
             },
             divCreate: {

package/package.json

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

package/src/services/template.js

@@ -360,17 +360,15 @@ class Template {
                     resolve(page_data);
                 }
             });
-            if (config.req.query.page_refer) {
-                for (const b of response_) {
-                    if (b.tag === 'c_header') {
-                        const c_config = (await new user_js_1.User(b.appName).getConfigV2({
-                            key: 'c_header_' + config.req.query.page_refer,
-                            user_id: 'manager'
-                        }));
-                        if (c_config && c_config[0]) {
-                            console.log(`c_config[0]==>`, c_config[0]);
-                            b.config = c_config;
-                        }
+            for (const b of response_) {
+                if (b.tag === 'c_header') {
+                    console.log(`c_header->==>`, config.req.query.page_refer);
+                    const c_config = (await new user_js_1.User(b.appName).getConfigV2({
+                        key: 'c_header_' + config.req.query.page_refer,
+                        user_id: 'manager'
+                    }));
+                    if (c_config && c_config[0]) {
+                        b.config = c_config;
                     }
                 }
             }