Skip to content

Commit 33b8dcc

Browse files
Dedicatus546Dedicatus546
committed
Merge branch 'dev'
2 parents 04fcaae + 47bdb9e commit 33b8dcc

123 files changed

Lines changed: 8537 additions & 5959 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc-auto-import.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"controlledComputed": true,
3030
"controlledRef": true,
3131
"createApp": true,
32+
"createDisposableDirective": true,
3233
"createEventHook": true,
3334
"createGlobalState": true,
3435
"createInjectionState": true,
@@ -109,7 +110,6 @@
109110
"refThrottled": true,
110111
"refWithControl": true,
111112
"resolveComponent": true,
112-
"resolveRef": true,
113113
"setActivePinia": true,
114114
"setMapStoreSuffix": true,
115115
"shallowReactive": true,

‎.github/workflows/dev.yml‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,45 +19,37 @@ jobs:
1919
- name: Set Up Node.js
2020
uses: actions/setup-node@v6
2121
with:
22-
node-version: 'latest'
23-
24-
- name: Enable Corepack
25-
run: corepack enable
26-
27-
- name: Cache Linux pnpm
28-
if: matrix.os == 'ubuntu-latest'
29-
uses: actions/cache@v5
30-
with:
31-
path: ~/.local/share/pnpm/store
32-
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
33-
restore-keys: |
34-
pnpm-${{ runner.os }}-
35-
36-
- name: Cache Windows pnpm
37-
if: matrix.os == 'windows-latest'
38-
uses: actions/cache@v5
39-
with:
40-
path: D:\.pnpm-store
41-
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
42-
restore-keys: |
43-
pnpm-${{ runner.os }}-
22+
node-version: '24.10.0'
23+
24+
- name: Git SSH fix
25+
run: |
26+
git config --global url."https://github.com/".insteadOf git@github.com:
27+
git config --global url."https://".insteadOf git://
28+
29+
- name: Install pnpm
30+
uses: pnpm/action-setup@v6
31+
with:
32+
cache: true
4433

4534
- name: Install Dependencies
4635
run: pnpm install
4736

37+
- name: Build Web
38+
run: pnpm run build:web
39+
4840
- name: Build Electron App
49-
run: pnpm run build:latest
41+
run: pnpm run build
5042

5143
- name: Upload Linux Artifacts
5244
if: matrix.os == 'ubuntu-latest'
5345
uses: actions/upload-artifact@v7
5446
with:
5547
name: linux-release-assets-${{ github.sha }}
56-
path: release/*/jm-desktop-Linux-*.zip
48+
path: release/make/zip/linux/x64/jm-desktop-*.zip
5749

5850
- name: Upload Windows Artifacts
5951
if: matrix.os == 'windows-latest'
6052
uses: actions/upload-artifact@v7
6153
with:
6254
name: windows-release-assets-${{ github.sha }}
63-
path: release/*/jm-desktop-Windows-*.zip
55+
path: release/make/zip/win32/x64/jm-desktop-*.zip

‎.github/workflows/latest.yml‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,37 @@ jobs:
2121
- name: Set Up Node.js
2222
uses: actions/setup-node@v6
2323
with:
24-
node-version: 'latest'
25-
26-
- name: Enable Corepack
27-
run: corepack enable
28-
29-
- name: Cache Linux pnpm
30-
if: matrix.os == 'ubuntu-latest'
31-
uses: actions/cache@v5
32-
with:
33-
path: ~/.local/share/pnpm/store
34-
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
35-
restore-keys: |
36-
pnpm-${{ runner.os }}-
37-
38-
- name: Cache Windows pnpm
39-
if: matrix.os == 'windows-latest'
40-
uses: actions/cache@v5
41-
with:
42-
path: D:\.pnpm-store
43-
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
44-
restore-keys: |
45-
pnpm-${{ runner.os }}-
24+
node-version: '24.10.0'
25+
26+
- name: Git SSH fix
27+
run: |
28+
git config --global url."https://github.com/".insteadOf git@github.com:
29+
git config --global url."https://".insteadOf git://
30+
31+
- name: Install pnpm
32+
uses: pnpm/action-setup@v6
33+
with:
34+
cache: true
4635

4736
- name: Install Dependencies
4837
run: pnpm install
4938

39+
- name: Build Web
40+
run: pnpm run build:web
41+
5042
- name: Build Electron App
51-
run: pnpm run build:latest
43+
run: pnpm run build
5244

5345
- name: Upload Linux Artifacts
5446
if: matrix.os == 'ubuntu-latest'
5547
uses: actions/upload-artifact@v7
5648
with:
5749
name: linux-release-assets-${{ github.sha }}
58-
path: release/*/jm-desktop-Linux-*.zip
50+
path: release/make/zip/linux/x64/jm-desktop-*.zip
5951

6052
- name: Upload Windows Artifacts
6153
if: matrix.os == 'windows-latest'
6254
uses: actions/upload-artifact@v7
6355
with:
6456
name: windows-release-assets-${{ github.sha }}
65-
path: release/*/jm-desktop-Windows-*.zip
57+
path: release/make/zip/win32/x64/jm-desktop-*.zip

