ts-glitter 21.1.8 → 21.2.0

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

@@ -6,10 +6,11 @@ import { ApiShop } from '../glitter-base/route/shopping.js';
 import { Article } from '../glitter-base/route/article.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { ApiStock } from '../glitter-base/route/stock.js';
-import { FormModule } from '../cms-plugin/module/form-module.js';
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
-import { FormCheck } from '../cms-plugin/module/form-check.js';
 import { Language, LanguageLocation } from '../glitter-base/global/language.js';
+import { FormModule } from '../cms-plugin/module/form-module.js';
+import { FormCheck } from '../cms-plugin/module/form-check.js';
+import { TableStorage } from '../cms-plugin/module/table-storage.js';
 import { ProductAi } from '../cms-plugin/ai-generator/product-ai.js';
 import { imageLibrary } from '../modules/image-library.js';
 import { Animation } from '../glitterBundle/module/Animation.js';
@@ -56,6 +57,8 @@ type TableV3Filter = {
   event: (data: any) => void;
 };
 
+type ActiveFilterKeys = '' | 'updownFilter' | 'funnelFilter' | 'countingFilter' | 'columnFilter';
+
 interface StockOptionsItem extends OptionsItem {
   stock: number;
 }
@@ -3522,77 +3525,146 @@ ${obj.default ?? ''}</textarea
     </div>`;
   }
 
-  static columnFilter(obj: { gvc: GVC; callback: (value: any) => void }) {
+  static activeFilter = '';
+
+  static setActiveFilter = (gvc: GVC, key: ActiveFilterKeys) => {
+    const keyList: ActiveFilterKeys[] = ['updownFilter', 'funnelFilter', 'countingFilter'];
+    this.activeFilter = key;
+    gvc.notifyDataChange(keyList);
+  };
+
+  static columnFilter(obj: { gvc: GVC; callback: () => void }) {
+    const id = 'columnFilter';
     return html` <div
-      class="c_funnel"
+      class="c_filter_view"
       onclick="${obj.gvc.event(() => {
-        obj.callback('c_funnel');
+        obj.callback();
+        this.setActiveFilter(obj.gvc, this.activeFilter === id ? '' : id);
       })}"
     >
       <i class="fa-regular fa-columns-3"></i>
     </div>`;
   }
 
-  static funnelFilter(obj: { gvc: GVC; callback: (value: any) => void }) {
+  static funnelFilter(obj: { gvc: GVC; callback: () => void }) {
+    const id = 'funnelFilter';
     return html` <div
-      class="c_funnel"
+      class="c_filter_view"
       onclick="${obj.gvc.event(() => {
