befly 3.17.15 → 3.18.0

package/checks/config.js

@@ -41,7 +41,8 @@ const configSchema = z
                 username: noTrimString,
                 password: noTrimString,
                 database: noTrimString,
-                max: z.number().min(1)
+                max: z.number().min(1),
+                stateFilter: z.union([z.literal(0), z.literal(1)]).optional()
             })
             .strict(),
 

package/configs/beflyConfig.json

@@ -25,7 +25,8 @@
         "username": "root",
         "password": "root",
         "database": "befly_dev",
-        "max": 10
+        "max": 10,
+        "stateFilter": 1
     },
 
     "redis": {

package/configs/beflyMenus.json

@@ -2,12 +2,12 @@
     {
         "name": "首页",
         "path": "/",
-        "sort": 1
+        "sort": 0
     },
     {
         "name": "人员管理",
         "path": "/people",
-        "sort": 2,
+        "sort": 9000,
         "children": [
             {
                 "name": "管理员",
@@ -19,7 +19,7 @@
     {
         "name": "权限设置",
         "path": "/permission",
-        "sort": 3,
+        "sort": 9001,
         "children": [
             {
                 "name": "角色管理",
@@ -41,7 +41,7 @@
     {
         "name": "配置管理",
         "path": "/config",
-        "sort": 4,
+        "sort": 9002,
         "children": [
             {
                 "name": "字典类型",
@@ -63,7 +63,7 @@
     {
         "name": "日志管理",
         "path": "/log",
-        "sort": 5,
+        "sort": 9003,
         "children": [
             {
                 "name": "登录日志",

package/lib/dbHelper/builders.js

@@ -355,7 +355,11 @@ export function processJoinOn(on) {
     return result;
 }
 
-export function addDefaultStateFilter(where = {}, table, hasJoins = false) {
+export function addDefaultStateFilter(where = {}, table, hasJoins = false, enableStateFilter = true) {
+    if (!enableStateFilter) {
+        return where;
+    }
+
     const hasStateCondition = Object.keys(where).some((key) => key.startsWith("state") || key.includes(".state"));
     if (hasStateCondition) {
         return where;

package/lib/dbHelper/dataOps.js

@@ -13,7 +13,7 @@ export const dataOpsMethods = {
         const { table, where, joins, tableQualifier } = await this.prepareQueryOptions(options, "getCount.options");
         const hasJoins = Array.isArray(joins) && joins.length > 0;
 
-        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins);
+        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins, this.enableStateFilter);
         const result = await this.fetchCount({ table: table, joins: joins }, whereFiltered, "COUNT(*) as count");
 
         return {
@@ -26,7 +26,7 @@ export const dataOpsMethods = {
         const { table, fields, where, joins, tableQualifier } = await this.prepareQueryOptions(options, "getOne.options");
         const hasJoins = Array.isArray(joins) && joins.length > 0;
 
-        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins);
+        const whereFiltered = addDefaultStateFilter(where, tableQualifier, hasJoins, this.enableStateFilter);
         const builder = this.createSqlBuilder().select(fields).from(table).where(whereFiltered);
         this.applyJoins(builder, joins);
 
@@ -50,7 +50,7 @@ export const dataOpsMethods = {
         validatePageLimitRange(prepared, options.table);
 
         const hasJoins = Array.isArray(prepared.joins) && prepared.joins.length > 0;
-        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins);
+        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins, this.enableStateFilter);
         const countResult = await this.fetchCount(prepared, whereFiltered, "COUNT(*) as total");
         const total = countResult.total;
 
@@ -102,7 +102,7 @@ export const dataOpsMethods = {
         const prepared = await this.prepareQueryOptions(prepareOptions, "getAll.options");
 
         const hasJoins = Array.isArray(prepared.joins) && prepared.joins.length > 0;
-        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins);
+        const whereFiltered = addDefaultStateFilter(prepared.where, prepared.tableQualifier, hasJoins, this.enableStateFilter);
         const countResult = await this.fetchCount(prepared, whereFiltered, "COUNT(*) as total");
         const total = countResult.total;
 
@@ -150,7 +150,7 @@ export const dataOpsMethods = {
         validateNoJoinReadOptions(options, "exists", "exists 不支持 joins（请使用显式 query 或拆分查询）");
         const snakeTable = snakeCase(options.table);
         const snakeWhere = whereKeysToSnake(clearDeep(options.where || {}));
-        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false);
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.enableStateFilter);
 
         const builder = this.createSqlBuilder().selectRaw("COUNT(1) as cnt").from(snakeTable).where(whereFiltered).limit(1);
         const { sql, params } = builder.toSelectSql();
@@ -405,7 +405,7 @@ export const dataOpsMethods = {
         const snakeWhere = whereKeysToSnake(clearDeep(where));
 
         const processed = buildUpdateRow({ data: data, now: Date.now(), allowState: true });
-        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false);
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.enableStateFilter);
         const builder = this.createSqlBuilder().where(whereFiltered);
         const { sql, params } = builder.toUpdateSql(snakeTable, processed);
 
@@ -478,7 +478,7 @@ export const dataOpsMethods = {
         const snakeField = snakeCase(field);
 
         const snakeWhere = whereKeysToSnake(clearDeep(where));
-        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false);
+        const whereFiltered = addDefaultStateFilter(snakeWhere, snakeTable, false, this.enableStateFilter);
         const builder = this.createSqlBuilder().where(whereFiltered);
         const { sql: whereClause, params: whereParams } = builder.getWhereConditions();
 

package/lib/dbHelper/index.js

@@ -19,6 +19,7 @@ function DbHelper(options) {
     this.sql = options.sql || null;
     this.isTransaction = Boolean(options.sql);
     this.idMode = options.idMode === "autoId" ? "autoId" : "timeId";
+    this.enableStateFilter = options.stateFilter === 0 ? false : true;
 }
 
 Object.assign(DbHelper.prototype, builderMethods, executeMethods, dataOpsMethods, transactionMethods);

package/lib/dbHelper/transaction.js

@@ -26,7 +26,7 @@ export const transactionMethods = {
 
         try {
             return await sql.begin(async (tx) => {
-                const trans = new this.constructor({ redis: this.redis, dbName: this.dbName, sql: tx, idMode: this.idMode });
+                const trans = new this.constructor({ redis: this.redis, dbName: this.dbName, sql: tx, idMode: this.idMode, stateFilter: this.enableStateFilter ? 1 : 0 });
                 const result = await callback(trans);
                 if (isBeflyResponse(result) && result.code !== 0) {
                     throw new TransAbortError(result);

package/package.json

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

package/plugins/mysql.js

@@ -19,7 +19,8 @@ export default {
                 redis: befly.redis,
                 dbName: befly.config?.mysql?.database,
                 sql: Connect.getMysql(),
-                idMode: befly.config?.mysql?.idMode
+                idMode: befly.config?.mysql?.idMode,
+                stateFilter: befly.config?.mysql?.stateFilter
             });
 
             return dbManager;

package/scripts/syncDb/context.js

@@ -67,7 +67,8 @@ export async function prepareSyncDbBaseContext(mysqlConfig) {
         redis: null,
         dbName: mysqlConfig.database,
         sql: Connect.getMysql(),
-        idMode: mysqlConfig.idMode
+        idMode: mysqlConfig.idMode,
+        stateFilter: mysqlConfig.stateFilter
     });
 
     const dbColumns = await querySyncDbColumns(mysql);