befly 3.18.22 → 3.19.0

package/apis/auth/login.js

@@ -18,7 +18,8 @@ export default {
         password: adminTable.password,
         loginType: {
             name: "登录类型",
-            input: "/^(username|email|phone)$/",
+            input: "enum",
+            check: "username|email|phone",
             min: null,
             max: null
         }

package/checks/api.js

@@ -1,8 +1,9 @@
 import * as z from "zod";
 
+import { FIELD_RULE_DEFAULT_MAX, FIELD_RULE_DEFAULT_MIN, FIELD_RULE_INPUT_TYPES } from "../configs/constConfig.js";
 import { Logger } from "../lib/logger.js";
 import { formatZodIssues } from "../utils/formatZodIssues.js";
-import { isNoTrimStringAllowEmpty } from "../utils/is.js";
+import { isNoTrimStringAllowEmpty, isNullable, isRegexInput } from "../utils/is.js";
 
 z.config(z.locales.zhCN());
 
@@ -10,14 +11,69 @@ const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首
 const lowerCamelRegex = /^_?[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*$/;
 const apiPathRegex = /^\/api\/(?:core\/[a-z][a-zA-Z0-9]*(?:\/[a-z][a-zA-Z0-9]*)*|(?!app(?:\/|$))[a-z][a-zA-Z0-9]*(?:\/[a-z][a-zA-Z0-9]*)*)$/;
 
+function addIssue(context, path, message) {
+    context.addIssue({
+        path: path,
+        message: message
+    });
+}
+
 const fieldSchema = z
     .object({
         name: noTrimString.min(1),
-        input: noTrimString.min(1),
+        input: z.enum(FIELD_RULE_INPUT_TYPES),
+        check: noTrimString.optional(),
         min: z.number().nullable().optional(),
-        max: z.number().nullable().optional()
+        max: z.number().nullable().optional(),
+        detail: z.string().optional()
     })
-    .strict();
+    .strict()
+    .superRefine((value, context) => {
+        const min = isNullable(value.min) ? FIELD_RULE_DEFAULT_MIN : value.min;
+        const max = isNullable(value.max) ? FIELD_RULE_DEFAULT_MAX : value.max;
+        if (min > max) {
+            addIssue(context, ["min"], "min 不能大于 max");
+        }
+
+        const checkValue = value.check;
+        const input = value.input;
+
+        if ((input === "enum" || input === "enumNumber" || input === "enumInteger" || input === "regexp") && (!checkValue || checkValue.length === 0)) {
+            addIssue(context, ["check"], `${input} 必须提供 check`);
+            return;
+        }
+
+        if (input === "regexp" && checkValue && !isRegexInput(checkValue)) {
+            addIssue(context, ["check"], "regexp.check 必须是正则字面量或 @ 别名");
+            return;
+        }
+
+        if ((input === "enum" || input === "enumNumber" || input === "enumInteger") && checkValue) {
+            const items = String(checkValue)
+                .split("|")
+                .map((item) => item.trim())
+                .filter((item) => item.length > 0);
+
+            if (items.length === 0) {
+                addIssue(context, ["check"], `${input}.check 必须是非空枚举值列表`);
+                return;
+            }
+
+            if (input === "enumNumber" || input === "enumInteger") {
+                for (const item of items) {
+                    const num = Number(item);
+                    if (!Number.isFinite(num)) {
+                        addIssue(context, ["check"], `${input}.check 存在非法数字值: ${item}`);
+                        return;
+                    }
+                    if (input === "enumInteger" && !Number.isInteger(num)) {
+                        addIssue(context, ["check"], `${input}.check 存在非法整数值: ${item}`);
+                        return;
+                    }
+                }
+            }
+        }
+    });
 
 const fieldsSchema = z.record(z.string().regex(lowerCamelRegex), fieldSchema);
 

package/checks/table.js

@@ -1,22 +1,15 @@
 import * as z from "zod";
 
+import { FIELD_RULE_DEFAULT_MAX, FIELD_RULE_DEFAULT_MIN, FIELD_RULE_INPUT_TYPES } from "../configs/constConfig.js";
 import { Logger } from "../lib/logger.js";
 import { formatZodIssues } from "../utils/formatZodIssues.js";
-import { isNoTrimStringAllowEmpty, isNullable } from "../utils/is.js";
+import { isNoTrimStringAllowEmpty, isNullable, isRegexInput } from "../utils/is.js";
 
 z.config(z.locales.zhCN());
 
 const lowerCamelRegex = /^_?[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*$/;
 const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首尾空格");
-const INPUT_TYPES = ["number", "integer", "string", "char", "array", "array_number", "array_integer", "json", "json_number", "json_integer"];
-
-const inputRegexLiteral = /^\/.*?\/[gimsuy]*$/;
-const inputEnumRegex = /^[^/].*\|.*$/;
-const inputAliasRegex = /^@.+$/;
-
-const inputSchema = z.union([z.enum(INPUT_TYPES), z.string().regex(inputRegexLiteral), z.string().regex(inputEnumRegex), z.string().regex(inputAliasRegex)]).refine(isNoTrimStringAllowEmpty, "不允许首尾空格");
-const DEFAULT_MIN = 0;
-const DEFAULT_MAX = Number.MAX_SAFE_INTEGER;
+const inputSchema = z.enum(FIELD_RULE_INPUT_TYPES);
 
 function addIssue(context, path, message) {
     context.addIssue({
@@ -29,16 +22,57 @@ const fieldDefSchema = z
     .object({
         name: z.string().min(1),
         input: inputSchema,
+        check: noTrimString.optional(),
         min: z.number().nullable().optional(),
-        max: z.number().nullable().optional()
+        max: z.number().nullable().optional(),
+        detail: z.string().optional()
     })
     .strict()
     .superRefine((value, context) => {
-        const min = isNullable(value.min) ? DEFAULT_MIN : value.min;
-        const max = isNullable(value.max) ? DEFAULT_MAX : value.max;
+        const min = isNullable(value.min) ? FIELD_RULE_DEFAULT_MIN : value.min;
+        const max = isNullable(value.max) ? FIELD_RULE_DEFAULT_MAX : value.max;
         if (min > max) {
             addIssue(context, ["min"], "min 不能大于 max");
         }
+
+        const checkValue = value.check;
+        const input = value.input;
+
+        if ((input === "enum" || input === "enumNumber" || input === "enumInteger" || input === "regexp") && (!checkValue || checkValue.length === 0)) {
+            addIssue(context, ["check"], `${input} 必须提供 check`);
+            return;
+        }
+
+        if (input === "regexp" && checkValue && !isRegexInput(checkValue)) {
+            addIssue(context, ["check"], "regexp.check 必须是正则字面量或 @ 别名");
+            return;
+        }
+
+        if ((input === "enum" || input === "enumNumber" || input === "enumInteger") && checkValue) {
+            const items = String(checkValue)
+                .split("|")
+                .map((item) => item.trim())
+                .filter((item) => item.length > 0);
+
+            if (items.length === 0) {
+                addIssue(context, ["check"], `${input}.check 必须是非空枚举值列表`);
+                return;
+            }
+
+            if (input === "enumNumber" || input === "enumInteger") {
+                for (const item of items) {
+                    const num = Number(item);
+                    if (!Number.isFinite(num)) {
+                        addIssue(context, ["check"], `${input}.check 存在非法数字值: ${item}`);
+                        return;
+                    }
+                    if (input === "enumInteger" && !Number.isInteger(num)) {
+                        addIssue(context, ["check"], `${input}.check 存在非法整数值: ${item}`);
+                        return;
+                    }
+                }
+            }
+        }
     });
 
 const tableContentSchema = z.record(z.string().regex(lowerCamelRegex), fieldDefSchema);

package/configs/constConfig.js

@@ -32,3 +32,14 @@ export const RUN_MODE_VALUES = ["development", "production"];
 
 // 数据库 ID 生成模式可选值
 export const DB_ID_MODE_VALUES = ["timeId", "autoId"];
+
+// ==========================
+// 字段验证规则配置
+// ==========================
+
+// 字段 input 可选值（统一用于 validator / checkTable / checkApi）
+export const FIELD_RULE_INPUT_TYPES = ["number", "integer", "string", "char", "array", "arrayNumber", "arrayInteger", "json", "jsonNumber", "jsonInteger", "regexp", "enum", "enumNumber", "enumInteger"];
+
+// 字段 min/max 缺省值
+export const FIELD_RULE_DEFAULT_MIN = 0;
+export const FIELD_RULE_DEFAULT_MAX = Number.MAX_SAFE_INTEGER;

package/lib/dbHelper/dataOps.js

@@ -551,6 +551,7 @@ export const dataOpsMethods = {
                     redis: this.redis,
                     dbName: this.dbName,
                     sql: tx,
+                    isTransaction: true,
                     idMode: this.idMode,
                     beflyMode: this.beflyMode
                 });

package/lib/dbHelper/index.js

@@ -15,7 +15,7 @@ function DbHelper(options) {
     this.dbName = options.dbName;
 
     this.sql = options.sql || null;
-    this.isTransaction = Boolean(options.sql);
+    this.isTransaction = options.isTransaction === true;
     this.idMode = options.idMode === "autoId" ? "autoId" : "timeId";
     this.beflyMode = options.beflyMode === 0 ? 0 : 1;
 }

package/lib/validator.js

@@ -4,10 +4,12 @@
  */
 
 import RegexAliases from "../configs/regexpAlias.json";
+import { FIELD_RULE_DEFAULT_MAX, FIELD_RULE_DEFAULT_MIN, FIELD_RULE_INPUT_TYPES } from "../configs/constConfig.js";
 import { getCompiledRegex } from "../utils/regexpUtil.js";
-import { isEnumInput, isFiniteNumber, isIntegerNumber, isJsonObject, isJsonPrimitive, isJsonStructure, isNullable, isNumber, isPlainObject, isRegexInput, isString } from "../utils/is.js";
+import { isFiniteNumber, isIntegerNumber, isJsonObject, isJsonPrimitive, isJsonStructure, isNullable, isNumber, isPlainObject, isRegexInput, isString } from "../utils/is.js";
 
-const INPUT_TYPE_SET = new Set(["number", "integer", "string", "char", "array", "array_number", "array_integer", "json", "json_number", "json_integer"]);
+const INPUT_TYPE_SET = new Set(FIELD_RULE_INPUT_TYPES);
+const RULE_ALLOWED_KEYS = new Set(["input", "check", "name", "min", "max", "detail"]);
 
 /**
  * 递归校验 JSON 结构叶子节点是否满足数值规则。
@@ -54,30 +56,38 @@ export class Validator {
             return this.buildResult({ _error: "验证规则必须是对象格式" });
         }
 
-        const dataRecord = data;
-        const rulesRecord = rules;
-
         // 检查必填字段
         for (const field of required) {
-            const value = dataRecord[field];
+            const value = data[field];
             if (isNullable(value)) {
-                const rawRule = rulesRecord[field];
+                const rawRule = rules[field];
                 const label = isPlainObject(rawRule) && isString(rawRule["name"]) ? rawRule["name"] : field;
                 fieldErrors[field] = `${label}为必填项`;
             }
         }
 
         // 验证有值的字段
-        for (const [field, rawRule] of Object.entries(rulesRecord)) {
+        for (const [field, rawRule] of Object.entries(rules)) {
             if (fieldErrors[field]) continue;
             // 字段值为 undefined 时跳过验证（除非是必填字段，但必填字段已在上面检查过）
-            if (isNullable(dataRecord[field]) && !required.includes(field)) continue;
+            if (isNullable(data[field]) && !required.includes(field)) continue;
 
             if (!isPlainObject(rawRule)) {
                 fieldErrors[field] = `${field}验证规则必须是对象格式`;
                 continue;
             }
 
+            const invalidKeys = [];
+            for (const key of Object.keys(rawRule)) {
+                if (!RULE_ALLOWED_KEYS.has(key)) {
+                    invalidKeys.push(key);
+                }
+            }
+            if (invalidKeys.length > 0) {
+                fieldErrors[field] = `${field}存在非法属性: ${invalidKeys.join(",")}`;
+                continue;
+            }
+
             const ruleName = rawRule["name"];
             const ruleInput = rawRule["input"];
             if (!isString(ruleName) || !isString(ruleInput)) {
@@ -85,18 +95,29 @@ export class Validator {
                 continue;
             }
 
+            if (!INPUT_TYPE_SET.has(ruleInput)) {
+                fieldErrors[field] = `${field}input 不支持: ${ruleInput}`;
+                continue;
+            }
+
             const rule = {
                 name: ruleName,
                 input: ruleInput
             };
 
+            const check = rawRule["check"];
+            if (isString(check)) rule.check = check;
+
+            const detail = rawRule["detail"];
+            if (isString(detail)) rule.detail = detail;
+
             const min = rawRule["min"];
             if (isNumber(min) || min === null) rule.min = min;
 
             const max = rawRule["max"];
             if (isNumber(max) || max === null) rule.max = max;
 
-            const error = this.checkField(dataRecord[field], rule, field);
+            const error = this.checkField(data[field], rule, field);
             if (error) fieldErrors[field] = error;
         }
 
@@ -107,7 +128,10 @@ export class Validator {
      * 验证单个值（带类型转换）
      */
     static single(value, fieldDef) {
-        const input = isString(fieldDef.input) ? fieldDef.input.trim() : "";
+        if (!isString(fieldDef.input) || !INPUT_TYPE_SET.has(fieldDef.input)) {
+            const input = isString(fieldDef.input) ? fieldDef.input : "";
+            return { value: null, error: `input 不支持: ${input}` };
+        }
 
         // 处理空值
         if (isNullable(value, [""])) {
@@ -115,7 +139,7 @@ export class Validator {
         }
 
         // 类型转换
-        const converted = this.convert(value, input);
+        const converted = this.convert(value, fieldDef.input);
         if (converted.error) {
             return { value: null, error: converted.error };
         }
@@ -150,9 +174,7 @@ export class Validator {
     /** 验证单个字段 */
     static checkField(value, fieldDef, fieldName) {
         const label = fieldDef.name || fieldName;
-
-        const input = isString(fieldDef.input) ? fieldDef.input.trim() : "";
-        const converted = this.convert(value, input);
+        const converted = this.convert(value, fieldDef.input);
         if (converted.error) {
             return `${label}${converted.error}`;
         }
@@ -163,18 +185,7 @@ export class Validator {
 
     /** 类型转换 */
     static convert(value, input) {
-        const inputRaw = String(input || "").trim();
-        const inputKey = inputRaw.toLowerCase();
-
-        if (!INPUT_TYPE_SET.has(inputKey) && isRegexInput(inputRaw)) {
-            return isString(value) ? { value: value, error: null } : { value: null, error: "必须是字符串" };
-        }
-
-        if (!INPUT_TYPE_SET.has(inputKey) && isEnumInput(inputRaw)) {
-            return isString(value) ? { value: value, error: null } : { value: null, error: "必须是字符串" };
-        }
-
-        switch (inputKey) {
+        switch (input) {
             case "number": {
                 if (isFiniteNumber(value)) return { value: value, error: null };
                 if (isString(value)) {
@@ -204,7 +215,7 @@ export class Validator {
             case "array":
                 return Array.isArray(value) ? { value: value, error: null } : { value: null, error: "必须是数组" };
 
-            case "array_number": {
+            case "arrayNumber": {
                 if (!Array.isArray(value)) return { value: null, error: "必须是数组" };
                 for (const item of value) {
                     if (!isFiniteNumber(item)) return { value: null, error: "数组元素必须是数字" };
@@ -212,7 +223,7 @@ export class Validator {
                 return { value: value, error: null };
             }
 
-            case "array_integer": {
+            case "arrayInteger": {
                 if (!Array.isArray(value)) return { value: null, error: "必须是数组" };
                 for (const item of value) {
                     if (!isIntegerNumber(item)) return { value: null, error: "数组元素必须是整数" };
@@ -224,14 +235,36 @@ export class Validator {
                 if (!isJsonStructure(value)) return { value: null, error: "必须是JSON对象或数组" };
                 return { value: value, error: null };
 
-            case "json_number":
+            case "jsonNumber":
                 if (!isJsonStructure(value)) return { value: null, error: "必须是JSON对象或数组" };
                 return checkJsonLeaves(value, "number") ? { value: value, error: null } : { value: null, error: "JSON值必须是数字" };
 
-            case "json_integer":
+            case "jsonInteger":
                 if (!isJsonStructure(value)) return { value: null, error: "必须是JSON对象或数组" };
                 return checkJsonLeaves(value, "integer") ? { value: value, error: null } : { value: null, error: "JSON值必须是整数" };
 
+            case "regexp":
+            case "enum":
+                return isString(value) ? { value: value, error: null } : { value: null, error: "必须是字符串" };
+
+            case "enumNumber": {
+                if (isFiniteNumber(value)) return { value: value, error: null };
+                if (isString(value)) {
+                    const num = Number(value);
+                    return Number.isFinite(num) ? { value: num, error: null } : { value: null, error: "必须是数字" };
+                }
+                return { value: null, error: "必须是数字" };
+            }
+
+            case "enumInteger": {
+                if (isIntegerNumber(value)) return { value: value, error: null };
+                if (isString(value)) {
+                    const num = Number(value);
+                    return Number.isFinite(num) && Number.isInteger(num) ? { value: num, error: null } : { value: null, error: "必须是整数" };
+                }
+                return { value: null, error: "必须是整数" };
+            }
+
             default: {
                 return { value: value, error: null };
             }
@@ -240,43 +273,69 @@ export class Validator {
 
     /** 规则验证 */
     static checkRule(value, fieldDef) {
-        const input = isString(fieldDef.input) ? fieldDef.input.trim() : "";
-        const min = isNumber(fieldDef.min) ? fieldDef.min : 0;
-        const max = isNumber(fieldDef.max) ? fieldDef.max : Number.MAX_SAFE_INTEGER;
+        const min = isNumber(fieldDef.min) ? fieldDef.min : FIELD_RULE_DEFAULT_MIN;
+        const max = isNumber(fieldDef.max) ? fieldDef.max : FIELD_RULE_DEFAULT_MAX;
 
-        const inputRaw = String(input || "").trim();
-        const inputKey = inputRaw.toLowerCase();
-        const isRegex = !INPUT_TYPE_SET.has(inputKey) && isRegexInput(inputRaw);
-        const isEnum = !INPUT_TYPE_SET.has(inputKey) && isEnumInput(inputRaw);
+        if (!isString(fieldDef.input)) {
+            return "input 不支持";
+        }
 
-        if (inputKey === "number" || inputKey === "integer") {
-            if (typeof value !== "number") return inputKey === "integer" ? "必须是整数" : "必须是数字";
+        if (fieldDef.input === "number" || fieldDef.input === "integer") {
+            if (typeof value !== "number") return fieldDef.input === "integer" ? "必须是整数" : "必须是数字";
             if (value < min) return `不能小于${min}`;
             if (value > max) return `不能大于${max}`;
-        } else if (inputKey === "string" || inputKey === "char" || isRegex || isEnum) {
+        } else if (fieldDef.input === "string" || fieldDef.input === "char" || fieldDef.input === "regexp" || fieldDef.input === "enum") {
             if (!isString(value)) return "必须是字符串";
-            if (inputKey === "char" && value.length !== 1) return "必须是单字符";
+            if (fieldDef.input === "char" && value.length !== 1) return "必须是单字符";
             if (value.length < min) return `长度不能少于${min}个字符`;
             if (value.length > max) return `长度不能超过${max}个字符`;
 
-            if (isRegex) {
-                const regex = this.resolveRegex(inputRaw);
+            if (fieldDef.input === "regexp") {
+                if (!isString(fieldDef.check) || fieldDef.check.length === 0) return "缺少 check 规则";
+                if (!isRegexInput(fieldDef.check)) return "check 规则无效";
+                const regex = this.resolveRegex(fieldDef.check);
                 if (!this.testRegex(regex, value)) return "格式不正确";
             }
 
-            if (isEnum) {
-                const enums = String(inputRaw || "")
-                    .trim()
+            if (fieldDef.input === "enum") {
+                if (!isString(fieldDef.check) || fieldDef.check.length === 0) return "缺少 check 规则";
+                const enums = fieldDef.check
                     .split("|")
                     .map((x) => x.trim())
                     .filter((x) => x !== "");
+                if (enums.length === 0) return "check 规则无效";
                 if (!enums.includes(value)) return "值不在枚举范围内";
             }
-        } else if (inputKey === "array" || inputKey === "array_number" || inputKey === "array_integer") {
+        } else if (fieldDef.input === "enumNumber" || fieldDef.input === "enumInteger") {
+            if (typeof value !== "number") return fieldDef.input === "enumInteger" ? "必须是整数" : "必须是数字";
+            if (!isString(fieldDef.check) || fieldDef.check.length === 0) return "缺少 check 规则";
+
+            const enumValues = [];
+            for (const item of fieldDef.check.split("|")) {
+                const normalized = item.trim();
+                if (normalized.length === 0) {
+                    continue;
+                }
+
+                const num = Number(normalized);
+                if (!Number.isFinite(num)) {
+                    return "check 规则无效";
+                }
+
+                if (fieldDef.input === "enumInteger" && !Number.isInteger(num)) {
+                    return "check 规则无效";
+                }
+
+                enumValues.push(num);
+            }
+
+            if (enumValues.length === 0) return "check 规则无效";
+            if (!enumValues.includes(value)) return "值不在枚举范围内";
+        } else if (fieldDef.input === "array" || fieldDef.input === "arrayNumber" || fieldDef.input === "arrayInteger") {
             if (!Array.isArray(value)) return "必须是数组";
             if (value.length < min) return `至少需要${min}个元素`;
             if (value.length > max) return `最多只能有${max}个元素`;
-        } else if (inputKey === "json" || inputKey === "json_number" || inputKey === "json_integer") {
+        } else if (fieldDef.input === "json" || fieldDef.input === "jsonNumber" || fieldDef.input === "jsonInteger") {
             if (!isJsonStructure(value)) return "必须是JSON对象或数组";
         }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.18.22",
-    "gitHead": "fdf4570d70dbec2c68b317db54bdc9c8a7229c11",
+    "version": "3.19.0",
+    "gitHead": "ccc66d5da9c6b84f8346087adc1d24412ce65bec",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [

package/sync/dev.js

@@ -1,28 +1,33 @@
 import { isNumber } from "../utils/is.js";
 
+const MENU_TABLE_NAME = "beflyMenu";
+const API_TABLE_NAME = "beflyApi";
+const ROLE_TABLE_NAME = "beflyRole";
+const ADMIN_TABLE_NAME = "beflyAdmin";
+
 export async function syncDev(ctx) {
     try {
         const allMenus = await ctx.mysql.getAll({
-            table: "beflyMenu",
+            table: MENU_TABLE_NAME,
             fields: ["path"],
             where: { state$gte: 0 },
             orderBy: ["id#ASC"]
         });
 
         const allApis = await ctx.mysql.getAll({
-            table: "beflyApi",
+            table: API_TABLE_NAME,
             fields: ["path", "auth"],
             where: { state$gte: 0 },
             orderBy: ["id#ASC"]
         });
 
         const devRole = await ctx.mysql.getOne({
-            table: "beflyRole",
+            table: ROLE_TABLE_NAME,
             where: { code: "dev", state$gte: 0 }
         });
 
         const devAdmin = await ctx.mysql.getOne({
-            table: "beflyAdmin",
+            table: ADMIN_TABLE_NAME,
             where: { username: "dev", state$gte: 0 }
         });
 
@@ -47,7 +52,7 @@ export async function syncDev(ctx) {
 
         if (isNumber(devRole.data.id)) {
             await ctx.mysql.updData({
-                table: "beflyRole",
+                table: ROLE_TABLE_NAME,
                 where: { code: "dev", state$gte: 0 },
                 data: {
                     name: devRoleData.name,
@@ -60,7 +65,7 @@ export async function syncDev(ctx) {
             });
         } else {
             await ctx.mysql.insData({
-                table: "beflyRole",
+                table: ROLE_TABLE_NAME,
                 data: devRoleData
             });
         }
@@ -78,7 +83,7 @@ export async function syncDev(ctx) {
 
         if (isNumber(devAdmin.data.id)) {
             await ctx.mysql.updData({
-                table: "beflyAdmin",
+                table: ADMIN_TABLE_NAME,
                 where: { username: "dev" },
                 data: {
                     nickname: devAdminData.nickname,
@@ -91,7 +96,7 @@ export async function syncDev(ctx) {
             });
         } else {
             await ctx.mysql.insData({
-                table: "beflyAdmin",
+                table: ADMIN_TABLE_NAME,
                 data: {
                     nickname: devAdminData.nickname,
                     email: devAdminData.email,
@@ -127,7 +132,7 @@ export async function syncDev(ctx) {
 
         for (const roleConfig of roles) {
             const existingRole = await ctx.mysql.getOne({
-                table: "beflyRole",
+                table: ROLE_TABLE_NAME,
                 where: {
                     code: roleConfig.code,
                     state$gte: 0
@@ -191,7 +196,7 @@ export async function syncDev(ctx) {
             if (existingRole.data?.id) {
                 // 角色存在则强制更新（不做差异判断）
                 await ctx.mysql.updData({
-                    table: "beflyRole",
+                    table: ROLE_TABLE_NAME,
                     where: { code: roleConfig.code, state$gte: 0 },
                     data: {
                         name: roleConfig.name,
@@ -203,7 +208,7 @@ export async function syncDev(ctx) {
                 });
             } else {
                 await ctx.mysql.insData({
-                    table: "beflyRole",
+                    table: ROLE_TABLE_NAME,
                     data: {
                         code: roleConfig.code,
                         name: roleConfig.name,

package/sync/menu.js

@@ -1,3 +1,5 @@
+const MENU_TABLE_NAME = "beflyMenu";
+
 export function flattenMenusToDefMap(menus) {
     // 读取配置菜单：扁平化为 path => { name, sort, parentPath }
     // - 以 path 为唯一键：后出现的覆盖先出现的（与旧逻辑“同 path 多次同步同一条记录”一致）
@@ -40,7 +42,7 @@ export async function syncMenu(ctx, menus) {
     // 2) 批量同步（事务内）：按 path diff 执行批量 insert/update/delete
     // 读取全部菜单
     const allExistingMenus = await ctx.mysql.getAll({
-        table: "beflyMenu",
+        table: MENU_TABLE_NAME,
         fields: ["id", "name", "path", "parentPath", "sort", "state"],
         where: { state$gte: 0 }
     });
@@ -84,16 +86,16 @@ export async function syncMenu(ctx, menus) {
     }
 
     if (updList.length > 0) {
-        await ctx.mysql.updBatch("beflyMenu", updList);
+        await ctx.mysql.updBatch(MENU_TABLE_NAME, updList);
     }
 
     if (insList.length > 0) {
-        await ctx.mysql.insBatch("beflyMenu", insList);
+        await ctx.mysql.insBatch(MENU_TABLE_NAME, insList);
     }
 
     // 3) 删除差集（DB - 配置）
     const delIds = Array.from(delIdSet);
     if (delIds.length > 0) {
-        await ctx.mysql.delForceBatch("beflyMenu", delIds);
+        await ctx.mysql.delForceBatch(MENU_TABLE_NAME, delIds);
     }
 }

package/tables/admin.json

@@ -7,7 +7,8 @@
     },
     "username": {
         "name": "用户名",
-        "input": "@alphanumeric_",
+        "input": "regexp",
+        "check": "@alphanumeric_",
         "min": 2,
         "max": 30
     },
@@ -19,12 +20,14 @@
     },
     "email": {
         "name": "邮箱",
-        "input": "@email",
+        "input": "regexp",
+        "check": "@email",
         "max": 100
     },
     "phone": {
         "name": "手机号",
-        "input": "@phone",
+        "input": "regexp",
+        "check": "@phone",
         "max": 20
     },
     "avatar": {
@@ -34,13 +37,15 @@
     },
     "roleCode": {
         "name": "角色编码",
-        "input": "@alphanumeric_",
+        "input": "regexp",
+        "check": "@alphanumeric_",
         "min": 2,
         "max": 50
     },
     "roleType": {
         "name": "角色类型",
-        "input": "admin|user",
+        "input": "enum",
+        "check": "admin|user",
         "min": 4,
         "max": 5
     },

package/tables/dict.json

@@ -1,13 +1,15 @@
 {
     "typeCode": {
         "name": "字典类型代码",
-        "input": "@alphanumeric_",
+        "input": "regexp",
+        "check": "@alphanumeric_",
         "min": 2,
         "max": 50
     },
     "key": {
         "name": "字典键",
-        "input": "@alphanumeric_",
+        "input": "regexp",
+        "check": "@alphanumeric_",
         "min": 1,
         "max": 50
     },

package/tables/dictType.json

@@ -1,7 +1,8 @@
 {
     "code": {
         "name": "类型代码",
-        "input": "@alphanumeric_",
+        "input": "regexp",
+        "check": "@alphanumeric_",
         "min": 2,
         "max": 50
     },

package/tables/emailLog.json

@@ -15,7 +15,8 @@
     },
     "toEmail": {
         "name": "收件人邮箱",
-        "input": "@email",
+        "input": "regexp",
+        "check": "@email",
         "min": 5,
         "max": 200
     },

package/tables/role.json

@@ -7,7 +7,8 @@
     },
     "code": {
         "name": "角色编码",
-        "input": "@alphanumericDash_",
+        "input": "regexp",
+        "check": "@alphanumericDash_",
         "min": 2,
         "max": 50
     },

package/tables/sysConfig.json

@@ -7,7 +7,8 @@
     },
     "code": {
         "name": "配置代码",
-        "input": "@alphanumeric_",
+        "input": "regexp",
+        "check": "@alphanumeric_",
         "min": 2,
         "max": 100
     },
@@ -17,7 +18,8 @@
     },
     "valueType": {
         "name": "值类型",
-        "input": "string|number|boolean|json",
+        "input": "enum",
+        "check": "string|number|boolean|json",
         "max": 20
     },
     "group": {

package/utils/cors.js

@@ -16,11 +16,44 @@ export function setCorsOptions(req, config = {}) {
 
     const merged = Object.assign({}, defaultConfig, config || {});
     const origin = merged.origin;
+    const requestedHeaders = req.headers.get("Access-Control-Request-Headers") || "";
+
+    const allowedHeaderItems = [];
+    const allowedHeaderMap = Object.create(null);
+
+    const pushHeaderIfNeeded = (rawValue) => {
+        if (typeof rawValue !== "string") {
+            return;
+        }
+
+        const value = rawValue.trim();
+        if (value.length < 1) {
+            return;
+        }
+
+        const key = value.toLowerCase();
+        if (allowedHeaderMap[key]) {
+            return;
+        }
+
+        allowedHeaderMap[key] = 1;
+        allowedHeaderItems.push(value);
+    };
+
+    for (const item of String(merged.allowedHeaders || "").split(",")) {
+        pushHeaderIfNeeded(item);
+    }
+
+    for (const item of String(requestedHeaders).split(",")) {
+        pushHeaderIfNeeded(item);
+    }
+
+    const allowHeaders = allowedHeaderItems.join(", ");
 
     return {
         "Access-Control-Allow-Origin": origin === "*" ? req.headers.get("origin") || "*" : origin,
         "Access-Control-Allow-Methods": merged.methods,
-        "Access-Control-Allow-Headers": merged.allowedHeaders,
+        "Access-Control-Allow-Headers": allowHeaders,
         "Access-Control-Expose-Headers": merged.exposedHeaders,
         "Access-Control-Max-Age": String(merged.maxAge),
         "Access-Control-Allow-Credentials": merged.credentials