ts-glitter 13.3.5 → 13.3.8

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

@@ -61,7 +61,6 @@ export class UserList {
         let vmi: any = undefined;
 
         function getDatalist() {
-            // ok
             return vm.dataList.map((dd: any) => {
                 return [
                     {
@@ -71,12 +70,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: '會員等級',
@@ -89,7 +86,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: '用戶狀態',
@@ -100,8 +96,6 @@ export class UserList {
                                 return html`<div class="badge bg-danger fs-7" style="max-height:34px;">已停用</div>`;
                             }
                         })(),
-                        width: 8,
-                        position: 'text-center',
                     },
                 ];
             });
@@ -306,7 +300,6 @@ export class UserList {
                                                                         },
                                                                     });
                                                                 },
-                                                                option: false,
                                                             },
                                                         ],
                                                     });
@@ -366,7 +359,6 @@ export class UserList {
         let vmi: any = undefined;
 
         function getDatalist() {
-            // ok
             return vm.dataList.map((dd: any) => {
                 return [
                     {
@@ -376,12 +368,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: '會員等級',
@@ -394,7 +384,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: '用戶狀態',
@@ -405,8 +394,6 @@ export class UserList {
                                 return html`<div class="badge bg-danger fs-7" style="max-height:34px;">已停用</div>`;
                             }
                         })(),
-                        width: 8,
-                        position: 'text-center',
                     },
                 ];
             });
@@ -539,7 +526,6 @@ export class UserList {
                                                     },
                                                 });
                                             },
-                                            option: false,
                                         },
                                     ],
                                 });
@@ -683,12 +669,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: '總金額',
@@ -717,7 +701,6 @@ export class UserList {
                                 gvc.notifyDataChange(vm.id);
                             })
                         ),
-                        width: 10,
                     },
                 ];
             });
@@ -738,7 +721,6 @@ export class UserList {
                             }
                             return gvc.glitter.ut.dateFormat(new Date(dd.deadline), 'yyyy-MM-dd hh:mm');
                         })(),
-                        width: 20,
                     },
                     { key: '購物金項目', value: dd.note ?? '' },
                     {
@@ -749,7 +731,6 @@ export class UserList {
                             }
                             return html`<span class="tx_700 text-danger">- ${dd.origin * -1}</span>`;
                         })(),
-                        width: 10,
                     },
                     {
                         key: '此筆可使用餘額',
@@ -1037,7 +1018,6 @@ export class UserList {
                                                                                                                     }
                                                                                                                     return text;
                                                                                                                 })(),
