From 6863ba871550832566e29488a6018e04410de2e9 Mon Sep 17 00:00:00 2001 From: Wjavan <219539974+Wjavan@users.noreply.github.com> Date: Sun, 15 Nov 2026 17:30:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(ctfile):=20=E5=8B=BE=E9=80=89=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E6=97=B6=E7=BB=99=E7=A9=BA=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=9B=9E=E9=80=80=E6=95=B4=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\344\270\213\350\275\275\345\212\251\346\211\213.user.js" | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" index eb6d932..fda8920 100644 --- "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" +++ "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" @@ -4424,11 +4424,10 @@ } let hit = items.filter(it => { let n = this._name(it); - return n && picked.some(t => t.indexOf(n) !== -1); + return n && picked.some(t => t === n || t.startsWith(n + ' ')); }); - // 页面上勾了但名字对不上时保留整页,别让面板变空 if (hit.length) items = hit; - else console.warn('[FerryLink] ctfile 勾选没对上文件名:', picked.slice(0, 3), items.map(it => this._name(it)).slice(0, 3)); + else if (items.length) return base.renderDownloadPanel([], this); if (!items.length) return base.renderErrorPanel('当前目录没有可取的文件,请先进入子文件夹', this); if (items.length >= 100) return base.renderErrorPanel('当前目录文件过多,请进入子文件夹后再试', this); let ids = items.map(it => this._fid(it)); From 5d57c937a4997afba3631d613a069fb60896e8db Mon Sep 17 00:00:00 2001 From: Wjavan <219539974+Wjavan@users.noreply.github.com> Date: Thu, 19 Nov 2026 20:13:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(ctfile):=20=E5=8B=BE=E9=80=89=E5=90=8D?= =?UTF-8?q?=E6=94=B9=E5=8F=96=E5=8B=BE=E9=80=89=E6=A1=86=E7=9A=84=20aria-l?= =?UTF-8?q?abel=EF=BC=8C=E5=8C=B9=E9=85=8D=E6=94=B9=E7=B2=BE=E7=A1=AE?= =?UTF-8?q?=E7=9B=B8=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0\213\350\275\275\345\212\251\346\211\213.user.js" | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" index fda8920..3a993a2 100644 --- "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" +++ "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" @@ -1187,6 +1187,7 @@ e.stopPropagation(); base.showSetting(); }); + doc.on('click', '.listener-dl-confirm', () => Swal.close()); doc.on('click', '.listener-dl-retry', async () => { const adapter = base._activeAdapter; if (!adapter) return; @@ -1452,12 +1453,12 @@ base._updateMainButton(); base._paintLinkCells(); }, - renderErrorPanel(errMsg, adapter) { + renderErrorPanel(errMsg, adapter, okText) { base._activeAdapter = adapter; base.panelFiles = []; Swal.fire({ title: '获取下载链接失败', - html: `
${base.esc(errMsg)}
`, + html: `
${base.esc(errMsg)}
${okText ? `` : ''}
`, allowOutsideClick: false, showCloseButton: true, showConfirmButton: false, width: 860, @@ -4424,10 +4425,10 @@ } let hit = items.filter(it => { let n = this._name(it); - return n && picked.some(t => t === n || t.startsWith(n + ' ')); + return n && picked.indexOf(n) !== -1; }); if (hit.length) items = hit; - else if (items.length) return base.renderDownloadPanel([], this); + else if (items.length) return base.renderErrorPanel('勾选的文件不在本页,或全是文件夹', this, '确认'); if (!items.length) return base.renderErrorPanel('当前目录没有可取的文件,请先进入子文件夹', this); if (items.length >= 100) return base.renderErrorPanel('当前目录文件过多,请进入子文件夹后再试', this); let ids = items.map(it => this._fid(it)); @@ -4595,6 +4596,8 @@ if (t && names.indexOf(t) === -1) names.push(t); }; $('input[type=checkbox], input[type=radio]').filter(function () { return this.checked; }).each(function () { + let n = $(this).attr('aria-label'); + if (n) { if (names.indexOf(n) === -1) names.push(n); return; } let row = $(this).closest('tr, li, [role=row], [class*=row], [class*=item], [class*=card]'); if (row.length) push(row[0]); }); From c6d528cc638fb1209409ecbfefa067bc27ff6c45 Mon Sep 17 00:00:00 2001 From: Wjavan <219539974+Wjavan@users.noreply.github.com> Date: Thu, 19 Nov 2026 22:24:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(ctfile):=20=E8=A1=A5=E5=9B=9E=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E5=A4=B1=E8=B4=A5=E6=97=A5=E5=BF=97=EF=BC=8C=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=96=87=E6=A1=88=E8=B5=B0=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...44\270\213\350\275\275\345\212\251\346\211\213.user.js" | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" index 3a993a2..b86394c 100644 --- "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" +++ "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" @@ -1458,7 +1458,7 @@ base.panelFiles = []; Swal.fire({ title: '获取下载链接失败', - html: `
${base.esc(errMsg)}
${okText ? `` : ''}
`, + html: `
${base.esc(errMsg)}
${okText ? `` : ''}
`, allowOutsideClick: false, showCloseButton: true, showConfirmButton: false, width: 860, @@ -4428,7 +4428,10 @@ return n && picked.indexOf(n) !== -1; }); if (hit.length) items = hit; - else if (items.length) return base.renderErrorPanel('勾选的文件不在本页,或全是文件夹', this, '确认'); + else if (items.length) { + console.warn('[FerryLink] ctfile 勾选没对上文件名:', picked.slice(0, 3), items.map(it => this._name(it)).slice(0, 3)); + return base.renderErrorPanel('勾选的文件不在本页,或全是文件夹', this, '确认'); + } if (!items.length) return base.renderErrorPanel('当前目录没有可取的文件,请先进入子文件夹', this); if (items.length >= 100) return base.renderErrorPanel('当前目录文件过多,请进入子文件夹后再试', this); let ids = items.map(it => this._fid(it)); From 7163d279a2a8c849e8440da07afb2178ae23b8ad Mon Sep 17 00:00:00 2001 From: Wjavan <219539974+Wjavan@users.noreply.github.com> Date: Thu, 19 Nov 2026 22:29:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"fix(ctfile):=20=E8=A1=A5=E5=9B=9E?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E5=A4=B1=E8=B4=A5=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E8=B5=B0=E8=BD=AC=E4=B9=89?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c6d528cc638fb1209409ecbfefa067bc27ff6c45. --- ...44\270\213\350\275\275\345\212\251\346\211\213.user.js" | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" index b86394c..3a993a2 100644 --- "a/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" +++ "b/\347\275\221\347\233\230\347\233\264\351\223\276\344\270\213\350\275\275\345\212\251\346\211\213.user.js" @@ -1458,7 +1458,7 @@ base.panelFiles = []; Swal.fire({ title: '获取下载链接失败', - html: `
${base.esc(errMsg)}
${okText ? `` : ''}
`, + html: `
${base.esc(errMsg)}
${okText ? `` : ''}
`, allowOutsideClick: false, showCloseButton: true, showConfirmButton: false, width: 860, @@ -4428,10 +4428,7 @@ return n && picked.indexOf(n) !== -1; }); if (hit.length) items = hit; - else if (items.length) { - console.warn('[FerryLink] ctfile 勾选没对上文件名:', picked.slice(0, 3), items.map(it => this._name(it)).slice(0, 3)); - return base.renderErrorPanel('勾选的文件不在本页,或全是文件夹', this, '确认'); - } + else if (items.length) return base.renderErrorPanel('勾选的文件不在本页,或全是文件夹', this, '确认'); if (!items.length) return base.renderErrorPanel('当前目录没有可取的文件,请先进入子文件夹', this); if (items.length >= 100) return base.renderErrorPanel('当前目录文件过多,请进入子文件夹后再试', this); let ids = items.map(it => this._fid(it));