ts-glitter 21.7.2 → 21.7.3

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.7.2';
+            glitter.share.editerVersion = 'V_21.7.3';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {
@@ -547,7 +547,7 @@ export class Entry {
         callback();
     }
     static toNormalRender(glitter, vm, callback) {
-        if (['hidden/', 'shop/'].find((dd) => {
+        if (['hidden/', 'shop/', 'pages/'].find((dd) => {
             return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd));
         })) {
             const og_path = glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');

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.7.2';
+      glitter.share.editerVersion = 'V_21.7.3';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {
@@ -597,7 +597,7 @@ export class Entry {
   // 跳轉至一般頁面
   public static toNormalRender(glitter: Glitter, vm: any, callback: () => void) {
     //紀錄初始載入頁面，後續會帶入query當中用與替換Header避免跳頁
-    if(['hidden/','shop/'].find((dd)=>{
+    if(['hidden/','shop/','pages/'].find((dd)=>{
       return (glitter.getUrlParameter('page') || '').startsWith(dd) || ((glitter.getUrlParameter('page_refer') || '').startsWith(dd))
     })){
       const og_path=glitter.getUrlParameter('page_refer') || glitter.getUrlParameter('page');

package/lowcode/api/pageConfig.js

@@ -171,7 +171,6 @@ export class ApiPageConfig {
         })) {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 data.config[0].is_customer_header = true;
-                data.config[0].data.menu_refer = glitter.share.menu_refer;
                 yield ApiUser.setPublicConfig({
                     key: 'c_header_' + window.parent.glitter.getUrlParameter('page'),
                     value: data.config,
@@ -182,6 +181,21 @@ export class ApiPageConfig {
                 });
             }));
         }
+        else if (data.tag === 'footer' && ['pages/', 'hidden/', 'shop/'].find((dd) => {
+            return window.parent.glitter.getUrlParameter('page').startsWith(dd);
+        })) {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                data.config[0].is_customer_footer = true;
+                yield ApiUser.setPublicConfig({
+                    key: 'c_footer_' + window.parent.glitter.getUrlParameter('page'),
+                    value: data.config,
+                    user_id: 'manager',
+                });
+                resolve({
+                    result: true
+                });
+            }));
+        }
         else {
             return BaseApi.create({
                 "url": config.url + `/api/v1/template`,

package/lowcode/api/pageConfig.ts

@@ -210,8 +210,6 @@ const glitter=(window as any).glitter;
       })){
        return  new Promise(async (resolve,reject)=>{
          (data.config as any)[0].is_customer_header=true;
-         (data.config as any)[0].data.menu_refer=glitter.share.menu_refer;
-
          await ApiUser.setPublicConfig({
            key: 'c_header_'+(window.parent as any).glitter.getUrlParameter('page'),
            value: data.config,
@@ -220,17 +218,21 @@ const glitter=(window as any).glitter;
          resolve({
            result: true
          })
-       })
-        // return BaseApi.create({
-        //   "url": config.url + `/api/v1/template`,
-        //   "type": "PUT",
-        //   "timeout": 0,
-        //   "headers": {
-        //     "Content-Type": "application/json",
-        //     "Authorization": config.token
-        //   },
-        //   data: JSON.stringify(data)
-        // })
+       });
+      }else if(data.tag==='footer' && ['pages/','hidden/','shop/'].find((dd)=>{
+        return (window.parent as any).glitter.getUrlParameter('page').startsWith(dd)
+      })){
+        return  new Promise(async (resolve,reject)=>{
+          (data.config as any)[0].is_customer_footer=true;
+          await ApiUser.setPublicConfig({
+            key: 'c_footer_'+(window.parent as any).glitter.getUrlParameter('page'),
+            value: data.config,
+            user_id: 'manager',
+          })
+          resolve({
+            result: true
+          })
+        })
       }else{
         return BaseApi.create({
           "url": config.url + `/api/v1/template`,

package/lowcode/cms-plugin/line-auto-reply.js

@@ -115,6 +115,7 @@ export class AutoReply {
                                 'auto-line-shipment-arrival',
                                 'auto-line-payment-successful',
                                 'auto-line-order-create',
+                                'auto-line-order-cancel-success',
                                 'line-proof-purchase',
                                 'auto-line-birthday',
                             ];

package/lowcode/cms-plugin/line-auto-reply.ts

@@ -135,6 +135,7 @@ export class AutoReply {
                                                 'auto-line-shipment-arrival',
                                                 'auto-line-payment-successful',
                                                 'auto-line-order-create',
+                                                'auto-line-order-cancel-success',
                                                 'line-proof-purchase',
                                                 'auto-line-birthday',
                                             ];

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

@@ -14,7 +14,7 @@ import { LanguageBackend } from './language-backend.js';
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 const html = String.raw;
 export class MenusSetting {
-    static main(gvc, widget) {
+    static main(gvc, widget, def) {
         const html = String.raw;
         const glitter = gvc.glitter;
         const vm = {
@@ -22,7 +22,7 @@ export class MenusSetting {
             index: 0,
             dataList: undefined,
             query: '',
-            tab: 'menu',
+            tab: def || 'menu',
             select: { title: '', tag: '' }
         };
         const filterID = gvc.glitter.getUUID();
@@ -64,7 +64,7 @@ export class MenusSetting {
                                     menu_all.list = [
                                         {
                                             tag: gvc.glitter.getUUID(),
-                                            title: [tab, `${menu_all.list.length + 1}`].join(''),
+                                            title: title || [tab, `${(menu_all.list.length + 1)}`].join(''),
                                             tab: vm.tab === 'menu' ? 'menu-setting' : 'footer-setting'
                                         }
                                     ].concat(menu_all.list);
@@ -103,7 +103,7 @@ export class MenusSetting {
                             });
                         })))}
               </div>
-              ${BgWidget.tab([
+              ${def ? `` : BgWidget.tab([
                             { title: '主選單', key: 'menu' },
                             { title: '頁腳', key: 'footer' }
                         ], gvc, vm.tab, (text) => {

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

@@ -16,7 +16,7 @@ interface MenuItem {
 }
 
 export class MenusSetting {
-  public static main(gvc: GVC, widget: any) {
+  public static main(gvc: GVC, widget: any,def:'menu'|'footer') {
     const html = String.raw;
     const glitter = gvc.glitter;
 
@@ -32,7 +32,7 @@ export class MenusSetting {
       index: 0,
       dataList: undefined,
       query: '',
-      tab:'menu',
+      tab:def || 'menu',
       select:{title:'',tag:''}
     };
     const filterID = gvc.glitter.getUUID();
@@ -78,7 +78,7 @@ export class MenusSetting {
                       menu_all.list=[
                         {
                           tag:gvc.glitter.getUUID(),
-                          title:[tab,`${menu_all.list.length+1}`].join(''),
+                          title:title || [tab,`${(menu_all.list.length+1)}`].join(''),
                           tab:vm.tab==='menu' ? 'menu-setting':'footer-setting'
                         }
                       ].concat(menu_all.list);
@@ -120,7 +120,7 @@ export class MenusSetting {
                   })
                 )}
               </div>
-              ${BgWidget.tab(
+              ${def ? ``:BgWidget.tab(
                 [
                   { title: '主選單', key: 'menu' },
                   { title: '頁腳', key: 'footer' }

package/lowcode/cms-plugin/shopping-market-shopee.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { BgWidget } from '../backend-manager/bg-widget.js';
 import { ApiUser } from '../glitter-base/route/user.js';
-import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { ApiShopee } from '../glitter-base/route/shopee.js';
 import { ApiPageConfig } from '../api/pageConfig.js';
 const css = String.raw;
@@ -321,30 +320,13 @@ export class MarketShopee {
                     授權蝦皮
                   </button>
                   <button
-                    class="shopee-btn mt-3"
+                    class="shopee-btn mt-3 d-none"
                     onclick="${gvc.event(() => {
                             localStorage.setItem('shopee', window.parent.location.href);
                             ApiShopee.generateOrderAuth(window.parent.location.href);
                         })}"
                   >
-                    授權蝦皮訂單同步
-                  </button>
-                  <button
-                    id=""
-                    class="shopee-btn mt-3 d-none"
-                    onclick="${gvc.event(() => {
-                            const dialog = new ShareDialog(gvc.glitter);
-                            dialog.dataLoading({
-                                visible: true,
-                            });
-                            ApiShopee.syncProduct((res) => {
-                                dialog.dataLoading({
-                                    visible: false,
-                                });
-                            });
-                        })}"
-                  >
-                    同步商品庫存
+                    授權訂單同步
                   </button>
                 `),
                         BgWidget.mbContainer(18),

package/lowcode/cms-plugin/shopping-market-shopee.ts

@@ -352,30 +352,13 @@ export class MarketShopee {
                     授權蝦皮
                   </button>
                   <button
-                    class="shopee-btn mt-3"
+                    class="shopee-btn mt-3 d-none"
                     onclick="${gvc.event(() => {
                       localStorage.setItem('shopee', window.parent.location.href);
                       ApiShopee.generateOrderAuth(window.parent.location.href);
                     })}"
                   >
-                    授權蝦皮訂單同步
-                  </button>
-                  <button
-                    id=""
-                    class="shopee-btn mt-3 d-none"
-                    onclick="${gvc.event(() => {
-                      const dialog = new ShareDialog(gvc.glitter);
-                      dialog.dataLoading({
-                        visible: true,
-                      });
-                      ApiShopee.syncProduct((res: any) => {
-                        dialog.dataLoading({
-                          visible: false,
-                        });
-                      });
-                    })}"
-                  >
-                    同步商品庫存
+                    授權訂單同步
                   </button>
                 `),
                 BgWidget.mbContainer(18),
@@ -398,6 +381,7 @@ export class MarketShopee {
                     })
                   },
                 }),
+                //todo 訂單同步
                 // BgWidget.mbContainer(18),
                 // showShopeeBlock({
                 //   btnText: '匯入訂單',

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

@@ -379,6 +379,7 @@ export class ShoppingOrderManager {
           BgWidget.tableV3({
             gvc: gvc,
             defPage: ShoppingOrderManager.vm.page,
+            
             getData: vmi => {
               ShoppingOrderManager.vm.page = vmi.page;
               vm.apiJSON = {

package/lowcode/editor-components/global-widget/bridge.js

@@ -1,4 +1,14 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { ToolSetting } from '../../jspage/function-page/tool-setting.js';
+import { ApiUser } from '../../glitter-base/route/user.js';
 const html = String.raw;
 export class Bridge {
     static grayButton(text, event, obj) {
@@ -30,7 +40,6 @@ export class Bridge {
       </select>`;
     }
     static main(obj) {
-        console.log(`refer_form_data=>`, obj.widget);
         const gvc = obj.gvc;
         const glitter = gvc.glitter;
         const is_sub_page = ['pages/', 'hidden/', 'shop/'].find((dd) => {
@@ -39,7 +48,7 @@ export class Bridge {
         const c_view = [
             `<div style="height:5px;"></div>`,
         ];
-        c_view.push(ToolSetting.item({
+        c_view.push(`<div class="mx-n2">${ToolSetting.item({
             gvc: gvc,
             dd: (() => {
                 switch (glitter.share.editorViewModel.selectItem.data.tag) {
@@ -71,7 +80,90 @@ export class Bridge {
                         };
                 }
             })(),
-        }));
+        })}</div>`);
+        if (['c_header', 'footer'].includes(glitter.share.editorViewModel.selectItem.data.tag)) {
+            c_view.push([
+                `<div class="fs-6 mb-2" style="color: black;">選單列表內容</div>`,
+                gvc.bindView(() => {
+                    const bi = gvc.glitter.getUUID();
+                    return {
+                        bind: bi,
+                        view: () => __awaiter(this, void 0, void 0, function* () {
+                            var _a, _b;
+                            try {
+                                const vm = {
+                                    tab: (glitter.share.editorViewModel.selectItem.data.tag === 'c_header') ? 'menu' : 'footer',
+                                    dataList: []
+                                };
+                                const tag = vm.tab === 'menu' ? 'menu-setting' : 'footer-setting';
+                                let menu_all = (yield ApiUser.getPublicConfig('menu-setting-list', 'manager')).response.value;
+                                menu_all.list = (_a = menu_all.list) !== null && _a !== void 0 ? _a : [];
+                                vm.dataList = [
+                                    { tag: tag, title: `系統預設
+                        ` },
+                                    ...menu_all.list.filter((d1) => {
+                                        return d1.tab === tag;
+                                    })
+                                ];
+                                return [
+                                    this.select({
+                                        gvc: gvc,
+                                        callback: (text) => {
+                                            obj.subData.form_data['menu_refer'] = text;
+                                            obj.subData.refresh();
+                                        },
+                                        default: (_b = obj.subData.form_data['menu_refer']) !== null && _b !== void 0 ? _b : tag,
+                                        options: vm.dataList.map((dd) => {
+                                            return {
+                                                key: dd.tag,
+                                                value: dd.title
+                                            };
+                                        })
+                                    }),
+                                    this.grayButton('設定', gvc.event(() => {
+                                        gvc.glitter.getModule(`${gvc.glitter.root_path}cms-plugin/menus-setting.js`, menu => {
+                                            gvc.glitter.innerDialog((gvc) => {
+                                                return html `
+                          <div class="vw-100 vh-100 bg-white">
+                            <div class="d-flex align-items-center" style="height: 60px;width: 100vw;border-bottom: solid 1px #DDD;font-size: 16px;font-style: normal;font-weight: 700;color: #393939;">
+                              <div class="d-flex" style="padding:19px 32px;gap:8px;cursor: pointer;border-right: solid 1px #DDD;" onclick="${gvc.event(() => {
+                                                    gvc.closeDialog();
+                                                })}">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                  <path d="M13.7859 4.96406L8.02969 10.7203C7.69219 11.0578 7.5 11.5219 7.5 12C7.5 12.4781 7.69219 12.9422 8.02969 13.2797L13.7859 19.0359C14.0859 19.3359 14.4891 19.5 14.9109 19.5C15.7875 19.5 16.5 18.7875 16.5 17.9109V15H22.5C23.3297 15 24 14.3297 24 13.5V10.5C24 9.67031 23.3297 9 22.5 9H16.5V6.08906C16.5 5.2125 15.7875 4.5 14.9109 4.5C14.4891 4.5 14.0859 4.66875 13.7859 4.96406ZM7.5 19.5H4.5C3.67031 19.5 3 18.8297 3 18V6C3 5.17031 3.67031 4.5 4.5 4.5H7.5C8.32969 4.5 9 3.82969 9 3C9 2.17031 8.32969 1.5 7.5 1.5H4.5C2.01562 1.5 0 3.51562 0 6V18C0 20.4844 2.01562 22.5 4.5 22.5H7.5C8.32969 22.5 9 21.8297 9 21C9 20.1703 8.32969 19.5 7.5 19.5Z" fill="#393939"></path>
+                                </svg>
+                                返回
+                              </div>
+                              <div class="flex-fill" style="padding: 19px 32px;">編輯選單內容</div>
+                            </div>
+                            <div class="w-100">${menu.main(gvc, obj.widget, vm.tab)}</div>
+                          </div>
+`;
+                                            }, 'menus-setting', {
+                                                dismiss: () => {
+                                                    gvc.notifyDataChange(bi);
+                                                    obj.subData.refresh();
+                                                }
+                                            });
+                                            setTimeout(() => {
+                                                document.querySelector('.glitter-dialog').style.zIndex = 9999;
+                                            }, 1000);
+                                        });
+                                    }), {})
+                                ].join('');
+                            }
+                            catch (e) {
+                                console.log(e);
+                                return ``;
+                            }
+                        }),
+                        divCreate: {
+                            class: `d-flex align-items-center mb-2`, style: `gap:5px;`
+                        }
+                    };
+                })
+            ].join(''));
+        }
         c_view.push(`<div style="height:1px;" class="border-top mx-n3"></div>`);
         return c_view.join(`<div style="height:10px;"></div>`);
     }