ts-glitter 14.3.9 → 14.4.2

package/lowcode/cms-plugin/shopping-product-stock.js

@@ -12,7 +12,7 @@ export class StockList {
         title: '庫存管理',
         select_data: [],
         select_mode: false,
-        filter_variants: []
+        filter_variants: [],
     }, productType = 'all') {
         const glitter = gvc.glitter;
         const vm = {
@@ -219,20 +219,15 @@ export class StockList {
                                                     searchType: vm.queryType || 'title',
                                                     orderBy: vm.orderString || undefined,
                                                     status: (() => {
-                                                        if (vm.filter.status && vm.filter.status.length === 1) {
-                                                            switch (vm.filter.status[0]) {
-                                                                case 'active':
-                                                                    return 'active';
-                                                                case 'draft':
-                                                                    return 'draft';
-                                                            }
+                                                        if (vm.filter.status && vm.filter.status.length > 0) {
+                                                            return vm.filter.status.join(',');
                                                         }
                                                         return undefined;
                                                     })(),
                                                     collection: vm.filter.collection,
                                                     stockCount: vm.filter.count,
                                                     accurate_search_collection: true,
-                                                    productType: productType
+                                                    productType: productType,
                                                 }).then((data) => {
                                                     data.response.data = data.response.data.filter((dd) => {
                                                         return !option.filter_variants.includes([dd.product_id].concat(dd.variant_content.spec).join('-'));
@@ -256,7 +251,7 @@ export class StockList {
                                                     if (b.checked) {
                                                         option.select_data.push({
                                                             variant: b.variant_content,
-                                                            product_id: b.product_id
+                                                            product_id: b.product_id,
                                                         });
                                                     }
                                                 }
@@ -273,13 +268,14 @@ export class StockList {
                                                 vm.replaceData = product;
                                                 vm.type = 'editSpec';
                                             },
-                                            filter: (option.select_mode) ? [
-                                                {
-                                                    name: '選擇項目',
-                                                    event: (checkedData) => {
+                                            filter: option.select_mode
+                                                ? [
+                                                    {
+                                                        name: '選擇項目',
+                                                        event: (checkedData) => { },
                                                     },
-                                                },
-                                            ] : [],
+                                                ]
+                                                : [],
                                         });
                                     }
                                     catch (e) {

package/lowcode/cms-plugin/shopping-product-stock.ts

@@ -34,15 +34,15 @@ export class StockList {
         option: {
             title: string;
             select_mode: boolean;
-            select_data: { variant:any,product_id:string }[];
+            select_data: { variant: any; product_id: string }[];
             filter_variants: string[];
         } = {
             title: '庫存管理',
             select_data: [],
             select_mode: false,
-            filter_variants: []
+            filter_variants: [],
         },
-        productType:'product' | 'addProduct' | 'giveaway' | 'hidden' | 'all' ='all'
+        productType: 'product' | 'addProduct' | 'giveaway' | 'hidden' | 'all' = 'all'
     ) {
         const glitter = gvc.glitter;
 
@@ -274,24 +274,19 @@ export class StockList {
                                                                     searchType: vm.queryType || 'title',
                                                                     orderBy: vm.orderString || undefined,
                                                                     status: (() => {
-                                                                        if (vm.filter.status && vm.filter.status.length === 1) {
-                                                                            switch (vm.filter.status[0]) {
-                                                                                case 'active':
-                                                                                    return 'active';
-                                                                                case 'draft':
-                                                                                    return 'draft';
-                                                                            }
+                                                                        if (vm.filter.status && vm.filter.status.length > 0) {
+                                                                            return vm.filter.status.join(',');
                                                                         }
                                                                         return undefined;
                                                                     })(),
                                                                     collection: vm.filter.collection,
                                                                     stockCount: vm.filter.count,
                                                                     accurate_search_collection: true,
-                                                                    productType:productType
+                                                                    productType: productType,
                                                                 }).then((data) => {
-                                                                    data.response.data=data.response.data.filter((dd:any)=>{
-                                                                        return  !option.filter_variants.includes([dd.product_id].concat(dd.variant_content.spec).join('-'))
-                                                                    })
+                                                                    data.response.data = data.response.data.filter((dd: any) => {
+                                                                        return !option.filter_variants.includes([dd.product_id].concat(dd.variant_content.spec).join('-'));
+                                                                    });
                                                                     vm.dataList = data.response.data;
                                                                     vmi.pageSize = Math.ceil(data.response.total / limit);
                                                                     vmi.originalData = vm.dataList;
@@ -302,17 +297,17 @@ export class StockList {
                                                                     vmi.callback();
                                                                 });
                                                             },
-                                                            item_select:()=>{
-                                                                console.log(vm.dataList)
+                                                            item_select: () => {
+                                                                console.log(vm.dataList);
                                                                 while (option.select_data.length > 0) {
                                                                     option.select_data.shift();
                                                                 }
-                                                                for (const  b of  vm.dataList){
-                                                                    if(b.checked){
+                                                                for (const b of vm.dataList) {
+                                                                    if (b.checked) {
                                                                         option.select_data.push({
-                                                                            variant:b.variant_content,
-                                                                            product_id:b.product_id
-                                                                        })
+                                                                            variant: b.variant_content,
+                                                                            product_id: b.product_id,
+                                                                        });
                                                                     }
                                                                 }
                                                                 // if(vm.dataList[index].checked){
@@ -327,8 +322,8 @@ export class StockList {
                                                                 // gvc.notifyDataChange(vm.filterId);
                                                             },
                                                             rowClick: (data, index) => {
-                                                                if(option.select_mode){
-                                                                    return
+                                                                if (option.select_mode) {
+                                                                    return;
                                                                 }
                                                                 const product = vm.dataList[index].product_content;
                                                                 const variant = vm.dataList[index].variant_content;
@@ -338,20 +333,19 @@ export class StockList {
                                                                 vm.replaceData = product;
                                                                 vm.type = 'editSpec';
                                                             },
-                                                            filter:(option.select_mode)  ? [
-                                                                {
-                                                                    name: '選擇項目',
-                                                                    event: (checkedData) => {
-                                                                     
-                                                                    },
-                                                                },
-                                                            ]:[],
+                                                            filter: option.select_mode
+                                                                ? [
+                                                                      {
+                                                                          name: '選擇項目',
+                                                                          event: (checkedData) => {},
+                                                                      },
+                                                                  ]
+                                                                : [],
                                                         });
-                                                    }catch (e) {
-                                                        console.log(e)
-                                                        return  `${e}`
+                                                    } catch (e) {
+                                                        console.log(e);
+                                                        return `${e}`;
                                                     }
-                                                  
                                                 },
                                             }),
                                         ].join('')

package/lowcode/glitter-base/route/shopping.js

@@ -300,6 +300,9 @@ export class ApiShop {
                     json.maxPrice && par.push(`max_price=${json.maxPrice}`);
                     json.minPrice && par.push(`min_price=${json.minPrice}`);
                     json.status && par.push(`status=${json.status}`);
+                    if (json.schedule === true || json.schedule === false) {
+                        par.push(`schedule=${json.schedule}`);
+                    }
                     json.orderBy && par.push(`order_by=${json.orderBy}`);
                     json.id_list && par.push(`id_list=${json.id_list}`);
                     json.productType && par.push(`productType=${json.productType}`);
@@ -323,6 +326,24 @@ export class ApiShop {
             },
         });
     }
+    static getProductDomain(json) {
+        return BaseApi.create({
+            url: getBaseUrl() +
+                `/api-public/v1/ec/product/domain?${(() => {
+                    let par = [];
+                    json.id && par.push(`id=${json.id}`);
+                    json.search && par.push(`search=${json.search}`);
+                    json.domain && par.push(`domain=${json.domain}`);
+                    return par.join('&');
+                })()}`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': json.app_name || (window.glitter.getUrlParameter('type') === 'find_idea' ? window.appName : encodeURIComponent(getConfig().config.appName)),
+                Authorization: (window.parent.glitter.getUrlParameter('type') === 'editor' && getConfig().config.token) || GlobalUser.token,
+            },
+        });
+    }
     static orderListFilterString(obj) {
         if (!obj)
             return [];
@@ -564,7 +585,7 @@ export class ApiShop {
         });
     }
     static getInvoice(json) {
-        console.log("json.filter -- ", json);
+        console.log('json.filter -- ', json);
         let filterString = this.invoiceListFilterString(json.filter);
         return BaseApi.create({
             url: getBaseUrl() +
@@ -776,8 +797,8 @@ export class ApiShop {
             data: JSON.stringify({
                 base64: {
                     app_name: app_name,
-                    "receipt-data": receipt
-                }
+                    'receipt-data': receipt,
+                },
             }),
         });
     }
