ts-glitter 21.8.3 → 21.8.4

package/lowcode/public-components/banner/first-banner.js

@@ -7,6 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { ApiPageConfig } from "../../api/pageConfig.js";
+import { GlobalWidget } from "../../glitterBundle/html-component/global-widget.js";
 const html = String.raw;
 const css = String.raw;
 export class FirstBanner {
@@ -37,18 +39,50 @@ export class FirstBanner {
                 background: #393939!important;
             }
         `);
-            const formData = obj.widget.formData;
-            if (formData.list && formData.list.length) {
-                obj.gvc.glitter.innerDialog((gvc) => {
-                    return gvc.bindView(() => {
-                        return {
-                            bind: id,
-                            view: () => {
-                                return html `
+            const widget = obj.ed_widget || ((yield ApiPageConfig.getPage({
+                appName: gvc.glitter.window.appName,
+                type: 'template',
+                tag: 'advertise',
+            })).response.result[0]).config[0];
+            (gvc.glitter.window.glitterInitialHelper).getPageData({
+                tag: widget.data.tag,
+                appName: widget.data.refer_app
+            }, (d2) => {
+                const data = d2.response.result[0];
+                function getFormData(ref) {
+                    var _a, _b;
+                    ref = window.parent.glitter.share.updated_form_data[`${widget.refer_app}_${widget.tag}`] || ref;
+                    let formData = JSON.parse(JSON.stringify(ref || {}));
+                    if ((widget.data.refer_app)) {
+                        GlobalWidget.initialShowCaseData({
+                            widget: widget,
+                            gvc: gvc
+                        });
+                        if (gvc.glitter.document.body.clientWidth < 800 && widget.mobile.refer === 'custom') {
+                            ((_a = widget[`mobile_editable`]) !== null && _a !== void 0 ? _a : []).map((dd) => {
+                                formData[dd] = JSON.parse(JSON.stringify((widget.mobile.data.refer_form_data || data.page_config.formData)[dd] || {}));
+                            });
+                        }
+                        else if (gvc.glitter.document.body.clientWidth >= 800 && widget.desktop.refer === 'custom') {
+                            ((_b = widget[`desktop_editable`]) !== null && _b !== void 0 ? _b : []).map((dd) => {
+                                formData[dd] = JSON.parse(JSON.stringify((widget.desktop.data.refer_form_data || data.page_config.formData)[dd] || {}));
+                            });
+                        }
+                    }
+                    return formData;
+                }
+                const formData = getFormData((widget.data.refer_app) ? (widget.data.refer_form_data || data.page_config.formData) : data.page_config.formData);
+                if (formData.list && formData.list.length) {
+                    obj.gvc.glitter.innerDialog((gvc) => {
+                        return gvc.bindView(() => {
+                            return {
+                                bind: id,
+                                view: () => {
+                                    return html `
                             <div class="swiper mySwiper_${id}" style="width:520px;max-width:100vw;height:auto !important;">
                                 <div class="swiper-wrapper">
                                     ${formData.list.map((dd) => {
-                                    return html `
+                                        return html `
                                                     <div class="swiper-slide pb-4 d-flex align-items-center justify-content-center position-relative"
                                                          style="background: none;
 overflow: hidden;;
@@ -56,60 +90,61 @@ overflow: hidden;;
                                                         <img  src="${dd.img || 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'}" style="width:520px;max-width:calc(100vw - 40px);max-height: 100vh;cursor: pointer;
 border-radius: 25px;
 " onclick="${gvc.event(() => {
-                                        gvc.glitter.href = dd.link;
-                                        gvc.closeDialog();
-                                    })}" >
+                                            gvc.glitter.href = dd.link;
+                                            gvc.closeDialog();
+                                        })}" >
                                                         <div class="position-absolute d-flex align-items-center justify-content-center"
                                                              style="top:0px;right: 0px;width:50px;height: 50px;
 background: rgba(0,0,0,0.5);border-top-right-radius: 25px;border-bottom-left-radius: 10px;cursor: pointer;" onclick="${(() => {
-                                        if (gvc.glitter.htmlGenerate.isEditMode()) {
-                                            return gvc.editorEvent(() => {
-                                                gvc.closeDialog();
-                                            });
-                                        }
-                                        else {
-                                            return gvc.event(() => {
-                                                gvc.closeDialog();
-                                            });
-                                        }
-                                    })()}">
+                                            if (gvc.glitter.htmlGenerate.isEditMode()) {
+                                                return gvc.editorEvent(() => {
+                                                    gvc.closeDialog();
+                                                });
+                                            }
+                                            else {
+                                                return gvc.event(() => {
+                                                    gvc.closeDialog();
+                                                });
+                                            }
+                                        })()}">
                                                             <i class="fa-regular fa-circle-xmark text-white fs-5"
                                                                ></i>
                                                         </div>
                                                     </div>
                                                 `;
-                                }).join('')}
+                                    }).join('')}
                                 </div>
                                 <div class="swiper-pagination swiper-pagination-${id}"></div>
                             </div>`;
-                            },
-                            divCreate: {
-                                class: `vw-100 vh-100 position-fixed ${id} d-flex align-items-center justify-content-center`,
-                                style: css `z-index: 999999;
+                                },
+                                divCreate: {
+                                    class: `vw-100 vh-100 position-fixed ${id} d-flex align-items-center justify-content-center`,
+                                    style: css `z-index: 999999;
                             background: rgba(0, 0, 0, 0.5);`
-                            },
-                            onCreate: () => {
-                                const interval = setInterval(() => {
-                                    if (gvc.glitter.window.Swiper) {
-                                        const swiper = new gvc.glitter.window.Swiper(`.mySwiper_${id}`, {
-                                            loop: true,
-                                            pagination: {
-                                                el: `.swiper-pagination-${id}`,
-                                                clickable: true,
-                                            },
-                                            on: {
-                                                slideChange: function () {
+                                },
+                                onCreate: () => {
+                                    const interval = setInterval(() => {
+                                        if (gvc.glitter.window.Swiper) {
+                                            const swiper = new gvc.glitter.window.Swiper(`.mySwiper_${id}`, {
+                                                loop: true,
+                                                pagination: {
+                                                    el: `.swiper-pagination-${id}`,
+                                                    clickable: true,
                                                 },
-                                            },
-                                        });
-                                        clearTimeout(interval);
-                                    }
-                                }, 100);
-                            }
-                        };
-                    });
-                }, 'first-banner', {});
-            }
+                                                on: {
+                                                    slideChange: function () {
+                                                    },
+                                                },
+                                            });
+                                            clearTimeout(interval);
+                                        }
+                                    }, 100);
+                                }
+                            };
+                        });
+                    }, 'first-banner', {});
+                }
+            });
             return ``;
         });
     }