‎.github/workflows/release.yml‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,31 @@ jobs:
2222
- name: Set Up Node.js
2323
uses: actions/setup-node@v6
2424
with:
25-
node-version: 'latest'
25+
node-version: '24.10.0'
26+
27+
- name: Git SSH fix
28+
run: |
29+
git config --global url."https://github.com/".insteadOf git@github.com:
30+
git config --global url."https://".insteadOf git://
31+
32+
- name: Install pnpm
33+
uses: pnpm/action-setup@v6
34+
with:
35+
cache: true
2636

27-
- name: Enable Corepack
28-
run: corepack enable
29-
30-
- name: Cache Linux pnpm
31-
if: matrix.os == 'ubuntu-latest'
32-
uses: actions/cache@v5
33-
with:
34-
path: ~/.local/share/pnpm/store
35-
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
36-
restore-keys: |
37-
pnpm-${{ runner.os }}-
38-
39-
- name: Cache Windows pnpm
40-
if: matrix.os == 'windows-latest'
41-
uses: actions/cache@v5
42-
with:
43-
path: D:\.pnpm-store
44-
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
45-
restore-keys: |
46-
pnpm-${{ runner.os }}-
37+
- name: Install Dependencies
38+
run: pnpm install
4739

4840
- name: Install Dependencies
4941
run: pnpm i
5042

43+
- name: Build Web
44+
run: pnpm run build:web
45+
5146
- name: Build Electron App
52-
env:
53-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
5447
run: pnpm run build
48+
49+
- name: Publish
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
52+
run: pnpm run publish

‎.npmrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
registry=https://registry.npmmirror.com/
22
electron_mirror=https://cdn.npmmirror.com/binaries/electron/
3-
electron_builder_binaries_mirror=https://npmmirror.com/mirrors/electron-builder-binaries/
3+
electron_builder_binaries_mirror=https://npmmirror.com/mirrors/electron-builder-binaries/
4+
node_gyp_github_url=https://npmmirror.com/mirrors/node-gyp/

‎.oxfmtrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3-
"ignorePatterns": [],
3+
"ignorePatterns": ["auto-imports.d.ts"],
44
"semi": false,
55
"singleQuote": true
66
}

‎.vscode/extensions.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"recommendations": [
33
"Vue.volar",
44
"editorconfig.editorconfig",
5-
"dbaeumer.vscode-eslint",
65
"antfu.unocss",
7-
"mhutchie.git-graph"
6+
"oxc.oxc-vscode"
87
]
98
}

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
- 如果窗口位于不同的显示器上，则当面积占比超过 50% 显示器被删除时，应该将窗口位置重置到可用显示器上
66
- 子评论回复
77
- 翻页滚动优化
8+
- 下载路径优化，在整体移动文件夹后，下载的 json 文件没有改变路径
9+
10+
# 2.1.4（未发布）
11+
12+
- 接口错误情况下显示重试按钮
13+
现在页面在出现网络错误后会出现重试 UI ，这样就不用使用 ctrl + r 来刷新了
14+
![](https://fastly.jsdelivr.net/gh/Dedicatus546/image@main/2026/05/12/20260512143314940.avif)
15+
- 设置页、登录页、签到页、关于页拆分为单独的窗口
16+
![](https://fastly.jsdelivr.net/gh/Dedicatus546/image@main/2026/06/09/20260609111709834.avif)
17+
- 升级了一些依赖
818

919
# 2.1.3
1020

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@
101101

102102
![](./readme-assets/启用代理.png)
103103

104-
并将 api 添加到你的代理规则中，V2rayN 默认的 v3 路由规则应该可以代理该域名，手动添加如下图
104+
并将 api 添加到你的代理规则中，V2rayN 默认的 v3 路由规则应该可以代理该域名，手动添加如下图：
105105

106106
![](./readme-assets/V2rayN添加代理.png)
107107

108108
### 高分辨率下字体过小
109109

110-
windows 百分百缩放设置下，请在设置中更改缩放等级，建议 2k 屏幕设置为 1.4 ， 4k 屏幕为 1.8 ，如下图
110+
windows 百分百缩放设置下，请在设置中更改缩放等级，建议 2k 屏幕设置为 1.4 ， 4k 屏幕为 1.8 ，如下图：
111111

112112
![](./readme-assets/设置缩放等级.png)
113113

114+
如果 2k 屏幕 windows 已是 125% 缩放，则使用 1.0 即可。
115+
114116
### 漫画跳转不正确
115117

116118
很大概率是接口过期了，请提 issue ，或者可以通过以下方式自己更新。

‎about.html‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<!-- <meta
7+
http-equiv="Content-Security-Policy"
8+
content="default-src * 'unsafe-inline', font-src * 'unsafe-inline'"
9+
/> -->
10+
<title>关于 - 禁漫❤天堂</title>
11+
</head>
12+
<body>
13+
<div id="root"></div>
14+
<script type="module" src="/src/modules/about/main.ts"></script>
15+
</body>
16+
</html>

0 commit comments

Comments
 (0)