@@ -884,7 +905,7 @@ export class ApiShop {
         const passData = {
             invoiceNo: invoiceNo,
             voidReason: voidReason,
-            createDate: createDate
+            createDate: createDate,
         };
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/ec/void_invoice`,

package/lowcode/glitter-base/route/shopping.ts

@@ -311,13 +311,14 @@ export class ApiShop {
         maxPrice?: string;
         minPrice?: string;
         status?: string;
+        schedule?: boolean;
         orderBy?: string;
         id_list?: string;
         with_hide_index?: string;
         productType?: string;
         filter_visible?: string;
         app_name?: string;
-        show_hidden?:boolean
+        show_hidden?: boolean;
     }) {
         return BaseApi.create({
             url:
@@ -333,6 +334,9 @@ export class ApiShop {
                     json.maxPrice && par.push(`max_price=${json.maxPrice}`);
                     json.minPrice && par.push(`min_price=${json.minPrice}`);
                     json.status && par.push(`status=${json.status}`);
+                    if(json.schedule === true || json.schedule === false){
+                        par.push(`schedule=${json.schedule}`)
+                    }
                     json.orderBy && par.push(`order_by=${json.orderBy}`);
                     json.id_list && par.push(`id_list=${json.id_list}`);
                     json.productType && par.push(`productType=${json.productType}`);
@@ -340,9 +344,9 @@ export class ApiShop {
                     json.searchType && par.push(`searchType=${json.searchType}`);
                     json.filter_visible && par.push(`filter_visible=${json.filter_visible}`);
                     json.show_hidden && par.push(`show_hidden=${json.show_hidden}`);
-                    if(location.pathname.includes('/hidden/')) {
+                    if (location.pathname.includes('/hidden/')) {
                         par.push(`filter_visible=false`);
-                    }else if ( (window as any).glitter.getUrlParameter('function')==='user-editor') {
+                    } else if ((window as any).glitter.getUrlParameter('function') === 'user-editor') {
                         par.push(`filter_visible=true`);
                     }
                     return par.join('&');
@@ -356,6 +360,26 @@ export class ApiShop {
         });
     }
 
+    static getProductDomain(json: { id?: string; search?: string; domain?: string; app_name?: string }) {
+        return BaseApi.create({
+            url:
+                getBaseUrl() +
+                `/api-public/v1/ec/product/domain?${(() => {
+                    let par = [];
+                    json.id && par.push(`id=${json.id}`);
+                    json.search && par.push(`search=${json.search}`);
+                    json.domain && par.push(`domain=${json.domain}`);
+                    return par.join('&');
+                })()}`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': json.app_name || ((window as any).glitter.getUrlParameter('type') === 'find_idea' ? (window as any).appName : encodeURIComponent(getConfig().config.appName)),
+                Authorization: ((window.parent as any).glitter.getUrlParameter('type') === 'editor' && getConfig().config.token) || GlobalUser.token,
+            },
+        });
+    }
+
     static orderListFilterString(obj: any): string[] {
         if (!obj) return [];
         let list = [] as string[];
@@ -644,16 +668,9 @@ export class ApiShop {
             });
         });
     }
-    static getInvoice(json: {
-        limit: number;
-        page: number;
-        search?: string;
-        searchType?: string;
-        orderString?: string;
-        filter?: any;
-    }) {
-        console.log("json.filter -- " , json)
-        let filterString = this.invoiceListFilterString(json.filter)
+    static getInvoice(json: { limit: number; page: number; search?: string; searchType?: string; orderString?: string; filter?: any }) {
+        console.log('json.filter -- ', json);
+        let filterString = this.invoiceListFilterString(json.filter);
         // const filterString = this.orderListFilterString(json.filter);
         // filterString.length > 0 && par.push(filterString.join('&'));
         return BaseApi.create({
@@ -676,16 +693,8 @@ export class ApiShop {
             },
         });
     }
-    static getAllowance(json: {
-        limit: number;
-        page: number;
-        search?: string;
-        searchType?: string;
-        orderString?: string;
-        filter?: any;
-    }) {
-
-        let filterString = this.allowanceListFilterString(json.filter)
+    static getAllowance(json: { limit: number; page: number; search?: string; searchType?: string; orderString?: string; filter?: any }) {
+        let filterString = this.allowanceListFilterString(json.filter);
         // const filterString = this.orderListFilterString(json.filter);
         // filterString.length > 0 && par.push(filterString.join('&'));
         return BaseApi.create({
@@ -924,7 +933,7 @@ export class ApiShop {
         });
     }
 
-    public static app_subscription(receipt:string,app_name:string){
+    public static app_subscription(receipt: string, app_name: string) {
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/ec/apple-webhook`,
             type: 'POST',
@@ -934,9 +943,10 @@ export class ApiShop {
                 Authorization: getConfig().config.token,
             },
             data: JSON.stringify({
-                base64:{
-                    app_name:app_name,
-                    "receipt-data": receipt }
+                base64: {
+                    app_name: app_name,
+                    'receipt-data': receipt,
+                },
             }),
         });
     }
