ts-glitter 18.3.3 → 18.3.4

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

@@ -845,6 +845,23 @@ export class Language {
             { key: 'chat', tw: '聊聊', cn: '聊聊', en: 'chat' },
             { key: 'collect', tw: '收藏', cn: '收藏', en: 'collect' },
             { key: 'h_collect', tw: '已收藏', cn: '已收藏', en: 'collected' },
+            { key: 'cookie_use', tw: `
+            本網站中使用 cookie，欲查詢有關本網站使用 cookie 方式之詳情，及若您不希望在電腦上使用 cookie 時應如何變更電腦的 cookie 設定，請參閱本網站「 <a class="fw-bold" style="font-size:16px;color:${window.glitter.share.globalValue['theme_color.0.solid-button-text']};" href="/privacy">
+             隱私權條款
+</a> 」之 Cookie 聲明。您繼續使用本網站即表示您同意本公司得按本網站使用條款之 Cookie 聲明使用 cookie。
+            `, en: `
+             This website uses cookies. To learn more about how this website uses cookies and how to change your computer's cookie settings if you do not wish to use cookies, please refer to the Cookie Statement in our <a class="fw-bold"
+              style="color:${window.glitter.share.globalValue['theme_color.0.solid-button-text']};font-size:16px;"
+              href="/privacy">
+             Privacy Policy
+</a>. By continuing to use this website, you agree to our use of cookies as described in the Cookie Statement of our Terms of Use.
+            `, cn: `
+             本网站使用 Cookie。欲了解本网站如何使用 Cookie，以及如果您不希望在计算机上使用 Cookie 时应如何更改计算机的 Cookie 设置，请参阅本网站『
+             <a href="/privacy"
+             style="color:${window.glitter.share.globalValue['theme_color.0.solid-button-text']};font-size:16px;"
+             >隐私政策</a>
+             』**中的 Cookie 声明。您继续使用本网站即表示您同意本公司按照本网站使用条款中的 Cookie 声明使用 Cookie。
+            ` }
         ];
     }
     static getLanguageCustomText(text) {

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

@@ -853,6 +853,23 @@ export class Language {
             { key: 'chat', tw: '聊聊', cn: '聊聊', en: 'chat' },
             { key: 'collect', tw: '收藏', cn: '收藏', en: 'collect' },
             { key: 'h_collect', tw: '已收藏', cn: '已收藏', en: 'collected' },
+            {key: 'cookie_use',tw:`
+            本網站中使用 cookie，欲查詢有關本網站使用 cookie 方式之詳情，及若您不希望在電腦上使用 cookie 時應如何變更電腦的 cookie 設定，請參閱本網站「 <a class="fw-bold" style="font-size:16px;color:${(window as any).glitter.share.globalValue['theme_color.0.solid-button-text']};" href="/privacy">
+             隱私權條款
+</a> 」之 Cookie 聲明。您繼續使用本網站即表示您同意本公司得按本網站使用條款之 Cookie 聲明使用 cookie。
+            `,en:`
+             This website uses cookies. To learn more about how this website uses cookies and how to change your computer's cookie settings if you do not wish to use cookies, please refer to the Cookie Statement in our <a class="fw-bold"
+              style="color:${(window as any).glitter.share.globalValue['theme_color.0.solid-button-text']};font-size:16px;"
+              href="/privacy">
+             Privacy Policy
+</a>. By continuing to use this website, you agree to our use of cookies as described in the Cookie Statement of our Terms of Use.
+            `,cn: `
+             本网站使用 Cookie。欲了解本网站如何使用 Cookie，以及如果您不希望在计算机上使用 Cookie 时应如何更改计算机的 Cookie 设置，请参阅本网站『
+             <a href="/privacy"
+             style="color:${(window as any).glitter.share.globalValue['theme_color.0.solid-button-text']};font-size:16px;"
+             >隐私政策</a>
+             』**中的 Cookie 声明。您继续使用本网站即表示您同意本公司按照本网站使用条款中的 Cookie 声明使用 Cookie。
+            `}
         ];
     }
 

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