-                                                                                                                width: 55,
                                                                                                             },
                                                                                                             {
                                                                                                                 key: '有效期限',
@@ -1159,7 +1139,7 @@ export class UserList {
                                                                             bind: id,
                                                                             view: () => {
                                                                                 const limit = 10;
-                                                                                return new Promise(async (resolve, reject) => {
+                                                                                return new Promise(async (resolve) => {
                                                                                     const h = BgWidget.tableV3({
                                                                                         gvc: gvc,
                                                                                         getData: (vd) => {
@@ -1657,12 +1637,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: '用戶狀態',
@@ -1704,80 +1682,83 @@ 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: any) => {
-                                                    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: any) => {
-                                                                        return dd.id;
-                                                                    })
-                                                                    .join(`,`),
-                                                            }).then((res) => {
-                                                                dialog.dataLoading({ visible: false });
-                                                                if (res.result) {
-                                                                    vm.dataList = undefined;
-                                                                    gvc.notifyDataChange(id);
-                                                                } else {
-                                                                    dialog.errorMessage({ text: '刪除失敗' });
-                                                                }
-                                                            });
-                                                        }
-                                                    },
+                                ${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();
                                                 });
                                             },
-                                            option: false,
-                                        },
-                                    ],
-                                })}
+                                            rowClick: (data, index) => {
+                                                if (type === 'select') {
+                                                    vm.dataList[index].checked = !vm.dataList[index].checked;
+                                                    vmi.data = getDatalist();
+                                                    vmi.callback();
+                                                    callback(
+                                                        vm.dataList.filter((dd: any) => {
+                                                            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: any) => {
+                                                                                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;'

package/lowcode/cms-plugin/web-config-setting.js

@@ -20,39 +20,6 @@ export class WebConfigSetting {
         function getDatalist() {
             return vm.dataList.map((dd) => {
                 return [
-                    {
-                        key: EditorElem.checkBoxOnly({
-                            gvc: gvc,
-                            def: !vm.dataList.find((dd) => {
-                                return !dd.checked;
-                            }),
-                            callback: (result) => {
-                                vm.dataList.map((dd) => {
-                                    dd.checked = result;
-                                });
-                                vmi.data = getDatalist();
-                                vmi.callback();
-                                gvc.notifyDataChange(filterID);
-                                callback(vm.dataList.filter((dd) => {
-                                    return dd.checked;
-                                }));
-                            },
-                        }),
-                        value: EditorElem.checkBoxOnly({
-                            gvc: gvc,
-                            def: dd.checked,
-                            callback: (result) => {
-                                dd.checked = result;
-                                vmi.data = getDatalist();
-                                vmi.callback();
-                                gvc.notifyDataChange(filterID);
-                                callback(vm.dataList.filter((dd) => {
-                                    return dd.checked;
-                                }));
-                            },
-                            style: 'height:25px;',
-                        }),
-                    },
                     {
                         key: '配置檔標題',
                         value: html `<span class="fs-7">${dd.content.form_title}</span>`,
@@ -82,88 +49,71 @@ export class WebConfigSetting {
                             vm.type = 'add';
                         }))}
                                 </div>
-                                ${BgWidget.container(BgWidget.mainCard(BgWidget.tableV2({
-                            gvc: gvc,
-                            getData: (vd) => {
-                                vmi = vd;
-                                ApiPost.getManagerPost({
-                                    page: vmi.page - 1,
-                                    limit: 20,
-                                    type: WebConfigSetting.tag,
-                                    search: vm.query ? [`form_title-|>${vm.query}`] : [],
-                                }).then((data) => {
-                                    vmi.pageSize = Math.ceil(data.response.total / 20);
-                                    vm.dataList = data.response.data;
-                                    vmi.data = getDatalist();
-                                    vmi.loading = false;
-                                    vmi.callback();
-                                });
-                            },
-                            rowClick: (data, index) => {
-                                vm.data = vm.dataList[index];
-                                vm.type = 'replace';
-                            },
-                            filter: html `
-                                                ${BgWidget.searchPlace(gvc.event((e, event) => {
+                                ${BgWidget.container(BgWidget.mainCard([
+                            BgWidget.searchPlace(gvc.event((e, event) => {
                                 vm.query = e.value;
                                 gvc.notifyDataChange(vm.id);
-                            }), vm.query || '', '搜尋所有表單')}
-                                                ${gvc.bindView(() => {
-                                return {
-                                    bind: filterID,
-                                    view: () => {
-                                        const dialog = new ShareDialog(gvc.glitter);
-                                        const selCount = vm.dataList.filter((dd) => dd.checked).length;
-                                        return BgWidget.selNavbar({
-                                            count: selCount,
-                                            buttonList: [
-                                                BgWidget.selEventButton('批量移除', gvc.event(() => {
-                                                    dialog.checkYesOrNot({
-                                                        text: '是否確認刪除所選項目？',
-                                                        callback: (response) => {
-                                                            if (response) {
-                                                                dialog.dataLoading({ visible: true });
-                                                                ApiPost.delete({
-                                                                    id: vm.dataList
-                                                                        .filter((dd) => {
-                                                                        return dd.checked;
-                                                                    })
-                                                                        .map((dd) => {
-                                                                        return dd.id;
-                                                                    })
-                                                                        .join(`,`),
-                                                                }).then((res) => {
-                                                                    dialog.dataLoading({ visible: false });
-                                                                    if (res.result) {
-                                                                        vm.dataList = undefined;
-                                                                        gvc.notifyDataChange(vm.id);
-                                                                    }
-                                                                    else {
-                                                                        dialog.errorMessage({ text: '刪除失敗' });
-                                                                    }
-                                                                });
+                            }), vm.query || '', '搜尋所有表單'),
+                            BgWidget.tableV3({
+                                gvc: gvc,
+                                getData: (vd) => {
+                                    vmi = vd;
+                                    const limit = 20;
+                                    ApiPost.getManagerPost({
+                                        page: vmi.page - 1,
+                                        limit: limit,
+                                        type: WebConfigSetting.tag,
+                                        search: vm.query ? [`form_title-|>${vm.query}`] : [],
+                                    }).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) => {
+                                    vm.data = vm.dataList[index];
+                                    vm.type = 'replace';
+                                },
+                                filter: [
+                                    {
+                                        name: '批量移除',
+                                        event: () => {
+                                            const dialog = new ShareDialog(gvc.glitter);
+                                            dialog.checkYesOrNot({
+                                                text: '是否確認刪除所選項目？',
+                                                callback: (response) => {
+                                                    if (response) {
+                                                        dialog.dataLoading({ visible: true });
+                                                        ApiPost.delete({
+                                                            id: vm.dataList
+                                                                .filter((dd) => {
+                                                                return dd.checked;
+                                                            })
+                                                                .map((dd) => {
+                                                                return dd.id;
+                                                            })
+                                                                .join(`,`),
+                                                        }).then((res) => {
+                                                            dialog.dataLoading({ visible: false });
+                                                            if (res.result) {
+                                                                vm.dataList = undefined;
+                                                                gvc.notifyDataChange(vm.id);
                                                             }
-                                                        },
-                                                    });
-                                                })),
-                                            ],
-                                        });
-                                    },
-                                    divCreate: () => {
-                                        return {
-                                            class: `d-flex align-items-center p-2 py-3 ${!vm.dataList ||
-                                                !vm.dataList.find((dd) => {
-                                                    return dd.checked;
-                                                })
-                                                ? `d-none`
-                                                : ``}`,
-                                            style: ``,
-                                        };
+                                                            else {
+                                                                dialog.errorMessage({ text: '刪除失敗' });
+                                                            }
+                                                        });
+                                                    }
+                                                },
+                                            });
+                                        },
                                     },
-                                };
-                            })}
-                                            `,
-                        })))}
+                                ],
+                            }),
+                        ].join('')))}
                             `, BgWidget.getContainerWidth());
                     }
                     else if (vm.type == 'add') {