diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 879145c2b..0cd05e256 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,6 @@
 name: build
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -35,10 +36,11 @@ jobs:
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
           # github-token: ${{ secrets.GITHUB_TOKEN }} # Optional
-          vercel-args: "--prod" # Optional
+          vercel-args: "--prod --debug" # Optional
           vercel-org-id: ${{ secrets.ORG_ID}} # Required
           vercel-project-id: ${{ secrets.PROJECT_ID}} # Required
           working-directory: dist
+          vercel-version: '48.9.0'
       - name: zip
         run: |
           zip -r dist.zip dist
diff --git a/.github/workflows/update-vercel-project-settings.yml b/.github/workflows/update-vercel-project-settings.yml
new file mode 100644
index 000000000..1f019f18d
--- /dev/null
+++ b/.github/workflows/update-vercel-project-settings.yml
@@ -0,0 +1,16 @@
+# 该 workflow 用于更新 Vercel 项目的 Node.js 版本
+name: Update Vercel project settings
+on:
+  workflow_dispatch:
+
+jobs:
+  update-nodejs-version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update Vercel project Node.js version
+        run: |
+          curl --request PATCH \
+          --url https://api.vercel.com/v9/projects/${{ secrets.PROJECT_ID }} \
+          --header 'Authorization: Bearer ${{ secrets.VERCEL_TOKEN }}' \
+          --header 'Content-Type: application/json' \
+          --data '{ "nodeVersion":"22.x"}'
\ No newline at end of file
diff --git a/package.json b/package.json
index 7025c829d..a192fe412 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store-front-end",
-  "version": "2.15.66",
+  "version": "2.16.18",
   "private": true,
   "scripts": {
     "dev": "vite --host",
diff --git a/src/api/share/index.ts b/src/api/share/index.ts
index 82bd8d9a6..2fd3f1438 100644
--- a/src/api/share/index.ts
+++ b/src/api/share/index.ts
@@ -11,10 +11,11 @@ export function useShareApi() {
         data,
       });
     },
-    deleteShare: (token: string): AxiosPromise<MyAxiosRes> => {
+    deleteShare: (token: string, type: string, name: string): AxiosPromise<MyAxiosRes> => {
       return request({
         url: `/api/token/${encodeURIComponent(token)}`,
         method: "delete",
+        params: { type, name },
       });
     },
     getShares: (type?: string, name?: string): AxiosPromise<MyAxiosRes> => {
diff --git a/src/assets/icons/concurrency.svg b/src/assets/icons/concurrency.svg
new file mode 100644
index 000000000..a20ea37a7
--- /dev/null
+++ b/src/assets/icons/concurrency.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1768354385879" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M334.26 769.715c-10.113 32.346-40.18 55.821-75.7 55.821-43.827 0-79.347-35.725-79.347-79.795 0-44.058 35.52-79.783 79.347-79.783 35.52 0 65.587 23.476 75.7 55.834h510.527v47.923H334.26z m-75.7-55.731c-17.446 0-31.59 14.22-31.59 31.757 0 17.549 14.144 31.782 31.59 31.782 17.446 0 31.59-14.233 31.59-31.782 0-17.536-14.144-31.757-31.59-31.757z m252.915-98.509h333.312v47.834H511.475v-47.834zM258.56 591.808c-43.827 0-79.347-35.725-79.347-79.795 0-44.058 35.52-79.783 79.347-79.783 35.52 0 65.587 23.476 75.7 55.821h510.527v47.936H334.26c-10.112 32.346-40.179 55.821-75.699 55.821z m0-111.552c-17.446 0-31.59 14.22-31.59 31.757 0 17.549 14.144 31.77 31.59 31.77 17.446 0 31.59-14.221 31.59-31.77 0-17.536-14.144-31.757-31.59-31.757z m252.915-101.094h333.312v47.833H511.475v-47.833zM258.56 358.08c-43.827 0-79.347-35.725-79.347-79.795 0-44.058 35.52-79.783 79.347-79.783 35.52 0 65.587 23.476 75.7 55.821h510.527v47.936H334.26c-10.125 32.346-40.179 55.821-75.699 55.821z m0-111.552c-17.446 0-31.59 14.22-31.59 31.757 0 17.549 14.144 31.77 31.59 31.77 17.446 0 31.59-14.221 31.59-31.77 0-17.536-14.144-31.757-31.59-31.757z" p-id="5436" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/headersCacheTtl.svg b/src/assets/icons/headersCacheTtl.svg
new file mode 100644
index 000000000..df8390e54
--- /dev/null
+++ b/src/assets/icons/headersCacheTtl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1768348602493" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1823" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M905.728 646.272C920.48 603.04 928 557.664 928 512c0-229.76-186.24-416-416-416S96 282.24 96 512s186.24 416 416 416c45.664 0 91.04-7.52 134.272-22.272a192 192 0 1 1 259.456-259.456z m-451.84-96.064H368a16.32 16.32 0 0 1-14.976-22.24L438.4 298.56A16 16 0 0 1 453.344 288h144c11.328 0 19.072 11.776 14.784 22.56l-49.664 124.928h93.504c13.76 0 21.12 16.608 12.032 27.2l-229.312 267.648c-11.136 13.024-31.808 1.728-27.488-15.008l42.688-165.12zM896 736a160 160 0 1 1-320 0 160 160 0 0 1 320 0z m-244.288 32a32 32 0 0 0 27.712 48h110.848a32 32 0 0 0 27.712-48l-55.424-96a32 32 0 0 0-55.424 0l-55.424 96z" p-id="1824" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/resourceCacheTtl.svg b/src/assets/icons/resourceCacheTtl.svg
new file mode 100644
index 000000000..215f22bef
--- /dev/null
+++ b/src/assets/icons/resourceCacheTtl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1768348812032" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5803" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M795.927273 477.090909c-13.963636-2.327273-23.272727-13.963636-23.272728-27.927273 0-102.4-65.163636-197.818182-162.90909-228.072727-134.981818-41.890909-262.981818 34.909091-302.545455 151.272727-2.327273 9.309091-11.636364 16.290909-20.945455 18.618182-109.381818 20.945455-193.163636 118.690909-193.163636 235.054546v2.327272c0 104.727273 88.436364 186.181818 190.836364 186.181819h477.090909c93.090909-2.327273 167.563636-76.8 167.563636-169.89091 2.327273-81.454545-55.854545-148.945455-132.654545-167.563636z m-139.636364 95.418182l-109.381818 109.381818c-11.636364 11.636364-27.927273 13.963636-41.890909 9.309091h-2.327273c-4.654545-2.327273-9.309091-4.654545-13.963636-9.309091l-109.381818-109.381818c-13.963636-13.963636-13.963636-39.563636 0-53.527273 13.963636-13.963636 39.563636-13.963636 53.527272 0l46.545455 46.545455V442.181818c0-20.945455 16.290909-37.236364 37.236363-37.236363 20.945455 0 37.236364 16.290909 37.236364 37.236363v123.345455l46.545455-46.545455c16.290909-16.290909 39.563636-16.290909 55.854545 0 16.290909 13.963636 16.290909 37.236364 0 53.527273z" fill="#ffffff" p-id="5804"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/scriptCacheTtl.svg b/src/assets/icons/scriptCacheTtl.svg
new file mode 100644
index 000000000..2bedb77f9
--- /dev/null
+++ b/src/assets/icons/scriptCacheTtl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1768348780105" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4763" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.1953125" height="200"><path d="M832 128H192a64 64 0 0 0-64 64v640a64 64 0 0 0 64 64h640a64 64 0 0 0 64-64V192a64 64 0 0 0-64-64zM395.65 626.75L350.39 672 192 513.61l45.25-45.25 113.14-113.14 45.25 45.25-113.13 113.14zM480 768h-64l128-512h64z m193.61-96l-45.25-45.25 113.13-113.14-113.14-113.14 45.25-45.25 113.15 113.13L832 513.61z" p-id="4764" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/src/assets/styles/reduced-motion-fix.scss b/src/assets/styles/reduced-motion-fix.scss
new file mode 100644
index 000000000..ae89d625d
--- /dev/null
+++ b/src/assets/styles/reduced-motion-fix.scss
@@ -0,0 +1,40 @@
+/**
+ * 修复 modern-css-reset 在 prefers-reduced-motion 时的问题
+ * 
+ * 问题：modern-css-reset 将动画/过渡时间设置为 0.01ms，这会导致：
+ * 1. Notify 通知极快闪现
+ * 2. 代码编辑器 cmView 滚动不跟手
+ * 详见：https://github.com/sub-store-org/Sub-Store/issues/486
+ * 解决方案：让动画和过渡完全禁用，针对性处理Notify和代码编辑器样式
+ */
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0s !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0s !important;
+    scroll-behavior: auto !important;
+  }
+
+  /* 需要保持动画的元素：添加 .keep-motion 类或使用特定前缀 */
+  .keep-motion,
+  .keep-motion *,
+  [class^="Toastify"],
+  [class*=" Toastify"],
+  [class^="nut-toast"],
+  [class^="nut-overlay"] {
+    animation-duration: 0.5s !important;
+    transition-duration: 0.5s !important;
+  }
+
+  // NutUI Toast.loading 动画
+  .nut-toast-loading .nut-toast-icon-wrapper {
+    animation: rotation 1s linear infinite !important;
+  }
+
+  .cmviewRef,
+  .cm-scroller {
+    scroll-behavior: auto !important;
+  }
+}
diff --git a/src/changelogs/2023-08-15.md b/src/changelogs/2023-08-15.md
deleted file mode 100644
index 656279c48..000000000
--- a/src/changelogs/2023-08-15.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-date: 2023-08-15
----
-
-- 更新组件库 NutUI v3.3.8、Picker 问题修复
-- 解决反复重启并发消耗资源、降低资源占用内存
-- 移除：Monaco-Editor 组件
-
-- 添加新主题、Simple 模式 主页与管理页
-- 自定义后端 HostAPI 更多使用场景
-
-- 优化侧滑返回容易失效的问题
-- 修复左右滑动组件的时候 没有阻止会上下滑动 容易误触
-- 修复拖动卡片的时会把快捷方式跟着拖动
-- 脚本操作、正则操作、等平铺放置更容易添加操作
-- 点击订阅左边的图标才会预览，防止误触预览节点
-- 首页订阅页面：卡片左滑呼出快捷方式，可设置右滑呼出。ㅤ ㅤ
-- 点击卡片空白处可关闭当前滑块。添加编辑方便修改
-
-- 改进 Service Worker 通过将资源预缓存，更快、流畅地加载ㅤ ㅤ
-- 网络连接稳定或不可用时仍能够访问程序
-- 增加预览时候的 V2Ray 入口
-- 新增长按卡片拖动排序，前端需 v2.14.6+ 后端 v2.14.13+
-- 首页订阅页面图标默认为黑白，可自定义开启图标为彩色
diff --git a/src/changelogs/2023-08-23.md b/src/changelogs/2023-08-23.md
deleted file mode 100644
index 2baec1acb..000000000
--- a/src/changelogs/2023-08-23.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-date: 2023-08-23
----
-
-### 新增开关项
-- 订阅编辑页面 常用配置板块 默认开启
-- 添加简洁模式 卡片开启刷新按钮 默认关闭
\ No newline at end of file
diff --git a/src/changelogs/2023-08-27.md b/src/changelogs/2023-08-27.md
deleted file mode 100644
index b8d0440e1..000000000
--- a/src/changelogs/2023-08-27.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-date: 2023-08-27
----
-
-### 修复
-
-- 修复了当隐藏同步页面时 tab bar 的 active 状态错误
-
-### 优化
-
-- 优化了订阅列表复制预览等按钮的操作逻辑
-
-### 功能
-
-- 域名解析服务增加了 Ali 和 Tencent (要求: 后端 >= 2.14.33)
-- 新增了后端 API 管理页面，可以方便的在多个后端之间切换
-- 新增了在 url 查询参数传入 api 时可以自动将其加入后端 API 列表并切换至该 API
diff --git a/src/changelogs/2023-08-28.md b/src/changelogs/2023-08-28.md
deleted file mode 100644
index f95c01364..000000000
--- a/src/changelogs/2023-08-28.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-date: 2023-08-28
----
-
-### 功能
-
-- 输出支持 Clash.Meta (要求: 后端 >= 2.14.35)
-
-### UI
-
-- 修复错位，标题栏偏移
\ No newline at end of file
diff --git a/src/changelogs/2023-09-02.md b/src/changelogs/2023-09-02.md
deleted file mode 100644
index f46bd9f22..000000000
--- a/src/changelogs/2023-09-02.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-date: 2023-10-26
----
-
-- 拖动排序失败回退
-- 检测后端版本启用 name 排序接口
-- 我的页面取消禁止滑动
-- 修复重复点击多次保存会提示重复的问题
\ No newline at end of file
diff --git a/src/changelogs/2023-10-31.md b/src/changelogs/2023-10-31.md
deleted file mode 100644
index e82ab7c50..000000000
--- a/src/changelogs/2023-10-31.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-date: 2023-10-31
----
-
-- 修复订阅/组合编辑编辑报错不显示的问题
-- 修复动态添加节点后无法预览的问题
\ No newline at end of file
diff --git a/src/changelogs/2023-11-08.md b/src/changelogs/2023-11-08.md
deleted file mode 100644
index 0efe51000..000000000
--- a/src/changelogs/2023-11-08.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-date: 2023-11-08
----
-
-- 为同步订阅项增加了点击预览来源订阅的功能(便于查看确认来源订阅是否正常)
\ No newline at end of file
diff --git a/src/changelogs/2023-11-25.md b/src/changelogs/2023-11-25.md
deleted file mode 100644
index 3998d2c11..000000000
--- a/src/changelogs/2023-11-25.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-date: 2023-11-25
----
-
-- 支持设置默认 User-Agent(后端版本应 > 2.14.101)
\ No newline at end of file
diff --git a/src/changelogs/2024-01-12.md b/src/changelogs/2024-01-12.md
deleted file mode 100644
index 041eb3f41..000000000
--- a/src/changelogs/2024-01-12.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-date: 2024-01-12
----
-
-### 阶段性更新汇总
-
-- 同步配置支持文件(后端 > 2.14.144)
-
-- 新增文件功能
-
-- 默认隐藏悬浮刷新按钮(可在设置中切换)
-
-- 支持 Surfboard
-
-- 节点操作中的正则支持拖拽排序
-
-- 支持忽略失败的远程订阅
-
-- 手动下载备份文件和使用备份上传恢复
-
-- 支持按顺序合并本地和远程订阅
-
-- 远程订阅支持换行输入多个订阅
-
-- 预览节点时增加 JSON 数据便于查看复制
\ No newline at end of file
diff --git a/src/changelogs/2024-01-29.md b/src/changelogs/2024-01-29.md
deleted file mode 100644
index 37a534e13..000000000
--- a/src/changelogs/2024-01-29.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-date: 2024-01-29
----
-
-### UI
-
-- 优化 iOS PWA 下状态栏样式
-
-- 适配桌面端左右滑动
diff --git a/src/changelogs/2024-04-23.md b/src/changelogs/2024-04-23.md
deleted file mode 100644
index 1c77349fa..000000000
--- a/src/changelogs/2024-04-23.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-date: 2024-04-23
----
-
-### 阶段性更新汇总
-
-此处的更新可能不完整不及时
-
-Telegram 频道 https://t.me/cool_scripts 内有每次更新的详细说明
-
-- 处理手动删除 Gist 之后, Sub-Store 侧重新同步的逻辑
-
-- QX 输出正式支持 VLESS
-
-- 节点操作支持单项展开/收起
-
-- 支持 Loon SOCKS5/SOCKS5-TLS
-
-- 支持 WireGuard URI 输入和输出
-
-- 支持 dialer-proxy, detour
-
-- fancy-characters 增加 modifier-letter(小写没有 q, 用 ᵠ 替代. 大写缺的太多, 用小写替代)
-
-- 订阅支持输出哪吒探针兼容响应, 网络监控接口(Loon/Surge 可输出节点延迟)
-
-- 节点操作增加收起/展开按钮, 方便处理多个操作
-
-- 远程订阅 URL 新增参数 validCheck 将检查订阅有效期和剩余流量
-
-- 增加脚本说明文档链接
-
-- HTML 中增加 version meta
-
-- 支持导出操作的数据到剪贴板, 从剪贴板数据导入操作
-
-- 设置展示订阅进度
-
-- 增加提示文案(部分浏览器上 HTTPS 前端无法访问本地 HTTP 后端)
-
-- 恢复数据后 重新加载页面
-
-- 旗帜操作(支持更多选项)
-
-- 协议类型筛选支持 SSH
-
-- 增加 User-Agent 说明文案
-
-- 预览界面显示保留/过滤节点数量并可跳转
-
-- 预览界面增加端口
-
-- 域名解析新增 IP4P, 支持禁用缓存
-
-- 增加下载缓存阈值
-
-- 文件预览界面增加复制预览内容按钮
-
-- 订阅列表的流量信息兼容远程和本地合并的情况, 排除设置了不查询订阅信息的链接
-
-- 支持显示剩余重置天数
-
-- 支持自定义订阅流量信息
-
-- 通过代理/节点/策略获取订阅 现已支持 Surge, Loon, Stash, Shadowrocket, QX, Node.js
-
-- 支持设置查询远程订阅流量信息时的 User-Agent
-
-- 支持收起/展开订阅
-
-- 订阅支持标签分组
-
-- 组合订阅中的子订阅支持分组筛选(仅支持筛选, 未实现动态绑定一个分组的所有订阅)
-
-- 支持参数 hideExpire 隐藏到期时间
-
-- 订阅链接支持 `showRemaining` 参数, 此时将显示剩余流量而不是已用流量
-
-- 支持设置并在远程订阅失败时读取最近一次成功的缓存
diff --git a/src/changelogs/2024-12-15.md b/src/changelogs/2024-12-15.md
deleted file mode 100644
index 5a35c0fde..000000000
--- a/src/changelogs/2024-12-15.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-date: 2024-12-15
----
-
-### 阶段性更新汇总
-
-此处的更新可能不完整不及时
-
-Telegram 频道 https://t.me/cool_scripts 内有每次更新的详细说明
-
-#### 核心功能增强
-
-1. 协议支持
-
-- 新增支持 Egern 输出
-
-- 支持 VLESS mKcp
-
-- 支持 Juicity, SSH 等新协议
-
-- 支持 Trojan, VMess, VLESS httpupgrade
-
-2. 解析优化
-
-- 修复各类 URI 解析问题(SS, VMess, Trojan等)
-
-- 改进域名解析功能,支持自定义 EDNS 和 DoH
-
-- 优化无效节点处理逻辑
-
-3. 代理与策略
-
-- 新增全局代理/策略设置
-
-- 支持文件和链接设置代理/策略
-
-- 支持 direct 类型节点
-
-#### 功能改进
-
-1. 缓存与性能
-
-- 默认缓存阈值调整为 1024KB
-
-- 默认超时调整为 8000ms
-
-- 优化乐观缓存逻辑
-
-2. 订阅管理
-
-- 支持订阅流量信息自定义
-
-- 改进订阅刷新机制
-
-- 支持定时处理订阅功能
-
-3. 安全性
-
-- 支持 JWT 和 token 管理
-
-- 支持自定义 share token
-
-- 支持 insecure 模式不验证证书
-
-#### UI/UX 改进
-
-- 新增图标仓库功能
-
-- 支持标签管理和排序
-
-- 改进分享功能,支持二维码
-
-- 优化界面样式和交互
-
-#### 其他
-
-- 增加更多的兼容性支持
-
-- 修复各类 bug
-
-- 完善文档和说明
-
-- 支持更多的配置选项
-
-这些更新显著提升了软件的功能完整性、稳定性和用户体验。
diff --git a/src/changelogs/2025-03-02.md b/src/changelogs/2025-03-02.md
deleted file mode 100644
index 58811fead..000000000
--- a/src/changelogs/2025-03-02.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-date: 2025-03-02
----
-
-### 阶段性更新汇总
-
-此处的更新可能不完整不及时
-
-Telegram 频道 https://t.me/cool_scripts 内有每次更新的详细说明
-
-功能新增
-	
-  •	区域过滤和协议过滤支持保留模式和过滤模式(后端需 >= 2.17.0, 前端需 >= 2.15.0)
-	
-  •	订阅管理
-	
-  •	支持环境变量 SUB_STORE_PRODUCE_CRON 在后台定时处理订阅。
-	
-  •	订阅支持开关 passThroughUA 透传请求的 User-Agent。
-	
-  •	组合订阅支持手动设置流量信息，可使用链接，响应内容即为流量信息。
-	
-  •	远程订阅支持透传请求的 User-Agent。
-	
-  •	协议支持
-	
-  •	sing-box 及 Egern 支持 anytls 协议。
-	
-  •	Egern 和 Stash 可根据 User-Agent 自动包含官方/商店版/未续费订阅不支持的协议。
-	
-  •	Egern 正式支持 Shadowsocks 2022。
-	
-  •	Loon 正式支持 Shadowsocks 2022 和 Shadow-TLS。
-	
-  •	Surge 默认开启 Shadowsocks 2022。
-	
-  •	sing-box 及 Egern 支持 Hysteria2 端口跳跃。
-	
-  •	VLESS 支持 spx 参数；Trojan 支持 REALITY/XHTTP 结合使用。
-	
-  •	Proxy URI Scheme 支持省略端口号（HTTP 默认 80，TLS 默认 443）。
-	
-  •	Shadowrocket 的 Shadowsocks 输入支持 Shadow TLS 参数。
-	
-  •	Egern 支持 prev_hop 前置代理。
-	
-  •	Mihomo 配置
-	
-  •	Mihomo 配置支持 覆写 多次使用。
-	
-  •	Mihomo 配置的 Snell 版本 < 3 时，强制去除 udp 字段以防止内核报错。
-	
-  •	Mihomo 配置文件支持 流量信息链接 设置。
-
-优化改进
-	
-  •	解析 & 兼容性
-	
-  •	修复 Shadowsocks URI 解析逻辑，支持 Shadow TLS plugin。
-	
-  •	UUID 仅辅助判断，不直接过滤；VMess/VLESS 校验 UUID。
-	
-  •	兼容 v2rayN 非标 TUIC URI，并支持更多 TUIC URI 字段。
-	
-  •	Egern 增加默认 SNI。
-	
-  •	Loon 排除 XTLS。
-	
-  •	界面优化
-	
-  •	预览界面：
-	
-  •	复制分享链接优化，新增一键复制按钮。
-	
-  •	订阅管理界面顶部标签栏始终显示，增加 PWA 判断。
-	
-  •	修复宽屏设备下节点信息面板二维码样式问题。
-	
-  •	文件管理
-	
-  •	target 名称适配大小写和别名。
-	
-  •	Mihomo 配置中订阅名称选取交互优化。
-	
-  •	订阅流量信息去除空字段，增强兼容性。
-
-修复
-	
-  •	修复 Surge 输入的 tfo。
-	
-  •	修复 Loon ip-mode 逻辑。
-	
-  •	修复 Egern VMess tcp 传输层问题。
-	
-  •	修复 TUIC URI 解析问题。
-	
-  •	修复 组合订阅 透传 User-Agent 逻辑。
-	
-  •	修复 Base64 解码合法性判断。
-	
-  •	修复 Clash Pre-processor 逻辑。
-	
-  •	修复 短 ID 正则匹配 问题。
-	
-  •	修复 代理 App 版 target 参数为空的情况。
-
-其他
-	
-  •	geo 数据更新。
-	
-  •	README 文档调整。
-	
-  •	pnpm 依赖更新，构建方式调整（使用 esbuild）。
-	
-  •	GitHub Actions 流水线优化。
-
-这一版本包含了大量新增特性和修复，建议所有用户尽快更新！ 🚀
\ No newline at end of file
diff --git a/src/components/ArtifactsListItem.vue b/src/components/ArtifactsListItem.vue
index c058de9cd..57076c036 100644
--- a/src/components/ArtifactsListItem.vue
+++ b/src/components/ArtifactsListItem.vue
@@ -85,7 +85,7 @@
                   <font-awesome-icon icon="fa-solid fa-angles-right" />
                 </button>
               </div>
