ts-glitter 16.2.6 → 16.2.9

package/lowcode/public-components/product/product-list.ts

@@ -648,8 +648,10 @@ export class ProductList {
             if (!vm.collections || vm.collections.length === 0) {
                 vm.title = all_text;
             } else {
-                let collectionObj = vm.collections.find((item: { code: string }) => {
-                    return item.code === decodeURIComponent(extractCategoryTitleFromUrl(location.href)) ;
+                let collectionObj = vm.collections.find((item:any) => {
+                    const language_data=item.language_data && item.language_data[Language.getLanguage()]
+                    const code=((language_data && language_data.seo && language_data.seo.domain) || item.code) || (language_data && language_data.title) || item.title;
+                    return (code) === decodeURIComponent(extractCategoryTitleFromUrl(location.href)) ;
                 });
                 try {
                     if(!collectionObj){
@@ -658,63 +660,74 @@ export class ProductList {
                         });
                     }
                 }catch (e){}
-                vm.title = collectionObj ? collectionObj.title : all_text;
+                if(collectionObj){
+                    const language_data=collectionObj.language_data
+                    vm.title=(language_data && (language_data[Language.getLanguage()] && language_data[Language.getLanguage()].title)) || collectionObj.title;
+                }else{
+                    vm.title=all_text
+                }
             }
             gvc.notifyDataChange(ids.pageTitle);
         }
 
         function setAdTag(data: any) {
-            const path = location.pathname;
-            const pathParts = path.split('/');
-            const collectionIndex = pathParts.indexOf('collections');
-            const index = collectionIndex + 1;
-            const collection = pathParts[index];
-            const collectionName = decodeURIComponent(collection);
-
-            function findObjectByValue(arr: any, value: string): any {
-                for (const item of arr) {
-                    if (item.code === value) {
-                        return item;
-                    }
-                    if (item.array.length > 0) {
-                        const found = findObjectByValue(item.array, value);
-                        if (found) {
-                            return found;
+            try {
+                const path = location.pathname;
+                const pathParts = path.split('/');
+                const collectionIndex = pathParts.indexOf('collections');
+                const index = collectionIndex + 1;
+                const collection = pathParts[index];
+                const collectionName = decodeURIComponent(collection);
+
+                function findObjectByValue(arr: any, value: string): any {
+                    for (const item of arr) {
+                        const language_data=item.language_data
+                        const code=(language_data && language_data[Language.getLanguage()] && language_data[Language.getLanguage()].seo && language_data[Language.getLanguage()].seo.domain) || item.code
+                        if (code === value) {
+                            return item;
+                        }
+                        if (item.array.length > 0) {
+                            const found = findObjectByValue(item.array, value);
+                            if (found) {
+                                return found;
+                            }
                         }
                     }
+                    return null;
                 }
-                return null;
-            }
 
-            if ((window as any).gtag) {
-                if (collectionName) {
-                    const foundObject = findObjectByValue(data, collectionName);
-                    Ad.gtagEvent('view_item_list', {
-                        items: [
-                            {
-                                item_id: foundObject.code,
-                                item_name: foundObject.title,
-                            },
-                        ],
-                    });
-                    Ad.fbqEvent('ViewContent', {
-                        content_ids: [foundObject.code],
-                        content_type: 'product_group',
-                    });
-                } else {
-                    Ad.gtagEvent('view_item_list', {
-                        items: [
-                            {
-                                item_id: 'all-product',
-                                item_name: '所有商品',
-                            },
-                        ],
-                    });
-                    Ad.fbqEvent('ViewContent', {
-                        content_ids: ['all-product'],
-                        content_type: 'product_group',
-                    });
+                if ((window as any).gtag) {
+                    if (collectionName) {
+                        const foundObject = findObjectByValue(data, collectionName);
+                        Ad.gtagEvent('view_item_list', {
+                            items: [
+                                {
+                                    item_id: collectionName,
+                                    item_name: foundObject.title,
+                                },
+                            ],
+                        });
+                        Ad.fbqEvent('ViewContent', {
+                            content_ids: [collectionName],
+                            content_type: 'product_group',
+                        });
+                    } else {
+                        Ad.gtagEvent('view_item_list', {
+                            items: [
+                                {
+                                    item_id: 'all-product',
+                                    item_name: '所有商品',
+                                },
+                            ],
+                        });
+                        Ad.fbqEvent('ViewContent', {
+                            content_ids: ['all-product'],
+                            content_type: 'product_group',
+                        });
+                    }
                 }
+            }catch (e) {
+                console.log(e)
             }
         }
 

package/package.json

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

package/src/api-public/services/shopping.js

@@ -94,6 +94,7 @@ class Shopping {
     }
     async getProduct(query) {
         var _a, _b;
+        console.log(`query=>`, query);
         try {
             query.language = (_a = query.language) !== null && _a !== void 0 ? _a : (await app_js_1.App.getDefLanguage(this.app));
             query.show_hidden = (_b = query.show_hidden) !== null && _b !== void 0 ? _b : 'true';