ts-glitter 21.1.7 → 21.1.9

package/lowcode/cms-plugin/stock-vendors.ts

@@ -7,6 +7,7 @@ import { FilterOptions } from './filter-options.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -29,6 +30,7 @@ type VM = {
   query: string;
   queryType: string;
   orderString: string;
+  listLimit: number;
 };
 
 export class StockVendors {
@@ -45,6 +47,7 @@ export class StockVendors {
       queryType: '',
       filter: {},
       orderString: '',
+      listLimit: TableStorage.getLimit(),
     };
 
     return gvc.bindView({
@@ -133,8 +136,7 @@ export class StockVendors {
                         gvc,
                         callback: (value: any) => {
                           vm.queryType = value;
-                          gvc.notifyDataChange(vm.tableId);
-                          gvc.notifyDataChange(id);
+                          gvc.notifyDataChange([vm.tableId, id]);
                         },
                         default: vm.queryType || 'name',
                         options: FilterOptions.vendorsSelect,
@@ -142,12 +144,19 @@ export class StockVendors {
                       BgWidget.searchFilter(
                         gvc.event(e => {
                           vm.query = `${e.value}`.trim();
-                          gvc.notifyDataChange(vm.tableId);
-                          gvc.notifyDataChange(id);
+                          gvc.notifyDataChange([vm.tableId, id]);
                         }),
                         vm.query || '',
                         '搜尋庫存點名稱'
                       ),
+                      BgWidget.countingFilter({
+                        gvc,
+                        callback: value => {
+                          vm.listLimit = value;
+                          gvc.notifyDataChange([vm.tableId, id]);
+                        },
+                        default: vm.listLimit,
+                      }),
                     ];
 
                     const filterTags = ListComp.getFilterTags(FilterOptions.vendorsFunnel);
@@ -162,14 +171,13 @@ export class StockVendors {
                     gvc: gvc,
                     getData: vd => {
                       vmi = vd;
-                      const limit = 100;
                       this.getPublicData().then((data: any) => {
                         if (data.list) {
                           data.list = data.list.filter((item: VendorData) => {
                             return vm.query === '' || item.name.includes(vm.query);
                           });
                           vm.dataList = data.list;
-                          vmi.pageSize = Math.ceil(data.list.length / limit);
+                          vmi.pageSize = Math.ceil(data.list.length / vm.listLimit);
                           vmi.originalData = vm.dataList;
                           vmi.tableData = getDatalist();
                         }

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

@@ -26,6 +26,7 @@ import { UserExcel } from './module/user-excel.js';
 import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { ListHeaderOption } from './list-header-option.js';
 import { UserModule } from './user/user-module.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 export class UserList {
     static main(gvc, obj) {
@@ -53,6 +54,7 @@ export class UserList {
             headerConfig: [],
             apiJSON: {},
             checkedData: [],
+            listLimit: TableStorage.getLimit(),
         };
         const ListComp = new BgListComponent(gvc, vm, FilterOptions.userFilterFrame);
         vm.filter = ListComp.getFilterObject();
@@ -300,6 +302,14 @@ export class UserList {
                                                 vm.query = `${e.value}`.trim();
                                                 gvc.notifyDataChange([vm.barId, vm.tableId]);
                                             }), vm.query || '', '搜尋所有用戶'),
+                                            BgWidget.countingFilter({
+                                                gvc,
+                                                callback: value => {
+                                                    vm.listLimit = value;
+                                                    gvc.notifyDataChange([vm.barId, vm.tableId]);
+                                                },
+                                                default: vm.listLimit,
+                                            }),
                                             BgWidget.funnelFilter({
                                                 gvc,
                                                 callback: () => ListComp.showRightMenu(userFunnel),
@@ -358,10 +368,9 @@ export class UserList {
                                                 vmi = vd;
                                                 vm.tabLoading = true;
                                                 UserList.vm.page = vmi.page;
-                                                const limit = 20;
                                                 vm.apiJSON = {
                                                     page: vmi.page - 1,
-                                                    limit: limit,
+                                                    limit: vm.listLimit,
                                                     search: vm.query || undefined,
                                                     searchType: vm.queryType || 'name',
                                                     orderString: vm.orderString || '',
@@ -371,8 +380,8 @@ export class UserList {
                                                 };
                                                 ApiUser.getUserListOrders(vm.apiJSON).then(data => {
                                                     vm.dataList = data.response.data;
-                                                    vmi.limit = limit;
-                                                    vmi.pageSize = Math.ceil(data.response.total / limit);
+                                                    vmi.limit = vm.listLimit;
+                                                    vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                                                     vmi.originalData = vm.dataList;
                                                     vmi.tableData = getUserlist();
                                                     vmi.allResult = () => __awaiter(this, void 0, void 0, function* () {
@@ -495,6 +504,7 @@ export class UserList {
             headerConfig: [],
             apiJSON: {},
             checkedData: [],
+            listLimit: TableStorage.getLimit(),
         };
         const ListComp = new BgListComponent(gvc, vm, FilterOptions.userFilterFrame);
         vm.filter = ListComp.getFilterObject();
@@ -558,6 +568,14 @@ export class UserList {
                                             vm.query = `${e.value}`.trim();
                                             gvc.notifyDataChange([vm.barId, vm.tableId]);
                                         }), vm.query || '', '搜尋會員電話/編號/名稱'),
+                                        BgWidget.countingFilter({
+                                            gvc,
+                                            callback: value => {
+                                                vm.listLimit = value;
+                                                gvc.notifyDataChange([vm.barId, vm.tableId]);
+                                            },
+                                            default: vm.listLimit,
+                                        }),
                                         BgWidget.funnelFilter({
                                             gvc,
                                             callback: () => ListComp.showRightMenu(userFunnel),
@@ -584,10 +602,9 @@ export class UserList {
                                     gvc: gvc,
                                     getData: vd => {
                                         vmi = vd;
-                                        const limit = 20;
                                         vm.apiJSON = {
                                             page: vmi.page - 1,
-                                            limit: limit,
+                                            limit: vm.listLimit,
                                             search: vm.query || undefined,
                                             searchType: vm.queryType || 'name',
                                             orderString: vm.orderString || '',
@@ -597,7 +614,7 @@ export class UserList {
                                         };
                                         ApiUser.getUserListOrders(vm.apiJSON).then(data => {
                                             vm.dataList = data.response.data;
-                                            vmi.pageSize = Math.ceil(data.response.total / limit);
+                                            vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                                             vmi.originalData = vm.dataList;
                                             vmi.tableData = getDatalist();
                                             vmi.loading = false;

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

@@ -18,6 +18,7 @@ import { UserExcel } from './module/user-excel.js';
 import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { ListHeaderOption } from './list-header-option.js';
 import { UserModule } from './user/user-module.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -43,6 +44,7 @@ type ViewModel = {
   headerConfig: string[];
   apiJSON: any;
   checkedData: any[];
+  listLimit: number;
 };
 
 export class UserList {
@@ -89,6 +91,7 @@ export class UserList {
       headerConfig: [],
       apiJSON: {},
       checkedData: [],
+      listLimit: TableStorage.getLimit(),
     };
 
     const ListComp = new BgListComponent(gvc, vm, FilterOptions.userFilterFrame);
@@ -369,6 +372,14 @@ export class UserList {
                               vm.query || '',
                               '搜尋所有用戶'
                             ),
+                            BgWidget.countingFilter({
+                              gvc,
+                              callback: value => {
+                                vm.listLimit = value;
+                                gvc.notifyDataChange([vm.barId, vm.tableId]);
+                              },
+                              default: vm.listLimit,
+                            }),
                             BgWidget.funnelFilter({
                               gvc,
                               callback: () => ListComp.showRightMenu(userFunnel),
@@ -433,11 +444,10 @@ export class UserList {
                               vmi = vd;
                               vm.tabLoading = true;
                               UserList.vm.page = vmi.page;
-                              const limit = 20;
 
                               vm.apiJSON = {
                                 page: vmi.page - 1,
-                                limit: limit,
+                                limit: vm.listLimit,
                                 search: vm.query || undefined,
                                 searchType: vm.queryType || 'name',
                                 orderString: vm.orderString || '',
@@ -448,8 +458,8 @@ export class UserList {
 
                               ApiUser.getUserListOrders(vm.apiJSON).then(data => {
                                 vm.dataList = data.response.data;
-                                vmi.limit = limit;
-                                vmi.pageSize = Math.ceil(data.response.total / limit);
+                                vmi.limit = vm.listLimit;
+                                vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                                 vmi.originalData = vm.dataList;
                                 vmi.tableData = getUserlist();
 
@@ -588,6 +598,7 @@ export class UserList {
       headerConfig: [],
       apiJSON: {},
       checkedData: [],
+      listLimit: TableStorage.getLimit(),
     };
 
     const ListComp = new BgListComponent(gvc, vm, FilterOptions.userFilterFrame);
@@ -660,6 +671,14 @@ export class UserList {
                       vm.query || '',
                       '搜尋會員電話/編號/名稱'
                     ),
+                    BgWidget.countingFilter({
+                      gvc,
+                      callback: value => {
+                        vm.listLimit = value;
+                        gvc.notifyDataChange([vm.barId, vm.tableId]);
+                      },
+                      default: vm.listLimit,
+                    }),
                     BgWidget.funnelFilter({
                       gvc,
                       callback: () => ListComp.showRightMenu(userFunnel),
@@ -687,10 +706,9 @@ export class UserList {
                   gvc: gvc,
                   getData: vd => {
                     vmi = vd;
-                    const limit = 20;
                     vm.apiJSON = {
                       page: vmi.page - 1,
-                      limit: limit,
+                      limit: vm.listLimit,
                       search: vm.query || undefined,
                       searchType: vm.queryType || 'name',
                       orderString: vm.orderString || '',
@@ -700,7 +718,7 @@ export class UserList {
                     };
                     ApiUser.getUserListOrders(vm.apiJSON).then(data => {
                       vm.dataList = data.response.data;
-                      vmi.pageSize = Math.ceil(data.response.total / limit);
+                      vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                       vmi.originalData = vm.dataList;
                       vmi.tableData = getDatalist();
                       vmi.loading = false;

package/lowcode/css/editor.css

@@ -588,14 +588,18 @@ h6 {
   background: var(--background-orange);
 }
 
+.form-switch .form-check-input {
+  box-shadow: 1px 1px 2.5px rgba(0, 0, 0, 0.2);
+}
+
 .form-switch .form-check-input:checked {
   background-color: var(--main-black) !important;
-  box-shadow: 0 0.5rem 1.125rem -0.5rem var(--main-black);
+  box-shadow: 1px 1px 2.5px rgba(0, 0, 0, 0.2);
 }
 
 .form-switch .form-check-input-success:checked {
   background-color: var(--item-success) !important;
-  box-shadow: 0 0.5rem 1.125rem -0.5rem var(--main-black);
+  box-shadow: 1px 1px 2.5px rgba(0, 0, 0, 0.2);
 }
 
 .bt_border_editor {
@@ -902,7 +906,7 @@ h6 {
   color: var(--main-black);
 }
 
-.c_funnel {
+.c_filter_view {
   display: flex;
   padding: 9px;
   min-width: 40px;
@@ -941,6 +945,7 @@ h6 {
   color: var(--main-black);
   font-size: 16px;
   font-weight: 400;
+  padding-top: 1px;
 }
 
 .c_dropdown {
@@ -1277,9 +1282,9 @@ h6 {
   }
 
   .c_absolute {
-    width: 200px;
-    height: 250px;
-    padding: 12px;
+    width: 220px;
+    height: 280px;
+    padding: 16px;
   }
 
   .btn-gray,

package/lowcode/form-view/e-commerce/product-select.js

@@ -124,9 +124,10 @@ export class ProductSelect {
                                 return [];
                             }
                         }))();
-                        resolve(html ` <div class="d-flex flex-column py-2 my-2 border-top" style="gap: 18px;">
+                        resolve(html ` <div class="d-flex flex-column py-2" style="">
+                <div class="mx-n3  border-top" ></div>
                 <div
-                  class="d-flex align-items-center gray-bottom-line-18 pb-2"
+                  class="d-flex align-items-center  pb-2"
                   style="gap: 10px; justify-content: space-between;"
                 >
                   <div class="flex-fill ">
@@ -153,14 +154,7 @@ export class ProductSelect {
                     class="${bundle.formData[bundle.key].select === 'all' ? `d-none` : ``}"
                     style="margin-top: 30px;"
                   >
-                    ${BgWidget.grayButton((() => {
-                            switch (bundle.formData[bundle.key].select) {
-                                case 'product':
-                                case 'collection':
-                                    return `選取`;
-                            }
-                            return ``;
-                        })(), gvc.event(() => {
+                    ${BgWidget.save(gvc.event(() => {
                             var _a, _b;
                             if (bundle.formData[bundle.key].select === 'product') {
                                 bundle.formData[bundle.key].value = (_a = bundle.formData[bundle.key].value) !== null && _a !== void 0 ? _a : [];
@@ -186,7 +180,14 @@ export class ProductSelect {
                                     }),
                                 });
                             }
-                        }), { textStyle: 'font-weight: 400;' })}
+                        }), (() => {
+                            switch (bundle.formData[bundle.key].select) {
+                                case 'product':
+                                case 'collection':
+                                    return `選取`;
+                            }
+                            return ``;
+                        })())}
                   </div>
                 </div>
                 <div class="d-flex flex-column gap-2" id="${subVM.containerId}">
@@ -232,6 +233,7 @@ export class ProductSelect {
                             }
                         }))}
                 </div>
+                <div class="mx-n3  border-top" ></div>
               </div>`);
                     }));
                 },

package/lowcode/form-view/e-commerce/product-select.ts

@@ -127,9 +127,10 @@ export class ProductSelect {
               }
             })();
             resolve(
-              html` <div class="d-flex flex-column py-2 my-2 border-top" style="gap: 18px;">
+              html` <div class="d-flex flex-column py-2" style="">
+                <div class="mx-n3  border-top" ></div>
                 <div
-                  class="d-flex align-items-center gray-bottom-line-18 pb-2"
+                  class="d-flex align-items-center  pb-2"
                   style="gap: 10px; justify-content: space-between;"
                 >
                   <div class="flex-fill ">
@@ -156,15 +157,7 @@ export class ProductSelect {
                     class="${bundle.formData[bundle.key].select === 'all' ? `d-none` : ``}"
                     style="margin-top: 30px;"
                   >
-                    ${BgWidget.grayButton(
-                      (() => {
-                        switch (bundle.formData[bundle.key].select) {
-                          case 'product':
-                          case 'collection':
-                            return `選取`;
-                        }
-                        return ``;
-                      })(),
+                    ${BgWidget.save(
                       gvc.event(() => {
                         if (bundle.formData[bundle.key].select === 'product') {
                           bundle.formData[bundle.key].value = bundle.formData[bundle.key].value ?? [];
@@ -190,7 +183,15 @@ export class ProductSelect {
                           });
                         }
                       }),
-                      { textStyle: 'font-weight: 400;' }
+                      (() => {
+                        switch (bundle.formData[bundle.key].select) {
+                          case 'product':
+                          case 'collection':
+                            return `選取`;
+                        }
+                        return ``;
+                      })(),
+                      
                     )}
                   </div>
                 </div>
@@ -241,6 +242,7 @@ export class ProductSelect {
                     })
                   )}
                 </div>
+                <div class="mx-n3  border-top" ></div>
               </div>`
             );
           });

package/lowcode/modules/tool.js

@@ -81,4 +81,13 @@ export class Tool {
             return a + b;
         }
     }
+    static isNowBetweenDates(startIso, endIso) {
+        const now = new Date();
+        const startDate = new Date(startIso);
+        const endDate = new Date(endIso);
+        if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+            return true;
+        }
+        return now >= startDate && now <= endDate;
+    }
 }

package/lowcode/modules/tool.ts

@@ -98,4 +98,16 @@ export class Tool {
       return a + b;
     }
   }
+
+  static isNowBetweenDates(startIso: string, endIso: string): boolean {
+    const now = new Date();
+    const startDate = new Date(startIso);
+    const endDate = new Date(endIso);
+
+    if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+      return true;
+    }
+
+    return now >= startDate && now <= endDate;
+  }
 }