ts-glitter 21.1.7 → 21.1.9

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

@@ -283,6 +283,7 @@ export class PdClass {
         });
     }
     static showSwiper(obj) {
+        var _a;
         const isPhone = document.body.clientWidth < 768;
         obj.gvc.glitter.addStyleLink(['https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.css']);
         obj.gvc.glitter.addMtScript([
@@ -300,8 +301,10 @@ export class PdClass {
             }
         });
         PdClass.addSpecStyle(obj.gvc);
-        if (obj.vm.specs.length === 0) {
-            obj.vm.specs = obj.vm.specs.map((spec) => spec.option[0].title);
+        const invisibleVariants = obj.prod.variants.filter(v => v.invisible);
+        const visibleVariants = obj.prod.variants.filter(v => !v.invisible);
+        if (obj.vm.specs.length === 0 || invisibleVariants.find(iv => Tool.ObjCompare(iv.spec, obj.vm.specs))) {
+            obj.vm.specs = (_a = visibleVariants === null || visibleVariants === void 0 ? void 0 : visibleVariants[0].spec) !== null && _a !== void 0 ? _a : [];
         }
         obj.prod.preview_image = obj.prod.preview_image.filter(image => {
             return image !== 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg';
@@ -648,6 +651,7 @@ export class PdClass {
                 return {
                     bind: ids.ids_spec,
                     view: () => {
+                        const invisibleVariants = prod.variants.filter(v => v.invisible).map(v => v.spec);
                         return prod.specs
                             .map((spec, index1) => {
                             return html ` <div>
@@ -656,6 +660,11 @@ export class PdClass {
                       </h5>
                       <div class="d-flex gap-2 flex-wrap">
                         ${gvc.map(spec.option.map((opt) => {
+                                const cloneSpecs = vm.specs.slice();
+                                cloneSpecs[index1] = opt.title;
+                                if (invisibleVariants.find(iv => Tool.ObjCompare(iv, cloneSpecs))) {
+                                    return '';
+                                }
                                 return html ` <div
                               gvc-option="spec-option-${index1}"
                               class="spec-option ${vm.specs[index1] === opt.title ? 'selected-option' : ''}"

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

@@ -437,9 +437,13 @@ export class PdClass {
     });
     PdClass.addSpecStyle(obj.gvc);
 
+    // 可顯示與不可顯示產品規格
+    const invisibleVariants = obj.prod.variants.filter(v => v.invisible);
+    const visibleVariants = obj.prod.variants.filter(v => !v.invisible);
+
     // 更新規格
-    if (obj.vm.specs.length === 0) {
-      obj.vm.specs = obj.vm.specs.map((spec: any) => spec.option[0].title);
+    if (obj.vm.specs.length === 0 || invisibleVariants.find(iv => Tool.ObjCompare(iv.spec, obj.vm.specs))) {
+      obj.vm.specs = visibleVariants?.[0].spec ?? [];
     }
 
     // 過濾預覽圖片
@@ -830,6 +834,8 @@ export class PdClass {
           return {
             bind: ids.ids_spec,
             view: () => {
+              const invisibleVariants = prod.variants.filter(v => v.invisible).map(v => v.spec);
+
               return prod.specs
                 .map((spec, index1) => {
                   return html` <div>
@@ -839,6 +845,14 @@ export class PdClass {
                       <div class="d-flex gap-2 flex-wrap">
                         ${gvc.map(
                           spec.option.map((opt: any) => {
+                            // 排除不可顯示的規格選項
+                            const cloneSpecs = vm.specs.slice();
+                            cloneSpecs[index1] = opt.title;
+
+                            if (invisibleVariants.find(iv => Tool.ObjCompare(iv, cloneSpecs))) {
+                              return '';
+                            }
+
                             return html` <div
                               gvc-option="spec-option-${index1}"
                               class="spec-option ${vm.specs[index1] === opt.title ? 'selected-option' : ''}"
@@ -1052,7 +1066,6 @@ export class PdClass {
                           });
                         }
                       );
-                      // gvc.glitter.getModule('',(module)=>{
                     })}"
                   >
                     <i class="fa-brands fa-rocketchat"></i>

package/lowcode/public-components/public/ad.js

@@ -1,4 +1,14 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { ApiTrack } from '../../glitter-base/route/api-track.js';
+import { GlobalUser } from '../../glitter-base/global/global-user.js';
 export class Ad {
     static gtagEvent(name, obj) {
         const gtag = window.gtag;
@@ -7,16 +17,38 @@ export class Ad {
         }
     }
     static fbqEvent(name, obj) {
-        const fbq = window.fbq;
-        obj.eventID = obj.eventID || window.glitter.getUUID();
-        if (fbq) {
-            fbq('track', name, JSON.parse(JSON.stringify(obj)));
-        }
-        obj.event_id = obj.eventID;
-        delete obj.eventID;
-        ApiTrack.track({
-            event_name: name,
-            custom_data: obj,
+        return __awaiter(this, void 0, void 0, function* () {
+            const fbq = window.fbq;
+            obj.eventID = obj.eventID || window.glitter.getUUID();
+            if (fbq) {
+                if (GlobalUser.userInfo) {
+                    function hashSHA256(input) {
+                        return __awaiter(this, void 0, void 0, function* () {
+                            const encoder = new TextEncoder();
+                            const data = encoder.encode(input.trim().toLowerCase());
+                            const hashBuffer = yield crypto.subtle.digest('SHA-256', data);
+                            return Array.from(new Uint8Array(hashBuffer))
+                                .map(b => b.toString(16).padStart(2, '0'))
+                                .join('');
+                        });
+                    }
+                    const obj = {};
+                    if (GlobalUser.userInfo.email) {
+                        obj.email = yield hashSHA256(GlobalUser.userInfo.email);
+                    }
+                    if (GlobalUser.userInfo.phone) {
+                        obj.phone = yield hashSHA256(GlobalUser.userInfo.phone);
+                    }
+                    fbq('init', window.fb_pixel_id, obj);
+                }
+                fbq('track', name, JSON.parse(JSON.stringify(obj)));
+            }
+            obj.event_id = obj.eventID;
+            delete obj.eventID;
+            ApiTrack.track({
+                event_name: name,
+                custom_data: obj,
+            });
         });
     }
 }

package/lowcode/public-components/public/ad.ts

@@ -1,4 +1,5 @@
 import { ApiTrack } from '../../glitter-base/route/api-track.js';
+import { GlobalUser } from '../../glitter-base/global/global-user.js';
 
 export class Ad {
   static gtagEvent(name: string, obj: any) {
@@ -8,10 +9,36 @@ export class Ad {
     }
   }
 
-  static fbqEvent(name: string, obj: any) {
+  static async fbqEvent(name: string, obj: any) {
     const fbq = (window as any).fbq;
     obj.eventID = obj.eventID || (window as any).glitter.getUUID();
     if (fbq) {
+      // console.log(`pixel-user-info`,GlobalUser.userInfo)
+      //fbq('init', '你的PIXEL_ID', {
+      //   em: '雜湊後的email',
+      //   ph: '雜湊後的phone'
+      // });
+      // 這通常在登入成功或註冊完成之後
+      if (GlobalUser.userInfo) {
+        async function hashSHA256(input: any) {
+          const encoder = new TextEncoder();
+          const data = encoder.encode(input.trim().toLowerCase());
+          const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+          return Array.from(new Uint8Array(hashBuffer))
+            .map(b => b.toString(16).padStart(2, '0'))
+            .join('');
+        }
+
+        const obj: any = {};
+
+        if(GlobalUser.userInfo.email){
+          obj.email = await hashSHA256(GlobalUser.userInfo.email);
+        }
+        if(GlobalUser.userInfo.phone){
+          obj.phone = await hashSHA256(GlobalUser.userInfo.phone);
+        }
+        fbq('init', (window as any).fb_pixel_id, obj);
+      }
       fbq('track', name, JSON.parse(JSON.stringify(obj)));
     }
     obj.event_id = obj.eventID;

package/lowcode/public-models/product.ts

@@ -21,6 +21,7 @@ export interface Variant {
   show_understocking: string;
   type: string;
   checked?: any;
+  invisible?: boolean;
 }
 
 export interface LanguageData {