ts-glitter 22.0.0 → 22.0.2

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -4163,7 +4163,7 @@ export class ShoppingOrderManager {
                                         return new Promise(resolve => {
                                             ApiUser.getUserList({
                                                 page: 0,
-                                                limit: 99999,
+                                                limit: 999,
                                                 search: data.query,
                                                 only_id: true,
                                             }).then(dd => {

package/lowcode/cms-plugin/shopping-order-manager.ts

@@ -4548,7 +4548,7 @@ export class ShoppingOrderManager {
                                           return new Promise(resolve => {
                                             ApiUser.getUserList({
                                               page: 0,
-                                              limit: 99999,
+                                              limit: 999,
                                               search: data.query,
                                               only_id: true,
                                             }).then(dd => {

package/lowcode/cms-plugin/shopping-rebate.js

@@ -72,7 +72,7 @@ export class ShoppingRebate {
                     return new Promise(resolve => {
                         ApiUser.getUserListOrders({
                             page: 0,
-                            limit: 99999,
+                            limit: 999,
                             search: data.query,
                             orderString: data.orderString,
                             only_id: true,

package/lowcode/cms-plugin/shopping-rebate.ts

@@ -81,7 +81,7 @@ export class ShoppingRebate {
           return new Promise(resolve => {
             ApiUser.getUserListOrders({
               page: 0,
-              limit: 99999,
+              limit: 999,
               search: data.query,
               orderString: data.orderString,
               only_id: true,

package/lowcode/cms-plugin/shopping-setting-basic.js

@@ -333,12 +333,26 @@ export class ShoppingSettingBasic {
                                                     footer_html: (gvc2) => {
                                                         return [
                                                             BgWidget.cancel(gvc2.event(() => {
-                                                                language_data.sub_title = originContent;
-                                                                gvc2.closeDialog();
+                                                                dialog.checkYesOrNot({
+                                                                    text: '確定要取消並關閉嗎？',
+                                                                    callback: bool => {
+                                                                        if (bool) {
+                                                                            language_data.sub_title = originContent;
+                                                                            gvc2.closeDialog();
+                                                                        }
+                                                                    },
+                                                                });
                                                             })),
                                                             BgWidget.save(gvc2.event(() => {
-                                                                gvc2.closeDialog();
-                                                                gvc.notifyDataChange(id);
+                                                                dialog.checkYesOrNot({
+                                                                    text: '確定要儲存並更新嗎？',
+                                                                    callback: bool => {
+                                                                        if (bool) {
+                                                                            gvc2.closeDialog();
+                                                                            gvc.notifyDataChange(id);
+                                                                        }
+                                                                    },
+                                                                });
                                                             })),
                                                         ].join('');
                                                     },
@@ -628,12 +642,26 @@ export class ShoppingSettingBasic {
                                                             footer_html: (gvc2) => {
                                                                 return [
                                                                     BgWidget.cancel(gvc2.event(() => {
-                                                                        language_data.content = originContent;
-                                                                        gvc2.closeDialog();
+                                                                        dialog.checkYesOrNot({
+                                                                            text: '確定要取消並關閉嗎？',
+                                                                            callback: bool => {
+                                                                                if (bool) {
+                                                                                    language_data.content = originContent;
+                                                                                    gvc2.closeDialog();
+                                                                                }
+                                                                            },
+                                                                        });
                                                                     })),
                                                                     BgWidget.save(gvc2.event(() => {
-                                                                        gvc2.closeDialog();
-                                                                        gvc.notifyDataChange(id);
+                                                                        dialog.checkYesOrNot({
+                                                                            text: '確定要儲存並更新嗎？',
+                                                                            callback: bool => {
+                                                                                if (bool) {
+                                                                                    gvc2.closeDialog();
+                                                                                    gvc.notifyDataChange(id);
+                                                                                }
+                                                                            },
+                                                                        });
                                                                     })),
                                                                 ].join('');
                                                             },

package/lowcode/cms-plugin/shopping-setting-basic.ts

@@ -397,14 +397,28 @@ export class ShoppingSettingBasic {
                                         return [
                                           BgWidget.cancel(
                                             gvc2.event(() => {
-                                              language_data.sub_title = originContent;
-                                              gvc2.closeDialog();
+                                              dialog.checkYesOrNot({
+                                                text: '確定要取消並關閉嗎？',
+                                                callback: bool => {
+                                                  if (bool) {
+                                                    language_data.sub_title = originContent;
+                                                    gvc2.closeDialog();
+                                                  }
+                                                },
+                                              });
                                             })
                                           ),
                                           BgWidget.save(
                                             gvc2.event(() => {
-                                              gvc2.closeDialog();
-                                              gvc.notifyDataChange(id);
+                                              dialog.checkYesOrNot({
+                                                text: '確定要儲存並更新嗎？',
+                                                callback: bool => {
+                                                  if (bool) {
+                                                    gvc2.closeDialog();
+                                                    gvc.notifyDataChange(id);
+                                                  }
+                                                },
+                                              });
                                             })
                                           ),
                                         ].join('');
@@ -746,14 +760,28 @@ export class ShoppingSettingBasic {
                                               return [
                                                 BgWidget.cancel(
                                                   gvc2.event(() => {
-                                                    language_data.content = originContent;
-                                                    gvc2.closeDialog();
+                                                    dialog.checkYesOrNot({
+                                                      text: '確定要取消並關閉嗎？',
+                                                      callback: bool => {
+                                                        if (bool) {
+                                                          language_data.content = originContent;
+                                                          gvc2.closeDialog();
+                                                        }
+                                                      },
+                                                    });
                                                   })
                                                 ),
                                                 BgWidget.save(
                                                   gvc2.event(() => {
-                                                    gvc2.closeDialog();
-                                                    gvc.notifyDataChange(id);
+                                                    dialog.checkYesOrNot({
+                                                      text: '確定要儲存並更新嗎？',
+                                                      callback: bool => {
+                                                        if (bool) {
+                                                          gvc2.closeDialog();
+                                                          gvc.notifyDataChange(id);
+                                                        }
+                                                      },
+                                                    });
                                                   })
                                                 ),
                                               ].join('');

package/lowcode/glitter-base/route/shopping.js

@@ -336,15 +336,22 @@ export class ApiShop {
         });
     }
     static getWishList() {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/ec/wishlist?page=0&limit=200`,
-            type: 'get',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: GlobalUser.token,
-            },
-        });
+        if (!GlobalUser.token) {
+            return new Promise((resolve, reject) => {
+                resolve({ result: false, response: null });
+            });
+        }
+        else {
+            return BaseApi.create({
+                url: getBaseUrl() + `/api-public/v1/ec/wishlist?page=0&limit=200`,
+                type: 'get',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'g-app': getConfig().config.appName,
+                    Authorization: GlobalUser.token,
+                },
+            });
+        }
     }
     static checkWishList(product_id) {
         return BaseApi.create({

package/lowcode/glitter-base/route/shopping.ts

@@ -360,16 +360,22 @@ export class ApiShop {
     });
   }
 
-  static getWishList() {
-    return BaseApi.create({
-      url: getBaseUrl() + `/api-public/v1/ec/wishlist?page=0&limit=200`,
-      type: 'get',
-      headers: {
-        'Content-Type': 'application/json',
-        'g-app': getConfig().config.appName,
-        Authorization: GlobalUser.token,
-      },
-    });
+  static getWishList():Promise<{result:boolean,response:any}> {
+    if(!GlobalUser.token){
+      return  new Promise((resolve, reject) => {
+        resolve({result:false,response:null})
+      })
+    }else{
+      return BaseApi.create({
+        url: getBaseUrl() + `/api-public/v1/ec/wishlist?page=0&limit=200`,
+        type: 'get',
+        headers: {
+          'Content-Type': 'application/json',
+          'g-app': getConfig().config.appName,
+          Authorization: GlobalUser.token,
+        },
+      });
+    }
   }
 
   static checkWishList(product_id: string) {

package/lowcode/glitter-base/route/user.js

@@ -24,6 +24,13 @@ export class ApiUser {
                 data: JSON.stringify(json),
             });
             if (res_.result) {
+                try {
+                    GlobalUser.token = res_.response.token;
+                    GlobalUser.userInfo = res_.response;
+                    GlobalUser.updateUserData = JSON.parse(JSON.stringify(res_.response));
+                }
+                catch (e) {
+                }
                 Ad.gtagEvent('sign_up', {
                     method: 'normal'
                 });
@@ -82,15 +89,25 @@ export class ApiUser {
         });
     }
     static getUserData(token, type) {
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/user?type=${type}`,
-            type: 'GET',
-            headers: {
-                'g-app': getConfig().config.appName,
-                'Content-Type': 'application/json',
-                Authorization: token,
-            },
-        });
+        if (!token) {
+            return new Promise((resolve, reject) => {
+                resolve({
+                    response: {},
+                    result: false
+                });
+            });
+        }
+        else {
+            return BaseApi.create({
+                url: getBaseUrl() + `/api-public/v1/user?type=${type}`,
+                type: 'GET',
+                headers: {
+                    'g-app': getConfig().config.appName,
+                    'Content-Type': 'application/json',
+                    Authorization: token,
+                },
+            });
+        }
     }
     static getUserLevel(token, user_id) {
         return BaseApi.create({
@@ -571,6 +588,13 @@ export class ApiUser {
                 data: JSON.stringify(json),
             });
             if (res_.response.create_user_success) {
+                try {
+                    GlobalUser.token = res_.response.token;
+                    GlobalUser.userInfo = res_.response;
+                    GlobalUser.updateUserData = JSON.parse(JSON.stringify(res_.response));
+                }
+                catch (e) {
+                }
                 Ad.gtagEvent('sign_up', {
                     method: json.login_type || 'normal'
                 });

package/lowcode/glitter-base/route/user.ts

@@ -4,6 +4,7 @@ import { ApiShop } from './shopping.js';
 import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
 import { Ad } from '../../public-components/public/ad.js';
 
+
 export class ApiUser {
   public static register(json: { account: string; pwd: string; userData: any }) {
     return new Promise<{ result: boolean; response: any }>(async (resolve, reject) => {
@@ -88,16 +89,26 @@ export class ApiUser {
     });
   }
 
-  public static getUserData(token: string, type: 'list' | 'me') {
-    return BaseApi.create({
-      url: getBaseUrl() + `/api-public/v1/user?type=${type}`,
-      type: 'GET',
-      headers: {
-        'g-app': getConfig().config.appName,
-        'Content-Type': 'application/json',
-        Authorization: token,
-      },
-    });
+  public static getUserData(token: string, type: 'list' | 'me'):Promise<{response:any,result:boolean}> {
+    if(!token){
+      return  new Promise((resolve, reject)=>{
+        resolve({
+          response:{},
+          result:false
+        })
+      })
+    }else{
+      return BaseApi.create({
+        url: getBaseUrl() + `/api-public/v1/user?type=${type}`,
+        type: 'GET',
+        headers: {
+          'g-app': getConfig().config.appName,
+          'Content-Type': 'application/json',
+          Authorization: token,
+        },
+      });
+    }
+
   }
 
   public static getUserLevel(token: string, user_id: string) {

package/lowcode/glitterBundle/plugins/editor-elem.js

@@ -966,7 +966,7 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
             return {
                 bind: id,
                 view: () => {
-                    return new Promise((resolve, reject) => {
+                    return new Promise(resolve => {
                         window.glitter.getModule(obj.gvc.glitter.root_path + `backend-manager/bg-widget.js`, (BgWidget) => __awaiter(this, void 0, void 0, function* () {
                             var _a;
                             resolve(html `
@@ -1009,9 +1009,6 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
                     style: `${obj.style || `overflow-y: auto;`}position:relative;`,
                 },
                 onCreate: () => {
-                    let loading = true;
-                    let delay = true;
-                    let loadingView = false;
                     const interval = setInterval(() => {
                         if (glitter.window.FroalaEditor && !glitter.share.richTextRendering) {
                             clearInterval(interval);
@@ -1176,7 +1173,6 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
                                             return;
                                         }
                                         else {
-                                            loadingView = false;
                                             const target = glitter.document
                                                 .querySelector(`#` + richID)
                                                 .querySelector(`[data-cmd="insertImage"]`);

package/lowcode/glitterBundle/plugins/editor-elem.ts

@@ -1128,7 +1128,7 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
       return {
         bind: id,
         view: () => {
-          return new Promise((resolve, reject) => {
+          return new Promise(resolve => {
             (window as any).glitter.getModule(
               obj.gvc.glitter.root_path + `backend-manager/bg-widget.js`,
               async (BgWidget: any) => {
@@ -1174,9 +1174,6 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
           style: `${obj.style || `overflow-y: auto;`}position:relative;`,
         },
         onCreate: () => {
-          let loading = true;
-          let delay = true;
-          let loadingView = false;
           const interval = setInterval(() => {
             if ((glitter.window as any).FroalaEditor && !glitter.share.richTextRendering) {
               clearInterval(interval);
@@ -1384,7 +1381,6 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
                       }, 300);
                       return;
                     } else {
-                      loadingView = false;
                       const target: any = glitter.document
                         .querySelector(`#` + richID)
                         .querySelector(`[data-cmd="insertImage"]`);

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

@@ -34,10 +34,10 @@ export class Ad {
                     }
                     const obj = {};
                     if (GlobalUser.userInfo.email) {
-                        obj.email = yield hashSHA256(GlobalUser.userInfo.email);
+                        obj.em = yield hashSHA256(GlobalUser.userInfo.email);
                     }
                     if (GlobalUser.userInfo.phone) {
-                        obj.phone = yield hashSHA256(GlobalUser.userInfo.phone);
+                        obj.ph = yield hashSHA256(GlobalUser.userInfo.phone);
                     }
                     fbq('init', window.fb_pixel_id, obj);
                 }

package/package.json

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

package/src/api-public/services/checkout-event.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };