ts-glitter 21.1.8 → 21.2.0

package/lowcode/cms-plugin/module/order-excel.ts

@@ -410,8 +410,7 @@ export class OrderExcel {
 
   // 取得客製化資訊
   static getCustomizeMap = async (order?: any) => {
-    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig] = await OrderExcel.customizePromise();
-
+    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig ,receipt] = await OrderExcel.customizePromise();
     const customizeMap = new Map();
 
     const getUserValue = (key: string) => {
@@ -456,6 +455,20 @@ export class OrderExcel {
       customizeMap.set(`物流自訂值 - ${item.title}`, order ? getShipmentValue(item.key) : '-');
     });
 
+    let viewModel = [
+      ['姓名', 'name'],
+      ['電話', 'phone'],
+      ['信箱', 'email'],
+    ];
+    receipt.list.map((d1: any) => {
+      if (
+        !viewModel.find(dd => {
+          return dd[1] === d1.key;
+        })
+      ) {
+        customizeMap.set(`收件人資訊 - ${d1.title}`, order ? (order.orderData.user_info[d1.key] ?? '-') : '-');
+      }
+    })
     return customizeMap;
   };
 
@@ -1010,6 +1023,13 @@ export class OrderExcel {
       await ApiUser.getPublicConfig('customer_form_user_setting', 'manager').then(r => {
         return Array.isArray(r.response.value.list) ? r.response.value.list : [];
       }),
+      //收件人資料
+      (
+        await ApiUser.getPublicConfig(
+          'custom_form_checkout_recipient',
+          'manager'
+        )
+      ).response.value
     ]);
 
     return dataArray;

package/lowcode/cms-plugin/module/table-storage.js

@@ -0,0 +1,11 @@
+export class TableStorage {
+}
+TableStorage.limitList = [10, 25, 50, 75, 100];
+TableStorage.setLimit = (limit) => {
+    localStorage.setItem('table_default_limit', `${limit}`);
+};
+TableStorage.getLimit = () => {
+    var _a;
+    const limit = parseInt((_a = localStorage.getItem('table_default_limit')) !== null && _a !== void 0 ? _a : '10', 10);
+    return isNaN(limit) ? 10 : limit;
+};

package/lowcode/cms-plugin/module/table-storage.ts

@@ -0,0 +1,12 @@
+export class TableStorage {
+  static limitList = [10, 25, 50, 75, 100];
+
+  static setLimit = (limit: number) => {
+    localStorage.setItem('table_default_limit', `${limit}`);
+  };
+
+  static getLimit = () => {
+    const limit = parseInt(localStorage.getItem('table_default_limit') ?? '10', 10);
+    return isNaN(limit) ? 10 : limit;
+  };
+}

package/lowcode/cms-plugin/permission-setting.js

@@ -6,6 +6,7 @@ import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Setting_editor } from '../jspage/function-page/setting_editor.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 export class PermissionSetting {
     static main(gvc, edit_mode) {
@@ -41,6 +42,7 @@ export class PermissionSetting {
                     },
                     dataList: [],
                     filter: {},
+                    listLimit: TableStorage.getLimit(),
                 };
                 return a;
             }
@@ -73,6 +75,7 @@ export class PermissionSetting {
                     },
                     dataList: [],
                     filter: {},
+                    listLimit: TableStorage.getLimit(),
                 };
             }
         }
@@ -203,17 +206,23 @@ export class PermissionSetting {
                                             gvc,
                                             callback: (value) => {
                                                 vm.queryType = value;
-                                                gvc.notifyDataChange(vm.tableId);
-                                                gvc.notifyDataChange(id);
+                                                gvc.notifyDataChange([vm.tableId, id]);
                                             },
                                             default: vm.queryType || 'name',
                                             options: FilterOptions.permissionSelect,
                                         }),
                                         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,
