feat(V0.2): 列表拖动修复 + 打卡项组内拖动排序
- 任务列表/看板拖动: 激活后用非 passive touchmove preventDefault 拦截浏览器滚动接管, 修复列表长按抬起后 pointercancel 导致无法真正拖动 - 打卡: 列表按周期分组展示(每天/每周/每月/每年), 长按拖动组内排序(上下落点指示), 新增 POST /checkin/habits/reorder 重写 sortOrder; 新建项排到末尾 - 打卡卡片加 touch-action/user-select 防长按误触; 拖动结束 350ms 内抑制点击余波
This commit is contained in:
jif2.zhang
+345
-328
@@ -1,328 +1,345 @@
|
|||||||
import { Router } from 'express'
|
import { Router } from 'express'
|
||||||
import { prisma } from '../db.js'
|
import { prisma } from '../db.js'
|
||||||
import { authRequired } from '../middleware.js'
|
import { authRequired } from '../middleware.js'
|
||||||
import {
|
import {
|
||||||
toDateStr, addDays, periodRange, periodDays, expectedPerDay,
|
toDateStr, addDays, periodRange, periodDays, expectedPerDay,
|
||||||
periodIsClosed, eachDay, PERIODS, PERIOD_LABEL,
|
periodIsClosed, eachDay, PERIODS, PERIOD_LABEL,
|
||||||
} from '../checkin/period.js'
|
} from '../checkin/period.js'
|
||||||
|
|
||||||
const router = Router()
|
const router = Router()
|
||||||
router.use(authRequired)
|
router.use(authRequired)
|
||||||
|
|
||||||
// 补打卡允许的回溯天数 (F-CK-10)
|
// 补打卡允许的回溯天数 (F-CK-10)
|
||||||
const BACKFILL_DAYS = 7
|
const BACKFILL_DAYS = 7
|
||||||
|
|
||||||
const DATE_RE = /^\d{4}-\d{2}-\d{2}$/
|
const DATE_RE = /^\d{4}-\d{2}-\d{2}$/
|
||||||
const MONTH_RE = /^\d{4}-\d{2}$/
|
const MONTH_RE = /^\d{4}-\d{2}$/
|
||||||
|
|
||||||
function normDate(v) {
|
function normDate(v) {
|
||||||
const s = String(v || '')
|
const s = String(v || '')
|
||||||
return DATE_RE.test(s) ? s : toDateStr()
|
return DATE_RE.test(s) ? s : toDateStr()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------- 统计辅助 ----------
|
// ---------- 统计辅助 ----------
|
||||||
|
|
||||||
// 记录 -> { habitId: { date: count } }
|
// 记录 -> { habitId: { date: count } }
|
||||||
function groupRecords(records) {
|
function groupRecords(records) {
|
||||||
const map = new Map()
|
const map = new Map()
|
||||||
for (const r of records) {
|
for (const r of records) {
|
||||||
if (!map.has(r.habitId)) map.set(r.habitId, new Map())
|
if (!map.has(r.habitId)) map.set(r.habitId, new Map())
|
||||||
const byDate = map.get(r.habitId)
|
const byDate = map.get(r.habitId)
|
||||||
byDate.set(r.date, (byDate.get(r.date) || 0) + 1)
|
byDate.set(r.date, (byDate.get(r.date) || 0) + 1)
|
||||||
}
|
}
|
||||||
return map
|
return map
|
||||||
}
|
}
|
||||||
|
|
||||||
function countInRange(byDate, start, end) {
|
function countInRange(byDate, start, end) {
|
||||||
let n = 0
|
let n = 0
|
||||||
eachDay(start, end, (d) => { n += byDate.get(d) || 0 })
|
eachDay(start, end, (d) => { n += byDate.get(d) || 0 })
|
||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
// 连续达标的周期数: 当前周期未结束且未达标 -> 跳过(不算断签), 不是中断
|
// 连续达标的周期数: 当前周期未结束且未达标 -> 跳过(不算断签), 不是中断
|
||||||
function computeStreak(habit, byDate, today) {
|
function computeStreak(habit, byDate, today) {
|
||||||
let cursor = today
|
let cursor = today
|
||||||
let streak = 0
|
let streak = 0
|
||||||
for (let i = 0; i < 400; i++) {
|
for (let i = 0; i < 400; i++) {
|
||||||
const { start } = periodRange(habit.period, cursor)
|
const { start } = periodRange(habit.period, cursor)
|
||||||
const done = countInRange(byDate, start, periodRange(habit.period, cursor).end)
|
const done = countInRange(byDate, start, periodRange(habit.period, cursor).end)
|
||||||
if (done >= habit.target) {
|
if (done >= habit.target) {
|
||||||
streak++
|
streak++
|
||||||
} else if (periodIsClosed(habit.period, cursor, today)) {
|
} else if (periodIsClosed(habit.period, cursor, today)) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
const prevEnd = addDays(start, -1)
|
const prevEnd = addDays(start, -1)
|
||||||
if (prevEnd < '1970-01-01') break
|
if (prevEnd < '1970-01-01') break
|
||||||
cursor = prevEnd
|
cursor = prevEnd
|
||||||
}
|
}
|
||||||
return streak
|
return streak
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadActiveHabits(userId) {
|
async function loadActiveHabits(userId) {
|
||||||
return prisma.habit.findMany({
|
return prisma.habit.findMany({
|
||||||
where: { userId, archived: false },
|
where: { userId, archived: false },
|
||||||
orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
|
orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 组装单个打卡项的展示态
|
// 组装单个打卡项的展示态
|
||||||
function buildItem(habit, byDate, date, today) {
|
function buildItem(habit, byDate, date, today) {
|
||||||
const { start, end } = periodRange(habit.period, date)
|
const { start, end } = periodRange(habit.period, date)
|
||||||
const done = countInRange(byDate, start, end)
|
const done = countInRange(byDate, start, end)
|
||||||
const target = Math.max(1, habit.target)
|
const target = Math.max(1, habit.target)
|
||||||
const onDate = byDate.get(date) || 0
|
const onDate = byDate.get(date) || 0
|
||||||
const expPerDay = expectedPerDay(habit.period, target, date)
|
const expPerDay = expectedPerDay(habit.period, target, date)
|
||||||
return {
|
return {
|
||||||
id: habit.id,
|
id: habit.id,
|
||||||
name: habit.name,
|
name: habit.name,
|
||||||
period: habit.period,
|
period: habit.period,
|
||||||
periodLabel: PERIOD_LABEL[habit.period] || '每天',
|
sortOrder: habit.sortOrder,
|
||||||
target,
|
periodLabel: PERIOD_LABEL[habit.period] || '每天',
|
||||||
color: habit.color,
|
target,
|
||||||
icon: habit.icon,
|
color: habit.color,
|
||||||
note: habit.note,
|
icon: habit.icon,
|
||||||
archived: habit.archived,
|
note: habit.note,
|
||||||
periodStart: start,
|
archived: habit.archived,
|
||||||
periodEnd: end,
|
periodStart: start,
|
||||||
periodDays: periodDays(habit.period, date),
|
periodEnd: end,
|
||||||
done,
|
periodDays: periodDays(habit.period, date),
|
||||||
remaining: Math.max(0, target - done),
|
done,
|
||||||
percent: Math.min(1, target > 0 ? done / target : 1),
|
remaining: Math.max(0, target - done),
|
||||||
completed: done >= target,
|
percent: Math.min(1, target > 0 ? done / target : 1),
|
||||||
over: Math.max(0, done - target),
|
completed: done >= target,
|
||||||
countOnDate: onDate,
|
over: Math.max(0, done - target),
|
||||||
expectedPerDay: expPerDay,
|
countOnDate: onDate,
|
||||||
dayDone: onDate >= expPerDay,
|
expectedPerDay: expPerDay,
|
||||||
streak: computeStreak(habit, byDate, today),
|
dayDone: onDate >= expPerDay,
|
||||||
}
|
streak: computeStreak(habit, byDate, today),
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// 拉取 [start, end] 内的打卡记录并分组
|
|
||||||
async function loadRecords(userId, habits, ranges) {
|
// 拉取 [start, end] 内的打卡记录并分组
|
||||||
let min = ranges[0]?.start
|
async function loadRecords(userId, habits, ranges) {
|
||||||
let max = ranges[0]?.end
|
let min = ranges[0]?.start
|
||||||
for (const r of ranges) {
|
let max = ranges[0]?.end
|
||||||
if (r.start < min) min = r.start
|
for (const r of ranges) {
|
||||||
if (r.end > max) max = r.end
|
if (r.start < min) min = r.start
|
||||||
}
|
if (r.end > max) max = r.end
|
||||||
if (!min || !max) return new Map()
|
}
|
||||||
const records = await prisma.checkIn.findMany({
|
if (!min || !max) return new Map()
|
||||||
where: { userId, habitId: { in: habits.map((h) => h.id) }, date: { gte: min, lte: max } },
|
const records = await prisma.checkIn.findMany({
|
||||||
select: { habitId: true, date: true },
|
where: { userId, habitId: { in: habits.map((h) => h.id) }, date: { gte: min, lte: max } },
|
||||||
})
|
select: { habitId: true, date: true },
|
||||||
return groupRecords(records)
|
})
|
||||||
}
|
return groupRecords(records)
|
||||||
|
}
|
||||||
// ---------- 打卡项 ----------
|
|
||||||
|
// ---------- 打卡项 ----------
|
||||||
// GET /api/checkin/habits?date=YYYY-MM-DD 今日(或指定日)待办 + 周期进度
|
|
||||||
router.get('/habits', async (req, res, next) => {
|
// GET /api/checkin/habits?date=YYYY-MM-DD 今日(或指定日)待办 + 周期进度
|
||||||
try {
|
router.get('/habits', async (req, res, next) => {
|
||||||
const userId = req.user.sub
|
try {
|
||||||
const today = toDateStr()
|
const userId = req.user.sub
|
||||||
const date = normDate(req.query.date)
|
const today = toDateStr()
|
||||||
const habits = await loadActiveHabits(userId)
|
const date = normDate(req.query.date)
|
||||||
const ranges = habits.map((h) => periodRange(h.period, date))
|
const habits = await loadActiveHabits(userId)
|
||||||
const grouped = await loadRecords(userId, habits, ranges.length ? ranges : [{ start: date, end: date }])
|
const ranges = habits.map((h) => periodRange(h.period, date))
|
||||||
const items = habits.map((h) => buildItem(h, grouped.get(h.id) || new Map(), date, today))
|
const grouped = await loadRecords(userId, habits, ranges.length ? ranges : [{ start: date, end: date }])
|
||||||
const doneCount = items.filter((i) => i.completed).length
|
const items = habits.map((h) => buildItem(h, grouped.get(h.id) || new Map(), date, today))
|
||||||
res.json({ today, date, items, summary: { total: items.length, done: doneCount } })
|
const doneCount = items.filter((i) => i.completed).length
|
||||||
} catch (e) { next(e) }
|
res.json({ today, date, items, summary: { total: items.length, done: doneCount } })
|
||||||
})
|
} catch (e) { next(e) }
|
||||||
|
})
|
||||||
// POST /api/checkin/habits 新建打卡项
|
|
||||||
router.post('/habits', async (req, res, next) => {
|
// POST /api/checkin/habits 新建打卡项
|
||||||
try {
|
router.post('/habits', async (req, res, next) => {
|
||||||
const userId = req.user.sub
|
try {
|
||||||
const { name, period = 'day', target = 1, color = '#1677ff', icon = '', note = '' } = req.body || {}
|
const userId = req.user.sub
|
||||||
const cleanName = String(name || '').trim()
|
const { name, period = 'day', target = 1, color = '#1677ff', icon = '', note = '' } = req.body || {}
|
||||||
if (!cleanName) return res.status(400).json({ error: '名称不能为空' })
|
const cleanName = String(name || '').trim()
|
||||||
if (cleanName.length > 20) return res.status(400).json({ error: '名称不能超过 20 个字' })
|
if (!cleanName) return res.status(400).json({ error: '名称不能为空' })
|
||||||
if (!PERIODS.includes(period)) return res.status(400).json({ error: '周期类型不合法' })
|
if (cleanName.length > 20) return res.status(400).json({ error: '名称不能超过 20 个字' })
|
||||||
const t = Math.floor(Number(target))
|
if (!PERIODS.includes(period)) return res.status(400).json({ error: '周期类型不合法' })
|
||||||
if (!Number.isFinite(t) || t < 1) return res.status(400).json({ error: '目标次数需为 ≥1 的整数' })
|
const t = Math.floor(Number(target))
|
||||||
const row = await prisma.habit.create({
|
if (!Number.isFinite(t) || t < 1) return res.status(400).json({ error: '目标次数需为 ≥1 的整数' })
|
||||||
data: { userId, name: cleanName, period, target: t, color: String(color), icon: String(icon), note: String(note || '') },
|
const last = await prisma.habit.findFirst({ where: { userId }, orderBy: { sortOrder: 'desc' }, select: { sortOrder: true } })
|
||||||
})
|
const row = await prisma.habit.create({
|
||||||
res.json({ item: row })
|
data: { userId, name: cleanName, period, target: t, color: String(color), icon: String(icon), note: String(note || ''), sortOrder: (last?.sortOrder ?? -1) + 1 },
|
||||||
} catch (e) { next(e) }
|
})
|
||||||
})
|
res.json({ item: row })
|
||||||
|
} catch (e) { next(e) }
|
||||||
// PUT /api/checkin/habits/:id 编辑
|
})
|
||||||
router.put('/habits/:id', async (req, res, next) => {
|
|
||||||
try {
|
// PUT /api/checkin/habits/:id 编辑
|
||||||
const userId = req.user.sub
|
router.put('/habits/:id', async (req, res, next) => {
|
||||||
const id = Number(req.params.id)
|
try {
|
||||||
const exist = await prisma.habit.findFirst({ where: { id, userId } })
|
const userId = req.user.sub
|
||||||
if (!exist) return res.status(404).json({ error: '打卡项不存在' })
|
const id = Number(req.params.id)
|
||||||
const { name, period, target, color, icon, note, archived, sortOrder } = req.body || {}
|
const exist = await prisma.habit.findFirst({ where: { id, userId } })
|
||||||
const data = {}
|
if (!exist) return res.status(404).json({ error: '打卡项不存在' })
|
||||||
if (name !== undefined) {
|
const { name, period, target, color, icon, note, archived, sortOrder } = req.body || {}
|
||||||
const n = String(name).trim()
|
const data = {}
|
||||||
if (!n) return res.status(400).json({ error: '名称不能为空' })
|
if (name !== undefined) {
|
||||||
if (n.length > 20) return res.status(400).json({ error: '名称不能超过 20 个字' })
|
const n = String(name).trim()
|
||||||
data.name = n
|
if (!n) return res.status(400).json({ error: '名称不能为空' })
|
||||||
}
|
if (n.length > 20) return res.status(400).json({ error: '名称不能超过 20 个字' })
|
||||||
if (period !== undefined) {
|
data.name = n
|
||||||
if (!PERIODS.includes(period)) return res.status(400).json({ error: '周期类型不合法' })
|
}
|
||||||
data.period = period
|
if (period !== undefined) {
|
||||||
}
|
if (!PERIODS.includes(period)) return res.status(400).json({ error: '周期类型不合法' })
|
||||||
if (target !== undefined) {
|
data.period = period
|
||||||
const t = Math.floor(Number(target))
|
}
|
||||||
if (!Number.isFinite(t) || t < 1) return res.status(400).json({ error: '目标次数需为 ≥1 的整数' })
|
if (target !== undefined) {
|
||||||
data.target = t
|
const t = Math.floor(Number(target))
|
||||||
}
|
if (!Number.isFinite(t) || t < 1) return res.status(400).json({ error: '目标次数需为 ≥1 的整数' })
|
||||||
if (color !== undefined) data.color = String(color)
|
data.target = t
|
||||||
if (icon !== undefined) data.icon = String(icon)
|
}
|
||||||
if (note !== undefined) data.note = String(note)
|
if (color !== undefined) data.color = String(color)
|
||||||
if (archived !== undefined) data.archived = !!archived
|
if (icon !== undefined) data.icon = String(icon)
|
||||||
if (sortOrder !== undefined) data.sortOrder = Number(sortOrder) || 0
|
if (note !== undefined) data.note = String(note)
|
||||||
const row = await prisma.habit.update({ where: { id }, data })
|
if (archived !== undefined) data.archived = !!archived
|
||||||
res.json({ item: row })
|
if (sortOrder !== undefined) data.sortOrder = Number(sortOrder) || 0
|
||||||
} catch (e) { next(e) }
|
const row = await prisma.habit.update({ where: { id }, data })
|
||||||
})
|
res.json({ item: row })
|
||||||
|
} catch (e) { next(e) }
|
||||||
// DELETE /api/checkin/habits/:id?hard=1 默认归档(保留历史), hard=1 物理删除
|
})
|
||||||
router.delete('/habits/:id', async (req, res, next) => {
|
|
||||||
try {
|
// POST /api/checkin/habits/reorder { ids: [习惯id 的新顺序] } 按数组下标重写 sortOrder
|
||||||
const userId = req.user.sub
|
router.post('/habits/reorder', async (req, res, next) => {
|
||||||
const id = Number(req.params.id)
|
try {
|
||||||
const exist = await prisma.habit.findFirst({ where: { id, userId } })
|
const userId = req.user.sub
|
||||||
if (!exist) return res.status(404).json({ error: '打卡项不存在' })
|
const ids = Array.isArray((req.body || {}).ids) ? req.body.ids.map(Number).filter(Number.isFinite) : []
|
||||||
if (req.query.hard === '1') {
|
if (!ids.length) return res.status(400).json({ error: 'ids 不能为空' })
|
||||||
await prisma.checkIn.deleteMany({ where: { habitId: id } })
|
const habits = await prisma.habit.findMany({ where: { userId, id: { in: ids } } })
|
||||||
await prisma.habit.delete({ where: { id } })
|
if (habits.length !== new Set(ids).size) return res.status(400).json({ error: '包含无效的打卡项' })
|
||||||
return res.json({ ok: true, removed: true })
|
await prisma.$transaction(
|
||||||
}
|
ids.map((id, i) => prisma.habit.update({ where: { id }, data: { sortOrder: i } })),
|
||||||
const row = await prisma.habit.update({ where: { id }, data: { archived: true } })
|
)
|
||||||
res.json({ ok: true, removed: false, item: row })
|
res.json({ ok: true })
|
||||||
} catch (e) { next(e) }
|
} catch (e) { next(e) }
|
||||||
})
|
})
|
||||||
|
|
||||||
// ---------- 打卡 / 撤销 ----------
|
// DELETE /api/checkin/habits/:id?hard=1 默认归档(保留历史), hard=1 物理删除
|
||||||
|
router.delete('/habits/:id', async (req, res, next) => {
|
||||||
// POST /api/checkin/habits/:id/check { date?, note? } 打一次卡
|
try {
|
||||||
router.post('/habits/:id/check', async (req, res, next) => {
|
const userId = req.user.sub
|
||||||
try {
|
const id = Number(req.params.id)
|
||||||
const userId = req.user.sub
|
const exist = await prisma.habit.findFirst({ where: { id, userId } })
|
||||||
const id = Number(req.params.id)
|
if (!exist) return res.status(404).json({ error: '打卡项不存在' })
|
||||||
const habit = await prisma.habit.findFirst({ where: { id, userId } })
|
if (req.query.hard === '1') {
|
||||||
if (!habit) return res.status(404).json({ error: '打卡项不存在' })
|
await prisma.checkIn.deleteMany({ where: { habitId: id } })
|
||||||
const today = toDateStr()
|
await prisma.habit.delete({ where: { id } })
|
||||||
const date = normDate((req.body || {}).date)
|
return res.json({ ok: true, removed: true })
|
||||||
if (date > today) return res.status(400).json({ error: '不能为未来日期打卡' })
|
}
|
||||||
if (date < addDays(today, -BACKFILL_DAYS)) {
|
const row = await prisma.habit.update({ where: { id }, data: { archived: true } })
|
||||||
return res.status(400).json({ error: `最多只能补打最近 ${BACKFILL_DAYS} 天` })
|
res.json({ ok: true, removed: false, item: row })
|
||||||
}
|
} catch (e) { next(e) }
|
||||||
const dayRecords = await prisma.checkIn.findMany({ where: { habitId: id, date }, select: { seq: true } })
|
})
|
||||||
const seq = dayRecords.reduce((m, r) => Math.max(m, r.seq), 0) + 1
|
|
||||||
const note = String((req.body || {}).note || '').slice(0, 200)
|
// ---------- 打卡 / 撤销 ----------
|
||||||
await prisma.checkIn.create({
|
|
||||||
data: { habitId: id, userId, date, seq, note, source: date === today ? 'user' : 'backfill' },
|
// POST /api/checkin/habits/:id/check { date?, note? } 打一次卡
|
||||||
})
|
router.post('/habits/:id/check', async (req, res, next) => {
|
||||||
const grouped = await loadRecords(userId, [habit], [periodRange(habit.period, date)])
|
try {
|
||||||
res.json({ item: buildItem(habit, grouped.get(habit.id) || new Map(), date, today), date })
|
const userId = req.user.sub
|
||||||
} catch (e) {
|
const id = Number(req.params.id)
|
||||||
// 唯一约束冲突 = 并发重复提交, 视为已打卡
|
const habit = await prisma.habit.findFirst({ where: { id, userId } })
|
||||||
if (e && e.code === 'P2002') return res.status(409).json({ error: '该次打卡已记录' })
|
if (!habit) return res.status(404).json({ error: '打卡项不存在' })
|
||||||
next(e)
|
const today = toDateStr()
|
||||||
}
|
const date = normDate((req.body || {}).date)
|
||||||
})
|
if (date > today) return res.status(400).json({ error: '不能为未来日期打卡' })
|
||||||
|
if (date < addDays(today, -BACKFILL_DAYS)) {
|
||||||
// DELETE /api/checkin/habits/:id/check?date= 撤销本周期内最近一次打卡
|
return res.status(400).json({ error: `最多只能补打最近 ${BACKFILL_DAYS} 天` })
|
||||||
router.delete('/habits/:id/check', async (req, res, next) => {
|
}
|
||||||
try {
|
const dayRecords = await prisma.checkIn.findMany({ where: { habitId: id, date }, select: { seq: true } })
|
||||||
const userId = req.user.sub
|
const seq = dayRecords.reduce((m, r) => Math.max(m, r.seq), 0) + 1
|
||||||
const id = Number(req.params.id)
|
const note = String((req.body || {}).note || '').slice(0, 200)
|
||||||
const habit = await prisma.habit.findFirst({ where: { id, userId } })
|
await prisma.checkIn.create({
|
||||||
if (!habit) return res.status(404).json({ error: '打卡项不存在' })
|
data: { habitId: id, userId, date, seq, note, source: date === today ? 'user' : 'backfill' },
|
||||||
const today = toDateStr()
|
})
|
||||||
const date = normDate(req.query.date)
|
const grouped = await loadRecords(userId, [habit], [periodRange(habit.period, date)])
|
||||||
const { start, end } = periodRange(habit.period, date)
|
res.json({ item: buildItem(habit, grouped.get(habit.id) || new Map(), date, today), date })
|
||||||
const last = await prisma.checkIn.findFirst({
|
} catch (e) {
|
||||||
where: { habitId: id, date: { gte: start, lte: end } },
|
// 唯一约束冲突 = 并发重复提交, 视为已打卡
|
||||||
orderBy: [{ date: 'desc' }, { seq: 'desc' }],
|
if (e && e.code === 'P2002') return res.status(409).json({ error: '该次打卡已记录' })
|
||||||
})
|
next(e)
|
||||||
if (!last) return res.status(400).json({ error: '本周期还没有打卡记录' })
|
}
|
||||||
await prisma.checkIn.delete({ where: { id: last.id } })
|
})
|
||||||
const grouped = await loadRecords(userId, [habit], [{ start, end }])
|
|
||||||
res.json({ item: buildItem(habit, grouped.get(habit.id) || new Map(), date, today), date })
|
// DELETE /api/checkin/habits/:id/check?date= 撤销本周期内最近一次打卡
|
||||||
} catch (e) { next(e) }
|
router.delete('/habits/:id/check', async (req, res, next) => {
|
||||||
})
|
try {
|
||||||
|
const userId = req.user.sub
|
||||||
// ---------- 某日详情 / 月历 ----------
|
const id = Number(req.params.id)
|
||||||
|
const habit = await prisma.habit.findFirst({ where: { id, userId } })
|
||||||
// GET /api/checkin/day?date=YYYY-MM-DD 当天每个打卡项的明细 (含可打卡/只读标记)
|
if (!habit) return res.status(404).json({ error: '打卡项不存在' })
|
||||||
router.get('/day', async (req, res, next) => {
|
const today = toDateStr()
|
||||||
try {
|
const date = normDate(req.query.date)
|
||||||
const userId = req.user.sub
|
const { start, end } = periodRange(habit.period, date)
|
||||||
const today = toDateStr()
|
const last = await prisma.checkIn.findFirst({
|
||||||
const date = normDate(req.query.date)
|
where: { habitId: id, date: { gte: start, lte: end } },
|
||||||
const habits = await loadActiveHabits(userId)
|
orderBy: [{ date: 'desc' }, { seq: 'desc' }],
|
||||||
const ranges = habits.map((h) => periodRange(h.period, date))
|
})
|
||||||
const grouped = await loadRecords(userId, habits, ranges.length ? ranges : [{ start: date, end: date }])
|
if (!last) return res.status(400).json({ error: '本周期还没有打卡记录' })
|
||||||
const items = habits.map((h) => {
|
await prisma.checkIn.delete({ where: { id: last.id } })
|
||||||
const base = buildItem(h, grouped.get(h.id) || new Map(), date, today)
|
const grouped = await loadRecords(userId, [habit], [{ start, end }])
|
||||||
return { ...base, canCheck: date <= today && date >= addDays(today, -BACKFILL_DAYS) }
|
res.json({ item: buildItem(habit, grouped.get(habit.id) || new Map(), date, today), date })
|
||||||
})
|
} catch (e) { next(e) }
|
||||||
res.json({ today, date, isToday: date === today, isFuture: date > today, items })
|
})
|
||||||
} catch (e) { next(e) }
|
|
||||||
})
|
// ---------- 某日详情 / 月历 ----------
|
||||||
|
|
||||||
// GET /api/checkin/calendar?month=YYYY-MM 月历: 每天完成情况 + 当月完成率
|
// GET /api/checkin/day?date=YYYY-MM-DD 当天每个打卡项的明细 (含可打卡/只读标记)
|
||||||
router.get('/calendar', async (req, res, next) => {
|
router.get('/day', async (req, res, next) => {
|
||||||
try {
|
try {
|
||||||
const userId = req.user.sub
|
const userId = req.user.sub
|
||||||
const today = toDateStr()
|
const today = toDateStr()
|
||||||
const month = MONTH_RE.test(String(req.query.month || '')) ? String(req.query.month) : today.slice(0, 7)
|
const date = normDate(req.query.date)
|
||||||
const start = month + '-01'
|
const habits = await loadActiveHabits(userId)
|
||||||
const end = addDays(monthStartNext(month), -1)
|
const ranges = habits.map((h) => periodRange(h.period, date))
|
||||||
const habits = await prisma.habit.findMany({ where: { userId }, orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }] })
|
const grouped = await loadRecords(userId, habits, ranges.length ? ranges : [{ start: date, end: date }])
|
||||||
const active = habits.filter((h) => !h.archived)
|
const items = habits.map((h) => {
|
||||||
const records = await prisma.checkIn.findMany({
|
const base = buildItem(h, grouped.get(h.id) || new Map(), date, today)
|
||||||
where: { userId, date: { gte: start, lte: end } },
|
return { ...base, canCheck: date <= today && date >= addDays(today, -BACKFILL_DAYS) }
|
||||||
select: { habitId: true, date: true },
|
})
|
||||||
})
|
res.json({ today, date, isToday: date === today, isFuture: date > today, items })
|
||||||
const grouped = groupRecords(records)
|
} catch (e) { next(e) }
|
||||||
const days = []
|
})
|
||||||
let expTotal = 0
|
|
||||||
let doneTotal = 0
|
// GET /api/checkin/calendar?month=YYYY-MM 月历: 每天完成情况 + 当月完成率
|
||||||
eachDay(start, end, (d) => {
|
router.get('/calendar', async (req, res, next) => {
|
||||||
let expected = 0
|
try {
|
||||||
let actual = 0
|
const userId = req.user.sub
|
||||||
let over = false
|
const today = toDateStr()
|
||||||
const detail = []
|
const month = MONTH_RE.test(String(req.query.month || '')) ? String(req.query.month) : today.slice(0, 7)
|
||||||
for (const h of active) {
|
const start = month + '-01'
|
||||||
if (toDateStr(h.createdAt) > d) continue // 创建之前的日期不计入期望
|
const end = addDays(monthStartNext(month), -1)
|
||||||
const exp = expectedPerDay(h.period, Math.max(1, h.target), d)
|
const habits = await prisma.habit.findMany({ where: { userId }, orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }] })
|
||||||
const cnt = (grouped.get(h.id) || new Map()).get(d) || 0
|
const active = habits.filter((h) => !h.archived)
|
||||||
expected += exp
|
const records = await prisma.checkIn.findMany({
|
||||||
actual += Math.min(cnt, exp)
|
where: { userId, date: { gte: start, lte: end } },
|
||||||
if (cnt > exp) over = true
|
select: { habitId: true, date: true },
|
||||||
detail.push({ id: h.id, name: h.name, color: h.color, count: cnt, expected: exp, done: cnt >= exp })
|
})
|
||||||
}
|
const grouped = groupRecords(records)
|
||||||
const isFuture = d > today
|
const days = []
|
||||||
if (!isFuture) { expTotal += expected; doneTotal += actual }
|
let expTotal = 0
|
||||||
let status = 'empty'
|
let doneTotal = 0
|
||||||
if (expected > 0 && actual >= expected) status = over ? 'over' : 'full'
|
eachDay(start, end, (d) => {
|
||||||
else if (actual > 0) status = 'partial'
|
let expected = 0
|
||||||
days.push({
|
let actual = 0
|
||||||
date: d, expected, actual, status, isToday: d === today, isFuture,
|
let over = false
|
||||||
habits: detail,
|
const detail = []
|
||||||
})
|
for (const h of active) {
|
||||||
})
|
if (toDateStr(h.createdAt) > d) continue // 创建之前的日期不计入期望
|
||||||
res.json({
|
const exp = expectedPerDay(h.period, Math.max(1, h.target), d)
|
||||||
today, month, days,
|
const cnt = (grouped.get(h.id) || new Map()).get(d) || 0
|
||||||
rate: expTotal > 0 ? Math.min(1, doneTotal / expTotal) : 0,
|
expected += exp
|
||||||
habits: active.map((h) => ({ id: h.id, name: h.name, color: h.color, period: h.period, target: h.target })),
|
actual += Math.min(cnt, exp)
|
||||||
})
|
if (cnt > exp) over = true
|
||||||
} catch (e) { next(e) }
|
detail.push({ id: h.id, name: h.name, color: h.color, count: cnt, expected: exp, done: cnt >= exp })
|
||||||
})
|
}
|
||||||
|
const isFuture = d > today
|
||||||
function monthStartNext(month) {
|
if (!isFuture) { expTotal += expected; doneTotal += actual }
|
||||||
const [y, m] = month.split('-').map(Number)
|
let status = 'empty'
|
||||||
const d = new Date(Date.UTC(y, m, 1)) // m 已 +1 (下月)
|
if (expected > 0 && actual >= expected) status = over ? 'over' : 'full'
|
||||||
return d.toISOString().slice(0, 10)
|
else if (actual > 0) status = 'partial'
|
||||||
}
|
days.push({
|
||||||
|
date: d, expected, actual, status, isToday: d === today, isFuture,
|
||||||
export default router
|
habits: detail,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
res.json({
|
||||||
|
today, month, days,
|
||||||
|
rate: expTotal > 0 ? Math.min(1, doneTotal / expTotal) : 0,
|
||||||
|
habits: active.map((h) => ({ id: h.id, name: h.name, color: h.color, period: h.period, target: h.target })),
|
||||||
|
})
|
||||||
|
} catch (e) { next(e) }
|
||||||
|
})
|
||||||
|
|
||||||
|
function monthStartNext(month) {
|
||||||
|
const [y, m] = month.split('-').map(Number)
|
||||||
|
const d = new Date(Date.UTC(y, m, 1)) // m 已 +1 (下月)
|
||||||
|
return d.toISOString().slice(0, 10)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default router
|
||||||
|
|||||||
+42
-41
@@ -1,41 +1,42 @@
|
|||||||
import { api } from './client.js'
|
import { api } from './client.js'
|
||||||
|
|
||||||
const q = (params) => {
|
const q = (params) => {
|
||||||
const s = new URLSearchParams()
|
const s = new URLSearchParams()
|
||||||
Object.entries(params || {}).forEach(([k, v]) => {
|
Object.entries(params || {}).forEach(([k, v]) => {
|
||||||
if (v !== undefined && v !== null && v !== '') s.set(k, v)
|
if (v !== undefined && v !== null && v !== '') s.set(k, v)
|
||||||
})
|
})
|
||||||
const str = s.toString()
|
const str = s.toString()
|
||||||
return str ? '?' + str : ''
|
return str ? '?' + str : ''
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打卡 / 日历
|
// 打卡 / 日历
|
||||||
export const checkinApi = {
|
export const checkinApi = {
|
||||||
habits: (date) => api('/checkin/habits' + q({ date })),
|
habits: (date) => api('/checkin/habits' + q({ date })),
|
||||||
day: (date) => api('/checkin/day' + q({ date })),
|
day: (date) => api('/checkin/day' + q({ date })),
|
||||||
calendar: (month) => api('/checkin/calendar' + q({ month })),
|
calendar: (month) => api('/checkin/calendar' + q({ month })),
|
||||||
createHabit: (body) => api('/checkin/habits', { method: 'POST', body }),
|
createHabit: (body) => api('/checkin/habits', { method: 'POST', body }),
|
||||||
updateHabit: (id, body) => api(`/checkin/habits/${id}`, { method: 'PUT', body }),
|
updateHabit: (id, body) => api(`/checkin/habits/${id}`, { method: 'PUT', body }),
|
||||||
deleteHabit: (id, hard) => api(`/checkin/habits/${id}${hard ? '?hard=1' : ''}`, { method: 'DELETE' }),
|
reorderHabits: (ids) => api('/checkin/habits/reorder', { method: 'POST', body: { ids } }),
|
||||||
check: (id, date, note) => api(`/checkin/habits/${id}/check`, { method: 'POST', body: { date, note } }),
|
deleteHabit: (id, hard) => api(`/checkin/habits/${id}${hard ? '?hard=1' : ''}`, { method: 'DELETE' }),
|
||||||
uncheck: (id, date) => api(`/checkin/habits/${id}/check` + q({ date }), { method: 'DELETE' }),
|
check: (id, date, note) => api(`/checkin/habits/${id}/check`, { method: 'POST', body: { date, note } }),
|
||||||
}
|
uncheck: (id, date) => api(`/checkin/habits/${id}/check` + q({ date }), { method: 'DELETE' }),
|
||||||
|
}
|
||||||
// 检查清单
|
|
||||||
export const checklistApi = {
|
// 检查清单
|
||||||
lists: (archived) => api('/checklists' + q({ archived: archived ? 1 : 0 })),
|
export const checklistApi = {
|
||||||
list: (id) => api(`/checklists/${id}`),
|
lists: (archived) => api('/checklists' + q({ archived: archived ? 1 : 0 })),
|
||||||
create: (body) => api('/checklists', { method: 'POST', body }),
|
list: (id) => api(`/checklists/${id}`),
|
||||||
update: (id, body) => api(`/checklists/${id}`, { method: 'PUT', body }),
|
create: (body) => api('/checklists', { method: 'POST', body }),
|
||||||
remove: (id) => api(`/checklists/${id}`, { method: 'DELETE' }),
|
update: (id, body) => api(`/checklists/${id}`, { method: 'PUT', body }),
|
||||||
duplicate: (id) => api(`/checklists/${id}/duplicate`, { method: 'POST', body: {} }),
|
remove: (id) => api(`/checklists/${id}`, { method: 'DELETE' }),
|
||||||
addItem: (id, body) => api(`/checklists/${id}/items`, { method: 'POST', body }),
|
duplicate: (id) => api(`/checklists/${id}/duplicate`, { method: 'POST', body: {} }),
|
||||||
updateItem: (itemId, body) => api(`/checklists/items/${itemId}`, { method: 'PUT', body }),
|
addItem: (id, body) => api(`/checklists/${id}/items`, { method: 'POST', body }),
|
||||||
removeItem: (itemId) => api(`/checklists/items/${itemId}`, { method: 'DELETE' }),
|
updateItem: (itemId, body) => api(`/checklists/items/${itemId}`, { method: 'PUT', body }),
|
||||||
checkAll: (id, done) => api(`/checklists/${id}/check-all`, { method: 'POST', body: { done } }),
|
removeItem: (itemId) => api(`/checklists/items/${itemId}`, { method: 'DELETE' }),
|
||||||
templates: () => api('/checklists/templates'),
|
checkAll: (id, done) => api(`/checklists/${id}/check-all`, { method: 'POST', body: { done } }),
|
||||||
template: (id) => api(`/checklists/templates/${id}`),
|
templates: () => api('/checklists/templates'),
|
||||||
createTemplate: (body) => api('/checklists/templates', { method: 'POST', body }),
|
template: (id) => api(`/checklists/templates/${id}`),
|
||||||
updateTemplate: (id, body) => api(`/checklists/templates/${id}`, { method: 'PUT', body }),
|
createTemplate: (body) => api('/checklists/templates', { method: 'POST', body }),
|
||||||
removeTemplate: (id) => api(`/checklists/templates/${id}`, { method: 'DELETE' }),
|
updateTemplate: (id, body) => api(`/checklists/templates/${id}`, { method: 'PUT', body }),
|
||||||
}
|
removeTemplate: (id) => api(`/checklists/templates/${id}`, { method: 'DELETE' }),
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||||
|
|
||||||
|
// 打卡项组内拖动排序
|
||||||
|
// 手势与任务列表/看板一致: 长按 400ms 原位抬起(震动), 之后拖动;
|
||||||
|
// elementFromPoint 命中同一周期组内的 [data-habit-row] 作为落点,
|
||||||
|
// 按指针在目标卡上半/下半决定插到其前/后, 松手提交。
|
||||||
|
// 只允许组内 (每天/每周/每月/每年) 排序, 命中其他组视为无效落点。
|
||||||
|
// 激活后用非 passive touchmove preventDefault 拦截浏览器滚动接管,
|
||||||
|
// 保证纵向拖动期间指针事件持续派发 (同 useRowDrag 的教训)。
|
||||||
|
export default function useHabitDrag({ onDrop }) {
|
||||||
|
const [dragItem, setDragItem] = useState(null) // 拖动中的打卡项 (视觉态)
|
||||||
|
const [over, setOver] = useState(null) // { id, after } 落点
|
||||||
|
const st = useRef({ timer: null, active: false, startX: 0, startY: 0, item: null, over: null })
|
||||||
|
const lastEnd = useRef(0)
|
||||||
|
|
||||||
|
const cleanup = useCallback(() => {
|
||||||
|
if (st.current.timer) { clearTimeout(st.current.timer); st.current.timer = null }
|
||||||
|
st.current.active = false
|
||||||
|
st.current.over = null
|
||||||
|
setDragItem(null)
|
||||||
|
setOver(null)
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
useEffect(() => () => cleanup(), [cleanup])
|
||||||
|
|
||||||
|
/** 拖动刚结束 (350ms 内): 抑制松手合成的 click 误触打卡 */
|
||||||
|
const justEnded = useCallback(() => Date.now() - lastEnd.current < 350, [])
|
||||||
|
|
||||||
|
const hitRow = (x, y) => {
|
||||||
|
const el = document.elementFromPoint(x, y)
|
||||||
|
const rowEl = el?.closest?.('[data-habit-row]')
|
||||||
|
if (!rowEl) return null
|
||||||
|
const r = rowEl.getBoundingClientRect()
|
||||||
|
return { id: Number(rowEl.dataset.habitId), after: y > r.top + r.height / 2 }
|
||||||
|
}
|
||||||
|
|
||||||
|
const onMove = (ev) => {
|
||||||
|
const s = st.current
|
||||||
|
if (!s.active) {
|
||||||
|
if (s.timer && (Math.abs(ev.clientX - s.startX) > 10 || Math.abs(ev.clientY - s.startY) > 10)) {
|
||||||
|
clearTimeout(s.timer); s.timer = null
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ev.preventDefault()
|
||||||
|
const hit = hitRow(ev.clientX, ev.clientY)
|
||||||
|
// 只认同一周期组的落点
|
||||||
|
if (hit && hit.id !== s.item.id) { s.over = hit; setOver(hit) }
|
||||||
|
else { s.over = null; setOver(null) }
|
||||||
|
}
|
||||||
|
|
||||||
|
const onUp = () => {
|
||||||
|
const s = st.current
|
||||||
|
if (s.active && s.item) {
|
||||||
|
lastEnd.current = Date.now()
|
||||||
|
if (s.over && s.over.id !== s.item.id) onDrop?.(s.item, s.over.id, s.over.after)
|
||||||
|
}
|
||||||
|
cleanup()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 绑定到卡片: 卡片元素需设置 touch-action: pan-y */
|
||||||
|
const bind = useCallback((item) => ({
|
||||||
|
onPointerDown: (ev) => {
|
||||||
|
if (ev.button !== undefined && ev.button !== 0) return
|
||||||
|
st.current = { ...st.current, startX: ev.clientX, startY: ev.clientY, item, active: false }
|
||||||
|
st.current.timer = setTimeout(() => {
|
||||||
|
st.current.active = true
|
||||||
|
setDragItem(item)
|
||||||
|
if (navigator.vibrate) navigator.vibrate(15)
|
||||||
|
}, 400)
|
||||||
|
try { ev.currentTarget.setPointerCapture(ev.pointerId) } catch { /* ignore */ }
|
||||||
|
const el = ev.currentTarget
|
||||||
|
const move = (e2) => onMove(e2)
|
||||||
|
const tm = (e2) => { if (st.current.active) e2.preventDefault() }
|
||||||
|
const up = () => { onUp(); detach() }
|
||||||
|
const cancel = () => {
|
||||||
|
if (st.current.active) lastEnd.current = Date.now()
|
||||||
|
cleanup()
|
||||||
|
detach()
|
||||||
|
}
|
||||||
|
const detach = () => {
|
||||||
|
el.removeEventListener('pointermove', move)
|
||||||
|
el.removeEventListener('pointerup', up)
|
||||||
|
el.removeEventListener('pointercancel', cancel)
|
||||||
|
el.removeEventListener('touchmove', tm)
|
||||||
|
}
|
||||||
|
el.addEventListener('pointermove', move)
|
||||||
|
el.addEventListener('pointerup', up)
|
||||||
|
el.addEventListener('pointercancel', cancel)
|
||||||
|
el.addEventListener('touchmove', tm, { passive: false })
|
||||||
|
},
|
||||||
|
onContextMenu: (ev) => ev.preventDefault(),
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}), [])
|
||||||
|
|
||||||
|
return { dragItem, over, bind, cancel: cleanup, justEnded }
|
||||||
|
}
|
||||||
@@ -99,6 +99,8 @@ export default function useColumnDrag({ onDrop, scrollSelector = '.board-wrap' }
|
|||||||
try { ev.currentTarget.setPointerCapture(ev.pointerId) } catch { /* ignore */ }
|
try { ev.currentTarget.setPointerCapture(ev.pointerId) } catch { /* ignore */ }
|
||||||
const el = ev.currentTarget
|
const el = ev.currentTarget
|
||||||
const move = (e2) => onPointerMove(e2)
|
const move = (e2) => onPointerMove(e2)
|
||||||
|
// 激活后拦截触摸滚动: 防纵向分量触发浏览器接管 (pointercancel), 同 useRowDrag
|
||||||
|
const tm = (e2) => { if (st.current.active) e2.preventDefault() }
|
||||||
const up = (e2) => { onPointerUp(e2); detach() }
|
const up = (e2) => { onPointerUp(e2); detach() }
|
||||||
const cancel = () => {
|
const cancel = () => {
|
||||||
if (st.current.active) lastEnd.current = Date.now()
|
if (st.current.active) lastEnd.current = Date.now()
|
||||||
@@ -109,10 +111,12 @@ export default function useColumnDrag({ onDrop, scrollSelector = '.board-wrap' }
|
|||||||
el.removeEventListener('pointermove', move)
|
el.removeEventListener('pointermove', move)
|
||||||
el.removeEventListener('pointerup', up)
|
el.removeEventListener('pointerup', up)
|
||||||
el.removeEventListener('pointercancel', cancel)
|
el.removeEventListener('pointercancel', cancel)
|
||||||
|
el.removeEventListener('touchmove', tm)
|
||||||
}
|
}
|
||||||
el.addEventListener('pointermove', move)
|
el.addEventListener('pointermove', move)
|
||||||
el.addEventListener('pointerup', up)
|
el.addEventListener('pointerup', up)
|
||||||
el.addEventListener('pointercancel', cancel)
|
el.addEventListener('pointercancel', cancel)
|
||||||
|
el.addEventListener('touchmove', tm, { passive: false })
|
||||||
},
|
},
|
||||||
// 长按不弹系统菜单 (配合 CSS user-select:none, 防长按变文字选择)
|
// 长按不弹系统菜单 (配合 CSS user-select:none, 防长按变文字选择)
|
||||||
onContextMenu: (ev) => ev.preventDefault(),
|
onContextMenu: (ev) => ev.preventDefault(),
|
||||||
|
|||||||
@@ -74,6 +74,10 @@ export default function useRowDrag({ columns, onDrop }) {
|
|||||||
try { ev.currentTarget.setPointerCapture(ev.pointerId) } catch { /* ignore */ }
|
try { ev.currentTarget.setPointerCapture(ev.pointerId) } catch { /* ignore */ }
|
||||||
const el = ev.currentTarget
|
const el = ev.currentTarget
|
||||||
const move = (e2) => onMove(e2)
|
const move = (e2) => onMove(e2)
|
||||||
|
// 激活后拦截触摸滚动: pan-y 下纵向分量稍大浏览器即接管手势并派发
|
||||||
|
// pointercancel (列表是整页长滚动容器, 必现), 非 passive touchmove
|
||||||
|
// preventDefault 才能真正拦住, 拖动期间指针事件得以持续派发
|
||||||
|
const tm = (e2) => { if (st.current.active) e2.preventDefault() }
|
||||||
const up = () => { onUp(); detach() }
|
const up = () => { onUp(); detach() }
|
||||||
const cancel = () => {
|
const cancel = () => {
|
||||||
if (st.current.active) lastEnd.current = Date.now()
|
if (st.current.active) lastEnd.current = Date.now()
|
||||||
@@ -84,10 +88,12 @@ export default function useRowDrag({ columns, onDrop }) {
|
|||||||
el.removeEventListener('pointermove', move)
|
el.removeEventListener('pointermove', move)
|
||||||
el.removeEventListener('pointerup', up)
|
el.removeEventListener('pointerup', up)
|
||||||
el.removeEventListener('pointercancel', cancel)
|
el.removeEventListener('pointercancel', cancel)
|
||||||
|
el.removeEventListener('touchmove', tm)
|
||||||
}
|
}
|
||||||
el.addEventListener('pointermove', move)
|
el.addEventListener('pointermove', move)
|
||||||
el.addEventListener('pointerup', up)
|
el.addEventListener('pointerup', up)
|
||||||
el.addEventListener('pointercancel', cancel)
|
el.addEventListener('pointercancel', cancel)
|
||||||
|
el.addEventListener('touchmove', tm, { passive: false })
|
||||||
},
|
},
|
||||||
// 长按不弹系统菜单 (配合 CSS user-select:none, 防长按变文字选择)
|
// 长按不弹系统菜单 (配合 CSS user-select:none, 防长按变文字选择)
|
||||||
onContextMenu: (ev) => ev.preventDefault(),
|
onContextMenu: (ev) => ev.preventDefault(),
|
||||||
|
|||||||
+338
-282
@@ -1,282 +1,338 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react'
|
import { useCallback, useEffect, useMemo, useState } from 'react'
|
||||||
import {
|
import {
|
||||||
Button, Dialog, DotLoading, Empty, Input, Popup, Selector, Stepper, Toast,
|
Button, Dialog, DotLoading, Empty, Input, Popup, Selector, Stepper, Toast,
|
||||||
} from 'antd-mobile'
|
} from 'antd-mobile'
|
||||||
import RingProgress, { Celebrate } from '../../components/RingProgress.jsx'
|
import RingProgress, { Celebrate } from '../../components/RingProgress.jsx'
|
||||||
import { checkinApi } from '../../api/checkin.js'
|
import useHabitDrag from '../../components/checkin/useHabitDrag.js'
|
||||||
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
import { checkinApi } from '../../api/checkin.js'
|
||||||
import { toDateStr, dayLabel } from './date.js'
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
||||||
|
import { toDateStr, dayLabel } from './date.js'
|
||||||
const PERIOD_OPTIONS = [
|
|
||||||
{ label: '每天', value: 'day' },
|
const PERIOD_OPTIONS = [
|
||||||
{ label: '每周', value: 'week' },
|
{ label: '每天', value: 'day' },
|
||||||
{ label: '每月', value: 'month' },
|
{ label: '每周', value: 'week' },
|
||||||
{ label: '每年', value: 'year' },
|
{ label: '每月', value: 'month' },
|
||||||
]
|
{ label: '每年', value: 'year' },
|
||||||
|
]
|
||||||
const COLORS = ['#1677ff', '#00b578', '#ff8f1f', '#ff3141', '#a855f7', '#14b8a6', '#f43f9e']
|
|
||||||
|
const COLORS = ['#1677ff', '#00b578', '#ff8f1f', '#ff3141', '#a855f7', '#14b8a6', '#f43f9e']
|
||||||
const EMPTY_FORM = { id: null, name: '', period: 'day', target: 1, color: COLORS[0], note: '' }
|
|
||||||
|
const EMPTY_FORM = { id: null, name: '', period: 'day', target: 1, color: COLORS[0], note: '' }
|
||||||
// 打卡视图: 今日待办列表 + 环形进度 + 打卡/撤销 + 新建/编辑
|
|
||||||
export default function HabitView({ date, onDateChange }) {
|
// 打卡视图: 今日待办列表 + 环形进度 + 打卡/撤销 + 新建/编辑
|
||||||
const [data, setData] = useState(null) // { today, date, items, summary }
|
export default function HabitView({ date, onDateChange }) {
|
||||||
const [err, setErr] = useState('')
|
const [data, setData] = useState(null) // { today, date, items, summary }
|
||||||
const [bursts, setBursts] = useState({}) // { habitId: 触发计数 }
|
const [err, setErr] = useState('')
|
||||||
const [form, setForm] = useState(EMPTY_FORM)
|
const [bursts, setBursts] = useState({}) // { habitId: 触发计数 }
|
||||||
const [showForm, setShowForm] = useState(false)
|
const [form, setForm] = useState(EMPTY_FORM)
|
||||||
|
const [showForm, setShowForm] = useState(false)
|
||||||
const load = useCallback((silent) => {
|
|
||||||
if (!silent) setErr('')
|
const load = useCallback((silent) => {
|
||||||
checkinApi.habits(date)
|
if (!silent) setErr('')
|
||||||
.then((d) => setData(d))
|
checkinApi.habits(date)
|
||||||
.catch((e) => { if (!silent) setErr(e.message) })
|
.then((d) => setData(d))
|
||||||
}, [date])
|
.catch((e) => { if (!silent) setErr(e.message) })
|
||||||
|
}, [date])
|
||||||
useEffect(() => { load(false) }, [load])
|
|
||||||
useRefreshOnVisible(() => load(true))
|
useEffect(() => { load(false) }, [load])
|
||||||
|
useRefreshOnVisible(() => load(true))
|
||||||
const items = useMemo(() => {
|
|
||||||
const list = data?.items || []
|
const items = useMemo(() => {
|
||||||
// 未完成在前, 已完成在后 (F-CK-16 默认排序)
|
const list = data?.items || []
|
||||||
return [...list].sort((a, b) => Number(a.completed) - Number(b.completed) || a.id - b.id)
|
// 手动排序优先 (sortOrder), 拖动排序后覆盖 F-CK-16 的"未完成在前"
|
||||||
}, [data])
|
return [...list].sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0) || a.id - b.id)
|
||||||
|
}, [data])
|
||||||
const fireBurst = (id) => setBursts((m) => ({ ...m, [id]: (m[id] || 0) + 1 }))
|
|
||||||
|
// 按周期分组 (每天/每周/每月/每年), 组内顺序 = 手动排序
|
||||||
// 乐观更新: 先本地 +1, 成功用服务端结果覆盖, 失败回滚 (F-SY-06/E-02)
|
const groups = useMemo(() => {
|
||||||
async function doCheck(item) {
|
const out = []
|
||||||
const before = data
|
for (const p of PERIOD_OPTIONS) {
|
||||||
const patch = (it) => {
|
const list = items.filter((i) => i.period === p.value)
|
||||||
const done = it.done + 1
|
if (list.length) out.push({ key: p.value, label: p.label, list })
|
||||||
return {
|
}
|
||||||
...it,
|
const known = new Set(PERIOD_OPTIONS.map((p) => p.value))
|
||||||
done,
|
const rest = items.filter((i) => !known.has(i.period))
|
||||||
remaining: Math.max(0, it.target - done),
|
if (rest.length) out.push({ key: 'other', label: '其他', list: rest })
|
||||||
percent: Math.min(1, done / it.target),
|
return out
|
||||||
completed: done >= it.target,
|
}, [items])
|
||||||
over: Math.max(0, done - it.target),
|
|
||||||
countOnDate: (it.countOnDate || 0) + 1,
|
const drag = useHabitDrag({ onDrop: reorderHabit })
|
||||||
dayDone: (it.countOnDate || 0) + 1 >= it.expectedPerDay,
|
|
||||||
}
|
// 组内拖动落位: 重排后按展平顺序整体重写 sortOrder
|
||||||
}
|
async function reorderHabit(dragged, targetId, after) {
|
||||||
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? patch(x) : x)) }))
|
const snapshot = data
|
||||||
try {
|
const g = groups.find((x) => x.key === dragged.period)
|
||||||
const res = await checkinApi.check(item.id, date)
|
if (!g) return
|
||||||
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? res.item : x)) }))
|
const rest = g.list.filter((i) => i.id !== dragged.id)
|
||||||
if (res.item.completed) fireBurst(item.id)
|
const ti = rest.findIndex((i) => i.id === targetId)
|
||||||
} catch (e) {
|
if (ti < 0) return
|
||||||
setData(before)
|
rest.splice(after ? ti + 1 : ti, 0, dragged)
|
||||||
Toast.show({ content: e.message || '打卡失败' })
|
const flat = groups.map((x) => (x.key === g.key ? rest : x.list)).flat()
|
||||||
}
|
const withOrder = flat.map((it, i) => ({ ...it, sortOrder: i }))
|
||||||
}
|
setData((d) => ({ ...d, items: withOrder }))
|
||||||
|
try {
|
||||||
async function doUncheck(item) {
|
await checkinApi.reorderHabits(flat.map((i) => i.id))
|
||||||
const before = data
|
} catch (e) {
|
||||||
setData((d) => ({
|
setData(snapshot)
|
||||||
...d,
|
Toast.show({ content: e.message || '排序保存失败' })
|
||||||
items: d.items.map((x) => {
|
}
|
||||||
if (x.id !== item.id) return x
|
}
|
||||||
const done = Math.max(0, x.done - 1)
|
|
||||||
return {
|
const fireBurst = (id) => setBursts((m) => ({ ...m, [id]: (m[id] || 0) + 1 }))
|
||||||
...x,
|
|
||||||
done,
|
// 乐观更新: 先本地 +1, 成功用服务端结果覆盖, 失败回滚 (F-SY-06/E-02)
|
||||||
remaining: Math.max(0, x.target - done),
|
async function doCheck(item) {
|
||||||
percent: Math.min(1, done / x.target),
|
const before = data
|
||||||
completed: done >= x.target,
|
const patch = (it) => {
|
||||||
over: Math.max(0, done - x.target),
|
const done = it.done + 1
|
||||||
countOnDate: Math.max(0, (x.countOnDate || 0) - 1),
|
return {
|
||||||
}
|
...it,
|
||||||
}),
|
done,
|
||||||
}))
|
remaining: Math.max(0, it.target - done),
|
||||||
try {
|
percent: Math.min(1, done / it.target),
|
||||||
const res = await checkinApi.uncheck(item.id, date)
|
completed: done >= it.target,
|
||||||
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? res.item : x)) }))
|
over: Math.max(0, done - it.target),
|
||||||
} catch (e) {
|
countOnDate: (it.countOnDate || 0) + 1,
|
||||||
setData(before)
|
dayDone: (it.countOnDate || 0) + 1 >= it.expectedPerDay,
|
||||||
Toast.show({ content: e.message || '撤销失败' })
|
}
|
||||||
}
|
}
|
||||||
}
|
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? patch(x) : x)) }))
|
||||||
|
try {
|
||||||
async function submitForm() {
|
const res = await checkinApi.check(item.id, date)
|
||||||
const name = String(form.name || '').trim()
|
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? res.item : x)) }))
|
||||||
if (!name) return Toast.show({ content: '请填写名称' })
|
if (res.item.completed) fireBurst(item.id)
|
||||||
if (name.length > 20) return Toast.show({ content: '名称不能超过 20 个字' })
|
} catch (e) {
|
||||||
const payload = { name, period: form.period, target: Number(form.target) || 1, color: form.color, note: form.note }
|
setData(before)
|
||||||
try {
|
Toast.show({ content: e.message || '打卡失败' })
|
||||||
if (form.id) await checkinApi.updateHabit(form.id, payload)
|
}
|
||||||
else await checkinApi.createHabit(payload)
|
}
|
||||||
setShowForm(false)
|
|
||||||
setForm(EMPTY_FORM)
|
async function doUncheck(item) {
|
||||||
load(true)
|
const before = data
|
||||||
} catch (e) {
|
setData((d) => ({
|
||||||
Toast.show({ content: e.message || '保存失败' })
|
...d,
|
||||||
}
|
items: d.items.map((x) => {
|
||||||
}
|
if (x.id !== item.id) return x
|
||||||
|
const done = Math.max(0, x.done - 1)
|
||||||
async function removeHabit(item) {
|
return {
|
||||||
const ok = await Dialog.confirm({
|
...x,
|
||||||
content: `归档「${item.name}」？归档后不再出现在待办，历史记录保留。`,
|
done,
|
||||||
confirmText: '归档',
|
remaining: Math.max(0, x.target - done),
|
||||||
cancelText: '取消',
|
percent: Math.min(1, done / x.target),
|
||||||
})
|
completed: done >= x.target,
|
||||||
if (!ok) return
|
over: Math.max(0, done - x.target),
|
||||||
try {
|
countOnDate: Math.max(0, (x.countOnDate || 0) - 1),
|
||||||
await checkinApi.deleteHabit(item.id)
|
}
|
||||||
Toast.show({ content: '已归档' })
|
}),
|
||||||
load(true)
|
}))
|
||||||
} catch (e) {
|
try {
|
||||||
Toast.show({ content: e.message || '操作失败' })
|
const res = await checkinApi.uncheck(item.id, date)
|
||||||
}
|
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? res.item : x)) }))
|
||||||
}
|
} catch (e) {
|
||||||
|
setData(before)
|
||||||
const summary = data?.summary || { total: 0, done: 0 }
|
Toast.show({ content: e.message || '撤销失败' })
|
||||||
const isToday = data ? data.date === data.today : true
|
}
|
||||||
|
}
|
||||||
return (
|
|
||||||
<div className="habit-view">
|
async function submitForm() {
|
||||||
<div className="habit-head">
|
const name = String(form.name || '').trim()
|
||||||
<div className="habit-head-left">
|
if (!name) return Toast.show({ content: '请填写名称' })
|
||||||
<div className="habit-date">{dayLabel(date, data?.today || toDateStr())}</div>
|
if (name.length > 20) return Toast.show({ content: '名称不能超过 20 个字' })
|
||||||
<div className="habit-summary">
|
const payload = { name, period: form.period, target: Number(form.target) || 1, color: form.color, note: form.note }
|
||||||
已完成 <strong>{summary.done}</strong> / {summary.total}
|
try {
|
||||||
{!isToday && <span className="habit-badge">非今天</span>}
|
if (form.id) await checkinApi.updateHabit(form.id, payload)
|
||||||
</div>
|
else await checkinApi.createHabit(payload)
|
||||||
</div>
|
setShowForm(false)
|
||||||
<div className="habit-head-right">
|
setForm(EMPTY_FORM)
|
||||||
<Button size="mini" color="primary" onClick={() => { setForm(EMPTY_FORM); setShowForm(true) }}>
|
load(true)
|
||||||
+ 新建
|
} catch (e) {
|
||||||
</Button>
|
Toast.show({ content: e.message || '保存失败' })
|
||||||
</div>
|
}
|
||||||
</div>
|
}
|
||||||
|
|
||||||
{err && (
|
async function removeHabit(item) {
|
||||||
<div className="error-banner">
|
const ok = await Dialog.confirm({
|
||||||
{err}
|
content: `归档「${item.name}」？归档后不再出现在待办，历史记录保留。`,
|
||||||
<span className="retry-link" onClick={() => load(false)}>重试</span>
|
confirmText: '归档',
|
||||||
</div>
|
cancelText: '取消',
|
||||||
)}
|
})
|
||||||
|
if (!ok) return
|
||||||
{data === null && !err && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
try {
|
||||||
|
await checkinApi.deleteHabit(item.id)
|
||||||
{data !== null && !err && items.length === 0 && (
|
Toast.show({ content: '已归档' })
|
||||||
<div className="checkin-empty">
|
load(true)
|
||||||
<Empty description="还没有打卡项" />
|
} catch (e) {
|
||||||
<Button color="primary" size="small" onClick={() => { setForm(EMPTY_FORM); setShowForm(true) }}>
|
Toast.show({ content: e.message || '操作失败' })
|
||||||
创建第一个打卡项
|
}
|
||||||
</Button>
|
}
|
||||||
</div>
|
|
||||||
)}
|
const summary = data?.summary || { total: 0, done: 0 }
|
||||||
|
const isToday = data ? data.date === data.today : true
|
||||||
<div className="habit-list">
|
|
||||||
{items.map((item) => (
|
return (
|
||||||
<div key={item.id} className={'habit-card' + (item.completed ? ' done' : '')}>
|
<div className="habit-view">
|
||||||
<RingProgress
|
<div className="habit-head">
|
||||||
percent={item.percent}
|
<div className="habit-head-left">
|
||||||
done={item.done}
|
<div className="habit-date">{dayLabel(date, data?.today || toDateStr())}</div>
|
||||||
target={item.target}
|
<div className="habit-summary">
|
||||||
over={item.over}
|
已完成 <strong>{summary.done}</strong> / {summary.total}
|
||||||
completed={item.completed}
|
{!isToday && <span className="habit-badge">非今天</span>}
|
||||||
color={item.color}
|
</div>
|
||||||
onClick={() => doCheck(item)}
|
</div>
|
||||||
/>
|
<div className="habit-head-right">
|
||||||
<div className="habit-main">
|
<Button size="mini" color="primary" onClick={() => { setForm(EMPTY_FORM); setShowForm(true) }}>
|
||||||
<div className="habit-name">{item.name}</div>
|
+ 新建
|
||||||
<div className="habit-meta">
|
</Button>
|
||||||
{item.periodLabel} {item.target} 次
|
</div>
|
||||||
{item.streak > 0 && <span className="habit-streak">连续 {item.streak}</span>}
|
</div>
|
||||||
</div>
|
|
||||||
{item.note && <div className="habit-note">{item.note}</div>}
|
{err && (
|
||||||
<div className="habit-range">
|
<div className="error-banner">
|
||||||
{item.periodStart === item.periodEnd
|
{err}
|
||||||
? '今日'
|
<span className="retry-link" onClick={() => load(false)}>重试</span>
|
||||||
: `${item.periodStart.slice(5)} ~ ${item.periodEnd.slice(5)}`}
|
</div>
|
||||||
{item.over > 0 && <span className="habit-over">超额 {item.over}</span>}
|
)}
|
||||||
</div>
|
|
||||||
</div>
|
{data === null && !err && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
||||||
<div className="habit-actions">
|
|
||||||
<Button
|
{data !== null && !err && items.length === 0 && (
|
||||||
size="mini"
|
<div className="checkin-empty">
|
||||||
color={item.completed ? 'default' : 'primary'}
|
<Empty description="还没有打卡项" />
|
||||||
onClick={() => doCheck(item)}
|
<Button color="primary" size="small" onClick={() => { setForm(EMPTY_FORM); setShowForm(true) }}>
|
||||||
>
|
创建第一个打卡项
|
||||||
{item.completed ? '再打一次' : '打卡'}
|
</Button>
|
||||||
</Button>
|
</div>
|
||||||
</div>
|
)}
|
||||||
<div className="habit-foot">
|
|
||||||
{item.done > 0 && (
|
<div className="habit-list">
|
||||||
<span className="habit-link" onClick={() => doUncheck(item)}>撤销</span>
|
{groups.map((g) => (
|
||||||
)}
|
<div key={g.key}>
|
||||||
<span
|
<div className="habit-group-title">
|
||||||
className="habit-link"
|
{g.label}
|
||||||
onClick={() => {
|
<span className="cnt">{g.list.length}</span>
|
||||||
setForm({ id: item.id, name: item.name, period: item.period, target: item.target, color: item.color, note: item.note })
|
</div>
|
||||||
setShowForm(true)
|
{g.list.map((item) => (
|
||||||
}}
|
<div
|
||||||
>编辑</span>
|
key={item.id}
|
||||||
<span className="habit-link danger" onClick={() => removeHabit(item)}>归档</span>
|
data-habit-row
|
||||||
</div>
|
data-habit-id={item.id}
|
||||||
<Celebrate fire={bursts[item.id] || 0} color={item.color} />
|
className={
|
||||||
</div>
|
'habit-card'
|
||||||
))}
|
+ (item.completed ? ' done' : '')
|
||||||
</div>
|
+ (drag.dragItem?.id === item.id ? ' dragging' : '')
|
||||||
|
+ (drag.over?.id === item.id ? ` dragover ${drag.over.after ? 'after' : 'before'}` : '')
|
||||||
{/* 新建 / 编辑 */}
|
}
|
||||||
<Popup
|
{...drag.bind(item)}
|
||||||
visible={showForm}
|
>
|
||||||
onMaskClick={() => setShowForm(false)}
|
<RingProgress
|
||||||
bodyStyle={{ borderTopLeftRadius: 12, borderTopRightRadius: 12, paddingBottom: 16 }}
|
percent={item.percent}
|
||||||
>
|
done={item.done}
|
||||||
<div className="form-popup">
|
target={item.target}
|
||||||
<div className="form-title">{form.id ? '编辑打卡项' : '新建打卡项'}</div>
|
over={item.over}
|
||||||
<div className="form-field">
|
completed={item.completed}
|
||||||
<label>名称</label>
|
color={item.color}
|
||||||
<Input
|
onClick={() => { if (!drag.justEnded()) doCheck(item) }}
|
||||||
placeholder="例如：喝水 / 健身 / 读书"
|
/>
|
||||||
value={form.name}
|
<div className="habit-main">
|
||||||
maxLength={20}
|
<div className="habit-name">{item.name}</div>
|
||||||
onChange={(v) => setForm((f) => ({ ...f, name: v }))}
|
<div className="habit-meta">
|
||||||
/>
|
{item.periodLabel} {item.target} 次
|
||||||
</div>
|
{item.streak > 0 && <span className="habit-streak">连续 {item.streak}</span>}
|
||||||
<div className="form-field">
|
</div>
|
||||||
<label>周期</label>
|
{item.note && <div className="habit-note">{item.note}</div>}
|
||||||
<Selector
|
<div className="habit-range">
|
||||||
options={PERIOD_OPTIONS}
|
{item.periodStart === item.periodEnd
|
||||||
value={[form.period]}
|
? '今日'
|
||||||
onChange={(v) => setForm((f) => ({ ...f, period: v[0] }))}
|
: `${item.periodStart.slice(5)} ~ ${item.periodEnd.slice(5)}`}
|
||||||
/>
|
{item.over > 0 && <span className="habit-over">超额 {item.over}</span>}
|
||||||
</div>
|
</div>
|
||||||
<div className="form-field">
|
</div>
|
||||||
<label>目标次数（周期内）</label>
|
<div className="habit-actions">
|
||||||
<Stepper min={1} max={999} value={form.target} onChange={(v) => setForm((f) => ({ ...f, target: v }))} />
|
<Button
|
||||||
</div>
|
size="mini"
|
||||||
<div className="form-field">
|
color={item.completed ? 'default' : 'primary'}
|
||||||
<label>颜色</label>
|
onClick={() => { if (!drag.justEnded()) doCheck(item) }}
|
||||||
<div className="color-row">
|
>
|
||||||
{COLORS.map((c) => (
|
{item.completed ? '再打一次' : '打卡'}
|
||||||
<span
|
</Button>
|
||||||
key={c}
|
</div>
|
||||||
className={'color-dot' + (form.color === c ? ' active' : '')}
|
<div className="habit-foot">
|
||||||
style={{ background: c }}
|
{item.done > 0 && (
|
||||||
onClick={() => setForm((f) => ({ ...f, color: c }))}
|
<span className="habit-link" onClick={() => { if (!drag.justEnded()) doUncheck(item) }}>撤销</span>
|
||||||
/>
|
)}
|
||||||
))}
|
<span
|
||||||
</div>
|
className="habit-link"
|
||||||
</div>
|
onClick={() => {
|
||||||
<div className="form-field">
|
if (drag.justEnded()) return
|
||||||
<label>备注（可选）</label>
|
setForm({ id: item.id, name: item.name, period: item.period, target: item.target, color: item.color, note: item.note })
|
||||||
<Input
|
setShowForm(true)
|
||||||
placeholder="补充说明"
|
}}
|
||||||
value={form.note}
|
>编辑</span>
|
||||||
onChange={(v) => setForm((f) => ({ ...f, note: v }))}
|
<span className="habit-link danger" onClick={() => { if (!drag.justEnded()) removeHabit(item) }}>归档</span>
|
||||||
/>
|
</div>
|
||||||
</div>
|
<Celebrate fire={bursts[item.id] || 0} color={item.color} />
|
||||||
<div className="form-actions">
|
</div>
|
||||||
<Button block color="primary" onClick={submitForm}>保存</Button>
|
))}
|
||||||
<Button block fill="outline" onClick={() => setShowForm(false)} style={{ marginTop: 8 }}>取消</Button>
|
</div>
|
||||||
</div>
|
))}
|
||||||
</div>
|
</div>
|
||||||
</Popup>
|
|
||||||
</div>
|
{/* 新建 / 编辑 */}
|
||||||
)
|
<Popup
|
||||||
}
|
visible={showForm}
|
||||||
|
onMaskClick={() => setShowForm(false)}
|
||||||
|
bodyStyle={{ borderTopLeftRadius: 12, borderTopRightRadius: 12, paddingBottom: 16 }}
|
||||||
|
>
|
||||||
|
<div className="form-popup">
|
||||||
|
<div className="form-title">{form.id ? '编辑打卡项' : '新建打卡项'}</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>名称</label>
|
||||||
|
<Input
|
||||||
|
placeholder="例如：喝水 / 健身 / 读书"
|
||||||
|
value={form.name}
|
||||||
|
maxLength={20}
|
||||||
|
onChange={(v) => setForm((f) => ({ ...f, name: v }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>周期</label>
|
||||||
|
<Selector
|
||||||
|
options={PERIOD_OPTIONS}
|
||||||
|
value={[form.period]}
|
||||||
|
onChange={(v) => setForm((f) => ({ ...f, period: v[0] }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>目标次数（周期内）</label>
|
||||||
|
<Stepper min={1} max={999} value={form.target} onChange={(v) => setForm((f) => ({ ...f, target: v }))} />
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>颜色</label>
|
||||||
|
<div className="color-row">
|
||||||
|
{COLORS.map((c) => (
|
||||||
|
<span
|
||||||
|
key={c}
|
||||||
|
className={'color-dot' + (form.color === c ? ' active' : '')}
|
||||||
|
style={{ background: c }}
|
||||||
|
onClick={() => setForm((f) => ({ ...f, color: c }))}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>备注（可选）</label>
|
||||||
|
<Input
|
||||||
|
placeholder="补充说明"
|
||||||
|
value={form.note}
|
||||||
|
onChange={(v) => setForm((f) => ({ ...f, note: v }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-actions">
|
||||||
|
<Button block color="primary" onClick={submitForm}>保存</Button>
|
||||||
|
<Button block fill="outline" onClick={() => setShowForm(false)} style={{ marginTop: 8 }}>取消</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Popup>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|||||||
@@ -663,6 +663,21 @@ body.me-safe-top .app-safe-top { height: 0; }
|
|||||||
.habit-link { font-size: 12px; color: var(--color-primary); cursor: pointer; }
|
.habit-link { font-size: 12px; color: var(--color-primary); cursor: pointer; }
|
||||||
.habit-link.danger { color: var(--color-danger); }
|
.habit-link.danger { color: var(--color-danger); }
|
||||||
|
|
||||||
|
/* 打卡项分组 + 长按拖动排序 (组内) */
|
||||||
|
.habit-view { -webkit-user-select: none; user-select: none; -webkit-touch-callout: none; }
|
||||||
|
.habit-view input, .habit-view textarea { -webkit-user-select: text; user-select: text; }
|
||||||
|
.habit-group-title {
|
||||||
|
display: flex; align-items: center; gap: 7px; padding: 10px 2px 4px;
|
||||||
|
font-size: 12px; color: var(--color-muted); font-weight: 600;
|
||||||
|
}
|
||||||
|
.habit-group-title::before { content: ""; width: 3px; height: 12px; border-radius: 2px; background: var(--color-primary); }
|
||||||
|
.habit-group-title .cnt { color: #b8bcc4; font-weight: 400; }
|
||||||
|
.habit-card { touch-action: pan-y; }
|
||||||
|
.habit-card.dragging { opacity: 0.55; outline: 2px dashed var(--color-primary); outline-offset: 1px; }
|
||||||
|
.habit-card.dragover { outline: 2px solid var(--color-primary); outline-offset: 1px; }
|
||||||
|
.habit-card.dragover.after { border-bottom: 3px solid var(--color-primary); }
|
||||||
|
.habit-card.dragover.before { border-top: 3px solid var(--color-primary); }
|
||||||
|
|
||||||
/* ----- 日历视图 ----- */
|
/* ----- 日历视图 ----- */
|
||||||
.calendar-view { padding: 0 12px 20px; }
|
.calendar-view { padding: 0 12px 20px; }
|
||||||
.cal-month-bar { display: flex; align-items: center; gap: 10px; padding: 8px 2px; }
|
.cal-month-bar { display: flex; align-items: center; gap: 10px; padding: 8px 2px; }
|
||||||
|
|||||||
Reference in New Issue
Block a user