-              <span v-if="!appearanceSetting.isSimpleMode">
+              <span class="switch-label" v-if="!appearanceSetting.isSimpleMode">
                 {{ $t(`syncPage.syncSwitcher`) }}
               </span>
               <span @click.stop>
@@ -645,12 +645,7 @@ watch(isSyncOpen, async () => {
     }
 
     .sub-item-detail {
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      -webkit-line-clamp: 3;
       word-wrap: break-word;
-      word-break: break-all;
-      // overflow: hidden;
       // margin-top: 3.5px;
       font-size: 12px;
 
@@ -674,6 +669,9 @@ watch(isSyncOpen, async () => {
             // line-height: 2.8;
             color: var(--comment-text-color);
           }
+          .switch-label {
+            flex-shrink: 0;
+          }
 
           .my-switch {
             height: 22px;
@@ -689,7 +687,11 @@ watch(isSyncOpen, async () => {
       }
 
       p {
-        display: block;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+        word-break: break-all;
         line-height: 1.8;
       }
 
diff --git a/src/components/FileListItem.vue b/src/components/FileListItem.vue
index 409484da1..edf7bed9b 100644
--- a/src/components/FileListItem.vue
+++ b/src/components/FileListItem.vue
@@ -47,9 +47,15 @@
         <div class="sub-item-title-wrapper">
           <h3 v-if="!appearanceSetting.isSimpleMode" class="sub-item-title">
             {{ displayName || name }}
+            <span v-for="i in tag" :key="i" class="tag">
+              <nut-tag>{{ i }}</nut-tag>
+            </span>
           </h3>
           <h3 v-else class="sub-item-title" style="color: var(--primary-text-color); font-size: 16px">
             {{ displayName || name }}
+            <span v-for="i in tag" :key="i" class="tag">
+              <nut-tag>{{ i }}</nut-tag>
+            </span>
           </h3>
 
           <!-- onClickCopyLink 拷贝 -->
@@ -289,6 +295,7 @@
     props[props.type].displayName || props[props.type]['display-name'];
 
   const name = props[props.type].name;
+  const tag = props[props.type].tag;
   const remark = props[props.type].remark;
   const remarkText = computed(() => {
     if (remark) {
@@ -587,6 +594,10 @@
           overflow: hidden;
           font-size: 16px;
           color: var(--primary-text-color);
+          vertical-align: middle;
+        }
+        .tag {
+          margin: 0 2px;
         }
         .compare-sub-link,
         .share-sub-link,
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 7d8a1356a..d74b161ce 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -96,9 +96,10 @@ import { computed, ref, watchEffect, onMounted } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 import { useGlobalStore } from "@/store/global";
+import { useSystemStore } from "@/store/system";
 import { useSettingsStore } from '@/store/settings';
 import { storeToRefs } from "pinia";
-import { Toast } from "@nutui/nutui";
+import { Toast, Dialog } from "@nutui/nutui";
 import { initStores } from "@/utils/initApp";
 import { useMethodStore } from '@/store/methodStore';
 import { useAppNotifyStore } from "@/store/appNotify";
@@ -111,49 +112,21 @@ const router = useRouter();
 const route = useRoute();
 const methodStore = useMethodStore()
 const globalStore = useGlobalStore();
+const systemStore = useSystemStore();
 const showLangSwitchPopup = ref(false);
 const langList = ["zh", "en"];
 const settingsStore = useSettingsStore();
 const { changeAppearanceSetting } = settingsStore;
 const { appearanceSetting } = storeToRefs(settingsStore);
-// const { isSimpleMode, showFloatingRefreshButton } = storeToRefs(globalStore);
-const isLandscape = ref(false);
-const isSmall = ref(false);
-const screenWidth = ref(window.innerWidth);
-const screenHeight = ref(window.innerHeight);
-
-const handleResize = () => {
-  screenWidth.value = window.innerWidth;
-  screenHeight.value = window.innerHeight;
-};
+// 从systemStore获取状态
+const { isPWA, isLandscape, isSmall } = storeToRefs(systemStore);
 
 onMounted(() => {
-  window.addEventListener("resize", handleResize);
-});
-const isPWA = ref(
-  (window.matchMedia("(display-mode: standalone)").matches &&
-    !/Android/.test(navigator.userAgent)) ||
-    false
-);
-
-// isPWA.value = true;
-// isSmall.value = true;
-
-const navBarHeight = computed(() => {
-  return isPWA.value && !isLandscape.value ? (isSmall.value ? "78px" : "95px") : "56px";
+  systemStore.initSystemState();
 });
 
-const navBartop = computed(() => {
-  return isPWA.value && !isLandscape.value ? (isSmall.value ? "38px" : "55px") : "0px";
-});
-
-const navBartopRight = computed(() => {
-  return isPWA.value && !isLandscape.value ? (isSmall.value ? "52px" : "65px") : "15px";
-});
-
-const Pwa_top = computed(() => {
-  return isPWA.value ? (isSmall.value ? "20px" : "45px") : "45px";
-});
+// 使用systemStore中的计算属性
+const { navBarHeight, navBartop, navBartopRight, pwaTopPadding: Pwa_top } = storeToRefs(systemStore);
 
 const isNeedBack = computed(() => {
   return route.meta.needNavBack ?? false;
@@ -170,18 +143,19 @@ const currentTitleWhetherAsk = computed(() => {
 });
 const onClickNavbarIcon = () => {
   const metaTitle = route.meta.title;
-  const toastContent =
+  const content =
     t(`navBar.pagesTitle.askWhat.${metaTitle}.content`) || "";
-  const toastTitle = t(`navBar.pagesTitle.askWhat.${metaTitle}.title`) || "";
-  Toast.text(toastContent, {
-    title: toastTitle,
-    duration: 0,
-    cover: true,
-    "close-on-click-overlay": true,
-    "bg-color": "rgba(0, 0, 0, 0.8)",
-    "cover-color": "rgba(0, 0, 0, 0.2)",
-    "text-align-center": false,
-  });
+  const title = t(`navBar.pagesTitle.askWhat.${metaTitle}.title`) || "";
+    Dialog({
+      title: title,
+      content: content,
+      popClass: 'auto-dialog',
+      textAlign: 'left',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
 };
 
 const changeLang = (type: string) => {
@@ -245,11 +219,6 @@ const refresh = async () => {
     }, 1000);
   }
 };
-watchEffect(() => {
-  handleResize();
-  isSmall.value = screenHeight.value < 750 || /iPad/.test(navigator.userAgent);
-  isLandscape.value = screenWidth.value > screenHeight.value;
-});
 </script>
 
 <style lang="scss">
diff --git a/src/components/ShareListItem.vue b/src/components/ShareListItem.vue
index 5d4b3bfe2..1c52b5aad 100644
--- a/src/components/ShareListItem.vue
+++ b/src/components/ShareListItem.vue
@@ -83,10 +83,10 @@
           </div>
         </div>
         <p v-if="!appearanceSetting.isSimpleMode" class="sub-item-remark">
-          <span>创建时间：{{ createTime }}</span>
+          <span>{{ t(`sharePage.createTimeLabel`) }}{{ createTime }}</span>
         </p>
         <p class="sub-item-remark">
-          <span>到期时间：{{ expiresTime }}</span>
+          <span>{{ t(`sharePage.expiredLabel`) }}{{ expiresTime }}</span>
         </p>
 
         <!-- 分享备注 -->
@@ -247,7 +247,7 @@ const swipeController = () => {
 };
 
 const onDeleteConfirm = async () => {
-  await subsStore.deleteShare(token.value);
+  await subsStore.deleteShare(token.value, type.value, name.value);
 };
 
 const onClickEdit = () => {
@@ -345,6 +345,12 @@ const secretPath = computed(() => {
 const getShareUrl = () => {
   try {
     const { type, name, token } = props.data;
+    if (!secretPath.value.startsWith('/')) {
+      Toast.fail(t('sharePage.magicPathErrorNotify'));
+      throw new Error(
+        t("sharePage.magicPathErrorNotify"),
+      );
+    }
     const shareUrl = `${host.value.replace(
       new RegExp(`${secretPath.value}$`),
       "",
diff --git a/src/components/SubListItem.vue b/src/components/SubListItem.vue
index 5ccde0ef6..7b83a9dd8 100644
--- a/src/components/SubListItem.vue
+++ b/src/components/SubListItem.vue
@@ -400,7 +400,7 @@ const collectionDetail = computed(() => {
   } else {
     const displayNameList = nameList.map((name) => {
       const sub = subsStore.getOneSub(name);
-      return sub?.displayName || sub?.["display-name"] || sub.name;
+      return sub?.displayName || sub?.["display-name"] || sub?.name;
     });
     if (nameList.length === 0) {
       return `${t("subPage.collectionItem.containTag")}: ${subTags.join(", ")}`;
@@ -447,7 +447,7 @@ const flow = computed(() => {
         firstLine: t("subPage.subItem.noFlow"),
         secondLine: ``,
       };
-    } else if (target.status === "success") {
+    } else if (target.status === "success" && target.data?.usage) {
       let {
         planName,
         appUrl,
diff --git a/src/components/TagPopup.vue b/src/components/TagPopup.vue
index 76d5af2c0..d27f94fda 100644
--- a/src/components/TagPopup.vue
+++ b/src/components/TagPopup.vue
@@ -85,7 +85,7 @@ import { useI18n } from "vue-i18n";
 
 const { t } = useI18n();
 const subsStore = useSubsStore();
-const { hasSubs, hasCollections, subs, collections } = storeToRefs(subsStore);
+const { hasSubs, hasCollections, subs, collections, hasFiles, files } = storeToRefs(subsStore);
 const hasUntagged = ref(false);
 const props = defineProps({
   visible: {
@@ -96,6 +96,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  type: {
+    type: String,
+    default: 'subCol',
+  },
 });
 const isVisible = ref(props.visible);
 const keyword = ref("");
@@ -135,27 +139,40 @@ const allTagsList = computed(() => {
   return allTags.value.filter(i => i.label.indexOf(keyword.value) !== -1)
 })
 const getTags = () => {
-  if(!hasSubs.value && !hasCollections.value) return []
-  // 从 subs 和 collections 中获取所有的 tag, 去重
+  if(props.type === 'file' && !hasFiles.value) return []
+  if(props.type === 'subCol' && !hasSubs.value && !hasCollections.value) return []
   const set = new Set()
-  subs.value.forEach(sub => {
-    if (Array.isArray(sub.tag) && sub.tag.length > 0) {
-      sub.tag.forEach(i => {
-        set.add(i)
-      });
-    } else {
-      hasUntagged.value = true
-    }
-  })
-  collections.value.forEach(col => {
-    if (Array.isArray(col.tag) && col.tag.length > 0) {
-      col.tag.forEach(i => {
-        set.add(i)
-      });
-    } else {
-      hasUntagged.value = true
-    }
-  })
+  if (props.type === 'subCol') {
+    // 从 subs 和 collections 中获取所有的 tag, 去重
+    subs.value.forEach(sub => {
+      if (Array.isArray(sub.tag) && sub.tag.length > 0) {
+        sub.tag.forEach(i => {
+          set.add(i)
+        });
+      } else {
+        hasUntagged.value = true
+      }
+    })
+    collections.value.forEach(col => {
+      if (Array.isArray(col.tag) && col.tag.length > 0) {
+        col.tag.forEach(i => {
+          set.add(i)
+        });
+      } else {
+        hasUntagged.value = true
+      }
+    })
+  } else if (props.type === 'file') {
+    files.value.forEach(file => {
+      if (Array.isArray(file.tag) && file.tag.length > 0) {
+        file.tag.forEach(i => {
+          set.add(i)
+        });
+      } else {
+        hasUntagged.value = true
+      }
+    })
+  }
 
   let tags: any[] = Array.from(set)
   if(tags.length === 0) return []
diff --git a/src/hooks/useBackend.ts b/src/hooks/useBackend.ts
index fef1bae26..5ff812a2a 100644
--- a/src/hooks/useBackend.ts
+++ b/src/hooks/useBackend.ts
@@ -3,6 +3,7 @@ import clash from '@/assets/icons/clash.png';
 import quanx from '@/assets/icons/quanx.png';
 import loon from '@/assets/icons/loon.png';
 import stash from '@/assets/icons/stash.png';
+import egern from '@/assets/icons/egern.png';
 import node from '@/assets/icons/node.svg?url';
 
 import { useGlobalStore } from '@/store/global';
@@ -18,6 +19,8 @@ export const useBackend = () => {
     switch (env.value.backend) {
       case 'Surge':
         return surge;
+      case 'Egern':
+        return egern;
       case 'Clash':
         return clash;
       case 'QX':
diff --git a/src/hooks/useHostAPI.ts b/src/hooks/useHostAPI.ts
index eea4d3054..70a130250 100644
--- a/src/hooks/useHostAPI.ts
+++ b/src/hooks/useHostAPI.ts
@@ -148,6 +148,43 @@ export const useHostAPI = () => {
       return false; // 没有URL参数，返回false
     }
 
+    // 处理 concurrency 参数
+    const concurrency = query
+      .slice(1)
+      .split('&')
+      .map(i => i.split('='))
+      .find(i => i[0] === 'concurrency');
+    if (concurrency) {
+      const value = parseInt(concurrency[1], 10);
+      if (!isNaN(value)) {
+        if (value >= 1) {
+          console.log(`设置并发数 ${value}`)
+          localStorage.setItem('concurrency', value.toString());
+        } else {
+          console.log(`清除并发数设置`)
+          localStorage.removeItem('concurrency');
+        }
+      }
+    }
+    // 处理 timeout 参数
+    const timeout = query
+      .slice(1)
+      .split('&')
+      .map(i => i.split('='))
+      .find(i => i[0] === 'timeout');
+    if (timeout) {
+      const value = Number(timeout[1]);
+      if (!isNaN(value)) {
+        if (value > 0) {
+          console.log(`设置超时 ${value}`)
+          localStorage.setItem('timeout', value.toString());
+        } else {
+          console.log(`清除超时设置`)
+          localStorage.removeItem('timeout');
+        }
+      }
+    }
+
     // 处理api参数
     const apiUrl = query
       .slice(1)
@@ -180,7 +217,7 @@ export const useHostAPI = () => {
           try {
             // 测试API连接是否有效
             const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), 3000); // 3秒超时
+            const timeoutId = setTimeout(() => controller.abort(), localStorage.getItem('timeout') ? parseInt(localStorage.getItem('timeout') as string, 10) : 3000); // 3秒超时
 
             const res = await axios.get<{ status: 'success' | 'failed' }>(
               url + '/api/utils/env',
@@ -234,7 +271,7 @@ export const useHostAPI = () => {
 
           // 测试API连接是否有效，添加超时处理
           const controller = new AbortController();
-          const timeoutId = setTimeout(() => controller.abort(), 3000); // 3秒超时
+          const timeoutId = setTimeout(() => controller.abort(), localStorage.getItem('timeout') ? parseInt(localStorage.getItem('timeout') as string, 10) : 3000); // 3秒超时
 
           try {
             const res = await axios.get<{ status: 'success' | 'failed' }>(
@@ -296,7 +333,7 @@ export const useHostAPI = () => {
           try {
             // 测试API连接是否有效
             const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), 3000); // 3秒超时
+            const timeoutId = setTimeout(() => controller.abort(), localStorage.getItem('timeout') ? parseInt(localStorage.getItem('timeout') as string, 10) : 3000); // 3秒超时
 
             const res = await axios.get<{ status: 'success' | 'failed' }>(
               apiUrl + '/api/utils/env',
@@ -352,7 +389,7 @@ export const useHostAPI = () => {
 
           // 测试API连接是否有效，添加超时处理
           const controller = new AbortController();
-          const timeoutId = setTimeout(() => controller.abort(), 3000); // 3秒超时
+          const timeoutId = setTimeout(() => controller.abort(), localStorage.getItem('timeout') ? parseInt(localStorage.getItem('timeout') as string, 10) : 3000); // 3秒超时
 
           try {
             const res = await axios.get<{ status: 'success' | 'failed' }>(
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 8c5a3ef2a..43fcc311e 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -94,7 +94,7 @@ export default {
     url: {
       label: "URL",
       placeholder:
-        "Supports mixing three types of formats with line breaks: 1. Full remote URL 2. Internal file reference like /api/file/name 3. Absolute path for local file. Supported parameters: noCache - do not use cache; insecure - do not verify the server certificate. For example: http://a.com#noCache&insecure",
+        'Supports mixing three types of formats with line breaks: 1. Full remote URL 2. Internal file reference like /api/file/name 3. Absolute path for local file. Supported parameters: noCache - do not use cache; insecure - do not verify the server certificate; headers - custom request headers (single-line JSON string). For example: http://a.com#noCache&insecure',
       isEmpty: "URL cannot be empty",
       isIllegal: "Invalid URL",
     },
@@ -298,7 +298,7 @@ export default {
             label: "Usage",
             title: "Subscription URL(s)",
             content:
-              "Supports mixing three types of formats with line breaks:\n1. Full remote URL\n2. Internal file reference like /api/file/name 3.\nAbsolute path for local file\n\nSupported parameters:\n\ninsecure: https requests will not verify the server certificate\ncacheKey: Setting the name of the optimistic cache. Its value can be managed in the persistent store(suitable for subscriptions that often fail to fetch).\n\nvalidCheck: error will be reported when expired or there is no remaining traffic\n\nflowUserAgent: the User-Agent for fetching subscription usage info\n\nflowUrl: the URL for fetching subscription usage info(using the content of the response body)\n\nshowRemaining: show remaining traffic instead of usage\n\nnoFlow: do not query for flow\n\nhideExpire: hide expiration time\n\nnoCache: do not use cache\n\nresetDay: the day when monthly data usage resets\n\nstartDate: subscription start date\n\ncycleDays: reset cycle (in days).\n\nFor example: http://a.com?token=1#cycleDays=31&startDate=2024-06-04 \nor http://a.com?token=1#resetDay=15",
+              "Supports mixing three types of formats with line breaks:\n1. Full remote URL\n2. Internal file reference like /api/file/name 3.\nAbsolute path for local file\n\nSupported parameters:\n\nheaders: Custom request headers(single-line JSON string)\ninsecure: https requests will not verify the server certificate\ncacheKey: Setting the name of the optimistic cache. Its value can be managed in the persistent store(suitable for subscriptions that often fail to fetch).\n\nvalidCheck: error will be reported when expired or there is no remaining traffic\n\nflowUserAgent: the User-Agent for fetching subscription usage info\n\nflowUrl: the URL for fetching subscription usage info(using the content of the response body or response headers)\n\nshowRemaining: show remaining traffic instead of usage\n\nnoFlow: do not query for flow\n\nhideExpire: hide expiration time\n\nnoCache: do not use cache\n\nresetDay: the day when monthly data usage resets\n\nstartDate: subscription start date\n\ncycleDays: reset cycle (in days).\n\nFor example: http://a.com?token=1#cycleDays=31&startDate=2024-06-04 \nor http://a.com?token=1#resetDay=15",
           },
           isEmpty: "URL cannot be empty",
           isIllegal: "Invalid URL",
@@ -333,13 +333,15 @@ export default {
         ua: {
           label: "User-Agent",
           placeholder: "The User-Agent for downloading resource(s)",
+          placeholderDisabled: 'Disable custom UA when passing through',
         },
         subUserinfo: {
           label: "Subscription-Userinfo",
-          placeholder: "Value or URL(use response content)",
+          placeholder: "Value or URL(supports noCache etc.)",
         },
         passThroughUA: {
-          label: 'Pass Through Request User-Agent'
+          label: 'Pass Through Request User-Agent',
+          warning: 'Pass Through Request User-Agent and Custom UA cannot be enabled at the same time',
         },
         proxy: {
           label: "Proxy/Policy",
@@ -476,7 +478,10 @@ export default {
             "Hysteria 2",
             "Juicity",
             "mieru",
+            "sudoku",
+            "MASQUE",
             "AnyTLS",
+            'TrustTunnel',
             "WireGuard",
             "SSH",
             "External Proxy Program",
@@ -528,12 +533,16 @@ export default {
             placeholder:
               "The connector between the node name and the sequence number",
           },
+          field: {
+            des: 'Deduplication Field(supports multi-field concatenation and lodash get syntax)',
+            placeholder: 'Field for deduplication, e.g. node name, please enter name',
+          },
           tipsTitle: "Handle Duplicate Tips",
           tipsDes: "Node deduplication operation instructions",
         },
         "Script Filter": {
           label: "Script Filter",
-          options: ["Link", "Script"],
+          options: ["Remote Link", "Local Content"],
           des: ["Type", "Content"],
           placeholder:
             "Input Script Link or Internal File like /api/file/name. In addition to the parameters of the script itself, there is support for additional parameters: noCache - do not use cache, insecure - do not verify the server certificate. For example: http://a.com#a=1&b=2#noCache&insecure",
@@ -554,7 +563,7 @@ export default {
         },
         "Script Operator": {
           label: "Script Operator",
-          options: ["Link", "Script"],
+          options: ["Remote Link", "Local Content"],
           des: ["Type", "Content"],
           placeholder:
             "Input Script Link or Internal File like /api/file/name. In addition to the parameters of the script itself, there is support for additional parameters: noCache - do not use cache, insecure - do not verify the server certificate. For example: http://a.com#a=1&b=2#noCache&insecure",
@@ -594,8 +603,13 @@ export default {
       githubProxy: "Please input GitHub Proxy",
       defaultUserAgent: "Please input Default User-Agent",
       defaultProxy: "Please input Default Proxy/Policy",
-      defaultTimeout: "Default Timeout (in milliseconds, default: 8000)",
+      defaultTimeout: "Default Timeout (in ms, default: 8000)",
       cacheThreshold: "Cache Threshold (in KB, default: 1024)",
+      resourceCacheTtl: 'Resource Cache TTL, default: 3600(s)',
+      headersCacheTtl: 'Headers Cache TTL, default: 60(s)',
+      scriptCacheTtl: 'Script Cache TTL, default: 172800(s)',
+      concurrency: 'Concurrency Limit(default: 3)',
+      apiCheckTimeout: 'API Check Timeout, default: 3000(ms)',
       noGithubUser: "Not set GitHub username",
       noGistToken: "Not set Gist Token",
       noGithubProxy: "Not set GitHub Proxy",
@@ -633,7 +647,10 @@ export default {
         failed: "Sort failed",
       },
     },
-    config: "Configuration",
+    requestConfig: "Request Configuration",
+    cacheConfig: "Cache Configuration",
+    frontEndConfig: "Front-End Configuration",
+    githubConfig: 'GitHub Configuration',
     storage: {
       gist: {
         label: "Gist",
@@ -779,6 +796,9 @@ export default {
     noOriginalTips: "Failed to jump, check if the source data has been deleted.",
     leftTime: "Remaining time",
     expired: "Expired",
+    expiredLabel: "Expiration Time: ",
+    createTimeLabel: "Creation Time: ",
+    magicPathErrorNotify: "SUB_STORE_FRONTEND_BACKEND_PATH should start with /, please check the configuration!",
     createShare: {
       expiresValue: {
         label: "Valid for",
@@ -906,6 +926,11 @@ export default {
     },
   },
   moreSettingPage: {
+    gistUpload: {
+      title: 'Gist Upload',
+      base64: 'Base64 Encoded',
+      plaintext: 'Plaintext(w/o GitHub Token)',
+    },
     subProgress: {
       title: "Subscription Progress Style",
       hidden: "Hidden",
@@ -944,6 +969,7 @@ export default {
     showFloatingRefreshButton: "Show floating refresh button",
     showFloatingAddButton: "Show floating add button",
     displayPreviewInWebPage: 'Display preview in web page',
+    invalidShareFakeNode: "Invalid share returns fake info(to prevent caching)",
     tabBar: 'Hide "Sync" Page',
     tabBar2: 'Hide "File" Page',
     auto2: "MoreSetting Key",
@@ -965,7 +991,8 @@ export default {
       be: "Back-End",
       module: "Module",
       team: "Project Team",
-      link: "View on Github",
+      scriptTutorial: 'Scripts & Tutorials',
+      link: "GitHub",
     },
     changelogs: {
       title: "Changelogs",
diff --git a/src/locales/zh.ts b/src/locales/zh.ts
index 881b34a10..6555baf1e 100644
--- a/src/locales/zh.ts
+++ b/src/locales/zh.ts
@@ -29,8 +29,8 @@ export default {
       expiresValuePlaceholder: '请输入有效期时长',
       expiresValueRegex: '请输入0.01-99999.99范围内的数字',
       expiresUnit: '有效期单位',
-      token: '自定义Token',
-      tokenPlaceholder: '默认后端随机Token',
+      token: '自定义 Token',
+      tokenPlaceholder: '默认后端随机 Token',
       remark: '备注',
       remarkPlaceholder: '请输入备注',
       shareUrl: '分享链接',
@@ -120,7 +120,7 @@ export default {
     },
     url: {
       label: '链接',
-      placeholder: '支持换行混写三种格式: 1. 完整远程链接 2. 类似 /api/file/name 的内部文件调用路径 3. 本地文件的绝对路径. 支持参数: noCache 不使用缓存; insecure 不验证服务器证书. 例: http://a.com#noCache&insecure',
+      placeholder: '支持换行混写三种格式: 1. 完整远程链接 2. 类似 /api/file/name 的内部文件调用路径 3. 本地文件的绝对路径. 支持参数: noCache 不使用缓存; insecure 不验证服务器证书; headers 自定义请求头(单行 JSON 字符串). 例: http://a.com#noCache&insecure',
       isEmpty: '链接不能为空',
       isIllegal: '链接格式非法',
     },
@@ -225,7 +225,7 @@ export default {
         cancel: '取消',
         desc: '部分功能需使用参数 请查看文档',
         title: '订阅链接参数',
-        content: '"target=SurgeMac"\n+ ShadowsocksR/External Proxy Program\n\n"includeUnsupportedProxy=true" 包含官方/商店版不支持的协议',
+        content: '"target=SurgeMac"\n+ ShadowsocksR/External Proxy Program\n\n"includeUnsupportedProxy=true" 包含官方/商店版/未续费订阅不支持的协议',
       }
     },
   },
@@ -318,7 +318,7 @@ export default {
             fullScreenEditCancel: '取消全屏',
             label: '使用说明',
             title: '订阅链接',
-            content: '支持使用换行混写三种格式:\n1. 完整远程链接\n2. 类似 /api/file/name 的内部文件调用路径\n3. 本地文件的绝对路径\n\n支持以下参数\n\ninsecure: 不验证服务器证书\ncacheKey: 设置乐观缓存的名称 开启后也可自行在持久化缓存中管理(适合经常拉取失败的订阅)\nvalidCheck: 过期或无剩余流量时报错\nflowUserAgent: 查询流量时使用的 User-Agent\nflowUrl: 自定义查询流量的 URL(将使用响应体的内容)\nnoFlow: 不查询流量\nhideExpire: 隐藏到期\nshowRemaining: 显示剩余流量而不是已用流量\nnoCache: 不使用缓存\nresetDay: 每月流量重置日\nstartDate: 订阅开始日期\ncycleDays: 订阅重置周期(单位: 天)\n\n例: http://a.com?token=1#cycleDays=31&startDate=2024-06-04\n或 http://a.com?token=1#resetDay=15',
+            content: '支持使用换行混写三种格式:\n1. 完整远程链接\n2. 类似 /api/file/name 的内部文件调用路径\n3. 本地文件的绝对路径\n\n支持以下参数\n\nheaders: 自定义请求响应头(单行 JSON 字符串)\ninsecure: 不验证服务器证书\ncacheKey: 设置乐观缓存的名称 开启后也可自行在持久化缓存中管理(适合经常拉取失败的订阅)\nvalidCheck: 过期或无剩余流量时报错\nflowUserAgent: 查询流量时使用的 User-Agent\nflowUrl: 自定义查询流量的 URL(优先响应体, 也支持响应头)\nnoFlow: 不查询流量\nhideExpire: 隐藏到期\nshowRemaining: 显示剩余流量而不是已用流量\nnoCache: 不使用缓存\nresetDay: 每月流量重置日\nstartDate: 订阅开始日期\ncycleDays: 订阅重置周期(单位: 天)\n\n例: http://a.com?token=1#cycleDays=31&startDate=2024-06-04\n或 http://a.com?token=1#resetDay=15',
           },
           isEmpty: '订阅链接不能为空',
           isIllegal: '订阅链接格式非法',
@@ -351,13 +351,15 @@ export default {
         ua: {
           label: 'User-Agent',
           placeholder: '下载时使用的 UA，不填使用默认',
+          placeholderDisabled: '透传时禁用自定义 UA',
         },
         subUserinfo: {
           label: '订阅流量信息',
-          placeholder: '填写值或链接(使用响应内容)',
+          placeholder: '填写值或链接(支持 noCache 等参数)',
         },
         passThroughUA: {
-          label: '透传请求的 User-Agent'
+          label: '透传请求的 User-Agent',
+          warning: '透传请求的 User-Agent 和 自定义 UA 不可同时启用',
         },
         proxy: {
           label: '代理/策略',
@@ -422,7 +424,7 @@ export default {
       nodeActions: {
         'Script Operator': {
           label: '脚本操作',
-          options: ['链接', '脚本'],
+          options: ['远程链接', '本地内容'],
           des: ['类型', '内容'],
           placeholder: '1. 完整远程脚本链接 2. 类似 /api/file/name 的内部文件调用路径 3. 本地文件的绝对路径. 除了脚本本身的参数外, 支持叠加参数: noCache 不使用缓存, insecure 不验证服务器证书. 例: http://a.com#a=1&b=2#noCache&insecure',
           openEditorBtn: '打开脚本编辑器',
@@ -492,7 +494,10 @@ export default {
             'Hysteria 2',
             'Juicity',
             'mieru',
+            'sudoku',
+            'MASQUE',
             'AnyTLS',
+            'TrustTunnel',
             'WireGuard',
             'SSH',
             'External Proxy Program',
@@ -545,13 +550,17 @@ export default {
             des: '连接符',
             placeholder: '节点名和序号之间的连接符，如：- ',
           },
+          field: {
+            des: '去重字段(多字段连接 支持 lodash get 语法)',
+            placeholder: '例如节点名, 请输入 name',
+          },
           tipsTitle: '节点去重操作提示',
           tipsDes:
             '对名字重复的节点进行操作（移除/重命名）。重命名模式下，会自动为重名节点添加序号，序号样式和位置可以自定义。同时序号和名字之间的连接符也可以自定义',
         },
         'Script Filter': {
           label: '脚本过滤',
-          options: ['链接', '脚本'],
+          options: ['远程链接', '本地内容'],
           des: ['类型', '内容'],
           placeholder: '1. 完整远程脚本链接 2. 类似 /api/file/name 的内部文件调用路径 3. 本地文件的绝对路径. 除了脚本本身的参数外, 支持叠加参数: noCache 不使用缓存, insecure 不验证服务器证书. 例: http://a.com#a=1&b=2#noCache&insecure',
           openEditorBtn: '打开脚本编辑器',
@@ -591,6 +600,11 @@ export default {
       defaultProxy: '请输入默认代理/策略',
       defaultTimeout: '默认超时(单位: 毫秒, 默认: 8000)',
       cacheThreshold: '缓存阈值(单位: KB, 默认: 1024)',
+      resourceCacheTtl: '资源缓存(单位: 秒, 默认: 3600)',
+      headersCacheTtl: '响应头缓存(单位: 秒, 默认: 60)',
+      scriptCacheTtl: '脚本缓存(单位: 秒, 默认: 172800)',
+      concurrency: '并发数(默认: 3)',
+      apiCheckTimeout: 'API 检测超时(单位: 毫秒, 默认: 3000)',
       noGithubUser: '未配置 GitHub 用户名',
       noGistToken: '未配置 GitHub 令牌',
       noGithubProxy: '未配置 GitHub 加速代理',
@@ -628,7 +642,10 @@ export default {
       save: '保存',
       clear: '清空',
     },
-    config: '配置',
+    requestConfig: "请求配置",
+    cacheConfig: "缓存配置",
+    frontEndConfig: "前端配置",
+    githubConfig: 'GitHub 配置',
     storage: {
       gist: {
         label: 'Gist 同步',
@@ -769,19 +786,22 @@ export default {
     noOriginalTips: "跳转失败, 检查源数据是否已删除",
     leftTime: "剩余",
     expired: "已过期",
+    expiredLabel: "过期时间：",
+    createTimeLabel: "创建时间：",
+    magicPathErrorNotify: "SUB_STORE_FRONTEND_BACKEND_PATH 必须以 / 开头，当前分享链接异常，请检查运行环境",
     createShare: {
       expiresValue: {
         label: "有效期时长",
         placeholder: "请输入有效期时长",
-        regex: "请输入0.01-99999.99范围内的数字",
+        regex: "请输入 0.01-99999.99 范围内的数字",
         empty: "有效期时长不可为空",
       },
       expiresUnit: {
         label: "有效期单位",
       },
       token: {
-        label: "自定义Token",
-        placeholder: "默认后端随机Token"
+        label: "自定义 Token",
+        placeholder: "默认后端随机 Token"
       },
       remark: {
         label: "备注",
@@ -895,6 +915,11 @@ export default {
     },
   },
   moreSettingPage: {
+    gistUpload: {
+      title: 'Gist 上传',
+      base64: 'Base64 编码',
+      plaintext: '明文(不带 GitHub Token)',
+    },
     subProgress: {
       title: '订阅进度样式',
       hidden: '不显示',
@@ -933,6 +958,7 @@ export default {
     showFloatingRefreshButton: '显示悬浮刷新按钮',
     showFloatingAddButton: '显示悬浮添加按钮',
     displayPreviewInWebPage: '在网页中预览',
+    invalidShareFakeNode: '无效分享返回假节点(防客户端缓存)',
     tabBar: '隐藏 "Gist 同步" 页',
     tabBar2: '隐藏 "文件" 页',
     auto2: '自定义设置 Key',
@@ -955,7 +981,8 @@ export default {
       be: '后端',
       module: '模块',
       team: '项目组',
-      link: '在 GitHub 上查看',
+      scriptTutorial: '脚本教程',
+      link: 'GitHub',
     },
     changelogs: {
       title: '更新日志',
diff --git a/src/main.ts b/src/main.ts
index 57e83ce91..c23505cfb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,6 +13,7 @@ import '@/plugin/touch.js'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 import 'modern-css-reset/dist/reset.min.css';
+import '@/assets/styles/reduced-motion-fix.scss';
 import { createPinia } from 'pinia';
 import 'virtual:svg-icons-register';
 import { createApp } from 'vue';
diff --git a/src/plugin/awesomeIcon.ts b/src/plugin/awesomeIcon.ts
index 367158531..3704521c3 100644
--- a/src/plugin/awesomeIcon.ts
+++ b/src/plugin/awesomeIcon.ts
@@ -35,6 +35,8 @@ import {
   faShareNodes,
   faLink,
   faSquareArrowUpRight,
+  faMaximize,
+  faMinimize,
   faBars
 } from '@fortawesome/free-solid-svg-icons';
 
@@ -73,3 +75,5 @@ library.add(faLink);
 library.add(faSquareArrowUpRight);
 library.add(faBars);
 library.add(faEllipsis);
+library.add(faMaximize);
+library.add(faMinimize);
diff --git a/src/store/global.ts b/src/store/global.ts
index 782c47df7..7f10d1bdb 100644
--- a/src/store/global.ts
+++ b/src/store/global.ts
@@ -10,6 +10,7 @@ export const useGlobalStore = defineStore('globalStore', {
   state: (): GlobalStoreState => {
     return {
       subProgressStyle: localStorage.getItem('subProgressStyle') || 'hidden',
+      gistUpload: localStorage.getItem('gistUpload') || 'base64',
       isLoading: true,
       isFlowFetching: true,
       fetchResult: false,
@@ -30,10 +31,6 @@ export const useGlobalStore = defineStore('globalStore', {
       savedPositions: {},
       defaultIconCollection: localStorage.getItem('defaultIconCollection') || '',
       defaultIconCollections: [
-        {
-          text: "cc63/ICON",
-          value: "https://raw.githubusercontent.com/cc63/ICON/main/icons.json",
-        },
         {
           text: "Koolson/QureColor",
           value:
@@ -65,6 +62,10 @@ export const useGlobalStore = defineStore('globalStore', {
           value:
             "https://raw.githubusercontent.com/Twoandz9/TheMagic-Icons/main/TheRaw.json",
         },
+        {
+          text: "cc63/ICON",
+          value: "https://raw.githubusercontent.com/cc63/ICON/main/icons.json",
+        },
         {
           text: "lige47/QuanX-icon-rule",
           value:
@@ -86,6 +87,14 @@ export const useGlobalStore = defineStore('globalStore', {
       }
       this.subProgressStyle = style;
     },
+    setGistUpload(style: string) {
+      if (style && style !== 'base64') {
+        localStorage.setItem('gistUpload', style);
+      } else {
+        localStorage.removeItem('gistUpload');
+      }
+      this.gistUpload = style;
+    },
     setBottomSafeArea(height: number) {
       this.bottomSafeArea = height;
     },
diff --git a/src/store/settings.ts b/src/store/settings.ts
index 64fc2fb55..5cef90c18 100644
--- a/src/store/settings.ts
+++ b/src/store/settings.ts
@@ -21,6 +21,9 @@ export const useSettingsStore = defineStore("settingsStore", {
       defaultProxy: "",
       defaultTimeout: "",
       cacheThreshold: "",
+      resourceCacheTtl: "",
+      headersCacheTtl: "",
+      scriptCacheTtl: "",
       syncTime: 0,
       theme: {
         auto: true,
@@ -41,10 +44,12 @@ export const useSettingsStore = defineStore("settingsStore", {
         showFloatingRefreshButton: false,
         showFloatingAddButton: false,
         displayPreviewInWebPage: true,
+        invalidShareFakeNode: false,
         istabBar: false,
         istabBar2: false,
         subProgressStyle: "hidden",
       },
+      gistUpload: "base64",
       avatarUrl: "",
       artifactStore: "",
       artifactStoreStatus: "",
@@ -86,9 +91,11 @@ export const useSettingsStore = defineStore("settingsStore", {
         this.appearanceSetting.isSubItemMenuFold = res.data.data.appearanceSetting?.isSubItemMenuFold ?? true;
         this.appearanceSetting.showFloatingRefreshButton = res.data.data.appearanceSetting?.showFloatingRefreshButton ?? "";
         this.appearanceSetting.showFloatingAddButton = res.data.data.appearanceSetting?.showFloatingAddButton ?? false;
+        this.appearanceSetting.invalidShareFakeNode = res.data.data.appearanceSetting?.invalidShareFakeNode ?? false;
         this.appearanceSetting.istabBar = res.data.data.appearanceSetting?.istabBar ?? "";
         this.appearanceSetting.istabBar2 = res.data.data.appearanceSetting?.istabBar2 ?? "";
         this.appearanceSetting.subProgressStyle = res.data.data.appearanceSetting?.subProgressStyle ?? "hidden";
+        this.gistUpload = res.data.data?.gistUpload ?? "base64";
       } else {
         showNotify({
           title: `获取配置失败`,
@@ -96,7 +103,7 @@ export const useSettingsStore = defineStore("settingsStore", {
         });
       }
     },
-    async editGistSettings(data: SettingsPostData) {
+    async changeSettings(data: SettingsPostData) {
       const { showNotify } = useAppNotifyStore();
       const res = await settingsApi.setSettings(data);
       if (res?.data?.status === "success" && res?.data?.data) {
@@ -108,9 +115,13 @@ export const useSettingsStore = defineStore("settingsStore", {
         this.defaultUserAgent = res.data.data.defaultUserAgent || "";
         this.defaultTimeout = res.data.data.defaultTimeout || "";
         this.cacheThreshold = res.data.data.cacheThreshold || "";
+        this.resourceCacheTtl = res.data.data.resourceCacheTtl || "";
+        this.headersCacheTtl = res.data.data.headersCacheTtl || "";
+        this.scriptCacheTtl = res.data.data.scriptCacheTtl || "";
         this.avatarUrl = res.data.data.avatarUrl || "";
         this.artifactStore = res.data.data.artifactStore || "";
         this.artifactStoreStatus = res.data.data.artifactStoreStatus || "";
+        this.gistUpload = res.data.data.gistUpload || "";
         showNotify({ type: "success", title: t(`myPage.notify.save.succeed`) });
       } else {
         showNotify({
@@ -133,6 +144,7 @@ export const useSettingsStore = defineStore("settingsStore", {
         istabBar,
         istabBar2,
         subProgressStyle,
+        gistUpload,
       } = globalStore;
       const data = {
         isSimpleMode: isSimpleMode ?? false,
@@ -145,6 +157,7 @@ export const useSettingsStore = defineStore("settingsStore", {
         istabBar: istabBar ?? false,
         istabBar2: istabBar2 ?? false,
         subProgressStyle: subProgressStyle ?? "hidden",
+        gistUpload: gistUpload ?? "base64",
       };
       const list = Object.keys(data) as (keyof SettingsPostData)[];
       // 判断是否有本地持久化的外观设置
diff --git a/src/store/subs.ts b/src/store/subs.ts
index e0c70919e..6de03c0cf 100644
--- a/src/store/subs.ts
+++ b/src/store/subs.ts
@@ -307,9 +307,20 @@ export const useSubsStore = defineStore('subsStore', {
       //   waitTime: 0,
       // });
 
+      const flowTasks = [] as Array<() => Promise<void>>;
+
+      flowsUrlList.forEach((item, index) => {
+        const [url, , noFlow] = item;
+        if (noFlow) {
+          this.flows[url] = { status:'noFlow' };
+          return;
+        }
+        flowTasks.push(() => asyncGetFlow(item, index));
+      });
+
       await executeAsyncTasks(
-        flowsUrlList.map((item, index) => () =>  asyncGetFlow(item, index)),
-        { concurrency: 3 }
+        flowTasks,
+        { concurrency: localStorage.getItem('concurrency') ? parseInt(localStorage.getItem('concurrency') as string, 10) : 3 }
       )
   
       // const batches = [];
@@ -376,11 +387,11 @@ export const useSubsStore = defineStore('subsStore', {
         console.log('fetchShareData err', err);
       });
     },
-    async deleteShare(token: string, isShowNotify: boolean = true) {
+    async deleteShare(token: string, type: string, name: string, isShowNotify: boolean = true) {
       try {
         const { showNotify } = useAppNotifyStore();
 
-        const { data } = await shareApi.deleteShare(token);
+        const { data } = await shareApi.deleteShare(token, type, name);
         if (data.status === "success") {
           await this.fetchShareData();
           isShowNotify && showNotify({
@@ -392,11 +403,11 @@ export const useSubsStore = defineStore('subsStore', {
         console.log('deleteShare error', error);
       }
     },
-    async updateShare(token: string, data: ShareToken) {
+    async updateShare(token: string, type: string, name:string, data: ShareToken) {
       const { showNotify } = useAppNotifyStore();
       try {
-        await shareApi.deleteShare(token);
-        await shareApi.createShare(data); 
+        await shareApi.deleteShare(token, type, name);
+        await shareApi.createShare(data);
         await this.fetchShareData();
       } catch (error) {
         console.log('updateShare error', error);
diff --git a/src/store/system.ts b/src/store/system.ts
new file mode 100644
index 000000000..828452561
--- /dev/null
+++ b/src/store/system.ts
@@ -0,0 +1,52 @@
+import { defineStore } from 'pinia';
+
+export const useSystemStore = defineStore('systemStore', {
+  state: () => {
+    return {
+      isPWA: (window.matchMedia("(display-mode: standalone)").matches &&
+        !/Android/.test(navigator.userAgent)) || false,
+      isLandscape: window.innerWidth > window.innerHeight,
+      isSmall: window.innerHeight < 750 || /iPad/.test(navigator.userAgent),
+      screenWidth: window.innerWidth,
+      screenHeight: window.innerHeight,
+      statusBarHeight: 0
+    };
+  },
+  getters: {
+    navBarHeight: (state) => {
+      return state.isPWA && !state.isLandscape ? (state.isSmall ? "78px" : "95px") : "56px";
+    },
+    navBartop: (state) => {
+      return state.isPWA && !state.isLandscape ? (state.isSmall ? "38px" : "55px") : "0px";
+    },
+    navBartopRight: (state) => {
+      return state.isPWA && !state.isLandscape ? (state.isSmall ? "52px" : "65px") : "15px";
+    },
+    pwaTopPadding: (state) => {
+      return state.isPWA ? (state.isSmall ? "20px" : "45px") : "45px";
+    }
+  },
+  actions: {
+    handleResize() {
+      this.screenWidth = window.innerWidth;
+      this.screenHeight = window.innerHeight;
+      this.isSmall = this.screenHeight < 750 || /iPad/.test(navigator.userAgent);
+      this.isLandscape = this.screenWidth > this.screenHeight;
+      // console.log(`isPWA: ${this.isPWA}, Screen resized: ${this.screenWidth}x${this.screenHeight}, isSmall: ${this.isSmall}, isLandscape: ${this.isLandscape}`);
+    },
+    setStatusBarHeight(height: number) {
+      this.statusBarHeight = height;
+    },
+    setIsPWA(isPWA: boolean) {
+      this.isPWA = isPWA;
+    },
+    initSystemState() {
+      this.isPWA = (window.matchMedia("(display-mode: standalone)").matches &&
+        !/Android/.test(navigator.userAgent)) || false;
+      this.handleResize();
+      
+      // 监听屏幕尺寸变化
+      window.addEventListener("resize", () => this.handleResize());
+    }
+  },
+});
diff --git a/src/types/store/globalStore.d.ts b/src/types/store/globalStore.d.ts
index 5cefc744f..f592815c0 100644
--- a/src/types/store/globalStore.d.ts
+++ b/src/types/store/globalStore.d.ts
@@ -18,6 +18,7 @@ interface GlobalStoreState {
   ishostApi: string;
   savedPositions: any;
   subProgressStyle: any;
+  gistUpload: any;
   defaultIconCollection: string;
   defaultIconCollections?: any;
   customIconCollections?: any[];
diff --git a/src/types/store/settings.d.ts b/src/types/store/settings.d.ts
index 1a8cdbf4f..efd811ca9 100644
--- a/src/types/store/settings.d.ts
+++ b/src/types/store/settings.d.ts
@@ -17,12 +17,16 @@ interface SettingsPostData {
   defaultUserAgent?: string;
   defaultTimeout?: string;
   cacheThreshold?: string;
+  resourceCacheTtl?: string;
+  headersCacheTtl?: string;
+  scriptCacheTtl?: string;
   theme?: {
     auto: boolean;
     name?: CustomTheme;
     dark: CustomTheme;
     light: CustomTheme;
   };
+  gistUpload?: base64 | plaintext;
   appearanceSetting?: {
     isSimpleMode?: boolean; // 简洁模式
     isLeftRight?: boolean; // 卡片右滑呼出
@@ -36,10 +40,11 @@ interface SettingsPostData {
     showFloatingRefreshButton?: boolean; // 显示悬浮刷新按钮
     showFloatingAddButton?: boolean; // 显示悬浮添加按钮
     displayPreviewInWebPage?: boolean; // 在网页中预览
+    invalidShareFakeNode?: boolean; // 无效分享返回假节点(防客户端缓存)
     istabBar?: boolean; // 隐藏 "Gist 同步" 页
     istabBar2?: boolean; // 隐藏 "文件" 页
     subProgressStyle?: string; // 订阅进度样式
-  }
+  },
 }
 
 interface StoragePostData {
diff --git a/src/types/store/systemStore.d.ts b/src/types/store/systemStore.d.ts
new file mode 100644
index 000000000..58b425dca
--- /dev/null
+++ b/src/types/store/systemStore.d.ts
@@ -0,0 +1,8 @@
+declare interface SystemStoreState {
+  isPWA: boolean;
+  isLandscape: boolean;
+  isSmall: boolean;
+  screenWidth: number;
+  screenHeight: number;
+  statusBarHeight: number;
+}
diff --git a/src/utils/actionsOperate.ts b/src/utils/actionsOperate.ts
index 2e2f84784..13460d29c 100644
--- a/src/utils/actionsOperate.ts
+++ b/src/utils/actionsOperate.ts
@@ -59,6 +59,7 @@ export const addItem = (
           link: '-',
           position: 'back',
           template: '0 1 2 3 4 5 6 7 8 9',
+          field: ['name'],
         },
         customName
       });
diff --git a/src/utils/initApp.ts b/src/utils/initApp.ts
index 3aa84e526..db1879e80 100644
--- a/src/utils/initApp.ts
+++ b/src/utils/initApp.ts
@@ -41,7 +41,7 @@ export const initStores = async (
       const timeoutPromise = new Promise((_, reject) => {
         setTimeout(() => {
           reject(new Error('Backend connection timeout'));
-        }, 3000); // 3秒超时
+        }, localStorage.getItem('timeout') ? parseInt(localStorage.getItem('timeout') as string, 10) : 3000); // 3秒超时
       });
 
       // 尝试获取环境信息
diff --git a/src/views/File.vue b/src/views/File.vue
index 7efb9e634..bb7608c37 100644
--- a/src/views/File.vue
+++ b/src/views/File.vue
@@ -108,36 +108,44 @@
     <!-- 页面内容 -->
     <!-- 有数据 -->
     <div class="subs-list-wrapper">
-      <div v-if="hasFiles">
-        <draggable
-          v-model="files"
-          item-key="name"
-          :scroll-sensitivity="200"
-          :force-fallback="true"
-          :scroll-speed="8"
-          :scroll="true"
-          v-bind="{
-            animation: 200,
-            disabled: false,
-            delay: 200,
-            chosenClass: 'chosensub',
-            handle: 'div',
-          }"
-          @change="changeSort('files', files)"
-          @start="handleDragStart(files)"
-          @end="handleDragEnd(files)"
-        >
-          <template #item="{ element }">
-            <div :key="element.name" class="draggable-item">
-              <FileListItem
-                :file="element"
-                type="file"
-                :disabled="swipeDisabled"
-                @share="handleShare"
-              />
-            </div>
-          </template>
-        </draggable>
+      <div v-if="tags && tags.length > 0" ref="radioWrapperRef" class="radio-wrapper" >
+        <!-- <nut-radiogroup v-model="tag" direction="horizontal"> -->
+          <!-- <nut-radio v-for="i in tags" shape="button" :label="String(i.value)">{{ i.label }}</nut-radio> -->
+          <span v-for="i in tags" class="tag" :class="{ 'current': i.value === tag }" @click="setTag(i.value)">{{ i.label }}</span>
+        <!-- </nut-radiogroup> -->
+      </div>
+      <div class="subs-list-container" :style="{ paddingTop: `${radioWrapperHeight}px` }">
+        <div v-if="hasFiles">
+          <draggable
+            v-model="files"
+            item-key="name"
+            :scroll-sensitivity="200"
+            :force-fallback="true"
+            :scroll-speed="8"
+            :scroll="true"
+            v-bind="{
+              animation: 200,
+              disabled: false,
+              delay: 200,
+              chosenClass: 'chosensub',
+              handle: 'div',
+            }"
+            @change="changeSort('files', files)"
+            @start="handleDragStart(files)"
+            @end="handleDragEnd(files)"
+          >
+            <template #item="{ element }">
+              <div v-show="shouldShowElement(element)" :key="element.name" class="draggable-item">
+                <FileListItem
+                  :file="element"
+                  type="file"
+                  :disabled="swipeDisabled"
+                  @share="handleShare"
+                />
+              </div>
+            </template>
+          </draggable>
+        </div>
       </div>
     </div>
     <!-- 没有数据 -->
@@ -194,7 +202,7 @@
 
 <script lang="ts" setup>
 import { storeToRefs } from "pinia";
-import { ref, toRaw, onMounted } from "vue";
+import { ref, toRaw, onMounted, computed, watch, nextTick } from "vue";
 import draggable from "vuedraggable";
 import SharePopup from "./share/SharePopup.vue";
 
@@ -207,6 +215,7 @@ import FileListItem from "@/components/FileListItem.vue";
 import { useGlobalStore } from "@/store/global";
 import { useSubsStore } from "@/store/subs";
 import { useSettingsStore } from '@/store/settings';
+import { useSystemStore } from "@/store/system";
 import { useMethodStore } from '@/store/methodStore';
 import { initStores } from "@/utils/initApp";
 import { useI18n } from "vue-i18n";
@@ -234,9 +243,6 @@ const editFile = () => {
   addSubBtnIsVisible.value = true;
 };
 
-onMounted(() => {
-  methodStore.registerMethod("addFile", editFile);
-});
 const { env } = useBackend();
 const { showNotify } = useAppNotifyStore();
 const subApi = useSubsApi();
@@ -248,9 +254,10 @@ const restoreIsLoading = ref(false);
 const addSubBtnIsVisible = ref(false);
 const subsStore = useSubsStore();
 const globalStore = useGlobalStore();
+const systemStore = useSystemStore();
 const settingsStore = useSettingsStore();
 const { appearanceSetting } = storeToRefs(settingsStore);
-
+const { navBarHeight } = storeToRefs(systemStore);
 const { hasFiles, files } = storeToRefs(subsStore);
 const {
   // isSimpleMode,
@@ -263,6 +270,65 @@ const swipeDisabled = ref(false);
 const touchStartY = ref(null);
 const touchStartX = ref(null);
 const sortFailed = ref(false);
+const hasUntagged = ref(false);
+const getTag = () => {
+    return localStorage.getItem('file-tag') || 'all';
+  };
+const tag = ref(getTag());
+const tags = computed(() => {
+  if(!hasFiles.value) return [];
+  const set = new Set();
+  files.value.forEach(sub => {
+    
+    if (Array.isArray(sub.tag) && sub.tag.length > 0) {
+      sub.tag.forEach(i => {
+        set.add(i);
+      });
+    } else {
+      hasUntagged.value = true;
+    }
+  });
+
+  let tags: any[] = Array.from(set);
+  // if(tags.length === 0) return [];
+  tags = tags.map(i => ({ label: i, value: i }));
+  
+  const result = [{ label: t("specificWord.all"), value: "all" }, ...tags];
+  if(tags.length > 0 && hasUntagged.value) result.push({ label: t("specificWord.untagged"), value: "untagged" });
+
+  if (!result.find(i => i.value === tag.value)) {
+    tag.value = 'all';
+  }
+  return result;
+});
+const radioWrapperRef = ref(null);
+const radioWrapperHeight = ref(0);
+
+// 更新标签栏高度
+const updateRadioWrapperHeight = () => {
+  nextTick(() => {
+    if (radioWrapperRef.value) {
+      radioWrapperHeight.value = radioWrapperRef.value.offsetHeight;
+    } else {
+      radioWrapperHeight.value = 0;
+    }
+  });
+};
+
+const tagNavBarHeight = computed(() => {
+  return navBarHeight.value;
+});
+
+watch(tag, () => {
+  updateRadioWrapperHeight();
+});
+
+watch(() => tags.value, () => {
+  updateRadioWrapperHeight();
+}, { deep: true, immediate: true });
+onMounted(() => {
+  methodStore.registerMethod("addFile", editFile);
+});
 const onTouchStart = (event: TouchEvent) => {
   touchStartY.value = Math.abs(event.touches[0].clientY);
   touchStartX.value = Math.abs(event.touches[0].clientX);
@@ -402,6 +468,30 @@ const importTips = () => {
       lockScroll: false,
     });
 };
+const scrollToTop = () => {
+  const scrollPosition = 0;
+  
+  window.scrollTo({
+    top: scrollPosition,
+    behavior: "smooth"
+  });
+};
+
+const setTag = (current) => {
+  tag.value = current;
+  if (current === 'all') {
+    localStorage.removeItem('file-tag');
+  } else {
+    localStorage.setItem('file-tag', current);
+  }
+  // 增加滚动到顶部
+  scrollToTop();
+};
+const shouldShowElement = (element) => {
+  if(tag.value === 'all') return true;
+  if(tag.value === 'untagged') return !Array.isArray(element.tag) || element.tag.length === 0;
+  return element.tag?.includes(tag.value);
+};
 </script>
 
 <style lang="scss" scoped>
@@ -595,5 +685,37 @@ const importTips = () => {
   width: calc(100% - 1.5rem);
   margin-left: auto;
   margin-right: auto;
+  .radio-wrapper {
+    box-sizing: border-box;
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    position: fixed;
+    padding: 10px;
+    top: v-bind(tagNavBarHeight);
+    z-index: 10;
+    backdrop-filter: blur(var(--nav-bar-blur));
+    -webkit-backdrop-filter: blur(var(--nav-bar-blur));
+    background: var(--nav-bar-color);
+    @include centered-fixed-container;
+      @media screen and (min-width: 768px) {
+        border-radius: var(--item-card-radios);
+        overflow: hidden;
+      }
+    .tag {
+      font-size: 12px;
+      color: var(--second-text-color);
+      margin: 0px 5px;
+      padding: 7.5px 2.5px 4px;
+      cursor: pointer;
+      -webkit-user-select: none;
+      user-select: none;
+      border-bottom: 1px solid transparent;
+    }
+    .current {
+      border-bottom: 1px solid var(--primary-color);
+      color: var(--primary-color);
+    }
+  }
 }
 </style>
diff --git a/src/views/FileEditor.vue b/src/views/FileEditor.vue
index 751c67894..e62d9dcea 100644
--- a/src/views/FileEditor.vue
+++ b/src/views/FileEditor.vue
@@ -77,6 +77,23 @@
               <nut-switch v-model="form.download" />
             </div>
           </nut-form-item>
+        <!-- tag -->
+        <nut-form-item
+          :label="$t(`editorPage.subConfig.basic.tag.label`)"
+          prop="tag"
+        >
+          <nut-input
+            class="nut-input-text"
+            v-model.trim="form.tag"
+            :border="false"
+            :placeholder="$t(`editorPage.subConfig.basic.tag.placeholder`)"
+            type="text"
+            input-align="right"
+            right-icon="rect-right"
+            @click-right-icon="showTagPopup('tag')"
+          >
+          </nut-input>
+        </nut-form-item>
           <!-- icon -->
           <nut-form-item :label="$t(`editorPage.subConfig.basic.icon.label`)" prop="icon">
             <nut-input
@@ -245,7 +262,7 @@
             /> -->
 
               <button class="cimg-button" @click="isDis = false">
-                <img src="" />
+                <font-awesome-icon icon="fa-solid fa-maximize" />
                 {{ $t(`editorPage.subConfig.basic.url.tips.fullScreenEdit`) }}
                 <!-- 测试 后续再改效果 -->
               </button>
@@ -256,6 +273,7 @@
                 style="display: none"
               />
               <button class="cimg-button" @click="upload">
+              <font-awesome-icon icon="fa-solid fa-cloud-arrow-up" />
                 {{ $t(`editorPage.subConfig.basic.url.tips.importFromFile`) }}
               </button>
               <div
@@ -371,7 +389,7 @@
 
   <div v-else style="width: 100%; height: 95vh">
     <button class="cimg-button" @click="isDis = true">
-      <img src="" />
+      <font-awesome-icon icon="fa-solid fa-minimize" />
       {{ $t(`editorPage.subConfig.basic.url.tips.fullScreenEditCancel`) }}
     </button>
     <cmView :isReadOnly="false" id="FileEditer" />
@@ -399,6 +417,13 @@
       <p>{{ t(`editorPage.subConfig.sourceNamePicker.emptyTips`) }}</p>
     </div>
   </nut-picker>
+  <tag-popup
+    v-model:visible="tagPopupVisible"
+    ref="tagPopupRef"
+    :currentTag="currentTag"
+    @setTag="setTagValue"
+    type="file">
+  </tag-popup>
 </template>
 
 <script lang="ts" setup>
@@ -416,6 +441,7 @@ import ActionBlock from "@/views/editor/ActionBlock.vue";
 import { addItem, deleteItem, toggleItem } from "@/utils/actionsOperate";
 import { actionsToProcess } from "@/utils/actionsToPorcess";
 import Script from "@/views/editor/components/Script.vue";
+import TagPopup from "@/components/TagPopup.vue";
 import IconPopup from "@/views/icon/IconPopup.vue";
 import FilePreview from "@/views/FilePreview.vue";
 import { initStores } from "@/utils/initApp";
@@ -467,6 +493,41 @@ const actionsChecked = reactive([]);
 const actionsList = reactive([]);
 const isget = ref(false);
 const fileInput = ref(null);
+const hasUntagged = ref(false);
+const tags = computed(() => {
+  if(!subsStore.files || subsStore.files.length === 0) return []
+  const set = new Set()
+  subsStore.files.forEach(file => {
+    if (Array.isArray(file.tag) && file.tag.length > 0) {
+      file.tag.forEach(i => {
+        set.add(i)
+      });
+    } else {
+      hasUntagged.value = true
+    }
+  })
+
+  let tags: any[] = Array.from(set)
+  if(tags.length === 0) return []
+  tags = tags.map(i => ({ label: i, value: i }));
+  const result = [{ label: t("specificWord.all"), value: "all" }, ...tags]
+  if(hasUntagged.value) result.push({ label: t("specificWord.untagged"), value: "untagged" })
+  return result
+});
+const tag = ref('all');
+const tagPopupVisible = ref(false);
+const tagType = ref('tag');
+const tagPopupRef = ref(null);
+const currentTag = computed(() => {
+  return form.tag
+})
+const showTagPopup = (type:string) => {
+  tagType.value = type || 'tag'
+  tagPopupVisible.value = true
+};
+const setTagValue = (tag: any) => {
+  form.tag = tag;      
+};
 const form = reactive<any>({
   name: "",
   displayName: "",
@@ -548,6 +609,9 @@ watchEffect(() => {
     form.subInfoUrl = sourceData.subInfoUrl;
     form.subInfoUserAgent = sourceData.subInfoUserAgent;
     form.proxy = sourceData.proxy;
+    form.tag = Array.isArray(sourceData.tag)
+    ? sourceData.tag.join(", ")
+    : sourceData.tag;
     form.ua = sourceData.ua;
     form.mergeSources = sourceData.mergeSources;
     form.content = sourceData.content;
@@ -670,6 +734,14 @@ const compare = () => {
     if (data.ignoreFailedRemoteFile === "disabled"){
       data.ignoreFailedRemoteFile = false;
     }
+    data.tag = [
+      ...new Set(
+        (data.tag || "")
+          .split(",")
+          .map((item: string) => item.trim())
+          .filter((item: string) => item.length)
+      ),
+    ];
 
     // 过滤掉预览开关关闭的操作
     actionsChecked.forEach((item) => {
@@ -729,6 +801,14 @@ const submit = () => {
     Toast.loading("...", { id: "submits", cover: true, duration: 1500 });
     // 如果验证成功，开始保存/修改
     const data: any = JSON.parse(JSON.stringify(toRaw(form)));
+    data.tag = [
+      ...new Set(
+        (data.tag || "")
+          .split(",")
+          .map((item: string) => item.trim())
+          .filter((item: string) => item.length)
+      ),
+    ];
     data["display-name"] = data.displayName;
     data.process = actionsToProcess(data.process, actionsList, ignoreList);
     if (data.ignoreFailedRemoteFile === "disabled"){
@@ -770,7 +850,7 @@ const proxyTips = () => {
   Dialog({
     title: "通过代理/节点/策略获取远程文件",
     content:
-      '1. Surge(参数 policy/policy-descriptor)\n\n可设置节点代理 例: Test = snell, 1.2.3.4, 80, psk=password, version=4\n\n或设置策略/节点 例: 国外加速\n\n2. Loon(参数 node)\n\nLoon 官方文档: \n\n指定该请求使用哪一个节点或者策略组（可以使节点名称、策略组名称，也可以说是一个Loon格式的节点描述，如：shadowsocksr,example.com,1070,chacha20-ietf,"password",protocol=auth_aes128_sha1,protocol-param=test,obfs=plain,obfs-param=edge.microsoft.com）\n\n3. Stash(参数 headers["X-Surge-Policy"])/Shadowrocket(参数 headers.X-Surge-Policy)/QX(参数 opts.policy)\n\n可设置策略/节点\n\n4. Node.js 版(http/https/socks5):\n\n例: socks5://a:b@127.0.0.1:7890\n\n※ 优先级由高到低: 文件配置, 默认配置\n\n完整说明 请查看 https://t.me/zhetengsha/1843',
+      '1. Surge(参数 policy/policy-descriptor)\n\n可设置节点代理 例: Test = snell, 1.2.3.4, 80, psk=password, version=4\n\n或设置策略/节点 例: 国外加速\n\n2. Loon(参数 node)\n\nLoon 官方文档: \n\n指定该请求使用哪一个节点或者策略组（可以是节点名称、策略组名称，也可以是一个 Loon 格式的节点描述，如：shadowsocksr,example.com,1070,chacha20-ietf,"password",protocol=auth_aes128_sha1,protocol-param=test,obfs=plain,obfs-param=edge.microsoft.com）\n\n3. Stash(参数 headers["X-Surge-Policy"])/Shadowrocket(参数 headers.X-Surge-Policy)/QX(参数 opts.policy)\n\n可设置策略/节点\n\n4. Node.js 版(http/https/socks5):\n\n例: socks5://a:b@127.0.0.1:7890\n\n※ 优先级由高到低: 文件配置, 默认配置\n\n完整说明 请查看 https://t.me/zhetengsha/1843',
     popClass: "auto-dialog",
     textAlign: "left",
     okText: "OK",
diff --git a/src/views/FilePreview.vue b/src/views/FilePreview.vue
index eb2121408..58f4f560a 100644
--- a/src/views/FilePreview.vue
+++ b/src/views/FilePreview.vue
@@ -90,8 +90,18 @@ watchEffect(async () => {
       processedData.value = response.data
       cmStore.setEditCode('filePreview', processedData.value || '')
     } catch (error) {
-      console.error('Error fetching URL:', error)
-      cmStore.setEditCode('filePreview', `Error: ${error.message}`)
+      let data = error.response?.data
+      if (data) {
+        try {
+          data = JSON.stringify(JSON.parse(error.response?.data), null, 2)
+        } catch (e) {
+          
+        }
+      }
+      console.error('Error fetching URL:', error, data)
+      cmStore.setEditCode('filePreview', `Error: ${
+      error.response ? `${error.response.status} ${error.response.statusText}\n\n${data}` : error.message
+      }`)
       showNotify({ title: `加载失败: ${error.message}` })
     }
   }
diff --git a/src/views/My.vue b/src/views/My.vue
index 5df948e0d..05482f0f6 100644
--- a/src/views/My.vue
+++ b/src/views/My.vue
@@ -113,71 +113,70 @@
           </nut-button>
         </div>
       </div>
-      <div class="config-card">
-        <div class="title-wrapper">
-          <h1>{{ $t(`myPage.config`) }}</h1>
+      <div class="config-card" v-if="storageType !== 'manual'" >
+        <div class="title-wrapper" @click="isGitHubConfigEditing ? exitEditMode('github') : toggleEditMode('github')">
+          <h1>{{ $t(`myPage.githubConfig`) }}</h1>
           <div class="config-btn-wrapper">
             <nut-button
-              v-if="isEditing"
+              v-if="isGitHubConfigEditing"
               class="cancel-btn"
               plain
               type="info"
               size="mini"
-              @click="exitEditMode"
+              @click.stop="exitEditMode('github')"
               :disabled="isEditLoading"
             >
               <font-awesome-icon icon="fa-solid fa-ban" />
               {{ $t(`myPage.btn.cancel`) }}
             </nut-button>
             <nut-button
+              v-if="isGitHubConfigEditing"
               class="save-btn"
               type="primary"
               size="mini"
-              @click="toggleEditMode"
+              @click.stop="toggleEditMode('github')"
               :loading="isEditLoading"
             >
               <font-awesome-icon
-                v-if="!isEditing"
+                v-if="!isGitHubConfigEditing"
                 icon="fa-solid fa-pen-to-square"
               />
               <font-awesome-icon
-                v-else-if="!isEditLoading && isEditing"
+                v-else-if="!isEditLoading && isGitHubConfigEditing"
                 icon="fa-solid fa-floppy-disk"
               />
-              {{ !isEditing ? $t(`myPage.btn.edit`) : $t(`myPage.btn.save`) }}
+              {{ !isGitHubConfigEditing ? $t(`myPage.btn.edit`) : $t(`myPage.btn.save`) }}
             </nut-button>
+            <nut-icon v-else class="right-icon" name="right"></nut-icon>
           </div>
         </div>
-        <div class="config-input-wrapper">
+        <div class="config-input-wrapper" v-if="isGitHubConfigEditing">
           <nut-input
-            v-if="storageType !== 'manual'"
             class="input"
             v-model="userInput"
-            :disabled="!isEditing"
+            :disabled="!isGitHubConfigEditing"
             :placeholder="$t(`myPage.placeholder.githubUser`)"
             type="text"
             input-align="left"
             :left-icon="iconUser"
           >
             <!-- <template #button>
-              <nut-button :disabled="!isEditing" :plain="!isEditing" size="mini" :type="isEditing ? 'primary' : 'info' " @click="toggleSyncPlatform">{{ syncPlatformInput === 'gitlab' ? ( isEditing ?'切换回 Gist' : 'GitLab Snippet (β)') : ( isEditing ?'切换到 GitLab Snippet (β)' : 'Gist') }}</nut-button>
+              <nut-button :disabled="!isGitHubConfigEditing" :plain="!isGitHubConfigEditing" size="mini" :type="isGitHubConfigEditing ? 'primary' : 'info' " @click="toggleSyncPlatform">{{ syncPlatformInput === 'gitlab' ? ( isGitHubConfigEditing ?'切换回 Gist' : 'GitLab Snippet (β)') : ( isGitHubConfigEditing ?'切换到 GitLab Snippet (β)' : 'Gist') }}</nut-button>
             </template> -->
           </nut-input>
           <nut-input
-            v-if="storageType !== 'manual'"
             class="input"
             v-model="tokenInput"
-            :disabled="!isEditing"
+            :disabled="!isGitHubConfigEditing"
             :placeholder="$t(`myPage.placeholder.gistToken`)"
             type="text"
             input-align="left"
             :left-icon="iconKey"
           />
           <nut-input
-            v-if="storageType !== 'manual'"
             class="input"
             v-model="githubProxyInput"
-            :disabled="!isEditing"
+            :disabled="!isGitHubConfigEditing"
             :placeholder="$t(`myPage.placeholder.githubProxy`)"
             type="text"
             input-align="left"
@@ -185,10 +184,51 @@
             right-icon="tips"
             @click-right-icon="githubProxyTips"
           />
+          
+        </div>
+      </div>
+      <div class="config-card">
+        <div class="title-wrapper"  @click="isRequestConfigEditing ? exitEditMode('request') : toggleEditMode('request')">
+          <h1>{{ $t(`myPage.requestConfig`) }}</h1>
+          <div class="config-btn-wrapper">
+            <nut-button
+              v-if="isRequestConfigEditing"
+              class="cancel-btn"
+              plain
+              type="info"
+              size="mini"
+              @click.stop="exitEditMode('request')"
+              :disabled="isEditLoading"
+            >
+              <font-awesome-icon icon="fa-solid fa-ban" />
+              {{ $t(`myPage.btn.cancel`) }}
+            </nut-button>
+            <nut-button
+             v-if="isRequestConfigEditing"
+              class="save-btn"
+              type="primary"
+              size="mini"
+              @click.stop="toggleEditMode('request')"
+              :loading="isEditLoading"
+            >
+              <font-awesome-icon
+                v-if="!isRequestConfigEditing"
+                icon="fa-solid fa-pen-to-square"
+              />
+              <font-awesome-icon
+                v-else-if="!isEditLoading && isRequestConfigEditing"
+                icon="fa-solid fa-floppy-disk"
+              />
+              {{ !isRequestConfigEditing ? $t(`myPage.btn.edit`) : $t(`myPage.btn.save`) }}
+            </nut-button>
+             <nut-icon v-else class="right-icon" name="right"></nut-icon>
+          </div>
+        </div>
+        <div class="config-input-wrapper" v-if="isRequestConfigEditing">
           <nut-input
             class="input"
             v-model="proxyInput"
-            :disabled="!isEditing"
+            :disabled="!isRequestConfigEditing"
             :placeholder="$t(`myPage.placeholder.defaultProxy`)"
             type="text"
             input-align="left"
@@ -199,7 +239,7 @@
           <nut-input
             class="input"
             v-model="uaInput"
-            :disabled="!isEditing"
+            :disabled="!isRequestConfigEditing"
             :placeholder="$t(`myPage.placeholder.defaultUserAgent`)"
             type="text"
             input-align="left"
@@ -210,7 +250,7 @@
           <nut-input
             class="input"
             v-model="timeoutInput"
-            :disabled="!isEditing"
+            :disabled="!isRequestConfigEditing"
             :placeholder="$t(`myPage.placeholder.defaultTimeout`)"
             type="number"
             input-align="left"
@@ -218,10 +258,51 @@
             right-icon="tips"
             @click-right-icon="timeoutTips"
           />
+        </div>
+      </div>
+      <div class="config-card">
+        <div class="title-wrapper" @click="isCacheConfigEditing ? exitEditMode('cache') : toggleEditMode('cache')">
+          <h1>{{ $t(`myPage.cacheConfig`) }}</h1>
+          <div class="config-btn-wrapper">
+            <nut-button
+              v-if="isCacheConfigEditing"
+              class="cancel-btn"
+              plain
+              type="info"
+              size="mini"
+              @click.stop="exitEditMode('cache')"
+              :disabled="isEditLoading"
+            >
+              <font-awesome-icon icon="fa-solid fa-ban" />
+              {{ $t(`myPage.btn.cancel`) }}
+            </nut-button>
+            <nut-button
+              v-if="isCacheConfigEditing"
+              class="save-btn"
+              type="primary"
+              size="mini"
+              @click.stop="toggleEditMode('cache')"
+              :loading="isEditLoading"
+            >
+              <font-awesome-icon
+                v-if="!isCacheConfigEditing"
+                icon="fa-solid fa-pen-to-square"
+              />
+              <font-awesome-icon
+                v-else-if="!isEditLoading && isCacheConfigEditing"
+                icon="fa-solid fa-floppy-disk"
+              />
+              {{ !isCacheConfigEditing ? $t(`myPage.btn.edit`) : $t(`myPage.btn.save`) }}
+            </nut-button>
+            <nut-icon v-else class="right-icon" name="right"></nut-icon>
+          </div>
+        </div>
+        <div class="config-input-wrapper" v-if="isCacheConfigEditing">
+        
           <nut-input
             class="input"
             v-model="cacheThresholdInput"
-            :disabled="!isEditing"
+            :disabled="!isCacheConfigEditing"
             :placeholder="$t(`myPage.placeholder.cacheThreshold`)"
             type="number"
             input-align="left"
@@ -229,6 +310,103 @@
             right-icon="tips"
             @click-right-icon="cacheThresholdTips"
           />
+          <nut-input
+            class="input"
+            v-model="resourceCacheTtlInput"
+            :disabled="!isCacheConfigEditing"
+            :placeholder="$t(`myPage.placeholder.resourceCacheTtl`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconResourceCacheTtl"
+            right-icon="tips"
+            @click-right-icon="resourceCacheTtlTips"
+          />
+          <nut-input
+            class="input"
+            v-model="headersCacheTtlInput"
+            :disabled="!isCacheConfigEditing"
+            :placeholder="$t(`myPage.placeholder.headersCacheTtl`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconHeadersCacheTtl"
+            right-icon="tips"
+            @click-right-icon="headersCacheTtlTips"
+          />
+          <nut-input
+            class="input"
+            v-model="scriptCacheTtlInput"
+            :disabled="!isCacheConfigEditing"
+            :placeholder="$t(`myPage.placeholder.scriptCacheTtl`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconScriptCacheTtl"
+            right-icon="tips"
+            @click-right-icon="scriptCacheTtlTips"
+          />
+        </div>
+      </div>
+      <div class="config-card">
+        <div class="title-wrapper" @click="isFrontEndConfigEditing ? exitEditMode('frontEnd') : toggleEditMode('frontEnd')">
+          <h1>{{ $t(`myPage.frontEndConfig`) }}</h1>
+          <div class="config-btn-wrapper">
+            <nut-button
+              v-if="isFrontEndConfigEditing"
+              class="cancel-btn"
+              plain
+              type="info"
+              size="mini"
+              @click.stop="exitEditMode('frontEnd')"
+              :disabled="isEditLoading"
+            >
+              <font-awesome-icon icon="fa-solid fa-ban" />
+              {{ $t(`myPage.btn.cancel`) }}
+            </nut-button>
+            <nut-button
+              v-if="isFrontEndConfigEditing"
+              class="save-btn"
+              type="primary"
+              size="mini"
+              @click.stop="toggleEditMode('frontEnd')"
+              :loading="isEditLoading"
+            >
+              <font-awesome-icon
+                v-if="!isFrontEndConfigEditing"
+                icon="fa-solid fa-pen-to-square"
+              />
+              <font-awesome-icon
+                v-else-if="!isEditLoading && isFrontEndConfigEditing"
+                icon="fa-solid fa-floppy-disk"
+              />
+              {{ !isFrontEndConfigEditing ? $t(`myPage.btn.edit`) : $t(`myPage.btn.save`) }}
+            </nut-button>
+            <nut-icon v-else class="right-icon" name="right"></nut-icon>
+          </div>
+        </div>
+        <div class="config-input-wrapper" v-if="isFrontEndConfigEditing">
+        
+          <nut-input
+            class="input"
+            v-model="concurrencyInput"
+            :disabled="!isFrontEndConfigEditing"
+            :placeholder="$t(`myPage.placeholder.concurrency`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconConcurrency"
+            right-icon="tips"
+            @click-right-icon="concurrencyTips"
+          />
+          <nut-input
+            class="input"
+            v-model="apiCheckTimeoutInput"
+            :disabled="!isFrontEndConfigEditing"
+            :placeholder="$t(`myPage.placeholder.apiCheckTimeout`)"
+            type="number"
+            input-align="left"
+            :left-icon="iconTimeout"
+            right-icon="tips"
+            @click-right-icon="apiCheckTimeoutTips"
+          />
+        
         </div>
       </div>
 
@@ -236,26 +414,26 @@
         <nut-cell
           v-if="shareBtnVisible"
           :title="$t(`moreSettingPage.shareManageTitle`)"
-          class="change-themes"
+          class="right-icon"
           @click.stop="onClickShareManage"
           is-link
         ></nut-cell>
         <nut-cell
           :title="$t(`apiSettingPage.apiSettingTitle`)"
-          class="change-themes"
+          class="right-icon"
           @click.stop="onClickAPISetting"
           is-link
         ></nut-cell>
         <nut-cell
           :title="$t(`moreSettingPage.moreSettingTitle`)"
-          class="change-themes"
+          class="right-icon"
           @click.stop="onClickMore"
           is-link
         ></nut-cell>
 
         <nut-cell
           :title="$t(`navBar.pagesTitle.aboutUs`)"
-          class="change-themes"
+          class="right-icon"
           @click.stop="onClickAbout"
           is-link
         ></nut-cell>
@@ -290,7 +468,11 @@ import iconProxy from "@/assets/icons/proxy.svg";
 import icongithubProxy from "@/assets/icons/githubProxy.svg";
 import iconUA from "@/assets/icons/user-agent.svg";
 import iconMax from "@/assets/icons/max.svg";
+import iconHeadersCacheTtl from "@/assets/icons/headersCacheTtl.svg";
+import iconResourceCacheTtl from "@/assets/icons/resourceCacheTtl.svg";
+import iconScriptCacheTtl from "@/assets/icons/scriptCacheTtl.svg";
 import iconTimeout from "@/assets/icons/timeout.svg";
+import iconConcurrency from "@/assets/icons/concurrency.svg";
 import { useAppNotifyStore } from "@/store/appNotify";
 import { useGlobalStore } from "@/store/global";
 import { useSettingsStore } from "@/store/settings";
@@ -311,7 +493,7 @@ const router = useRouter();
 const { showNotify } = useAppNotifyStore();
 const { currentUrl: host } = useHostAPI();
 const settingsStore = useSettingsStore();
-const { githubUser, gistToken, syncTime, avatarUrl, defaultUserAgent, defaultProxy, defaultTimeout, cacheThreshold, syncPlatform, githubProxy } =
+const { githubUser, gistToken, syncTime, avatarUrl, defaultUserAgent, defaultProxy, defaultTimeout, cacheThreshold, resourceCacheTtl, headersCacheTtl, scriptCacheTtl, syncPlatform, githubProxy, gistUpload } =
   storeToRefs(settingsStore);
 
 const displayAvatar = computed(() => {
@@ -348,16 +530,24 @@ const uaInput = ref("");
 const proxyInput = ref("");
 const timeoutInput = ref("");
 const cacheThresholdInput = ref("");
-const isEditing = ref(false);
+const resourceCacheTtlInput = ref("");
+const headersCacheTtlInput = ref("");
+const scriptCacheTtlInput = ref("");
+const concurrencyInput = ref("");
+const apiCheckTimeoutInput = ref("");
+const isGitHubConfigEditing = ref(false);
+const isRequestConfigEditing = ref(false);
+const isCacheConfigEditing = ref(false);
+const isFrontEndConfigEditing = ref(false);
 const isEditLoading = ref(false);
 const isInit = ref(false);
 const storageType = ref('gist');
 const fileInput = ref(null);
 
-const toggleEditMode = async () => {
+const toggleEditMode = async (type) => {
   isEditLoading.value = true;
-  if (isEditing.value) {
-    await settingsStore.editGistSettings({
+  if ((type === 'github' && isGitHubConfigEditing.value) || (type === 'request' && isRequestConfigEditing.value) || (type === 'cache' && isCacheConfigEditing.value)) {
+    await settingsStore.changeSettings({
       syncPlatform: syncPlatformInput.value,
       githubUser: userInput.value,
       gistToken: tokenInput.value,
@@ -366,6 +556,9 @@ const toggleEditMode = async () => {
       defaultProxy: proxyInput.value,
       defaultTimeout: timeoutInput.value,
       cacheThreshold: cacheThresholdInput.value,
+      resourceCacheTtl: resourceCacheTtlInput.value,
+      headersCacheTtl: headersCacheTtlInput.value,
+      scriptCacheTtl: scriptCacheTtlInput.value,
     });
     setDisplayInfo();
   } else {
@@ -377,14 +570,77 @@ const toggleEditMode = async () => {
     proxyInput.value = defaultProxy.value;
     timeoutInput.value = defaultTimeout.value;
     cacheThresholdInput.value = cacheThreshold.value;
+    resourceCacheTtlInput.value = resourceCacheTtl.value;
+    headersCacheTtlInput.value = headersCacheTtl.value;
+    scriptCacheTtlInput.value = scriptCacheTtl.value;
+  }
+  if (type === 'frontEnd' && isFrontEndConfigEditing.value) {
+    const apiCheckTimeout = Number(apiCheckTimeoutInput.value);
+    if (!isNaN(apiCheckTimeout)) {
+      if (apiCheckTimeout > 0) {
+        console.log(`设置超时 ${apiCheckTimeout}`)
+        localStorage.setItem('timeout', apiCheckTimeout.toString());
+      } else {
+        console.log(`清除超时设置`)
+        localStorage.removeItem('timeout');
+      }
+    }else {
+      console.log(`清除超时设置`)
+      localStorage.removeItem('timeout');
+    }
+    const concurrency = parseInt(concurrencyInput.value, 10);
+    if (!isNaN(concurrency)) {
+      if (concurrency >= 1) {
+        console.log(`设置并发数 ${concurrency}`)
+        localStorage.setItem('concurrency', concurrency.toString());
+      } else {
+        console.log(`清除并发数设置`)
+        localStorage.removeItem('concurrency');
+      }
+    } else {
+      console.log(`清除并发数设置`)
+      localStorage.removeItem('concurrency');
+    }
+    setTimeout(() => {
+      window.location.reload();
+    }, 100);
+  } else {
+    const storedTimeout = localStorage.getItem('timeout');
+    if (storedTimeout) {
+      apiCheckTimeoutInput.value = storedTimeout;
+    } else {
+      apiCheckTimeoutInput.value = '';
+    }
+    const storedConcurrency = localStorage.getItem('concurrency');
+    if (storedConcurrency) {
+      concurrencyInput.value = storedConcurrency;
+    } else {
+      concurrencyInput.value = '';
+    }
   }
   isEditLoading.value = false;
-  isEditing.value = !isEditing.value;
+  if (type === 'github' && !isGitHubConfigEditing.value) {
+    isGitHubConfigEditing.value = !isGitHubConfigEditing.value;
+  } else if (type === 'cache' && !isCacheConfigEditing.value) {
+    isCacheConfigEditing.value = !isCacheConfigEditing.value;
+  } else if (type === 'request' && !isRequestConfigEditing.value) {
+    isRequestConfigEditing.value = !isRequestConfigEditing.value;
+  } else if (type === 'frontEnd' && !isFrontEndConfigEditing.value) {
+    isFrontEndConfigEditing.value = !isFrontEndConfigEditing.value;
+  }
 };
 
-const exitEditMode = () => {
+const exitEditMode = (type) => {
   setDisplayInfo();
-  isEditing.value = false;
+  if (type === 'github') {
+    isGitHubConfigEditing.value = false;
+  } else if (type === 'cache') {
+    isCacheConfigEditing.value = false;
+  } else if (type === 'request') {
+    isRequestConfigEditing.value = false;
+  } else {
+    isFrontEndConfigEditing.value = false;
+  }
   isEditLoading.value = false;
 };
 const toggleSyncPlatform = () => {
@@ -424,6 +680,9 @@ const setDisplayInfo = () => {
   proxyInput.value = defaultProxy.value || "";
   timeoutInput.value = defaultTimeout.value || "";
   cacheThresholdInput.value = cacheThreshold.value || "";
+  resourceCacheTtlInput.value = resourceCacheTtl.value || "";
+  headersCacheTtlInput.value = headersCacheTtl.value || "";
+  scriptCacheTtlInput.value = scriptCacheTtl.value || "";
 };
 
 // 同步 上传
@@ -463,7 +722,23 @@ const fileChange = async (event) => {
           type: "success",
           title: t(`myPage.notify.restore.succeed`),
         });
-        window.location.reload()
+
+        if ("serviceWorker" in navigator) {
+          const registrations = await navigator.serviceWorker.getRegistrations();
+          for (let registration of registrations) {
+            await registration.unregister();
+          }
+        }
+        if ("caches" in window) {
+          const cacheNames = await caches.keys();
+          for (let cacheName of cacheNames) {
+            await caches.delete(cacheName);
+          }
+        }
+        
+        setTimeout(() => {
+          window.location.reload();
+        }, 1000);
       } else {
         throw new Error('restore failed')
       }
@@ -517,7 +792,22 @@ const sync = async (query: "download" | "upload", options?: { keep?: string[], e
       title: t(`myPage.notify.${query}.succeed`),
     });
     if (query === "download") {
-      window.location.reload()
+      if ("serviceWorker" in navigator) {
+        const registrations = await navigator.serviceWorker.getRegistrations();
+        for (let registration of registrations) {
+          await registration.unregister();
+        }
+      }
+      if ("caches" in window) {
+        const cacheNames = await caches.keys();
+        for (let cacheName of cacheNames) {
+          await caches.delete(cacheName);
+        }
+      }
+      
+      setTimeout(() => {
+        window.location.reload();
+      }, 1000);
     }
   }
 
@@ -526,26 +816,28 @@ const sync = async (query: "download" | "upload", options?: { keep?: string[], e
 };
 
 const uploadBtn = () => {
-  Dialog({
-    title: '请选择',
-    content: '若选择明文, 将不会保留 GitHub Token. 若选择 Base64 编码, 将完整保留数据(后端版本必须 >= 2.19.85)',
-    footerDirection: 'vertical',
-    onCancel: () => {
-      sync('upload', {
-        encode: 'plaintext'
-      });
-    },
-    cancelText: '明文(将不会保留 GitHub Token)',
-    okText: 'Base64 编码上传',
-    onOk: () => {
-      sync('upload', {
-        encode: 'base64'
-      });
-    },
-    popClass: "auto-dialog",
-    closeOnPopstate: true,
-    lockScroll: false,
-  });
+  const encode = gistUpload.value || 'base64';
+  sync('upload', { encode });
+  // Dialog({
+  //   title: '请选择',
+  //   content: '若选择明文, 将不会保留 GitHub Token. 若选择 Base64 编码, 将完整保留数据(后端版本必须 >= 2.19.85)',
+  //   footerDirection: 'vertical',
+  //   onCancel: () => {
+  //     sync('upload', {
+  //       encode: 'plaintext'
+  //     });
+  //   },
+  //   cancelText: '明文(将不会保留 GitHub Token)',
+  //   okText: 'Base64 编码上传',
+  //   onOk: () => {
+  //     sync('upload', {
+  //       encode: 'base64'
+  //     });
+  //   },
+  //   popClass: "auto-dialog",
+  //   closeOnPopstate: true,
+  //   lockScroll: false,
+  // });
 }
 const downloadBtn = () => {
   Dialog({
@@ -582,7 +874,7 @@ const githubProxyTips = () => {
 const proxyTips = () => {
   Dialog({
       title: '通过代理/节点/策略进行下载',
-      content: '1. Surge(参数 policy/policy-descriptor)\n\n可设置节点代理 例: Test = snell, 1.2.3.4, 80, psk=password, version=4\n\n或设置策略/节点 例: 国外加速\n\n2. Loon(参数 node)\n\nLoon 官方文档: \n\n指定该请求使用哪一个节点或者策略组（可以使节点名称、策略组名称，也可以说是一个Loon格式的节点描述，如：shadowsocksr,example.com,1070,chacha20-ietf,"password",protocol=auth_aes128_sha1,protocol-param=test,obfs=plain,obfs-param=edge.microsoft.com）\n\n3. Stash(参数 headers["X-Surge-Policy"])/Shadowrocket(参数 headers.X-Surge-Policy)/QX(参数 opts.policy)\n\n可设置策略/节点\n\n4. Node.js 版(http/https/socks5):\n\n例: socks5://a:b@127.0.0.1:7890\n\n※ 优先级由高到低: 单条订阅, 组合订阅, 默认配置',
+      content: '1. Surge(参数 policy/policy-descriptor)\n\n可设置节点代理 例: Test = snell, 1.2.3.4, 80, psk=password, version=4\n\n或设置策略/节点 例: 国外加速\n\n2. Loon(参数 node)\n\nLoon 官方文档: \n\n指定该请求使用哪一个节点或者策略组（可以是节点名称、策略组名称，也可以是一个 Loon 格式的节点描述，如：shadowsocksr,example.com,1070,chacha20-ietf,"password",protocol=auth_aes128_sha1,protocol-param=test,obfs=plain,obfs-param=edge.microsoft.com）\n\n3. Stash(参数 headers["X-Surge-Policy"])/Shadowrocket(参数 headers.X-Surge-Policy)/QX(参数 opts.policy)\n\n可设置策略/节点\n\n4. Node.js 版(http/https/socks5):\n\n例: socks5://a:b@127.0.0.1:7890\n\n※ 优先级由高到低: 单条订阅, 组合订阅, 默认配置',
       popClass: 'auto-dialog',
       textAlign: 'left',
       okText: 'OK',
@@ -624,6 +916,61 @@ const cacheThresholdTips = () => {
       lockScroll: false,
     });
 };
+const resourceCacheTtlTips = () => {
+  Dialog({
+      title: '资源缓存时间 (秒)',
+      content: '主要涉及下载订阅/下载脚本/域名解析等功能',
+      popClass: 'auto-dialog',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
+const headersCacheTtlTips = () => {
+  Dialog({
+      title: '响应头缓存时间 (秒)',
+      content: '主要涉及订阅流量信息等功能',
+      popClass: 'auto-dialog',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
+const scriptCacheTtlTips = () => {
+  Dialog({
+      title: '脚本缓存时间 (秒)',
+      content: '主要涉及在脚本中使用的 scriptResourceCache 缓存',
+      popClass: 'auto-dialog',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
+const concurrencyTips = () => {
+  Dialog({
+      title: '并发数',
+      content: 'Shadowrocket 并发可能会爆内存, 可设为 1',
+      popClass: 'auto-dialog',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
+const apiCheckTimeoutTips = () => {
+  Dialog({
+      title: 'API 检测超时',
+      content: '某些版本的 Mac 上 QX https://sub.store/api/utils/env 可能会超时, JS 一直活跃中, 可设为 8000',
+      popClass: 'auto-dialog',
+      okText: 'OK',
+      noCancelBtn: true,
+      closeOnPopstate: true,
+      lockScroll: false,
+    });
+};
 // store 刷新数据完成后 复制内容给 input 绑定
 const { isLoading: storeIsLoading, env: backendEnv } = storeToRefs(useGlobalStore());
 watchEffect(() => {
@@ -677,14 +1024,15 @@ const setTag = (current) => {
     }
 
     .config-card {
-      margin-top: 20px;
+      margin-top: 10px;
       width: 100%;
-      padding: 12px;
+      padding: 6px 12px 6px 6px;
       border-radius: var(--item-card-radios);
       color: var(--second-text-color);
       background: var(--card-color);
 
       .title-wrapper {
+        cursor: pointer;
         display: flex;
         justify-content: space-between;
         align-items: center;
@@ -746,6 +1094,7 @@ const setTag = (current) => {
       justify-content: space-between;
       align-items: center;
       padding: 12px 0 0 0;
+      margin-bottom: 20px;
 
       .avatar-wrapper {
         display: flex;
@@ -809,7 +1158,7 @@ const setTag = (current) => {
       }
     }
 
-    .change-themes {
+    .right-icon {
       // color: var(--comment-text-color);
       box-shadow: none;
       font-weight: bold;
diff --git a/src/views/Sub.vue b/src/views/Sub.vue
index f35c097a5..dd9600318 100644
--- a/src/views/Sub.vue
+++ b/src/views/Sub.vue
@@ -262,22 +262,12 @@ import SubListItem from "@/components/SubListItem.vue";
 import { useBackend } from "@/hooks/useBackend";
 import { useAppNotifyStore } from "@/store/appNotify";
 import { useGlobalStore } from "@/store/global";
+import { useSystemStore } from "@/store/system";
 import { useMethodStore } from '@/store/methodStore';
 import { useSettingsStore } from '@/store/settings';
 import { useSubsStore } from "@/store/subs";
 import { initStores } from "@/utils/initApp";
 import { isMobile } from "@/utils/isMobile";
-
-
-
-
-
-
-
-
-
-
-
 const { env } = useBackend();
 const { showNotify } = useAppNotifyStore();
 const subsApi = useSubsApi();
@@ -291,6 +281,7 @@ const addSubBtnIsVisible = ref(false);
 const methodStore = useMethodStore();
 const subsStore = useSubsStore();
 const globalStore = useGlobalStore();
+const systemStore = useSystemStore();
 const settingsStore = useSettingsStore();
 const { hasSubs, hasCollections, subs, collections } = storeToRefs(subsStore);
 const { appearanceSetting } = storeToRefs(settingsStore);
@@ -301,6 +292,7 @@ const {
   bottomSafeArea,
   // showFloatingRefreshButton,
 } = storeToRefs(globalStore);
+const { navBarHeight } = storeToRefs(systemStore);
 const swipeDisabled = ref(false);
 const touchStartY = ref(null);
 const touchStartX = ref(null);
@@ -308,6 +300,9 @@ const sortFailed = ref(false);
 const hasUntagged = ref(false);
 const hasLocal = ref(false);
 const hasRemote = ref(false);
+const tagNavBarHeight = computed(() => {
+  return navBarHeight.value;
+});
 const getTag = () => {
     return localStorage.getItem('sub-tag') || 'all';
   };
@@ -434,14 +429,6 @@ const updateRadioWrapperHeight = () => {
     }
   });
 };
-const isPWA = ref(
-  (window.matchMedia("(display-mode: standalone)").matches &&
-    !/Android/.test(navigator.userAgent)) ||
-    false
-);
-const navBarHeight = computed(() => {
-  return isPWA.value ? `${44 + 32 + bottomSafeArea.value}px` : `${44 + 12 + bottomSafeArea.value}px`;
-});
 
 watch(tag, () => {
   updateRadioWrapperHeight();
@@ -569,7 +556,7 @@ const shouldShowElement = (element) => {
   if(tag.value === 'untagged') return !Array.isArray(element.tag) || element.tag.length === 0;
   if(tag.value === 'remote') return element.source === 'remote';
   if(tag.value === 'local') return element.source === 'local';
-  return element.tag.includes(tag.value);
+  return element.tag?.includes(tag.value);
 };
 const upload = async() => {
   try {
@@ -829,7 +816,7 @@ const importTips = () => {
     flex-wrap: wrap;
     position: fixed;
     padding: 10px;
-    top: v-bind(navBarHeight);
+    top: v-bind(tagNavBarHeight);
     z-index: 10;
     backdrop-filter: blur(var(--nav-bar-blur));
     -webkit-backdrop-filter: blur(var(--nav-bar-blur));
diff --git a/src/views/SubEditor.vue b/src/views/SubEditor.vue
index 2f71d5c7d..5d131fbdb 100644
--- a/src/views/SubEditor.vue
+++ b/src/views/SubEditor.vue
@@ -189,12 +189,13 @@
               type="text"
             /> -->
             <button class="cimg-button" @click="isDis = false">
-              <img src="" />
+              <font-awesome-icon icon="fa-solid fa-maximize" />
               {{ $t(`editorPage.subConfig.basic.url.tips.fullScreenEdit`) }}
               <!-- 测试 后续再改效果 -->
             </button>
             <input type="file" ref="fileInput" @change="fileChange" style="display: none">
             <button class="cimg-button" @click="upload">
+              <font-awesome-icon icon="fa-solid fa-cloud-arrow-up" />
               {{ $t(`editorPage.subConfig.basic.url.tips.importFromFile`) }}
             </button>
             <span class="button-tips" @click="contentTips">
@@ -215,7 +216,7 @@
             v-if="form.source === 'remote'"
           >
             <div class="switch-wrapper">
-              <nut-switch v-model="form.passThroughUA" />
+              <nut-switch v-model="form.passThroughUA" @change="handlePassThroughUAChange"/>
             </div>
           </nut-form-item>
           <nut-form-item
@@ -227,10 +228,11 @@
               :border="false"
               class="nut-input-text"
               v-model.trim="form.ua"
-              :placeholder="$t(`editorPage.subConfig.basic.ua.placeholder`)"
+              :placeholder="userAgentPlaceholder"
               type="text"
               input-align="right"
               left-icon="tips"
+              :readonly="passThroughUAOn"
               @click-left-icon="uaTips"
             />
           </nut-form-item>
@@ -467,7 +469,7 @@
 </div>
 <div v-else style="width: 100%;max-height: 95vh;">
     <button class="cimg-button" @click="isDis = true">
-      <img src="" />
+      <font-awesome-icon icon="fa-solid fa-minimize" />
       {{ $t(`editorPage.subConfig.basic.url.tips.fullScreenEditCancel`) }}
     </button>
     <cmView :isReadOnly="false" id="SubEditer" />
@@ -617,7 +619,8 @@ const padding = bottomSafeArea.value + "px";
     if(!Array.isArray(subscriptions) || subscriptions.length === 0) return `: ${t(`editorPage.subConfig.basic.subscriptions.empty`)}`
     return `: ${subscriptions.map((name) => {
       const sub = subsStore.getOneSub(name);
-      return sub?.displayName || sub?.["display-name"] || sub.name;
+      if(!sub) form.subscriptions = form.subscriptions.filter((n) => n !== name);
+      return sub?.displayName || sub?.["display-name"] || sub?.name;
     }).join(', ')}`
   });
   const compareTableIsVisible = ref(false);
@@ -680,6 +683,12 @@ watchEffect(() => {
   }
 
   const sourceData: any = toRaw(sub.value) || toRaw(collection.value);
+  if (!sourceData) {
+    return;
+  }
+  if (!Array.isArray(sourceData.process)) {
+    sourceData.process = [];
+  }
   const newProcess = JSON.parse(JSON.stringify(sourceData.process));
   form.mergeSources = sourceData.mergeSources;
   let ignoreFailedRemoteSub = sourceData.ignoreFailedRemoteSub;
@@ -707,8 +716,9 @@ watchEffect(() => {
 
   switch (editType) {
     case "collections":
-      form.subscriptions = [];
-      form.subscriptions.push(...sourceData.subscriptions);
+      form.subscriptions = Array.isArray(sourceData.subscriptions)
+        ? [...sourceData.subscriptions]
+        : [];
       console.log('form.subscriptions ==>', form.subscriptions);
       break;
     case "subs":
@@ -717,6 +727,14 @@ watchEffect(() => {
       form.content = sourceData.content;
       cmStore.setEditCode('SubEditer', sourceData.content);
       form.ua = sourceData.ua;
+      form._savedUA = sourceData._savedUA;
+      if(form.passThroughUA && form.ua){
+        showNotify({
+          type: "warning",
+          title: t(`editorPage.subConfig.basic.passThroughUA.warning`),
+          duration: 65535,
+        });
+      }
       break;
   }
 
@@ -906,6 +924,28 @@ const compare = () => {
   });
 };
 
+const passThroughUAOn = computed(() => {
+  return form.source === "remote" && form.passThroughUA;
+});
+
+const userAgentPlaceholder = computed(() => {
+  return passThroughUAOn.value
+    ? t(`editorPage.subConfig.basic.ua.placeholderDisabled`)
+    : t(`editorPage.subConfig.basic.ua.placeholder`);
+});
+
+const handlePassThroughUAChange = (val) => {
+  if (val) {
+    form._savedUA = form.ua;
+    form.ua = "";
+  } else {
+    if (form._savedUA !== undefined) {
+      form.ua = form._savedUA;
+      form._savedUA = undefined;
+    }
+  }
+};
+
 const submit = () => {
   if (isget.value) {
     showNotify({
@@ -1077,7 +1117,7 @@ const urlValidator = (val: string): Promise<boolean> => {
   const subUserinfoTips = () => {
     Dialog({
         title: '手动设置订阅流量信息',
-        content: '若填写链接, 则使用链接的响应内容作为值.\n\n此项值的格式为:\n\nupload=1024; download=10240; total=102400; expire=4115721600; reset_day=14; plan_name=VIP1; app_url=http://a.com\n\n1. app_url, 订阅将有一个可点击跳转的按钮\n\n2. plan_name, hover 时将显示套餐名称\n\n3. reset_day, 流量重置剩余天数(若要设置周期性重置, 可查看订阅链接中的参数说明)\n\n⚠️ 注意: 手动设置的订阅流量信息会附加到订阅自己的流量信息之前. 若包含不合法的内容, 订阅将无法正常使用\n\n例如: http://官网.com 应编码为 http%3A%2F%2F%E5%AE%98%E7%BD%91.com',
+        content: '若填写链接, 则使用链接的响应体内容/响应头 subscription-userinfo 作为值.\n\n此项值的格式为:\n\nupload=1024; download=10240; total=102400; expire=4115721600; reset_day=14; plan_name=VIP1; app_url=http://a.com\n\n1. app_url, 订阅将有一个可点击跳转的按钮\n\n2. plan_name, hover 时将显示套餐名称\n\n3. reset_day, 流量重置剩余天数(若要设置周期性重置, 可查看订阅链接中的参数说明)\n\n⚠️ 注意: 手动设置的订阅流量信息会附加到订阅自己的流量信息之前. 若包含不合法的内容, 订阅将无法正常使用\n\n例如: http://官网.com 应编码为 http%3A%2F%2F%E5%AE%98%E7%BD%91.com',
         popClass: 'auto-dialog',
         okText: 'OK',
         noCancelBtn: true,
@@ -1088,7 +1128,7 @@ const urlValidator = (val: string): Promise<boolean> => {
   const proxyTips = () => {
     Dialog({
         title: '通过代理/节点/策略获取订阅',
-        content: '1. Surge(参数 policy/policy-descriptor)\n\n可设置节点代理 例: Test = snell, 1.2.3.4, 80, psk=password, version=4\n\n或设置策略/节点 例: 国外加速\n\n2. Loon(参数 node)\n\nLoon 官方文档: \n\n指定该请求使用哪一个节点或者策略组（可以使节点名称、策略组名称，也可以说是一个Loon格式的节点描述，如：shadowsocksr,example.com,1070,chacha20-ietf,"password",protocol=auth_aes128_sha1,protocol-param=test,obfs=plain,obfs-param=edge.microsoft.com）\n\n3. Stash(参数 headers["X-Surge-Policy"])/Shadowrocket(参数 headers.X-Surge-Policy)/QX(参数 opts.policy)\n\n可设置策略/节点\n\n4. Node.js 版(http/https/socks5):\n\n例: socks5://a:b@127.0.0.1:7890\n\n※ 优先级由高到低: 单条订阅, 组合订阅, 默认配置',
+        content: '1. Surge(参数 policy/policy-descriptor)\n\n可设置节点代理 例: Test = snell, 1.2.3.4, 80, psk=password, version=4\n\n或设置策略/节点 例: 国外加速\n\n2. Loon(参数 node)\n\nLoon 官方文档: \n\n指定该请求使用哪一个节点或者策略组（可以是节点名称、策略组名称，也可以是一个 Loon 格式的节点描述，如：shadowsocksr,example.com,1070,chacha20-ietf,"password",protocol=auth_aes128_sha1,protocol-param=test,obfs=plain,obfs-param=edge.microsoft.com）\n\n3. Stash(参数 headers["X-Surge-Policy"])/Shadowrocket(参数 headers.X-Surge-Policy)/QX(参数 opts.policy)\n\n可设置策略/节点\n\n4. Node.js 版(http/https/socks5):\n\n例: socks5://a:b@127.0.0.1:7890\n\n※ 优先级由高到低: 单条订阅, 组合订阅, 默认配置',
         popClass: 'auto-dialog',
         textAlign: 'left',
         okText: 'OK',
@@ -1186,39 +1226,24 @@ const urlValidator = (val: string): Promise<boolean> => {
   const filteredSubsSelectList = ref([]);
 
   const updateFilteredSubsList = () => {
-    if (subsSelectList.value && subsSelectList.value.length > 0) {
-      const filtered = subsSelectList.value.filter(item => shouldShowElement(item[3]));
-      
-      // 分离已勾选和未勾选的订阅
-      const selectedItems = [];
-      const unselectedItems = [];
-      
-      // 确保 form.subscriptions 存在
-      if (!form.subscriptions) {
-        form.subscriptions = [];
-      }
-      
-      // 优先添加已勾选的订阅
-      form.subscriptions.forEach(selectedName => {
-        const item = filtered.find(item => item[0] === selectedName);
-        if (item) {
-          selectedItems.push(item);
-        }
-      });
-      
-      // 添加未勾选的订阅
-      filtered.forEach(item => {
-        if (!form.subscriptions.includes(item[0])) {
-          unselectedItems.push(item);
-        }
-      });
-      
-      // 合并：已勾选的在前，未勾选的在后
-      filteredSubsSelectList.value = [...selectedItems, ...unselectedItems];
-    } else {
+    if (!subsSelectList.value?.length) {
       filteredSubsSelectList.value = [];
+      return;
     }
+    
+    form.subscriptions = form.subscriptions || [];
+    
+    // 当选中"全部"标签时，将已选中的订阅提到最前面；否则保持原顺序
+    filteredSubsSelectList.value = tag.value === 'all'
+      ? [
+          // 已选中的（按选中顺序）
+          ...form.subscriptions.map(name => subsSelectList.value.find(item => item[0] === name)).filter(Boolean),
+          // 未选中的
+          ...subsSelectList.value.filter(item => !form.subscriptions.includes(item[0]))
+        ]
+      : [...subsSelectList.value];
   };
+  // 监听 tag、subsSelectList 和 subsStore.subs 的变化时更新列表
   watch([tag, subsSelectList, () => subsStore.subs], () => {
     updateFilteredSubsList();
   }, { immediate: true, deep: true });
@@ -1233,7 +1258,10 @@ const urlValidator = (val: string): Promise<boolean> => {
     console.log("结束拖拽");
     isDragging.value = false;
   
-    const newFilteredOrder = filteredSubsSelectList.value.map(item => item[0]);
+    // 获取当前过滤视图中可见的订阅顺序
+    const visibleOrder = filteredSubsSelectList.value
+      .filter(item => shouldShowElement(item[3]))
+      .map(item => item[0]);
     
     const newSubscriptions = [];
     
@@ -1243,7 +1271,7 @@ const urlValidator = (val: string): Promise<boolean> => {
     }
     
     // 先按新顺序添加当前过滤列表中已选中的订阅
-    newFilteredOrder.forEach(name => {
+    visibleOrder.forEach(name => {
       if (form.subscriptions.includes(name)) {
         newSubscriptions.push(name);
       }
@@ -1251,7 +1279,7 @@ const urlValidator = (val: string): Promise<boolean> => {
     
     // 添加不在当前过滤列表中但已选中的订阅（保持原有顺序）
     form.subscriptions.forEach(name => {
-      if (!newFilteredOrder.includes(name)) {
+      if (!visibleOrder.includes(name)) {
         newSubscriptions.push(name);
       }
     });
diff --git a/src/views/editCode/cmView.vue b/src/views/editCode/cmView.vue
index 8c4158ead..fd6429dd6 100644
--- a/src/views/editCode/cmView.vue
+++ b/src/views/editCode/cmView.vue
@@ -186,7 +186,7 @@ const getjsjson = (res) => {
   // if (props.isJS) return false;
   try {
     const jsRegex =
-      /(?:function|var|let|const|if|else|return|try|catch|finally|typeof|delete|async|await)\s/;
+      /(?:function|var|let|const|if|else|return|try|catch|finally|typeof|delete|async|await|Error:)\s/;
     if (jsRegex.test(res.slice(0, 4000))) {
       setHJ();
       console.log("---setHJ");
@@ -349,7 +349,7 @@ const pasteNav = async () => {
   } catch (e) {
     showNotify({
       type: "warning",
-      title: "获取剪贴板失败: 非Https",
+      title: "获取剪贴板失败: 本地/HTTPS 环境下可用(或手动配置权限)"
     });
   }
 };
diff --git a/src/views/editCode/light.js b/src/views/editCode/light.js
index 886480a0d..90c40a4bd 100644
--- a/src/views/editCode/light.js
+++ b/src/views/editCode/light.js
@@ -31,6 +31,7 @@ const config = {
     regexp: '#7f99b8',
     
 };
+
 const  lightCodeTheme = EditorView.theme({
     '&': {
         color: config.foreground,
@@ -43,8 +44,8 @@ const  lightCodeTheme = EditorView.theme({
     '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
     '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
     '.cm-searchMatch': {
-        backgroundColor: config.dropdownBackground,
-        outline: `1px solid ${config.dropdownBorder}`
+        backgroundColor: '#ffff0054',
+        outline: `1px solid #87a6cc`
     },
     '.cm-searchMatch.cm-searchMatch-selected': {
         backgroundColor: config.selection
diff --git a/src/views/editor/ActionBlock.vue b/src/views/editor/ActionBlock.vue
index 6cf002b4f..796c40a64 100644
--- a/src/views/editor/ActionBlock.vue
+++ b/src/views/editor/ActionBlock.vue
@@ -54,22 +54,38 @@
                 <nut-icon v-if="collapsedElements.includes(element.id)" name="rect-right" size="12px"></nut-icon>
               </span>
               <div class="input-wrapper">
-                <input
-                  ref="customNameInput"
+                <nut-input
+                  :id="`action-input-${element.id}`"
                   @click.stop
                   v-model="findEditItemById(element).customName"
                   class="custom-name-input"
                   type="text"
-                  :disabled="!findEditItemById(element).isEditing"
-                  :placeholder="findEditItemById(element).defualtName"
-                />
-                <div
+                  :readonly="!findEditItemById(element).isEditing"
+                  :placeholder="findEditItemById(element).defaultName"
+                  @blur="saveEditName(element)"
+                  @keyup.enter="saveEditName(element)"
+                  @click="toggleInput(element)"
+                >
+                  <!-- <template #button>
+                    <div class="list-group-item-icons">
+                      <template v-if="!findEditItemById(element).isEditing">
+                        <font-awesome-icon icon="fa-solid fa-pen-to-square" @click.stop="toggleEditName(element)" />
+                      </template>
+                      <template v-else>
+                        <font-awesome-icon icon="fa-solid fa-floppy-disk" @click.stop="saveEditName(element)" />
+                        <font-awesome-icon icon="fa-solid fa-ban" @click.stop="exitEditName(element)" />
+                      </template>
+                      <font-awesome-icon icon="fa-solid fa-circle-question" @click.stop="pop(element.type, element.tipsDes)" />
+                    </div>
+                  </template> -->
+                </nut-input>
+                <!-- <div
                   v-if="!findEditItemById(element).isEditing"
                   class="input-overlay"
                   @click="toggleElementCollapsed(element.id)"
-                ></div>
+                ></div> -->
               </div>
-              <div class="list-group-item-icons">
+              <!-- <div class="list-group-item-icons">
                 <template v-if="!findEditItemById(element).isEditing">
                   <font-awesome-icon icon="fa-solid fa-pen-to-square" @click.stop="toggleEditName(element)" />
                 </template>
@@ -78,16 +94,19 @@
                   <font-awesome-icon icon="fa-solid fa-ban" @click.stop="exitEditName(element)" />
                 </template>
                 <font-awesome-icon icon="fa-solid fa-circle-question" @click.stop="pop(element.type, element.tipsDes)" />
-              </div>
+              </div> -->
             </div>
             <div class="right">
+              <div class="list-group-item-icons icon-button__input">
+                <template v-if="!findEditItemById(element).isEditing">
+                  <font-awesome-icon icon="fa-solid fa-pen-to-square" @click.stop="toggleEditName(element)" />
+                </template>
+                <template v-else>
+                  <font-awesome-icon icon="fa-solid fa-floppy-disk" @click.stop="saveEditName(element)" />
+                  <font-awesome-icon icon="fa-solid fa-ban" @click.stop="exitEditName(element)" />
+                </template>
+              </div>
               <div class="action-switch">
-                <!-- <nut-switch
-                  v-model="element.enabled"
-                  class="my-switch"
-                  :active-text="t(`editorPage.subConfig.actions.enable`)"
-                  :inactive-text="t(`editorPage.subConfig.actions.disable`)"
-                /> -->
                 <nut-checkbox
                   v-model="element.enabled"
                   class="my-switch"
@@ -103,7 +122,10 @@
                   {{ $t(`editorPage.subConfig.basic.previewSwitch`) }}
                 </span>
               </div>
-              <div class="copy">
+              <div class="icon-button">
+                <font-awesome-icon icon="fa-solid fa-circle-question" @click.stop="pop(element.type, element.tipsDes)" />
+              </div>
+              <div class="icon-button">
                 <font-awesome-icon icon="fa-solid fa-clone" @click="copyItem(element)"></font-awesome-icon>
               </div>
               <div class="delete">
@@ -236,6 +258,13 @@ const setCollapsed = (v) => {
     collapsedElements.value = [];
   }
 };
+const toggleInput = (e) => {
+  if (findEditItemById(e).isEditing) {
+    return;
+  } else {
+    toggleElementCollapsed(e.id);
+  }
+};
 const toggleElementCollapsed = (id) => {
   if (collapsedElements.value.includes(id)) {
     collapsedElements.value = collapsedElements.value.filter(item => item !== id);
@@ -383,13 +412,11 @@ const pop = (type: string, tipsDes: string) => {
 };
 
 // 操作名称自定义
-const customNameInput = ref(null);
-
 const findNameByType = (type) => items.find((item) => item.value === type).text;
 const generateEditNameItem = (element) => {
   const { tipsDes, component, ...values } = element;
   return {
-    defualtName: findNameByType(values.type),
+    defaultName: findNameByType(values.type),
     oldCustomName: values.customName,
     isEditing: false,
     ...values,
@@ -469,7 +496,11 @@ const toggleEditName = (element) => {
   });
   editItem.isEditing = true;
   nextTick(() => {
-    customNameInput.value.focus();
+    const inputWrapper = document.getElementById(`action-input-${element.id}`);
+    const inputEl = inputWrapper?.querySelector('input');
+    if (inputEl) {
+      inputEl.focus();
+    }
   });
 };
 
@@ -529,23 +560,37 @@ defineExpose({ exitAllEditName });
     margin-bottom: 12px;
     color: var(--comment-text-color);
     border-bottom: 1px solid var(--divider-color);
+    width: 100%;
 
     .input-wrapper {
       position: relative;
-      display: inline-block;
-      width: 60px;
+      display: flex;
+      align-items: center;
+      flex: 1;
       margin-right: 2px;
-
       .custom-name-input {
-        width: 60px;
         font-size: 12px;
         font-weight: bold;
         background: transparent;
-        // color: var(--second-text-color);
+        color: var(--second-text-color);
         padding: 0;
         border: none;
         outline: none;
         text-overflow: ellipsis;
+        :deep(.nut-input) {
+          width: 100%;
+          color: var(--second-text-color);
+          text-overflow: ellipsis;
+
+        }
+        &.nut-input-readonly,
+        &.nut-input-disabled {
+          :deep(.input-text) {
+            cursor: pointer;
+            color: var(--second-text-color);
+            text-overflow: ellipsis;
+          }
+        }
       }
 
       .input-overlay {
@@ -556,6 +601,7 @@ defineExpose({ exitAllEditName });
         height: 100%;
         cursor: pointer;
         background: transparent;
+        z-index: 1;
       }
     }
 
@@ -579,7 +625,8 @@ defineExpose({ exitAllEditName });
       font-weight: bold;
       display: flex;
       align-items: center;
-
+      flex: 1;
+      padding-right: 5px;
       .collapsed, .name {
         cursor: pointer;
       }
@@ -596,6 +643,7 @@ defineExpose({ exitAllEditName });
     .right {
       display: flex;
       align-items: center;
+      flex-shrink: 0;
       .action-switch {
         display: flex;
         align-items: center;
@@ -639,10 +687,12 @@ defineExpose({ exitAllEditName });
           }
         }
       }
-
-      .copy {
+      .icon-button {
         padding: 0 8px;
         cursor: pointer;
+        &__input {
+          padding-right: 20px;
+        }
       }
       .delete {
         padding: 0 8px;
diff --git a/src/views/editor/components/FilterSelect.vue b/src/views/editor/components/FilterSelect.vue
index 360a07858..468299edb 100644
--- a/src/views/editor/components/FilterSelect.vue
+++ b/src/views/editor/components/FilterSelect.vue
@@ -72,7 +72,10 @@
         'hysteria2',
         'juicity',
         'mieru',
+        'sudoku',
+        'masque',
         'anytls',
+        'trust-tunnel',
         'wireguard',
         'ssh',
         'external',
diff --git a/src/views/editor/components/HandleDuplicate.vue b/src/views/editor/components/HandleDuplicate.vue
index c5cb34826..9fe9bd94d 100644
--- a/src/views/editor/components/HandleDuplicate.vue
+++ b/src/views/editor/components/HandleDuplicate.vue
@@ -1,5 +1,44 @@
 <template>
   <div class="editor-action-card">
+    <p class="des-label">
+      {{ $t(`editorPage.subConfig.nodeActions['${type}'].field.des`) }}
+    </p>
+    <div class="tag-wrapper">
+      <draggable
+          item-key="id"
+          v-model="dragData"
+          :force-fallback="true"
+          :scroll="true"
+          v-bind="{
+            chosenClass: 'chosentag',
+          }"
+        >
+        <template #item="{ element, index }">
+            <nut-tag
+              @click="onClickTag"
+              class="tag-item"
+              closeable
+              @close="deleteItem(index)"
+            >
+              <span>{{
+                element.value
+              }}
+              </span>
+            </nut-tag>
+          </template>
+      </draggable>
+    </div>
+    <div class="input-wrapper">
+      <nut-input
+       class="custom-input"
+        label=""
+        :placeholder="
+          $t(`editorPage.subConfig.nodeActions['${type}'].field.placeholder`)
+        "
+        v-model="input"
+      />
+      <font-awesome-icon @click="addItem" icon="fa-solid fa-location-arrow" />
+    </div>
     <p class="des-label">
       {{ $t(`editorPage.subConfig.nodeActions['${type}'].action.des`) }}
     </p>
@@ -59,8 +98,12 @@
 </template>
 
 <script lang="ts" setup>
-  import { inject, onMounted, watch, reactive, toRaw } from 'vue';
-
+  import { useI18n } from 'vue-i18n';
+  import { Dialog } from '@nutui/nutui';
+  import { inject, onMounted, watch, reactive, toRaw, ref, computed } from 'vue';
+  import draggable from "vuedraggable";
+  const { t } = useI18n();
+  const input = ref('');
   const { type, id } = defineProps<{
     type: string;
     id: string;
@@ -76,8 +119,61 @@
     position: '',
     template: '',
     link: '',
+    field: [],
   });
+  const dragData = computed({
+    get() {
+      return Array.isArray(value.field) ? value.field.map((item, index) => ({
+        id: index + JSON.stringify(item),
+        value: item,
+      })) : []
+    },
+    set(val) {
+      val.map((item, index) => {
+        value.field[index] = item.value
+      })
+    }
+  })
+const onClickTag = el => {
+    const index = [...el.currentTarget.parentElement.children].indexOf(
+      el.currentTarget
+    );
+    if (input.value ) {
+      Dialog({
+        title: t('editorPage.subConfig.pop.clickTag.title'),
+        content: t('editorPage.subConfig.pop.clickTag.content'),
+        popClass: 'auto-dialog',
+        okText: t(`editorPage.subConfig.pop.clickTag.confirm`),
+        cancelText: t(`editorPage.subConfig.pop.clickTag.cancel`),
+        onOk: () => editTag(index),
+        // onCancel: () => resolve(false),
+        // @ts-ignore
+        closeOnClickOverlay: true,
+      });
+    } else {
+      editTag(index);
+    }
+  };
+
+  const editTag = index => {
+    const oldValue = value.field[index];
+
+    value.field.splice(index, 1);
+
+    input.value = oldValue;
+  };
+
+  const deleteItem = index => {
+    value.field.splice(index, 1);
+  };
 
+  const addItem = () => {
+    if (!input.value) return;
+
+      value.field.push(input.value);
+
+    input.value = ''
+  };
   // 挂载时将 value 值指针指向 form 对应的数据
   onMounted(() => {
     const item = form.process.find(item => item.id === id);
@@ -86,6 +182,7 @@
       value.position = item.args.position;
       value.template = item.args.template;
       value.link = item.args.link;
+      value.field = item.args.field || ['name'];
     }
   });
 
@@ -124,4 +221,62 @@
       color: var(--second-text-color);
     }
   }
+
+  .tag-wrapper {
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    margin-bottom: 12px;
+    max-width: 100%;
+    cursor: pointer;
+
+    &:active {
+      cursor: grabbing;
+      cursor: -moz-grabbing;
+      cursor: -webkit-grabbing;
+    }
+
+    .tag-item {
+      max-width: 100%;
+      margin-right: 8px;
+      margin-bottom: 8px;
+
+      span {
+        max-width: 95%;
+        min-width: 20px;
+        display: -webkit-box;
+        white-space: normal !important;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        word-wrap: break-word;
+        -webkit-line-clamp: 3;
+        -webkit-box-orient: vertical;
+      }
+    }
+  }
+
+  .chosentag {
+    box-shadow: 0 0 5px var(--primary-color);
+    overflow: hidden;
+  }
+
+  .input-wrapper {
+    display: flex;
+    align-items: center;
+
+    > view.nut-input {
+      background: transparent;
+      padding: 8px 12px;
+      margin-right: 16px;
+    }
+
+    > svg {
+      width: 20px;
+      height: 20px;
+      color: var(--primary-color);
+      flex: 1;
+      padding-right: 12px;
+    }
+  }
 </style>
diff --git a/src/views/editor/components/Script.vue b/src/views/editor/components/Script.vue
index dbfd03453..d31492cea 100644
--- a/src/views/editor/components/Script.vue
+++ b/src/views/editor/components/Script.vue
@@ -326,40 +326,9 @@ const handleLinkValueChange = () => {
     }
   }
 };
-
-let placeholders =
-  sourceType !== "file"
-    ? t(`// Example:
-// Script Operator
-// 1. backend version(>2.14.88):
-$server.name = 'prefix-' + $server.name
-$server.ecn = true
-$server['test-url'] = 'http://1.0.0.1/generate_204'
-// 2. operator function
-function operator(proxies, targetPlatform, context) {
-  return proxies.map( proxy => {
-    // Change proxy information here
-
-    return proxy;
-  });
-}
-
-// Script Filter
-// 1. backend version(>2.14.119):
-const port = Number($server.port)
-return [80].includes(port)
-
-// 2. filter function
-function filter(proxies, targetPlatform) {
-  return proxies.map( proxy => {
-    // Return true if the current proxy is selected
-
-    return true;
-  });
-}
-`)
-    : t(`// Example:
-// backend version(>2.14.148):
+let placeholders
+if(sourceType === "file") {
+  placeholders = `// Example:
 // $files: ['0', '1']
 // $content: '0\\n1'
 
@@ -396,13 +365,63 @@ let clashMetaProxies = await produceArtifact({
 // yaml.proxies.unshift(...clashMetaProxies)
 // $content = ProxyUtils.yaml.dump(yaml)
 
+// https://clashparty.org/docs/guide/urlscheme#profile-update-interval
+// if ($options){
+//   $options._res = {
+//     headers: {
+//       'profile-update-interval': 24
+//     }
+//   }
+// } 
+
+
 // JSON
 $content = JSON.stringify({}, null, 2)
 
 // { $content, $files, $options } will be passed to the next operator
 // $content is the final content of the file
-`);
+`
+} else if (type === 'Script Operator') {
+  placeholders = `// Example:
+// Script Operator
+// 1. shortcut script
+$server.name = 'prefix-' + $server.name
+$server.ecn = true
+$server['test-url'] = 'http://1.0.0.1/generate_204'
+// 2. operator function
+function operator(proxies, targetPlatform, context) {
+  // if ($options) {
+  //   const { headers, url, path } = $options?._req || {}
+  //   const ua = headers?.['user-agent'] || headers?.['User-Agent']
+  //   console.log(ua)
+  //   $options._res = {
+  //     headers: {
+  //       'X-Custom': 'new',
+  //       'X-Powered-By': undefined, // removeHeader
+  //     }
+  //   }
+  // }
+  return proxies.map(proxy => {
+    // Change proxy information here
 
+    return proxy;
+  });
+}`
+} else {
+  placeholders = `// Script Filter
+// 1. shortcut script
+const port = Number($server.port)
+return [80].includes(port)
+
+// 2. filter function
+function filter(proxies, targetPlatform) {
+  return proxies.map( proxy => {
+    // Return true if the current proxy is selected
+
+    return true;
+  });
+}`
+}
 onMounted(() => {
   const item = form.process.find((item) => item.id === id);
   if (item) {
diff --git a/src/views/settings/AboutUs.vue b/src/views/settings/AboutUs.vue
index 0d8cf6a91..df74be242 100644
--- a/src/views/settings/AboutUs.vue
+++ b/src/views/settings/AboutUs.vue
@@ -6,21 +6,22 @@
         <nut-cell-group :title="$t(`aboutUsPage.projectInfo.title`)">
           <nut-cell
             class="cell-item"
-            :desc="$t(`aboutUsPage.projectInfo.link`)"
-            url="https://github.com/sub-store-org/Sub-Store-Front-End"
           >
             <template v-slot:title>
-              <span
-                >{{ $t(`aboutUsPage.projectInfo.fe`) }}
-                <b class="bclass">v{{ version }}</b></span
-              >
+              <span>
+                {{ $t(`aboutUsPage.projectInfo.fe`) }}
+                <b class="bclass">v{{ version }} </b>
+              </span>
+            </template>
+            <template v-slot:link>
+              <a target="_blank" href="https://github.com/sub-store-org/Sub-Store-Front-End">{{ $t(`aboutUsPage.projectInfo.link`)  }}</a>
+              &nbsp;&nbsp;
+              <a target="_blank" href="https://github.com/sub-store-org/Sub-Store-Front-End/releases">{{ $t(`aboutUsPage.changelogs.title`)  }}</a>
             </template>
           </nut-cell>
 
           <nut-cell
             class="cell-item"
-            :desc="$t(`aboutUsPage.projectInfo.link`)"
-            :url="env.backend === 'Node' ? 'https://github.com/sub-store-org/Sub-Store/releases' : 'https://github.com/sub-store-org/Sub-Store/tree/master/config'"
           >
             <template v-slot:title>
               <span
@@ -29,16 +30,36 @@
                 <b v-else class="bclass">v{{ env.version }}</b>
               </span>
             </template>
+            <template v-slot:link>
+              <a target="_blank" :href="env.backend === 'Node' ? 'https://github.com/sub-store-org/Sub-Store/releases' : 'https://github.com/sub-store-org/Sub-Store/tree/master/config'">{{ $t(`aboutUsPage.projectInfo.link`)  }}</a>
+              &nbsp;&nbsp;
+              <a target="_blank" href="https://github.com/sub-store-org/Sub-Store/releases">{{ $t(`aboutUsPage.changelogs.title`)  }}</a>
+            </template>
           </nut-cell>
 
           <nut-cell
             class="cell-item"
-            :desc="$t(`aboutUsPage.projectInfo.link`)"
-            url="https://github.com/sub-store-org"
           >
             <template v-slot:title>
               <span>{{ $t(`aboutUsPage.projectInfo.team`) }}</span>
             </template>
+            <template v-slot:link>
+              <a target="_blank" href="https://github.com/sub-store-org">{{ $t(`aboutUsPage.projectInfo.link`)  }}</a>
+              &nbsp;&nbsp;
+              <a target="_blank" href="https://t.me/cool_scripts">Telegram</a>
+            </template>
+          </nut-cell>
+          <nut-cell
+            class="cell-item"
+          >
+            <template v-slot:title>
+              <span>{{ $t(`aboutUsPage.projectInfo.scriptTutorial`) }}</span>
+            </template>
+            <template v-slot:link>
+              <a target="_blank" href="https://github.com/sub-store-org/Sub-Store/wiki">{{ $t(`aboutUsPage.projectInfo.link`)  }}</a>
+              &nbsp;&nbsp;
+              <a target="_blank" href="https://t.me/zhetengsha/214">Telegram</a>
+            </template>
           </nut-cell>
         </nut-cell-group>
 
@@ -81,44 +102,21 @@
       </div>
     </div>
 
-    <div class="changelog-wrapper">
-      <h1 class="block-title">{{ $t(`aboutUsPage.changelogs.title`) }}</h1>
-      <div class="block-content">
-        <nut-collapse
-          v-model:active="active"
-          icon="rect-right"
-          rotate="90"
-          accordion
-        >
-          <nut-collapse-item
-            v-for="changelog in changelogs"
-            :key="changelog.htmlContent"
-            :name="changelog.date.format('YYYY-MM-DD')"
-          >
-            <template #mTitle>
-              <h2 class="changelog-title">
-                {{ changelog.date.format('YYYY-MM-DD') }}
-              </h2>
-            </template>
-            <div class="changelog-content" v-html="changelog.htmlContent" />
-          </nut-collapse-item>
-        </nut-collapse>
-      </div>
-    </div>
+  
   </div>
 </template>
 
 <script lang="ts" setup>
   import { storeToRefs } from 'pinia';
   import { useGlobalStore } from '@/store/global';
-  import { useChangelogs } from '@/hooks/useChangelogs';
+  // import { useChangelogs } from '@/hooks/useChangelogs';
   import { ref } from 'vue';
 
   const globalStore = useGlobalStore();
   const { env } = storeToRefs(globalStore);
 
-  const changelogs = useChangelogs();
-  const active = ref(changelogs[0].date.format('YYYY-MM-DD'));
+  // const changelogs = useChangelogs();
+  // const active = ref(changelogs[0].date.format('YYYY-MM-DD'));
 
   const version = import.meta.env.PACKAGE_VERSION
 </script>
@@ -137,6 +135,7 @@
     :deep(.nut-cell__value) {
       font-weight: normal;
       color: var(--primary-color);
+      cursor: pointer;
     }
 
     .bclass {
@@ -166,6 +165,10 @@
       margin: 0 var(--safe-area-side);
       border-radius: var(--item-card-radios);
       overflow: hidden;
+      a {
+        color: var(--primary-color);
+        font-weight: normal;
+      }
     }
 
     .about-wrapper {
diff --git a/src/views/settings/moreSetting.vue b/src/views/settings/moreSetting.vue
index ee84c430f..990adfa34 100644
--- a/src/views/settings/moreSetting.vue
+++ b/src/views/settings/moreSetting.vue
@@ -1,235 +1,152 @@
 <template>
   <div class="page-wrapper">
-    <p class="More-title">
+    <!-- <p class="More-title">
       {{ $t(`themeSettingPage.themeSettingTitle`) }}
-    </p>
+    </p> -->
 
     <nut-cell-group>
       <nut-cell :title="$t(`moreSettingPage.simple`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="SimpleSwitch"
-            size="mini"
-            @change="setSimpleMode"
-          />
+          <nut-switch class="my-switch" v-model="SimpleSwitch" size="mini" @change="setSimpleMode" />
         </template>
       </nut-cell>
       <nut-cell :title="$t(`moreSettingPage.isSimpleReicon`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awSimpleReicon"
-            size="mini"
-            @change="setSimpleReicon"
-          />
+          <nut-switch class="my-switch" v-model="awSimpleReicon" size="mini" @change="setSimpleReicon" />
         </template>
       </nut-cell>
-      <nut-cell
-        :title="$t(`moreSettingPage.isSimpleShowRemarks`)"
-        class="cell-item"
-      >
+      <nut-cell :title="$t(`moreSettingPage.isSimpleShowRemarks`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awSimpleShowRemark"
-            size="mini"
-            @change="setSimpleShowRemark"
-          />
+          <nut-switch class="my-switch" v-model="awSimpleShowRemark" size="mini" @change="setSimpleShowRemark" />
         </template>
       </nut-cell>
-      <nut-cell :title="$t(`moreSettingPage.islr`)" class="cell-item">
+    </nut-cell-group>
+    <nut-cell-group>
+      <nut-cell :title="$t(`moreSettingPage.isDefaultIcon`)" class="cell-item">
+        <template v-slot:link>
+          <nut-switch class="my-switch" v-model="awIsDefaultIcon" size="mini" @change="setIsDefaultIcon" />
+        </template>
+      </nut-cell>
+      <nut-cell :title="$t(`moreSettingPage.isShowIcon`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="LeftRight"
-            size="mini"
-            @change="setLeftRight"
-          />
+          <nut-switch class="my-switch" v-model="awIsShowIcon" size="mini" @change="setIsShowIcon" />
         </template>
       </nut-cell>
+    </nut-cell-group>
+    <nut-cell-group>
 
-      <nut-cell :title="$t(`moreSettingPage.isDefaultIcon`)" class="cell-item">
+      <nut-cell :title="$t(`moreSettingPage.islr`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awIsDefaultIcon"
-            size="mini"
-            @change="setIsDefaultIcon"
-          />
+          <nut-switch class="my-switch" v-model="LeftRight" size="mini" @change="setLeftRight" />
         </template>
       </nut-cell>
-      <nut-cell :title="$t(`moreSettingPage.isShowIcon`)" class="cell-item">
+
+
+      <nut-cell :title="$t(`moreSettingPage.isSubItemMenuFold`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awIsShowIcon"
-            size="mini"
-            @change="setIsShowIcon"
-          />
+          <nut-switch class="my-switch" v-model="awIsSubItemMenuFold" size="mini" @change="setIsSubItemMenuFold" />
         </template>
       </nut-cell>
-      <nut-cell
-        :title="$t(`moreSettingPage.isSubItemMenuFold`)"
-        class="cell-item"
-      >
+
+
+
+      <nut-cell class="cell-item" :title="$t(`moreSettingPage.subProgress.title`)" :desc="subProgressStyleName"
+        @click="()=>{showSubProgressPicker=true}" is-link>
+      </nut-cell>
+      <nut-picker v-model="subProgressStyleValue" v-model:visible="showSubProgressPicker" :columns="[
+        { text: $t(`moreSettingPage.subProgress.hidden`), value: 'hidden' },
+        { text: $t(`moreSettingPage.subProgress.background`), value: 'background' }
+      ]" :title="$t(`moreSettingPage.subProgress.title`)" @confirm="subProgressStyleConfirm">
+      </nut-picker>
+
+
+      <nut-cell :title="$t(`moreSettingPage.displayPreviewInWebPage`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awIsSubItemMenuFold"
-            size="mini"
-            @change="setIsSubItemMenuFold"
-          />
+          <nut-switch class="my-switch" v-model="awDisplayPreviewInWebPage" size="mini"
+            @change="setDisplayPreviewInWebPage" />
         </template>
       </nut-cell>
       <nut-cell :title="$t(`moreSettingPage.isEditorCommon`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awEditorCommon"
-            size="mini"
-            @change="setEditorCommon"
-          />
+          <nut-switch class="my-switch" v-model="awEditorCommon" size="mini" @change="setEditorCommon" />
         </template>
       </nut-cell>
+    </nut-cell-group>
 
-      <nut-cell :title="$t(`moreSettingPage.showFloatingRefreshButton`)" class="cell-item">
+    <nut-cell-group v-if="shareBtnVisible">
+      <nut-cell :title="$t(`moreSettingPage.invalidShareFakeNode`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awShowFloatingRefreshButton"
-            size="mini"
-            @change="setShowFloatingRefreshButton"
-          />
+          <nut-switch class="my-switch" v-model="invalidShareFakeNode" size="mini"
+            @change="setInvalidShareFakeNode" />
         </template>
       </nut-cell>
-      <nut-cell :title="$t(`moreSettingPage.showFloatingAddButton`)" class="cell-item">
+    </nut-cell-group>
+
+    <nut-cell-group>
+      <nut-cell :title="$t(`moreSettingPage.showFloatingRefreshButton`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awShowFloatingAddButton"
-            size="mini"
-            @change="setShowFloatingAddButton"
-          />
+          <nut-switch class="my-switch" v-model="awShowFloatingRefreshButton" size="mini"
+            @change="setShowFloatingRefreshButton" />
         </template>
       </nut-cell>
-      <nut-cell :title="$t(`moreSettingPage.displayPreviewInWebPage`)" class="cell-item">
+      <nut-cell :title="$t(`moreSettingPage.showFloatingAddButton`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awDisplayPreviewInWebPage"
-            size="mini"
-            @change="setDisplayPreviewInWebPage"
-          />
+          <nut-switch class="my-switch" v-model="awShowFloatingAddButton" size="mini"
+            @change="setShowFloatingAddButton" />
         </template>
       </nut-cell>
-
       <nut-cell :title="$t(`moreSettingPage.tabBar2`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awtabBar2"
-            size="mini"
-            @change="settabBar2"
-          />
+          <nut-switch class="my-switch" v-model="awtabBar2" size="mini" @change="settabBar2" />
         </template>
       </nut-cell>
       <nut-cell :title="$t(`moreSettingPage.tabBar`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="awtabBar"
-            size="mini"
-            @change="settabBar"
-          />
+          <nut-switch class="my-switch" v-model="awtabBar" size="mini" @change="settabBar" />
         </template>
       </nut-cell>
-      <nut-cell
-          class="cell-item"
-          :title="$t(`moreSettingPage.subProgress.title`)"
-          :desc="subProgressStyleName"
-          @click="()=>{showSubProgressPicker=true}"
-          is-link
-        >
+    </nut-cell-group>
+    <nut-cell-group>
+      <nut-cell class="cell-item" :title="$t(`moreSettingPage.gistUpload.title`)" :desc="gistUploadName"
+        @click="()=>{showGistUploadPicker=true}" is-link>
       </nut-cell>
-      <nut-picker
-        v-model="subProgressStyleValue"
-        v-model:visible="showSubProgressPicker"
-        :columns="[
-        { text: $t(`moreSettingPage.subProgress.hidden`), value: 'hidden' },
-        { text: $t(`moreSettingPage.subProgress.background`), value: 'background' }
-      ]"
-        :title="$t(`moreSettingPage.subProgress.title`)"
-        @confirm="subProgressStyleConfirm"
-      >
+      <nut-picker v-model="gistUploadValue" v-model:visible="showGistUploadPicker" :columns="[
+        { text: $t(`moreSettingPage.gistUpload.base64`), value: 'base64' },
+        { text: $t(`moreSettingPage.gistUpload.plaintext`), value: 'plaintext' }
+      ]" :title="$t(`moreSettingPage.gistUpload.title`)" @confirm="gistUploadConfirm">
       </nut-picker>
     </nut-cell-group>
 
     <nut-cell-group>
       <nut-cell :title="$t(`themeSettingPage.auto`)" class="cell-item">
         <template v-slot:link>
-          <nut-switch
-            class="my-switch"
-            v-model="autoSwitch"
-            size="mini"
-            @change="autoSwitchIsChange"
-          />
+          <nut-switch class="my-switch" v-model="autoSwitch" size="mini" @change="autoSwitchIsChange" />
         </template>
       </nut-cell>
 
       <template v-if="theme.auto">
-        <nut-cell
-          class="cell-item"
-          :title="$t(`themeSettingPage.dark`)"
-          :desc="themeDes.darkDes"
-          @click="openPicker('dark')"
-          is-link
-        >
+        <nut-cell class="cell-item" :title="$t(`themeSettingPage.dark`)" :desc="themeDes.darkDes"
+          @click="openPicker('dark')" is-link>
         </nut-cell>
 
-        <nut-cell
-          class="cell-item"
-          :title="$t(`themeSettingPage.light`)"
-          :desc="themeDes.lightDes"
-          @click="openPicker('light')"
-          is-link
-        >
+        <nut-cell class="cell-item" :title="$t(`themeSettingPage.light`)" :desc="themeDes.lightDes"
+          @click="openPicker('light')" is-link>
         </nut-cell>
       </template>
 
-      <nut-cell
-        v-else
-        class="cell-item"
-        :title="$t(`themeSettingPage.themeSettingTitle`)"
-        :desc="themeDes.nameDes"
-        @click="openPicker('name')"
-        is-link
-      />
+      <nut-cell v-else class="cell-item" :title="$t(`themeSettingPage.themeSettingTitle`)" :desc="themeDes.nameDes"
+        @click="openPicker('name')" is-link />
     </nut-cell-group>
-    <nut-picker
-      v-model="selectedValue"
-      v-model:visible="showThemePicker"
-      :columns="pickerColumn"
-      :title="$t(`themeSettingPage.themePicker.title`)"
-      :cancel-text="$t(`themeSettingPage.themePicker.cancel`)"
-      :ok-text="$t(`themeSettingPage.themePicker.confirm`)"
-      @confirm="confirm"
-    />
+    <nut-picker v-model="selectedValue" v-model:visible="showThemePicker" :columns="pickerColumn"
+      :title="$t(`themeSettingPage.themePicker.title`)" :cancel-text="$t(`themeSettingPage.themePicker.cancel`)"
+      :ok-text="$t(`themeSettingPage.themePicker.confirm`)" @confirm="confirm" />
     <nut-cell-group>
-      <nut-cell
-          :title="$t(`moreSettingPage.clearFrontEndData.label`)"
-          class="change-themes"
-          @click.stop="clearFrontEndData"
-          is-link
-        ></nut-cell>
-      <nut-cell
-          :title="$t(`moreSettingPage.clearData.label`)"
-          class="change-themes"
-          @click.stop="clearData"
-          is-link
-        ></nut-cell>
+      <nut-cell :title="$t(`moreSettingPage.clearFrontEndData.label`)" class="change-themes"
+        @click.stop="clearFrontEndData" is-link></nut-cell>
+      <nut-cell :title="$t(`moreSettingPage.clearData.label`)" class="change-themes" @click.stop="clearData"
+        is-link></nut-cell>
     </nut-cell-group>
-  
+
   </div>
 </template>
 
@@ -245,6 +162,7 @@
   import { useI18n } from 'vue-i18n';
   import { useAppNotifyStore } from "@/store/appNotify";
   import { useSettingsApi } from "@/api/settings";
+  import { useBackend } from "@/hooks/useBackend";
   // import { Dialog } from '@nutui/nutui';
 
   const { t } = useI18n();
@@ -265,10 +183,10 @@
     // subProgressStyle,
   } = storeToRefs(globalStore);
   // 外观设置
-  const { changeAppearanceSetting } = settingsStore;
-  const { appearanceSetting } = storeToRefs(settingsStore);
+  const { changeAppearanceSetting, changeSettings } = settingsStore;
+  const { appearanceSetting, gistUpload } = storeToRefs(settingsStore);
   const { showNotify } = useAppNotifyStore();
-
+  const { icon, env } = useBackend();
   const InputHostApi = ref('');
   const autoSwitchSync = ref(false);
   const SimpleSwitch = ref(false);
@@ -282,18 +200,22 @@
   const awShowFloatingRefreshButton = ref(false);
   const awShowFloatingAddButton = ref(true);
   const awDisplayPreviewInWebPage = ref(true);
+  const invalidShareFakeNode = ref(false);
   const awtabBar = ref(true);
   const awtabBar2 = ref(true);
   // const isEditing = ref(false);
   const isInit = ref(false);
   const subProgressStyleValue = ref(['hidden']);
+  const gistUploadValue = ref(['base64']);
 
   const pickerType = ref('');
   const autoSwitch = ref(false);
   const showThemePicker = ref(false);
   // const isEditLoading = ref(false);
   const showSubProgressPicker = ref(false);
-
+  const shareBtnVisible = computed(() => {
+    return env.value?.feature?.share;
+  });
   const subProgressStyleName = computed(() => {
     return t(`moreSettingPage.subProgress.${subProgressStyleValue.value}`)
   })
@@ -305,6 +227,16 @@
     }
     changeAppearanceSetting({ appearanceSetting: data });
   };
+  const showGistUploadPicker = ref(false);
+
+  const gistUploadName = computed(() => {
+    return t(`moreSettingPage.gistUpload.${gistUploadValue.value}`)
+  })
+  const gistUploadConfirm = ({ selectedValue }) => {
+    changeSettings({
+      gistUpload: selectedValue[0]
+    });
+  };
   const setSimpleMode = (isSimpleMode: boolean) => {
     // globalStore.setSimpleMode(isSimpleMode);
     const data = {
@@ -401,6 +333,13 @@
     }
     changeAppearanceSetting({ appearanceSetting: data });
   };
+  const setInvalidShareFakeNode = (invalidShareFakeNode: boolean) => {
+    const data = {
+      ...appearanceSetting.value,
+      invalidShareFakeNode: invalidShareFakeNode
+    }
+    changeAppearanceSetting({ appearanceSetting: data });
+  };
   const settabBar = (istabBar: boolean) => {
     // globalStore.settabBar(istabBar);
     const data = {
@@ -607,9 +546,11 @@
     awShowFloatingRefreshButton.value = appearanceSetting.value.showFloatingRefreshButton;
     awShowFloatingAddButton.value = appearanceSetting.value.showFloatingAddButton;
     awDisplayPreviewInWebPage.value = appearanceSetting.value.displayPreviewInWebPage;
+    invalidShareFakeNode.value = appearanceSetting.value.invalidShareFakeNode;
     awtabBar.value = appearanceSetting.value.istabBar;
     awtabBar2.value = appearanceSetting.value.istabBar2;
     subProgressStyleValue.value = [appearanceSetting.value.subProgressStyle];
+    gistUploadValue.value = [gistUpload.value];
     // SimpleSwitch.value = isSimpleMode.value;
     // LeftRight.value = isLeftRight.value;
     // awIconColor.value = isIconColor.value;
diff --git a/src/views/share/SharePopup.vue b/src/views/share/SharePopup.vue
index 92efd0b0e..07fe29c95 100644
--- a/src/views/share/SharePopup.vue
+++ b/src/views/share/SharePopup.vue
@@ -229,9 +229,11 @@
                 input-align="left"
                 rows="3"
                 :autosize="{ maxHeight: 140 }"
+                readonly
               />
             </nut-form-item>
             <nut-form-item
+              v-if="isUpdateShare ? true : form.remark"
               :label="$t(`sharePage.createShare.remark.label`)"
               prop="remark"
             >
@@ -245,6 +247,7 @@
                 rows="1"
                 :autosize="{ maxHeight: 140 }"
                 max-length="100"
+                :readonly="!isUpdateShare"
               />
             </nut-form-item>
             <div v-if="shareUrlVisible" class="qrcode-wrapper">
@@ -391,6 +394,7 @@ watchEffect(() => {
     form.name = props.data?.name;
     form.displayName = props.data?.displayName;
     form.type = props.data?.type;
+    form.token = props.data?.token;
   } else {
     form.expiresValue = "";
     form.expiresUnit = "day";
@@ -511,6 +515,7 @@ const handleUpdateShare = async () => {
       console.log("form", form);
       console.log("props.data", props.data);
       isUpdateShare.value = true;
+      form.shareUrl = ''
     },
     onCancel: () => {
       console.log("取消");
@@ -550,6 +555,12 @@ const handleCreateShare = async () => {
   if (res?.data?.status === "success") {
     isCreateShareLinkSuccess.value = true;
     const { token } = res.data.data;
+    if (!secretPath.value.startsWith('/')) {
+      Toast.fail(t('sharePage.magicPathErrorNotify'));
+      throw new Error(
+        t("sharePage.magicPathErrorNotify"),
+      );
+    }
     const shareUrl = `${host.value.replace(new RegExp(`${secretPath.value}$`), "")}/share/${typeMap[form.type]}/${encodeURIComponent(
       props.data.name,
     )}?token=${encodeURIComponent(token)}`;
@@ -565,7 +576,7 @@ const handleCreateShare = async () => {
 };
 
 const confirmUpdateShare = async () => {
-  await subsStore.deleteShare(props.data?.token, false);
+  await subsStore.deleteShare(props.data?.token, props.data?.type, props.data?.name, false);
   await handleCreateShare();
 };