+                                        }),
                                         BgWidget.funnelFilter({
                                             gvc,
                                             callback: () => ListComp.showRightMenu(FilterOptions.permissionFunnel),
@@ -222,8 +231,7 @@ export class PermissionSetting {
                                             gvc,
                                             callback: (value) => {
                                                 vm.orderString = value;
-                                                gvc.notifyDataChange(vm.tableId);
-                                                gvc.notifyDataChange(id);
+                                                gvc.notifyDataChange([vm.tableId, id]);
                                             },
                                             default: vm.orderString || 'default',
                                             options: FilterOptions.permissionOrderBy,
@@ -241,17 +249,16 @@ export class PermissionSetting {
                                     gvc: gvc,
                                     getData: vd => {
                                         vmi = vd;
-                                        const limit = 10;
                                         ApiUser.getPermission({
                                             page: vmi.page - 1,
-                                            limit: limit,
+                                            limit: vm.listLimit,
                                             queryType: vm.queryType,
                                             query: vm.query,
                                             orderBy: vm.orderString,
                                             filter: vm.filter,
                                         }).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/permission-setting.ts

@@ -7,6 +7,7 @@ import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Setting_editor } from '../jspage/function-page/setting_editor.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -84,6 +85,7 @@ type ViewModel = {
   data: PermissionItem;
   dataList: any;
   filter: any;
+  listLimit: number;
 };
 
 type PosViewModel = {
@@ -135,6 +137,7 @@ export class PermissionSetting {
           },
           dataList: [],
           filter: {},
+          listLimit: TableStorage.getLimit(),
         };
         return a;
       } else {
@@ -166,6 +169,7 @@ export class PermissionSetting {
           },
           dataList: [],
           filter: {},
+          listLimit: TableStorage.getLimit(),
         };
       }
     }
