ts-glitter 21.6.8 → 21.7.1

package/lowcode/Entry.js

@@ -146,7 +146,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_21.6.8';
+            glitter.share.editerVersion = 'V_21.7.1';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -150,7 +150,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_21.6.8';
+      glitter.share.editerVersion = 'V_21.7.1';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

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

@@ -4683,15 +4683,12 @@ export class ShoppingOrderManager {
             if (checkOrderEmpty(passData)) {
                 ApiShop.toManualCheckout(passData).then(() => {
                     dialog.dataLoading({ visible: false });
-                    window.parent.glitter.innerDialog(() => {
-                        return dialog.successMessage({
-                            text: html `訂單新增成功！<br />已將訂單明細發送至顧客信箱`,
-                        });
-                    }, 'orderFinish', {
-                        dismiss: () => {
-                            vm.type = 'list';
-                        },
+                    dialog.successMessage({
+                        text: `訂單新增成功<br />已將訂單明細發送至顧客信箱`,
                     });
+                    setTimeout(() => {
+                        vm.type = 'list';
+                    }, 1200);
                 });
             }
             else {

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

@@ -5076,19 +5076,12 @@ export class ShoppingOrderManager {
             if (checkOrderEmpty(passData)) {
               ApiShop.toManualCheckout(passData).then(() => {
                 dialog.dataLoading({ visible: false });
-                (window.parent as any).glitter.innerDialog(
-                  () => {
-                    return dialog.successMessage({
-                      text: html`訂單新增成功！<br />已將訂單明細發送至顧客信箱`,
-                    });
-                  },
-                  'orderFinish',
-                  {
-                    dismiss: () => {
-                      vm.type = 'list';
-                    },
-                  }
-                );
+                dialog.successMessage({
+                  text: `訂單新增成功<br />已將訂單明細發送至顧客信箱`,
+                });
+                setTimeout(() => {
+                  vm.type = 'list';
+                }, 1200);
               });
             } else {
               dialog.dataLoading({ visible: false });

package/lowcode/glitter-base/global/language.js

@@ -238,6 +238,14 @@ export class Language {
             { key: 'discount', tw: '折抵', cn: '折抵', en: 'Discount' },
             { key: 'remaining_balance', tw: '您目前剩餘', cn: '您目前剩余', en: 'Your remaining balance' },
             { key: 'point', tw: '點', cn: '点', en: '' },
+            { key: 'recipient', tw: '收件人', cn: '收件人', en: 'Recipient' },
+            { key: 'add_recipient', tw: '新增收件人', cn: '新增收件人', en: 'Add Recipient' },
+            {
+                key: 'recipient_limit',
+                tw: '最多限制儲存 _max_ 名收件人',
+                cn: '最多限制保存 _max_ 名收件人',
+                en: 'You can save up to _max_ recipients',
+            },
             {
                 key: 'max_discount_order',
                 tw: '此份訂單最多可折抵',

package/lowcode/glitter-base/global/language.ts

@@ -247,6 +247,14 @@ export class Language {
       { key: 'discount', tw: '折抵', cn: '折抵', en: 'Discount' },
       { key: 'remaining_balance', tw: '您目前剩餘', cn: '您目前剩余', en: 'Your remaining balance' },
       { key: 'point', tw: '點', cn: '点', en: '' },
+      { key: 'recipient', tw: '收件人', cn: '收件人', en: 'Recipient' },
+      { key: 'add_recipient', tw: '新增收件人', cn: '新增收件人', en: 'Add Recipient' },
+      {
+        key: 'recipient_limit',
+        tw: '最多限制儲存 _max_ 名收件人',
+        cn: '最多限制保存 _max_ 名收件人',
+        en: 'You can save up to _max_ recipients',
+      },
       {
         key: 'max_discount_order',
         tw: '此份訂單最多可折抵',

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

@@ -593,15 +593,16 @@ export class ApiUser {
         return new Promise((resolve, reject) => {
             var _a;
             window.glitter.share._public_config = (_a = window.glitter.share._public_config) !== null && _a !== void 0 ? _a : {};
+            const tag = [appName, key, user_id].join('');
             const config = window.glitter.share._public_config;
-            if (config[key + user_id]) {
-                resolve(config[key + user_id]);
+            if (config[tag]) {
+                resolve(config[tag]);
                 return;
             }
             function callback(res) {
                 if (key.indexOf('shipment_config_') === 0 &&
                     window.parent.glitter.getUrlParameter('function') !== 'backend-manger') {
-                    config[key + user_id] = res;
+                    config[tag] = res;
                 }
                 switch (key) {
                     case 'app-header-config':
@@ -611,7 +612,7 @@ export class ApiUser {
                     case 'message_setting':
                     case 'promo-label':
                         if (window.parent.glitter.getUrlParameter('function') !== 'backend-manger') {
-                            config[key + user_id] = res;
+                            config[tag] = res;
                         }
                         break;
                     case 'image-manager':
@@ -621,18 +622,18 @@ export class ApiUser {
                         break;
                 }
                 if (key.indexOf('alt_') === 0) {
-                    config[key + user_id] = res;
+                    config[tag] = res;
                 }
                 resolve(res);
             }
             const find_ = this.getting_config.find(dd => {
-                return dd.key === key;
+                return dd.key === tag;
             });
             if (find_) {
                 find_.array.push(callback);
             }
             else {
-                this.getting_config.push({ key: key, array: [callback] });
+                this.getting_config.push({ key: tag, array: [callback] });
                 BaseApi.create({
                     url: getBaseUrl() + `/api-public/v1/user/public/config?key=${key}&user_id=${user_id}`,
                     type: 'GET',
@@ -643,7 +644,7 @@ export class ApiUser {
                     },
                 }).then(res => {
                     this.getting_config = this.getting_config.filter(d1 => {
-                        if (d1.key === key) {
+                        if (d1.key === tag) {
                             d1.array.map(dd => {
                                 return dd(res);
                             });

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

@@ -676,9 +676,10 @@ export class ApiUser {
   public static getPublicConfig(key: string, user_id: string, appName: string = getConfig().config.appName) {
     return new Promise<{ result: boolean; response: any }>((resolve, reject) => {
       (window as any).glitter.share._public_config = (window as any).glitter.share._public_config ?? {};
+      const tag=[appName,key,user_id].join('')
       const config = (window as any).glitter.share._public_config;
-      if (config[key + user_id]) {
-        resolve(config[key + user_id]);
+      if (config[tag]) {
+        resolve(config[tag]);
         return;
       }
 
@@ -688,7 +689,7 @@ export class ApiUser {
           key.indexOf('shipment_config_') === 0 &&
           (window.parent as any).glitter.getUrlParameter('function') !== 'backend-manger'
         ) {
-          config[key + user_id] = res;
+          config[tag] = res;
         }
         switch (key) {
           case 'app-header-config':
@@ -699,7 +700,7 @@ export class ApiUser {
           case 'promo-label':
             //前台才有暫存功能
             if ((window.parent as any).glitter.getUrlParameter('function') !== 'backend-manger') {
-              config[key + user_id] = res;
+              config[tag] = res;
             }
             break;
           case 'image-manager':
@@ -709,18 +710,18 @@ export class ApiUser {
             break;
         }
         if (key.indexOf('alt_') === 0) {
-          config[key + user_id] = res;
+          config[tag] = res;
         }
         resolve(res);
       }
 
       const find_ = this.getting_config.find(dd => {
-        return dd.key === key;
+        return dd.key === tag;
       });
       if (find_) {
         find_.array.push(callback);
       } else {
-        this.getting_config.push({ key: key, array: [callback] });
+        this.getting_config.push({ key: tag, array: [callback] });
         BaseApi.create({
           url: getBaseUrl() + `/api-public/v1/user/public/config?key=${key}&user_id=${user_id}`,
           type: 'GET',
@@ -731,7 +732,7 @@ export class ApiUser {
           },
         }).then(res => {
           this.getting_config = this.getting_config.filter(d1 => {
-            if (d1.key === key) {
+            if (d1.key === tag) {
               d1.array.map(dd => {
                 return dd(res);
               });

package/lowcode/official_view_component/official/component.js

@@ -901,6 +901,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter, editM
                                                                                                         return {
                                                                                                             bind: vm.id,
                                                                                                             view: () => __awaiter(this, void 0, void 0, function* () {
+                                                                                                                var _a;
                                                                                                                 let refer_form = getReferForm(widget, type);
                                                                                                                 function refresh(widget, device) {
                                                                                                                     if (widget.data.refer_app) {
@@ -972,6 +973,8 @@ export const component = Plugin.createComponent(import.meta.url, (glitter, editM
                                                                                                                         subData.editor_updated_callback(oWidget);
                                                                                                                 }
                                                                                                                 glitter.share.refer_form = refer_form;
+                                                                                                                glitter.share.refer_form_ = (_a = glitter.share.refer_form_) !== null && _a !== void 0 ? _a : {};
+                                                                                                                glitter.share.refer_form_[oWidget.data.tag] = refer_form;
                                                                                                                 glitter.share.refresh_global = (() => {
                                                                                                                     refresh(widget, type);
                                                                                                                 });

package/lowcode/official_view_component/official/component.ts

@@ -1078,6 +1078,8 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
                                                                 subData.editor_updated_callback(oWidget);
                                                             }
                                                             glitter.share.refer_form=refer_form
+                                                            glitter.share.refer_form_=glitter.share.refer_form_ ?? {}
+                                                            glitter.share.refer_form_[oWidget.data.tag]=refer_form
                                                             glitter.share.refresh_global=(()=>{
                                                               refresh(widget,type)
                                                             })

package/lowcode/public-components/checkout/index.js

@@ -2222,7 +2222,7 @@ export class CheckoutIndex {
                                                       class="d-flex justify-content-between align-items-center p-1 w-100 gap-2"
                                                     >
                                                       <div class="d-flex flex-column">
-                                                        <h5>收件人 ${index + 1}</h5>
+                                                        <h5>${Language.text('recipient')} ${index + 1}</h5>
                                                         ${['name', 'email', 'phone']
                                                                 .filter(key => data[key])
                                                                 .map(key => {
@@ -3182,9 +3182,7 @@ export class CheckoutIndex {
         }
         let pass = true;
         if (subData.shipment === 'none') {
-            dialog.errorMessage({
-                text: Language.text('select_shipping_method'),
-            });
+            dialog.errorMessage({ text: Language.text('select_shipping_method') });
             return false;
         }
         if (ShipmentConfig.supermarketList.includes(subData['shipment'])) {

package/lowcode/public-components/checkout/index.ts

@@ -1786,7 +1786,6 @@ export class CheckoutIndex {
                                                 return '';
                                               }
                                             };
-
                                             return html` <div class="d-flex flex-column gap-1">
                                               <select
                                                 class="w-100 ${gClass('select')}"
@@ -2446,7 +2445,7 @@ export class CheckoutIndex {
                                                       class="d-flex justify-content-between align-items-center p-1 w-100 gap-2"
                                                     >
                                                       <div class="d-flex flex-column">
-                                                        <h5>收件人 ${index + 1}</h5>
+                                                        <h5>${Language.text('recipient')} ${index + 1}</h5>
                                                         ${['name', 'email', 'phone']
                                                           .filter(key => data[key])
                                                           .map(key => {
@@ -3488,9 +3487,7 @@ export class CheckoutIndex {
 
     // 驗證有無配送方式
     if (subData.shipment === 'none') {
-      dialog.errorMessage({
-        text: Language.text('select_shipping_method'),
-      });
+      dialog.errorMessage({ text: Language.text('select_shipping_method') });
       return false;
     }
 

package/lowcode/public-components/user-manager/um-receive.js

@@ -28,6 +28,7 @@ export class UMReceive {
             dataList: [],
             dataKeys: [],
         };
+        const receive_list_max_length = 100;
         let changePage = (index, type, subData) => { };
         gvc.glitter.getModule(new URL('./official_event/page/change-page.js', gvc.glitter.root_path).href, cl => {
             changePage = cl.changePage;
@@ -38,6 +39,93 @@ export class UMReceive {
                 if (vm.loading) {
                     return UmClass.spinner();
                 }
+                function saveView() {
+                    return html `<div class="d-flex justify-content-end">
+            <div
+              class="um-nav-btn um-nav-btn-active d-flex align-items-center justify-content-center fw-bold"
+              onclick="${gvc.event(() => {
+                        vm.userData.receive_list = vm.dataList
+                            .map((data) => {
+                            const temp = {};
+                            vm.dataKeys.map(key => {
+                                temp[key] = data[key];
+                            });
+                            return temp;
+                        })
+                            .filter((data) => {
+                            return Object.values(data).some(Boolean);
+                        });
+                        ApiUser.updateUserData({
+                            userData: vm.userData,
+                        }).then(res => {
+                            dialog.dataLoading({ visible: false });
+                            if (!res.result && res.response.data.msg === 'email-verify-false') {
+                                dialog.errorMessage({ text: Language.text('email_verification_code_incorrect') });
+                            }
+                            else if (!res.result && res.response.data.msg === 'phone-verify-false') {
+                                dialog.errorMessage({ text: Language.text('sms_verification_code_incorrect') });
+                            }
+                            else if (!res.result && res.response.data.msg === 'phone-exists') {
+                                dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
+                            }
+                            else if (!res.result && res.response.data.msg === 'email-exists') {
+                                dialog.errorMessage({ text: Language.text('email_already_exists') });
+                            }
+                            else if (!res.result) {
+                                dialog.errorMessage({ text: Language.text('update_exception') });
+                            }
+                            else {
+                                dialog.successMessage({ text: Language.text('change_success') });
+                                gvc.recreateView();
+                            }
+                        });
+                    })}"
+            >
+              ${Language.text('confirm')}
+            </div>
+          </div>`;
+                }
+                function recipientView() {
+                    return html ` <div class="col-12" style="min-height: 500px;">
+            ${vm.dataList
+                        .map((data, index) => {
+                        const cloneForm = JSON.parse(JSON.stringify(vm.funnyForm));
+                        return html `<div class="px-0 py-2 px-md-2 py-md-4 mb-3">
+                  <h5>${Language.text('recipient')} ${index + 1}</h5>
+                  ${FormWidget.editorView({
+                            gvc: gvc,
+                            array: cloneForm.map((dd, index) => {
+                                dd.col = '6';
+                                if (index === cloneForm.length - 1) {
+                                    dd.col = '12';
+                                }
+                                return dd;
+                            }),
+                            refresh: () => {
+                                gvc.notifyDataChange(vm.id);
+                            },
+                            formData: data,
+                        })}
+                </div>`;
+                    })
+                        .join('')}
+          </div>`;
+                }
+                function plusButton() {
+                    return html `<div
+            class="w-100 d-flex justify-content-center align-items-center gap-2"
+            style="color: #3366BB; cursor: pointer"
+            onclick="${gvc.event(() => {
+                        vm.dataList.push({});
+                        gvc.notifyDataChange(vm.id);
+                    })}"
+          >
+            <div style="font-size: 16px; font-weight: 400; word-wrap: break-word">
+              ${Language.text('add_recipient')}
+            </div>
+            <i class="fa-solid fa-plus"></i>
+          </div>`;
+                }
                 return html `
           <div class="row mx-auto p-0">
             <div class="w-100 align-items-center d-flex py-3 pb-lg-3 pt-lg-0" style="gap:10px;">
@@ -63,74 +151,9 @@ export class UMReceive {
               </div>
               <div class="um-info-title fw-bold" style="font-size: 24px;">${Language.text('recipient_info')}</div>
             </div>
-            <div class="col-12" style="min-height: 500px;">
-              ${vm.dataList
-                    .map((data, index) => {
-                    const cloneForm = JSON.parse(JSON.stringify(vm.funnyForm));
-                    return html `<div class="px-0 py-2 px-md-2 py-md-4 mb-3">
-                    <h5>收件人 ${index + 1}</h5>
-                    ${FormWidget.editorView({
-                        gvc: gvc,
-                        array: cloneForm.map((dd, index) => {
-                            dd.col = '6';
-                            if (index === cloneForm.length - 1) {
-                                dd.col = '12';
-                            }
-                            return dd;
-                        }),
-                        refresh: () => {
-                            gvc.notifyDataChange(vm.id);
-                        },
-                        formData: data,
-                    })}
-                  </div>`;
-                })
-                    .join('')}
-              <div class="d-flex justify-content-end">
-                <div
-                  class="um-nav-btn um-nav-btn-active d-flex align-items-center justify-content-center fw-bold"
-                  onclick="${gvc.event(() => {
-                    vm.userData.receive_list = vm.dataList
-                        .map((data) => {
-                        const temp = {};
-                        vm.dataKeys.map(key => {
-                            temp[key] = data[key];
-                        });
-                        return temp;
-                    })
-                        .filter((data) => {
-                        return Object.values(data).some(Boolean);
-                    });
-                    ApiUser.updateUserData({
-                        userData: vm.userData,
-                    }).then(res => {
-                        dialog.dataLoading({ visible: false });
-                        if (!res.result && res.response.data.msg === 'email-verify-false') {
-                            dialog.errorMessage({ text: Language.text('email_verification_code_incorrect') });
-                        }
-                        else if (!res.result && res.response.data.msg === 'phone-verify-false') {
-                            dialog.errorMessage({ text: Language.text('sms_verification_code_incorrect') });
-                        }
-                        else if (!res.result && res.response.data.msg === 'phone-exists') {
-                            dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
-                        }
-                        else if (!res.result && res.response.data.msg === 'email-exists') {
-                            dialog.errorMessage({ text: Language.text('email_already_exists') });
-                        }
-                        else if (!res.result) {
-                            dialog.errorMessage({ text: Language.text('update_exception') });
-                        }
-                        else {
-                            dialog.successMessage({ text: Language.text('change_success') });
-                            gvc.recreateView();
-                        }
-                    });
-                })}"
-                >
-                  ${Language.text('confirm')}
-                </div>
-              </div>
-            </div>
+            ${vm.dataList.length > 0 ? [saveView(), recipientView()].join('') : ''}
+            <div class="w-100 my-3" style="background: white;height: 1px;"></div>
+            ${receive_list_max_length > vm.dataList.length ? plusButton() : ''}
           </div>
         `;
             }),
@@ -139,12 +162,9 @@ export class UMReceive {
                     const classPrefix = 'cart-prefix';
                     CartModule.addStyle(gvc, classPrefix);
                     Promise.all([ApiUser.getUserData(GlobalUser.token, 'me'), this.funnyQuickFormFrame(classPrefix)]).then(dataArray => {
-                        var _a;
                         vm.userData = dataArray[0].response.userData;
-                        vm.userData.receive_list = (_a = vm.userData.receive_list) !== null && _a !== void 0 ? _a : [];
-                        if (vm.userData.receive_list) {
-                            vm.dataList = [...vm.userData.receive_list, ...new Array(3 - vm.userData.receive_list.length).fill({})];
-                        }
+                        vm.userData.receive_list = Array.isArray(vm.userData.receive_list) ? vm.userData.receive_list : [];
+                        vm.dataList = vm.userData.receive_list;
                         vm.funnyForm = dataArray[1];
                         vm.dataKeys = vm.funnyForm.map((item) => item.key).filter(Boolean);
                         vm.loading = false;