ts-glitter 16.5.4 → 16.5.6

package/lowcode/Entry.js

@@ -79,7 +79,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_16.5.4';
+        glitter.share.editerVersion = 'V_16.5.6';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -78,7 +78,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_16.5.4';
+        glitter.share.editerVersion = 'V_16.5.6';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

package/lowcode/cms-plugin/POS-setting.js

@@ -252,65 +252,75 @@ height: 51px;
             return {
                 bind: id,
                 view: () => __awaiter(this, void 0, void 0, function* () {
-                    let [initial, res, member_auth, store_list] = yield Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
-                            app: gvc.glitter.getUrlParameter('app-id'),
-                            token: GlobalUser.saas_token,
-                        }), ApiUser.getPermission({
-                            page: 0,
-                            limit: 100
-                        }), ApiUser.getPublicConfig('store_manager', 'manager')]);
-                    member_auth = member_auth.response.data.filter((dd) => {
-                        return dd.invited && dd.status;
-                    });
-                    store_list = store_list.response.value.list;
-                    glitter.share.store_list = store_list;
-                    glitter.share.member_auth_list = member_auth;
-                    glitter.share.editorViewModel.app_config_original;
                     try {
-                        const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID;
-                        const find_ = member_auth.find((dd) => {
-                            return `${dd.user}` === `${login_user}`;
+                        let [initial, res, member_auth, store_list] = yield Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
+                                app: gvc.glitter.getUrlParameter('app-id'),
+                                token: GlobalUser.saas_token,
+                            }), ApiUser.getPermission({
+                                page: 0,
+                                limit: 100
+                            }), ApiUser.getPublicConfig('store_manager', 'manager')]);
+                        member_auth = member_auth.response.data.filter((dd) => {
+                            return dd.invited && dd.status;
                         });
