create-fesd-app 1.0.0-bate.95 → 1.0.0-bate.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fesd-app",
-  "version": "1.0.0-bate.95",
+  "version": "1.0.0-bate.99",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/src/assets/css/layouts/article4/_article4_2.0.sass

@@ -161,6 +161,8 @@
     ._wordCover
       margin: 0
       margin-bottom: $img-cover-TB-gap
+    ._cover
+      margin-bottom: 0
     &[img-row="x2"],
     &[img-row="x3"],
     &[img-row="x4"],
@@ -170,14 +172,24 @@
     +rwdmax($basic_rwd)
       ._wordCover
         margin-bottom: $img-cover-TB-gap_rwd
+      ._imgCover
+        margin-bottom: 0
       &[mobile-rwd="on"]
         ._H
-          margin-top: $img-cover-TB-gap_rwd
+          // 2025.04.21 新增 important
+          margin-top: $img-cover-TB-gap_rwd !important
         ._imgCover
-          margin-top: 0
+          margin-top: 0 !important
           order: -1
         ._wordCover
           margin: 0
+      // 2025.04.21 新增判斷
+      &[img-row="x2"],
+      &[img-row="x3"],
+      &[img-row="x4"],
+      &[img-row="x5"]
+        ._imgCover
+          margin-bottom: #{-$cover-TB-gap_rwd}
 
   &.typeUL,
   &.typeUR
@@ -232,8 +244,7 @@
 
   &.typeD
     ._imgCover
-      // margin-bottom: #{-$cover-TB-gap + $img-cover-TB-gap}
-      margin-bottom: #{$img-cover-TB-gap - (-$cover-TB-gap + $img-cover-TB-gap)}
+      margin-bottom: #{-$cover-TB-gap + $img-cover-TB-gap}
     ._wordCover
       margin: 0
     +rwdmax($basic_rwd)
@@ -585,10 +596,16 @@
 
   // swiper
   &[img-swiper="on"]
+    &.typeD
+      ._imgCover
+        // margin-bottom: #{-$cover-TB-gap + $img-cover-TB-gap}
+        margin-bottom: #{$img-cover-TB-gap - (-$cover-TB-gap + $img-cover-TB-gap)}
     ._imgCover
       position: relative
+      margin: 0 #{-$swiper-cover-LR-gap * 0.5}
       ._cover
         margin-bottom: 0
+        padding: 0 #{$swiper-cover-LR-gap * 0.5}
       .swiper-button-cover
         &:before
           display: block

package/src/assets/js/apps/about/page.js

@@ -1,5 +1,5 @@
 import { Article4 } from '@xwadex/fesd';
