ts-glitter 18.3.9 → 18.4.0

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.3.9';
+        glitter.share.editerVersion = 'V_18.4.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.3.9';
+        glitter.share.editerVersion = 'V_18.4.0';
         glitter.share.start = new Date();
         const vm = { appConfig: [] };
         (window as any).saasConfig = {

package/lowcode/public-components/public/ad.js

@@ -1,4 +1,4 @@
-import { ApiTrack } from "../../glitter-base/route/api-track.js";
+import { ApiTrack } from '../../glitter-base/route/api-track.js';
 export class Ad {
     static gtagEvent(name, obj) {
         const gtag = window.gtag;
@@ -13,7 +13,7 @@ export class Ad {
         }
         ApiTrack.track({
             event_name: name,
-            custom_data: obj
+            custom_data: obj,
         });
     }
 }

package/lowcode/public-components/public/ad.ts

@@ -1,22 +1,21 @@
-import {ApiTrack} from "../../glitter-base/route/api-track.js";
+import { ApiTrack } from '../../glitter-base/route/api-track.js';
 
 export class Ad {
-    static gtagEvent(name: string, obj: any) {
-        const gtag = (window as any).gtag;
-        if (gtag) {
-            gtag('event', name, obj);
-        }
+  static gtagEvent(name: string, obj: any) {
+    const gtag = (window as any).gtag;
+    if (gtag) {
+      gtag('event', name, obj);
     }
+  }
 
-    static fbqEvent(name: string, obj: any) {
-        const fbq = (window as any).fbq;
-        if (fbq) {
-            fbq('track', name, obj);
-        }
-        // alert('12')
-        ApiTrack.track({
-            event_name: name,
-            custom_data: obj
-        })
+  static fbqEvent(name: string, obj: any) {
+    const fbq = (window as any).fbq;
+    if (fbq) {
+      fbq('track', name, obj);
     }
+    ApiTrack.track({
+      event_name: name,
+      custom_data: obj,
+    });
+  }
 }

package/package.json

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

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

@@ -369,7 +369,7 @@ class Shopping {
                         content.min_price = Infinity;
                         content.max_price = Number.MIN_VALUE;
                         (content.variants || []).forEach((variant) => {
-                            var _a, _b;
+                            var _a, _b, _c, _d;
                             variant.stock = 0;
                             variant.sold_out = variant.sold_out || 0;
                             variant.preview_image = (_a = variant.preview_image) !== null && _a !== void 0 ? _a : '';
@@ -387,6 +387,14 @@ class Shopping {
                             if (variant.preview_image === 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg') {
                                 variant.preview_image = (_b = content.preview_image) === null || _b === void 0 ? void 0 : _b[0];
                             }
+                            if (!((_c = variant.preview_image) !== null && _c !== void 0 ? _c : '').includes('http')) {
+                                variant.preview_image = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg';
+                            }
+                            ((_d = content.preview_image) !== null && _d !== void 0 ? _d : []).map((dd, index) => {
+                                if (!dd.includes('http')) {
+                                    content.preview_image[index] = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg';
+                                }
+                            });
                             Object.entries(variant.stockList || {}).forEach(([storeId, stockData]) => {
                                 if (!store_config.list.some((store) => store.id === storeId) || !(stockData === null || stockData === void 0 ? void 0 : stockData.count)) {
                                     delete variant.stockList[storeId];
@@ -729,25 +737,30 @@ class Shopping {
                           CAST(JSON_EXTRACT(v.content, '$.stock') AS UNSIGNED) as stock,
                           JSON_EXTRACT(v.content, '$.stockList')               as stockList
                    from (\`${this.app}\`.t_variants as v)
-                   where product_id  in (select id
-                                            from \`${this.app}\`.t_manager_post
-                                            where ((content ->>'$.product_category' is null) or
-                                                   (content ->>'$.product_category' != 'kitchen'))) and ${querySql.join(' and ')} ${query.order_by || `order by id desc`}`;
+                   where product_id in (select id
+                                        from \`${this.app}\`.t_manager_post
+                                        where ((content ->>'$.product_category' is null) or
+                                               (content ->>'$.product_category' != 'kitchen')))
+                     and ${querySql.join(' and ')} ${query.order_by || `order by id desc`}`;
         query.limit = query.limit && query.limit > 999 ? 999 : query.limit;
         const limitSQL = `limit ${query.page * query.limit} , ${query.limit}`;
         if (query.id) {
             const data = (await database_js_1.default.query(`SELECT *
                      FROM (${sql}) as subqyery ${limitSQL}
                     `, []))[0];
-            data.product_content = (await database_js_1.default.query(`select * from \`${this.app}\`.t_manager_post where id = ${data.product_id}`, []))[0]['content'];
+            data.product_content = (await database_js_1.default.query(`select *
+                                                    from \`${this.app}\`.t_manager_post
+                                                    where id = ${data.product_id}`, []))[0]['content'];
             return { data: data, result: !!data };
         }
         else {
             const vData = await database_js_1.default.query(`SELECT *
-                     FROM (${sql}) as subqyery ${limitSQL}
-                    `, []);
+                 FROM (${sql}) as subqyery ${limitSQL}
+                `, []);
             await Promise.all(vData.map(async (data) => {
-                data.product_content = (await database_js_1.default.query(`select * from \`${this.app}\`.t_manager_post where id = ${data.product_id}`, []))[0]['content'];
+                data.product_content = (await database_js_1.default.query(`select *
+                                                        from \`${this.app}\`.t_manager_post
+                                                        where id = ${data.product_id}`, []))[0]['content'];
             }));
             return {
                 data: vData,
@@ -1122,7 +1135,7 @@ class Shopping {
                 shipment_selector: shipment_config_js_1.ShipmentConfig.list.map((dd) => {
                     return {
                         name: dd.title,
-                        value: dd.value
+                        value: dd.value,
                     };
                 })
                     .concat(((_h = shipment_setting.custom_delivery) !== null && _h !== void 0 ? _h : []).map((dd) => {
@@ -1152,7 +1165,7 @@ class Shopping {
                 pos_info: data.pos_info,
                 client_ip_address: data.client_ip_address,
                 fbc: data.fbc,
-                fbp: data.fbp
+                fbp: data.fbp,
             };
             if (!data.user_info.name && userData && userData.userData) {
                 carData.user_info.name = userData.userData.name;
@@ -1190,7 +1203,7 @@ class Shopping {
                         status: 'inRange',
                         channel: data.checkOutType === 'POS' ? (data.isExhibition ? 'exhibition' : 'pos') : undefined,
                         whereStore: data.checkOutType === 'POS' ? data.pos_store : undefined,
-                        setUserID: `${(userData === null || userData === void 0 ? void 0 : userData.userID) || ''}`
+                        setUserID: `${(userData === null || userData === void 0 ? void 0 : userData.userID) || ''}`,
                     })).data;
                     if (pdDqlData) {
                         const pd = pdDqlData.content;
@@ -1553,9 +1566,9 @@ class Shopping {
                     }
                 }
                 const sum = (await database_js_1.default.query(`SELECT sum(money)
-                                 FROM \`${this.app}\`.t_wallet
-                                 WHERE status in (1, 2)
-                                   and userID = ?`, [userData.userID]))[0]['sum(money)'] || 0;
+                             FROM \`${this.app}\`.t_wallet
+                             WHERE status in (1, 2)
+                               and userID = ?`, [userData.userID]))[0]['sum(money)'] || 0;
                 carData.use_wallet = sum < carData.total ? sum : carData.total;
             }
             if (type === 'manual') {
@@ -1588,7 +1601,7 @@ class Shopping {
                     counting: 'single',
                     conditionType: 'item',
                     device: ['normal'],
-                    productOffStart: 'price_all'
+                    productOffStart: 'price_all',
                 };
                 carData.discount = data.discount;
                 carData.voucherList = [tempVoucher];
@@ -1682,7 +1695,7 @@ class Shopping {
                 await order_event_js_1.OrderEvent.insertOrder({
                     cartData: carData,
                     status: 1,
-                    app: this.app
+                    app: this.app,
                 });
                 if (carData.use_wallet > 0) {
                     new invoice_js_1.Invoice(this.app).postCheckoutInvoice(carData.orderID, false);
@@ -1755,7 +1768,7 @@ class Shopping {
                         await order_event_js_1.OrderEvent.insertOrder({
                             cartData: carData,
                             status: 0,
-                            app: this.app
+                            app: this.app,
                         });
                         await Promise.all(saveStockArray.map((dd) => {
                             return dd();
@@ -2513,7 +2526,7 @@ class Shopping {
                 let orderArray = query.orderStatus.split(',');
                 let temp = '';
                 if (orderArray.includes('0')) {
-                    temp += "JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) IS NULL OR ";
+                    temp += 'JSON_UNQUOTE(JSON_EXTRACT(orderData, \'$.orderStatus\')) IS NULL OR ';
                 }
                 temp += `JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) IN (${query.orderStatus})`;
                 querySql.push(`(${temp})`);
@@ -2525,7 +2538,7 @@ class Shopping {
                 let newArray = query.progress.split(',');
                 let temp = '';
                 if (newArray.includes('wait')) {
-                    temp += "JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.progress')) IS NULL OR ";
+                    temp += 'JSON_UNQUOTE(JSON_EXTRACT(orderData, \'$.progress\')) IS NULL OR ';
                 }
                 temp += `JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.progress')) IN (${newArray.map((status) => `"${status}"`).join(',')})`;
                 querySql.push(`(${temp})`);
@@ -2546,7 +2559,7 @@ class Shopping {
                 let shipment = query.shipment.split(',');
                 let temp = '';
                 if (shipment.includes('normal')) {
-                    temp += "JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.user_info.shipment')) IS NULL OR ";
+                    temp += 'JSON_UNQUOTE(JSON_EXTRACT(orderData, \'$.user_info.shipment\')) IS NULL OR ';
                 }
                 temp += `JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.user_info.shipment')) IN (${shipment.map((status) => `"${status}"`).join(',')})`;
                 querySql.push(`(${temp})`);
@@ -2569,10 +2582,10 @@ class Shopping {
                         orderString = 'order by created_time asc';
                         break;
                     case 'order_total_desc':
-                        orderString = "order by CAST(JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.total')) AS SIGNED) desc";
+                        orderString = 'order by CAST(JSON_UNQUOTE(JSON_EXTRACT(orderData, \'$.total\')) AS SIGNED) desc';
                         break;
                     case 'order_total_asc':
-                        orderString = "order by CAST(JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.total')) AS SIGNED) asc";
+                        orderString = 'order by CAST(JSON_UNQUOTE(JSON_EXTRACT(orderData, \'$.total\')) AS SIGNED) asc';
                         break;
                 }
             }
@@ -2630,7 +2643,7 @@ class Shopping {
             const response_data = await new Promise(async (resolve, reject) => {
                 if (query.id) {
                     const data = (await database_js_1.default.query(`SELECT *
-                         FROM (${sql}) as subqyery limit ${query.page * query.limit}, ${query.limit}`, []))[0];
+                             FROM (${sql}) as subqyery limit ${query.page * query.limit}, ${query.limit}`, []))[0];
                     resolve({
                         data: data,
                         result: !!data,
@@ -2639,9 +2652,9 @@ class Shopping {
                 else {
                     resolve({
                         data: await database_js_1.default.query(`SELECT *
-                         FROM (${sql}) as subqyery limit ${query.page * query.limit}, ${query.limit}`, []),
+                             FROM (${sql}) as subqyery limit ${query.page * query.limit}, ${query.limit}`, []),
                         total: (await database_js_1.default.query(`SELECT count(1)
-                             FROM (${sql}) as subqyery`, []))[0]['count(1)'],
+                                 FROM (${sql}) as subqyery`, []))[0]['count(1)'],
                     });
                 }
             });
@@ -2737,7 +2750,10 @@ class Shopping {
                          FROM \`${this.app}\`.t_checkout
                          WHERE cart_token = ?;`, [order_id]))[0];
                 const brandAndMemberType = await app_js_1.App.checkBrandAndMemberType(this.app);
-                const store_info = await new user_js_1.User(this.app).getConfigV2({ key: 'store-information', user_id: 'manager' });
+                const store_info = await new user_js_1.User(this.app).getConfigV2({
+                    key: 'store-information',
+                    user_id: 'manager',
+                });
                 for (const b of order_data['orderData'].lineItems) {
                     this.calcSoldOutStock(b.count, b.id, b.spec);
                     this.soldMailNotice({
@@ -2923,7 +2939,7 @@ class Shopping {
                 const insertData = await database_js_1.default.query(`INSERT INTO \`${this.app}\`.t_variants
                                                    SET ?`, [{
                         content: JSON.stringify(variant),
-                        product_id: content.id
+                        product_id: content.id,
                     }]);
                 const originalVariant = originVariants.find((item) => JSON.parse(item.spec).join(',') === variant.spec.join(','));
                 if (originalVariant) {
@@ -3556,10 +3572,10 @@ class Shopping {
             if (content.shopee_id) {
                 await new shopee_1.Shopee(this.app, this.token).asyncStockToShopee({
                     product: {
-                        content: content
+                        content: content,
                     },
                     callback: () => {
-                    }
+                    },
                 });
             }
             return content.insertId;