ts-glitter 17.2.0 → 17.2.2

package/lowcode/official_view_component/official/component.ts

@@ -152,9 +152,9 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
 
                                         function updatePageConfig(formData: any, type: any, oWidget: any) {
                                             oWidget && (widget = oWidget);
-                                            const ref=(widget.data.refer_app) ? (widget.data.refer_form_data || data.page_config.formData) : data.page_config.formData
-                                            viewConfig.formData = getFormData(ref);
+                                            const ref=(widget.data.refer_app) ? (widget.data.refer_form_data || data.page_config.formData) : data.page_config.formData;
                                             (window.parent as any).glitter.share.updated_form_data[`${page_request_config.appName}_${tag}`]=ref;
+                                            viewConfig.formData = getFormData(ref);
                                             const view = getView();
                                             (window.parent as any).glitter.share.loading_dialog.dataLoading({visible: true})
                                             setTimeout(() => {
@@ -859,7 +859,6 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
                                                                                                                                         })
                                                                                                                                     });
                                                                                                                                     try {
-                                                                                                                                        console.log(`getPageData-${parent_array.tag}`, parent_array);
                                                                                                                                         (window as any).glitterInitialHelper.share[`getPageData-${(window as any).appName}-${parent_array.tag}`].data.response.result[0].config = parent_array;
                                                                                                                                     } catch (error) {
                                                                                                                                         console.log(`error->`, error)
@@ -903,6 +902,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
 
                                                                                                                                 }
                                                                                                                             }
+                                                                                                                          
                                                                                                                             subData.editor_updated_callback && subData.editor_updated_callback(oWidget);
                                                                                                                         }
 
@@ -1348,7 +1348,6 @@ font-weight: 700;" onclick="${gvc.event(() => {
                                                                         if (!pageData.template_config || !pageData.template_config.tag || (!pageData.template_config.tag.find((dd: any) => {
                                                                             return dd === "商品卡片"
                                                                         }))) {
-                                                                            console.log(`pageData.template_config.tag`, pageData.template_config.tag)
                                                                             if ((gvc.glitter.getUrlParameter('device') === 'mobile') && pageData.template_config.tag.includes('標頭元件')) {
 
                                                                             } else if ((gvc.glitter.getUrlParameter('device') !== 'mobile') && pageData.template_config.tag.includes('APP-Header')) {

package/lowcode/public-components/footer/footer-01.js

@@ -199,7 +199,7 @@ export class Footer01 {
                                             }
                                         })}"
                                                                                 >
-                                                                                    <a class="f-aclass">${chi.title}</a>
+                                                                                    <a class="f-aclass" title="${chi.title}">${chi.title}</a>
                                                                                 </li>`;
                                     })
                                         .join('')}

package/lowcode/public-components/footer/footer-01.ts

@@ -212,7 +212,7 @@ export class Footer01 {
                                                                                         }
                                                                                     })}"
                                                                                 >
-                                                                                    <a class="f-aclass">${chi.title}</a>
+                                                                                    <a class="f-aclass" title="${chi.title}">${chi.title}</a>
                                                                                 </li>`;
                                                                             })
                                                                             .join('')}

package/lowcode/public-components/footer/footer-02.js

@@ -124,7 +124,7 @@ export class Footer02 {
                                             }
                                         })}"
                                                                                 >
-                                                                                    <a class="f-aclass">${chi.title}</a>
+                                                                                    <a class="f-aclass" title="${chi.title}">${chi.title}</a>
                                                                                 </li>`;
                                     })
                                         .join('')}

package/lowcode/public-components/footer/footer-02.ts

@@ -139,7 +139,7 @@ export class Footer02 {
                                                                                         }
                                                                                     })}"
                                                                                 >
-                                                                                    <a class="f-aclass">${chi.title}</a>
+                                                                                    <a class="f-aclass" title="${chi.title}">${chi.title}</a>
                                                                                 </li>`;
                                                                             })
                                                                             .join('')}

package/lowcode/public-components/footer/footer-03.js

