ts-glitter 21.1.7 → 21.1.9

package/lowcode/cms-plugin/shopping-setting-basic.ts

@@ -2510,20 +2510,38 @@ export class ShoppingSettingBasic {
                                               gvc.notifyDataChange([variantsViewID]);
                                             })}"
                                           ></i>
-                                          <div style="width:40%;font-size: 16px;font-weight: 400;">規格</div>
+                                          <div
+                                            style="width:calc(35% - ${document.body.clientWidth > 800
+                                              ? 46
+                                              : 0}px);font-size: 16px;font-weight: 400;"
+                                          >
+                                            規格
+                                          </div>
                                           ${document.body.clientWidth < 768
                                             ? html` <div
-                                                style="color:#393939;font-size: 16px;font-weight: 400;"
-                                                class="me-3"
-                                              >
-                                                售價*
-                                              </div>`
-                                            : `${['售價*', '庫存數量*', '運費計算方式']
+                                                  class="text-center"
+                                                  style="width: 20%;color:#393939;font-size: 16px;font-weight: 400;"
+                                                >
+                                                  顯示
+                                                </div>
+                                                <div
+                                                  class="text-center"
+                                                  style="width: 35%;color:#393939;font-size: 16px;font-weight: 400;"
+                                                >
+                                                  售價
+                                                </div>`
+                                            : `${[
+                                                { title: '顯示', width: 10 },
+                                                { title: '售價', width: 15 },
+                                                { title: '庫存數量', width: 15 },
+                                                { title: '運費計算方式', width: 20 },
+                                              ]
                                                 .map(dd => {
                                                   return html` <div
-                                                    style="color:#393939;font-size: 16px;font-weight: 400;width: 20%;"
+                                                    class="text-center"
+                                                    style="color:#393939;font-size: 16px;font-weight: 400;width: ${dd.width}%;"
                                                   >
-                                                    ${dd}
+                                                    ${dd.title}
                                                   </div>`;
                                                 })
                                                 .join('')}`}
@@ -2608,7 +2626,9 @@ export class ShoppingSettingBasic {
                                                     })}"
                                                   ></i>
                                                   <div
-                                                    style="flex:1 0 0;font-size: 16px;font-weight: 400;display: flex;align-items: center; gap:${document
+                                                    style="width: calc(35% - ${document.body.clientWidth > 800
+                                                      ? 52
+                                                      : -10}px);font-size: 16px;font-weight: 400;display: flex;align-items: center; gap:${document
                                                       .body.clientWidth < 800
                                                       ? 10
                                                       : 24}px;"
@@ -2667,6 +2687,47 @@ export class ShoppingSettingBasic {
                                                         : html` <i class="fa-regular fa-chevron-down"></i>`}
                                                     </div>
                                                   </div>