package/lowcode/public-components/banner/first-banner.ts

@@ -8,10 +8,9 @@ const css = String.raw
 
 export class FirstBanner {
 
-    public static async main(obj:{
-      gvc: GVC,
-      widget: any,
-      subData: any
+    public static async main(obj: {
+        gvc: GVC,
+        ed_widget?:any
     }) {
 
         const gvc = obj.gvc
@@ -39,21 +38,57 @@ export class FirstBanner {
                 background: #393939!important;
             }
         `)
-      const formData = obj.widget.formData;
+        const widget=obj.ed_widget || ((
+            await ApiPageConfig.getPage({
+                appName: (gvc.glitter.window as any).appName,
+                type: 'template',
+                tag:'advertise',
+            })
+        ).response.result[0]).config[0];
+        ((gvc.glitter.window as any).glitterInitialHelper).getPageData( {
+            tag: widget.data.tag,
+            appName: widget.data.refer_app
+        }, (d2: any) => {
+            const data = d2.response.result[0]
+            function getFormData(ref: any) {
+                //判斷是否有上次的更新資料
+                ref= (window.parent as any).glitter.share.updated_form_data[`${widget.refer_app}_${widget.tag}`] || ref;
+                let formData = JSON.parse(JSON.stringify(ref || {}))
+                if ((widget.data.refer_app)) {
+                    GlobalWidget.initialShowCaseData({
+                        widget: widget,
+                        gvc: gvc
+                    });
+                    if (gvc.glitter.document.body.clientWidth < 800 && (widget as any).mobile.refer === 'custom') {
+                        ((widget as any)[`mobile_editable`] ?? []).map((dd: any) => {
+                            formData[dd] = JSON.parse(JSON.stringify(((widget as any).mobile.data.refer_form_data || data.page_config.formData)[dd] || {}))
+                        });
+                        // data.page_config.formData = (widget.data.refer_form_data || data.page_config.formData)
+                    } else if (gvc.glitter.document.body.clientWidth >= 800 && (widget as any).desktop.refer === 'custom') {
+                        ((widget as any)[`desktop_editable`] ?? []).map((dd: any) => {
+                            formData[dd] = JSON.parse(JSON.stringify(((widget as any).desktop.data.refer_form_data || data.page_config.formData)[dd] || {}))
+                        });
 
-      if(formData.list && formData.list.length){
-        obj.gvc.glitter.innerDialog((gvc) => {
-          return gvc.bindView(() => {
+                        // data.page_config.formData = ((widget as any).desktop.data.refer_form_data || data.page_config.formData);
+                    }
 
-            return {
-              bind: id,
-              view: () => {
-                return html`
+                }
+                return formData;
+            }
+            const formData=getFormData((widget.data.refer_app) ? (widget.data.refer_form_data || data.page_config.formData) : data.page_config.formData);
+            if(formData.list && formData.list.length){
+                obj.gvc.glitter.innerDialog((gvc) => {
+                    return gvc.bindView(() => {
+
+                        return {
+                            bind: id,
+                            view: () => {
+                                return html`
                             <div class="swiper mySwiper_${id}" style="width:520px;max-width:100vw;height:auto !important;">
                                 <div class="swiper-wrapper">
                                     ${
-                  formData.list.map((dd:any) => {
-                    return html`
+                                            formData.list.map((dd:any) => {
+                                        return html`
                                                     <div class="swiper-slide pb-4 d-flex align-items-center justify-content-center position-relative"
                                                          style="background: none;
 overflow: hidden;;
@@ -61,66 +96,68 @@ overflow: hidden;;
                                                         <img  src="${dd.img || 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'}" style="width:520px;max-width:calc(100vw - 40px);max-height: 100vh;cursor: pointer;
 border-radius: 25px;
 " onclick="${gvc.event(() => {
-                      gvc.glitter.href=dd.link;
-                      gvc.closeDialog()
-                    })}" >
+                                            gvc.glitter.href=dd.link;
+                                            gvc.closeDialog()
+                                        })}" >
                                                         <div class="position-absolute d-flex align-items-center justify-content-center"
                                                              style="top:0px;right: 0px;width:50px;height: 50px;
 background: rgba(0,0,0,0.5);border-top-right-radius: 25px;border-bottom-left-radius: 10px;cursor: pointer;" onclick="${
-                      (()=>{
-                        if(gvc.glitter.htmlGenerate.isEditMode()){
-                          return  gvc.editorEvent(()=>{
-                            gvc.closeDialog()
-                          })
-                        }else{
-                          return gvc.event(()=>{
-                            gvc.closeDialog()
-                          })
-                        }
-                      })()}">
+                                                                (()=>{
+                                                                    if(gvc.glitter.htmlGenerate.isEditMode()){
+                                                                        return  gvc.editorEvent(()=>{
+                                                                            gvc.closeDialog()
+                                                                        })
+                                                                    }else{
+                                                                        return gvc.event(()=>{
+                                                                            gvc.closeDialog()
+                                                                        })
+                                                                    }
+                                                                })()}">
                                                             <i class="fa-regular fa-circle-xmark text-white fs-5"
                                                                ></i>
                                                         </div>
                                                     </div>
                                                 `
-                  }).join('')
-                }
+                                    }).join('')
+                                }
                                 </div>
                                 <div class="swiper-pagination swiper-pagination-${id}"></div>
                             </div>`
-              },
-              divCreate: {
-                class: `vw-100 vh-100 position-fixed ${id} d-flex align-items-center justify-content-center`,
-                style: css`z-index: 999999;
+                            },
+                            divCreate: {
+                                class: `vw-100 vh-100 position-fixed ${id} d-flex align-items-center justify-content-center`,
+                                style: css`z-index: 999999;
                             background: rgba(0, 0, 0, 0.5);`
-              },
-              onCreate: () => {
+                            },
+                            onCreate: () => {
 
-                const interval = setInterval(() => {
-                  if ((gvc.glitter.window as any).Swiper) {
-                    const swiper = new (gvc.glitter.window as any).Swiper(`.mySwiper_${id}`, {
-                      // Optional parameters
-                      loop: true,
-                      // If we need pagination
-                      pagination: {
-                        el: `.swiper-pagination-${id}`,
-                        clickable: true,
-                      },
-                      on: {
-                        slideChange: function () {
-                          // @ts-ignore
-                        },
-                      },
+                                const interval = setInterval(() => {
+                                    if ((gvc.glitter.window as any).Swiper) {
+                                        const swiper = new (gvc.glitter.window as any).Swiper(`.mySwiper_${id}`, {
+                                            // Optional parameters
+                                            loop: true,
+                                            // If we need pagination
+                                            pagination: {
+                                                el: `.swiper-pagination-${id}`,
+                                                clickable: true,
+                                            },
+                                            on: {
+                                                slideChange: function () {
+                                                    // @ts-ignore
+                                                },
+                                            },
 
-                    });
-                    clearTimeout(interval)
-                  }
-                }, 100)
-              }
+                                        });
+                                        clearTimeout(interval)
+                                    }
+                                }, 100)
+                            }
+                        }
+                    })
+                }, 'first-banner', {})
             }