@@ -173,7 +173,7 @@ export class Footer02 {
                                             }
                                         })}"
                                                                             >
-                                                                                <a class="f-aclass">${chi.title}</a>
+                                                                                <a class="f-aclass" title="${chi.title}">${chi.title}</a>
                                                                             </li>`;
                                     })
                                         .join('')}

package/lowcode/public-components/footer/footer-03.ts

@@ -187,7 +187,7 @@ export class Footer02 {
                                                                                     }
                                                                                 })}"
                                                                             >
-                                                                                <a class="f-aclass">${chi.title}</a>
+                                                                                <a class="f-aclass" title="${chi.title}">${chi.title}</a>
                                                                             </li>`;
                                                                         })
                                                                         .join('')}

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

@@ -151,6 +151,18 @@ export class ProductCard01 {
             }
         `);
         const labelID = glitter.getUUID();
+        function getImgSrc(index) {
+            const innerText = prod.preview_image[index] || prod.preview_image[0] || ProductCard01.noImageURL;
+            let rela_link = innerText;
+            if (innerText.includes('size1440_s*px$_')) {
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+            }
+            return rela_link;
+        }
         return html ` <div
             class="card mb-7 card-border"
             onclick="${gvc.event(() => {
@@ -192,18 +204,17 @@ export class ProductCard01 {
         })}
                 <img
                     class="card-image-fit-center "
-                    src="${(() => {
-            const innerText = prod.preview_image[0] || this.noImageURL;
-            let rela_link = innerText;
-            if (innerText.includes('size1440_s*px$_')) {
-                [150, 600, 1200, 1440].reverse().map((dd) => {
-                    if (document.body.clientWidth < dd) {
-                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                    }
-                });
+                    src="${getImgSrc(0)}"
+                    onmouseover="${gvc.event((e, event) => {
+            if (widget.formData.show_second === 'true') {
+                e.src = getImgSrc(1);
             }
-            return rela_link;
-        })()}"
+        })}"
+                    onmouseleave="${gvc.event((e, event) => {
+            if (widget.formData.show_second === 'true') {
+                e.src = getImgSrc(0);
+            }
+        })}"
                 />
                 <div class="child add-cart-child">
                     <div

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

@@ -154,7 +154,20 @@ export class ProductCard01 {
                 letter-spacing: -0.98px;
             }
         `);
+
         const labelID = glitter.getUUID();
+        function getImgSrc(index:number){
+            const innerText = prod.preview_image[index] || prod.preview_image[0] || ProductCard01.noImageURL;
+            let rela_link = innerText;
+            if (innerText.includes('size1440_s*px$_')) {
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+            }
+            return rela_link;
+        }
         return html` <div
             class="card mb-7 card-border"
             onclick="${gvc.event(() => {
@@ -196,18 +209,17 @@ export class ProductCard01 {
                 })}
                 <img
                     class="card-image-fit-center "
-                    src="${(() => {
-                        const innerText = prod.preview_image[0] || this.noImageURL;
-                        let rela_link = innerText;
-                        if (innerText.includes('size1440_s*px$_')) {
-                            [150, 600, 1200, 1440].reverse().map((dd) => {
-                                if (document.body.clientWidth < dd) {
-                                    rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                                }
-                            });
+                    src="${getImgSrc(0)}"
+                    onmouseover="${gvc.event((e,event)=>{
+                       if(widget.formData.show_second==='true'){
+                           e.src=getImgSrc(1)
+                       }
+                    })}"
+                    onmouseleave="${gvc.event((e,event)=>{
+                        if(widget.formData.show_second==='true'){
+                            e.src=getImgSrc(0)
                         }
-                        return rela_link;
-                    })()}"
+                    })}"
                 />
                 <div class="child add-cart-child">
                     <div

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

@@ -141,6 +141,18 @@ export class ProductCard02 {
             }
         `);
         const labelID = glitter.getUUID();
+        function getImgSrc(index) {
+            const innerText = prod.preview_image[index] || prod.preview_image[0] || ProductCard02.noImageURL;
+            let rela_link = innerText;
+            if (innerText.includes('size1440_s*px$_')) {
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+            }
+            return rela_link;
+        }
         return html `<div
             class="card mb-7 card-border"
             style="cursor: pointer"