+                                                  ${gvc.bindView(
+                                                    (() => {
+                                                      const id = gvc.glitter.getUUID();
+                                                      return {
+                                                        bind: id,
+                                                        view: () => {
+                                                          return postMD.variants
+                                                            .filter(v => v.spec.includes(spec.title))
+                                                            .every(v => v.invisible)
+                                                            ? html`<i
+                                                                class="fa-solid fa-eye-slash cursor_pointer"
+                                                                onclick="${obj.gvc.event(() => {
+                                                                  postMD.variants.map(data => {
+                                                                    if (data.spec.includes(spec.title)) {
+                                                                      data.invisible = false;
+                                                                    }
+                                                                    return data;
+                                                                  });
+                                                                  gvc.notifyDataChange(vm.id);
+                                                                })}"
+                                                              ></i>`
+                                                            : html`<i
+                                                                class="fa-regular fa-eye cursor_pointer"
+                                                                onclick="${obj.gvc.event(() => {
+                                                                  postMD.variants.map(data => {
+                                                                    if (data.spec.includes(spec.title)) {
+                                                                      data.invisible = true;
+                                                                    }
+                                                                    return data;
+                                                                  });
+                                                                  gvc.notifyDataChange(vm.id);
+                                                                })}"
+                                                              ></i>`;
+                                                        },
+                                                        divCreate: {
+                                                          class: 'text-center',
+                                                          style: 'width: 10%;',
+                                                        },
+                                                      };
+                                                    })()
+                                                  )}
                                                   ${[
                                                     {
                                                       title: '統一設定價格',
@@ -2699,20 +2760,13 @@ export class ShoppingSettingBasic {
                                                         dd.title = `${stock}`;
                                                       }
                                                       return html` <div
+                                                        class="px-1"
                                                         style="color:#393939;font-size: 16px;font-weight: 400;width:  ${document
                                                           .body.clientWidth > 800
-                                                          ? `20%;`
-                                                          : 'auto;max-width:140px;'}padding-right: ${document.body
-                                                          .clientWidth > 768
-                                                          ? `10px`
-                                                          : '0px'};"
+                                                          ? `17.5%;`
+                                                          : 'auto;max-width:140px;'}"
                                                       >
-                                                        <input
-                                                          style="height: 40px;width:100%;padding: 0px 18px;border-radius: 10px;border: 1px solid #DDD;background: #FFF;font-size: 13px;"
-                                                          placeholder="${dd.title}"
-                                                          type="number"
-                                                          ${dd.key == 'stock' ? `readonly` : ``}
-                                                          min="0"
+                                                        <div
                                                           onclick="${gvc.event(() => {
                                                             if (index === 1) {
                                                               ProductSetting.showBatchEditDialog({
@@ -2725,17 +2779,31 @@ export class ShoppingSettingBasic {
                                                               });
                                                             }
                                                           })}"
-                                                          onchange="${gvc.event(e => {
-                                                            postMD.variants
-                                                              .filter(dd => {
-                                                                return dd.spec[0] === spec.title;
-                                                              })
-                                                              .map(d1 => {
-                                                                (d1 as any)[dd.key] = e.value;
-                                                              });
-                                                            gvc.notifyDataChange(vm.id);
-                                                          })}"
-                                                        />
+                                                        >
+                                                          ${BgWidget.editeInput({
+                                                            gvc,
+                                                            title: '',
+                                                            default: '',
+                                                            placeHolder: dd.title,
+                                                            callback: value => {
+                                                              const n = parseInt(`${value}`, 10);
+                                                              postMD.variants
+                                                                .filter(dd => {
+                                                                  return dd.spec[0] === spec.title;
+                                                                })
+                                                                .map(d1 => {
+                                                                  (d1 as any)[dd.key] = isNaN(n) ? 0 : n;
+                                                                });
+                                                              gvc.notifyDataChange(vm.id);
+                                                            },
+                                                            type: 'number',
+                                                            readonly: dd.key == 'stock',
+                                                            divStyle:
+                                                              document.body.clientWidth > 800
+                                                                ? ''
+                                                                : 'max-width: 130px;',
+                                                          })}
+                                                        </div>
                                                       </div>`;
                                                     })
                                                     .join('')}
@@ -2842,10 +2910,11 @@ export class ShoppingSettingBasic {
                                                         }
                                                         return html`
                                                           <div
+                                                            class="w-100"
                                                             style="background-color: white;position:relative;display: flex;padding: 8px 0px;align-items: center;border-radius: 10px;width:100%;"
                                                           >
                                                             <div
-                                                              style="flex:1 0 0;font-size: 16px;font-weight: 400;gap:14px;display: flex;align-items: center;padding-left: ${postMD
+                                                              style="width: 40%;flex:1 0 0;font-size: 16px;font-weight: 400;gap:14px;display: flex;align-items: center;padding-left: ${postMD
                                                                 .specs.length > 1 && document.body.clientWidth > 768
                                                                 ? `32px`
                                                                 : `12px`};"
@@ -2894,6 +2963,35 @@ export class ShoppingSettingBasic {
                                                                 >
                                                               </div>
                                                             </div>
+                                                            ${gvc.bindView(
+                                                              (() => {
+                                                                const id = gvc.glitter.getUUID();
+                                                                return {
+                                                                  bind: id,
+                                                                  view: () => {
+                                                                    return Boolean(data.invisible)
+                                                                      ? html`<i
+                                                                          class="fa-solid fa-eye-slash cursor_pointer"
+                                                                          onclick="${obj.gvc.event(() => {
+                                                                            data.invisible = false;
+                                                                            gvc.notifyDataChange(vm.id);
+                                                                          })}"
+                                                                        ></i>`
+                                                                      : html`<i
+                                                                          class="fa-regular fa-eye cursor_pointer"
+                                                                          onclick="${obj.gvc.event(() => {
+                                                                            data.invisible = true;
+                                                                            gvc.notifyDataChange(vm.id);
+                                                                          })}"
+                                                                        ></i>`;
+                                                                  },
+                                                                  divCreate: {
+                                                                    class: 'text-center',
+                                                                    style: 'width: 10%;',
+                                                                  },
+                                                                };
+                                                              })()
+                                                            )}
                                                             ${['sale_price', 'stock']
                                                               .filter(dd => {
                                                                 return (
@@ -2902,13 +3000,11 @@ export class ShoppingSettingBasic {
                                                               })
                                                               .map((dd, index) => {
                                                                 return html` <div