@@ -11,6 +11,7 @@ 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";
 init(import.meta.url, (gvc, glitter, gBundle) => {
     var _a, _b, _c, _d;
     glitter.share.htmlExtension = (_a = glitter.share.htmlExtension) !== null && _a !== void 0 ? _a : {};
@@ -89,7 +90,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
     }
     return {
         onCreateView: () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             FirstBanner.main({ gvc: gvc });
             if (gBundle.page_config.seo && (gBundle.page_config.seo.type === "custom") && gBundle.page_config.seo.title) {
                 glitter.setUrlParameter('', undefined, [
@@ -275,6 +276,23 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                     }, 50);
                 },
             }));
+            if ((localStorage.getItem('cookie_accept') != 'true') && ((_j = window.store_info.cookie_check) !== null && _j !== void 0 ? _j : true)) {
+                map.push(`
+            <div class="position-fixed  rounded-3 d-flex align-items-center flex-column flex-sm-row p-3 privacy-notice" style="width:852px;max-width:calc(100vw - 30px);background: ${glitter.share.globalValue['theme_color.0.solid-button-bg']};
+           color: ${glitter.share.globalValue['theme_color.0.solid-button-text']};
+            z-index: 99999;bottom: 30px;transform: translateX(-50%);left: 50%;">
+            <div style="font-size: 14px;
+            ">${Language.text('cookie_use')}</div>
+            <div class="d-sm-none w-100 border-top my-3"></div>
+            <div class="d-flex align-items-center justify-content-center fw-bold" style="min-width: 150px;cursor: pointer;" onclick="${gvc.event(() => {
+                    localStorage.setItem('cookie_accept', 'true');
+                    for (const b of document.querySelectorAll('.privacy-notice')) {
+                        b.remove();
+                    }
+                })}">我知道了</div>
+</div>
+            `);
+            }
             return map.join('');
         }
     };

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

@@ -3,6 +3,7 @@ import {TriggerEvent} from "./trigger-event.js";
 import {EditorConfig} from "../../editor-config.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";
 
 init(import.meta.url, (gvc, glitter, gBundle) => {
     glitter.share.htmlExtension = glitter.share.htmlExtension ?? {};
@@ -14,7 +15,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
         mainView: ''
     };
 
-    console.log(`the-page`,gvc.glitter.getUrlParameter('page'))
+    console.log(`the-page`, gvc.glitter.getUrlParameter('page'))
     console.log(`waitCreateView-time:`, (window as any).renderClock.stop())
 
     async function load() {
@@ -66,32 +67,32 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
             }
         })
     };
