ts-glitter 18.8.9 → 18.9.0

package/kem3hy0ds7.json

@@ -0,0 +1 @@
+{"question":[{"ask":"商店營業時間","response":"每天早上6:00到晚上9:30"},{"ask":"配送時間","response":"預計3-6個工作天"},{"ask":"查詢我的訂單狀態","response":"orders-search"},{"ask":"查詢我的訂單配送狀態","response":"orders-search"},{"ask":"查詢我的訂單付款狀態","response":"orders-search"},{"ask":"訂單號碼##########的配送狀態","response":"orders-search"},{"ask":"訂單號碼##########的付款狀態","response":"orders-search"},{"ask":"訂單號碼##########的狀態","response":"orders-search"}]}

package/lowcode/Entry.js

@@ -131,7 +131,7 @@ export class Entry {
         }
         window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_18.8.9';
+        glitter.share.editerVersion = 'V_18.9.0';
         glitter.share.start = new Date();
         const vm = { appConfig: [] };
         window.saasConfig = {

package/lowcode/Entry.ts

@@ -131,7 +131,7 @@ export class Entry {
         }
         (window as any).renderClock = (window as any).renderClock ?? createClock();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_18.8.9';
+        glitter.share.editerVersion = 'V_18.9.0';
         glitter.share.start = new Date();
         const vm = { appConfig: [] };
         (window as any).saasConfig = {

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

@@ -1721,7 +1721,7 @@ export class BgRecommend {
                     </div>
                     <div>
                       ${BgWidget.title(vm.data.name || '新增推薦人')}${cf.data.id
-                                ? BgWidget.grayNote(`建立時間: ${Tool.convertDateTimeFormat(cf.data.created_time)}`)
+                                ? BgWidget.grayNote(`建立時間: ${Tool.formatDateTime(cf.data.created_time)}`)
                                 : ''}
                     </div>
                   </div>

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

@@ -1946,7 +1946,7 @@ export class BgRecommend {
                     </div>
                     <div>
                       ${BgWidget.title(vm.data.name || '新增推薦人')}${cf.data.id
-                        ? BgWidget.grayNote(`建立時間: ${Tool.convertDateTimeFormat(cf.data.created_time)}`)
+                        ? BgWidget.grayNote(`建立時間: ${Tool.formatDateTime(cf.data.created_time)}`)
                         : ''}
                     </div>
                   </div>

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

@@ -29,4 +29,28 @@ export class Excel {
             XLSX.writeFile(workbook, fileName);
         });
     }
+    static parseExcelToJson(gvc, file) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const XLSX = yield Excel.loadXLSX(gvc);
+            return new Promise((resolve, reject) => {
+                const reader = new FileReader();
+                reader.onload = event => {
+                    var _a;
+                    try {
+                        const data = new Uint8Array((_a = event.target) === null || _a === void 0 ? void 0 : _a.result);
+                        const workbook = XLSX.read(data, { type: 'array' });
+                        const sheetName = workbook.SheetNames[0];
+                        const sheet = workbook.Sheets[sheetName];
+                        const jsonData = XLSX.utils.sheet_to_json(sheet);
+                        resolve(jsonData);
+                    }
+                    catch (error) {
+                        reject(error);
+                    }
+                };
+                reader.onerror = error => reject(error);
+                reader.readAsArrayBuffer(file);
+            });
+        });
+    }
 }

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

@@ -31,4 +31,33 @@ export class Excel {
     // 生成 Excel 檔案並下載
     XLSX.writeFile(workbook, fileName);
   }
+
+  static async parseExcelToJson(gvc: GVC, file: File): Promise<any[]> {
+    const XLSX = await Excel.loadXLSX(gvc);
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+
+      reader.onload = event => {
+        try {
+          const data = new Uint8Array(event.target?.result as ArrayBuffer);
+          const workbook = XLSX.read(data, { type: 'array' });
+
+          // 取得第一個工作表名稱
+          const sheetName = workbook.SheetNames[0];
+
+          // 取得工作表內容並轉換為 JSON
+          const sheet = workbook.Sheets[sheetName];
+          const jsonData = XLSX.utils.sheet_to_json(sheet);
+
+          resolve(jsonData);
+        } catch (error) {
+          reject(error);
+        }
+      };
+
+      reader.onerror = error => reject(error);
+
+      reader.readAsArrayBuffer(file);
+    });
+  }
 }

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

