create-fesd-app 1.0.17 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fesd-app",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@tailwindcss/postcss": "^4.1.10",
     "@tailwindcss/vite": "^4.1.10",
-    "@xwadex/fesd": "0.0.40",
+    "@xwadex/fesd": "0.0.41",
     "ansi-colors": "^4.1.3",
     "chalk": "^5.3.0",
     "clsx": "^2.1.1",

package/src/assets/js/commons/cookies/cookiePolicy.js

@@ -223,13 +223,14 @@ cookieAdvanced.switchState = () => {
     if (isSyncing) return
     isSyncing = true
 
-    const $step1Switch = $(`[t4-id='step1'] input[type="checkbox"][data-name='${parent}']:not(.disabled)`)
     const key = $(this).data("name")
     const parent = $(this).data("parent")
     const val = $(this).prop('checked') ? 0 : 1
+    const $step1Switch = $(`[t4-id='step1'] input[type="checkbox"][data-name='${parent}']:not(.disabled)`)
     const total = $($step2contentSwitch).length
     const checked = $($step2contentSwitch).filter(':checked').length
     
+
     // 改變 cookieNewObj 的值
     cookieNewObj[parent].list[key].close = val
 
@@ -255,7 +256,6 @@ cookieAdvanced.switchState = () => {
   $(document).off("change.step2top").on("change.step2top", $step2topSwitch, function () {
     if (isSyncing) return
     isSyncing = true
-
     const $this = $(this)
     const key = $this.data("name")
     const isChecked = $this.prop("checked")
@@ -310,7 +310,7 @@ cookieAdvanced.clickEvent = () => {
 
   // 打開進階版 cookie 介面
   $settingBtn.on("click", () => cookieSetting.openEvent($settingBlock));
-  // 綁定按鈕
+  // 全開
   $("[data-cookie-all]").on('click', cookieSetting.enableAll)
   // 儲存
   $("[data-cookie-save]").on('click', cookieAdvanced.cookieSaveFn)
@@ -360,59 +360,46 @@ cookieSetting.rejectAll = () => {
   $('.main-option:not([data-name="required"]),.list-option:not([data-name="required"])').removeClass("checked")
   cookieNewObj.close = 1
   Object.keys(cookieNewObj).forEach(data => {
-    cookieNewObj[data].close = 1
+    cookieNewObj[data].close == 1
   })
 }
 
 // 判斷該分類底下細項按鈕狀態
 cookieSetting.hasAnyListItemsOpen = (key) => {
-  const targetList = cookieNewObj[key]?.list;
+  const category = cookieNewObj[key];
+  if (!category) return false;
+
+  const targetList = category.list;
+
+  // 沒有子 list，就看自己這一層
   if (!targetList) {
-    if (cookieNewObj[key].close == 0) {
-      return true;
-    } else {
-      return false; 
-    }
+    return category.close === 0;
   }
-  const childKeys = Object.keys(targetList);
-  const isOpen = childKeys.some(childKey => {
-    return targetList[childKey]?.close === 0;
-  });
-  return isOpen;
+
+  // 有子 list，就看子項目有沒有任何一個是 open
+  return Object.values(targetList).some(item => item?.close === 0);
+};
+
+cookieSetting.isCategoryChecked = (key) => {
+  if (key === "required") return true;
+  return cookieSetting.hasAnyListItemsOpen(key);
+};
+
+// 共用：產生 step 元件用的 getter
+const createStepElement = (templateFn) => {
+  return (opt, index) => {
+    const isDisabled = opt.disabled ? "disabled" : "";
+    const isChecked = () =>
+      cookieSetting.isCategoryChecked(opt.key) ? "checked" : "";
+
+    return templateFn(opt, index, isDisabled, isChecked);
+  };
 };
 
 // step 1 結構
-cookieElements.getStep1Element = (opt, index) => {
-  const isDisabled = opt.disabled ? "disabled" : ""
-  const isChecked = () => {
-    if (opt.key == "required") {
-      return "checked"
-    } else {
-      if (cookieSetting.hasAnyListItemsOpen(opt.key)) {
-        return "checked"
-      } else {
-        return ""
-      }
-    }
-  }
-  return cookieStep1El(opt, index, isDisabled, isChecked)
-}
+cookieElements.getStep1Element = createStepElement(cookieStep1El);
 // step 2 上面結構
-cookieElements.getStep2TopElement = (opt, index) => {
-  const isDisabled = opt.disabled ? "disabled" : ""
-  const isChecked = () => {
-    if (opt.key == "required") {
-      return "checked"
-    } else {
-      if (cookieSetting.hasAnyListItemsOpen(opt.key)) {
-        return "checked"
-      } else {
-        return ""
-      }
-    }
-  }
-  return cookieStep2TittleEl(opt, index, isDisabled, isChecked)
-}
+cookieElements.getStep2TopElement = createStepElement(cookieStep2TittleEl);
 
 // 頁籤
 cookieSetting.goToTab = (el = true) => {