ts-glitter 21.4.4 → 21.4.5

package/lowcode/cms-plugin/shopping-product-setting.js

@@ -260,18 +260,14 @@ export class ShoppingProductSetting {
                                                                                     width: 40,
                                                                                     class: 'rounded border me-2',
                                                                                 })}
-                                                <div class="d-flex flex-column">
+                                                <div class="d-flex align-items-center gap-2">
+                                                  ${Tool.truncateString(dd.content.title, dd.content.shopee_id ? 16 : 20)}
                                                   ${dd.content.shopee_id
-                                                                                    ? html `<div style="margin-bottom: -10px;">
-                                                        <div
-                                                          class="insignia"
-                                                          style="background: orangered;color: white;"
-                                                        >
-                                                          蝦皮
-                                                        </div>
-                                                      </div> `
+                                                                                    ? html `<img
+                                                        src="${ShoppingProductSetting.shopeeImage}"
+                                                        style="width: 20px; height: 20px;"
+                                                      />`
                                                                                     : ''}
-                                                  <div>${Tool.truncateString(dd.content.title)}</div>
                                                 </div>
                                               </div>`,
                                                                             },
@@ -1740,4 +1736,5 @@ ShoppingProductSetting.getDateTime = (n = 0) => {
     const timeStr = `${hours}:00`;
     return { date: dateStr, time: timeStr };
 };
+ShoppingProductSetting.shopeeImage = 'https://deo.shopeemobile.com/shopee/shopee-mobilemall-live-sg/assets/icon_favicon_1_32.0Wecxv.png';
 window.glitter.setModule(import.meta.url, ShoppingProductSetting);

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

@@ -318,18 +318,17 @@ export class ShoppingProductSetting {
                                                   width: 40,
                                                   class: 'rounded border me-2',
                                                 })}
-                                                <div class="d-flex flex-column">
+                                                <div class="d-flex align-items-center gap-2">
+                                                  ${Tool.truncateString(
+                                                    dd.content.title,
+                                                    dd.content.shopee_id ? 16 : 20
+                                                  )}
                                                   ${dd.content.shopee_id
-                                                    ? html`<div style="margin-bottom: -10px;">
-                                                        <div
-                                                          class="insignia"
-                                                          style="background: orangered;color: white;"
-                                                        >
-                                                          蝦皮
-                                                        </div>
-                                                      </div> `
+                                                    ? html`<img
+                                                        src="${ShoppingProductSetting.shopeeImage}"
+                                                        style="width: 20px; height: 20px;"
+                                                      />`
                                                     : ''}
-                                                  <div>${Tool.truncateString(dd.content.title)}</div>
                                                 </div>
                                               </div>`,
                                             },
@@ -2033,6 +2032,9 @@ export class ShoppingProductSetting {
         return BgWidget.secondaryInsignia('草稿');
     }
   }
+
+  static shopeeImage =
+    'https://deo.shopeemobile.com/shopee/shopee-mobilemall-live-sg/assets/icon_favicon_1_32.0Wecxv.png';
 }
 
 (window as any).glitter.setModule(import.meta.url, ShoppingProductSetting);

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

@@ -3262,11 +3262,8 @@ ${(_b = language_data.seo.content) !== null && _b !== void 0 ? _b : ''}</textare
                         single: false,
                         readonly: postMD.product_category === 'weighing',
                     })}
-                  <div class="${postMD.shopee_id ? `d-flex` : `d-none`} align-items-center mt-1" style="gap:6px;">
-                    <img
-                      src="https://deo.shopeemobile.com/shopee/shopee-mobilemall-live-sg/assets/icon_favicon_1_32.0Wecxv.png"
-                      style="width:20px;height:20px;"
-                    />
+                  <div class="${postMD.shopee_id ? `d-flex` : `d-none`} align-items-center mt-1" style="gap: 6px;">
+                    <img src="${ShoppingProductSetting.shopeeImage}" style="width: 20px; height: 20px;" />
                     蝦皮賣場
                   </div>
                 `;

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

@@ -3604,11 +3604,8 @@ ${language_data.seo.content ?? ''}</textarea
                       readonly: postMD.product_category === 'weighing',
                     }
                   )}
-                  <div class="${postMD.shopee_id ? `d-flex` : `d-none`} align-items-center mt-1" style="gap:6px;">
-                    <img
-                      src="https://deo.shopeemobile.com/shopee/shopee-mobilemall-live-sg/assets/icon_favicon_1_32.0Wecxv.png"
-                      style="width:20px;height:20px;"
-                    />
+                  <div class="${postMD.shopee_id ? `d-flex` : `d-none`} align-items-center mt-1" style="gap: 6px;">
+                    <img src="${ShoppingProductSetting.shopeeImage}" style="width: 20px; height: 20px;" />
                     蝦皮賣場
                   </div>
                 `;

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