-        obj.callback('c_funnel');
+        obj.callback();
+        this.setActiveFilter(obj.gvc, this.activeFilter === id ? '' : id);
       })}"
     >
       <i class="fa-regular fa-filter"></i>
     </div>`;
   }
 
+  static countingFilter(obj: { gvc: GVC; callback: (value: number) => void; default: number }) {
+    const vm = {
+      id: 'countingFilter' as ActiveFilterKeys,
+      checkClass: this.getDarkDotClass(obj.gvc),
+      show: false,
+    };
+
+    const countingList = TableStorage.limitList.map(n => {
+      return { key: n, value: `顯示 ${n} 個` };
+    });
+
+    return html`<div
+      class="d-flex"
+      onclick="${obj.gvc.event(() => {
+        setTimeout(() => {
+          this.setActiveFilter(obj.gvc, this.activeFilter === vm.id ? '' : vm.id);
+        }, 50);
+      })}"
+    >
+      <div class="c_filter_view">
+        <i class="fa-solid fa-list-ol"></i>
+      </div>
+      ${obj.gvc.bindView({
+        bind: vm.id,
+        view: () => {
+          if (!(this.activeFilter === vm.id)) {
+            return '';
+          }
+          return html` <div class="c_absolute" style="top: 20px; right: 20px;">
+            <div class="form-check d-flex flex-column" style="gap: 16px">
+              ${obj.gvc.map(
+                countingList.map(opt => {
+                  return html` <div>
+                    <input
+                      class="form-check-input ${vm.checkClass}"
+                      type="radio"
+                      id="${opt.key}"
+                      name="radio_${vm.id}"
+                      onclick="${obj.gvc.event(() => {
+                        TableStorage.setLimit(opt.key);
+                        obj.callback(opt.key);
+                        this.setActiveFilter(obj.gvc, '');
+                      })}"
+                      ${obj.default === opt.key ? 'checked' : ''}
+                    />
+                    <label class="form-check-label c_updown_label" for="${opt.key}">${opt.value}</label>
+                  </div>`;
+                })
+              )}
+            </div>
+          </div>`;
+        },
+        divCreate: {
+          style: 'position: relative;',
+        },
+      })}
+    </div>`;
+  }
+
   static updownFilter(obj: { gvc: GVC; callback: (value: any) => void; default: string; options: OptionsItem[] }) {
     const vm = {
-      id: obj.gvc.glitter.getUUID(),
+      id: 'updownFilter' as ActiveFilterKeys,
       checkClass: this.getDarkDotClass(obj.gvc),
       show: false,
     };
 
-    return html`<div class="d-flex">
-      <div
-        class="c_updown"
-        onclick="${obj.gvc.event(() => {
-          vm.show = !vm.show;
-          obj.gvc.notifyDataChange(vm.id);
-        })}"
-      >
+    return html`<div
+      class="d-flex"
+      onclick="${obj.gvc.event(() => {
+        setTimeout(() => {
+          this.setActiveFilter(obj.gvc, this.activeFilter === vm.id ? '' : vm.id);
+        }, 50);
+      })}"
+    >
+      <div class="c_filter_view">
         <i class="fa-regular fa-arrow-up-arrow-down"></i>
       </div>
       ${obj.gvc.bindView({
         bind: vm.id,
         view: () => {
-          if (vm.show) {
-            if (obj.options.length === 0) {
-              return '';
-            }
-            return html` <div class="c_absolute" style="top: 20px; right: 20px;">
-              <div class="form-check d-flex flex-column" style="gap: 16px">
-                ${obj.gvc.map(
-                  obj.options.map(opt => {
-                    return html` <div>
-                      <input
-                        class="form-check-input ${vm.checkClass}"
-                        type="radio"
-                        id="${opt.key}"
-                        name="radio_${vm.id}"
-                        onclick="${obj.gvc.event(e => {
-                          vm.show = !vm.show;
-                          obj.callback(e.id);
-                          obj.gvc.notifyDataChange(vm.id);
-                        })}"
-                        ${obj.default === opt.key ? 'checked' : ''}
-                      />
-                      <label class="form-check-label c_updown_label" for="${opt.key}">${opt.value}</label>
-                    </div>`;
-                  })
-                )}
-              </div>
-            </div>`;
+          if (!(this.activeFilter === vm.id) || obj.options.length === 0) {
+            return '';
           }
-          return '';
+
+          return html` <div class="c_absolute" style="top: 20px; right: 20px;">
+            <div class="form-check d-flex flex-column" style="gap: 16px">
+              ${obj.gvc.map(
+                obj.options.map(opt => {
+                  return html` <div>
+                    <input
+                      class="form-check-input ${vm.checkClass}"
+                      type="radio"
+                      id="${opt.key}"
+                      name="radio_${vm.id}"
+                      onclick="${obj.gvc.event(e => {
+                        obj.callback(e.id);
+                        this.setActiveFilter(obj.gvc, '');
+                      })}"
+                      ${obj.default === opt.key ? 'checked' : ''}
+                    />
+                    <label class="form-check-label c_updown_label" for="${opt.key}">${opt.value}</label>
+                  </div>`;
+                })
+              )}
+            </div>
+          </div>`;
         },
         divCreate: {
           style: 'position: relative;',

package/lowcode/cms-plugin/auto-fcm-history.js

@@ -20,6 +20,7 @@ import { ShoppingDiscountSetting } from '../cms-plugin/shopping-discount-setting
 import { ApiSmtp } from '../glitter-base/route/smtp.js';
 import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 const inputStyle = 'font-size: 16px; height:40px; width:300px;';
 export class BgNotify {
@@ -262,6 +263,7 @@ export class BgNotify {
             query: '',
             queryType: 'email',
             filter: {},
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView(() => {
             const ListComp = new BgListComponent(gvc, vm, FilterOptions.emailFilterFrame);
@@ -288,6 +290,14 @@ export class BgNotify {
                                                 gvc.notifyDataChange(vm.tableId);
                                                 gvc.notifyDataChange(id);
                                             }), vm.query || '', '搜尋所有信件內容'),
+                                            BgWidget.countingFilter({
+                                                gvc,
+                                                callback: value => {
+                                                    vm.listLimit = value;
+                                                    gvc.notifyDataChange([vm.tableId, id]);
+                                                },
+                                                default: vm.listLimit,
+                                            }),
                                             BgWidget.funnelFilter({
                                                 gvc,
                                                 callback: () => {
@@ -307,10 +317,9 @@ export class BgNotify {
                                         gvc: gvc,
                                         getData: vmi => {
                                             var _a, _b;
-                                            const limit = 20;
                                             ApiFcm.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,
@@ -381,7 +390,7 @@ export class BgNotify {
                                                         });
                                                     }
                                                     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;
@@ -840,7 +849,7 @@ export class BgNotify {
                         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) {
@@ -1174,7 +1183,7 @@ export class BgNotify {
                                                 ApiUser.getUserList({
                                                     page: 0,
                                                     limit: 99999,
-                                                    only_id: true
+                                                    only_id: true,
                                                 }).then(dd => {
                                                     if (dd.response.data) {
                                                         const ids = [];
@@ -1226,7 +1235,7 @@ export class BgNotify {
                                                                 page: 0,
                                                                 limit: 99999,
                                                                 only_id: true,
-                                                                search: data.query
+                                                                search: data.query,
                                                             }).then(dd => {
                                                                 if (dd.response.data) {
                                                                     vm.dataList = dd.response.data

package/lowcode/cms-plugin/auto-fcm-history.ts

@@ -12,6 +12,7 @@ import { ShoppingDiscountSetting } from '../cms-plugin/shopping-discount-setting
 import { ApiSmtp } from '../glitter-base/route/smtp.js';
 import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -312,6 +313,7 @@ export class BgNotify {
       query?: string;
       queryType?: string;
       filter?: any;
+      listLimit: number;
     } = {
       id: glitter.getUUID(),
       tableId: glitter.getUUID(),
@@ -321,6 +323,7 @@ export class BgNotify {
       query: '',
       queryType: 'email',
       filter: {},
+      listLimit: TableStorage.getLimit(),
     };
     return gvc.bindView(() => {
       const ListComp = new BgListComponent(gvc, vm, FilterOptions.emailFilterFrame);
@@ -353,6 +356,14 @@ export class BgNotify {
                               vm.query || '',
                               '搜尋所有信件內容'
                             ),
+                            BgWidget.countingFilter({
+                              gvc,
+                              callback: value => {
+                                vm.listLimit = value;
+                                gvc.notifyDataChange([vm.tableId, id]);
+                              },
+                              default: vm.listLimit,
+                            }),
                             BgWidget.funnelFilter({
                               gvc,
                               callback: () => {
@@ -372,10 +383,9 @@ export class BgNotify {
                         return BgWidget.tableV3({
                           gvc: gvc,
                           getData: vmi => {
-                            const limit = 20;
                             ApiFcm.history({
                               page: vmi.page - 1,
-                              limit: limit,
+                              limit: vm.listLimit,
                               search: vm.query ?? '',
                               searchType: vm.queryType ?? 'email',
                               sendTime: undefined,
@@ -394,10 +404,7 @@ export class BgNotify {
                                         {
                                           key: '標題',
                                           value: html`<span class="fs-7"
