ts-glitter 20.3.7 → 20.4.1

package/lowcode/Entry.js

@@ -29,6 +29,7 @@ export class Entry {
                 return originalReplaceState.apply(history, arguments);
             }
         };
+        window.history.pushState({}, glitter.document.title, location.href);
         function next() {
             var _a, _b;
             if (glitter.getUrlParameter('EndCheckout') === '1') {
@@ -143,7 +144,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_20.3.7';
+            glitter.share.editerVersion = 'V_20.4.1';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -25,6 +25,7 @@ export class Entry {
         return originalReplaceState.apply(history, arguments);
       }
     };
+    window.history.pushState({}, glitter.document.title,location.href);
     function next(){
       //判斷結帳成功清空購物車紀錄
       if (glitter.getUrlParameter('EndCheckout') === '1') {
@@ -144,7 +145,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_20.3.7';
+      glitter.share.editerVersion = 'V_20.4.1';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

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

@@ -610,7 +610,7 @@ export class BgRecommend {
                                                         gvc.notifyDataChange(vm.previewId);
                                                     },
                                                     filter: {
-                                                        page: ['一頁商店', '隱形賣場'],
+                                                        page: ['一頁商店', '隱形賣場', '所有商品'],
                                                     },
                                                 })}`,
                                                 gvc.bindView({

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

@@ -725,7 +725,7 @@ export class BgRecommend {
                                     gvc.notifyDataChange(vm.previewId);
                                   },
                                   filter: {
-                                    page: ['一頁商店', '隱形賣場'],
+                                    page: ['一頁商店', '隱形賣場','所有商品'],
                                   },
                                 })}`,
                               gvc.bindView({

package/lowcode/cms-plugin/product-service.js

@@ -1,6 +1,5 @@
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { ShoppingProductSetting } from './shopping-product-setting.js';
-import { CheckInput } from '../modules/checkInput.js';
 export class ProductService {
     static checkData(postMD, obj, vm, refresh) {
         const gvc = obj.gvc;
@@ -65,10 +64,6 @@ export class ProductService {
                     check: (data) => !data.seo.domain,
                     errorMessage: '未設定商品連結',
                 },
-                {
-                    check: (data) => !CheckInput.isChineseEnglishNumberHyphen(data.seo.domain),
-                    errorMessage: '連結僅限使用中英文數字與連接號',
-                },
             ];
             for (const languageCode of supportedLanguages) {
                 const currentLanguageData = languageData[languageCode];

package/lowcode/cms-plugin/product-service.ts

@@ -77,10 +77,10 @@ export class ProductService {
           check: (data: LanguageData) => !data.seo.domain,
           errorMessage: '未設定商品連結',
         },
-        {
-          check: (data: LanguageData) => !CheckInput.isChineseEnglishNumberHyphen(data.seo.domain),
-          errorMessage: '連結僅限使用中英文數字與連接號',
-        },
+        // {
+        //   check: (data: LanguageData) => !CheckInput.isChineseEnglishNumberHyphen(data.seo.domain),
+        //   errorMessage: '連結僅限使用中英文數字與連接號',
+        // },
       ];
 
       // 遍歷支持的語言並進行驗證

package/lowcode/glitterBundle/module/PageManager.ts

@@ -320,12 +320,13 @@ export class PageManager {
             if (['home', 'page'].find((dd) => {
                 return dd === type
             })) {
+
                 if(glitter.waiting_push_state){
                     glitter.waiting_push_state()
                     glitter.waiting_push_state=undefined
                 }else {
                     window.history.pushState({}, glitter.document.title, (glitter.root_path + Language.getLanguageLinkPrefix()+tag + glitter.window.location.search));
-                }
+                     }
                 glitter.pageConfig[glitter.pageConfig.length - 1].search = glitter.root_path + Language.getLanguageLinkPrefix()+tag + glitter.window.location.search;
             }
 

package/package.json

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

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

@@ -3465,11 +3465,11 @@ class Shopping {
                                     return 'wait';
                                 case '0101':
                                 case '4000':
+                                case '4019':
                                 case '0102':
                                 case '9411':
                                     return 'shipping';
                                 case '0103':
-                                case '4019':
                                 case '4033':
                                 case '4031':
                                 case '4032':
@@ -4758,6 +4758,12 @@ class Shopping {
                 await database_js_1.default.query(`UPDATE \`${this.app}\`.t_variants
            SET ?
            WHERE id = ?`, [{ content: JSON.stringify(data.variant_content) }, data.id]);
+                let variants = (await database_js_1.default.query(`SELECT *
+           FROM \`${this.app}\`.t_variants
+           WHERE product_id = ?`, [data.product_id])).map((dd) => {
+                    return dd.content;
+                });
+                data.product_content.variants = variants;
                 await database_js_1.default.query(`UPDATE \`${this.app}\`.t_manager_post
            SET ?
            WHERE id = ?`, [{ content: JSON.stringify(data.product_content) }, data.product_id]);