Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a6ab2b322 | ||
|
|
3b48a27921 | ||
|
|
793a41ab99 |
@@ -0,0 +1,11 @@
|
|||||||
|
# v0.6.5 发布说明(2026-10-26)
|
||||||
|
|
||||||
|
## 修复
|
||||||
|
|
||||||
|
- **写操作不再因同步失败弹全屏报错**:此前任何一次写后同步失败(如服务端 500)都会以「应用内部错误」遮罩抛到界面,一次服务端故障会让每次点击都报错。现在写操作在本地提交成功即视为成功,同步失败仅记录状态(设置页「多端数据同步」可见原因),并由下一轮自动同步继续完成。
|
||||||
|
- **服务端 500 留痕**:接口异常现在会连同堆栈写入容器日志(`docker logs internlog-sync`),用于定位「同步服务返回 500」的真实原因。
|
||||||
|
|
||||||
|
## 部署
|
||||||
|
|
||||||
|
- 服务器:`cd /opt/daywork && git pull && cd server && docker compose up -d --build`
|
||||||
|
- 桌面 / 安卓:安装 0.6.5(或继续用 0.6.2+ 旧版客户端,报错遮罩问题主要影响 0.6.4 网页端)
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# v0.6.6 发布说明(2026-10-26)
|
||||||
|
|
||||||
|
## 修复「同步服务返回 500」与二次数据丢失(根因修复)
|
||||||
|
|
||||||
|
**根因**:此前数据恢复用的合并脚本把用户数据文件中的表写成了**数组**形态,而服务端按「uuid 键对象」读写。后果:数组上的附加属性在序列化时被丢弃(**每次容器重启丢失合并后新写的数据**)、删除/半途状态产生 null 行(**自然键扫描读到 null.date → 每次同步 500**)。该脚本缺陷由开发者引入,本版彻底治愈。
|
||||||
|
|
||||||
|
## 修复内容
|
||||||
|
|
||||||
|
- **服务端加载即自愈**:读取用户数据时自动把数组形态转回 uuid 键对象、剔除 null/非法行(一次性治愈线上文件,无需任何手动操作),自愈结果立即持久化
|
||||||
|
- **自然键扫描 / 墓碑生效循环**:对非对象行防御性跳过
|
||||||
|
- **客户端快照重建**:跳过 null / 无 uuid 行,垃圾行不再进入本地缓存
|
||||||
|
- 合并后丢失的增量数据:各端升级后首次同步会触发行数比对防线,**自动把设备缓存中的数据重推回服务器**
|
||||||
|
|
||||||
|
## 验证
|
||||||
|
|
||||||
|
- 表结构自愈冒烟 8/8(数组+null 混合文件 → 同步一次 → 治愈且数据完整、快照无 null)
|
||||||
|
- 存储冒烟 9/9 · 协议审计 36/36 · 用户管理审计 16/16 · 灾难恢复自救 7/7
|
||||||
|
|
||||||
|
## 部署
|
||||||
|
|
||||||
|
- 服务器:`cd /opt/daywork && git pull && cd server && docker compose up -d --build`
|
||||||
|
- 桌面 / 安卓:安装 0.6.6(网页端刷新即新版)
|
||||||
|
- 部署后各端打开一次,核对数据(工作记录/记账等);若仍有缺,检查设置页「立即同步」的结果行并反馈
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# v0.6.7 发布说明(2026-10-26)
|
||||||
|
|
||||||
|
## 全组件 UI 审核打磨(19 个界面/组件逐一过审)
|
||||||
|
|
||||||
|
**交互反馈**
|
||||||
|
- 按钮增加按下态(轻微下沉 + 主按钮阴影收起),主按钮带品牌色微阴影
|
||||||
|
- 全局细滚动条(8px 圆角,滚动区域观感统一)
|
||||||
|
- 修复侧栏 tooltip:仅折叠态(平板)显示,宽侧栏不再多余弹泡
|
||||||
|
|
||||||
|
**语义色与信息层级**
|
||||||
|
- 记账统计卡增加语义色条:收入绿 / 支出灰 / 结余蓝 / 待报销橙
|
||||||
|
- 长期计划进度条 100% 完成时变绿
|
||||||
|
- 危险确认弹窗标题红色警示
|
||||||
|
- 详情页出勤时间数字加大加粗;工作记录内容字重提升;总结页摘要数字加粗
|
||||||
|
- 密码库密码文本改等宽字体
|
||||||
|
- 记账表格金额列右对齐
|
||||||
|
|
||||||
|
**体验升级**
|
||||||
|
- 记录弹窗「耗时」新增快捷选择 chips(15/30/60/90/120 分)
|
||||||
|
- 登录页背景渐变质感、输入框加高
|
||||||
|
- 日历:今日格子淡蓝高亮、非本月格灰底、周标题字重
|
||||||
|
- 移动端「更多」弹层加拖拽指示条
|
||||||
|
|
||||||
|
## 部署
|
||||||
|
|
||||||
|
- 服务器:`cd /opt/daywork && git pull && cd server && docker compose up -d --build`(网页端即生效)
|
||||||
|
- 桌面 / 安卓:安装 0.6.7 安装包
|
||||||
-1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+2
-2
@@ -1,2 +1,2 @@
|
|||||||
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-CAumy6rT.js","./index-DHLkCnnx.js","./index-BuZbSc5_.css"])))=>i.map(i=>d[i]);
|
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-CEj0vlG8.js","./index-o_Kd7ZbB.js","./index-CsewO6wh.css"])))=>i.map(i=>d[i]);
|
||||||
import{r as s,_ as i}from"./index-DHLkCnnx.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-CAumy6rT.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
|
import{r as s,_ as i}from"./index-o_Kd7ZbB.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-CEj0vlG8.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
|
||||||
+14
-14
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+2
-2
@@ -8,8 +8,8 @@
|
|||||||
<link rel="icon" href="./icons/icon.svg" type="image/svg+xml" />
|
<link rel="icon" href="./icons/icon.svg" type="image/svg+xml" />
|
||||||
<link rel="apple-touch-icon" href="./icons/icon-192.png" />
|
<link rel="apple-touch-icon" href="./icons/icon-192.png" />
|
||||||
<title>实习工作日志</title>
|
<title>实习工作日志</title>
|
||||||
<script type="module" crossorigin src="./assets/index-DHLkCnnx.js"></script>
|
<script type="module" crossorigin src="./assets/index-o_Kd7ZbB.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="./assets/index-BuZbSc5_.css">
|
<link rel="stylesheet" crossorigin href="./assets/index-CsewO6wh.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "intern-log",
|
"name": "intern-log",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.6.4",
|
"version": "0.6.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
+12
-1
@@ -333,6 +333,7 @@ onMounted(async () => {
|
|||||||
<!-- 手机端「更多」底部弹层 -->
|
<!-- 手机端「更多」底部弹层 -->
|
||||||
<div v-if="moreOpen" class="sheet-mask" @click="moreOpen = false">
|
<div v-if="moreOpen" class="sheet-mask" @click="moreOpen = false">
|
||||||
<div class="more-sheet" @click.stop>
|
<div class="more-sheet" @click.stop>
|
||||||
|
<div class="sheet-handle"></div>
|
||||||
<div class="sheet-user num">{{ session?.username }}</div>
|
<div class="sheet-user num">{{ session?.username }}</div>
|
||||||
<button v-for="v in moreViews" :key="v.key" class="sheet-row" @click="navFromSheet(v.key)">
|
<button v-for="v in moreViews" :key="v.key" class="sheet-row" @click="navFromSheet(v.key)">
|
||||||
<Icon :name="v.icon" :size="18" />
|
<Icon :name="v.icon" :size="18" />
|
||||||
@@ -452,6 +453,7 @@ onMounted(async () => {
|
|||||||
background: var(--accent);
|
background: var(--accent);
|
||||||
}
|
}
|
||||||
.nav-label { white-space: nowrap; }
|
.nav-label { white-space: nowrap; }
|
||||||
|
/* tooltip 仅在折叠态(图标-only)显示;宽侧栏文字可见,不需要 */
|
||||||
.nav-btn::after {
|
.nav-btn::after {
|
||||||
content: attr(data-tip);
|
content: attr(data-tip);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@@ -647,10 +649,18 @@ onMounted(async () => {
|
|||||||
bottom: 0;
|
bottom: 0;
|
||||||
background: var(--bg-page);
|
background: var(--bg-page);
|
||||||
border-radius: 16px 16px 0 0;
|
border-radius: 16px 16px 0 0;
|
||||||
padding: 10px 14px calc(14px + env(safe-area-inset-bottom));
|
padding: 6px 14px calc(14px + env(safe-area-inset-bottom));
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
.sheet-handle {
|
||||||
|
width: 36px;
|
||||||
|
height: 4px;
|
||||||
|
border-radius: 2px;
|
||||||
|
background: var(--border-strong);
|
||||||
|
margin: 4px auto 8px;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
.sheet-user {
|
.sheet-user {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: var(--text-3);
|
color: var(--text-3);
|
||||||
@@ -721,6 +731,7 @@ onMounted(async () => {
|
|||||||
.brand-name, .nav-label, .nav-group { display: none; }
|
.brand-name, .nav-label, .nav-group { display: none; }
|
||||||
.nav-btn { justify-content: center; padding: 0; width: 40px; align-self: center; }
|
.nav-btn { justify-content: center; padding: 0; width: 40px; align-self: center; }
|
||||||
.nav-btn.active::before { display: none; }
|
.nav-btn.active::before { display: none; }
|
||||||
|
.nav-btn:hover::after { opacity: 1; }
|
||||||
.side-foot { flex-direction: column; gap: 6px; }
|
.side-foot { flex-direction: column; gap: 6px; }
|
||||||
.foot-name { display: none; }
|
.foot-name { display: none; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ onUnmounted(() => window.removeEventListener('keydown', onKey))
|
|||||||
<transition name="modal">
|
<transition name="modal">
|
||||||
<div v-if="open" class="mask" @click.self="emit('cancel')">
|
<div v-if="open" class="mask" @click.self="emit('cancel')">
|
||||||
<div class="dialog" role="dialog" :aria-label="title">
|
<div class="dialog" role="dialog" :aria-label="title">
|
||||||
<div class="dialog-title">{{ title }}</div>
|
<div class="dialog-title" :class="{ 'is-danger': danger }">{{ title }}</div>
|
||||||
<div class="dialog-msg">{{ message }}</div>
|
<div class="dialog-msg">{{ message }}</div>
|
||||||
<div class="dialog-btns">
|
<div class="dialog-btns">
|
||||||
<button class="btn btn-sm" @click="emit('cancel')">{{ cancelText }}</button>
|
<button class="btn btn-sm" @click="emit('cancel')">{{ cancelText }}</button>
|
||||||
@@ -42,6 +42,7 @@ onUnmounted(() => window.removeEventListener('keydown', onKey))
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.dialog { width: 380px; }
|
.dialog { width: 380px; }
|
||||||
|
.dialog-title.is-danger { color: var(--danger); }
|
||||||
.dialog-msg { margin-top: 8px; color: var(--text-2); font-size: 13px; line-height: 1.7; word-break: break-all; }
|
.dialog-msg { margin-top: 8px; color: var(--text-2); font-size: 13px; line-height: 1.7; word-break: break-all; }
|
||||||
.dialog-btns { margin-top: 20px; }
|
.dialog-btns { margin-top: 20px; }
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -420,6 +420,7 @@ async function confirmDelete() {
|
|||||||
.att-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px 16px; }
|
.att-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px 16px; }
|
||||||
.att-cell label { display: block; font-size: 12px; color: var(--text-2); margin-bottom: 4px; }
|
.att-cell label { display: block; font-size: 12px; color: var(--text-2); margin-bottom: 4px; }
|
||||||
.att-val { display: flex; align-items: center; gap: 6px; min-height: 32px; font-size: 13px; }
|
.att-val { display: flex; align-items: center; gap: 6px; min-height: 32px; font-size: 13px; }
|
||||||
|
.att-val > .num { font-size: 14px; font-weight: 600; letter-spacing: 0.2px; }
|
||||||
.val-empty { color: var(--text-3); }
|
.val-empty { color: var(--text-3); }
|
||||||
.edit-row { display: flex; gap: 6px; align-items: center; flex-wrap: wrap; }
|
.edit-row { display: flex; gap: 6px; align-items: center; flex-wrap: wrap; }
|
||||||
.time-input { width: 104px; }
|
.time-input { width: 104px; }
|
||||||
@@ -444,7 +445,7 @@ async function confirmDelete() {
|
|||||||
}
|
}
|
||||||
.item:hover { border-color: var(--border-strong); background: var(--bg-page); }
|
.item:hover { border-color: var(--border-strong); background: var(--bg-page); }
|
||||||
.item-main { display: flex; align-items: center; gap: 8px; min-height: 26px; flex-wrap: wrap; }
|
.item-main { display: flex; align-items: center; gap: 8px; min-height: 26px; flex-wrap: wrap; }
|
||||||
.item-content { cursor: text; word-break: break-all; }
|
.item-content { cursor: text; word-break: break-all; font-weight: 500; }
|
||||||
.item-meta { font-size: 12px; }
|
.item-meta { font-size: 12px; }
|
||||||
.item-sub {
|
.item-sub {
|
||||||
margin-top: 6px; padding-top: 6px; border-top: 1px dashed var(--border);
|
margin-top: 6px; padding-top: 6px; border-top: 1px dashed var(--border);
|
||||||
|
|||||||
@@ -146,6 +146,13 @@ function save() {
|
|||||||
<div class="field">
|
<div class="field">
|
||||||
<label>耗时(分钟)</label>
|
<label>耗时(分钟)</label>
|
||||||
<input class="input" type="number" min="0" v-model.number="formMinutes" placeholder="选填" />
|
<input class="input" type="number" min="0" v-model.number="formMinutes" placeholder="选填" />
|
||||||
|
<div class="min-chips">
|
||||||
|
<button
|
||||||
|
v-for="m in [15, 30, 60, 90, 120]" :key="m" type="button"
|
||||||
|
class="min-chip" :class="{ on: formMinutes === m }"
|
||||||
|
@click="formMinutes = formMinutes === m ? null : m"
|
||||||
|
>{{ m }}分</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label>主要收获</label>
|
<label>主要收获</label>
|
||||||
@@ -183,4 +190,18 @@ function save() {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.dialog { width: 560px; }
|
.dialog { width: 560px; }
|
||||||
|
.min-chips { display: flex; gap: 6px; margin-top: 6px; flex-wrap: wrap; }
|
||||||
|
.min-chip {
|
||||||
|
border: 1px solid var(--border-strong);
|
||||||
|
background: var(--bg-page);
|
||||||
|
border-radius: 999px;
|
||||||
|
height: 24px;
|
||||||
|
padding: 0 10px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--text-2);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.12s;
|
||||||
|
}
|
||||||
|
.min-chip:hover { background: var(--bg-hover); }
|
||||||
|
.min-chip.on { background: var(--accent-bg); border-color: var(--accent); color: var(--accent); }
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -78,9 +78,11 @@ button, input, select, textarea { font: inherit; color: inherit; }
|
|||||||
transition: background 0.12s, border-color 0.12s, color 0.12s;
|
transition: background 0.12s, border-color 0.12s, color 0.12s;
|
||||||
}
|
}
|
||||||
.btn:hover { background: var(--bg-hover); border-color: var(--border-strong); }
|
.btn:hover { background: var(--bg-hover); border-color: var(--border-strong); }
|
||||||
|
.btn:active { transform: translateY(1px); }
|
||||||
.btn:disabled { opacity: 0.45; cursor: not-allowed; }
|
.btn:disabled { opacity: 0.45; cursor: not-allowed; }
|
||||||
.btn-primary { background: var(--accent); border-color: var(--accent); color: #FFFFFF; }
|
.btn-primary { background: var(--accent); border-color: var(--accent); color: #FFFFFF; box-shadow: 0 1px 2px rgba(51, 112, 255, 0.28); }
|
||||||
.btn-primary:hover { background: var(--accent-deep); border-color: var(--accent-deep); }
|
.btn-primary:hover { background: var(--accent-deep); border-color: var(--accent-deep); }
|
||||||
|
.btn-primary:active { box-shadow: none; }
|
||||||
.btn-danger { color: var(--danger); border-color: var(--danger); background: var(--bg-page); }
|
.btn-danger { color: var(--danger); border-color: var(--danger); background: var(--bg-page); }
|
||||||
.btn-danger:hover { background: #FDF0F0; }
|
.btn-danger:hover { background: #FDF0F0; }
|
||||||
.btn-danger-solid { background: var(--danger); border-color: var(--danger); color: #FFFFFF; }
|
.btn-danger-solid { background: var(--danger); border-color: var(--danger); color: #FFFFFF; }
|
||||||
@@ -279,6 +281,16 @@ button, input, select, textarea { font: inherit; color: inherit; }
|
|||||||
.bar-fill { display: block; height: 100%; background: var(--accent); border-radius: 4px; }
|
.bar-fill { display: block; height: 100%; background: var(--accent); border-radius: 4px; }
|
||||||
.bar-num { font-size: 12px; flex: none; color: var(--text-3); }
|
.bar-num { font-size: 12px; flex: none; color: var(--text-3); }
|
||||||
|
|
||||||
|
/* ---------- 滚动条(桌面细滚动条,移动端系统默认) ---------- */
|
||||||
|
::-webkit-scrollbar { width: 8px; height: 8px; }
|
||||||
|
::-webkit-scrollbar-thumb { background: #D3D7DE; border-radius: 4px; }
|
||||||
|
::-webkit-scrollbar-thumb:hover { background: #B9BEC7; }
|
||||||
|
::-webkit-scrollbar-track { background: transparent; }
|
||||||
|
::-webkit-scrollbar-corner { background: transparent; }
|
||||||
|
|
||||||
|
/* 记账表格:金额列右对齐(数字位对齐更利扫读) */
|
||||||
|
.tx-table th:nth-child(3), .tx-table td:nth-child(3) { text-align: right; }
|
||||||
|
|
||||||
/* ---------- 图标 ---------- */
|
/* ---------- 图标 ---------- */
|
||||||
.icon { display: inline-flex; align-items: center; justify-content: center; flex: none; }
|
.icon { display: inline-flex; align-items: center; justify-content: center; flex: none; }
|
||||||
.icon svg { width: 100%; height: 100%; display: block; }
|
.icon svg { width: 100%; height: 100%; display: block; }
|
||||||
|
|||||||
@@ -159,14 +159,15 @@ export async function syncWithStoredConfig(): Promise<SyncResult> {
|
|||||||
return runSync({ baseUrl: await baseOf(), username: creds.username, password: creds.password })
|
return runSync({ baseUrl: await baseOf(), username: creds.username, password: creds.password })
|
||||||
}
|
}
|
||||||
|
|
||||||
// 界面写操作完成后调用:立即推送差异并以服务器快照重建缓存(失败会把缓存回退到服务器真值)
|
// 界面写操作完成后调用:立即推送差异并以服务器快照重建缓存
|
||||||
|
// 注意:绝不向界面抛出——写操作本身已在本地提交成功,同步失败只记录状态
|
||||||
|
// (设置页可见 + 下一轮自动同步续传),否则一次服务端故障会把每次点击都变成全屏报错
|
||||||
export async function flushAfterWrite(): Promise<void> {
|
export async function flushAfterWrite(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
await syncWithStoredConfig()
|
await syncWithStoredConfig()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
syncLastError.value = e instanceof Error ? e.message : String(e)
|
syncLastError.value = e instanceof Error ? e.message : String(e)
|
||||||
try { await syncWithStoredConfig() } catch { /* 服务器不可达:本地暂存修改,下次自动推送或全量刷新时对齐 */ }
|
try { await syncWithStoredConfig() } catch { /* 服务器不可达:本地暂存修改,下次自动推送或全量刷新时对齐 */ }
|
||||||
throw e
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,7 +438,9 @@ async function applySnapshot(
|
|||||||
const prevById = new Map(prevRows.map(r => [pkOf(t, r), r]))
|
const prevById = new Map(prevRows.map(r => [pkOf(t, r), r]))
|
||||||
const prevByUuid = new Map(prevRows.filter(r => r.uuid).map(r => [r.uuid as string, r]))
|
const prevByUuid = new Map(prevRows.filter(r => r.uuid).map(r => [r.uuid as string, r]))
|
||||||
|
|
||||||
const live: AnyRow[] = (serverTables[t] || []).filter(r => !dead.has(t + '|' + r.uuid))
|
const live: AnyRow[] = (serverTables[t] || [])
|
||||||
|
.filter(r => r && typeof r === 'object' && r.uuid)
|
||||||
|
.filter(r => !dead.has(t + '|' + r.uuid))
|
||||||
// 设置表的临时键:不写回本地缓存;顺手在服务端也清掉(下一轮推送墓碑)
|
// 设置表的临时键:不写回本地缓存;顺手在服务端也清掉(下一轮推送墓碑)
|
||||||
const filtered = live.filter(r => !(t === 'setting' && EXCLUDE_SETTING_KEYS.has(r.key)))
|
const filtered = live.filter(r => !(t === 'setting' && EXCLUDE_SETTING_KEYS.has(r.key)))
|
||||||
const tmpKeys = live.filter(r => t === 'setting' && EXCLUDE_SETTING_KEYS.has(r.key))
|
const tmpKeys = live.filter(r => t === 'setting' && EXCLUDE_SETTING_KEYS.has(r.key))
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ watch(focusDate, d => {
|
|||||||
<button
|
<button
|
||||||
v-for="(c, idx) in cells" :key="idx"
|
v-for="(c, idx) in cells" :key="idx"
|
||||||
class="cal-cell"
|
class="cal-cell"
|
||||||
:class="{ blank: !c.inMonth, weekend: c.weekend, selected: selected === c.date }"
|
:class="{ blank: !c.inMonth, weekend: c.weekend, selected: selected === c.date, 'is-today': c.date === t }"
|
||||||
:title="c.inMonth ? cellTitle(c.date) : undefined"
|
:title="c.inMonth ? cellTitle(c.date) : undefined"
|
||||||
@click="selectDay(c.date, c.inMonth)"
|
@click="selectDay(c.date, c.inMonth)"
|
||||||
>
|
>
|
||||||
@@ -149,6 +149,7 @@ watch(focusDate, d => {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 7px 0;
|
padding: 7px 0;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
font-weight: 500;
|
||||||
color: var(--text-3);
|
color: var(--text-3);
|
||||||
}
|
}
|
||||||
.cal-cell {
|
.cal-cell {
|
||||||
@@ -163,7 +164,8 @@ watch(focusDate, d => {
|
|||||||
transition: background 0.12s;
|
transition: background 0.12s;
|
||||||
}
|
}
|
||||||
.cal-cell:hover { background: var(--bg-subtle); }
|
.cal-cell:hover { background: var(--bg-subtle); }
|
||||||
.cal-cell.blank { cursor: default; }
|
.cal-cell.blank { cursor: default; background: var(--bg-subtle); }
|
||||||
|
.cal-cell.is-today { background: #F5F9FF; }
|
||||||
.cal-cell.selected { background: var(--accent-bg); box-shadow: inset 0 0 0 2px var(--accent); }
|
.cal-cell.selected { background: var(--accent-bg); box-shadow: inset 0 0 0 2px var(--accent); }
|
||||||
.daynum.today { color: var(--accent); font-weight: 600; }
|
.daynum.today { color: var(--accent); font-weight: 600; }
|
||||||
.cal-cell.weekend .daynum { color: var(--text-3); }
|
.cal-cell.weekend .daynum { color: var(--text-3); }
|
||||||
|
|||||||
@@ -236,10 +236,10 @@ async function confirmDelete() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="cards">
|
<div class="cards">
|
||||||
<div class="card stat-card"><div class="muted">本月收入(元)</div><div class="stat-num num amt-income">{{ yuan(summary.income) }}</div></div>
|
<div class="card stat-card stat-income"><div class="muted">本月收入(元)</div><div class="stat-num num amt-income">{{ yuan(summary.income) }}</div></div>
|
||||||
<div class="card stat-card"><div class="muted">本月支出(元)</div><div class="stat-num num">{{ yuan(summary.expense) }}</div></div>
|
<div class="card stat-card stat-expense"><div class="muted">本月支出(元)</div><div class="stat-num num">{{ yuan(summary.expense) }}</div></div>
|
||||||
<div class="card stat-card"><div class="muted">本月结余(元)</div><div class="stat-num num" :class="{ 'amt-income': summary.balance >= 0, 'amt-expense': summary.balance < 0 }">{{ yuan(summary.balance) }}</div></div>
|
<div class="card stat-card stat-balance"><div class="muted">本月结余(元)</div><div class="stat-num num" :class="{ 'amt-income': summary.balance >= 0, 'amt-expense': summary.balance < 0 }">{{ yuan(summary.balance) }}</div></div>
|
||||||
<div class="card stat-card"><div class="muted">待报销(元)</div><div class="stat-num num amt-warn">{{ yuan(summary.pending) }}</div></div>
|
<div class="card stat-card stat-pending"><div class="muted">待报销(元)</div><div class="stat-num num amt-warn">{{ yuan(summary.pending) }}</div></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card sec" v-if="categoryStats.length">
|
<div class="card sec" v-if="categoryStats.length">
|
||||||
@@ -319,6 +319,11 @@ async function confirmDelete() {
|
|||||||
.w-filter { width: 110px; flex: none; }
|
.w-filter { width: 110px; flex: none; }
|
||||||
|
|
||||||
.cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 12px; }
|
.cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 12px; }
|
||||||
|
.stat-card { border-left: 3px solid var(--border); }
|
||||||
|
.stat-income { border-left-color: var(--ok); }
|
||||||
|
.stat-expense { border-left-color: var(--text-3); }
|
||||||
|
.stat-balance { border-left-color: var(--accent); }
|
||||||
|
.stat-pending { border-left-color: var(--warn); }
|
||||||
|
|
||||||
.card.sec, .card.section { margin-top: 12px; }
|
.card.sec, .card.section { margin-top: 12px; }
|
||||||
.bar-label { width: 56px; }
|
.bar-label { width: 56px; }
|
||||||
|
|||||||
@@ -78,12 +78,13 @@ async function submit() {
|
|||||||
.login-page {
|
.login-page {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
min-height: 100dvh;
|
min-height: 100dvh;
|
||||||
background: var(--bg-app);
|
background: linear-gradient(180deg, #EBF0F8 0%, var(--bg-app) 46%);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
}
|
}
|
||||||
|
.login-card .input { height: 38px; }
|
||||||
.login-card {
|
.login-card {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
|||||||
@@ -236,7 +236,10 @@ function weekday(s: string): string {
|
|||||||
<div class="goal-bar">
|
<div class="goal-bar">
|
||||||
<span
|
<span
|
||||||
class="goal-bar-fill"
|
class="goal-bar-fill"
|
||||||
:style="{ width: (goalProg[String(g.id)] ? Math.round(goalProg[String(g.id)].done / Math.max(1, goalProg[String(g.id)].total) * 100) : 0) + '%' }"
|
:style="{
|
||||||
|
width: (goalProg[String(g.id)] ? Math.round(goalProg[String(g.id)].done / Math.max(1, goalProg[String(g.id)].total) * 100) : 0) + '%',
|
||||||
|
background: goalProg[String(g.id)] && goalProg[String(g.id)].done >= goalProg[String(g.id)].total && goalProg[String(g.id)].total > 0 ? 'var(--ok)' : 'var(--accent)'
|
||||||
|
}"
|
||||||
></span>
|
></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="muted num goal-meta">
|
<div class="muted num goal-meta">
|
||||||
|
|||||||
@@ -221,6 +221,7 @@ function undoPolish() {
|
|||||||
.md-editor { min-height: 420px; line-height: 1.7; }
|
.md-editor { min-height: 420px; line-height: 1.7; }
|
||||||
|
|
||||||
.sum-row { display: flex; justify-content: space-between; padding: 3px 0; font-size: 12px; }
|
.sum-row { display: flex; justify-content: space-between; padding: 3px 0; font-size: 12px; }
|
||||||
|
.sum-row span:last-child { font-weight: 500; }
|
||||||
.section-sub { font-weight: 600; margin: 12px 0 4px; font-size: 12px; color: var(--text-2); }
|
.section-sub { font-weight: 600; margin: 12px 0 4px; font-size: 12px; color: var(--text-2); }
|
||||||
.sum-item { font-size: 12px; padding: 2px 0; word-break: break-all; }
|
.sum-item { font-size: 12px; padding: 2px 0; word-break: break-all; }
|
||||||
.sum-empty { font-size: 12px; }
|
.sum-empty { font-size: 12px; }
|
||||||
|
|||||||
@@ -375,7 +375,7 @@ async function doChangePwd() {
|
|||||||
.td-system { font-weight: 500; }
|
.td-system { font-weight: 500; }
|
||||||
.th-ops { width: 150px; }
|
.th-ops { width: 150px; }
|
||||||
.pwd-cell { display: flex; align-items: center; gap: 4px; flex-wrap: wrap; }
|
.pwd-cell { display: flex; align-items: center; gap: 4px; flex-wrap: wrap; }
|
||||||
.pwd-text { letter-spacing: 1px; }
|
.pwd-text { letter-spacing: 1px; font-family: ui-monospace, SFMono-Regular, Consolas, monospace; }
|
||||||
.copyable { cursor: pointer; }
|
.copyable { cursor: pointer; }
|
||||||
.copyable:hover { color: var(--accent); }
|
.copyable:hover { color: var(--accent); }
|
||||||
.ops { display: flex; gap: 4px; flex-wrap: wrap; }
|
.ops { display: flex; gap: 4px; flex-wrap: wrap; }
|
||||||
|
|||||||
Binary file not shown.
@@ -0,0 +1,52 @@
|
|||||||
|
// 表结构自愈冒烟:数组形态 + null 行 + 合法行混合 → 同步一次 → 治愈为 uuid 键对象且数据完整
|
||||||
|
const BASE = 'http://127.0.0.1:3780'
|
||||||
|
let pass = 0, fail = 0
|
||||||
|
function check(name, ok, detail) {
|
||||||
|
if (ok) { pass++; console.log(' PASS ' + name) } else { fail++; console.log(' FAIL ' + name + (detail ? ' -> ' + detail : '')) }
|
||||||
|
}
|
||||||
|
async function j(path, body, token) {
|
||||||
|
const r = await fetch(BASE + path, { method: 'POST', headers: { 'Content-Type': 'application/json', ...(token ? { Authorization: 'Bearer ' + token } : {}) }, body: body ? JSON.stringify(body) : undefined })
|
||||||
|
return { status: r.status, json: await r.json().catch(() => ({})) }
|
||||||
|
}
|
||||||
|
async function main() {
|
||||||
|
const fsp = await import('fs')
|
||||||
|
const reg = await j('/api/auth/register', { username: 'healtest', password: 'test123456' })
|
||||||
|
const tok = reg.json.token
|
||||||
|
const file = 'server/data/users/' + reg.json.userId + '.json'
|
||||||
|
// 构造坏文件:work_log 是数组 + 含 null 槽位;attendance 数组含 null;memo 正常对象但混入 null 行
|
||||||
|
const bad = {
|
||||||
|
userId: reg.json.userId, cursor: 0,
|
||||||
|
created_at: '2026-10-26T12:00:00.000Z',
|
||||||
|
tables: {
|
||||||
|
work_log: [ { uuid: 'wl1', date: '2026-10-20', created_at: '2026-10-20T00:00:00', updated_at: '2026-10-20T00:00:00' }, null, { uuid: 'wl2', date: '2026-10-21', created_at: '2026-10-21T00:00:00', updated_at: '2026-10-21T00:00:00' } ],
|
||||||
|
attendance: [ null, { uuid: 'at1', date: '2026-10-20', created_at: '2026-10-20T00:00:00', updated_at: '2026-10-20T00:00:00' } ],
|
||||||
|
memo: { m1: { uuid: 'm1', title: '幸存备忘', content: '', created_at: '2026-10-20T00:00:00', updated_at: '2026-10-20T00:00:00' }, bad: null },
|
||||||
|
plan: []
|
||||||
|
},
|
||||||
|
tombstones: { memo: { g1: null }, work_log: {} }
|
||||||
|
}
|
||||||
|
fsp.mkdirSync('server/data/users', { recursive: true })
|
||||||
|
fsp.writeFileSync(file, JSON.stringify(bad))
|
||||||
|
|
||||||
|
// 推送一行 work_log(自然键 date 扫描会遍历表)→ 修复前这里 500,修复后应 200
|
||||||
|
const r1 = await j('/api/sync', { device: 't', tables: { work_log: [ { uuid: 'wl3', date: '2026-10-22', created_at: '2026-10-22T00:00:00', updated_at: '2026-10-22T00:00:00' } ] }, tombstones: [] }, tok)
|
||||||
|
check('同步 200(不再读 null.date)', r1.status === 200, 'status=' + r1.status)
|
||||||
|
|
||||||
|
const healed = JSON.parse(fsp.readFileSync(file, 'utf8'))
|
||||||
|
check('work_log 已转 uuid 键对象', !Array.isArray(healed.tables.work_log) && !!healed.tables.work_log.wl1 && !!healed.tables.work_log.wl3)
|
||||||
|
check('null 行已剔除', !('1' in (healed.tables.work_log || {})) && !healed.tables.attendance['0'])
|
||||||
|
check('attendance 幸存行保留', healed.tables.attendance && healed.tables.attendance.at1)
|
||||||
|
check('memo 正常对象保留', healed.tables.memo && healed.tables.memo.m1)
|
||||||
|
check('null 墓碑已清理', !healed.tombstones.memo || !healed.tombstones.memo.g1)
|
||||||
|
check('全表均为对象形态', Object.values(healed.tables).every(x => x && !Array.isArray(x) && typeof x === 'object'))
|
||||||
|
|
||||||
|
// 推送 m1 更新(memo 无自然键)→ 再拉全量,快照中不得出现 null
|
||||||
|
await j('/api/sync', { device: 't', tables: { memo: [ { uuid: 'm2', title: '新备忘', content: '', created_at: '2026-10-26T00:00:00', updated_at: '2026-10-26T00:00:00' } ] }, tombstones: [] }, tok)
|
||||||
|
const r3 = await j('/api/sync', { device: 't', tables: {}, tombstones: [] }, tok)
|
||||||
|
const flat = Object.values(r3.json.tables || {}).flat()
|
||||||
|
check('权威快照不含 null/无uuid行', r3.status === 200 && flat.every(x => x && typeof x === 'object' && x.uuid), JSON.stringify(flat.filter(x => !x || !x.uuid)).slice(0, 100))
|
||||||
|
|
||||||
|
console.log('RESULT: ' + (fail === 0 ? 'ALL PASS ' + pass : 'FAIL ' + fail + '/' + (pass + fail)))
|
||||||
|
if (fail) process.exit(1)
|
||||||
|
}
|
||||||
|
main().catch(e => { console.error('SMOKE ERROR', e); process.exit(1) })
|
||||||
+52
-8
@@ -140,20 +140,60 @@ function userFile(userId) { return path.join(DATA_DIR, 'users', userId + '.json'
|
|||||||
function emptyUserData(userId) {
|
function emptyUserData(userId) {
|
||||||
return { userId, cursor: 0, tables: {}, tombstones: {}, created_at: '' }
|
return { userId, cursor: 0, tables: {}, tombstones: {}, created_at: '' }
|
||||||
}
|
}
|
||||||
|
// 表结构自愈:tables[t] 必须是「uuid -> 行对象」;
|
||||||
|
// 兼容历史误存为数组的形态(并剔除 null / 非法行),避免自然键扫描在 null 上崩溃、避免序列化丢弃行
|
||||||
|
function sanitizeTables(data) {
|
||||||
|
let healed = false
|
||||||
|
const src = data.tables && typeof data.tables === 'object' && !Array.isArray(data.tables) ? data.tables : null
|
||||||
|
if (!src) { data.tables = {}; return true }
|
||||||
|
const out = {}
|
||||||
|
for (const t of Object.keys(src)) {
|
||||||
|
const container = src[t]
|
||||||
|
if (Array.isArray(container)) {
|
||||||
|
healed = true
|
||||||
|
const m = {}
|
||||||
|
for (const row of container) {
|
||||||
|
if (row && typeof row === 'object' && row.uuid) m[row.uuid] = row
|
||||||
|
}
|
||||||
|
out[t] = m
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (!container || typeof container !== 'object') { healed = true; out[t] = {}; continue }
|
||||||
|
const m = {}
|
||||||
|
for (const k of Object.keys(container)) {
|
||||||
|
const row = container[k]
|
||||||
|
if (!row || typeof row !== 'object' || Array.isArray(row) || !row.uuid) { healed = true; continue }
|
||||||
|
m[k] = row
|
||||||
|
}
|
||||||
|
out[t] = m
|
||||||
|
}
|
||||||
|
data.tables = out
|
||||||
|
if (!data.tombstones || typeof data.tombstones !== 'object' || Array.isArray(data.tombstones)) { data.tombstones = {}; healed = true }
|
||||||
|
for (const t of Object.keys(data.tombstones)) {
|
||||||
|
const bucket = data.tombstones[t]
|
||||||
|
if (!bucket || typeof bucket !== 'object' || Array.isArray(bucket)) { delete data.tombstones[t]; healed = true; continue }
|
||||||
|
for (const k of Object.keys(bucket)) {
|
||||||
|
if (!bucket[k]) { delete bucket[k]; healed = true }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return healed
|
||||||
|
}
|
||||||
function loadUserData(userId) {
|
function loadUserData(userId) {
|
||||||
const full = userFile(userId)
|
const full = userFile(userId)
|
||||||
if (fs.existsSync(full)) {
|
if (fs.existsSync(full)) {
|
||||||
try {
|
try {
|
||||||
return JSON.parse(fs.readFileSync(full, 'utf-8'))
|
const data = JSON.parse(fs.readFileSync(full, 'utf-8'))
|
||||||
|
const healed = sanitizeTables(data)
|
||||||
|
return { data, healed }
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// 数据文件损坏:隔离保留原件并大声报错,绝不静默当作空数据(否则客户端同步会引发连锁覆盖)
|
// 数据文件损坏:隔离保留原件并大声报错,绝不静默当作空数据(否则客户端同步会引发连锁覆盖)
|
||||||
const quarantine = full + '.corrupt-' + new Date().toISOString().replace(/[:.]/g, '-')
|
const quarantine = full + '.corrupt-' + new Date().toISOString().replace(/[:.]/g, '-')
|
||||||
try { fs.renameSync(full, quarantine) } catch { /* 忽略 */ }
|
try { fs.renameSync(full, quarantine) } catch { /* 忽略 */ }
|
||||||
console.error('[存储] 用户数据文件解析失败,已隔离:' + quarantine + '(' + (e && e.message) + ')')
|
console.error('[存储] 用户数据文件解析失败,已隔离:' + quarantine + '(' + (e && e.message) + ')')
|
||||||
return emptyUserData(userId)
|
return { data: emptyUserData(userId), healed: false }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return emptyUserData(userId)
|
return { data: emptyUserData(userId), healed: false }
|
||||||
}
|
}
|
||||||
// 墓碑回收:超过保留期的墓碑删除(全量快照重建的客户端不依赖过期墓碑也能收敛)
|
// 墓碑回收:超过保留期的墓碑删除(全量快照重建的客户端不依赖过期墓碑也能收敛)
|
||||||
function gcTombstones(data) {
|
function gcTombstones(data) {
|
||||||
@@ -403,8 +443,9 @@ async function handle(req, res) {
|
|||||||
const auth = verifyToken(String(req.headers['authorization'] || '').replace(/^Bearer\s+/i, '').trim())
|
const auth = verifyToken(String(req.headers['authorization'] || '').replace(/^Bearer\s+/i, '').trim())
|
||||||
if (!auth || !tokenUsable(auth)) { json(res, 401, { error: '未认证' }); return }
|
if (!auth || !tokenUsable(auth)) { json(res, 401, { error: '未认证' }); return }
|
||||||
const body = await readBody(req)
|
const body = await readBody(req)
|
||||||
const userData = loadUserData(auth.userId)
|
const loaded = loadUserData(auth.userId)
|
||||||
let dirty = false
|
const userData = loaded.data
|
||||||
|
let dirty = loaded.healed
|
||||||
if (userData.cursor == null) { userData.cursor = 0; dirty = true }
|
if (userData.cursor == null) { userData.cursor = 0; dirty = true }
|
||||||
if (!userData.tables) { userData.tables = {}; dirty = true }
|
if (!userData.tables) { userData.tables = {}; dirty = true }
|
||||||
if (!userData.tombstones) { userData.tombstones = {}; dirty = true }
|
if (!userData.tombstones) { userData.tombstones = {}; dirty = true }
|
||||||
@@ -429,7 +470,9 @@ async function handle(req, res) {
|
|||||||
if (nkVal) {
|
if (nkVal) {
|
||||||
for (const u2 of Object.keys(userData.tables[t])) {
|
for (const u2 of Object.keys(userData.tables[t])) {
|
||||||
if (u2 === row.uuid) continue
|
if (u2 === row.uuid) continue
|
||||||
if (String(userData.tables[t][u2][nk] || '') === nkVal) { conflictUuid = u2; break }
|
const other = userData.tables[t][u2]
|
||||||
|
if (!other || typeof other !== 'object') continue
|
||||||
|
if (String(other[nk] || '') === nkVal) { conflictUuid = u2; break }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -484,7 +527,7 @@ async function handle(req, res) {
|
|||||||
const tombs = userData.tombstones[t] || {}
|
const tombs = userData.tombstones[t] || {}
|
||||||
for (const [u, deletedAt] of Object.entries(tombs)) {
|
for (const [u, deletedAt] of Object.entries(tombs)) {
|
||||||
const row = userData.tables[t][u]
|
const row = userData.tables[t][u]
|
||||||
if (row && String(row.updated_at || '') <= String(deletedAt)) delete userData.tables[t][u]
|
if (row && typeof row === 'object' && String(row.updated_at || '') <= String(deletedAt)) delete userData.tables[t][u]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (gcTombstones(userData) > 0) dirty = true
|
if (gcTombstones(userData) > 0) dirty = true
|
||||||
@@ -621,7 +664,8 @@ setInterval(doBackup, 24 * 60 * 60 * 1000)
|
|||||||
// ---------- HTTP 服务 ----------
|
// ---------- HTTP 服务 ----------
|
||||||
const server = http.createServer((req, res) => {
|
const server = http.createServer((req, res) => {
|
||||||
handle(req, res).catch(err => {
|
handle(req, res).catch(err => {
|
||||||
json(res, 500, { error: err.message || 'server error' })
|
console.error('[api] ' + req.method + ' ' + req.url + ' -> 500: ' + ((err && (err.stack || err.message)) || String(err)))
|
||||||
|
json(res, 500, { error: (err && err.message) || 'server error' })
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user