-import { common, noContentCheck } from "@/commons";
+import { common, methods } from "@/commons";
 
 $(async () => {
   // common Init
@@ -7,5 +7,5 @@ $(async () => {
   // pluginInit
   new Article4('._articleBlock')
   // coding...
-  noContentCheck();
+  methods.noContentCheck();
 })

package/src/assets/js/apps/index/page.js

@@ -16,7 +16,6 @@ import {
 } from '@xwadex/fesd/tools';
 import {
   common,
-  collapseEvent,
   methods
 } from "@/commons"
 // flatpickr
@@ -28,8 +27,10 @@ import { bannerConfig } from "@/configs"
 // swiper
 const { SwiperV11 } = SwiperVer11
 const swiperHandler = {};
+
 swiperHandler.banner = function () {
   const bannerEvents = {
+    ...bannerConfig,
     init() {
       console.log('swiper init!!');
     },
@@ -37,8 +38,9 @@ swiperHandler.banner = function () {
       isVideo(swiper);
     },
   };
-  const banner = new SwiperV11('.swiper', { ...bannerConfig, on: bannerEvents });
+  const banner = new SwiperV11('.swiper', bannerEvents );
 };
+
 swiperHandler.all = function () {
   this.banner();
 };
@@ -123,7 +125,7 @@ const s4Handler = function () {
 
 const s6Handler = function () {
   // 簡易版
-  collapseEvent('[data-collapse-click]', '[data-collapse]', true, true)
+  methods.collapseEvent('[data-collapse-click]', '[data-collapse]', true, true)
   // 公版
   collapse: new Collapse4('[partnerCollapse-wrapper]', {
     defaultOpen: false,
@@ -151,7 +153,6 @@ const s8Handler = function () {
   });
   wddForm.addEventListener('submit', function () {
     console.log('submit', wddForm.value);
-
   });
 };
 // -- 方法 給後端

package/src/assets/js/commons/inits.js

@@ -11,7 +11,7 @@ import {
   scrollUnlock
 } from '@xwadex/fesd/tools';
 import { toBackend } from "@/commons/methods";
-import { cookiePolicyInit } from "@/commons/pages";
+import { cookiePolicy } from "@/commons/pages";
 import { lazyLoadImg } from '@/plugins';
 import { navbar } from '@/ui';
 
@@ -51,7 +51,7 @@ export const inits = () => {
   new ImageValidate();
   // uiInit
   navbar.init();
-  cookiePolicyInit();
+  cookiePolicy();
   // coding...
   firstEntryHandler.init();
 }

package/src/assets/js/commons/methods.js

@@ -1,11 +1,42 @@
 export const toBackend = (contents) => {
-    if (!contents) return
-    if (!document || !document?.body) return
-    if (!document.body?.fesd) document.body.fesd = {}
+  if (!contents) return
+  if (!document || !document?.body) return
+  if (!document.body?.fesd) document.body.fesd = {}
 
-    for (const [key, value] of Object.entries(contents)) {
-        document.body.fesd[key] = value
-    }
+  for (const [key, value] of Object.entries(contents)) {
+    document.body.fesd[key] = value
+  }
 
-    return document.body.fesd
+  return document.body.fesd
+}
+
+// collapse
+export function collapseEvent(clickTarget, parentBox, anchor = false, single = false) {
+  if (!clickTarget || !parentBox) return;
+
+  const $clickTarget = $(clickTarget);
+  const $parentBoxes = $(parentBox);
+  if (!$clickTarget.length || !$parentBoxes.length) return;
+
+  $clickTarget.on('click', function () {
+    const $parent = $(this).closest(parentBox);
+    if (!$parent.length) return;
+    if ($parent.hasClass('open')) return $parent.removeClass('open');
+
+    $parent.addClass('open');
+    if (single) $parentBoxes.not($parent).removeClass('open');
+    if (anchor) setTimeout(() => Anchor4.run({ target: $parent[0] }), 500);
+  });
+}
+
+export function noContentCheck() {
+  const params = new URLSearchParams(document.location.search);
+  const val = params.get('debug');
+  const contentBox = $('[data-content]')
+  const noContentBox = $('[data-noContent]')
+  if (!val || !contentBox || !noContentBox) return
+  if (val.toLowerCase() === 'nocontent') {
+    contentBox.hide();
+    noContentBox.show();
+  }
 }

package/src/assets/js/commons/pages/page.cookiePolicy.js

@@ -1,51 +1,37 @@
-const cookiePolicy = {};
-
-// 首次進入執行
-cookiePolicy.firstEnterDetect = () => {
-  const { $cookiePolicy } = cookiePolicy;
-
-  // 請記得更改 cookie 存入的值
-  const agreeLocal = localStorage.getItem("frameworkCookie-agree");
-  const agreeSession = sessionStorage.getItem("frameworkCookie-agree");
-
-  if (agreeLocal !== "true" && agreeSession !== "false") {
-    $cookiePolicy.addClass("first-enter");
-    setTimeout(() => {
-      $cookiePolicy.addClass("show");
-    }, 800);
-  }
-};
-
-// 點擊事件
-cookiePolicy.clickEvent = () => {
-  const { $cookiePolicy, $agreeBtn, $closeBtn } = cookiePolicy;
-
-  $agreeBtn.on("click", () => {
-    $cookiePolicy.addClass("agree");
-    localStorage.setItem("frameworkCookie-agree", "true");
-    sessionStorage.setItem("frameworkCookie-agree", "true");
-  });
-
-  $closeBtn.on("click", () => {
-    $cookiePolicy.addClass("hidden");
-    sessionStorage.setItem("frameworkCookie-agree", "false");
-  });
-};
-
-cookiePolicy.init = () => {
+export const cookiePolicy = () => {
   const $cookiePolicy = $(".cookie-check"); 
-
   if (!$cookiePolicy.length) return;
-
-  cookiePolicy.$cookiePolicy = $cookiePolicy;
-  cookiePolicy.$agreeBtn = $cookiePolicy.find(".agree");
-  cookiePolicy.$closeBtn = $cookiePolicy.find(".close");
+  
+  const $agreeBtn = $cookiePolicy.find(".agree");
+  const $closeBtn = $cookiePolicy.find(".close");
+
+  const firstEnterDetect = () => {
+    // 請記得更改 cookie 存入的值
+    const agreeLocal = localStorage.getItem("frameworkCookie-agree");
+    const agreeSession = sessionStorage.getItem("frameworkCookie-agree");
+  
+    if (agreeLocal !== "true" && agreeSession !== "false") {
+      $cookiePolicy.addClass("first-enter");
+      setTimeout(() => {
+        $cookiePolicy.addClass("show");
+      }, 800);
+    }
+  };
+  
+  // 點擊事件
+  const clickEvent = () => {
+    $agreeBtn.on("click", () => {
+      $cookiePolicy.addClass("agree");
+      localStorage.setItem("frameworkCookie-agree", "true");
+    });
+  
+    $closeBtn.on("click", () => {
+      $cookiePolicy.addClass("hidden");
+      sessionStorage.setItem("frameworkCookie-agree", "false");
+    });
+  };
 
   // 執行事件
-  cookiePolicy.firstEnterDetect();
-  cookiePolicy.clickEvent();
-};
-
-export const cookiePolicyInit = () => {
-  cookiePolicy.init();
+  firstEnterDetect();
+  clickEvent();
 };

package/src/assets/js/commons/utils.js

@@ -1,32 +0,0 @@
-import { Anchor4 } from '@xwadex/fesd';
-
-// collapse
-export function collapseEvent(clickTarget, parentBox, anchor = false, single = false) {
-  if (!clickTarget || !parentBox) return;
-
-  const $clickTarget = $(clickTarget);
-  const $parentBoxes = $(parentBox);
-  if (!$clickTarget.length || !$parentBoxes.length) return;
-
-  $clickTarget.on('click', function () {
-    const $parent = $(this).closest(parentBox);
-    if (!$parent.length) return;
-    if ($parent.hasClass('open')) return $parent.removeClass('open');
-
-    $parent.addClass('open');
-    if (single) $parentBoxes.not($parent).removeClass('open');
-    if (anchor) setTimeout(() => Anchor4.run({ target: $parent[0] }), 500);
-  });
-}
-
-export function noContentCheck() {
-  const params = new URLSearchParams(document.location.search);
-  const val = params.get('debug');
-  const contentBox = $('[data-content]')
-  const noContentBox = $('[data-noContent]')
-  if (!val || !contentBox || !noContentBox) return
-  if (val.toLowerCase() === 'nocontent') {
-    contentBox.hide();
-    noContentBox.show();
-  }
-}

package/src/pages/ajax/ajax_igDemo.pug

@@ -1,5 +1,5 @@
 modern-modal(data-modal-id="video-ig-template" video-template data-modal-template-setting="destroy")
   .close-button(data-modal-destroy="data-modal-destroy")
   //- 純展示使用, 後端那邊會有自己的 ajax 燈箱結構
+  //- 以下可自行修改, 放 ig 嵌入碼
   <blockquote class="instagram-media" data-instgrm-captioned data-instgrm-permalink="https://www.instagram.com/p/C1O1Sh-vAIW/?img_index=1"></blockquote><script async src="//https://www.instagram.com/embed.js"></script>
-  <script async src="//www.instagram.com/embed.js"></script>