@@ -1045,7 +1055,7 @@ export class ApiShop {
         orderBy?: string;
         status?: string;
         stockCount?: { key: string; value: string };
-        productType?:'product' | 'addProduct' | 'giveaway' | 'hidden' | 'all'
+        productType?: 'product' | 'addProduct' | 'giveaway' | 'hidden' | 'all';
     }) {
         return BaseApi.create({
             url:
@@ -1118,25 +1128,24 @@ export class ApiShop {
             headers: {
                 'Content-Type': 'application/json',
                 'g-app': getConfig().config.appName,
-                Authorization:  getConfig().config.token,
+                Authorization: getConfig().config.token,
             },
             data: JSON.stringify(passData),
         });
     }
-    static voidInvoice(invoiceNo:string , voidReason:string ,createDate:string
-    ) {
+    static voidInvoice(invoiceNo: string, voidReason: string, createDate: string) {
         const passData = {
-            invoiceNo:invoiceNo,
-            voidReason:voidReason,
-            createDate:createDate
-        }
+            invoiceNo: invoiceNo,
+            voidReason: voidReason,
+            createDate: createDate,
+        };
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/ec/void_invoice`,
             type: 'POST',
             headers: {
                 'Content-Type': 'application/json',
                 'g-app': getConfig().config.appName,
-                Authorization:  getConfig().config.token,
+                Authorization: getConfig().config.token,
             },
             data: JSON.stringify(passData),
         });
@@ -1148,25 +1157,24 @@ export class ApiShop {
             headers: {
                 'Content-Type': 'application/json',
                 'g-app': getConfig().config.appName,
-                Authorization:  getConfig().config.token,
+                Authorization: getConfig().config.token,
             },
             data: JSON.stringify(passData),
         });
     }
-    static voidAllowance(invoiceNo:string , allowanceNo:string , voidReason:string
-    ) {
+    static voidAllowance(invoiceNo: string, allowanceNo: string, voidReason: string) {
         const passData = {
-            invoiceNo:invoiceNo,
-            allowanceNo:allowanceNo,
-            voidReason:voidReason,
-        }
+            invoiceNo: invoiceNo,
+            allowanceNo: allowanceNo,
+            voidReason: voidReason,
+        };
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/ec/void_allowance`,
             type: 'POST',
             headers: {
                 'Content-Type': 'application/json',
                 'g-app': getConfig().config.appName,
-                Authorization:  getConfig().config.token,
+                Authorization: getConfig().config.token,
             },
             data: JSON.stringify(passData),
         });

