@befly-addon/admin 1.7.16 → 1.7.18

package/apis/admin/del.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "删除管理员",

package/apis/admin/detail.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取管理员信息",

package/apis/admin/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "查询管理员列表",

package/apis/admin/upd.ts

@@ -1,7 +1,7 @@
 import type { ApiRoute } from "befly/types/api";
 
+import fieldsScheme from "../../configs/fieldsScheme.json";
 import adminTable from "../../tables/admin.json";
-import { fieldsScheme } from "../../utils/fieldsScheme";
 import { mergeTableFields } from "../../utils/mergeTableFields";
 
 const route: ApiRoute = {

package/apis/api/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取接口列表",

package/apis/dict/del.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "删除字典",

package/apis/dict/detail.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取字典详情",

package/apis/dict/list.ts

@@ -1,7 +1,7 @@
 import type { ApiRoute } from "befly/types/api";
 
+import fieldsScheme from "../../configs/fieldsScheme.json";
 import dictTable from "../../tables/dict.json";
-import { fieldsScheme } from "../../utils/fieldsScheme";
 
 const route: ApiRoute = {
     name: "获取字典列表",

package/apis/dict/upd.ts

@@ -1,7 +1,7 @@
 import type { ApiRoute } from "befly/types/api";
 
+import fieldsScheme from "../../configs/fieldsScheme.json";
 import adminDictTable from "../../tables/dict.json";
-import { fieldsScheme } from "../../utils/fieldsScheme";
 import { mergeTableFields } from "../../utils/mergeTableFields";
 
 const route: ApiRoute = {

package/apis/dictType/del.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "删除字典类型",

package/apis/dictType/detail.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "字典类型详情",

package/apis/dictType/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取字典类型列表",

package/apis/dictType/upd.ts

@@ -1,7 +1,7 @@
 import type { ApiRoute } from "befly/types/api";
 
+import fieldsScheme from "../../configs/fieldsScheme.json";
 import dictTypeTable from "../../tables/dictType.json";
-import { fieldsScheme } from "../../utils/fieldsScheme";
 import { mergeTableFields } from "../../utils/mergeTableFields";
 
 const route: ApiRoute = {

package/apis/email/logList.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "邮件发送日志列表",

package/apis/loginLog/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取登录日志列表",

package/apis/menu/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取菜单列表",

package/apis/operateLog/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取操作日志列表",

package/apis/role/del.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "删除角色",

package/apis/role/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取角色列表",

package/apis/sysConfig/del.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "删除系统配置",

package/apis/sysConfig/list.ts

@@ -1,6 +1,6 @@
 import type { ApiRoute } from "befly/types/api";
 
-import { fieldsScheme } from "../../utils/fieldsScheme";
+import fieldsScheme from "../../configs/fieldsScheme.json";
 
 const route: ApiRoute = {
     name: "获取系统配置列表",

package/apis/sysConfig/upd.ts

@@ -1,7 +1,7 @@
 import type { ApiRoute } from "befly/types/api";
 
+import fieldsScheme from "../../configs/fieldsScheme.json";
 import sysConfigTable from "../../tables/sysConfig.json";
-import { fieldsScheme } from "../../utils/fieldsScheme";
 import { mergeTableFields } from "../../utils/mergeTableFields";
 
 const route: ApiRoute = {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.7.16",
-    "gitHead": "a3b52aca13281d7029eabe43f79eadb50ce5382e",
+    "version": "1.7.18",
+    "gitHead": "03ffbb2ac39c377d046a594894e1c568e367def9",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [
@@ -53,7 +53,7 @@
         "ua-parser-js": "^2.0.8"
     },
     "devDependencies": {
-        "befly": "3.15.16"
+        "befly": "3.15.18"
     },
     "peerDependencies": {
         "befly": "^3.14.0"

package/tables/admin.json

@@ -1,64 +1,65 @@
 {
     "nickname": {
         "name": "昵称",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 50
     },
     "username": {
         "name": "用户名",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumeric_",
         "min": 2,
-        "max": 30,
-        "regexp": "@alphanumeric_"
+        "max": 30
     },
     "password": {
         "name": "密码",
-        "type": "string",
+        "type": "varchar",
         "min": 6,
         "max": 500
     },
     "email": {
         "name": "邮箱",
-        "type": "string",
-        "max": 100,
-        "regexp": "@email"
+        "type": "varchar",
+        "input": "@email",
+        "max": 100
     },
     "phone": {
         "name": "手机号",
-        "type": "string",
-        "max": 20,
-        "regexp": "@phone"
+        "type": "varchar",
+        "input": "@phone",
+        "max": 20
     },
     "avatar": {
         "name": "头像",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     },
     "roleCode": {
         "name": "角色编码",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumeric_",
         "min": 2,
-        "max": 50,
-        "regexp": "@alphanumeric_"
+        "max": 50
     },
     "roleType": {
         "name": "角色类型",
-        "type": "string",
+        "type": "varchar",
+        "input": "admin|user",
         "min": 4,
         "max": 5,
         "default": "user",
-        "index": true,
-        "regexp": "^(admin|user)$"
+        "index": true
     },
     "lastLoginTime": {
         "name": "最后登录时间",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "default": 0
     },
     "lastLoginIp": {
         "name": "最后登录IP",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     }
 }

package/tables/api.json

@@ -1,14 +1,15 @@
 {
     "name": {
         "name": "接口名称",
-        "type": "string",
+        "type": "varchar",
         "min": 2,
         "max": 100,
         "index": true
     },
     "auth": {
         "name": "是否需要登录",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 1,
         "default": 1,
@@ -16,21 +17,21 @@
     },
     "path": {
         "name": "接口路径",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 200,
         "index": true
     },
     "parentPath": {
         "name": "父级路径",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 200,
         "index": true
     },
     "addonName": {
         "name": "所属插件",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     }
 }

package/tables/dict.json

@@ -1,36 +1,37 @@
 {
     "typeCode": {
         "name": "字典类型代码",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumeric_",
         "min": 2,
         "max": 50,
-        "index": true,
-        "regexp": "@alphanumeric_"
+        "index": true
     },
     "key": {
         "name": "字典键",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumeric_",
         "min": 1,
         "max": 50,
-        "index": true,
-        "regexp": "@alphanumeric_"
+        "index": true
     },
     "label": {
         "name": "字典标签",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 100
     },
     "sort": {
         "name": "排序",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 9999,
         "default": 0
     },
     "remark": {
         "name": "备注",
-        "type": "string",
+        "type": "varchar",
         "max": 200
     }
 }

package/tables/dictType.json

@@ -1,26 +1,27 @@
 {
     "code": {
         "name": "类型代码",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumeric_",
         "min": 2,
         "max": 50,
-        "unique": true,
-        "regexp": "@alphanumeric_"
+        "unique": true
     },
     "name": {
         "name": "类型名称",
-        "type": "string",
+        "type": "varchar",
         "min": 2,
         "max": 50
     },
     "description": {
         "name": "描述",
-        "type": "string",
+        "type": "varchar",
         "max": 200
     },
     "sort": {
         "name": "排序",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 9999,
         "default": 0

package/tables/emailLog.json

@@ -1,30 +1,31 @@
 {
     "adminId": {
         "name": "发送人ID",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "index": true
     },
     "username": {
         "name": "发送人账号",
-        "type": "string",
+        "type": "varchar",
         "max": 100
     },
     "nickname": {
         "name": "发送人昵称",
-        "type": "string",
+        "type": "varchar",
         "max": 100
     },
     "toEmail": {
         "name": "收件人邮箱",
-        "type": "string",
+        "type": "varchar",
+        "input": "@email",
         "min": 5,
-        "max": 200,
-        "regexp": "@email"
+        "max": 200
     },
     "subject": {
         "name": "邮件主题",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 200
     },
@@ -34,33 +35,35 @@
     },
     "ccEmail": {
         "name": "抄送邮箱",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     },
     "bccEmail": {
         "name": "密送邮箱",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     },
     "sendTime": {
         "name": "发送时间",
-        "type": "number"
+        "type": "bigint",
+        "input": "number"
     },
     "sendResult": {
         "name": "发送结果",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 1,
         "default": 0
     },
     "messageId": {
         "name": "消息ID",
-        "type": "string",
+        "type": "varchar",
         "max": 200
     },
     "failReason": {
         "name": "失败原因",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     }
 }

package/tables/loginLog.json

@@ -1,86 +1,89 @@
 {
     "adminId": {
         "name": "管理员ID",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "index": true
     },
     "username": {
         "name": "用户名",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 50
     },
     "nickname": {
         "name": "昵称",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "ip": {
         "name": "登录IP",
-        "type": "string",
+        "type": "varchar",
         "max": 50,
         "index": true
     },
     "userAgent": {
         "name": "用户代理",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     },
     "browserName": {
         "name": "浏览器名称",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "browserVersion": {
         "name": "浏览器版本",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "osName": {
         "name": "操作系统",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "osVersion": {
         "name": "系统版本",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "deviceType": {
         "name": "设备类型",
-        "type": "string",
+        "type": "varchar",
         "max": 20
     },
     "deviceVendor": {
         "name": "设备厂商",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "deviceModel": {
         "name": "设备型号",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "engineName": {
         "name": "引擎名称",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "cpuArchitecture": {
         "name": "CPU架构",
-        "type": "string",
+        "type": "varchar",
         "max": 20
     },
     "loginTime": {
         "name": "登录时间",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "index": true
     },
     "loginResult": {
         "name": "登录结果",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 1,
         "default": 1,
@@ -88,7 +91,7 @@
     },
     "failReason": {
         "name": "失败原因",
-        "type": "string",
+        "type": "varchar",
         "max": 200
     }
 }

package/tables/menu.json

@@ -1,28 +1,29 @@
 {
     "name": {
         "name": "菜单名称",
-        "type": "string",
+        "type": "varchar",
         "min": 2,
         "max": 50,
         "index": true
     },
     "path": {
         "name": "路由路径",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 150,
         "unique": true
     },
     "sort": {
         "name": "排序",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 9999,
         "default": 0
     },
     "parentPath": {
         "name": "父级路径",
-        "type": "string",
+        "type": "varchar",
         "max": 200,
         "default": "",
         "index": true

package/tables/operateLog.json

@@ -1,47 +1,48 @@
 {
     "adminId": {
         "name": "管理员ID",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "index": true
     },
     "username": {
         "name": "用户名",
-        "type": "string",
+        "type": "varchar",
         "min": 1,
         "max": 50
     },
     "nickname": {
         "name": "昵称",
-        "type": "string",
+        "type": "varchar",
         "max": 50
     },
     "ip": {
         "name": "操作IP",
-        "type": "string",
+        "type": "varchar",
         "max": 50,
         "index": true
     },
     "module": {
         "name": "操作模块",
-        "type": "string",
+        "type": "varchar",
         "max": 50,
         "index": true
     },
     "action": {
         "name": "操作类型",
-        "type": "string",
+        "type": "varchar",
         "max": 50,
         "index": true
     },
     "method": {
         "name": "请求方法",
-        "type": "string",
+        "type": "varchar",
         "max": 10
     },
     "path": {
         "name": "请求路径",
-        "type": "string",
+        "type": "varchar",
         "max": 200
     },
     "params": {
@@ -50,7 +51,8 @@
     },
     "result": {
         "name": "操作结果",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 1,
         "default": 1,
@@ -62,18 +64,20 @@
     },
     "duration": {
         "name": "耗时毫秒",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0
     },
     "operateTime": {
         "name": "操作时间",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "index": true
     },
     "remark": {
         "name": "备注",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     }
 }

package/tables/role.json

@@ -1,37 +1,40 @@
 {
     "name": {
         "name": "角色名称",
-        "type": "string",
+        "type": "varchar",
         "min": 2,
         "max": 50,
         "index": true
     },
     "code": {
         "name": "角色编码",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumericDash_",
         "min": 2,
         "max": 50,
-        "index": true,
-        "regexp": "@alphanumericDash_"
+        "index": true
     },
     "description": {
         "name": "角色描述",
-        "type": "string",
+        "type": "varchar",
         "max": 200
     },
     "menus": {
         "name": "菜单权限",
-        "type": "array_text",
+        "type": "mediumtext",
+        "input": "array",
         "detail": "菜单路径数组（menu.path），如 [\"/permission/role\",\"/dashboard\"]"
     },
     "apis": {
         "name": "接口权限",
-        "type": "array_text",
+        "type": "mediumtext",
+        "input": "array",
         "detail": "接口路径数组（url.pathname），如 [\"/api/addon/addonAdmin/auth/login\"]"
     },
     "sort": {
         "name": "排序",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 9999,
         "default": 0

package/tables/sysConfig.json

@@ -1,17 +1,17 @@
 {
     "name": {
         "name": "配置名称",
-        "type": "string",
+        "type": "varchar",
         "min": 2,
         "max": 50
     },
     "code": {
         "name": "配置代码",
-        "type": "string",
+        "type": "varchar",
+        "input": "@alphanumeric_",
         "min": 2,
         "max": 100,
-        "unique": true,
-        "regexp": "@alphanumeric_"
+        "unique": true
     },
     "value": {
         "name": "配置值",
@@ -19,27 +19,30 @@
     },
     "valueType": {
         "name": "值类型",
-        "type": "string",
+        "type": "varchar",
+        "input": "string|number|boolean|json",
         "max": 20,
         "default": "string",
         "detail": "string number boolean json"
     },
     "group": {
         "name": "配置分组",
-        "type": "string",
+        "type": "varchar",
         "max": 50,
         "index": true
     },
     "sort": {
         "name": "排序",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 9999,
         "default": 0
     },
     "isSystem": {
         "name": "是否系统配置",
-        "type": "number",
+        "type": "bigint",
+        "input": "number",
         "min": 0,
         "max": 1,
         "default": 0,
@@ -47,7 +50,7 @@
     },
     "description": {
         "name": "描述说明",
-        "type": "string",
+        "type": "varchar",
         "max": 500
     }
 }

package/tsconfig.json

@@ -9,6 +9,6 @@
         "noFallthroughCasesInSwitch": false,
         "noImplicitOverride": false
     },
-    "include": ["apis/**/*.ts", "libs/**/*.ts", "plugins/**/*.ts", "utils/**/*.ts", "**/*.d.ts"],
+    "include": ["apis/**/*.ts", "libs/**/*.ts", "plugins/**/*.ts", "utils/**/*.ts", "configs/**/*.json", "**/*.d.ts"],
     "exclude": ["node_modules", "dist", "logs", "temp", "tests", "views", "adminViews", "appViews"]
 }

package/utils/fieldsScheme.ts

@@ -1,50 +0,0 @@
-import type { FieldDefinition } from "befly/types/validate";
-
-export const fieldsScheme: {
-    id: FieldDefinition;
-    page: FieldDefinition;
-    limit: FieldDefinition;
-    keyword: FieldDefinition;
-    state: FieldDefinition;
-} = {
-    id: {
-        name: "ID",
-        type: "number",
-        min: 1,
-        max: null,
-        default: null,
-        regexp: null
-    },
-    page: {
-        name: "页码",
-        type: "number",
-        min: 1,
-        max: 9999,
-        default: 1,
-        regexp: null
-    },
-    limit: {
-        name: "每页数量",
-        type: "number",
-        min: 1,
-        max: 100,
-        default: 30,
-        regexp: null
-    },
-    keyword: {
-        name: "关键词",
-        type: "string",
-        min: 0,
-        max: 50,
-        default: "",
-        regexp: null
-    },
-    state: {
-        name: "状态",
-        type: "number",
-        min: null,
-        max: null,
-        default: null,
-        regexp: "^[0-2]$"
-    }
-};