-                        POSSetting.config.who = find_.user;
-                    }
-                    catch (e) {
-                    }
-                    const member_auth_ = member_auth.find((dd) => {
-                        return `${dd.user}` === `${POSSetting.config.who}`;
-                    });
-                    member_auth_.config.support_shop = member_auth_.config.support_shop.filter((dd) => {
-                        return store_list.find((d1) => {
-                            return dd === d1.id;
+                        store_list = store_list.response.value.list;
+                        glitter.share.store_list = store_list;
+                        glitter.share.member_auth_list = member_auth;
+                        try {
+                            const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID;
+                            const find_ = member_auth.find((dd) => {
+                                return `${dd.user}` === `${login_user}`;
+                            });
+                            POSSetting.config.who = find_.user;
+                        }
+                        catch (e) {
+                        }
+                        const member_auth_ = member_auth.find((dd) => {
+                            return `${dd.user}` === `${POSSetting.config.who}`;
                         });
-                    });
-                    if (res.response.result && (member_auth_ || POSSetting.config.who === 'manager')) {
-                        if (!member_auth_.config.support_shop || member_auth_.config.support_shop.length === 0) {
-                            const dialog = new ShareDialog(gvc.glitter);
-                            dialog.errorMessage({
-                                text: `尚未設定任何門市，請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
-                                callback: () => {
-                                    const dialog = new ShareDialog(gvc.glitter);
-                                    dialog.dataLoading({ visible: true });
-                                    localStorage.removeItem('on-pos');
-                                    (window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
-                                    glitter.share.reload('cms', 'shopnex');
-                                }
+                        console.log(`member_auth_=>`, member_auth_);
+                        member_auth_.config.support_shop = member_auth_.config.support_shop.filter((dd) => {
+                            return store_list.find((d1) => {
+                                return dd === d1.id;
                             });
-                            return ``;
+                        });
+                        if (res.response.result && (member_auth_ || POSSetting.config.who === 'manager')) {
+                            if (!member_auth_.config.support_shop || member_auth_.config.support_shop.length === 0) {
+                                const dialog = new ShareDialog(gvc.glitter);
+                                dialog.errorMessage({
+                                    text: `尚未設定任何門市，請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
+                                    callback: () => {
+                                        const dialog = new ShareDialog(gvc.glitter);
+                                        dialog.dataLoading({ visible: true });
+                                        localStorage.removeItem('on-pos');
+                                        (window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
+                                        glitter.share.reload('cms', 'shopnex');
+                                    }
+                                });
+                                return ``;
+                            }
+                            else {
+                                glitter.share.member_auth_list = member_auth.filter((dd) => {
+                                    return dd.config.support_shop && dd.config.support_shop.length > 0;
+                                });
+                                if (!member_auth_.config.support_shop.includes(POSSetting.config.where_store)) {
+                                    POSSetting.config.where_store = member_auth_.config.support_shop[0];
+                                }
+                                return POSSetting.posView(gvc);
+                            }
                         }
                         else {
-                            glitter.share.member_auth_list = member_auth.filter((dd) => {
-                                return dd.config.support_shop && dd.config.support_shop.length > 0;
+                            return POSSetting.loginManager(gvc, 'first', () => {
                             });
-                            if (!member_auth_.config.support_shop.includes(POSSetting.config.where_store)) {
-                                POSSetting.config.where_store = member_auth_.config.support_shop[0];
-                            }
-                            return POSSetting.posView(gvc);
                         }
                     }
-                    else {
-                        return POSSetting.loginManager(gvc, 'first', () => {
-                        });
+                    catch (e) {
+                        const dialog = new ShareDialog(gvc.glitter);
+                        dialog.dataLoading({ visible: true });
+                        localStorage.removeItem('on-pos');
+                        (window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
+                        glitter.share.reload('cms', 'shopnex');
+                        return ``;
                     }
                 }),
                 divCreate: {},

package/lowcode/cms-plugin/POS-setting.ts

@@ -306,66 +306,74 @@ height: 51px;
             return {
                 bind: id,
                 view: async () => {
-                    let [initial, res, member_auth,store_list]: any = await Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
-                        app: gvc.glitter.getUrlParameter('app-id'),
-                        token: GlobalUser.saas_token,
-                    }), ApiUser.getPermission({
-                        page: 0,
-                        limit: 100
-                    }),ApiUser.getPublicConfig('store_manager', 'manager')]);
-                    member_auth = member_auth.response.data.filter((dd: any) => {
-                        return dd.invited && dd.status
-                    });
-                    store_list=store_list.response.value.list;
-                    glitter.share.store_list=store_list;
-                    glitter.share.member_auth_list = member_auth
-                    glitter.share.editorViewModel.app_config_original
-                    try {
-                        const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID
-                        const find_ = member_auth.find((dd: any) => {
-                            return `${dd.user}` === `${login_user}`
-                        });
-                        POSSetting.config.who = find_.user
-                    } catch (e) {
-
-                    }
-                    const member_auth_ = member_auth.find((dd: any) => {
-                        return `${dd.user}` === `${POSSetting.config.who}`
-                    })
-                    member_auth_.config.support_shop=member_auth_.config.support_shop.filter((dd:string)=>{
-                        return store_list.find((d1:any)=>{
-                            return dd===d1.id
-                        })
-                    })
-                    if (res.response.result && (
-                        member_auth_ || POSSetting.config.who === 'manager'
-                    )) {
-                        if (!member_auth_.config.support_shop || member_auth_.config.support_shop.length === 0) {
-                            const dialog = new ShareDialog(gvc.glitter)
-                            dialog.errorMessage({
-                                text: `尚未設定任何門市，請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
-                                callback: () => {
-                                    const dialog = new ShareDialog(gvc.glitter);
-                                    dialog.dataLoading({visible: true});
-                                    localStorage.removeItem('on-pos');
-                                    (window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
-                                    glitter.share.reload('cms', 'shopnex');
-                                }
-                            })
-                            return ``;
-                        } else {
-                            glitter.share.member_auth_list = member_auth.filter((dd:any)=>{
-                                return dd.config.support_shop && dd.config.support_shop.length > 0;
-                            });
-                            if(!member_auth_.config.support_shop.includes(POSSetting.config.where_store)){
-                                POSSetting.config.where_store=member_auth_.config.support_shop[0]
-                            }
-                            return POSSetting.posView(gvc);
-                        }
-                    } else {
-                        return POSSetting.loginManager(gvc, 'first', () => {
-                        });
-                    }
+                   try {
+                       let [initial, res, member_auth,store_list]: any = await Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
+                           app: gvc.glitter.getUrlParameter('app-id'),
+                           token: GlobalUser.saas_token,
+                       }), ApiUser.getPermission({
+                           page: 0,
+                           limit: 100
+                       }),ApiUser.getPublicConfig('store_manager', 'manager')]);
+                       member_auth = member_auth.response.data.filter((dd: any) => {
+                           return dd.invited && dd.status
+                       });
+                       store_list=store_list.response.value.list;
+                       glitter.share.store_list=store_list;
+                       glitter.share.member_auth_list = member_auth
+                       try {
+                           const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID
+                           const find_ = member_auth.find((dd: any) => {
+                               return `${dd.user}` === `${login_user}`
+                           });
+                           POSSetting.config.who = find_.user
+                       } catch (e) {
+                       }
+                       const member_auth_ = member_auth.find((dd: any) => {
+                           return `${dd.user}` === `${POSSetting.config.who}`
+                       })
+                       console.log(`member_auth_=>`,member_auth_)
+                       member_auth_.config.support_shop=member_auth_.config.support_shop.filter((dd:string)=>{
+                           return store_list.find((d1:any)=>{
+                               return dd===d1.id
+                           })
+                       });
+                       if (res.response.result && (
+                           member_auth_ || POSSetting.config.who === 'manager'
+                       )) {
+                           if (!member_auth_.config.support_shop || member_auth_.config.support_shop.length === 0) {
+                               const dialog = new ShareDialog(gvc.glitter)
+                               dialog.errorMessage({
+                                   text: `尚未設定任何門市，請前往『 門市設定 』與『 員工設定 』中設定相關參數`,
+                                   callback: () => {
+                                       const dialog = new ShareDialog(gvc.glitter);
+                                       dialog.dataLoading({visible: true});
+                                       localStorage.removeItem('on-pos');
+                                       (window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
+                                       glitter.share.reload('cms', 'shopnex');
+                                   }
+                               })
+                               return ``;
+                           } else {
+                               glitter.share.member_auth_list = member_auth.filter((dd:any)=>{
+                                   return dd.config.support_shop && dd.config.support_shop.length > 0;
+                               });
+                               if(!member_auth_.config.support_shop.includes(POSSetting.config.where_store)){
+                                   POSSetting.config.where_store=member_auth_.config.support_shop[0]
+                               }
+                               return POSSetting.posView(gvc);
+                           }
+                       } else {
+                           return POSSetting.loginManager(gvc, 'first', () => {
+                           });
+                       }
+                   }catch (e) {
+                       const dialog = new ShareDialog(gvc.glitter);
+                       dialog.dataLoading({visible: true});
+                       localStorage.removeItem('on-pos');
+                       (window.parent).history.replaceState({}, document.title, `${glitter.root_path}cms?appName=${glitter.getUrlParameter('app-id')}&type=editor&function=backend-manger&tab=home_page`);
+                       glitter.share.reload('cms', 'shopnex');
+                       return  ``
+                   }
                 },
                 divCreate: {},
                 onCreate: () => {

package/lowcode/cms-plugin/pos-pages/payment-page.js

@@ -138,7 +138,7 @@ export class PaymentPage {
                                     return html `
                                                                 <div class="d-flex" style="">
                                                                     <div class="col-8 col-sm-6 d-flex align-items-center">
-                                                                        <div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image}')"></div>
+                                                                        <div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image || 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'}')"></div>
                                                                         <div class="d-flex flex-column"
                                                                              style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;">
                                                                             ${data.title}

package/lowcode/cms-plugin/pos-pages/payment-page.ts

@@ -146,7 +146,7 @@ export class PaymentPage {
                                                             return html`
                                                                 <div class="d-flex" style="">
                                                                     <div class="col-8 col-sm-6 d-flex align-items-center">
-                                                                        <div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image}')"></div>
+                                                                        <div style="width: 54px;height: 54px;border-radius: 5px;background: 50%/cover url('${data.preview_image || 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'}')"></div>
                                                                         <div class="d-flex flex-column"
                                                                              style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;">
                                                                             ${data.title}