ts-glitter 21.5.3 → 21.5.4

package/lowcode/modules/image-library.js

@@ -191,8 +191,7 @@ export class imageLibrary {
                                                     function itemClick() {
                                                         var _a;
                                                         if (vm.type == 'folder') {
-                                                            console.log("vm.link --", vm.link);
-                                                            vm.type = 'folderEdit';
+                                                            vm.type = 'folder';
                                                             that.selectImageLibrary(gvc, selectData => {
                                                                 vm.link = selectData;
                                                                 gvc.notifyDataChange(vm.id);
@@ -509,7 +508,6 @@ export class imageLibrary {
                             }
                             if (vm.type == 'folderViewToEdit') {
                                 vm.type = 'folderView';
-                                console.log("vm.link --", vm.link);
                                 yield that.selectImageLibrary(gvc, selectData => {
                                     vm.link = selectData;
                                     gvc.notifyDataChange(vm.id);
@@ -1023,6 +1021,7 @@ export class imageLibrary {
                 });
             },
             footer_html: (gvc) => {
+                const footerType = vm.type;
                 const dialog = new ShareDialog(cf.gvc.glitter);
                 function clearNoNeedData(items) {
                     items.map(dd => {

package/lowcode/modules/image-library.ts

@@ -16,6 +16,14 @@ export type FileItem = {
   id: string;
 };
 
+type KeyType =
+  | 'file'
+  | 'folder'
+  | 'folderView'
+  | 'folderEdit'
+  | 'folderADD'
+  | 'folderViewToEdit';
+
 const html = String.raw;
 const css = String.raw;
 
@@ -48,7 +56,7 @@ export class imageLibrary {
       selected: boolean;
       query: string;
       orderString: string;
-      type: string;
+      type: KeyType
       tag?: string;
       newFolder: FileItem;
     } = {
@@ -249,9 +257,8 @@ export class imageLibrary {
 
                             function itemClick() {
                               if (vm.type == 'folder') {
-                                console.log("vm.link --" , vm.link);
                                 //編輯資料夾內容
-                                vm.type = 'folderEdit';
+                                vm.type = 'folder';
                                 that.selectImageLibrary(
                                   gvc,
                                   selectData => {
@@ -576,7 +583,7 @@ export class imageLibrary {
                           ? '700'
                           : '500'};cursor: pointer;"
                         onclick="${gvc.event(e => {
-                          vm.type = data.key;
+                          vm.type = data.key as KeyType;
                           vm.query = '';
                           gvc.notifyDataChange(vm.id);
                         })}"
@@ -589,7 +596,6 @@ export class imageLibrary {
               }
               if (vm.type == 'folderViewToEdit'){
                 vm.type = 'folderView';
-                console.log("vm.link --" , vm.link);
                 await that.selectImageLibrary(
                   gvc,
                   selectData => {
@@ -1164,8 +1170,17 @@ export class imageLibrary {
           label: string;
           onClick: () => void;
         };
+        // type KeyType =
+        //   | 'file'
+        //   | 'folder'
+        //   | 'folderView'
+        //   | 'folderEdit'
+        //   | 'folderADD'
+        //   | 'folderViewToEdit';
+        const footerType = vm.type
         const dialog = new ShareDialog(cf.gvc.glitter);
 
+
         function clearNoNeedData(items: FileItem[]) {
           items.map(dd => {
             if ((dd as any).selected) {
@@ -1240,7 +1255,6 @@ export class imageLibrary {
             },
           ];
         }
-
         function getDefaultButtons(gvc: GVC, save: Function, dialog: ShareDialog): BtnDef[] {
           const finishLabel = cf.key === 'album' ? '建立' : '完成';
           const cancelLabel = cf.key === 'album' ? '返回' : '取消';
@@ -1324,11 +1338,11 @@ export class imageLibrary {
             },
           ];
         }
-
         const defs = vm.type === 'folderEdit' ? getFolderEditButtons(gvc, save) : getDefaultButtons(gvc, save, dialog);
         return gvc.bindView({
           bind:vm.footer_id,
           view:()=>{
+
             return defs
               .map(d => {
                 const widget =

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

@@ -29,6 +29,7 @@ import { ApiLiveInteraction } from '../../glitter-base/route/live-purchase-inter
 import { ApplicationConfig } from '../../application-config.js';
 import { CartModule } from '../modules/cart-module.js';
 import { ProductModule } from '../modules/product-module.js';
+import { BgWidget } from '../../backend-manager/bg-widget.js';
 const html = String.raw;
 export class CheckoutIndex {
     static main(gvc, widget, subData) {
@@ -271,7 +272,7 @@ export class CheckoutIndex {
                 gvc.addMtScript([
                     {
                         src: `${gvc.glitter.root_path}/jslib/lottie-player.js`,
-                    }
+                    },
                 ], () => { }, () => { });
                 vm.cartData = FakeOrder.data;
                 ApiWallet.getRebateConfig({ type: 'me' }).then((res) => __awaiter(this, void 0, void 0, function* () {
@@ -1226,7 +1227,7 @@ export class CheckoutIndex {
                                                       style="${isSelected
                                                         ? isSelected.id === pd.id
                                                             ? `background: gray !important;`
-                                                            : ``
+                                                            : ''
                                                         : `background: orangered !important;`}"
                                                       onclick="${gvc.event(() => {
                                                         var _a;
@@ -1334,12 +1335,13 @@ export class CheckoutIndex {
                                                         });
                                                     })}"
                                                     >
-                                                      <span class="${gClass('button-text')}"
-                                                            style="${isSelected
+                                                      <span
+                                                        class="${gClass('button-text')}"
+                                                        style="${isSelected
                                                         ? isSelected.id === pd.id
-                                                            ? ``
+                                                            ? ''
                                                             : `color: white;`
-                                                        : ``}"
+                                                        : ''}"
                                                         >${isSelected
                                                         ? isSelected.id === pd.id
                                                             ? Language.text('selected')
@@ -1944,7 +1946,6 @@ export class CheckoutIndex {
                                               >
                                               <input
                                                 class="${gClass('input')}"
-                                                type=""
                                                 placeholder="${Language.text('postal_code')}"
                                                 value="${vm.cartData.user_info.postal_code || ''}"
                                                 onchange="${gvc.event(e => {
@@ -2175,39 +2176,87 @@ export class CheckoutIndex {
                                       style="cursor: pointer; color: #3366bb;"
                                       onclick="${gvc.event(() => {
                                         ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
-                                            ['name', 'phone', 'email'].map(dd => {
-                                                vm.cartData.user_info[dd] =
-                                                    res.response.userData[dd] || vm.cartData.user_info[dd];
-                                            });
-                                            [
-                                                {
-                                                    key: 'carrier_num',
-                                                    refer: res.response.userData['carrier_number'],
-                                                },
-                                                {
-                                                    key: 'gui_number',
-                                                    refer: res.response.userData['gui_number'],
-                                                },
-                                                {
-                                                    key: 'send_type',
-                                                    refer: res.response.userData['gui_number'] ||
-                                                        !res.response.userData['carrier_number']
-                                                        ? 'email'
-                                                        : 'carrier_num',
-                                                },
-                                                {
-                                                    key: 'invoice_type',
-                                                    refer: res.response.userData['gui_number'] ? 'company' : 'me',
-                                                },
-                                                {
-                                                    key: 'company',
-                                                    refer: res.response.userData['company'],
-                                                },
-                                            ].map(dd => {
-                                                vm.cartData.user_info[dd.key] = dd.refer || vm.cartData.user_info[dd.key];
-                                            });
-                                            this.storeLocalData(vm.cartData);
-                                            gvc.notifyDataChange('invoice_place');
+                                            const userData = res.response.userData;
+                                            const userInfo = vm.cartData.user_info;
+                                            function setUserInfo(data) {
+                                                ['name', 'phone', 'email'].map(dd => {
+                                                    userInfo[dd] = data[dd] || userInfo[dd];
+                                                });
+                                                const { carrier_number, gui_number, company } = data;
+                                                [
+                                                    {
+                                                        key: 'carrier_num',
+                                                        refer: carrier_number,
+                                                    },
+                                                    {
+                                                        key: 'gui_number',
+                                                        refer: gui_number,
+                                                    },
+                                                    {
+                                                        key: 'send_type',
+                                                        refer: gui_number || !carrier_number ? 'email' : 'carrier_num',
+                                                    },
+                                                    {
+                                                        key: 'invoice_type',
+                                                        refer: gui_number ? 'company' : 'me',
+                                                    },
+                                                    {
+                                                        key: 'company',
+                                                        refer: company,
+                                                    },
+                                                ].map(dd => {
+                                                    userInfo[dd.key] = dd.refer || userInfo[dd.key];
+                                                });
+                                                CheckoutIndex.storeLocalData(vm.cartData);
+                                                gvc.notifyDataChange('invoice_place');
+                                            }
+                                            if (Array.isArray(userData.receive_list)) {
+                                                BgWidget.settingDialog({
+                                                    gvc,
+                                                    title: '快速帶入',
+                                                    innerHTML: (iGVC) => {
+                                                        const isPhone = document.body.clientWidth < 800;
+                                                        const listHTML = userData.receive_list
+                                                            .map((data, index) => {
+                                                            return html `<div
+                                                      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>
+                                                        ${['name', 'email', 'phone']
+                                                                .filter(key => data[key])
+                                                                .map(key => {
+                                                                return html `<span style="line-break: anywhere;"
+                                                              >${data[key]}</span
+                                                            >`;
+                                                            })
+                                                                .join('')}
+                                                      </div>
+                                                      <button
+                                                        class="${gClass('button-bgr')}"
+                                                        style="width: ${isPhone ? 80 : 130}px;"
+                                                        onclick="${gvc.event(() => {
+                                                                iGVC.closeDialog();
+                                                                setUserInfo(data);
+                                                            })}"
+                                                      >
+                                                        <span class="${gClass('button-text')}" style="font-size: 13px;">
+                                                          ${Language.text('select')}</span
+                                                        >
+                                                      </button>
+                                                    </div>`;
+                                                        })
+                                                            .join(BgWidget.horizontalLine());
+                                                        return html `<div class="px-2 py-3">${listHTML}</div>`;
+                                                    },
+                                                    footer_html: () => {
+                                                        return '';
+                                                    },
+                                                });
+                                            }
+                                            else {
+                                                setUserInfo(userInfo);
+                                            }
                                         });
                                     })}"
                                     >
@@ -2608,7 +2657,7 @@ export class CheckoutIndex {
                                                         dd.form_config.title_style = {
                                                             list: [
                                                                 {
-                                                                    class: ['company', 'gui_number', 'carrier_num'].includes(dd.key)
+                                                                    class: ['company', 'gui_number', 'carrier_num', 'love_code'].includes(dd.key)
                                                                         ? gClass('label') + ' mt-2'
                                                                         : gClass('label') + ' mb-2',
                                                                     style: 'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',

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

@@ -22,6 +22,7 @@ import { ApiLiveInteraction } from '../../glitter-base/route/live-purchase-inter
 import { ApplicationConfig } from '../../application-config.js';
 import { CartModule, CartLogiGroup, CartDataList } from '../modules/cart-module.js';
 import { ProductModule } from '../modules/product-module.js';
+import { BgWidget } from '../../backend-manager/bg-widget.js';
 
 const html = String.raw;
 
@@ -147,7 +148,7 @@ export class CheckoutIndex {
       apiCart = getCartData();
       const dialog = new ShareDialog(gvc.glitter);
       //初次載入不需要加載動畫
-      if(!loadings.page){
+      if (!loadings.page) {
         dialog.dataLoading({ visible: true });
       }
       const beta = false;
@@ -320,7 +321,7 @@ export class CheckoutIndex {
           [
             {
               src: `${gvc.glitter.root_path}/jslib/lottie-player.js`,
-            }
+            },
           ],
           () => {},
           () => {}
@@ -1309,7 +1310,6 @@ export class CheckoutIndex {
                                 </div>
                                 <!--贈品-->
                                 ${(() => {
-                              
                                   const giftHtml = vm.cartData.voucherList
                                     .filter((d1: any) => {
                                       return d1.reBackType === 'giveaway';
@@ -1362,10 +1362,10 @@ export class CheckoutIndex {
                                                     <button
                                                       class="${gClass('button-bgr')} mb-0 mt-2"
                                                       style="${isSelected
-                                                ? isSelected.id === pd.id
-                                                ? `background: gray !important;`
-                                                : ``
-                                                : `background: orangered !important;`}"
+                                                        ? isSelected.id === pd.id
+                                                          ? `background: gray !important;`
+                                                          : ''
+                                                        : `background: orangered !important;`}"
                                                       onclick="${gvc.event(() => {
                                                         if (isSelected && isSelected.id === pd.id) {
                                                           return;
@@ -1489,12 +1489,13 @@ export class CheckoutIndex {
                                                         );
                                                       })}"
                                                     >
-                                                      <span class="${gClass('button-text')}"
-                                                            style="${isSelected
-                                                              ? isSelected.id === pd.id
-                                                                ? ``
-                                                                : `color: white;`
-                                                              : ``}"
+                                                      <span
+                                                        class="${gClass('button-text')}"
+                                                        style="${isSelected
+                                                          ? isSelected.id === pd.id
+                                                            ? ''
+                                                            : `color: white;`
+                                                          : ''}"
                                                         >${isSelected
                                                           ? isSelected.id === pd.id
                                                             ? Language.text('selected')
@@ -2157,7 +2158,6 @@ export class CheckoutIndex {
                                               >
                                               <input
                                                 class="${gClass('input')}"
-                                                type=""
                                                 placeholder="${Language.text('postal_code')}"
                                                 value="${vm.cartData.user_info.postal_code || ''}"
                                                 onchange="${gvc.event(e => {
@@ -2395,42 +2395,92 @@ export class CheckoutIndex {
                                       style="cursor: pointer; color: #3366bb;"
                                       onclick="${gvc.event(() => {
                                         ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
-                                          ['name', 'phone', 'email'].map(dd => {
-                                            vm.cartData.user_info[dd] =
-                                              res.response.userData[dd] || vm.cartData.user_info[dd];
-                                          });
+                                          const userData = res.response.userData;
+                                          const userInfo = vm.cartData.user_info;
 
-                                          [
-                                            {
-                                              key: 'carrier_num',
-                                              refer: res.response.userData['carrier_number'],
-                                            },
-                                            {
-                                              key: 'gui_number',
-                                              refer: res.response.userData['gui_number'],
-                                            },
-                                            {
-                                              key: 'send_type',
-                                              refer:
-                                                res.response.userData['gui_number'] ||
-                                                !res.response.userData['carrier_number']
-                                                  ? 'email'
-                                                  : 'carrier_num',
-                                            },
-                                            {
-                                              key: 'invoice_type',
-                                              refer: res.response.userData['gui_number'] ? 'company' : 'me',
-                                            },
-                                            {
-                                              key: 'company',
-                                              refer: res.response.userData['company'],
-                                            },
-                                          ].map(dd => {
-                                            vm.cartData.user_info[dd.key] = dd.refer || vm.cartData.user_info[dd.key];
-                                          });
+                                          function setUserInfo(data: any) {
+                                            ['name', 'phone', 'email'].map(dd => {
+                                              userInfo[dd] = data[dd] || userInfo[dd];
+                                            });
 
-                                          this.storeLocalData(vm.cartData);
-                                          gvc.notifyDataChange('invoice_place');
+                                            const { carrier_number, gui_number, company } = data;
+
+                                            [
+                                              {
+                                                key: 'carrier_num',
+                                                refer: carrier_number,
+                                              },
+                                              {
+                                                key: 'gui_number',
+                                                refer: gui_number,
+                                              },
+                                              {
+                                                key: 'send_type',
+                                                refer: gui_number || !carrier_number ? 'email' : 'carrier_num',
+                                              },
+                                              {
+                                                key: 'invoice_type',
+                                                refer: gui_number ? 'company' : 'me',
+                                              },
+                                              {
+                                                key: 'company',
+                                                refer: company,
+                                              },
+                                            ].map(dd => {
+                                              userInfo[dd.key] = dd.refer || userInfo[dd.key];
+                                            });
+
+                                            CheckoutIndex.storeLocalData(vm.cartData);
+                                            gvc.notifyDataChange('invoice_place');
+                                          }
+
+                                          if (Array.isArray(userData.receive_list)) {
+                                            BgWidget.settingDialog({
+                                              gvc,
+                                              title: '快速帶入',
+                                              innerHTML: (iGVC: GVC) => {
+                                                const isPhone = document.body.clientWidth < 800;
+                                                const listHTML = userData.receive_list
+                                                  .map((data: any, index: number) => {
+                                                    return html`<div
+                                                      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>
+                                                        ${['name', 'email', 'phone']
+                                                          .filter(key => data[key])
+                                                          .map(key => {
+                                                            return html`<span style="line-break: anywhere;"
+                                                              >${data[key]}</span
+                                                            >`;
+                                                          })
+                                                          .join('')}
+                                                      </div>
+                                                      <button
+                                                        class="${gClass('button-bgr')}"
+                                                        style="width: ${isPhone ? 80 : 130}px;"
+                                                        onclick="${gvc.event(() => {
+                                                          iGVC.closeDialog();
+                                                          setUserInfo(data);
+                                                        })}"
+                                                      >
+                                                        <span class="${gClass('button-text')}" style="font-size: 13px;">
+                                                          ${Language.text('select')}</span
+                                                        >
+                                                      </button>
+                                                    </div>`;
+                                                  })
+                                                  .join(BgWidget.horizontalLine());
+
+                                                return html`<div class="px-2 py-3">${listHTML}</div>`;
+                                              },
+                                              footer_html: () => {
+                                                return '';
+                                              },
+                                            });
+                                          } else {
+                                            setUserInfo(userInfo);
+                                          }
                                         });
                                       })}"
                                     >
@@ -2846,7 +2896,9 @@ export class CheckoutIndex {
                                             dd.form_config.title_style = {
                                               list: [
                                                 {
-                                                  class: ['company', 'gui_number', 'carrier_num'].includes(dd.key)
+                                                  class: ['company', 'gui_number', 'carrier_num', 'love_code'].includes(
+                                                    dd.key
+                                                  )
                                                     ? gClass('label') + ' mt-2'
                                                     : gClass('label') + ' mb-2',
                                                   style:

package/lowcode/public-components/footer/footer-initial.js

@@ -9,8 +9,17 @@ export class FooterInitial {
         }
         else {
             const res_ = (() => {
-                if ((window.glitter.getUrlParameter('page').startsWith('products/') || ['account_userinfo', 'account_edit', 'order_list', 'voucher-list', 'rebate',
-                    'wishlist'].includes(window.glitter.getUrlParameter('page'))) && document.body.clientWidth < 800) {
+                if ((window.glitter.getUrlParameter('page').startsWith('products/') ||
+                    [
+                        'account_userinfo',
+                        'recipient_info',
+                        'account_edit',
+                        'order_list',
+                        'voucher-list',
+                        'rebate',
+                        'wishlist',
+                    ].includes(window.glitter.getUrlParameter('page'))) &&
+                    document.body.clientWidth < 800) {
                     return true;
                 }
                 else

package/lowcode/public-components/footer/footer-initial.ts

@@ -1,26 +1,37 @@
 import { GVC } from '../../glitterBundle/GVController.js';
 
 export class FooterInitial {
-  public static initial(cf: { browser: () => string; mobile: () => string, gvc: GVC }) {
+  public static initial(cf: { browser: () => string; mobile: () => string; gvc: GVC }) {
     const gvc = cf.gvc;
-    if(gvc.glitter.share.is_application){
-        if ((window as any).glitter.getUrlParameter('page').startsWith('products/') ) {
-            return ``;
-        }
+    if (gvc.glitter.share.is_application) {
+      if ((window as any).glitter.getUrlParameter('page').startsWith('products/')) {
+        return ``;
+      }
 
-        return cf.mobile()
-    }else{
-        const res_=(()=>{
-            if (((window as any).glitter.getUrlParameter('page').startsWith('products/') || ['account_userinfo','account_edit','order_list','voucher-list','rebate'
-            ,'wishlist'].includes((window as any).glitter.getUrlParameter('page'))) && document.body.clientWidth < 800) {
-                return true;
-            } else return (window as any).glitter.getUrlParameter('page') === 'checkout';
-        })()
-        if(res_){
-            return ``
-        }else{
-            return cf.browser()
-        }
+      return cf.mobile();
+    } else {
+      const res_ = (() => {
+        if (
+          ((window as any).glitter.getUrlParameter('page').startsWith('products/') ||
+            [
+              'account_userinfo',
+              'recipient_info',
+              'account_edit',
+              'order_list',
+              'voucher-list',
+              'rebate',
+              'wishlist',
+            ].includes((window as any).glitter.getUrlParameter('page'))) &&
+          document.body.clientWidth < 800
+        ) {
+          return true;
+        } else return (window as any).glitter.getUrlParameter('page') === 'checkout';
+      })();
+      if (res_) {
+        return ``;
+      } else {
+        return cf.browser();
+      }
     }
   }
 }