ts-glitter 21.1.7 → 21.1.9

package/lowcode/backend-manager/bg-product.ts

@@ -16,6 +16,7 @@ export type OptionsItem = {
   note?: string;
   sub_title?: string;
   content?: any;
+  variant_index?: number;
 };
 
 type CollectionItem = {
@@ -77,6 +78,7 @@ export class BgProduct {
     filter_visible?: string;
     with_variants?: boolean;
     show_product_type?: boolean;
+    right_element_type?: 'price' | 'stock';
   }) {
     const glitter = (window.parent as any).glitter;
     return (window.parent as any).glitter.innerDialog((gvc: GVC) => {
@@ -225,13 +227,11 @@ export class BgProduct {
                                                 style="text-wrap: auto;"
                                                 onclick="${gvc.event(() => call())}"
                                               >
-                                                ${obj.show_product_type
-                                                  ? BgWidget.infoInsignia(ProductConfig.getName(opt.content))
-                                                  : ''}${opt.value}
+                                                ${opt.value}
                                               </div>
                                               ${opt.sub_title
                                                 ? html`
-                                                    <div class="fw-500" style="color:grey;font-size:13px;">
+                                                    <div class="fw-500" style="color: grey; font-size: 13px;">
                                                       ${opt.sub_title}
                                                     </div>
                                                   `
@@ -239,24 +239,59 @@ export class BgProduct {
                                             </div>
                                           </div>
                                           ${(() => {
+                                            const isVisibleProduct =
+                                              opt.content.visible === 'false' && !obj.show_product_type
+                                                ? BgWidget.warningInsignia('隱形商品', { size: 'sm' })
+                                                : '';
+
+                                            const productCategory = obj.show_product_type
+                                              ? BgWidget.infoInsignia(ProductConfig.getName(opt.content), {
+                                                  size: 'sm',
+                                                })
+                                              : '';
+
                                             const collections = opt.content?.collection
                                               ?.filter(Boolean)
                                               .map((col: string) => BgWidget.normalInsignia(col, { size: 'sm' }))
                                               .join('');
-                                            return collections
-                                              ? html`<div class="d-flex flex-wrap gap-1 mt-2">${collections}</div>`
+
+                                            const renderString = `${isVisibleProduct}${productCategory}${collections}`;
+
+                                            return renderString
+                                              ? html`<div class="d-flex flex-wrap gap-1 mt-2">${renderString}</div>`
                                               : '';
                                           })()}
                                         </div>
                                         <div class="text-end">
                                           <div class="tx_normal_14">
-                                            $${parseInt(
-                                              `${
-                                                opt.content[vm.orderString || 'min_price'] ??
-                                                opt.content.variants[0].sale_price
-                                              }`,
-                                              10
-                                            ).toLocaleString()}
+                                            ${(() => {
+                                              const contentMap: Record<string, () => string> = {
+                                                price: () => {
+                                                  return html`$${parseInt(
+                                                    `${
+                                                      opt.content[vm.orderString || 'min_price'] ??
+                                                      opt.content.variants[opt.variant_index ?? 0].sale_price
+                                                    }`,
+                                                    10
+                                                  ).toLocaleString()}`;
+                                                },
+                                                stock: () => {
+                                                  const variant = opt.content.variants[opt.variant_index ?? 0];
+                                                  if (variant.show_understocking === 'false') {
+                                                    return '不追蹤庫存';
+                                                  }
+
+                                                  const n = Number(opt.content.variants[opt.variant_index ?? 0].stock);
+                                                  return html`庫存 ${(isNaN(n) ? 0 : n).toLocaleString()} 個`;
+                                                },
+                                              };
+
+                                              return (
+                                                obj.right_element_type
+                                                  ? contentMap[obj.right_element_type]
+                                                  : contentMap.price
+                                              )();
+                                            })()}
                                           </div>
                                           ${opt.note ? html` <div class="tx_gray_12">${opt.note}</div> ` : ''}
                                         </div>
@@ -264,7 +299,7 @@ export class BgProduct {
                                   },
                                   divCreate: {
                                     class: 'd-flex align-items-center',
-                                    style: 'gap: 24px',
+                                    style: `gap: ${document.body.clientWidth > 800 ? 24 : 12}px`,
                                   },
                                 };
                               }) + BgWidget.horizontalLine({ margin: 0.15 })
@@ -332,19 +367,15 @@ export class BgProduct {
                     content: { id: number; title: string; preview_image: string[]; variants: any; visible: string };
                   }) => {
                     const image = product.content.preview_image[0] ?? BgWidget.noImageURL;
-                    const value = [
-                      product.content.visible === 'false' ? BgWidget.warningInsignia('隱形商品') : '',
-                      product.content.title,
-                    ]
-                      .filter(Boolean)
-                      .join('');
+                    const title = product.content.title;
 
                     if (obj.with_variants) {
-                      product.content.variants.map((variant: any) => {
+                      product.content.variants.map((variant: any, index: number) => {
                         vm.options.push({
                           key: `${product.content.id}-${variant.spec.join('-')}`,
                           sub_title: variant.spec.join('-') ? `規格:${variant.spec.join('-')}` : '',
-                          value: value,
+                          variant_index: index,
+                          value: title,
                           content: product.content,
                           image: image,
                         });
@@ -352,7 +383,7 @@ export class BgProduct {
                     } else {
                       vm.options.push({
                         key: product.content.id,
-                        value: value,
+                        value: title,
                         content: product.content,
                         image: image,
                       });

package/lowcode/backend-manager/bg-recommend.js

@@ -18,6 +18,7 @@ import { Tool } from '../modules/tool.js';
 import { BgProduct } from './bg-product.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { ShoppingOrderManager } from '../cms-plugin/shopping-order-manager.js';
+import { TableStorage } from '../cms-plugin/module/table-storage.js';
 export class BgRecommend {
     static linkList(gvc, widget) {
         const html = String.raw;
@@ -284,6 +285,7 @@ export class BgRecommend {
             group: { type: 'level', title: '', tag: '' },
             filter: {},
             orderString: 'default',
+            listLimit: TableStorage.getLimit(),
         };
         const ListComp = new BgListComponent(gvc, vm, FilterOptions.recommendUserFilterFrame);
         vm.filter = ListComp.getFilterObject();
@@ -343,23 +345,28 @@ export class BgRecommend {
                                                 gvc,
                                                 callback: (value) => {
                                                     vm.queryType = value;
-                                                    gvc.notifyDataChange(vm.tableId);
-                                                    gvc.notifyDataChange(fvm.id);
+                                                    gvc.notifyDataChange([vm.tableId, fvm.id]);
                                                 },
                                                 default: vm.queryType || 'name',
                                                 options: FilterOptions.recommendUserSelect,
                                             }),
                                             BgWidget.searchFilter(gvc.event(e => {
                                                 vm.query = `${e.value}`.trim();
-                                                gvc.notifyDataChange(vm.tableId);
-                                                gvc.notifyDataChange(fvm.id);
+                                                gvc.notifyDataChange([vm.tableId, fvm.id]);
                                             }), vm.query || '', '搜尋推薦人'),
+                                            BgWidget.countingFilter({
+                                                gvc,
+                                                callback: value => {
+                                                    vm.listLimit = value;
+                                                    gvc.notifyDataChange([vm.tableId, fvm.id]);
+                                                },
+                                                default: vm.listLimit,
+                                            }),
                                             BgWidget.updownFilter({
                                                 gvc,
                                                 callback: (value) => {
                                                     vm.orderString = value;
-                                                    gvc.notifyDataChange(vm.tableId);
-                                                    gvc.notifyDataChange(fvm.id);
+                                                    gvc.notifyDataChange([vm.tableId, fvm.id]);
                                                 },
                                                 default: vm.orderString || 'default',
                                                 options: FilterOptions.recommendUserOrderBy,
@@ -387,10 +394,9 @@ export class BgRecommend {
                                         gvc: gvc,
                                         getData: (vd) => __awaiter(this, void 0, void 0, function* () {
                                             vmi = vd;
-                                            const limit = 15;
                                             ApiRecommend.getUsers({
                                                 data: {},
-                                                limit: limit,
+                                                limit: vm.listLimit,
                                                 page: vmi.page - 1,
                                                 token: window.parent.config.token,
                                                 search: vm.query,
@@ -398,7 +404,7 @@ export class BgRecommend {
                                                 orderBy: vm.orderString,
                                             }).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/backend-manager/bg-recommend.ts

@@ -10,6 +10,7 @@ import { Tool } from '../modules/tool.js';
 import { BgProduct } from './bg-product.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { ShoppingOrderManager } from '../cms-plugin/shopping-order-manager.js';
+import { TableStorage } from '../cms-plugin/module/table-storage.js';
 
 export type OptionsItem = {
   key: number | string;
@@ -354,6 +355,7 @@ export class BgRecommend {
       group: { type: string; title: string; tag: string };
       filter: any;
       orderString: string;
+      listLimit: number;
     } = {
       id: glitter.getUUID(),
       tableId: glitter.getUUID(),
@@ -366,6 +368,7 @@ export class BgRecommend {
       group: { type: 'level', title: '', tag: '' },
       filter: {},
       orderString: 'default',
+      listLimit: TableStorage.getLimit(),
     };
 
     const ListComp = new BgListComponent(gvc, vm, FilterOptions.recommendUserFilterFrame);
@@ -433,8 +436,7 @@ export class BgRecommend {
                               gvc,
                               callback: (value: any) => {
                                 vm.queryType = value;
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(fvm.id);
+                                gvc.notifyDataChange([vm.tableId, fvm.id]);
                               },
                               default: vm.queryType || 'name',
                               options: FilterOptions.recommendUserSelect,
@@ -442,18 +444,24 @@ export class BgRecommend {
                             BgWidget.searchFilter(
                               gvc.event(e => {
                                 vm.query = `${e.value}`.trim();
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(fvm.id);
+                                gvc.notifyDataChange([vm.tableId, fvm.id]);
                               }),
                               vm.query || '',
                               '搜尋推薦人'
                             ),
+                            BgWidget.countingFilter({
+                              gvc,
+                              callback: value => {
+                                vm.listLimit = value;
+                                gvc.notifyDataChange([vm.tableId, fvm.id]);
+                              },
+                              default: vm.listLimit,
+                            }),
                             BgWidget.updownFilter({
                               gvc,
                               callback: (value: any) => {
                                 vm.orderString = value;
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(fvm.id);
+                                gvc.notifyDataChange([vm.tableId, fvm.id]);
                               },
                               default: vm.orderString || 'default',
                               options: FilterOptions.recommendUserOrderBy,
@@ -482,10 +490,9 @@ export class BgRecommend {
                           gvc: gvc,
                           getData: async vd => {
                             vmi = vd;
-                            const limit = 15;
                             ApiRecommend.getUsers({
                               data: {},
-                              limit: limit,
+                              limit: vm.listLimit,
                               page: vmi.page - 1,
                               token: (window.parent as any).config.token,
                               search: vm.query,
@@ -493,7 +500,7 @@ export class BgRecommend {
                               orderBy: vm.orderString,
                             }).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/backend-manager/bg-sns.js

@@ -21,6 +21,7 @@ import { BgListComponent } from './bg-list-component.js';
 import { Tool } from '../modules/tool.js';
 import { ApiWallet } from '../glitter-base/route/wallet.js';
 import { ApiSns } from '../glitter-base/route/sms.js';
+import { TableStorage } from '../cms-plugin/module/table-storage.js';
 const html = String.raw;
 const inputStyle = 'font-size: 16px; height:40px; width:300px;';
 export class BgSNS {
@@ -265,6 +266,7 @@ export class BgSNS {
             query: '',
             queryType: 'email',
             filter: {},
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView(() => {
             const ListComp = new BgListComponent(gvc, vm, FilterOptions.emailFilterFrame);
@@ -290,17 +292,23 @@ export class BgSNS {
                                                 gvc,
                                                 callback: (value) => {
                                                     vm.queryType = value;
-                                                    gvc.notifyDataChange(vm.tableId);
-                                                    gvc.notifyDataChange(id);
+                                                    gvc.notifyDataChange([vm.tableId, id]);
                                                 },
                                                 default: vm.queryType || 'email',
                                                 options: FilterOptions.snsSelect,
                                             }),
                                             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: () => {
@@ -320,10 +328,9 @@ export class BgSNS {
                                         gvc: gvc,
                                         getData: vmi => {
                                             var _a, _b;
-                                            const limit = 20;
                                             ApiSns.history({
                                                 page: vmi.page - 1,
-                                                limit: limit,
+                                                limit: vm.listLimit,
                                                 search: (_a = vm.query) !== null && _a !== void 0 ? _a : '',
                                                 searchType: (_b = vm.queryType) !== null && _b !== void 0 ? _b : 'email',
                                                 sendTime: undefined,
@@ -409,7 +416,7 @@ export class BgSNS {
                                                         });
                                                     }
                                                     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;
@@ -843,7 +850,7 @@ export class BgSNS {
                         ApiUser.getUserList({
                             page: 0,
                             limit: 99999,
-                            only_id: true
+                            only_id: true,
                         }).then(dd => {
                             dd.response.data.map((user) => {
                                 if (user.userData.email && user.userData.email.length > 0 && user.userData.phone) {
@@ -1195,7 +1202,7 @@ export class BgSNS {
                                                 ApiUser.getUserList({
                                                     page: 0,
                                                     limit: 99999,
-                                                    only_id: true
+                                                    only_id: true,
                                                 }).then(dd => {
                                                     if (dd.response.data) {
                                                         const ids = [];

package/lowcode/backend-manager/bg-sns.ts

@@ -9,11 +9,11 @@ import { FormWidget } from '../official_view_component/official/form.js';
 import { Chat } from '../glitter-base/route/chat.js';
 import { FilterOptions } from '../cms-plugin/filter-options.js';
 import { ShoppingDiscountSetting } from '../cms-plugin/shopping-discount-setting.js';
-import { ApiSmtp } from '../glitter-base/route/smtp.js';
 import { BgListComponent } from './bg-list-component.js';
 import { Tool } from '../modules/tool.js';
 import { ApiWallet } from '../glitter-base/route/wallet.js';
 import { ApiSns } from '../glitter-base/route/sms.js';
+import { TableStorage } from '../cms-plugin/module/table-storage.js';
 
 const html = String.raw;
 
@@ -320,6 +320,7 @@ export class BgSNS {
       query?: string;
       queryType?: string;
       filter?: any;
+      listLimit: number;
     } = {
       id: glitter.getUUID(),
       tableId: glitter.getUUID(),
@@ -329,6 +330,7 @@ export class BgSNS {
       query: '',
       queryType: 'email',
       filter: {},
+      listLimit: TableStorage.getLimit(),
     };
     return gvc.bindView(() => {
       const ListComp = new BgListComponent(gvc, vm, FilterOptions.emailFilterFrame);
@@ -356,8 +358,7 @@ export class BgSNS {
                               gvc,
                               callback: (value: any) => {
                                 vm.queryType = value;
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(id);
+                                gvc.notifyDataChange([vm.tableId, id]);
                               },
                               default: vm.queryType || 'email',
                               options: FilterOptions.snsSelect,
@@ -365,12 +366,19 @@ export class BgSNS {
                             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: () => {
@@ -390,10 +398,9 @@ export class BgSNS {
                         return BgWidget.tableV3({
                           gvc: gvc,
                           getData: vmi => {
-                            const limit = 20;
                             ApiSns.history({
                               page: vmi.page - 1,
-                              limit: limit,
+                              limit: vm.listLimit,
                               search: vm.query ?? '',
                               searchType: vm.queryType ?? 'email',
                               sendTime: undefined,
@@ -483,7 +490,7 @@ export class BgSNS {
                                 }
 
                                 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;
@@ -946,7 +953,7 @@ export class BgSNS {
             ApiUser.getUserList({
               page: 0,
               limit: 99999,
-              only_id:true
+              only_id: true,
             }).then(dd => {
               dd.response.data.map((user: any) => {
                 if (user.userData.email && user.userData.email.length > 0 && user.userData.phone) {
@@ -1321,7 +1328,7 @@ export class BgSNS {
                                   ApiUser.getUserList({
                                     page: 0,
                                     limit: 99999,
-                                    only_id:true
+                                    only_id: true,
                                   }).then(dd => {
                                     if (dd.response.data) {
                                       const ids: number[] = [];
@@ -1387,7 +1394,7 @@ export class BgSNS {
                                           ApiUser.getUserList({
                                             page: 0,
                                             limit: 99999,
-                                            only_id:true,
+                                            only_id: true,
                                             search: data.query,
                                           }).then(dd => {
                                             if (dd.response.data) {