-          })
-        }, 'first-banner', {})
-      }
+        })
+
 
 
         return ``

package/lowcode/public-components/layout-plugin/social-links-01.js

@@ -23,32 +23,16 @@ export class SocialLinks01 {
         };
         const gotoTopImg = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/arrow-up-to-line-light.svg';
         gvc.addStyle(css `
-      @media (max-width: 768px) {
-        .floating-action-panel {
-          position: fixed;
-          bottom: 20px;
-          right: 10px;
-          display: flex;
-          flex-direction: column; /* 垂直排列 */
-          align-items: center;
-          gap: 10px; /* 按鈕間距 */
-          z-index: 1000;
-        }
-      }
-
-      @media (min-width: 769px) {
-        .floating-action-panel {
-          position: fixed;
-          bottom: 30px;
-          right: 30px;
-          display: flex;
-          flex-direction: column; /* 垂直排列 */
-          align-items: center;
-          gap: 10px; /* 按鈕間距 */
-          z-index: 1000;
-        }
+      .floating-action-panel {
+        position: fixed;
+        bottom: 30px;
+        right: 30px;
+        display: flex;
+        flex-direction: column; /* 垂直排列 */
+        align-items: center;
+        gap: 10px; /* 按鈕間距 */
+        z-index: 1000;
       }
-     
 
       .social-links {
         display: flex;
@@ -75,20 +59,22 @@ export class SocialLinks01 {
         border: none;
         padding: 2px;
         cursor: pointer;
-        width: 40px;
-        height: 40px;
         border-radius: 50%;
         box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
       }
 
-     
+      .component-img {
+        width: 40px;
+        height: 40px;
+        object-fit: contain;
+      }
 
-      .component-circle:hover {
+      .component-circle:hover .component-img {
         opacity: 0.8;
       }
 
       .up-to-top.hidden {
-        display: none !important;
+        display: none;
       }
     `);
         return gvc.bindView({
@@ -100,37 +86,30 @@ export class SocialLinks01 {
           ${socialList
                     .map(socialLink => {
                     var _a;
-                    if (socialLink.icon === 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg') {
-                        socialLink.icon = undefined;
-                    }
                     const imgSrc = supportSocial.includes(socialLink.social_type)
                         ? socialIMG[socialLink.social_type]
                         : socialIMG.other;
                     return html `
-                <div onclick="${gvc.event(() => {
-                        gvc.glitter.href = socialLink.link;
-                    })}" class="component-circle" style="overflow: hidden;
-background-image: url('${(_a = socialLink.icon) !== null && _a !== void 0 ? _a : imgSrc}');background-size: cover;background-position: center;"
-                >
-                </div>
+                <a href="${socialLink.link}" class="component-circle">
+                  <img src="${(_a = socialLink.icon) !== null && _a !== void 0 ? _a : imgSrc}" alt="Go to top" class="component-img" />
+                </a>
               `;
                 })
                     .join('')}
         </div>
         <button
-          class="component-circle up-to-top hidden  rounded-circle  align-items-center justify-content-center"
-          style="overflow: hidden; background-color: white;display: flex; "
+          class="component-circle up-to-top hidden"
           onclick="${gvc.event(() => {
                     scrollToTop();
                 })}"
         >
