befly 3.23.5 → 3.23.6

package/apis/dictType/ins.js

@@ -9,7 +9,8 @@ export default {
         code: dictTypeTable.code,
         name: dictTypeTable.name,
         description: dictTypeTable.description,
-        sort: dictTypeTable.sort
+        sort: dictTypeTable.sort,
+        state: dictTypeTable.state
     },
     required: ["code", "name"],
     handler: async (befly, ctx) => {
@@ -28,7 +29,8 @@ export default {
                 code: ctx.body.code,
                 name: ctx.body.name,
                 description: ctx.body.description,
-                sort: ctx.body.sort
+                sort: ctx.body.sort,
+                state: ctx.body.state
             }
         });
 

package/apis/dictType/list.js

@@ -1,3 +1,5 @@
+import dictTypeTable from "../../tables/dictType.json";
+
 export default {
     name: "获取字典类型列表",
     method: "POST",
@@ -7,14 +9,15 @@ export default {
         page: { name: "页码", input: "integer", min: 1, max: 9999 },
         limit: { name: "每页数量", input: "integer", min: 1, max: 100 },
         keyword: { name: "关键词", input: "string", min: 0, max: 50 },
-        state: { name: "状态", input: "integer", min: 0, max: 2 }
+        state: dictTypeTable.state
     },
     required: [],
     handler: async (befly, ctx) => {
         const result = await befly.mysql.getList({
             table: "beflyDictType",
             where: {
-                name$like: ctx.body.keyword
+                $or: [{ name$like: ctx.body.keyword }, { code$like: ctx.body.keyword }],
+                state: ctx.body.state
             },
             orderBy: ["sort#ASC", "id#ASC"],
             page: ctx.body.page,

package/apis/dictType/upd.js

@@ -10,40 +10,33 @@ export default {
         code: dictTypeTable.code,
         name: dictTypeTable.name,
         description: dictTypeTable.description,
-        sort: dictTypeTable.sort
+        sort: dictTypeTable.sort,
+        state: dictTypeTable.state
     },
     required: ["id"],
     handler: async (befly, ctx) => {
-        const id = ctx.body.id;
-        const code = ctx.body.code;
-        const name = ctx.body.name;
-        const description = ctx.body.description;
-        const sort = ctx.body.sort;
-
-        if (code) {
-            const existing = await befly.mysql.getOne({
-                table: "beflyDictType",
-                where: {
-                    code: code,
-                    id$not: id
-                }
-            });
-
-            if (existing.data && existing.data.id) {
-                return befly.tool.No("类型代码已被使用");
+        const existing = await befly.mysql.getList({
+            table: "beflyDictType",
+            where: {
+                code: ctx.body.code,
+                id$not: ctx.body.id
             }
-        }
+        });
 
-        const updateData = {};
-        if (code !== undefined) updateData["code"] = code;
-        if (name !== undefined) updateData["name"] = name;
-        if (description !== undefined) updateData["description"] = description;
-        if (sort !== undefined) updateData["sort"] = sort;
+        if (existing.data.total > 0) {
+            return befly.tool.No("类型代码已被使用");
+        }
 
         await befly.mysql.updData({
             table: "beflyDictType",
-            data: updateData,
-            where: { id: id }
+            data: {
+                code: ctx.body.code,
+                name: ctx.body.name,
+                description: ctx.body.description,
+                sort: ctx.body.sort,
+                state: ctx.body.state
+            },
+            where: { id: ctx.body.id }
         });
 
         return befly.tool.Yes("更新成功");

package/checks/menu.js

@@ -5,8 +5,9 @@ import { formatZodIssues } from "../utils/formatZodIssues.js";
 
 z.config(z.locales.zhCN());
 
-const fullMenuPathRegex = /^\/(?:core(?:\/[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*)*|(?:[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*(?:\/[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*)*)?)$/;
-const childMenuPathRegex = /^\/[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*$/;
+const menuPathSegmentRegexSource = "[a-z][a-z0-9]*(?:-[a-z0-9]+)*";
+const fullMenuPathRegex = new RegExp(`^/(?:core(?:/${menuPathSegmentRegexSource})*|(?:${menuPathSegmentRegexSource}(?:/${menuPathSegmentRegexSource})*)?)$`);
+const childMenuPathRegex = new RegExp(`^/${menuPathSegmentRegexSource}$`);
 
 const childMenuSchema = z
     .object({

package/configs/beflyMenus.json

@@ -45,7 +45,7 @@
         "children": [
             {
                 "name": "字典类型",
-                "path": "/dictType",
+                "path": "/dict-type",
                 "sort": 1
             },
             {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.23.5",
-    "gitHead": "fa567235c96410c1f0bc921ab652e0517269060c",
+    "version": "3.23.6",
+    "gitHead": "50fca5a7f581822abfdc886fcd77f2fce3db47ca",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [
@@ -52,7 +52,7 @@
         "test": "bun test"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.7.2",
+        "fast-xml-parser": "^5.7.3",
         "nodemailer": "^8.0.7",
         "pathe": "^2.0.3",
         "picomatch": "^4.0.4",