ts-glitter 19.1.4 → 19.1.5

package/lowcode/Entry.js

@@ -132,7 +132,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_19.1.4';
+        glitter.share.editerVersion = 'V_19.1.5';
         glitter.share.start = new Date();
         const vm = { appConfig: [] };
         window.saasConfig = {

package/lowcode/Entry.ts

@@ -132,7 +132,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_19.1.4';
+        glitter.share.editerVersion = 'V_19.1.5';
         glitter.share.start = new Date();
         const vm = { appConfig: [] };
         (window as any).saasConfig = {

package/lowcode/cms-plugin/cms-router.js

@@ -27,15 +27,11 @@ export class CmsRouter {
                                 break;
                             case 'fb_live':
                             case 'ig_live':
+                            case 'line_plus':
                                 resolve(`<div class="d-flex w-100 align-items-center justify-content-center">
-<div class="insignia insignia-warning">功能優化中，預計於3月14號重新開放!</div>
+<div class="insignia insignia-warning">功能優化中，預計於4月1號重新開放!</div>
 </div>`);
                                 break;
-                            case 'line_plus':
-                                gvc.glitter.getModule(new URL('./cms-plugin/live_capture.js', gvc.glitter.root_path).href, (cl) => {
-                                    resolve(cl.main(gvc, true));
-                                });
-                                break;
                             case 'shipment_list':
                             case 'shipment_list_archive':
                                 gvc.glitter.getModule(new URL('./cms-plugin/shopping-order-manager.js', gvc.glitter.root_path).href, (cl) => {

package/lowcode/cms-plugin/cms-router.ts

@@ -32,16 +32,17 @@ export class CmsRouter{
                                break
                            case 'fb_live':
                            case 'ig_live':
+                           case 'line_plus':
                                resolve(`<div class="d-flex w-100 align-items-center justify-content-center">
-<div class="insignia insignia-warning">功能優化中，預計於3月14號重新開放!</div>
+<div class="insignia insignia-warning">功能優化中，預計於4月1號重新開放!</div>
 </div>`)
                                break
-                           case 'line_plus':
 
-                               gvc.glitter.getModule(new URL('./cms-plugin/live_capture.js', gvc.glitter.root_path).href, (cl) => {
-                                   resolve(cl.main(gvc,true))
-                               });
-                               break
+
+                               // gvc.glitter.getModule(new URL('./cms-plugin/live_capture.js', gvc.glitter.root_path).href, (cl) => {
+                               //     resolve(cl.main(gvc,true))
+                               // });
+                               // break
                            case 'shipment_list':
                            case 'shipment_list_archive':
                                gvc.glitter.getModule(new URL('./cms-plugin/shopping-order-manager.js', gvc.glitter.root_path).href, (cl) => {

package/lowcode/cms-plugin/filter-options.js

@@ -136,25 +136,7 @@ export class FilterOptions {
         });
     }
     static getOrderFunnel() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const saasConfig = window.parent.saasConfig;
-            const response = yield saasConfig.api.getPrivateConfig(saasConfig.config.appName, 'logistics_setting');
-            let configData = ((_a = response.response.result[0]) === null || _a === void 0 ? void 0 : _a.value) || {};
-            if (!configData.language_data) {
-                configData.language_data = {
-                    'en-US': { info: '' },
-                    'zh-CN': { info: '' },
-                    'zh-TW': { info: configData.info || '' },
-                };
-            }
-            const shipmentOptions = ShipmentConfig.list
-                .map(dd => {
-                return { key: dd.value, name: dd.title };
-            })
-                .concat(((_b = configData.custom_delivery) !== null && _b !== void 0 ? _b : []).map((dd) => {
-                return { key: dd.id, name: dd.name };
-            }));
             return [
                 { key: 'orderStatus', type: 'multi_checkbox', name: '訂單狀態', data: this.orderStatusOptions },
                 { key: 'payload', type: 'multi_checkbox', name: '付款狀態', data: this.payloadStatusOptions },
@@ -167,7 +149,9 @@ export class FilterOptions {
                         return dd;
                     }) },
                 { key: 'progress', type: 'multi_checkbox', name: '出貨狀況', data: this.progressOptions },
-                { key: 'shipment', type: 'multi_checkbox', name: '運送方式', data: shipmentOptions },
+                { key: 'shipment', type: 'multi_checkbox', name: '運送方式', data: yield ShipmentConfig.shipmentMethod({
+                        type: 'support'
+                    }) },
                 {
                     key: 'created_time',
                     type: 'during',

package/lowcode/cms-plugin/filter-options.ts

@@ -227,30 +227,7 @@ export class FilterOptions {
   ];
 
   static async getOrderFunnel() {
-    const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
-    const response: { response: any; result: boolean } = await saasConfig.api.getPrivateConfig(
-      saasConfig.config.appName,
-      'logistics_setting'
-    );
-
-    let configData: any = response.response.result[0]?.value || {};
-    if (!configData.language_data) {
-      configData.language_data = {
-        'en-US': { info: '' },
-        'zh-CN': { info: '' },
-        'zh-TW': { info: configData.info || '' },
-      };
-    }
 
-    const shipmentOptions = ShipmentConfig.list
-      .map(dd => {
-        return { key: dd.value, name: dd.title };
-      })
-      .concat(
-        (configData.custom_delivery ?? []).map((dd: any) => {
-          return { key: dd.id, name: dd.name };
-        })
-      );
 
 
     return [
@@ -265,7 +242,9 @@ dd.name=`<div class="d-flex">${[BgWidget.warningInsignia('POS'),name].join(`<div
         return dd
         }) },
       { key: 'progress', type: 'multi_checkbox', name: '出貨狀況', data: this.progressOptions },
-      { key: 'shipment', type: 'multi_checkbox', name: '運送方式', data: shipmentOptions },
+      { key: 'shipment', type: 'multi_checkbox', name: '運送方式', data: await ShipmentConfig.shipmentMethod({
+          type:'support'
+        })},
       {
         key: 'created_time',
         type: 'during',

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

@@ -92,7 +92,9 @@ export class OrderExcel {
             }
             const XLSX = yield Excel.loadXLSX(gvc);
             const [shipment_methods, payment_methods] = yield Promise.all([
-                ShipmentConfig.allShipmentMethod(),
+                ShipmentConfig.shipmentMethod({
+                    type: 'all'
+                }),
                 PaymentConfig.getSupportPayment(true),
             ]);
             const showLineItems = this.headerColumn['商品'].some(a => column.includes(a));

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

@@ -167,7 +167,9 @@ export class OrderExcel {
 
     // 取得琣送與付款方式設定檔
     const [shipment_methods, payment_methods] = await Promise.all([
-      ShipmentConfig.allShipmentMethod(),
+      ShipmentConfig.shipmentMethod({
+        type:'all'
+      }),
       PaymentConfig.getSupportPayment(true),
     ]);