@@ -21,6 +21,7 @@ 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';
+import { StockExcel } from './module/stock-excel.js';
 const html = String.raw;
 const typeConfig = {
     restocking: {
@@ -670,6 +671,21 @@ export class StockHistory {
             vm.view = 'replace';
         }))}${BgWidget.title(`${typeData.name}核對`)}
         <div class="flex-fill"></div>
+        <div class="d-flex" style="gap: 14px;">
+          ${vm.data.type === 'checking' && [2, 4, 5].includes(vm.data.status)
+            ? BgWidget.grayButton('匯入', gvc.event(() => {
+                StockExcel.importDialog(gvc, vm.data.content.product_list, (updateList) => {
+                    vm.data.content.product_list = updateList;
+                    gvc.notifyDataChange(vm.id);
+                });
+            }))
+            : ''}
+          ${vm.data.type === 'checking' && [2, 4, 5].includes(vm.data.status)
+            ? BgWidget.grayButton('匯出', gvc.event(() => {
+                StockExcel.exportChecking(gvc, vm.data.order_id, vm.data.content.product_list);
+            }))
+            : ''}
+        </div>
       </div>
       <div class="title-container">
         ${BgWidget.tab(tabs, gvc, vm.tabKey, text => {
@@ -776,7 +792,6 @@ export class StockHistory {
                         hiddenPageSplit: true,
                     });
                 },
-                divCreate: {},
                 onCreate: () => {
                     if (loading) {
                         loading = false;
@@ -1811,17 +1826,19 @@ export class StockHistory {
                                                         return StockHistory.vendorForm(gvc2, newVendorData);
                                                     },
                                                     footer_html: gvc2 => {
-                                                        return `${BgWidget.cancel(gvc2.event(() => {
-                                                            gvc2.closeDialog();
-                                                        }))}
-                                                            ${BgWidget.save(gvc2.event(() => {
-                                                            StockVendors.verifyStoreForm(glitter, 'create', newVendorData, response => {
+                                                        return [
+                                                            BgWidget.cancel(gvc2.event(() => {
                                                                 gvc2.closeDialog();
-                                                                vm.data.content.vendor = response.id;
-                                                                loading = true;
-                                                                gvc.notifyDataChange(id);
-                                                            });
-                                                        }), '完成')}`;
+                                                            })),
+                                                            BgWidget.save(gvc2.event(() => {
+                                                                StockVendors.verifyStoreForm(glitter, 'create', newVendorData, response => {
+                                                                    gvc2.closeDialog();
+                                                                    vm.data.content.vendor = response.id;
+                                                                    loading = true;
+                                                                    gvc.notifyDataChange(id);
+                                                                });
+                                                            }), '完成'),
+                                                        ].join('');
                                                     },
                                                 });
                                             },
@@ -1829,7 +1846,6 @@ export class StockHistory {
                                     });
                                 }
                             },
-                            divCreate: {},
                             onCreate: () => {
                                 if (loading) {
                                     ApiUser.getPublicConfig('vendor_manager', 'manager').then((dd) => {
@@ -1901,17 +1917,18 @@ export class StockHistory {
                                                         return StockHistory.storeForm(gvc2, newStoreData);
                                                     },
                                                     footer_html: gvc2 => {
-                                                        return `${BgWidget.cancel(gvc2.event(() => {
-                                                            gvc2.closeDialog();
-                                                        }))}
-                                                            ${BgWidget.save(gvc2.event(() => {
-                                                            StockStores.verifyStoreForm(glitter, 'create', newStoreData, response => {
+                                                        return [
+                                                            BgWidget.cancel(gvc2.event(() => {
                                                                 gvc2.closeDialog();
-                                                                vm.data.content.store_in = response.id;
-                                                                loading = true;
-                                                                gvc.notifyDataChange(id);
-                                                            });
-                                                        }), '完成')}`;
+                                                            }), BgWidget.save(gvc2.event(() => {
+                                                                StockStores.verifyStoreForm(glitter, 'create', newStoreData, response => {
+                                                                    gvc2.closeDialog();
+                                                                    vm.data.content.store_in = response.id;
+                                                                    loading = true;
+                                                                    gvc.notifyDataChange(id);
+                                                                });
+                                                            }), '完成')),
+                                                        ].join('');
                                                     },
                                                 });
                                             },