-          <i class="fa-solid fa-angle-up fs-3"></i>
+          <img src="${gotoTopImg}" alt="Go to top" class="component-img" />
         </button>
       </div>
     `;
             }, divCreate: {},
             onInitial: () => {
-                window.addEventListener('scroll', function () {
+                window.onscroll = function () {
                     const scrollPosition = window.scrollY;
                     const threshold = window.innerHeight / 2;
                     const panel = document.querySelector('.up-to-top');
@@ -140,7 +119,7 @@ background-image: url('${(_a = socialLink.icon) !== null && _a !== void 0 ? _a :
                     else {
                         panel.classList.add('hidden');
                     }
-                });
+                };
             }
         });
     }

package/lowcode/public-components/layout-plugin/social-links-01.ts

@@ -33,32 +33,16 @@ export class SocialLinks01 {
     };
     const gotoTopImg = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/arrow-up-to-line-light.svg';
     gvc.addStyle(css`
-      @media (max-width: 768px) {
-        .floating-action-panel {
-          position: fixed;
-          bottom: 20px;
-          right: 10px;
-          display: flex;
-          flex-direction: column; /* 垂直排列 */
-          align-items: center;
-          gap: 10px; /* 按鈕間距 */
-          z-index: 1000;
-        }
-      }
-
-      @media (min-width: 769px) {
-        .floating-action-panel {
-          position: fixed;
-          bottom: 30px;
-          right: 30px;
-          display: flex;
-          flex-direction: column; /* 垂直排列 */
-          align-items: center;
-          gap: 10px; /* 按鈕間距 */
-          z-index: 1000;
-        }
+      .floating-action-panel {
+        position: fixed;
+        bottom: 30px;
+        right: 30px;
+        display: flex;
+        flex-direction: column; /* 垂直排列 */
+        align-items: center;
+        gap: 10px; /* 按鈕間距 */
+        z-index: 1000;
       }
-     
 
       .social-links {
         display: flex;
@@ -85,23 +69,24 @@ export class SocialLinks01 {
         border: none;
         padding: 2px;
         cursor: pointer;
-        width: 40px;
-        height: 40px;
         border-radius: 50%;
         box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
       }
 
-     
+      .component-img {
+        width: 40px;
+        height: 40px;
+        object-fit: contain;
+      }
 
-      .component-circle:hover {
+      .component-circle:hover .component-img {
         opacity: 0.8;
       }
 
       .up-to-top.hidden {
-        display: none !important;
+        display: none;
       }
     `);
-
     return gvc.bindView({
       bind:vm.id,
       view:()=>{
@@ -110,39 +95,30 @@ export class SocialLinks01 {
         <div class="social-links">
           ${socialList
           .map(socialLink => {
-            if(socialLink.icon==='https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'){
-              (socialLink.icon as any) = undefined; 
-            }
             const imgSrc = supportSocial.includes(socialLink.social_type)
               ? socialIMG[socialLink.social_type]
               : socialIMG.other;
             return html`
-                <div onclick="${
-              gvc.event(()=>{
-                gvc.glitter.href = socialLink.link;
-              })
-                }" class="component-circle" style="overflow: hidden;
-background-image: url('${socialLink.icon??imgSrc}');background-size: cover;background-position: center;"
-                >
-                </div>
+                <a href="${socialLink.link}" class="component-circle">
+                  <img src="${socialLink.icon??imgSrc}" alt="Go to top" class="component-img" />
+                </a>
               `;
           })
           .join('')}
         </div>
         <button
-          class="component-circle up-to-top hidden  rounded-circle  align-items-center justify-content-center"
-          style="overflow: hidden; background-color: white;display: flex; "
+          class="component-circle up-to-top hidden"
           onclick="${gvc.event(() => {
           scrollToTop();
         })}"
         >
-          <i class="fa-solid fa-angle-up fs-3"></i>
+          <img src="${gotoTopImg}" alt="Go to top" class="component-img" />
         </button>
       </div>
     `;
       },divCreate:{}
       ,onInitial:()=>{
-        window.addEventListener('scroll', function() {
+        (window as any).onscroll = function() {
           const scrollPosition = window.scrollY;
 
           const threshold = window.innerHeight / 2;
@@ -154,8 +130,7 @@ background-image: url('${socialLink.icon??imgSrc}');background-size: cover;backg
           } else {
             panel!.classList.add('hidden');
           }
-        });
-
+        };
       }
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "21.8.3",
+  "version": "21.8.4",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/controllers/article.js

@@ -70,6 +70,17 @@ router.get('/manager', async (req, resp) => {
         if (req.query.search) {
             query.push(`(content->>'$.name' like '%${req.query.search}%') || (content->>'$.title' like '%${req.query.search}%')`);
         }
+        const idStr = req.query.id_list
+            ? req.query.id_list
+                .toString()
+                .split(',')
+                .filter(Boolean)
+                .map(id => database_js_1.default.escape(id))
+                .join(',')
+            : '';
+        if (req.query.id_list && idStr) {
+            query.push(`(id in (${idStr}))`);
+        }
         const collection_list_value = await new user_js_1.User(req.get('g-app')).getConfigV2({
             key: 'blog_collection',
             user_id: 'manager',