重构: 修复致命缺陷、清理死代码并打通类型检查与构建
本次优化在不改变业务行为的前提下,修复了多处会导致数据丢失或
功能失效的缺陷,并把此前从未跑过的类型检查与生产构建接通。
== 修复的严重缺陷 ==
服务端:
- dynamic/notice 路由在目标表缺失时用 `db.data = { dynamic: [] }`
整体替换数据库对象后落盘,会把 employee/Notice/qa 等全部业务表清空。
改为只创建缺失的那一张表。
- 列表接口在空表时访问 undefined.length 直接 500,统一补默认空数组。
- /api/employee/list 与 /login 明文返回 pwd 字段,且把含密码的
请求体写进日志。改为统一剔除敏感字段、移除参数日志。
- upd 允许请求体覆盖主键 id / createTime;改为服务端维护。
- upload 未限制扩展名与大小,且用原始扩展名拼路径。
前端:
- src/common/axios.ts 的拦截器注册在全局默认 axios 实例上,而业务
走 funjia-axios,导致拦截器全程失效;同时 funjia-axios 内部
`axios.prototype.error = () => {}` + `axios.prototype(msg)` 会抛
TypeError,使所有接口错误(含 401)被静默吞掉。现在本文件是唯一
的拦截器注册点。
- 修改密码功能形同虚设: PwdForm.onUpdate 只做 setTimeout 后 emit
成功,从不调接口;PwdDialog 又用已被拦截器解包掉的 status 判断
成败,无论结果都提示失败。
- Notice/Plugin 新增时 userId 静默丢失 (UmByClassEnhance 的
otherParams 只进 getList,不传 onAdd/onEdit),改用会话级
setCurrentUserId/getCurrentUserId。
- 修复 Login 模板绑定了从未定义的 loading、跳转到路由表里不存在
的路径;DynamicTable 里每次路由切换都触发的 debugger。
- 修复 Record/RecordUser 引用不存在的 marsLib/*、@/components/UmTable;
CodeMirror 使用 ref 却未 import; ImageCell 调用不存在的
getObjectTypeName。
== 结构优化 ==
- 新增 src/common/response.ts 与 BaseViewModel,收敛 7 个 viewModel
中重复 20+ 次的响应码判断与 CRUD 样板。
- 新增 server/routers/helpers.mjs,统一服务端取表/过滤/分页/脱敏。
- 新增 server/smoke-test.mjs,16 个用例覆盖上述修复(含整库清空回归)。
- 删除 0 引用的死文件: ImageList.vue、autoresponsive.vue、
animation.js、PwdDialog/PwdForm.vue。
== 工程配置 ==
- 修复阻塞安装与构建的三处错误:
funjiaui 指向不存在的仓库 FunjiaUI_Vue(#v1.1.3),实为
FunJiaUI_Vue_Package(#v1.3.1); pinia 锁 ~2.0.36 (vue 固定 3.2.33,
2.1+ 要求 vue ^3.3.0); App.vue 引用不存在的 funjiaui/dist/style.css,
实为包根目录 style.css。
- 新增 build/typecheck/build:only 脚本; 此前项目没有类型检查步骤。
- 移除 8 个未使用依赖,补齐 terser 与缺失的类型包。
- vite.config.ts 代理目标改由 .env 配置,移除硬编码内网地址;
增加 manualChunks 拆包。
- 服务端数据库改为不进版本库,提供 *.example.json 初始化模板。
== 验证 ==
- npx vue-tsc --noEmit : 0 错误
- npm run build : 成功 (1759 模块)
- cd server && npm run smoke : 16/16 通过
优化前的代码保留在 legacy 分支。
This commit is contained in:
+108
-157
@@ -1,157 +1,108 @@
|
||||
import cuid from "cuid";
|
||||
// import getDb from "../dbServer.mjs";
|
||||
import {getDb} from "funjia-server/lib/funjia-server.mjs";
|
||||
import _ from "lodash";
|
||||
|
||||
const getDynamic = (router) => {
|
||||
|
||||
router.post('/api/dynamic/list/:tableName', async (ctx) => {
|
||||
// 设置头类型, 如果不设置,会直接下载该页面
|
||||
ctx.type = 'application/json';
|
||||
const db = await getDb();
|
||||
const body = ctx.request.body;
|
||||
const data = db.data[ctx.params.tableName]?.filter((item) => {
|
||||
let isMatch = true;
|
||||
for (let field in body) {
|
||||
if (["page", "pageSize"].includes(field)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (typeof (item[field]) == "string") {
|
||||
isMatch = item[field]?.indexOf?.(body[field]) > -1;
|
||||
} else if (typeof (item[field]) == "number") {
|
||||
isMatch = item[field] == body[field];
|
||||
}
|
||||
if (!isMatch)
|
||||
break;
|
||||
}
|
||||
return isMatch;
|
||||
});
|
||||
|
||||
const {
|
||||
page,
|
||||
pageSize
|
||||
} = body;
|
||||
let batchData = data;
|
||||
if (page && pageSize) {
|
||||
batchData = data.slice((page - 1) * pageSize, page * pageSize);
|
||||
}
|
||||
|
||||
ctx.body = {
|
||||
code: 0,
|
||||
data: batchData || [],
|
||||
total: data.length
|
||||
};
|
||||
});
|
||||
|
||||
router.get('/api/dynamic/:tableName', async (ctx) => {
|
||||
// 设置头类型, 如果不设置,会直接下载该页面
|
||||
ctx.type = 'application/json';
|
||||
const db = await getDb();
|
||||
const data = db.data[ctx.params.tableName];
|
||||
const query = ctx.request.query;
|
||||
console.log("参数:", query, ctx.request.body, ctx.query);
|
||||
let detail = {};
|
||||
if (query.id && data) {
|
||||
detail = data.find((item) => {
|
||||
return item.id == query.id;
|
||||
});
|
||||
}
|
||||
|
||||
ctx.body = {
|
||||
code: 0,
|
||||
data: detail || {}
|
||||
};
|
||||
});
|
||||
|
||||
router.post('/api/dynamic/add/:tableName', async (ctx) => {
|
||||
ctx.type = 'application/json';
|
||||
const tableName=ctx.params.tableName;
|
||||
|
||||
const db = await getDb();
|
||||
|
||||
// You can also use this syntax if you prefer
|
||||
if (!db.data[tableName])
|
||||
db.data[tableName] = [];
|
||||
|
||||
const dynamic = db.data[tableName];
|
||||
const data = ctx.request.body;
|
||||
console.log("add:", data);
|
||||
data.id = cuid();
|
||||
data.createTime = new Date();
|
||||
dynamic.push(data)
|
||||
// Write db.data content to db.json
|
||||
await db.write()
|
||||
|
||||
ctx.body = {
|
||||
code: 0,
|
||||
};
|
||||
});
|
||||
|
||||
router.post('/api/dynamic/upd/:tableName', async (ctx) => {
|
||||
ctx.type = 'application/json';
|
||||
const tableName=ctx.params.tableName;
|
||||
|
||||
const db = await getDb();
|
||||
|
||||
// You can also use this syntax if you prefer
|
||||
if (!db.data[tableName])
|
||||
db.data = {
|
||||
dynamic: []
|
||||
}
|
||||
|
||||
const dynamic = db.data[tableName];
|
||||
|
||||
const data = ctx.request.body;
|
||||
const id = data.id;
|
||||
console.log("数据Id:", id);
|
||||
if (id && dynamic) {
|
||||
const currentDetail = dynamic.find(item => item.id == id);
|
||||
if (currentDetail) {
|
||||
_.merge(currentDetail, data);
|
||||
}
|
||||
// Write db.data content to db.json
|
||||
await db.write()
|
||||
}
|
||||
|
||||
ctx.body = {
|
||||
code: 0,
|
||||
};
|
||||
});
|
||||
|
||||
router.post('/api/dynamic/delete/:tableName', async (ctx) => {
|
||||
ctx.type = 'application/json';
|
||||
const tableName=ctx.params.tableName;
|
||||
|
||||
const db = await getDb();
|
||||
|
||||
// You can also use this syntax if you prefer
|
||||
if (!db.data[tableName])
|
||||
db.data = {
|
||||
[tableName]: []
|
||||
}
|
||||
|
||||
const dynamic = db.data[tableName];
|
||||
|
||||
const data = ctx.request.body;
|
||||
const ids = data.ids;
|
||||
if (ids?.length > 0 && dynamic) {
|
||||
let id = null;
|
||||
for (let i = 0; i < ids.length; i++) {
|
||||
id = ids[i];
|
||||
const idx = dynamic.findIndex(item => item.id == id);
|
||||
if (idx != -1) {
|
||||
dynamic.splice(idx, 1);
|
||||
}
|
||||
}
|
||||
// Write db.data content to db.json
|
||||
await db.write()
|
||||
}
|
||||
|
||||
ctx.body = {
|
||||
code: 0,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
export default getDynamic;
|
||||
import cuid from "cuid";
|
||||
import _ from "lodash";
|
||||
import { getDb } from "funjia-server/lib/funjia-server.mjs";
|
||||
import { getTable as getTableRaw, pickFilters, matchRow, listResponse } from "./helpers.mjs";
|
||||
|
||||
/**
|
||||
* 通用动态表 CRUD 路由。
|
||||
*
|
||||
* ## 改造前存在的三个严重缺陷
|
||||
*
|
||||
* 1. **upd / delete 会把整库数据清空**
|
||||
* ```js
|
||||
* if (!db.data[tableName]) db.data = { dynamic: [] } // ← 整个 db.data 被替换
|
||||
* ```
|
||||
* 当目标表不存在时,不是创建该表,而是把**整个数据库对象**换成 `{ dynamic: [] }`,
|
||||
* 紧接着 `db.write()` 落盘——employee / Notice / qa 等所有业务表瞬间消失。
|
||||
* 现在只创建缺失的那一张表。
|
||||
*
|
||||
* 2. **列表接口在表为空时抛 TypeError**
|
||||
* `db.data[name]?.filter(...)` 得到 `undefined` 后,紧接着访问
|
||||
* `data.length` / `data.slice(...)`,直接 500。`employee` / `Notice` /
|
||||
* `upload` 路由都有同样问题,这里统一补默认空数组。
|
||||
*
|
||||
* 3. **删除用 splice 逐个匹配,ids 中不存在的 id 会被静默忽略**
|
||||
* 改为过滤后回填,并返回实际删除条数,便于前端核对。
|
||||
*
|
||||
* 另外:原实现每次请求都 `console.log` 完整查询参数与写入的数据对象,
|
||||
* 密码、手机号等个人信息会直接进日志,已全部移除。
|
||||
*
|
||||
* 「过滤 / 分页 / 取表」等工具已收口到 `helpers.mjs`,本文件不再重复实现。
|
||||
*/
|
||||
|
||||
const getDynamic = (router) => {
|
||||
/** 取表并保证其为数组(关键:只在表缺失时补该表,不动 db.data 本身) */
|
||||
const getTable = (tableName) => getTableRaw(getDb, tableName);
|
||||
|
||||
router.post("/api/dynamic/list/:tableName", async (ctx) => {
|
||||
ctx.type = "application/json";
|
||||
const { table } = await getTable(ctx.params.tableName);
|
||||
|
||||
const body = ctx.request.body || {};
|
||||
const data = table.filter((item) => matchRow(item, pickFilters(body)));
|
||||
|
||||
ctx.body = listResponse(data, body);
|
||||
});
|
||||
|
||||
router.get("/api/dynamic/:tableName", async (ctx) => {
|
||||
ctx.type = "application/json";
|
||||
const { table } = await getTable(ctx.params.tableName);
|
||||
const { id } = ctx.request.query;
|
||||
|
||||
ctx.body = {
|
||||
code: 0,
|
||||
data: table.find((item) => item.id == id) || {},
|
||||
};
|
||||
});
|
||||
|
||||
router.post("/api/dynamic/add/:tableName", async (ctx) => {
|
||||
ctx.type = "application/json";
|
||||
const { db, table } = await getTable(ctx.params.tableName);
|
||||
|
||||
table.push({ ...(ctx.request.body || {}), id: cuid(), createTime: new Date() });
|
||||
await db.write();
|
||||
|
||||
ctx.body = { code: 0 };
|
||||
});
|
||||
|
||||
router.post("/api/dynamic/upd/:tableName", async (ctx) => {
|
||||
ctx.type = "application/json";
|
||||
const { db, table } = await getTable(ctx.params.tableName);
|
||||
const { id, createTime, ...patch } = ctx.request.body || {};
|
||||
// id / createTime 由服务端维护,不接受请求体覆盖
|
||||
void id;
|
||||
void createTime;
|
||||
|
||||
const current = table.find((item) => item.id == id);
|
||||
if (!current) {
|
||||
ctx.body = { code: 1, msg: "记录不存在" };
|
||||
return;
|
||||
}
|
||||
|
||||
_.merge(current, patch);
|
||||
await db.write();
|
||||
|
||||
ctx.body = { code: 0 };
|
||||
});
|
||||
|
||||
router.post("/api/dynamic/delete/:tableName", async (ctx) => {
|
||||
ctx.type = "application/json";
|
||||
const { db, table } = await getTable(ctx.params.tableName);
|
||||
const ids = (ctx.request.body?.ids || []).map(String);
|
||||
|
||||
if (ids.length === 0) {
|
||||
ctx.body = { code: 1, msg: "未指定要删除的记录" };
|
||||
return;
|
||||
}
|
||||
|
||||
const before = table.length;
|
||||
const rest = table.filter((item) => !ids.includes(String(item.id)));
|
||||
table.length = 0;
|
||||
table.push(...rest);
|
||||
await db.write();
|
||||
|
||||
ctx.body = { code: 0, data: { deleted: before - table.length } };
|
||||
});
|
||||
};
|
||||
|
||||
export default getDynamic;
|
||||
|
||||
Reference in New Issue
Block a user