feat(ui): 抽屉删除 — modal 加 checkbox + 滑动到位直接弹 modal
1) 删除会话 modal 加「同时删除任务文件夹」勾选框,默认勾选
- HTML 复用现有 .del-dir 样式,加 #confirm-check-wrap #confirm-check
- confirmModal(title, text, okText, danger, opts) 新增 opts.checkbox 支持
勾选状态通过 state._confirmChecked 传出(不破坏现有调用方签名)
- deleteSession 调 confirmModal 时传 checkbox,确认后用 _confirmChecked 决定 ?delete_dir=true/false
2) 移动端右滑到位直接弹删除 modal,不再露大红钮
- onUp 滑到 60+ 直接调 deleteSession(item.dataset.id)
- 起手已 swiped + 右滑回去(moved>=60 但 dx>0):视为滑回去,弹回原位
- 删除大红钮 .conv-del 相关 DOM/CSS 全部清理
3) 桌面端 .conv-del-inline 行为不变(hover/focus 露出,点击弹 modal)
This commit is contained in:
@@ -453,34 +453,17 @@ footer { flex: none; padding: 8px 12px calc(10px + env(safe-area-inset-bottom, 0
|
|||||||
.conv-item .st-dot.queued { background: var(--active); }
|
.conv-item .st-dot.queued { background: var(--active); }
|
||||||
.conv-item .st-dot.active { background: #1c7a2e; animation: pill-pulse 1.2s ease-in-out infinite; }
|
.conv-item .st-dot.active { background: #1c7a2e; animation: pill-pulse 1.2s ease-in-out infinite; }
|
||||||
.conv-item .st-dot.held { background: #b8860b; }
|
.conv-item .st-dot.held { background: #b8860b; }
|
||||||
/* 会话行包装:负责裁剪 + 提供 conv-del 绝对定位的参照
|
/* 会话行包装:为桌面端 hover 的内联 × 提供定位;移动端不需要 swiped 类
|
||||||
conv-del(外层大红按钮)是 conv-item 的兄弟(不在 transform 子树内),
|
(滑到位直接弹 modal,不再保留 swiped 状态) */
|
||||||
这样 swiped 状态 transform:translateX(-60px) 不会一起带走删除按钮
|
|
||||||
conv-del-inline 是 conv-item 的子元素,仅桌面端 hover/focus-within 露出 */
|
|
||||||
.conv-wrap {
|
.conv-wrap {
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
}
|
}
|
||||||
.conv-item {
|
.conv-item {
|
||||||
position: relative;
|
position: relative;
|
||||||
transition: transform .18s ease, background .12s;
|
transition: background .12s;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
.conv-wrap.swiped .conv-item { transform: translateX(-60px); }
|
|
||||||
|
|
||||||
/* 移动端右滑用的大红钮:默认完全不渲染,swiped 才露 */
|
|
||||||
.conv-wrap .conv-del {
|
|
||||||
display: none;
|
|
||||||
position: absolute; right: 0; top: 0; bottom: 0;
|
|
||||||
width: 60px;
|
|
||||||
background: #c0392b; border: 0; color: #fff;
|
|
||||||
font-size: 18px; line-height: 1; padding: 0; cursor: pointer;
|
|
||||||
align-items: center; justify-content: center;
|
|
||||||
border-radius: 0 12px 12px 0;
|
|
||||||
}
|
|
||||||
.conv-wrap.swiped .conv-del { display: flex; }
|
|
||||||
.conv-wrap .conv-del:active { background: #a83224; }
|
|
||||||
|
|
||||||
/* 桌面端用的内联小 ×:默认隐藏,hover/focus 露出 */
|
/* 桌面端用的内联小 ×:默认隐藏,hover/focus 露出 */
|
||||||
.conv-item .conv-del-inline {
|
.conv-item .conv-del-inline {
|
||||||
|
|||||||
@@ -187,6 +187,7 @@
|
|||||||
<div class="modal">
|
<div class="modal">
|
||||||
<h3 id="confirm-title">请确认</h3>
|
<h3 id="confirm-title">请确认</h3>
|
||||||
<div class="modal-text" id="confirm-text"></div>
|
<div class="modal-text" id="confirm-text"></div>
|
||||||
|
<label class="del-dir hidden" id="confirm-check-wrap"><input type="checkbox" id="confirm-check"> <span id="confirm-check-label"></span></label>
|
||||||
<div class="btn-row">
|
<div class="btn-row">
|
||||||
<button class="ghost-btn" onclick="confirmClose(false)">取消</button>
|
<button class="ghost-btn" onclick="confirmClose(false)">取消</button>
|
||||||
<button class="primary-btn" id="confirm-ok-btn" onclick="confirmClose(true)">确定</button>
|
<button class="primary-btn" id="confirm-ok-btn" onclick="confirmClose(true)">确定</button>
|
||||||
@@ -681,7 +682,6 @@
|
|||||||
'<span class="conv-title">' + esc(s.title || s.id) + '</span>' + drawerStatusDot(s) +
|
'<span class="conv-title">' + esc(s.title || s.id) + '</span>' + drawerStatusDot(s) +
|
||||||
'<button class="conv-del-inline" type="button" aria-label="删除会话" title="删除会话">×</button>' +
|
'<button class="conv-del-inline" type="button" aria-label="删除会话" title="删除会话">×</button>' +
|
||||||
'</button>' +
|
'</button>' +
|
||||||
'<button class="conv-del" type="button" aria-label="删除会话" title="删除会话">×</button>' +
|
|
||||||
'</div>';
|
'</div>';
|
||||||
}
|
}
|
||||||
box.innerHTML = html;
|
box.innerHTML = html;
|
||||||
@@ -709,9 +709,11 @@
|
|||||||
// ---------- 会话打开 / 新建 / 状态栏(抽屉行 × 调 deleteSession; 默认含任务目录) ----------
|
// ---------- 会话打开 / 新建 / 状态栏(抽屉行 × 调 deleteSession; 默认含任务目录) ----------
|
||||||
async function deleteSession(id) {
|
async function deleteSession(id) {
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
if (!await confirmModal('删除会话', '确定删除会话 ' + id + ' ?会话中的任务文件也会一起删除。', '删除', true)) return;
|
if (!await confirmModal('删除会话', '确定删除会话 ' + id + ' ?', '删除', true,
|
||||||
|
{ checkbox: { label: '同时删除任务文件夹', default: true } })) return;
|
||||||
|
const delDir = state._confirmChecked ? 'true' : 'false';
|
||||||
try {
|
try {
|
||||||
await req('DELETE', '/api/sessions/' + id + '?delete_dir=true');
|
await req('DELETE', '/api/sessions/' + id + '?delete_dir=' + delDir);
|
||||||
// 删的是当前打开的会话:回 welcome 视图并清状态
|
// 删的是当前打开的会话:回 welcome 视图并清状态
|
||||||
if (state.sessionId === id) {
|
if (state.sessionId === id) {
|
||||||
closeStream();
|
closeStream();
|
||||||
@@ -1443,7 +1445,7 @@
|
|||||||
searchTimer = setTimeout(loadSessionList, 250);
|
searchTimer = setTimeout(loadSessionList, 250);
|
||||||
});
|
});
|
||||||
$('drawer-list').addEventListener('click', e => {
|
$('drawer-list').addEventListener('click', e => {
|
||||||
if (e.target.closest('.conv-del, .conv-del-inline')) {
|
if (e.target.closest('.conv-del-inline')) {
|
||||||
const wrap = e.target.closest('.conv-wrap');
|
const wrap = e.target.closest('.conv-wrap');
|
||||||
const item = wrap && wrap.querySelector('.conv-item');
|
const item = wrap && wrap.querySelector('.conv-item');
|
||||||
if (item) { deleteSession(item.dataset.id); collapseAllSwiped(); }
|
if (item) { deleteSession(item.dataset.id); collapseAllSwiped(); }
|
||||||
@@ -1512,11 +1514,22 @@
|
|||||||
g.item.style.transition = '';
|
g.item.style.transition = '';
|
||||||
if (g.horiz) {
|
if (g.horiz) {
|
||||||
if (moved >= THRESHOLD) {
|
if (moved >= THRESHOLD) {
|
||||||
g.wrap.classList.add('swiped');
|
// 起手已是已滑开态 + 右滑回去:不应该触发删除,直接恢复原状
|
||||||
g.item.style.transform = ''; // CSS 接管到 -60
|
if (g.wasSwiped && dx > 0) {
|
||||||
|
// 保持 swiped 状态(因为这是从 -60 滑回 -30 不到 0 的情况)
|
||||||
|
// 但本次手不是超阈值出去的,既然收回去就令弹回
|
||||||
|
g.wrap.classList.remove('swiped');
|
||||||
|
g.item.style.transform = '';
|
||||||
|
} else {
|
||||||
|
// 滑到位:不露 conv-del,直接弹删除确认 modal
|
||||||
|
g.wrap.classList.remove('swiped');
|
||||||
|
g.item.style.transform = '';
|
||||||
|
deleteSession(g.item.dataset.id);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// 未达阈值:弹回
|
||||||
g.wrap.classList.remove('swiped');
|
g.wrap.classList.remove('swiped');
|
||||||
g.item.style.transform = ''; // CSS 接管回 0
|
g.item.style.transform = '';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 未识别为横向:不动(交给 click 委派处理打开)
|
// 未识别为横向:不动(交给 click 委派处理打开)
|
||||||
@@ -1657,7 +1670,21 @@
|
|||||||
_dlgResolve = null;
|
_dlgResolve = null;
|
||||||
if (r) r(val);
|
if (r) r(val);
|
||||||
}
|
}
|
||||||
function confirmModal(title, text, okText, danger) {
|
// confirmModal(title, text, okText, danger, opts?)
|
||||||
|
// opts.checkbox = {label, default=true} 可选:展示一个默认勾选状态可改的复选框
|
||||||
|
// 确认/取消后在 state._confirmChecked 读出勾选状态(不破坏现有调用方签名)
|
||||||
|
function confirmModal(title, text, okText, danger, opts) {
|
||||||
|
state._confirmChecked = !!(opts && opts.checkbox); // 未传 opts 时 reset 为 false
|
||||||
|
const wrap = $('confirm-check-wrap');
|
||||||
|
if (opts && opts.checkbox) {
|
||||||
|
$('confirm-check-label').textContent = opts.checkbox.label;
|
||||||
|
$('confirm-check').checked = opts.checkbox.default !== false;
|
||||||
|
state._confirmChecked = $('confirm-check').checked;
|
||||||
|
wrap.classList.remove('hidden');
|
||||||
|
} else {
|
||||||
|
wrap.classList.add('hidden');
|
||||||
|
}
|
||||||
|
$('confirm-check').onchange = function () { state._confirmChecked = this.checked; };
|
||||||
return new Promise(resolve => {
|
return new Promise(resolve => {
|
||||||
_dlgResolve = resolve;
|
_dlgResolve = resolve;
|
||||||
$('confirm-title').textContent = title || '请确认';
|
$('confirm-title').textContent = title || '请确认';
|
||||||
|
|||||||
Reference in New Issue
Block a user