@@ -1919,7 +1936,6 @@ export class StockHistory {
                                     });
                                 }
                             },
-                            divCreate: {},
                             onCreate: () => {
                                 if (loading) {
                                     ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
@@ -1984,7 +2000,6 @@ export class StockHistory {
                                     });
                                 }
                             },
-                            divCreate: {},
                             onCreate: () => {
                                 if (loading) {
                                     ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
@@ -2042,7 +2057,6 @@ export class StockHistory {
                                     });
                                 }
                             },
-                            divCreate: {},
                             onCreate: () => {
                                 if (loading) {
                                     ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
@@ -2109,7 +2123,6 @@ export class StockHistory {
                                     });
                                 }
                             },
-                            divCreate: {},
                             onCreate: () => {
                                 if (loading) {
                                     ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {

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

@@ -13,6 +13,7 @@ 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';
+import { StockExcel } from './module/stock-excel.js';
 
 const html = String.raw;
 
@@ -725,6 +726,27 @@ export class StockHistory {
           })
         )}${BgWidget.title(`${typeData.name}核對`)}
         <div class="flex-fill"></div>
+        <div class="d-flex" style="gap: 14px;">
+          ${vm.data.type === 'checking' && [2, 4, 5].includes(vm.data.status)
+            ? BgWidget.grayButton(
+                '匯入',
+                gvc.event(() => {
+                  StockExcel.importDialog(gvc, vm.data.content.product_list, (updateList: ContentProduct[]) => {
+                    vm.data.content.product_list = updateList;
+                    gvc.notifyDataChange(vm.id);
+                  });
+                })
+              )
+            : ''}
+          ${vm.data.type === 'checking' && [2, 4, 5].includes(vm.data.status)
+            ? BgWidget.grayButton(
+                '匯出',
+                gvc.event(() => {
+                  StockExcel.exportChecking(gvc, vm.data.order_id, vm.data.content.product_list);
+                })
+              )
+            : ''}
+        </div>
       </div>
       <div class="title-container">
         ${BgWidget.tab(
@@ -852,7 +874,6 @@ export class StockHistory {
                   hiddenPageSplit: true,
                 });
               },
-              divCreate: {},
               onCreate: () => {
                 if (loading) {
                   loading = false;
@@ -1976,27 +1997,24 @@ export class StockHistory {
                                     return StockHistory.vendorForm(gvc2, newVendorData);
                                   },
                                   footer_html: gvc2 => {
-                                    return `${BgWidget.cancel(
-                                      gvc2.event(() => {
-                                        gvc2.closeDialog();
-                                      })
-                                    )}
-                                                            ${BgWidget.save(
-                                                              gvc2.event(() => {
-                                                                StockVendors.verifyStoreForm(
-                                                                  glitter,
-                                                                  'create',
-                                                                  newVendorData,
-                                                                  response => {
-                                                                    gvc2.closeDialog();
-                                                                    vm.data.content.vendor = response.id;
-                                                                    loading = true;
-                                                                    gvc.notifyDataChange(id);
-                                                                  }
-                                                                );
-                                                              }),
-                                                              '完成'
-                                                            )}`;
+                                    return [
+                                      BgWidget.cancel(
+                                        gvc2.event(() => {
+                                          gvc2.closeDialog();
+                                        })
+                                      ),
+                                      BgWidget.save(
+                                        gvc2.event(() => {
+                                          StockVendors.verifyStoreForm(glitter, 'create', newVendorData, response => {
+                                            gvc2.closeDialog();
+                                            vm.data.content.vendor = response.id;
+                                            loading = true;
+                                            gvc.notifyDataChange(id);
+                                          });
+                                        }),
+                                        '完成'
+                                      ),
+                                    ].join('');
                                   },
                                 });
                               },
@@ -2004,7 +2022,6 @@ export class StockHistory {
                           });
                         }
                       },