@@ -124,6 +124,17 @@ export class OrderExcel {
                     分銷連結名稱: (_f = (_e = orderData.distribution_info) === null || _e === void 0 ? void 0 : _e.title) !== null && _f !== void 0 ? _f : '',
                 });
             };
+            const getProductJSON = (item) => {
+                var _a;
+                return formatJSON({
+                    商品名稱: item.title,
+                    商品規格: item.spec.length > 0 ? item.spec.join(' / ') : '單一規格',
+                    商品SKU: (_a = item.sku) !== null && _a !== void 0 ? _a : '',
+                    商品購買數量: item.count,
+                    商品價格: item.sale_price,
+                    商品折扣: item.discount_price,
+                });
+            };
             const getUserJSON = (order, orderData) => {
                 var _a, _b, _c, _d, _e, _f;
                 return formatJSON({
@@ -135,6 +146,10 @@ export class OrderExcel {
                     收件人信箱: orderData.user_info.email,
                     付款方式: findMethodName(orderData.customer_info.payment_select, payment_methods),
                     配送方式: findMethodName(orderData.user_info.shipment, shipment_methods),
+                    收貨地址: [orderData.user_info.city, orderData.user_info.area, orderData.user_info.address]
+                        .filter(Boolean)
+                        .join(''),
+                    代收金額: orderData.customer_info.payment_select === 'cash_on_delivery' ? orderData.total : 0,
                     出貨單號碼: (_a = orderData.user_info.shipment_number) !== null && _a !== void 0 ? _a : '',
                     出貨單日期: formatDate(orderData.user_info.shipment_date),
                     發票號碼: (_b = order.invoice_number) !== null && _b !== void 0 ? _b : '',
@@ -142,17 +157,6 @@ export class OrderExcel {
                     備註: (_f = orderData.user_info.note) !== null && _f !== void 0 ? _f : '無備註',
                 });
             };
-            const getProductJSON = (item) => {
-                var _a;
-                return formatJSON({
-                    商品名稱: item.title,
-                    商品規格: item.spec.length > 0 ? item.spec.join(' / ') : '單一規格',
-                    商品SKU: (_a = item.sku) !== null && _a !== void 0 ? _a : '',
-                    商品購買數量: item.count,
-                    商品價格: item.sale_price,
-                    商品折扣: item.discount_price,
-                });
-            };
             function exportOrdersToExcel(dataArray) {
                 if (!dataArray.length) {
                     dialog.errorMessage({ text: '無訂單資料可以匯出' });
@@ -262,7 +266,250 @@ export class OrderExcel {
             },
         });
     }
+    static importWithShipment(gvc, target, callback) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const dialog = new ShareDialog(gvc.glitter);
+            function errorMsg(text) {
+                dialog.dataLoading({ visible: false });
+                dialog.errorMessage({ text: text });
+            }
+            if ((_a = target.files) === null || _a === void 0 ? void 0 : _a.length) {
+                try {
+                    dialog.dataLoading({ visible: true, text: '上傳檔案中' });
+                    const jsonData = yield Excel.parseExcelToJson(gvc, target.files[0]);
+                    const importMap = new Map();
+                    for (let i = 0; i < jsonData.length; i++) {
+                        const order = jsonData[i];
+                        if ((order['出貨單號碼'] && !order['訂單編號']) || (!order['出貨單號碼'] && order['訂單編號'])) {
+                            errorMsg('每個訂單編號必須與出貨單號碼成對');
+                            return;
+                        }
+                        importMap.set(`${order['訂單編號']}`, `${order['出貨單號碼']}`);
+                    }
+                    const cartTokens = [...importMap.keys()];
+                    const getOrders = yield ApiShop.getOrder({
+                        page: 0,
+                        limit: 1000,
+                        searchType: 'cart_token',
+                        id_list: cartTokens.join(','),
+                    });
+                    if (!getOrders.result) {
+                        errorMsg('訂單資料取得失敗');
+                        return;
+                    }
+                    const orders = getOrders.response.data;
+                    const orderMap = new Map(orders.map((order) => [order.cart_token, true]));
+                    const importKey = cartTokens.find(key => !orderMap.has(key));
+                    if (importKey) {
+                        errorMsg(`訂單編號 #${importKey} 不存在`);
+                        return;
+                    }
+                    for (const order of orders) {
+                        try {
+                            if (order.orderData.user_info.shipment_number) {
+                                errorMsg(`出貨單號碼不可覆寫<br/>（訂單編號: ${order.cart_token}）`);
+                                return;
+                            }
+                            if (order.orderData.progress && order.orderData.progress !== 'wait') {
+                                errorMsg(`訂單出貨狀態必須為「未出貨」<br/>（訂單編號: ${order.cart_token}）`);
+                                return;
+                            }
+                            order.orderData.user_info.shipment_number = importMap.get(order.cart_token);
+                        }
+                        catch (error) {
+                            errorMsg('訂單資料有誤');
+                        }
+                    }
+                    const saveEvent = (order, setShipping) => {
+                        var _a;
+                        const orderData = order.orderData;
+                        const temps = [
+                            {
+                                time: Tool.formatDateTime(),
+                                record: `建立出貨單號碼 #${orderData.user_info.shipment_number}`,
+                            },
+                        ];
+                        if (setShipping) {
+                            orderData.progress = 'shipping';
+                            temps.push({
+                                time: Tool.formatDateTime(),
+                                record: '訂單已出貨',
+                            });
+                        }
+                        orderData.editRecord = [...((_a = orderData.editRecord) !== null && _a !== void 0 ? _a : []), ...temps];
+                        return ApiShop.putOrder({ id: `${order.id}`, order_data: orderData });
+                    };
+                    dialog.dataLoading({ visible: false });
+                    dialog.checkYesOrNot({
+                        text: '匯入的出貨單資料，是否要將出貨狀態改成「已出貨」？',
+                        yesString: '是',
+                        notString: '否',
+                        callback: (bool) => __awaiter(this, void 0, void 0, function* () {
+                            try {
+                                dialog.dataLoading({ visible: true });
+                                const responses = yield Promise.all(orders.map((order) => {
+                                    return saveEvent(order, bool);
+                                }));
+                                const failedResponse = responses.find(res => !res.result);
+                                dialog.dataLoading({ visible: false });
+                                if (failedResponse) {
+                                    console.error('匯入失敗:', failedResponse);
+                                    dialog.errorMessage({ text: '匯入失敗' });
+                                }
+                                else {
+                                    dialog.successMessage({ text: '匯入成功' });
+                                    setTimeout(() => callback(), 300);
+                                }
+                            }
+                            catch (error) {
+                                dialog.dataLoading({ visible: false });
+                                console.error('批次出貨更新錯誤:', error);
+                                dialog.errorMessage({ text: '系統錯誤，請稍後再試' });
+                            }
+                        }),
+                    });
+                }
+                catch (error) {
+                    console.error('Order Excel 解析失敗', error);
+                }
+            }
+        });
+    }
+    static importDialog(gvc, query, callback) {
+        const dialog = new ShareDialog(gvc.glitter);
+        const vm = {
+            id: 'importDialog',
+            fileInput: {},
+            type: '',
+            orderTitle: (() => {
+                if (query.isShipment)
+                    return '出貨單';
+                if (query.isArchived)
+                    return '已封存訂單';
+                return '訂單';
+            })(),
+        };
+        gvc.glitter.innerDialog((gvc) => {
+            return gvc.bindView({
+                bind: vm.id,
+                view: () => {
+                    const viewData = {
+                        title: `匯入${vm.orderTitle}`,
+                        category: {
+                            title: `匯入${vm.orderTitle}類型`,
+                            options: [],
+                        },
+                        example: {
+                            event: () => {
+                                Excel.downloadExcel(gvc, (() => {
+                                    if (query.isShipment)
+                                        return OrderExcel.importShipmentExample;
+                                    if (query.isArchived)
+                                        return [];
+                                    return [];
+                                })(), `範例_${vm.orderTitle}列表_${gvc.glitter.ut.dateFormat(new Date(), 'yyyyMMddhhmmss')}.xlsx`, `範例${vm.orderTitle}列表`);
+                            },
+                        },
+                        import: {
+                            event: () => {
+                                if (query.isShipment) {
+                                    return this.importWithShipment(gvc, vm.fileInput, () => {
+                                        gvc.glitter.closeDiaLog();
+                                        callback();
+                                    });
+                                }
+                                if (query.isArchived) {
+                                }
+                            },
+                        },
+                    };
+                    return html `
+            <div
+              class="d-flex align-items-center w-100 tx_700"
+              style="padding: 12px 0 12px 20px; align-items: center; border-radius: 10px 10px 0px 0px; background: #F2F2F2;"
+            >
+              ${viewData.title}
+            </div>
+            ${viewData.category.options.length > 0
+                        ? html `<div class="d-flex flex-column align-items-start gap-2" style="padding: 20px 20px 0px;">
+                  <div class="tx_700">${viewData.category.title}</div>
+                  ${BgWidget.multiCheckboxContainer(gvc, viewData.category.options, [vm.type], res => {
+                            vm.type = res[0];
+                        }, { single: true })}
+                </div>`
+                        : ''}
+            <div class="d-flex flex-column w-100 align-items-start gap-3" style="padding: 20px">
+              <div class="d-flex align-items-center gap-2">
+                <div class="tx_700">透過XLSX檔案匯入商品</div>
+                ${BgWidget.blueNote('下載範例', gvc.event(viewData.example.event))}
+              </div>
+              <input
+                class="d-none"
+                type="file"
+                id="upload-excel"
+                onchange="${gvc.event((_, event) => {
+                        vm.fileInput = event.target;
+                        gvc.notifyDataChange(vm.id);
+                    })}"
+              />
+              <div
+                class="d-flex flex-column w-100 justify-content-center align-items-center gap-3"
+                style="border: 1px solid #DDD; border-radius: 10px; min-height: 180px;"
+              >
+                ${(() => {
+                        if (vm.fileInput.files && vm.fileInput.files.length > 0) {
+                            return html `
+                      ${BgWidget.customButton({
+                                button: { color: 'snow', size: 'md' },
+                                text: { name: '更換檔案' },
+                                event: gvc.event(() => {
+                                    document.querySelector('#upload-excel').click();
+                                }),
+                            })}
+                      ${BgWidget.grayNote(vm.fileInput.files[0].name)}
+                    `;
+                        }
+                        else {
+                            return BgWidget.customButton({
+                                button: { color: 'snow', size: 'md' },
+                                text: { name: '新增檔案' },
+                                event: gvc.event(() => {
+                                    document.querySelector('#upload-excel').click();
+                                }),
+                            });
+                        }
+                    })()}
+              </div>
+            </div>
+            <div class="d-flex justify-content-end gap-3" style="padding-right: 20px; padding-bottom: 20px;">
+              ${BgWidget.cancel(gvc.event(() => {
+                        gvc.glitter.closeDiaLog();
+                    }))}
+              ${BgWidget.save(gvc.event(() => {
+                        if (vm.fileInput.files && vm.fileInput.files.length > 0) {
+                            viewData.import.event();
+                        }
+                        else {
+                            dialog.infoMessage({ text: '尚未上傳檔案' });
+                        }
+                    }), '匯入')}
+            </div>
+          `;
+                },
+                divCreate: {
+                    style: 'border-radius: 10px; background: #FFF; width: 570px; min-height: 360px; max-width: 90%;',
+                },
+            });
+        }, vm.id);
+    }
 }
+OrderExcel.importShipmentExample = [
+    {
+        訂單編號: '1241770010001',
+        出貨單號碼: '1249900602345',
+    },
+];
 OrderExcel.headerColumn = {
     訂單: [
         '訂單編號',
@@ -290,6 +537,8 @@ OrderExcel.headerColumn = {
         '收件人信箱',
         '付款方式',
         '配送方式',
+        '收貨地址',
+        '代收金額',
         '出貨單號碼',
         '出貨單日期',
         '發票號碼',