-                                            >${Tool.truncateString(
-                                              `${dd.content.title}`,
-                                              25
-                                            )}</span
+                                            >${Tool.truncateString(`${dd.content.title}`, 25)}</span
                                           >`,
                                         },
                                         {
@@ -453,7 +460,7 @@ export class BgNotify {
                                 }
 
                                 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;
@@ -947,7 +954,7 @@ export class BgNotify {
             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) {
@@ -1298,7 +1305,7 @@ export class BgNotify {
                                   ApiUser.getUserList({
                                     page: 0,
                                     limit: 99999,
-                                    only_id:true
+                                    only_id: true,
                                   }).then(dd => {
                                     if (dd.response.data) {
                                       const ids: number[] = [];
@@ -1350,8 +1357,8 @@ export class BgNotify {
                                           ApiUser.getUserList({
                                             page: 0,
                                             limit: 99999,
-                                            only_id:true,
-                                            search: data.query
+                                            only_id: true,
+                                            search: data.query,
                                           }).then(dd => {
                                             if (dd.response.data) {
                                               vm.dataList = dd.response.data

package/lowcode/cms-plugin/auto-reply.js

@@ -47,7 +47,14 @@ export class AutoReply {
                                 },
                                 {
                                     key: '最後更新時間',
-                                    value: dd.updated_time ? gvc.glitter.ut.dateFormat(dd.updated_time, 'yyyy-MM-dd') : '系統預設',
+                                    value: (() => {
+                                        if (!dd.updated_time || isNaN(new Date(dd.updated_time).getTime())) {
+                                            return '系統預設';
+                                        }
+                                        else {
+                                            return gvc.glitter.ut.dateFormat(dd.updated_time, 'yyyy-MM-dd');
+                                        }
+                                    })(),
                                 },
                                 {
                                     key: '狀態',
@@ -107,6 +114,7 @@ export class AutoReply {
                             vm.dataList = yield Promise.all([
                                 'auto-email-shipment-arrival',
                                 'auto-email-shipment',
+                                'auto-email-in-stock',
                                 'auto-email-order-create',
                                 'auto-email-payment-successful',
                                 'proof-purchase',
@@ -302,6 +310,14 @@ export class AutoReply {
                     content: '[@{{app_name}}] #@{{訂單號碼}} 送貨狀態 更新為: 出貨中',
                     toggle: true,
                 },
+                {
+                    tag: 'auto-email-in-stock',
+                    tag_name: '商品備貨',
+                    name: '@{{app_name}}',
+                    title: '[@{{app_name}}] #@{{訂單號碼}} 送貨狀態 更新為: 備貨中',
+                    content: '[@{{app_name}}] #@{{訂單號碼}} 送貨狀態 更新為: 備貨中',
+                    toggle: true,
+                },
                 {
                     tag: 'auto-email-shipment-arrival',
                     tag_name: '商品到貨',

package/lowcode/cms-plugin/auto-reply.ts

@@ -53,7 +53,13 @@ export class AutoReply {
                 },
                 {
                   key: '最後更新時間',
-                  value: dd.updated_time ? gvc.glitter.ut.dateFormat(dd.updated_time, 'yyyy-MM-dd') : '系統預設',
+                  value: (() => {
+                    if (!dd.updated_time || isNaN(new Date(dd.updated_time).getTime())) {
+                      return '系統預設';
+                    } else {
+                      return gvc.glitter.ut.dateFormat(dd.updated_time, 'yyyy-MM-dd');
+                    }
+                  })(),
                 },
                 {
                   key: '狀態',
@@ -122,6 +128,7 @@ export class AutoReply {
                       [
                         'auto-email-shipment-arrival',
                         'auto-email-shipment',
+                        'auto-email-in-stock',
                         'auto-email-order-create',
                         'auto-email-payment-successful',
                         'proof-purchase',
@@ -352,6 +359,14 @@ export class AutoReply {
         content: '[@{{app_name}}] #@{{訂單號碼}} 送貨狀態 更新為: 出貨中',
         toggle: true,
       },
+      {
+        tag: 'auto-email-in-stock',
+        tag_name: '商品備貨',
+        name: '@{{app_name}}',
+        title: '[@{{app_name}}] #@{{訂單號碼}} 送貨狀態 更新為: 備貨中',
+        content: '[@{{app_name}}] #@{{訂單號碼}} 送貨狀態 更新為: 備貨中',
+        toggle: true,
+      },
       {
         tag: 'auto-email-shipment-arrival',
         tag_name: '商品到貨',

package/lowcode/cms-plugin/exhibition-list.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;
 function getTimeState(startDate, endDate) {
     const now = new Date();
@@ -32,6 +33,7 @@ export class ExhibitionManager {
             filter: {},
             orderString: '',
             storeData: {},
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView({
             bind: vm.id,
@@ -136,6 +138,14 @@ export class ExhibitionManager {
                                 gvc.notifyDataChange(vm.tableId);
                                 gvc.notifyDataChange(id);
                             }), vm.query || '', '搜尋展場名稱'),
+                            BgWidget.countingFilter({
+                                gvc,
+                                callback: value => {
+                                    vm.listLimit = value;
+                                    gvc.notifyDataChange([vm.tableId, id]);
+                                },
+                                default: vm.listLimit,
+                            }),
                         ];
                         const filterTags = ListComp.getFilterTags(FilterOptions.exhibitionFunnel);
                         return BgListComponent.listBarRWD(filterList, filterTags);
@@ -149,10 +159,9 @@ export class ExhibitionManager {
                         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/exhibition-list.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;
 
@@ -41,6 +42,7 @@ type VM = {
   queryType: string;
   orderString: string;
   storeData: any;
+  listLimit: number;
 };
 
 function getTimeState(startDate: string, endDate: string): 'beforeStart' | 'inRange' | 'afterEnd' {
@@ -67,6 +69,7 @@ export class ExhibitionManager {
       filter: {},
       orderString: '',
       storeData: {},
+      listLimit: TableStorage.getLimit(),
     };
 
     return gvc.bindView({
@@ -190,6 +193,14 @@ export class ExhibitionManager {
                         vm.query || '',
                         '搜尋展場名稱'
                       ),
+                      BgWidget.countingFilter({
+                        gvc,
+                        callback: value => {
+                          vm.listLimit = value;
+                          gvc.notifyDataChange([vm.tableId, id]);
+                        },
+                        default: vm.listLimit,
+                      }),
                     ];
 
                     const filterTags = ListComp.getFilterTags(FilterOptions.exhibitionFunnel);
@@ -204,11 +215,10 @@ export class ExhibitionManager {
                     gvc: gvc,
                     getData: vd => {
                       vmi = vd;
-                      const limit = 100;
 
                       function callback(list: ExhibitionData[]) {
                         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/live_capture.js

@@ -3977,10 +3977,10 @@ export class LiveCapture {
                             value=""
                           />
                         </div>
-                        <div class="c_funnel">
+                        <div class="c_filter_view">
                           <i class="fa-regular fa-filter" aria-hidden="true"></i>
                         </div>
-                        <div class="c_updown">
+                        <div class="c_filter_view">
                           <i class="fa-regular fa-arrow-up-arrow-down" aria-hidden="true"></i>
                         </div>
                       </div>

package/lowcode/cms-plugin/live_capture.ts

@@ -4304,10 +4304,10 @@ export class LiveCapture {
                             value=""
                           />
                         </div>
-                        <div class="c_funnel">
+                        <div class="c_filter_view">
                           <i class="fa-regular fa-filter" aria-hidden="true"></i>
                         </div>
-                        <div class="c_updown">
+                        <div class="c_filter_view">
                           <i class="fa-regular fa-arrow-up-arrow-down" aria-hidden="true"></i>
                         </div>
                       </div>

package/lowcode/cms-plugin/model/order.d.ts

@@ -223,6 +223,7 @@ interface ViewModel {
   apiJSON: any;
   checkedData: any[];
   headerConfig: string[];
+  listLimit: number;
 }
 
 interface Invoice {

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

@@ -753,6 +753,7 @@ export class OrderExcel {
                 yield ApiUser.getPublicConfig('customer_form_user_setting', 'manager').then(r => {
                     return Array.isArray(r.response.value.list) ? r.response.value.list : [];
                 }),
+                (yield ApiUser.getPublicConfig('custom_form_checkout_recipient', 'manager')).response.value
             ]);
             return dataArray;
         });
@@ -825,7 +826,7 @@ OrderExcel.headerColumn = () => __awaiter(void 0, void 0, void 0, function* () {
     };
 });
 OrderExcel.getCustomizeMap = (order) => __awaiter(void 0, void 0, void 0, function* () {
-    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig] = yield OrderExcel.customizePromise();
+    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig, receipt] = yield OrderExcel.customizePromise();
     const customizeMap = new Map();
     const getUserValue = (key) => {
         try {
@@ -865,5 +866,18 @@ OrderExcel.getCustomizeMap = (order) => __awaiter(void 0, void 0, void 0, functi
     (shipmentConfig || []).map((item) => {
         customizeMap.set(`物流自訂值 - ${item.title}`, order ? getShipmentValue(item.key) : '-');
     });
+    let viewModel = [
+        ['姓名', 'name'],
+        ['電話', 'phone'],
+        ['信箱', 'email'],
+    ];
+    receipt.list.map((d1) => {
+        var _b;
+        if (!viewModel.find(dd => {
+            return dd[1] === d1.key;
+        })) {
+            customizeMap.set(`收件人資訊 - ${d1.title}`, order ? ((_b = order.orderData.user_info[d1.key]) !== null && _b !== void 0 ? _b : '-') : '-');
+        }
+    });
     return customizeMap;
 });