@@ -183,18 +195,17 @@ export class ProductCard02 {
         })}
                 <img
                     class="card-image-fit-center"
-                    src="${(() => {
-            const innerText = prod.preview_image[0] || this.noImageURL;
-            let rela_link = innerText;
-            if (innerText.includes('size1440_s*px$_')) {
-                [150, 600, 1200, 1440].reverse().map((dd) => {
-                    if (document.body.clientWidth < dd) {
-                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                    }
-                });
+                    src="${getImgSrc(0)}"
+                    onmouseover="${gvc.event((e, event) => {
+            if (widget.formData.show_second === 'true') {
+                e.src = getImgSrc(1);
             }
-            return rela_link;
-        })()}"
+        })}"
+                    onmouseleave="${gvc.event((e, event) => {
+            if (widget.formData.show_second === 'true') {
+                e.src = getImgSrc(0);
+            }
+        })}"
                 />
             </div>
             <div

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

@@ -144,6 +144,18 @@ export class ProductCard02 {
             }
         `);
         const labelID = glitter.getUUID();
+        function getImgSrc(index:number){
+            const innerText = prod.preview_image[index] || prod.preview_image[0] || ProductCard02.noImageURL;
+            let rela_link = innerText;
+            if (innerText.includes('size1440_s*px$_')) {
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+            }
+            return rela_link;
+        }
         return html`<div
             class="card mb-7 card-border"
             style="cursor: pointer"
@@ -187,18 +199,17 @@ export class ProductCard02 {
                 })}
                 <img
                     class="card-image-fit-center"
-                    src="${(() => {
-                        const innerText = prod.preview_image[0] || this.noImageURL;
-                        let rela_link = innerText;
-                        if (innerText.includes('size1440_s*px$_')) {
-                            [150, 600, 1200, 1440].reverse().map((dd) => {
-                                if (document.body.clientWidth < dd) {
-                                    rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                                }
-                            });
+                    src="${getImgSrc(0)}"
+                    onmouseover="${gvc.event((e,event)=>{
+                        if(widget.formData.show_second==='true'){
+                            e.src=getImgSrc(1)
+                        }
+                    })}"
+                    onmouseleave="${gvc.event((e,event)=>{
+                        if(widget.formData.show_second==='true'){
+                            e.src=getImgSrc(0)
                         }
-                        return rela_link;
-                    })()}"
+                    })}"
                 />
             </div>
             <div

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

@@ -145,6 +145,18 @@ export class ProductCard03 {
             }
         `);
         const labelID = glitter.getUUID();
+        function getImgSrc(index) {
+            const innerText = prod.preview_image[index] || prod.preview_image[0] || ProductCard03.noImageURL;
+            let rela_link = innerText;
+            if (innerText.includes('size1440_s*px$_')) {
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+            }
+            return rela_link;
+        }
         return html `
             <div
                     class="card mb-7 card-border"
@@ -190,18 +202,17 @@ export class ProductCard03 {
         })}
                     <img
                             class="card-image-fit-center"
-                            src="${(() => {
-            const innerText = prod.preview_image[0] || this.noImageURL;
-            let rela_link = innerText;
-            if (innerText.includes('size1440_s*px$_')) {
-                [150, 600, 1200, 1440].reverse().map((dd) => {
-                    if (document.body.clientWidth < dd) {
-                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                    }
-                });
+                            src="${getImgSrc(0)}"
+                            onmouseover="${gvc.event((e, event) => {
+            if (widget.formData.show_second === 'true') {
+                e.src = getImgSrc(1);
             }
-            return rela_link;
-        })()}"
+        })}"
+                            onmouseleave="${gvc.event((e, event) => {
+            if (widget.formData.show_second === 'true') {
+                e.src = getImgSrc(0);
+            }
+        })}"
                     />
                 </div>
                 <div

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

