ts-glitter 14.7.4 → 14.7.5

package/lowcode/Entry.js

@@ -80,7 +80,7 @@ export class Entry {
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_14.7.4';
+        glitter.share.editerVersion = 'V_14.7.5';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -82,7 +82,7 @@ export class Entry {
 
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_14.7.4';
+        glitter.share.editerVersion = 'V_14.7.5';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

package/package.json

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

package/src/api-public/services/shopping.d.ts

@@ -143,7 +143,7 @@ export declare class Shopping {
         type: string;
         divisor: number;
         executionTime: string;
-        queryStatus: "error" | "success";
+        queryStatus: "success" | "error";
         queryData: any;
     } | {
         type: string;

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

@@ -439,8 +439,8 @@ class Shopping {
     async querySqlByVariants(querySql, query) {
         let sql = `SELECT v.id,
                           v.product_id,
-                          v.content                                            as variant_content,
-                          p.content                                            as product_content,
+                          v.content as                                            variant_content,
+                          p.content as                                            product_content,
                           CAST(JSON_EXTRACT(v.content, '$.stock') AS UNSIGNED) as stock
                    FROM \`${this.app}\`.t_variants AS v
                             JOIN
@@ -825,7 +825,8 @@ class Shopping {
                         }
                     }
                 }
-                catch (e) { }
+                catch (e) {
+                }
             }
             carData.shipment_fee = (() => {
                 let total_volume = 0;
@@ -885,7 +886,8 @@ class Shopping {
                             carData.lineItems.push(dd);
                         }
                     }
-                    catch (e) { }
+                    catch (e) {
+                    }
                 });
                 await this.checkVoucher(carData);
                 let can_add_gift = [];
@@ -2795,17 +2797,17 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
             await new Promise((resolve, reject) => {
                 for (let index = 0; index < 14; index++) {
                     const monthCheckoutSQL = `
-                    SELECT orderData
-                    FROM \`${this.app}\`.t_checkout
-                    WHERE
-                        DAY (created_time) = DAY (DATE_SUB(NOW()
-                        , INTERVAL ${index} DAY))
-                      AND MONTH (created_time) = MONTH (DATE_SUB(NOW()
-                        , INTERVAL ${index} DAY))
-                      AND YEAR (created_time) = YEAR (DATE_SUB(NOW()
-                        , INTERVAL ${index} DAY))
-                      AND status = 1;
-                `;
+                        SELECT orderData
+                        FROM \`${this.app}\`.t_checkout
+                        WHERE
+                            DAY (created_time) = DAY (DATE_SUB(NOW()
+                            , INTERVAL ${index} DAY))
+                          AND MONTH (created_time) = MONTH (DATE_SUB(NOW()
+                            , INTERVAL ${index} DAY))
+                          AND YEAR (created_time) = YEAR (DATE_SUB(NOW()
+                            , INTERVAL ${index} DAY))
+                          AND status = 1;
+                    `;
                     database_js_1.default.query(monthCheckoutSQL, []).then((data) => {
                         pass++;
                         let total = 0;
@@ -3102,14 +3104,18 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
         var _a, _b;
         content.seo = (_a = content.seo) !== null && _a !== void 0 ? _a : {};
         content.seo.domain = content.seo.domain || content.title;
-        const find_conflict = await database_js_1.default.query(`select count(1)
-             from \`${this.app}\`.\`t_manager_post\`
-             where (content ->>'$.seo.domain'='${decodeURIComponent(content.seo.domain)}')`, []);
-        if (find_conflict[0]['count(1)'] > 0) {
-            throw exception_js_1.default.BadRequestError('BAD_REQUEST', 'DOMAIN ALREADY EXISTS:', {
-                message: '網域已被使用',
-                code: '733',
-            });
+        const language = await app_js_1.App.getSupportLanguage(this.app);
+        for (const b of language) {
+            const find_conflict = await database_js_1.default.query(`select count(1)
+                 from \`${this.app}\`.\`t_manager_post\`
+                 where content->>'$.language_data."${b}".seo.domain'='${decodeURIComponent(content.language_data[b].seo.domain)}'
+                  `, []);
+            if (find_conflict[0]['count(1)'] > 0) {
+                throw exception_js_1.default.BadRequestError('BAD_REQUEST', 'DOMAIN ALREADY EXISTS:', {
+                    message: '網域已被使用',
+                    code: '733',
+                });
+            }
         }
         try {
             content.type = 'product';
@@ -3225,15 +3231,18 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
         await Promise.all(promises);
     }
     async putProduct(content) {
-        const find_conflict = await database_js_1.default.query(`select count(1)
-             from \`${this.app}\`.\`t_manager_post\`
-             where (content ->>'$.seo.domain'='${decodeURIComponent(content.seo.domain)}')
-               and id != ${content.id}`, []);
-        if (find_conflict[0]['count(1)'] > 0) {
-            throw exception_js_1.default.BadRequestError('BAD_REQUEST', 'DOMAIN ALREADY EXISTS:', {
-                message: '網域已被使用',
-                code: '733',
-            });
+        const language = await app_js_1.App.getSupportLanguage(this.app);
+        for (const b of language) {
+            const find_conflict = await database_js_1.default.query(`select count(1)
+                 from \`${this.app}\`.\`t_manager_post\`
+                 where content->>'$.language_data."${b}".seo.domain'='${decodeURIComponent(content.language_data[b].seo.domain)}'
+                   and id != ${content.id}`, []);
+            if (find_conflict[0]['count(1)'] > 0) {
+                throw exception_js_1.default.BadRequestError('BAD_REQUEST', 'DOMAIN ALREADY EXISTS:', {
+                    message: '網域已被使用',
+                    code: '733',
+                });
+            }
         }
         try {
             content.type = 'product';