-                      divCreate: {},
                       onCreate: () => {
                         if (loading) {
                           ApiUser.getPublicConfig('vendor_manager', 'manager').then((dd: any) => {
@@ -2079,27 +2096,24 @@ export class StockHistory {
                                     return StockHistory.storeForm(gvc2, newStoreData);
                                   },
                                   footer_html: gvc2 => {
-                                    return `${BgWidget.cancel(
-                                      gvc2.event(() => {
-                                        gvc2.closeDialog();
-                                      })
-                                    )}
-                                                            ${BgWidget.save(
-                                                              gvc2.event(() => {
-                                                                StockStores.verifyStoreForm(
-                                                                  glitter,
-                                                                  'create',
-                                                                  newStoreData,
-                                                                  response => {
-                                                                    gvc2.closeDialog();
-                                                                    vm.data.content.store_in = response.id;
-                                                                    loading = true;
-                                                                    gvc.notifyDataChange(id);
-                                                                  }
-                                                                );
-                                                              }),
-                                                              '完成'
-                                                            )}`;
+                                    return [
+                                      BgWidget.cancel(
+                                        gvc2.event(() => {
+                                          gvc2.closeDialog();
+                                        }),
+                                        BgWidget.save(
+                                          gvc2.event(() => {
+                                            StockStores.verifyStoreForm(glitter, 'create', newStoreData, response => {
+                                              gvc2.closeDialog();
+                                              vm.data.content.store_in = response.id;
+                                              loading = true;
+                                              gvc.notifyDataChange(id);
+                                            });
+                                          }),
+                                          '完成'
+                                        )
+                                      ),
+                                    ].join('');
                                   },
                                 });
                               },
@@ -2107,7 +2121,6 @@ export class StockHistory {
                           });
                         }
                       },
-                      divCreate: {},
                       onCreate: () => {
                         if (loading) {
                           ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
@@ -2175,7 +2188,6 @@ export class StockHistory {
                           });
                         }
                       },
-                      divCreate: {},
                       onCreate: () => {
                         if (loading) {
                           ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
@@ -2236,7 +2248,6 @@ export class StockHistory {
                           });
                         }
                       },
-                      divCreate: {},
                       onCreate: () => {
                         if (loading) {
                           ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
@@ -2306,7 +2317,6 @@ export class StockHistory {
                           });
                         }
                       },