@@ -150,6 +150,19 @@ export class ProductCard03 {
         `);
 
         const labelID = glitter.getUUID();
+
+        function getImgSrc(index:number){
+            const innerText = prod.preview_image[index] || prod.preview_image[0] || ProductCard03.noImageURL;
+            let rela_link = innerText;
+            if (innerText.includes('size1440_s*px$_')) {
+                [150, 600, 1200, 1440].reverse().map((dd) => {
+                    if (document.body.clientWidth < dd) {
+                        rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
+                    }
+                });
+            }
+            return rela_link;
+        }
         return html`
             <div
                     class="card mb-7 card-border"
@@ -197,18 +210,17 @@ export class ProductCard03 {
                     })}
                     <img
                             class="card-image-fit-center"
-                            src="${(() => {
-                                const innerText = prod.preview_image[0] || this.noImageURL;
-                                let rela_link = innerText;
-                                if (innerText.includes('size1440_s*px$_')) {
-                                    [150, 600, 1200, 1440].reverse().map((dd) => {
-                                        if (document.body.clientWidth < dd) {
-                                            rela_link = innerText.replace('size1440_s*px$_', `size${dd}_s*px$_`);
-                                        }
-                                    });
+                            src="${getImgSrc(0)}"
+                            onmouseover="${gvc.event((e,event)=>{
+                                if(widget.formData.show_second==='true'){
+                                    e.src=getImgSrc(1)
+                                }
+                            })}"
+                            onmouseleave="${gvc.event((e,event)=>{
+                                if(widget.formData.show_second==='true'){
+                                    e.src=getImgSrc(0)
                                 }
-                                return rela_link;
-                            })()}"
+                            })}"
                     />
                 </div>
                 <div

package/lowcode/public-components/product/product-detail.js

@@ -395,6 +395,13 @@ export class ProductDetail {
                                         (vm.data.content.seo.domain || vm.data.content.title),
                                         (_b = window.home_seo.title_suffix) !== null && _b !== void 0 ? _b : "",
                                     ].join(''));
+                                    const json_ld = document.querySelector('script[type="application/ld+json"]');
+                                    if (json_ld) {
+                                        json_ld.remove();
+                                    }
+                                    ;
+                                    document.querySelector('head').innerHTML += vm.data.json_ld;
+                                    console.log(`(vm.data as any).json_ld=>`, vm.data.json_ld);
                                 }
                                 catch (e) {
                                     vm.data = {};

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

@@ -445,7 +445,11 @@ export class ProductDetail {
                                         (vm.data.content.seo.domain || vm.data.content.title),
                                         (window as any).home_seo.title_suffix ?? "",
                                     ].join(''));
-
+                                    //如有原先的JSON LD
+                                    const json_ld=document.querySelector('script[type="application/ld+json"]');
+                                    if(json_ld){json_ld.remove()};
+                                    (document.querySelector('head') as any).innerHTML+=(vm.data as any).json_ld;
+                                    console.log(`(vm.data as any).json_ld=>`,(vm.data as any).json_ld)
                                 } catch (e) {
                                     (vm.data as any) = {};
                                 }

package/lowcode/public-components/user-manager/um-voucher.ts

