ts-glitter 13.3.5 → 13.3.8

package/lowcode/cms-plugin/sns-auto-reply.js

@@ -12,7 +12,7 @@ import { BgWidget } from '../backend-manager/bg-widget.js';
 import { Tool } from '../modules/tool.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { EditorElem } from '../glitterBundle/plugins/editor-elem.js';
-import { ShareDialog } from "../glitterBundle/dialog/ShareDialog.js";
+import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 const html = String.raw;
 export class AutoReply {
     static main(gvc, widget) {
@@ -23,9 +23,9 @@ export class AutoReply {
             tag: '',
             query: '',
             userData: {
-                userName: "",
-                password: ""
-            }
+                userName: '',
+                password: '',
+            },
         };
         const glitter = gvc.glitter;
         const id = glitter.getUUID();
@@ -104,7 +104,7 @@ export class AutoReply {
                                 ${BgWidget.title('自動寄送簡訊')}
                                 <div class="flex-fill"></div>
                             </div>
-                            ${BgWidget.container(BgWidget.mainCard(BgWidget.tableV2({
+                            ${BgWidget.container(BgWidget.mainCard(BgWidget.tableV3({
                         gvc: gvc,
                         getData: (vmk) => __awaiter(this, void 0, void 0, function* () {
                             const appData = yield ApiUser.getPublicConfig('store-information', 'manager');
@@ -117,7 +117,7 @@ export class AutoReply {
                                 'auto-sns-order-create',
                                 'sns-proof-purchase',
                                 'auto-sns-birthday',
-                                'auto-phone-verify'
+                                'auto-phone-verify',
                             ];
                             let index = 0;
                             for (const b of vm.dataList) {
@@ -125,18 +125,18 @@ export class AutoReply {
                                 vm.dataList[index].title = vm.dataList[index].title.replace(/@\{\{app_name\}\}/g, (appData.response.value && appData.response.value.shop_name) || '商店名稱');
                                 index++;
                             }
-                            vmi.data = getDatalist();
+                            vmi.pageSize = 1;
+                            vmi.originalData = vm.dataList;
+                            vmi.tableData = getDatalist();
                             vmi.loading = false;
-                            setTimeout(() => {
-                                vmi.callback();
-                            });
+                            vmi.callback();
                         }),
                         rowClick: (data, index) => {
                             vm.tag = vm.dataList[index].tag;
                             vm.type = 'replace';
                             gvc.notifyDataChange(id);
                         },
-                        filter: '',
+                        filter: [],
                     })))}
                             ${BgWidget.mbContainer(240)}
                         `, BgWidget.getContainerWidth());
@@ -207,16 +207,16 @@ export class AutoReply {
                                 placeHolder: '請輸入寄件者名稱',
                             }),
                             html `
-                                        <div class="d-flex mt-3 mb-2" >
+                                        <div class="d-flex mt-3 mb-2">
                                             <div class="d-flex" style="color: #393939;font-size: 15px;">簡訊內容</div>
                                             <div class="d-flex align-items-end ms-3" style="font-size: 12px;color: #8D8D8D">預計每則簡訊花費${pointCount * this.ticket}點</div>
                                         </div>
                                     `,
                             EditorElem.editeText({
                                 gvc: gvc,
-                                title: "",
-                                default: vm.data.content || "",
-                                placeHolder: "",
+                                title: '',
+                                default: vm.data.content || '',
+                                placeHolder: '',
                                 callback: (text) => {
                                     vm.data.content = text;
                                     let totalSize = 0;
@@ -236,8 +236,8 @@ export class AutoReply {
                                         pointCount = Math.ceil(totalSize / this.longSMS);
                                     }
                                     gvc.notifyDataChange(id);
-                                }
-                            })
+                                },
+                            }),
                         ].join('');
                     },
                 };
@@ -266,7 +266,7 @@ export class AutoReply {
                             });
                         }
                     },
-                    text: `確認無誤後將儲存`
+                    text: `確認無誤後將儲存`,
                 });
             }))}
                 </div>`,

package/lowcode/cms-plugin/sns-auto-reply.ts

@@ -4,13 +4,13 @@ import { BgWidget } from '../backend-manager/bg-widget.js';
 import { Tool } from '../modules/tool.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { EditorElem } from '../glitterBundle/plugins/editor-elem.js';
-import {ShareDialog} from "../glitterBundle/dialog/ShareDialog.js";
+import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 
 const html = String.raw;
 
 export class AutoReply {
     public static maxSize = 160;
-    public static longSMS=153;
+    public static longSMS = 153;
     public static ticket = 15;
 
     public static main(gvc: GVC, widget: any) {
@@ -27,10 +27,10 @@ export class AutoReply {
             dataList: undefined,
             tag: '',
             query: '',
-            userData:{
-                userName : "",
-                password : ""
-            }
+            userData: {
+                userName: '',
+                password: '',
+            },
         };
         const glitter = gvc.glitter;
         const id = glitter.getUUID();
@@ -39,7 +39,6 @@ export class AutoReply {
                 bind: id,
                 view: () => {
                     if (vm.type === 'replace') {
-
                         return AutoReply.autoSendEmail(
                             gvc,
                             vm.tag,
@@ -125,7 +124,7 @@ export class AutoReply {
                             </div>
                             ${BgWidget.container(
                                 BgWidget.mainCard(
-                                    BgWidget.tableV2({
+                                    BgWidget.tableV3({
                                         gvc: gvc,
                                         getData: async (vmk) => {
                                             const appData = await ApiUser.getPublicConfig('store-information', 'manager');
@@ -138,7 +137,7 @@ export class AutoReply {
                                                 'auto-sns-order-create',
                                                 'sns-proof-purchase',
                                                 'auto-sns-birthday',
-                                                    'auto-phone-verify'
+                                                'auto-phone-verify',
                                             ];
                                             let index = 0;
                                             for (const b of vm.dataList) {
@@ -149,18 +148,18 @@ export class AutoReply {
                                                 );
                                                 index++;
                                             }
-                                            vmi.data = getDatalist();
+                                            vmi.pageSize = 1;
+                                            vmi.originalData = vm.dataList;
+                                            vmi.tableData = getDatalist();
                                             vmi.loading = false;
-                                            setTimeout(() => {
-                                                vmi.callback();
-                                            });
+                                            vmi.callback();
                                         },
                                         rowClick: (data, index) => {
                                             vm.tag = vm.dataList[index].tag;
                                             vm.type = 'replace';
                                             gvc.notifyDataChange(id);
                                         },
-                                        filter: '',
+                                        filter: [],
                                     })
                                 )
                             )}
@@ -234,7 +233,6 @@ export class AutoReply {
                         return {
                             bind: id,
                             view: () => {
-                                
                                 return [
                                     EditorElem.editeInput({
                                         gvc: gvc,
@@ -246,20 +244,20 @@ export class AutoReply {
                                         placeHolder: '請輸入寄件者名稱',
                                     }),
                                     html`
-                                        <div class="d-flex mt-3 mb-2" >
+                                        <div class="d-flex mt-3 mb-2">
                                             <div class="d-flex" style="color: #393939;font-size: 15px;">簡訊內容</div>
-                                            <div class="d-flex align-items-end ms-3" style="font-size: 12px;color: #8D8D8D">預計每則簡訊花費${pointCount*this.ticket}點</div>
+                                            <div class="d-flex align-items-end ms-3" style="font-size: 12px;color: #8D8D8D">預計每則簡訊花費${pointCount * this.ticket}點</div>
                                         </div>
                                     `,
                                     EditorElem.editeText({
                                         gvc: gvc,
-                                        title:"",
-                                        default:vm.data.content || "",
-                                        placeHolder:"",
-                                        callback:(text)=>{
+                                        title: '',
+                                        default: vm.data.content || '',
+                                        placeHolder: '',
+                                        callback: (text) => {
                                             vm.data.content = text;
                                             let totalSize = 0;
-                                            
+
                                             for (let i = 0; i < text.length; i++) {
                                                 const char = text[i];
                                                 // 判斷是否為中文或全形字符（Unicode範圍包含中文）
@@ -269,16 +267,15 @@ export class AutoReply {
                                                     totalSize += 1; // 英文或半形字符佔1個單位
                                                 }
                                             }
-                                            
-                                            if (totalSize < this.maxSize){
+
+                                            if (totalSize < this.maxSize) {
                                                 pointCount = 1;
-                                            }else {
-                                                pointCount =  Math.ceil(totalSize / this.longSMS);
+                                            } else {
+                                                pointCount = Math.ceil(totalSize / this.longSMS);
                                             }
-                                            gvc.notifyDataChange(id)
-                                            
-                                        }
-                                    })
+                                            gvc.notifyDataChange(id);
+                                        },
+                                    }),
                                 ].join('');
                             },
                         };
@@ -295,9 +292,9 @@ export class AutoReply {
                         gvc.event(() => {
                             const dialog = new ShareDialog(gvc.glitter);
                             dialog.checkYesOrNot({
-                                callback : (select)=>{
-                                    if (select){
-                                        dialog.dataLoading({visible:true,text:'儲存中'})
+                                callback: (select) => {
+                                    if (select) {
+                                        dialog.dataLoading({ visible: true, text: '儲存中' });
                                         vm.data.updated_time = new Date();
                                         ApiUser.setPublicConfig({
                                             key: tag,
@@ -305,15 +302,14 @@ export class AutoReply {
                                             user_id: 'manager',
                                         }).then(() => {
                                             setTimeout(() => {
-                                                dialog.dataLoading({visible:false})
-                                                dialog.successMessage({text:'儲存成功'})
+                                                dialog.dataLoading({ visible: false });
+                                                dialog.successMessage({ text: '儲存成功' });
                                             }, 1000);
                                         });
                                     }
                                 },
-                                text:`確認無誤後將儲存`
-                            })
-                            
+                                text: `確認無誤後將儲存`,
+                            });
                         })
                     )}
                 </div>`,
@@ -410,7 +406,6 @@ export class AutoReply {
             return dd.tag === tag;
         })!;
         if (keyData.response.value) {
-
             b.title = keyData.response.value.title || b.title;
             b.toggle = keyData.response.value.toggle ?? true;
             b.content = keyData.response.value.content || b.content;
@@ -419,7 +414,6 @@ export class AutoReply {
         }
         return b;
     }
-
 }
 
 (window as any).glitter.setModule(import.meta.url, AutoReply);

package/lowcode/cms-plugin/user-list.js

@@ -51,12 +51,10 @@ export class UserList {
                     {
                         key: '電子信箱',
                         value: `<span class="fs-7">${dd.userData.email}</span>`,
-                        width: 25,
                     },
                     {
                         key: '訂單',
                         value: `<span class="fs-7">${dd.checkout_count} 筆</span>`,
-                        width: 7,
                     },
                     {
                         key: '會員等級',
@@ -69,7 +67,6 @@ export class UserList {
                     {
                         key: '上次登入時間',
                         value: `<span class="fs-7">${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}</span>`,
-                        width: 15,
                     },
                     {
                         key: '用戶狀態',
@@ -81,8 +78,6 @@ export class UserList {
                                 return html `<div class="badge bg-danger fs-7" style="max-height:34px;">已停用</div>`;
                             }
                         })(),
-                        width: 8,
-                        position: 'text-center',
                     },
                 ];
             });
@@ -268,7 +263,6 @@ export class UserList {
                                                         },
                                                     });
                                                 },
-                                                option: false,
                                             },
                                         ],
                                     });
@@ -324,12 +318,10 @@ export class UserList {
                     {
                         key: '電子信箱',
                         value: `<span class="fs-7">${dd.userData.email}</span>`,
-                        width: 25,
                     },
                     {
                         key: '訂單',
                         value: `<span class="fs-7">${dd.checkout_count} 筆</span>`,
-                        width: 7,
                     },
                     {
                         key: '會員等級',
@@ -342,7 +334,6 @@ export class UserList {
                     {
                         key: '上次登入時間',
                         value: `<span class="fs-7">${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}</span>`,
-                        width: 15,
                     },
                     {
                         key: '用戶狀態',
@@ -354,8 +345,6 @@ export class UserList {
                                 return html `<div class="badge bg-danger fs-7" style="max-height:34px;">已停用</div>`;
                             }
                         })(),
-                        width: 8,
-                        position: 'text-center',
                     },
                 ];
             });
@@ -481,7 +470,6 @@ export class UserList {
                                                     },
                                                 });
                                             },
-                                            option: false,
                                         },
                                     ],
                                 });
@@ -618,12 +606,10 @@ export class UserList {
                     {
                         key: '訂單編號',
                         value: html ` <div style="overflow: hidden;white-space: normal;color: #4D86DB;word-break: break-all;">${dd.orderData.orderID}</div>`,
-                        width: 25,
                     },
                     {
                         key: '訂單日期',
                         value: html ` <div style="overflow: hidden;white-space: normal;word-break: break-all;">${gvc.glitter.ut.dateFormat(new Date(dd.created_time), 'yyyy-MM-dd hh:mm')}</div>`,
-                        width: 25,
                     },
                     {
                         key: '總金額',
@@ -649,7 +635,6 @@ export class UserList {
                             vm.type = 'order';
                             gvc.notifyDataChange(vm.id);
                         })),
-                        width: 10,
                     },
                 ];
             });
@@ -670,7 +655,6 @@ export class UserList {
                             }
                             return gvc.glitter.ut.dateFormat(new Date(dd.deadline), 'yyyy-MM-dd hh:mm');
                         })(),
-                        width: 20,
                     },
                     { key: '購物金項目', value: (_a = dd.note) !== null && _a !== void 0 ? _a : '' },
                     {
@@ -681,7 +665,6 @@ export class UserList {
                             }
                             return html `<span class="tx_700 text-danger">- ${dd.origin * -1}</span>`;
                         })(),
-                        width: 10,
                     },
                     {
                         key: '此筆可使用餘額',
@@ -937,7 +920,6 @@ export class UserList {
                                                                                         }
                                                                                         return text;
                                                                                     })(),
-                                                                                    width: 55,
                                                                                 },
                                                                                 {
                                                                                     key: '有效期限',
@@ -1052,7 +1034,7 @@ export class UserList {
                                                             bind: id,
                                                             view: () => {
                                                                 const limit = 10;
-                                                                return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                                                                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                                                                     const h = BgWidget.tableV3({
                                                                         gvc: gvc,
                                                                         getData: (vd) => {
@@ -1497,12 +1479,10 @@ export class UserList {
                     {
                         key: '用戶信箱',
                         value: `<span class="fs-7">${dd.userData.email}</span>`,
-                        width: 40,
                     },
                     {
                         key: '上次登入時間',
                         value: `<span class="fs-7">${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}</span>`,
-                        width: 25,
                     },
                     {
                         key: '用戶狀態',
@@ -1543,76 +1523,77 @@ export class UserList {
                                         自訂資料
                                     </button>
                                 </div>
-                                ${BgWidget.searchPlace(gvc.event((e, event) => {
-                            vm.query = e.value;
-                            gvc.notifyDataChange(id);
-                        }), vm.query || '', '搜尋所有用戶')}
-                                ${BgWidget.tableV3({
-                            gvc: gvc,
-                            getData: (vd) => {
-                                vmi = vd;
-                                const limit = 20;
-                                ApiUser.getUserList({
-                                    page: vmi.page - 1,
-                                    limit: limit,
-                                    search: vm.query || undefined,
-                                }).then((data) => {
-                                    vm.dataList = data.response.data;
-                                    vmi.pageSize = Math.ceil(data.response.total / limit);
-                                    vmi.originalData = vm.dataList;
-                                    vmi.tableData = getDatalist();
-                                    vmi.loading = false;
-                                    vmi.callback();
-                                });
-                            },
-                            rowClick: (data, index) => {
-                                if (type === 'select') {
-                                    vm.dataList[index].checked = !vm.dataList[index].checked;
-                                    vmi.data = getDatalist();
-                                    vmi.callback();
-                                    callback(vm.dataList.filter((dd) => {
-                                        return dd.checked;
-                                    }));
-                                }
-                                else {
-                                    vm.data = vm.dataList[index];
-                                    vm.type = 'replace';
-                                }
-                            },
-                            filter: [
-                                {
-                                    name: '批量移除',
-                                    event: (checkedData) => {
-                                        const dialog = new ShareDialog(gvc.glitter);
-                                        dialog.checkYesOrNot({
-                                            text: '是否確認刪除所選項目？',
-                                            callback: (response) => {
-                                                if (response) {
-                                                    dialog.dataLoading({ visible: true });
-                                                    ApiUser.deleteUser({
-                                                        id: checkedData
-                                                            .map((dd) => {
-                                                            return dd.id;
-                                                        })
-                                                            .join(`,`),
-                                                    }).then((res) => {
-                                                        dialog.dataLoading({ visible: false });
-                                                        if (res.result) {
-                                                            vm.dataList = undefined;
-                                                            gvc.notifyDataChange(id);
-                                                        }
-                                                        else {
-                                                            dialog.errorMessage({ text: '刪除失敗' });
-                                                        }
-                                                    });
-                                                }
-                                            },
-                                        });
-                                    },
-                                    option: false,
+                                ${BgWidget.mainCard([
+                            BgWidget.searchPlace(gvc.event((e, event) => {
+                                vm.query = e.value;
+                                gvc.notifyDataChange(id);
+                            }), vm.query || '', '搜尋所有用戶'),
+                            BgWidget.tableV3({
+                                gvc: gvc,
+                                getData: (vd) => {
+                                    vmi = vd;
+                                    const limit = 20;
+                                    ApiUser.getUserList({
+                                        page: vmi.page - 1,
+                                        limit: limit,
+                                        search: vm.query || undefined,
+                                    }).then((data) => {
+                                        vm.dataList = data.response.data;
+                                        vmi.pageSize = Math.ceil(data.response.total / limit);
+                                        vmi.originalData = vm.dataList;
+                                        vmi.tableData = getDatalist();
+                                        vmi.loading = false;
+                                        vmi.callback();
+                                    });
+                                },
+                                rowClick: (data, index) => {
+                                    if (type === 'select') {
+                                        vm.dataList[index].checked = !vm.dataList[index].checked;
+                                        vmi.data = getDatalist();
+                                        vmi.callback();
+                                        callback(vm.dataList.filter((dd) => {
+                                            return dd.checked;
+                                        }));
+                                    }
+                                    else {
+                                        vm.data = vm.dataList[index];
+                                        vm.type = 'replace';
+                                    }
                                 },
-                            ],
-                        })}
+                                filter: [
+                                    {
+                                        name: '批量移除',
+                                        event: (checkedData) => {
+                                            const dialog = new ShareDialog(gvc.glitter);
+                                            dialog.checkYesOrNot({
+                                                text: '是否確認刪除所選項目？',
+                                                callback: (response) => {
+                                                    if (response) {
+                                                        dialog.dataLoading({ visible: true });
+                                                        ApiUser.deleteUser({
+                                                            id: checkedData
+                                                                .map((dd) => {
+                                                                return dd.id;
+                                                            })
+                                                                .join(`,`),
+                                                        }).then((res) => {
+                                                            dialog.dataLoading({ visible: false });
+                                                            if (res.result) {
+                                                                vm.dataList = undefined;
+                                                                gvc.notifyDataChange(id);
+                                                            }
+                                                            else {
+                                                                dialog.errorMessage({ text: '刪除失敗' });
+                                                            }
+                                                        });
+                                                    }
+                                                },
+                                            });
+                                        },
+                                    },
+                                ],
+                            }),
+                        ].join(''))}
                             `, undefined, 'padding: 0 !important; margin: 0 !important;');
                     }
                     else if (vm.type == 'replace') {