+                                                                  class="text-center px-1"
                                                                   style="color:#393939;font-size: 16px;font-weight: 400;width:   ${document
                                                                     .body.clientWidth > 800
-                                                                    ? `20%;`
-                                                                    : 'auto;max-width:140px;'}padding-right: ${document
-                                                                    .body.clientWidth > 800
-                                                                    ? `12px`
-                                                                    : '0px'};"
+                                                                    ? `17.5%;`
+                                                                    : 'auto;max-width:140px;'}"
                                                                 >
                                                                   <input
                                                                     style="width: 100%;height: 40px;padding: 0px 18px;border-radius: 10px;border: 1px solid #DDD;background: #FFF;"

package/lowcode/cms-plugin/stock-history.js

@@ -20,6 +20,7 @@ import { StockVendors } from './stock-vendors.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
 import { BgProduct } from '../backend-manager/bg-product.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 const typeConfig = {
     restocking: {
@@ -163,6 +164,7 @@ export class StockHistory {
             filter: {},
             orderString: '',
             tabKey: 'all',
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView({
             bind: vm.id,
@@ -402,11 +404,10 @@ export class StockHistory {
                         gvc: gvc,
                         getData: vd => {
                             vmi = vd;
-                            const limit = 100;
                             Promise.all([
                                 ApiStock.getStockHistory({
                                     page: vmi.page - 1,
-                                    limit: limit,
+                                    limit: vm.listLimit,
                                     search: vm.query,
                                     type: vm.type,
                                     queryType: vm.queryType,
@@ -423,7 +424,7 @@ export class StockHistory {
                                 const r = dataArray[0];
                                 if (r.result && r.response) {
                                     vm.dataList = r.response.data;
-                                    vmi.pageSize = Math.ceil(r.response.total / limit);
+                                    vmi.pageSize = Math.ceil(r.response.total / vm.listLimit);
                                     vmi.originalData = vm.dataList;
                                     vmi.tableData = getDatalist();
                                 }
@@ -683,17 +684,23 @@ export class StockHistory {
                         gvc,
                         callback: (value) => {
                             vm.queryType = value;
-                            gvc.notifyDataChange(vm.tableId);
-                            gvc.notifyDataChange(id);
+                            gvc.notifyDataChange([vm.tableId, id]);
                         },
                         default: vm.queryType || 'title',
                         options: FilterOptions.stockHistoryCheckSelect,
                     }),
                     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.stockHistoryCheckFunnel);
                 return BgListComponent.listBarRWD(filterList, filterTags);
@@ -1052,6 +1059,7 @@ export class StockHistory {
                                                             gvc: gvc,
                                                             default: dvm.variantIds,
                                                             with_variants: true,
+                                                            right_element_type: 'stock',
                                                             callback: (value) => __awaiter(this, void 0, void 0, function* () {
                                                                 dvm.variantIds = value;
                                                                 gvc.notifyDataChange(dvm.tableId);

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

@@ -12,6 +12,7 @@ import { StockVendors, VendorData } from './stock-vendors.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
 import { BgProduct, OptionsItem } from '../backend-manager/bg-product.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -29,6 +30,7 @@ type VM = {
   queryType: string;
   orderString: string;
   tabKey: string;
+  listLimit: number;
 };
 
 const typeConfig: {
@@ -187,6 +189,7 @@ export class StockHistory {
       filter: {},
       orderString: '',
       tabKey: 'all',
+      listLimit: TableStorage.getLimit(),
     };
 
     return gvc.bindView({
@@ -443,11 +446,10 @@ export class StockHistory {
                     gvc: gvc,
                     getData: vd => {
                       vmi = vd;
-                      const limit = 100;
                       Promise.all([
                         ApiStock.getStockHistory({
                           page: vmi.page - 1,
-                          limit: limit,
+                          limit: vm.listLimit,
                           search: vm.query,
                           type: vm.type,
                           queryType: vm.queryType,
@@ -466,7 +468,7 @@ export class StockHistory {
                         const r = dataArray[0];
                         if (r.result && r.response) {
                           vm.dataList = r.response.data;
-                          vmi.pageSize = Math.ceil(r.response.total / limit);
+                          vmi.pageSize = Math.ceil(r.response.total / vm.listLimit);
                           vmi.originalData = vm.dataList;
                           vmi.tableData = getDatalist();
                         }
@@ -745,8 +747,7 @@ export class StockHistory {
                   gvc,
                   callback: (value: any) => {
                     vm.queryType = value;
-                    gvc.notifyDataChange(vm.tableId);
-                    gvc.notifyDataChange(id);
+                    gvc.notifyDataChange([vm.tableId, id]);
                   },
                   default: vm.queryType || 'title',
                   options: FilterOptions.stockHistoryCheckSelect,
@@ -754,12 +755,19 @@ export class StockHistory {
                 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.stockHistoryCheckFunnel);
@@ -1138,21 +1146,12 @@ export class StockHistory {
                                           gvc: gvc,
                                           default: dvm.variantIds,
                                           with_variants: true,
+                                          right_element_type: 'stock',
                                           callback: async value => {
                                             dvm.variantIds = value;
                                             gvc.notifyDataChange(dvm.tableId);
-                                            // alert(JSON.stringify(value))
                                           },
                                         });
-                                        // BgWidget.variantDialog({
-                                        //   gvc,
-                                        //   title: '搜尋商品',
-                                        //   default: dvm.variantIds,
-                                        //   callback: resultData => {
-                                        //     dvm.variantIds = resultData;
-                                        //     gvc.notifyDataChange(dvm.tableId);
-                                        //   },
-                                        // });
                                       })}"
                                     >
                                       <div>新增${typeData.name}商品</div>

package/lowcode/cms-plugin/stock-stores.js

@@ -7,6 +7,7 @@ import { ApiUser } from '../glitter-base/route/user.js';
 import { ApiStock } from '../glitter-base/route/stock.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 export class StockStores {
     static main(gvc, isShop) {
@@ -22,6 +23,7 @@ export class StockStores {
             filter: {},
             orderString: '',
             isShop: isShop,
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView({
             bind: vm.id,
@@ -96,8 +98,7 @@ export class StockStores {
                                 gvc,
                                 callback: (value) => {
                                     vm.queryType = value;
-                                    gvc.notifyDataChange(vm.tableId);
-                                    gvc.notifyDataChange(id);
+                                    gvc.notifyDataChange([vm.tableId, id]);
                                 },
                                 default: vm.queryType || 'name',
                                 options: isShop
@@ -111,9 +112,16 @@ export class StockStores {
                             }),
                             BgWidget.searchFilter(gvc.event(e => {
                                 vm.query = `${e.value}`.trim();
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(id);
+                                gvc.notifyDataChange([vm.tableId, id]);
                             }), vm.query || '', isShop ? '搜尋門市名稱' : '搜尋庫存點名稱'),
+                            BgWidget.countingFilter({
+                                gvc,
+                                callback: value => {
+                                    vm.listLimit = value;
+                                    gvc.notifyDataChange([vm.tableId, id]);
+                                },
+                                default: vm.listLimit,
+                            }),
                         ];
                         const filterTags = ListComp.getFilterTags(FilterOptions.storesFunnel);
                         return BgListComponent.listBarRWD(filterList, filterTags);
@@ -127,10 +135,9 @@ export class StockStores {
                         gvc: gvc,
                         getData: vd => {
                             vmi = vd;
-                            const limit = 100;
                             function callback(list) {
                                 vm.dataList = list;
-                                vmi.pageSize = Math.ceil(list.length / limit);
+                                vmi.pageSize = Math.ceil(list.length / vm.listLimit);
                                 vmi.originalData = vm.dataList;
                                 vmi.tableData = getDatalist();
                                 vmi.loading = false;

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

@@ -8,6 +8,7 @@ import { ApiUser } from '../glitter-base/route/user.js';
 import { ApiStock } from '../glitter-base/route/stock.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -32,6 +33,7 @@ type VM = {
   queryType: string;
   orderString: string;
   isShop: boolean;
+  listLimit: number;
 };
 
 export class StockStores {
@@ -48,6 +50,7 @@ export class StockStores {
       filter: {},
       orderString: '',
       isShop: isShop,
+      listLimit: TableStorage.getLimit(),
     };
 
     return gvc.bindView({
@@ -134,8 +137,7 @@ export class StockStores {
                         gvc,
                         callback: (value: any) => {
                           vm.queryType = value;
-                          gvc.notifyDataChange(vm.tableId);
-                          gvc.notifyDataChange(id);
+                          gvc.notifyDataChange([vm.tableId, id]);
                         },
                         default: vm.queryType || 'name',
                         options: isShop
@@ -150,12 +152,19 @@ export class StockStores {
                       BgWidget.searchFilter(
                         gvc.event(e => {
                           vm.query = `${e.value}`.trim();
-                          gvc.notifyDataChange(vm.tableId);
-                          gvc.notifyDataChange(id);
+                          gvc.notifyDataChange([vm.tableId, id]);
                         }),
                         vm.query || '',
                         isShop ? '搜尋門市名稱' : '搜尋庫存點名稱'
                       ),
+                      BgWidget.countingFilter({
+                        gvc,
+                        callback: value => {
+                          vm.listLimit = value;
+                          gvc.notifyDataChange([vm.tableId, id]);
+                        },
+                        default: vm.listLimit,
+                      }),
                     ];
 
                     const filterTags = ListComp.getFilterTags(FilterOptions.storesFunnel);
@@ -170,11 +179,10 @@ export class StockStores {
                     gvc: gvc,
                     getData: vd => {
                       vmi = vd;
-                      const limit = 100;
 
                       function callback(list: StoreData[]) {
                         vm.dataList = list;
-                        vmi.pageSize = Math.ceil(list.length / limit);
+                        vmi.pageSize = Math.ceil(list.length / vm.listLimit);
                         vmi.originalData = vm.dataList;
                         vmi.tableData = getDatalist();
                         vmi.loading = false;

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

@@ -6,6 +6,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;
 export class StockVendors {
     static main(gvc) {
@@ -20,6 +21,7 @@ export class StockVendors {
             queryType: '',
             filter: {},
             orderString: '',
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView({
             bind: vm.id,
@@ -83,17 +85,23 @@ export class StockVendors {
                                 gvc,
                                 callback: (value) => {
                                     vm.queryType = value;
-                                    gvc.notifyDataChange(vm.tableId);
-                                    gvc.notifyDataChange(id);
+                                    gvc.notifyDataChange([vm.tableId, id]);
                                 },
                                 default: vm.queryType || 'name',
                                 options: FilterOptions.vendorsSelect,
                             }),
                             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);
                         return BgListComponent.listBarRWD(filterList, filterTags);
@@ -107,14 +115,13 @@ export class StockVendors {
                         gvc: gvc,
                         getData: vd => {
                             vmi = vd;
-                            const limit = 100;
                             this.getPublicData().then((data) => {
                                 if (data.list) {
                                     data.list = data.list.filter((item) => {
                                         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();
                                 }