-                      divCreate: {},
                       onCreate: () => {
                         if (loading) {
                           ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
@@ -3445,7 +3455,6 @@ export class StockHistory {
     let product_list = data.content.product_list;
     if (ids.length === 0) {
       callback([]);
-      // callback(product_list);
       return;
     }
 

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

@@ -5,8 +5,8 @@ import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 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';
+import { VendorExcel } from './module/vendor-excel.js';
 const html = String.raw;
 export class StockVendors {
     static main(gvc) {
@@ -62,7 +62,7 @@ export class StockVendors {
                     },
                     {
                         key: '聯絡人姓名',
-                        value: `<span class="fs-7">${dd.manager_name}</span>`,
+                        value: `<span class="fs-7">${dd.manager_name || '（尚未填寫）'}</span>`,
                     },
                 ];
             });
@@ -70,9 +70,15 @@ export class StockVendors {
         return BgWidget.container(html ` <div class="title-container">
           ${BgWidget.title('供應商管理')}
           <div class="flex-fill"></div>
-          ${BgWidget.grayButton('新增供應商', gvc.event(() => {
-            vm.type = 'create';
-        }))}
+          <div class="d-flex align-items-center gap-2">
+            ${[
+            BgWidget.grayButton('匯入', gvc.event(() => VendorExcel.importDialog(gvc, () => gvc.notifyDataChange(vm.id)))),
+            BgWidget.grayButton('匯出', gvc.event(() => VendorExcel.exportDialog(gvc))),
+            BgWidget.grayButton('新增供應商', gvc.event(() => {
+                vm.type = 'create';
+            })),
+        ].join('')}
+          </div>
         </div>
         ${BgWidget.container(BgWidget.mainCard([
             (() => {
@@ -289,13 +295,6 @@ export class StockVendors {
             });
         });
     }
-    static getNewID(list) {
-        let newId;
-        do {
-            newId = `vendor_${Tool.randomString(6)}`;
-        } while (list.some((item) => item.id === newId));
-        return newId;
-    }
     static verifyStoreForm(glitter, type, data, callback) {
         const dialog = new ShareDialog(glitter);
         if (CheckInput.isEmpty(data.name)) {
@@ -314,6 +313,12 @@ export class StockVendors {
         this.getPublicData().then((vendors) => {
             var _a;
             vendors.list = (_a = vendors.list) !== null && _a !== void 0 ? _a : [];
+            const find_vendor = vendors.list.find((item) => item.name === data.name);
+            if (find_vendor && find_vendor.id !== data.id) {
+                dialog.dataLoading({ visible: false });
+                dialog.infoMessage({ text: `供應商「${data.name}」已存在` });
+                return;
+            }
             if (type === 'replace') {
                 const vendor = vendors.list.find((item) => item.id === data.id);
                 if (vendor) {
@@ -321,7 +326,7 @@ export class StockVendors {
                 }
             }
             else {
-                data.id = this.getNewID(vendors.list);
+                data.id = VendorExcel.getNewID(vendors.list);
                 vendors.list.push(data);
             }
             ApiUser.setPublicConfig({

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

@@ -8,6 +8,7 @@ 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';
+import { VendorExcel } from './module/vendor-excel.js';
 
 const html = String.raw;
 
@@ -106,7 +107,7 @@ export class StockVendors {
           },
           {
             key: '聯絡人姓名',
-            value: `<span class="fs-7">${dd.manager_name}</span>`,
+            value: `<span class="fs-7">${dd.manager_name || '（尚未填寫）'}</span>`,
           },
         ];
       });
@@ -116,12 +117,24 @@ export class StockVendors {
       html` <div class="title-container">
           ${BgWidget.title('供應商管理')}
           <div class="flex-fill"></div>
-          ${BgWidget.grayButton(
-            '新增供應商',
-            gvc.event(() => {
-              vm.type = 'create';
-            })
-          )}
+          <div class="d-flex align-items-center gap-2">
+            ${[
+              BgWidget.grayButton(
+                '匯入',
+                gvc.event(() => VendorExcel.importDialog(gvc, () => gvc.notifyDataChange(vm.id)))
+              ),
+              BgWidget.grayButton(
+                '匯出',
+                gvc.event(() => VendorExcel.exportDialog(gvc))
+              ),
+              BgWidget.grayButton(
+                '新增供應商',
+                gvc.event(() => {
+                  vm.type = 'create';
+                })
+              ),
+            ].join('')}
+          </div>
         </div>
         ${BgWidget.container(
           BgWidget.mainCard(
@@ -177,6 +190,7 @@ export class StockVendors {
                             return vm.query === '' || item.name.includes(vm.query);
                           });
                           vm.dataList = data.list;
+
                           vmi.pageSize = Math.ceil(data.list.length / vm.listLimit);
                           vmi.originalData = vm.dataList;
                           vmi.tableData = getDatalist();
@@ -363,14 +377,6 @@ export class StockVendors {
     });
   }
 
-  static getNewID(list: VendorData[]) {
-    let newId: string;
-    do {
-      newId = `vendor_${Tool.randomString(6)}`;
-    } while (list.some((item: VendorData) => item.id === newId));
-    return newId;
-  }
-
   static verifyStoreForm(
     glitter: any,
     type: 'create' | 'replace',
@@ -378,6 +384,7 @@ export class StockVendors {
     callback: (data: any) => void
   ): void {
     const dialog = new ShareDialog(glitter);
+
     // 名稱未填寫驗證
     if (CheckInput.isEmpty(data.name)) {
       dialog.infoMessage({ text: '供應商名稱不得為空白' });
@@ -400,13 +407,21 @@ export class StockVendors {
     this.getPublicData().then((vendors: any) => {
       vendors.list = vendors.list ?? [];
 
+      // 名稱未填寫驗證
+      const find_vendor = vendors.list.find((item: VendorData) => item.name === data.name);
+      if (find_vendor && find_vendor.id !== data.id) {
+        dialog.dataLoading({ visible: false });
+        dialog.infoMessage({ text: `供應商「${data.name}」已存在` });
+        return;
+      }
+
       if (type === 'replace') {
         const vendor = vendors.list.find((item: VendorData) => item.id === data.id);
         if (vendor) {
           Object.assign(vendor, data);
         }
       } else {
-        data.id = this.getNewID(vendors.list);
+        data.id = VendorExcel.getNewID(vendors.list);
         vendors.list.push(data);
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "21.4.4",
+  "version": "21.4.5",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/services/schedule.js

@@ -24,6 +24,9 @@ const invoice_js_1 = require("./invoice.js");
 const process_1 = __importDefault(require("process"));
 class Schedule {
     async preload(app) {
+        if (app === 'shopnex') {
+            return true;
+        }
         const brand_type = await app_js_1.App.checkBrandAndMemberType(app);
         if ((brand_type.brand === 'shopnex' && brand_type.domain) || (app === 'shopnex')) {
             if (!(await this.isDatabasePass(app)))
@@ -429,7 +432,9 @@ class Schedule {
     main() {
         const scheduleList = config_1.ConfigSetting.is_local
             ?
-                []
+                [
+                    { second: 60 * 5, status: true, func: 'visitLogs', desc: '更新每天造訪人數' }
+                ]
             :
                 [
                     { second: 3600, status: true, func: 'birthRebate', desc: '生日禮發放購物金' },