@@ -35,6 +35,7 @@ export interface VoucherContent {
     rebateEndDay: string;
     conditionType: string;
     start_ISO_Date: string;
+    language: 'en-US' | 'zh-CN' | 'zh-TW';
 }
 
 export interface Voucher {

package/package.json

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

package/src/api-public/controllers/shop.js

@@ -460,48 +460,57 @@ router.post('/returnOrder', async (req, resp) => {
     }
 });
 router.get('/voucher', async (req, resp) => {
-    var _a, _b;
     try {
         let query = [`(content->>'$.type'='voucher')`];
-        req.query.search && query.push(`(UPPER(JSON_UNQUOTE(JSON_EXTRACT(content, '$.title'))) LIKE UPPER('%${req.query.search}%'))`);
+        if (req.query.search) {
+            query.push(`(UPPER(JSON_UNQUOTE(JSON_EXTRACT(content, '$.title'))) LIKE UPPER('%${req.query.search}%'))`);
+        }
         if (req.query.voucher_type) {
             query.push(`(content->>'$.reBackType'='${req.query.voucher_type}')`);
         }
-        const vouchers = await new shopping_1.Shopping(req.get('g-app'), req.body.token).querySql(query, {
-            page: ((_a = req.query.page) !== null && _a !== void 0 ? _a : 0),
-            limit: ((_b = req.query.limit) !== null && _b !== void 0 ? _b : 50),
+        const shopping = new shopping_1.Shopping(req.get('g-app'), req.body.token);
+        const vouchers = await shopping.querySql(query, {
+            page: Number(req.query.page) || 0,
+            limit: Number(req.query.limit) || 50,
             id: req.query.id,
         });
-        if (!(await ut_permission_1.UtPermission.isManager(req))) {
-            const userClass = new user_js_1.User(req.get('g-app'));
-            const userLevels = await userClass.getUserLevel([{ userId: req.body.token.userID }]);
-            const groupList = await userClass.getUserGroups();
-            vouchers.data = vouchers.data.filter((d) => {
-                const dd = d.content;
-                if (dd.target === 'customer') {
-                    return dd.targetList.includes(req.body.token.userID);
-                }
-                if (dd.target === 'levels') {
-                    if (userLevels[0]) {
-                        return dd.targetList.includes(userLevels[0].data.id);
-                    }
-                    return false;
-                }
-                if (dd.target === 'group') {
-                    if (!groupList.result) {
-                        return false;
-                    }
-                    let pass = false;
-                    for (const group of groupList.data.filter((item) => dd.targetList.includes(item.type))) {
-                        if (!pass && group.users.some((item) => item.userID === req.body.token.userID)) {
-                            pass = true;
-                        }
-                    }
-                    return pass;
-                }
-                return true;
+        const isManager = await ut_permission_1.UtPermission.isManager(req);
+        if (isManager && !req.query.user_email) {
+            return response_1.default.succ(resp, vouchers);
+        }
+        if (req.query.date_confirm === 'true') {
+            vouchers.data = vouchers.data.filter((voucher) => {
+                const { start_ISO_Date, end_ISO_Date } = voucher.content;
+                const now = new Date().getTime();
+                return new Date(start_ISO_Date).getTime() < now && (!end_ISO_Date || new Date(end_ISO_Date).getTime() > now);
             });
         }
+        const userClass = new user_js_1.User(req.get('g-app'));
+        const groupList = await userClass.getUserGroups();
+        const userID = await (async () => {
+            if (!isManager)
+                return req.body.token.userID;
+            if (req.query.user_email === 'guest')
+                return -1;
+            const userData = await userClass.getUserData(req.query.user_email, 'email_or_phone');
+            return userData.userID;
+        })();
+        const userLevels = await userClass.getUserLevel([{ userId: userID }]);
+        vouchers.data = vouchers.data.filter((voucher) => {
+            const { target, targetList } = voucher.content;
+            switch (target) {
+                case 'customer':
+                    return targetList.includes(userID);
+                case 'levels':
+                    return userLevels[0] ? targetList.includes(userLevels[0].data.id) : false;
+                case 'group':
+                    if (!groupList.result)
+                        return false;
+                    return groupList.data.some((group) => targetList.includes(group.type) && group.users.some((user) => user.userID === userID));
+                default:
+                    return true;
+            }
+        });
         return response_1.default.succ(resp, vouchers);
     }
     catch (err) {
@@ -999,12 +1008,14 @@ router.post('/pos/checkout', async (req, resp) => {
             customer_info: req.body.customer_info,
             discount: req.body.discount,
             total: req.body.total,
+            use_rebate: req.body.use_rebate,
             pay_status: req.body.pay_status,
             code_array: req.body.code_array,
             pos_info: req.body.pos_info,
             pos_store: req.body.pos_store,
             invoice_select: req.body.invoice_select,
             pre_order: req.body.pre_order,
+            voucherList: req.body.voucherList,
         }, 'POS'));
     }
     try {