-    if(!gBundle.data){
-        gBundle.data={}
+    if (!gBundle.data) {
+        gBundle.data = {}
     }
     return {
         onCreateView: () => {
-            FirstBanner.main({gvc:gvc})
+            FirstBanner.main({gvc: gvc})
             //定義SEO TITLE
-            if(gBundle.page_config.seo && (gBundle.page_config.seo.type==="custom") && gBundle.page_config.seo.title){
-                glitter.setUrlParameter('',undefined,[
+            if (gBundle.page_config.seo && (gBundle.page_config.seo.type === "custom") && gBundle.page_config.seo.title) {
+                glitter.setUrlParameter('', undefined, [
                     gBundle.page_config.seo.title_prefix ?? "",
                     gBundle.page_config.seo.title ?? '',
                     gBundle.page_config.seo.title_suffix ?? "",
                 ].join(''))
-            }else{
-                glitter.setUrlParameter('',undefined,[
+            } else {
+                glitter.setUrlParameter('', undefined, [
                     (window as any).home_seo.title_prefix ?? "",
                     (window as any).home_seo.title ?? '',
                     (window as any).home_seo.title_suffix ?? "",
                 ].join(''))
             }
             //判斷如果是帳號頁面，且未登入則重新導向
-            if(gvc.glitter.getUrlParameter('page')==='account_userinfo' && !GlobalUser.token){
-                gvc.glitter.href='/login'
+            if (gvc.glitter.getUrlParameter('page') === 'account_userinfo' && !GlobalUser.token) {
+                gvc.glitter.href = '/login'
                 return ``
             }
-            document.querySelector('body')!.style.background=gBundle.app_config._background || glitter.share.globalValue[`theme_color.0.background`];
+            document.querySelector('body')!.style.background = gBundle.app_config._background || glitter.share.globalValue[`theme_color.0.background`];
             console.log(`onCreateView-time:`, (window as any).renderClock.stop())
             const mainId = glitter.getUUID()
             let map = [];
@@ -135,14 +136,14 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                     style: ``,
                     app_config: gBundle.app_config,
                     page_config: gBundle.page_config,
-                    onCreate:()=>{
+                    onCreate: () => {
                         console.log(`createRender`)
                     }
                 }))
             } else {
                 vm.loading = false
             }
-            let toggle_d_none=true
+            let toggle_d_none = true
             map.push(gvc.bindView({
                 bind: mainId,
                 view: () => {
@@ -155,6 +156,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                         if (gBundle.page_config.template) {
                             (window as any).glitterInitialHelper.getPageData(gBundle.page_config.template, (data: any) => {
                                 const template_config = JSON.parse(JSON.stringify(data.response.result[0].config))
+
                                 function findContainer(set: any) {
                                     set.map((dd: any, index: number) => {
                                         if (dd.type === 'glitter_article') {
@@ -199,6 +201,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                                         }
                                     });
                                 }
+
                                 findContainer(template_config);
                                 resolve(new glitter.htmlGenerate(template_config, [], gBundle.data, true).render(gvc, {
                                     class: ``,
@@ -227,7 +230,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                                     style: ``,
                                     app_config: gBundle.app_config,
                                     page_config: gBundle.page_config,
-is_page:true
+                                    is_page: true
                                 })
                             ));
                         }
@@ -236,9 +239,9 @@ is_page:true
                     })
 
                 },
-                divCreate: ()=>{
+                divCreate: () => {
                     return {
-                        class: glitter.htmlGenerate.styleEditor(gBundle.page_config).class()+((toggle_d_none) ? ' d-none':''),
+                        class: glitter.htmlGenerate.styleEditor(gBundle.page_config).class() + ((toggle_d_none) ? ' d-none' : ''),
                         style: `overflow-x:hidden;min-height: 100%;min-width: 100%;${glitter.htmlGenerate.styleEditor(gBundle.page_config).style()}`
                     }
                 },
@@ -251,13 +254,31 @@ is_page:true
                             }
                         }
                     })
-                    toggle_d_none=false
-                    setTimeout(()=>{
+                    toggle_d_none = false
+                    setTimeout(() => {
                         $('.new_page_loading').addClass('d-none');
                         (document.querySelector(`[gvc-id='${gvc.id(mainId)}']`) as any).classList.remove('d-none')
-                    },50)
+                    }, 50)
                 },
             }))
+            if ((localStorage.getItem('cookie_accept') != 'true') && ( (window as any).store_info.cookie_check ?? true)) {
+                map.push(`
+            <div class="position-fixed  rounded-3 d-flex align-items-center flex-column flex-sm-row p-3 privacy-notice" style="width:852px;max-width:calc(100vw - 30px);background: ${glitter.share.globalValue['theme_color.0.solid-button-bg']};
+           color: ${glitter.share.globalValue['theme_color.0.solid-button-text']};
+            z-index: 99999;bottom: 30px;transform: translateX(-50%);left: 50%;">
+            <div style="font-size: 14px;
+            ">${Language.text('cookie_use')}</div>
+            <div class="d-sm-none w-100 border-top my-3"></div>
+            <div class="d-flex align-items-center justify-content-center fw-bold" style="min-width: 150px;cursor: pointer;" onclick="${gvc.event(() => {
+                    localStorage.setItem('cookie_accept', 'true')
+                    for (const b of document.querySelectorAll('.privacy-notice')) {
+                        b.remove()
+                    }
+                })}">我知道了</div>
+</div>
+            `)
+            }
+
             return map.join('');
 
         }

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

@@ -724,7 +724,7 @@ Setting_editor.menuItems = () => {
             icon: '',
             page: 'shop_informationV2',
             group: '商店設定',
-            title: '商店訊息',
+            title: '全站設定',
             appName: 'cms_system',
             groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1716566571091-Property 1=gear-regular.svg',
             moduleName: '商店設計',

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

@@ -29,7 +29,7 @@ export class Setting_editor {
                 icon: '',
                 page: 'shop_informationV2',
                 group: '商店設定',
-                title: '商店訊息',
+                title: '全站設定',
                 appName: 'cms_system',
                 groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1716566571091-Property 1=gear-regular.svg',
                 moduleName: '商店設計',

package/package.json

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