@@ -310,8 +314,7 @@ export class PermissionSetting {
                               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.permissionSelect,
@@ -319,12 +322,19 @@ export class PermissionSetting {
                             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,
+                            }),
                             BgWidget.funnelFilter({
                               gvc,
                               callback: () => ListComp.showRightMenu(FilterOptions.permissionFunnel),
@@ -333,8 +343,7 @@ export class PermissionSetting {
                               gvc,
                               callback: (value: any) => {
                                 vm.orderString = value;
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(id);
+                                gvc.notifyDataChange([vm.tableId, id]);
                               },
                               default: vm.orderString || 'default',
                               options: FilterOptions.permissionOrderBy,
@@ -353,17 +362,16 @@ export class PermissionSetting {
                           gvc: gvc,
                           getData: vd => {
                             vmi = vd;
-                            const limit = 10;
                             ApiUser.getPermission({
                               page: vmi.page - 1,
-                              limit: limit,
+                              limit: vm.listLimit,
                               queryType: vm.queryType,
                               query: vm.query,
                               orderBy: vm.orderString,
                               filter: vm.filter,
                             }).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;
@@ -695,7 +703,7 @@ export class PermissionSetting {
                     }
 
                     dialog.dataLoading({ visible: true });
-                    
+
                     ApiUser.setPermission({
                       email: obj.type === 'add' ? vm.data.email : original.email,
                       config: {

package/lowcode/cms-plugin/reconciliation-area.js

@@ -19,6 +19,7 @@ import { ShoppingOrderManager } from './shopping-order-manager.js';
 import { PaymentConfig } from '../glitter-base/global/payment-config.js';
 import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { OrderInfo } from '../public-models/order-info.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 const globalStyle = {
     header_title: `
@@ -99,6 +100,7 @@ export class ReconciliationArea {
             apiJSON: {},
             checkedData: [],
             headerConfig: [],
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView(() => {
             const id = gvc.glitter.getUUID();
@@ -367,6 +369,14 @@ export class ReconciliationArea {
                                                                 vm.query = `${e.value}`.trim();
                                                                 gvc.notifyDataChange(vm.id);
                                                             }), vm.query || '', '搜尋訂單'),
+                                                            BgWidget.countingFilter({
+                                                                gvc,
+                                                                callback: value => {
+                                                                    vm.listLimit = value;
+                                                                    gvc.notifyDataChange(vm.id);
+                                                                },
+                                                                default: vm.listLimit,
+                                                            }),
                                                             BgWidget.funnelFilter({
                                                                 gvc,
                                                                 callback: () => {
@@ -393,10 +403,9 @@ export class ReconciliationArea {
                                                 defPage: ReconciliationArea.vm.page,
                                                 getData: vmi => {
                                                     ReconciliationArea.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 || 'cart_token',
                                                         orderString: vm.orderString,
@@ -491,7 +500,7 @@ export class ReconciliationArea {
                                                             });
                                                         }
                                                         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/reconciliation-area.ts

@@ -20,6 +20,7 @@ import { POSSetting } from './POS-setting.js';
 import { PosFunction } from './pos-pages/pos-function.js';
 import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { OrderInfo } from '../public-models/order-info.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -43,6 +44,7 @@ interface ViewModel {
   apiJSON: any;
   checkedData: any[];
   headerConfig: string[];
+  listLimit: number;
 }
 
 //共用樣式
@@ -147,6 +149,7 @@ export class ReconciliationArea {
       apiJSON: {},
       checkedData: [],
       headerConfig: [],
+      listLimit: TableStorage.getLimit(),
     };
     return gvc.bindView(() => {
       const id = gvc.glitter.getUUID();
@@ -443,6 +446,14 @@ export class ReconciliationArea {
                                     vm.query || '',
                                     '搜尋訂單'
                                   ),
+                                  BgWidget.countingFilter({
+                                    gvc,
+                                    callback: value => {
+                                      vm.listLimit = value;
+                                      gvc.notifyDataChange(vm.id);
+                                    },
+                                    default: vm.listLimit,
+                                  }),
                                   BgWidget.funnelFilter({
                                     gvc,
                                     callback: () => {
@@ -471,10 +482,9 @@ export class ReconciliationArea {
                             defPage: ReconciliationArea.vm.page,
                             getData: vmi => {
                               ReconciliationArea.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 || 'cart_token',
                                 orderString: vm.orderString,
@@ -583,7 +593,7 @@ export class ReconciliationArea {
                                 }
 
                                 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/shopping-allowance-manager.js

@@ -3,6 +3,7 @@ import { ApiShop } from '../glitter-base/route/shopping.js';
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { FilterOptions } from './filter-options.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 export class ShoppingAllowanceManager {
     static main(gvc, query) {
@@ -20,6 +21,7 @@ export class ShoppingAllowanceManager {
             filter: {},
             filterId: glitter.getUUID(),
             filter_type: query.isPOS ? 'pos' : 'normal',
+            listLimit: TableStorage.getLimit(),
         };
         const ListComp = new BgListComponent(gvc, vm, FilterOptions.invoiceFilterFrame);
         vm.filter = ListComp.getFilterObject();
@@ -236,6 +238,14 @@ export class ShoppingAllowanceManager {
                                             vm.query = `${e.value}`.trim();
                                             gvc.notifyDataChange(vm.id);
                                         }), vm.query || '', '搜尋折讓單'),
+                                        BgWidget.countingFilter({
+                                            gvc,
+                                            callback: value => {
+                                                vm.listLimit = value;
+                                                gvc.notifyDataChange(vm.id);
+                                            },
+                                            default: vm.listLimit,
+                                        }),
                                         BgWidget.funnelFilter({
                                             gvc,
                                             callback: () => {
@@ -260,10 +270,9 @@ export class ShoppingAllowanceManager {
                         BgWidget.tableV3({
                             gvc: gvc,
                             getData: vmi => {
-                                const limit = 20;
                                 ApiShop.getAllowance({
                                     page: vmi.page - 1,
-                                    limit: limit,
+                                    limit: vm.listLimit,
                                     search: (vm === null || vm === void 0 ? void 0 : vm.query) || '',
                                     searchType: (vm === null || vm === void 0 ? void 0 : vm.queryType) || 'order_id',
                                     orderString: vm.orderString,
@@ -319,7 +328,7 @@ export class ShoppingAllowanceManager {
                                     }
                                     console.log(data.response);
                                     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/shopping-allowance-manager.ts

@@ -4,6 +4,7 @@ import { ApiShop } from '../glitter-base/route/shopping.js';
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { FilterOptions } from './filter-options.js';
+import { TableStorage } from './module/table-storage.js';
 
 interface ViewModel {
   id: string;
@@ -16,6 +17,7 @@ interface ViewModel {
   orderString?: string;
   filter?: any;
   filter_type: 'normal' | 'block' | 'pos';
+  listLimit: number;
 }
 
 const html = String.raw;
@@ -43,6 +45,7 @@ export class ShoppingAllowanceManager {
       filter: {},
       filterId: glitter.getUUID(),
       filter_type: query.isPOS ? 'pos' : 'normal',
+      listLimit: TableStorage.getLimit(),
     };
     const ListComp = new BgListComponent(gvc, vm, FilterOptions.invoiceFilterFrame);
     vm.filter = ListComp.getFilterObject();
@@ -293,6 +296,14 @@ export class ShoppingAllowanceManager {
                           vm.query || '',
                           '搜尋折讓單'
                         ),
+                        BgWidget.countingFilter({
+                          gvc,
+                          callback: value => {
+                            vm.listLimit = value;
+                            gvc.notifyDataChange(vm.id);
+                          },
+                          default: vm.listLimit,
+                        }),
                         BgWidget.funnelFilter({
                           gvc,
                           callback: () => {
@@ -318,10 +329,9 @@ export class ShoppingAllowanceManager {
                 BgWidget.tableV3({
                   gvc: gvc,
                   getData: vmi => {
-                    const limit = 20;
                     ApiShop.getAllowance({
                       page: vmi.page - 1,
-                      limit: limit,
+                      limit: vm.listLimit,
                       search: vm?.query || '',
                       searchType: vm?.queryType || 'order_id',
                       orderString: vm.orderString,
@@ -376,7 +386,7 @@ export class ShoppingAllowanceManager {
 
                       console.log(data.response);
                       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/shopping-invoice-manager.js

@@ -7,6 +7,7 @@ import { ApiUser } from '../glitter-base/route/user.js';
 import { Tool } from '../modules/tool.js';
 import { ShoppingAllowanceManager } from './shopping-allowance-manager.js';
 import { IminModule } from './pos-pages/imin-module.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 export class ShoppingInvoiceManager {
     static supportShipmentMethod() {
@@ -66,6 +67,7 @@ export class ShoppingInvoiceManager {
             filter: {},
             filterId: glitter.getUUID(),
             filter_type: query.isPOS ? 'pos' : 'normal',
+            listLimit: TableStorage.getLimit(),
         };
         const ListComp = new BgListComponent(gvc, vm, FilterOptions.invoiceFilterFrame);
         vm.filter = ListComp.getFilterObject();
@@ -281,6 +283,14 @@ export class ShoppingInvoiceManager {
                                             vm.query = `${e.value}`.trim();
                                             gvc.notifyDataChange(vm.id);
                                         }), vm.query || '', '搜尋發票'),
+                                        BgWidget.countingFilter({
+                                            gvc,
+                                            callback: value => {
+                                                vm.listLimit = value;
+                                                gvc.notifyDataChange(vm.id);
+                                            },
+                                            default: vm.listLimit,
+                                        }),
                                         BgWidget.funnelFilter({
                                             gvc,
                                             callback: () => {
@@ -306,10 +316,9 @@ export class ShoppingInvoiceManager {
                             gvc: gvc,
                             getData: vmi => {
                                 var _a;
-                                const limit = 20;
                                 ApiShop.getInvoice({
                                     page: vmi.page - 1,
-                                    limit: limit,
+                                    limit: vm.listLimit,
                                     search: vm.query || '',
                                     searchType: (_a = vm.queryType) !== null && _a !== void 0 ? _a : 'order_number',
                                     orderString: vm.orderString,
@@ -390,7 +399,7 @@ export class ShoppingInvoiceManager {
                                         });
                                     }
                                     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/shopping-invoice-manager.ts

@@ -8,6 +8,7 @@ import { ApiUser } from '../glitter-base/route/user.js';
 import { Tool } from '../modules/tool.js';
 import { ShoppingAllowanceManager } from './shopping-allowance-manager.js';
 import { IminModule } from './pos-pages/imin-module.js';
+import { TableStorage } from './module/table-storage.js';
 
 interface ViewModel {
   id: string;
@@ -20,6 +21,7 @@ interface ViewModel {
   orderString?: string;
   filter?: any;
   filter_type: 'normal' | 'block' | 'pos';
+  listLimit: number;
 }
 
 const html = String.raw;
@@ -90,6 +92,7 @@ export class ShoppingInvoiceManager {
       filter: {},
       filterId: glitter.getUUID(),
       filter_type: query.isPOS ? 'pos' : 'normal',
+      listLimit: TableStorage.getLimit(),
     };
     const ListComp = new BgListComponent(gvc, vm, FilterOptions.invoiceFilterFrame);
     vm.filter = ListComp.getFilterObject();
@@ -339,6 +342,14 @@ export class ShoppingInvoiceManager {
                           vm.query || '',
                           '搜尋發票'
                         ),
+                        BgWidget.countingFilter({
+                          gvc,
+                          callback: value => {
+                            vm.listLimit = value;
+                            gvc.notifyDataChange(vm.id);
+                          },
+                          default: vm.listLimit,
+                        }),
                         BgWidget.funnelFilter({
                           gvc,
                           callback: () => {
@@ -364,11 +375,9 @@ export class ShoppingInvoiceManager {
                 BgWidget.tableV3({
                   gvc: gvc,
                   getData: vmi => {
-                    const limit = 20;
-
                     ApiShop.getInvoice({
                       page: vmi.page - 1,
-                      limit: limit,
+                      limit: vm.listLimit,
                       search: vm.query || '',
                       searchType: vm.queryType ?? 'order_number',
                       orderString: vm.orderString,
@@ -451,7 +460,7 @@ export class ShoppingInvoiceManager {
                       }
 
                       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/shopping-order-manager.js

@@ -33,6 +33,7 @@ import { FilterOptions } from './filter-options.js';
 import { ListHeaderOption } from './list-header-option.js';
 import { ShoppingInvoiceManager } from './shopping-invoice-manager.js';
 import { OrderModule } from './order/order-module.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 const css = String.raw;
 class OrderDetail {
@@ -91,6 +92,7 @@ export class ShoppingOrderManager {
             apiJSON: {},
             checkedData: [],
             headerConfig: [],
+            listLimit: TableStorage.getLimit(),
         };
         const ListComp = new BgListComponent(gvc, vm, FilterOptions.orderFilterFrame);
         vm.filter = ListComp.getFilterObject();
@@ -242,6 +244,14 @@ export class ShoppingOrderManager {
                             vm.query = `${e.value}`.trim();
                             gvc.notifyDataChange(vm.id);
                         }), vm.query || '', '搜尋訂單'),
+                        BgWidget.countingFilter({
+                            gvc,
+                            callback: value => {
+                                vm.listLimit = value;
+                                gvc.notifyDataChange(vm.id);
+                            },
+                            default: vm.listLimit,
+                        }),
                         BgWidget.funnelFilter({
                             gvc,
                             callback: () => {
@@ -297,10 +307,9 @@ export class ShoppingOrderManager {
                 defPage: ShoppingOrderManager.vm.page,
                 getData: vmi => {
                     ShoppingOrderManager.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 || 'cart_token',
                         orderString: vm.orderString,
@@ -456,7 +465,7 @@ export class ShoppingOrderManager {
                             });
                         }
                         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 = yield getDatalist();
                         vmi.loading = false;