ts-glitter 21.8.4 → 21.8.7

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

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

@@ -347,6 +347,13 @@ export class POSSetting {
             });
             return product.content.variants.find((variant) => arraysEqual(variant.spec, emptyArray));
         }
+        data.content.specs.map((dd, index) => {
+            dd.option.map((d1, index) => {
+                d1.select = index === 0;
+            });
+        });
+        selectVariant = changeSelectVariant(data);
+        obj.callback(selectVariant);
         gvc.glitter.innerDialog(gvc => {
             return gvc.bindView({
                 bind: 'productDialog',
@@ -354,10 +361,14 @@ export class POSSetting {
                     var _a;
                     try {
                         selectVariant.preview_image = selectVariant.preview_image || [];
-                        selectVariant.stock =
-                            (selectVariant.stockList[POSSetting.config.where_store] &&
-                                parseInt(selectVariant.stockList[POSSetting.config.where_store].count, 10)) ||
-                                0;
+                        selectVariant.stock = gvc.glitter.share.store_list.filter((dd) => {
+                            var _a;
+                            return (dd.id === POSSetting.config.where_store) || ((_a = gvc.glitter.share.store_list.find((dd) => {
+                                return dd.id === POSSetting.config.where_store;
+                            }).support_store) !== null && _a !== void 0 ? _a : []).includes(dd.id);
+                        }).map((d1) => {
+                            return selectVariant.stockList[d1.id].count;
+                        }).reduce((acc, val) => acc + val, 0);
                         return html ` <div
                 class="w-100 h-100 d-flex align-items-center justify-content-center"
                 onclick="${gvc.event(() => gvc.glitter.closeDiaLog())}"
@@ -507,7 +518,7 @@ export class POSSetting {
                                 </div>
                                 ${selectVariant.show_understocking === 'false'
                                         ? ''
-                                        : BgWidget.blueNote('查看其他庫存點', gvc.event(() => {
+                                        : BgWidget.blueNote('查看各庫存點數量', gvc.event(() => {
                                             BgWidget.settingDialog({
                                                 gvc,
                                                 title: '其他庫存點',
@@ -528,7 +539,7 @@ export class POSSetting {
                                                                 return dataList.map((dd) => {
                                                                     return [
                                                                         {
-                                                                            key: '門市名稱',
+                                                                            key: '門市/庫存點',
                                                                             value: `<span class="fs-7">${dd.name}</span>`,
                                                                         },
                                                                         {
@@ -540,6 +551,7 @@ export class POSSetting {
                                                             }
                                                             ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
                                                                 var _a;
+                                                                console.log(`selectVariant===>`, selectVariant);
                                                                 if (dd.result && Array.isArray((_a = dd.response.value) === null || _a === void 0 ? void 0 : _a.list)) {
                                                                     dd.response.value.list.map((store) => {
                                                                         var _a, _b, _c;

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

@@ -385,6 +385,7 @@ export class POSSetting {
     const data = obj.defaultData;
     const orderDetail = obj.orderDetail;
     let selectVariant = obj.selectVariant;
+
     let count = 1;
 
     function arraysEqual(arr1: any[], arr2: any[]) {
@@ -399,7 +400,13 @@ export class POSSetting {
       });
       return product.content.variants.find((variant: any) => arraysEqual(variant.spec, emptyArray));
     }
-
+    data.content.specs.map((dd:any,index:number)=>{
+      dd.option.map((d1:any,index:number)=>{
+        d1.select = index===0;
+      })
+    });
+    selectVariant = changeSelectVariant(data);
+    obj.callback(selectVariant);
     gvc.glitter.innerDialog(
       gvc => {
         return gvc.bindView({
@@ -407,10 +414,16 @@ export class POSSetting {
           view: () => {
             try {
               selectVariant.preview_image = selectVariant.preview_image || [];
-              selectVariant.stock =
-                (selectVariant.stockList[POSSetting.config.where_store] &&
-                  parseInt(selectVariant.stockList[POSSetting.config.where_store].count, 10)) ||
-                0;
+              selectVariant.stock = gvc.glitter.share.store_list.filter((dd:any)=>{
+                return (dd.id===POSSetting.config.where_store) || (
+                  gvc.glitter.share.store_list.find((dd:any)=>{
+                    return dd.id === POSSetting.config.where_store;
+                  }).support_store ?? []
+                ).includes(dd.id);
+              }).map((d1:any)=>{
+                 return  selectVariant.stockList[d1.id].count
+                }).reduce((acc: any, val: any) => acc + val,0)
+
 
               return html` <div
                 class="w-100 h-100 d-flex align-items-center justify-content-center"
@@ -453,7 +466,7 @@ export class POSSetting {
                               'zh-TW': string;
                             };
                           }[] = data.content.specs;
-
+                       
                           return productSpecs
                             .map((spec, index1) => {
                               return html` <div>
@@ -577,7 +590,7 @@ export class POSSetting {
                                 ${selectVariant.show_understocking === 'false'
                                   ? ''
                                   : BgWidget.blueNote(
-                                      '查看其他庫存點',
+                                      '查看各庫存點數量',
                                       gvc.event(() => {
                                         BgWidget.settingDialog({
                                           gvc,
@@ -588,7 +601,6 @@ export class POSSetting {
                                               filter: [],
                                               getData: vmi => {
                                                 const dataList: { name: string; count: number }[] = [];
-
                                                 function callback() {
                                                   vmi.pageSize = 1;
                                                   vmi.originalData = dataList;
@@ -596,12 +608,11 @@ export class POSSetting {
                                                   vmi.loading = false;
                                                   vmi.callback();
                                                 }
-
                                                 function getDatalist() {
                                                   return dataList.map((dd: any) => {
                                                     return [
                                                       {
-                                                        key: '門市名稱',
+                                                        key: '門市/庫存點',
                                                         value: `<span class="fs-7">${dd.name}</span>`,
                                                       },
                                                       {
@@ -613,6 +624,7 @@ export class POSSetting {
                                                 }
 
                                                 ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
+                                                  console.log(`selectVariant===>`,selectVariant)
                                                   if (dd.result && Array.isArray(dd.response.value?.list)) {
                                                     dd.response.value.list.map((store: any) => {
                                                       const n = selectVariant.stockList?.[store.id]?.count ?? 0;

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

@@ -228,8 +228,15 @@ export class PaymentPage {
                                     if (`${data.show_understocking}` === 'false') {
                                         return '不追蹤庫存';
                                     }
-                                    const stock = data.stockList[POSSetting.config.where_store];
-                                    return `庫存: ${(stock === null || stock === void 0 ? void 0 : stock.count) || 0}`;
+                                    const stock = gvc.glitter.share.store_list.filter((dd) => {
+                                        var _a;
+                                        return (dd.id === POSSetting.config.where_store) || ((_a = gvc.glitter.share.store_list.find((dd) => {
+                                            return dd.id === POSSetting.config.where_store;
+                                        }).support_store) !== null && _a !== void 0 ? _a : []).includes(dd.id);
+                                    }).map((d1) => {
+                                        return data.stockList[d1.id].count;
+                                    }).reduce((acc, val) => acc + val, 0);
+                                    return `庫存: ${stock || 0}`;
                                 })()}
                                     </div>
                                   </div>

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

@@ -265,9 +265,17 @@ export class PaymentPage {
                                         if (`${data.show_understocking}` === 'false') {
                                           return '不追蹤庫存';
                                         }
-
-                                        const stock = data.stockList[POSSetting.config.where_store];
-                                        return `庫存: ${stock?.count || 0}`;
+                                        const stock = gvc.glitter.share.store_list.filter((dd:any)=>{
+                                          return (dd.id===POSSetting.config.where_store) || (
+                                            gvc.glitter.share.store_list.find((dd:any)=>{
+                                              return dd.id === POSSetting.config.where_store;
+                                            }).support_store ?? []
+                                          ).includes(dd.id);
+                                        }).map((d1:any)=>{
+                                          return  data.stockList[d1.id].count
+                                        }).reduce((acc: any, val: any) => acc + val,0)
+                                       
+                                        return `庫存: ${stock || 0}`;
                                       })()}
                                     </div>
                                   </div>

package/lowcode/cms-plugin/stock-stores.js

@@ -52,6 +52,7 @@ export class StockStores {
             manager_phone: '',
             note: '',
             is_shop: is_shop,
+            support_store: []
         };
     }
     static list(gvc, vm, isShop) {
@@ -161,6 +162,7 @@ export class StockStores {
                                             manager_phone: '',
                                             note: '',
                                             is_shop: false,
+                                            support_store: []
                                         },
                                     ];
                                     ApiUser.setPublicConfig({
@@ -290,6 +292,59 @@ export class StockStores {
                     })}
                     </div>
                   </div>`,
+                    (() => {
+                        if (vm.data.is_shop) {
+                            return gvc.bindView(() => {
+                                var _a;
+                                const id = gvc.glitter.getUUID();
+                                vm.data.support_store = (_a = vm.data.support_store) !== null && _a !== void 0 ? _a : [];
+                                let manager = undefined;
+                                ApiUser.getPublicConfig('store_manager', 'manager').then(res => {
+                                    manager = res;
+                                    gvc.notifyDataChange(id);
+                                });
+                                return {
+                                    bind: id,
+                                    view: () => {
+                                        if (!manager) {
+                                            return BgWidget.spinner();
+                                        }
+                                        if (!manager.response.value.list.filter((dd) => {
+                                            return !dd.is_shop;
+                                        }).length) {
+                                            return ``;
+                                        }
+                                        return BgWidget.inlineCheckBox({
+                                            title: '門市相關庫存點',
+                                            gvc: gvc,
+                                            def: vm.data.support_store,
+                                            type: 'multiple',
+                                            array: manager.response.value.list
+                                                .filter((dd) => {
+                                                return !dd.is_shop;
+                                            })
+                                                .map((dd) => {
+                                                return {
+                                                    title: dd.name,
+                                                    value: dd.id,
+                                                };
+                                            }),
+                                            callback: text => {
+                                                vm.data.support_store = text;
+                                                gvc.notifyDataChange(id);
+                                            },
+                                        });
+                                    },
+                                    divCreate: {
+                                        class: `col-12`,
+                                    },
+                                };
+                            });
+                        }
+                        else {
+                            return ``;
+                        }
+                    })(),
                     html ` <div class="tx_normal">備註</div>
                     ${EditorElem.editeText({
                         gvc: gvc,

package/lowcode/cms-plugin/stock-stores.ts

@@ -20,6 +20,7 @@ export type StoreData = {
   manager_phone: string;
   note: string;
   is_shop: boolean;
+  support_store: string[];
 };
 
 type VM = {
@@ -83,6 +84,7 @@ export class StockStores {
       manager_phone: '',
       note: '',
       is_shop: is_shop,
+      support_store:[]
     };
   }
   static list(gvc: GVC, vm: VM, isShop: boolean) {
@@ -208,6 +210,7 @@ export class StockStores {
                               manager_phone: '',
                               note: '',
                               is_shop: false,
+                              support_store:[]
                             },
                           ];
                           ApiUser.setPublicConfig({
@@ -347,6 +350,62 @@ export class StockStores {
                       })}
                     </div>
                   </div>`,
+                  (()=>{
+                    if(vm.data.is_shop){
+                      return  gvc.bindView(() => {
+
+                        const id = gvc.glitter.getUUID();
+
+                        vm.data.support_store = vm.data.support_store ?? [];
+                        let manager: any = undefined;
+                        ApiUser.getPublicConfig('store_manager', 'manager').then(res => {
+                          manager = res;
+                          gvc.notifyDataChange(id);
+                        });
+                        return {
+                          bind: id,
+                          view: () => {
+                            if (!manager) {
+                              return BgWidget.spinner();
+                            }
+                            if (
+                              !manager.response.value.list.filter((dd: any) => {
+                                return !dd.is_shop;
+                              }).length
+                            ) {
+                              return ``;
+                            }
+                            return BgWidget.inlineCheckBox({
+                              title: '門市相關庫存點',
+                              gvc: gvc,
+                              def: vm.data.support_store!,
+                              type: 'multiple',
+                              array: manager.response.value.list
+                                .filter((dd: any) => {
+                                  return !dd.is_shop;
+                                })
+                                .map((dd: any) => {
+                                  return {
+                                    title: dd.name,
+                                    value: dd.id,
+                                  };
+                                }),
+                              callback: text => {
+                                vm.data.support_store = text as any;
+                                gvc.notifyDataChange(id);
+                              },
+                            });
+                          },
+                          divCreate: {
+                            class: `col-12`,
+                          },
+                        };
+                      })
+                    }else{
+                      return ``
+                    }
+                  })()
+                 ,
                   html` <div class="tx_normal">備註</div>
                     ${EditorElem.editeText({
                       gvc: gvc,

package/lowcode/editor/basic-component.js

@@ -9452,6 +9452,16 @@ BasicComponent.componentList = [
             "formData": {}
         },
         image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/size1440_s*px$_scs0sfs1sasbs1sf_Screenshot2024-11-14at2.03.47 AM.jpg`
+    },
+    {
+        title: '社群按鈕',
+        config: { "id": "s6s7sbs4s5s5sasd", "js": "./official_view_component/official.js", "css": { "class": {}, "style": {} }, "data": { "tag": "social_popup", "_gap": "", "attr": [], "elem": "div", "list": [], "inner": "", "_other": {}, "_border": {}, "_margin": {}, "_radius": "", "_padding": {}, "_reverse": "false", "carryData": {}, "refer_app": "shop_template_black_style", "_max_width": "", "_background": "", "_style_refer": "global", "_hor_position": "center", "refer_form_data": { "social_list": [{ "icon": "https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg", "social_type": "fb" }, { "social_type": "ig" }, { "social_type": "line" }] }, "_background_setting": { "type": "none" } }, "list": [], "type": "component", "class": "w-100", "index": 2, "label": "社群彈窗", "style": "", "global": [], "mobile": { "id": "s6s7sbs4s5s5sasd", "js": "./official_view_component/official.js", "css": { "class": {}, "style": {} }, "data": { "refer_app": "shop_template_black_style" }, "list": [], "type": "component", "class": "w-100", "index": 2, "label": "社群彈窗", "style": "", "global": [], "toggle": true, "stylist": [], "version": "v2", "visible": true, "dataType": "static", "style_from": "code", "classDataType": "static", "editor_bridge": {}, "preloadEvenet": {}, "container_fonts": 0, "mobile_editable": [], "desktop_editable": [], "refreshAllParameter": {}, "refreshComponentParameter": {}, "refer": "custom" }, "toggle": true, "desktop": { "data": { "refer_app": "shop_template_black_style", "refer_form_data": {} }, "refer": "custom" }, "stylist": [], "version": "v2", "visible": true, "dataType": "static", "style_from": "code", "classDataType": "static", "editor_bridge": {}, "preloadEvenet": {}, "container_fonts": 0, "mobile_editable": [], "desktop_editable": [], "refreshAllParameter": {}, "refreshComponentParameter": {}, "formData": {} },
+        image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/Screenshot 2025-05-21 at 6.22.03 PM.jpg`
+    },
+    {
+        title: '首頁廣告',
+        config: { "id": "s4s1sfs7s9s8sds5", "js": "./official_view_component/official.js", "css": { "class": {}, "style": {} }, "data": { "tag": "banner-first", "_gap": "", "attr": [], "elem": "div", "list": [], "inner": "", "_other": {}, "_border": {}, "_margin": {}, "_radius": "", "_padding": {}, "_reverse": "false", "carryData": {}, "refer_app": "shop_template_black_style", "_max_width": "", "_background": "", "_style_refer": "custom", "_hor_position": "center", "refer_form_data": { "map": "https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3625.9857346364677!2d121.56387331536634!3d25.033964283970027!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3442abbff9f1f2cd%3A0xa5e9e25b96d47b6!2z5p2x5Y2A5rC45bq36Zmi!5e0!3m2!1szh-TW!2stw!4v1697247462832!5m2!1szh-TW!2stw", "list": [{ "img": "https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/s*px$_s7s4s2sas9s7s1s8_1747824490757.png", "link": "/all-product", "title": "所有商品頁面" }], "width": { "unit": "px", "value": "450px", "number": "450" }, "height": { "unit": "px", "value": "450px", "number": "450" } }, "_background_setting": { "type": "none" }, "_style_refer_global": { "index": "0" } }, "list": [], "type": "component", "class": "w-100", "index": 21, "label": "首圖廣告", "style": "", "global": [], "mobile": { "id": "s4s1sfs7s9s8sds5", "js": "./official_view_component/official.js", "css": { "class": {}, "style": {} }, "data": { "refer_app": "shop_template_black_style" }, "list": [], "type": "component", "class": "w-100", "index": 21, "label": "首圖廣告", "style": "", "global": [], "toggle": true, "stylist": [], "version": "v2", "visible": true, "dataType": "static", "style_from": "code", "classDataType": "static", "editor_bridge": {}, "preloadEvenet": {}, "container_fonts": 0, "mobile_editable": [], "desktop_editable": [], "refreshAllParameter": {}, "refreshComponentParameter": {}, "refer": "custom" }, "toggle": true, "desktop": { "data": { "refer_app": "shop_template_black_style", "refer_form_data": {} }, "refer": "custom" }, "stylist": [], "version": "v2", "visible": true, "dataType": "static", "style_from": "code", "classDataType": "static", "editor_bridge": {}, "preloadEvenet": {}, "container_fonts": 0, "mobile_editable": [], "desktop_editable": [], "refreshAllParameter": {}, "refreshComponentParameter": {}, "formData": {} },
+        image: `https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/Screenshot 2025-05-21 at 6.50.46 PM.jpg`
     }
 ];
 BasicComponent.productList = [

package/lowcode/editor/basic-component.ts

@@ -9067,7 +9067,17 @@ export class BasicComponent {
                 "formData": {}
             },
             image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/size1440_s*px$_scs0sfs1sasbs1sf_Screenshot2024-11-14at2.03.47 AM.jpg`
-        }
+        },
+      {
+        title: '社群按鈕',
+        config: {"id":"s6s7sbs4s5s5sasd","js":"./official_view_component/official.js","css":{"class":{},"style":{}},"data":{"tag":"social_popup","_gap":"","attr":[],"elem":"div","list":[],"inner":"","_other":{},"_border":{},"_margin":{},"_radius":"","_padding":{},"_reverse":"false","carryData":{},"refer_app":"shop_template_black_style","_max_width":"","_background":"","_style_refer":"global","_hor_position":"center","refer_form_data":{"social_list":[{"icon":"https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg","social_type":"fb"},{"social_type":"ig"},{"social_type":"line"}]},"_background_setting":{"type":"none"}},"list":[],"type":"component","class":"w-100","index":2,"label":"社群彈窗","style":"","global":[],"mobile":{"id":"s6s7sbs4s5s5sasd","js":"./official_view_component/official.js","css":{"class":{},"style":{}},"data":{"refer_app":"shop_template_black_style"},"list":[],"type":"component","class":"w-100","index":2,"label":"社群彈窗","style":"","global":[],"toggle":true,"stylist":[],"version":"v2","visible":true,"dataType":"static","style_from":"code","classDataType":"static","editor_bridge":{},"preloadEvenet":{},"container_fonts":0,"mobile_editable":[],"desktop_editable":[],"refreshAllParameter":{},"refreshComponentParameter":{},"refer":"custom"},"toggle":true,"desktop":{"data":{"refer_app":"shop_template_black_style","refer_form_data":{}},"refer":"custom"},"stylist":[],"version":"v2","visible":true,"dataType":"static","style_from":"code","classDataType":"static","editor_bridge":{},"preloadEvenet":{},"container_fonts":0,"mobile_editable":[],"desktop_editable":[],"refreshAllParameter":{},"refreshComponentParameter":{},"formData":{}},
+        image: `https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/Screenshot 2025-05-21 at 6.22.03 PM.jpg`
+      },
+      {
+        title: '首頁廣告',
+        config: {"id":"s4s1sfs7s9s8sds5","js":"./official_view_component/official.js","css":{"class":{},"style":{}},"data":{"tag":"banner-first","_gap":"","attr":[],"elem":"div","list":[],"inner":"","_other":{},"_border":{},"_margin":{},"_radius":"","_padding":{},"_reverse":"false","carryData":{},"refer_app":"shop_template_black_style","_max_width":"","_background":"","_style_refer":"custom","_hor_position":"center","refer_form_data":{"map":"https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3625.9857346364677!2d121.56387331536634!3d25.033964283970027!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3442abbff9f1f2cd%3A0xa5e9e25b96d47b6!2z5p2x5Y2A5rC45bq36Zmi!5e0!3m2!1szh-TW!2stw!4v1697247462832!5m2!1szh-TW!2stw","list":[{"img":"https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/s*px$_s7s4s2sas9s7s1s8_1747824490757.png","link":"/all-product","title":"所有商品頁面"}],"width":{"unit":"px","value":"450px","number":"450"},"height":{"unit":"px","value":"450px","number":"450"}},"_background_setting":{"type":"none"},"_style_refer_global":{"index":"0"}},"list":[],"type":"component","class":"w-100","index":21,"label":"首圖廣告","style":"","global":[],"mobile":{"id":"s4s1sfs7s9s8sds5","js":"./official_view_component/official.js","css":{"class":{},"style":{}},"data":{"refer_app":"shop_template_black_style"},"list":[],"type":"component","class":"w-100","index":21,"label":"首圖廣告","style":"","global":[],"toggle":true,"stylist":[],"version":"v2","visible":true,"dataType":"static","style_from":"code","classDataType":"static","editor_bridge":{},"preloadEvenet":{},"container_fonts":0,"mobile_editable":[],"desktop_editable":[],"refreshAllParameter":{},"refreshComponentParameter":{},"refer":"custom"},"toggle":true,"desktop":{"data":{"refer_app":"shop_template_black_style","refer_form_data":{}},"refer":"custom"},"stylist":[],"version":"v2","visible":true,"dataType":"static","style_from":"code","classDataType":"static","editor_bridge":{},"preloadEvenet":{},"container_fonts":0,"mobile_editable":[],"desktop_editable":[],"refreshAllParameter":{},"refreshComponentParameter":{},"formData":{}},
+        image: `https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/Screenshot 2025-05-21 at 6.50.46 PM.jpg`
+      }
     ]
 
     public static productList = [

package/lowcode/glitterBundle/plugins/html-render.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { init } from '../GVController.js';
 import { TriggerEvent } from './trigger-event.js';
 import { GlobalUser } from '../../glitter-base/global/global-user.js';
-import { FirstBanner } from '../../public-components/banner/first-banner.js';
 import { Language } from '../../glitter-base/global/language.js';
 import { ApplicationConfig } from '../../application-config.js';
 const html = String.raw;
@@ -91,7 +90,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
     return {
         onCreateView: () => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
-            FirstBanner.main({ gvc: gvc });
             if (gBundle.page_config.seo && gBundle.page_config.seo.type === 'custom' && gBundle.page_config.seo.title) {
                 glitter.setUrlParameter('', undefined, [
                     (_a = gBundle.page_config.seo.title_prefix) !== null && _a !== void 0 ? _a : '',

package/lowcode/glitterBundle/plugins/html-render.ts

@@ -76,7 +76,6 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
 
   return {
     onCreateView: () => {
-      FirstBanner.main({ gvc: gvc });
       //定義SEO TITLE
       if (gBundle.page_config.seo && gBundle.page_config.seo.type === 'custom' && gBundle.page_config.seo.title) {
         glitter.setUrlParameter(

package/lowcode/jspage/function-page/setting_editor.js

@@ -77,7 +77,7 @@ export class Setting_editor {
                     ].includes(item.page)) {
                         return userPlan > 1;
                     }
-                    if (['app-design', 'app-upload', 'cloud_subscrible', 'notify_message_list'].includes(item.page)) {
+                    if (['app-design', 'app-upload', 'cloud_subscrible', 'notify_message_list', 'auto_fcm_push', 'auto_fcm_advertise', 'upload', 'auto_fcm_history'].includes(item.page)) {
                         return userPlan > 2;
                     }
                     return true;

package/lowcode/jspage/function-page/setting_editor.ts

@@ -964,7 +964,7 @@ export class Setting_editor {
                 ) {
                     return userPlan > 1;
                 }
-                if (['app-design', 'app-upload', 'cloud_subscrible', 'notify_message_list'].includes(item.page)) {
+                if (['app-design', 'app-upload', 'cloud_subscrible', 'notify_message_list','auto_fcm_push','auto_fcm_advertise','upload','auto_fcm_history'].includes(item.page)) {
                     return userPlan > 2;
                 }
                 return true;

package/lowcode/jspage/function-page/tool-setting.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { ApiPageConfig } from '../../api/pageConfig.js';
-import { FirstBanner } from '../../public-components/banner/first-banner.js';
 import { GlobalWidget } from '../../editor-components/global-widget/global-widget.js';
 export class ToolSetting {
     static main(gvc) {
@@ -173,10 +172,7 @@ export class ToolSetting {
                         const htmlGenerate = new gvc.glitter.htmlGenerate(widget_container, [], {
                             editor_updated_callback: (oWidget) => {
                                 if (dd.tag === '廣告輪播') {
-                                    FirstBanner.main({
-                                        gvc: document.querySelector('.iframe_view').contentWindow.glitter.pageConfig[0].gvc,
-                                        ed_widget: oWidget,
-                                    });
+                                    console.log(`oWidget==>`, oWidget);
                                 }
                             },
                         }, true);

package/lowcode/jspage/function-page/tool-setting.ts

@@ -213,10 +213,11 @@ export class ToolSetting {
             {
               editor_updated_callback: (oWidget: any) => {
                 if (dd.tag === '廣告輪播') {
-                  FirstBanner.main({
-                    gvc: (document.querySelector('.iframe_view') as any).contentWindow.glitter.pageConfig[0].gvc,
-                    ed_widget: oWidget,
-                  });
+                  console.log(`oWidget==>`,oWidget)
+                  // FirstBanner.main({
+                  //   gvc: (document.querySelector('.iframe_view') as any).contentWindow.glitter.pageConfig[0].gvc,
+                  //   // ed_widget: oWidget,
+                  // });
                 }
               },
             },

package/lowcode/jspage/main.js

@@ -743,12 +743,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                                                 src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
                                                 index: 'color',
                                                 hint: '全站樣式',
-                                            },
-                                            {
-                                                src: `fa-regular fa-grid-2 design-guide-1-icon`,
-                                                index: 'widget',
-                                                hint: '設計元件',
-                                            },
+                                            }
                                         ]
                                             .filter(dd => {
                                             if (gvc.glitter.getUrlParameter('device') === 'mobile') {

package/lowcode/jspage/main.ts

@@ -804,12 +804,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                               src: `fa-sharp fa-regular fa-globe guide-user-editor-11-icon`,
                               index: 'color',
                               hint: '全站樣式',
-                            },
-                            {
-                              src: `fa-regular fa-grid-2 design-guide-1-icon`,
-                              index: 'widget',
-                              hint: '設計元件',
-                            },
+                            }
                           ]
                             .filter(dd => {
                               if (gvc.glitter.getUrlParameter('device') === 'mobile') {

package/lowcode/modules/image-library.js

@@ -1099,7 +1099,6 @@ export class imageLibrary {
                                 if (cf.key === 'album') {
                                     dialog.successMessage({ text: '相簿建立成功' });
                                     cf.getSelect(selected);
-                                    gvc.closeDialog();
                                     return;
                                 }
                                 if (['image-manager', 'folderEdit'].includes(cf.key)) {

package/lowcode/modules/image-library.ts

@@ -1225,7 +1225,7 @@ export class imageLibrary {
                 if (cf.key === 'album') {
                   dialog.successMessage({ text: '相簿建立成功' });
                   cf.getSelect(selected);
-                  gvc.closeDialog();
+                  // gvc.closeDialog();
                   return;
                 }
 

package/lowcode/official_view_component/official/component.js

@@ -1178,7 +1178,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter, editM
                                                                                                                                         </div>`,
                                                                                                                         ` <div class="mx-n3" style="background: #DDD;height: 1px;"></div>`,
                                                                                                                     ].join(`<div style="height:18px;"></div>`);
-                                                                                                                    if (app_editor || glitter.share.editorViewModel.selectItem.is_customer_header) {
+                                                                                                                    if (app_editor || ((glitter.share.editorViewModel.selectItem) && glitter.share.editorViewModel.selectItem.is_customer_header)) {
                                                                                                                         global_setting_view = ``;
                                                                                                                     }
                                                                                                                     if (vm.page === 'editor') {

package/lowcode/official_view_component/official/component.ts

@@ -1355,7 +1355,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
                                                                                                                                         </div>`,
                                                                 ` <div class="mx-n3" style="background: #DDD;height: 1px;"></div>`,
                                                               ].join(`<div style="height:18px;"></div>`);
-                                                              if (app_editor || glitter.share.editorViewModel.selectItem.is_customer_header) {
+                                                              if (app_editor || ((glitter.share.editorViewModel.selectItem) && glitter.share.editorViewModel.selectItem.is_customer_header)) {
                                                                 global_setting_view = ``;
                                                               }
                                                               if (vm.page === 'editor') {