package/lowcode/glitterBundle/html-component/widget.js

@@ -383,8 +383,6 @@ export const widgetComponent = {
                                                                 resolve(true);
                                                             }
                                                         });
-                                                        console.log(`widget.data.key=>`, widget.data.key);
-                                                        console.log(oWidget);
                                                         if (widget.data.selectType === 'api') {
                                                             resolve(vm.data.map((dd) => {
                                                                 var _a;
@@ -445,7 +443,6 @@ export const widgetComponent = {
                                                     view.push(innerText);
                                                     break;
                                             }
-                                            console.log(`htmlGenerate.root`, htmlGenerate.root);
                                             return view.join('');
                                         },
                                         divCreate: getCreateOption,

package/lowcode/glitterBundle/html-component/widget.ts

@@ -388,8 +388,8 @@ export const widgetComponent = {
                                                                 resolve(true)
                                                             }
                                                         })
-                                                        console.log(`widget.data.key=>`,widget.data.key)
-                                                        console.log(oWidget)
+                                                        // console.log(`widget.data.key=>`,widget.data.key)
+                                                        // console.log(oWidget)
                                                         if (widget.data.selectType === 'api') {
                                                             resolve(vm.data.map((dd: any) => {
                                                                 formData[widget.data.key] = formData[widget.data.key] ?? dd.value
@@ -448,7 +448,7 @@ export const widgetComponent = {
                                                     break
 
                                             }
-                                            console.log(`htmlGenerate.root`, htmlGenerate.root)
+                                            // console.log(`htmlGenerate.root`, htmlGenerate.root)
                                             // if ((window.parent as any).editerData !== undefined && htmlGenerate.root && widget.data.elem !== 'textArea') {
                                             //     view.push(glitter.htmlGenerate.getEditorSelectSection({
                                             //         id: widget.id,

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

@@ -1,4 +1,141 @@
+import { ShareDialog } from "../../glitterBundle/dialog/ShareDialog.js";
+import { UmClass } from "../user-manager/um-class.js";
 export class Blogs01 {
-    static main() {
+    static main(gvc, subData) {
+        if (subData.content.generator !== 'page_editor') {
+            return subData.content.text;
+        }
+        else {
+            console.log(`subData.content==>`, subData.content.show_auth);
+            function startRender() {
+                if (subData.content.relative_data && ["shopping", "hidden"].includes(subData.content.page_type) && (localStorage.getItem('block-refresh-cart') !== 'true')) {
+                    subData.content.relative_data.map((dd) => {
+                        const key = [dd.product_id].concat(dd.variant.spec).join('-');
+                        const cart = gvc.glitter.share.ApiCart.cart;
+                        const line_item = cart.line_items.find((dd) => {
+                            return `${dd.id}-${dd.spec.join('-')}` === key;
+                        });
+                        let cle = [];
+                        cart.line_items.map((dd) => {
+                            if (!cle.find((d1) => {
+                                return `${dd.id}-${dd.spec.join('-')}` === `${d1.id}-${d1.spec.join('-')}`;
+                            })) {
+                                cle.push(dd);
+                            }
+                        });
+                        cart.line_items = cle;
+                        if (!line_item) {
+                            cart.line_items.push({
+                                id: dd.product_id,
+                                spec: dd.variant.spec,
+                                count: 1
+                            });
+                        }
+                        gvc.glitter.share.ApiCart.cart = cart;
+                    });
+                }
+                else {
+                    localStorage.setItem('block-refresh-cart', 'false');
+                }
+                return new gvc.glitter.htmlGenerate(subData.content.config, [], subData.content).render(gvc, {
+                    class: `w-100`,
+                    style: `position:relative;`,
+                    containerID: gvc.glitter.getUUID(),
+                    tag: gvc.glitter.getUUID(),
+                    jsFinish: () => {
+                    },
+                    onCreate: () => {
+                    },
+                    document: document
+                }, {});
+            }
+            if (subData.content.page_type === 'hidden') {
+                if (subData.content.show_auth.auth === 'all') {
+                    return startRender();
+                }
+                else if (subData.content.show_auth.auth === "password") {
+                    if (localStorage.getItem('password_to_see_' + subData.content.tag) === subData.content.show_auth.value) {
+                        return startRender();
+                    }
+                    return gvc.bindView(() => {
+                        const rid = gvc.glitter.getUUID();
+                        return {
+                            bind: rid,
+                            view: () => {
+                                return ``;
+                            },
+                            divCreate: {
+                                option: [
+                                    { key: 'id', value: rid }
+                                ]
+                            },
+                            onCreate: () => {
+                                function checkPwd() {
+                                    const pwd = window.prompt('請輸入網站密碼', '');
+                                    localStorage.setItem('password_to_see_' + subData.content.tag, pwd !== null && pwd !== void 0 ? pwd : '');
+                                    if (subData.content.show_auth.value === pwd) {
+                                        document.querySelector(`#${rid}`).outerHTML = startRender();
+                                    }
+                                    else {
+                                        const dialog = new ShareDialog(gvc.glitter);
+                                        dialog.checkYesOrNot({
+                                            text: '網站密碼輸入錯誤', callback: () => {
+                                                gvc.glitter.closeDiaLog();
+                                                checkPwd();
+                                            }
+                                        });
+                                    }
+                                }
+                                checkPwd();
+                            }
+                        };
+                    });
+                }
+                else if (subData.content.show_auth.auth === "member_type") {
+                    return gvc.bindView(() => {
+                        const rid = gvc.glitter.getUUID();
+                        return {
+                            bind: rid,
+                            view: () => {
+                                return ``;
+                            },
+                            divCreate: {
+                                option: [
+                                    { key: 'id', value: rid }
+                                ]
+                            },
+                            onCreate: () => {
+                                const dialog = new ShareDialog(gvc.glitter);
+                                UmClass.getUserData(gvc).then((resp) => {
+                                    try {
+                                        const mem = resp.member.find((d) => {
+                                            return d.trigger;
+                                        });
+                                        if (subData.content.show_auth.value.includes(mem.id)) {
+                                            document.querySelector(`#${rid}`).outerHTML = startRender();
+                                        }
+                                        else {
+                                            dialog.errorMessage({ text: '無訪問權限' });
+                                            gvc.glitter.href = '/index';
+                                        }
+                                    }
+                                    catch (e) {
+                                        dialog.errorMessage({ text: '無訪問權限' });
+                                        gvc.glitter.href = '/index';
+                                    }
+                                });
+                            }
+                        };
+                    });
+                }
+                else {
+                    return startRender();
+                }
+            }
+            else {
+                return startRender();
+            }
+        }
     }
 }
+window.glitter.setModule(import.meta.url, Blogs01);