midway-fatcms 0.0.5 → 0.0.7

package/dist/service/curd/fixSoftDelete.d.ts

@@ -2,5 +2,19 @@ import { KeysOfSimpleSQL } from "../../libs/crud-pro/models/keys";
 import { IRequestModel } from "../../libs/crud-pro/interfaces";
 import { IRequestCfgModel2 } from "../../models/bizmodels";
 import { Context } from "@midwayjs/koa";
+/**
+ * 软删除处理函数
+ *
+ * 当 cfgModel.enableSoftDelete === true 时，自动处理软删除逻辑：
+ *
+ * 1. INSERT 操作：自动设置 deleted_at = 0
+ * 2. DELETE 操作：转为 UPDATE，设置 deleted_at = 时间戳, deleted_by = 当前用户
+ * 3. QUERY 操作：自动添加 deleted_at = 0 条件
+ *
+ * @param oldSqlSimpleName 原始 SQL 类型
+ * @param cfgModel 配置模型
+ * @param params 请求参数（会被修改）
+ * @param ctx 请求上下文（用于获取当前用户信息）
+ */
 declare function fixSoftDelete(oldSqlSimpleName: KeysOfSimpleSQL, cfgModel: IRequestCfgModel2, params: IRequestModel, ctx?: Context): void;
 export { fixSoftDelete, };

package/dist/service/curd/fixSoftDelete.js

@@ -2,42 +2,60 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixSoftDelete = void 0;
 const keys_1 = require("../../libs/crud-pro/models/keys");
+/**
+ * 软删除处理函数
+ *
+ * 当 cfgModel.enableSoftDelete === true 时，自动处理软删除逻辑：
+ *
+ * 1. INSERT 操作：自动设置 deleted_at = 0
+ * 2. DELETE 操作：转为 UPDATE，设置 deleted_at = 时间戳, deleted_by = 当前用户
+ * 3. QUERY 操作：自动添加 deleted_at = 0 条件
+ *
+ * @param oldSqlSimpleName 原始 SQL 类型
+ * @param cfgModel 配置模型
+ * @param params 请求参数（会被修改）
+ * @param ctx 请求上下文（用于获取当前用户信息）
+ */
 function fixSoftDelete(oldSqlSimpleName, cfgModel, params, ctx) {
     var _a;
-    // 没有开启软删除。不做处理，直接物理删除
+    // 没有开启软删除，不做处理，直接物理删除
     if (cfgModel.enableSoftDelete !== true) {
         return;
     }
-    // 刚插入的话，肯定是未删除的
+    // INSERT 操作：刚插入的数据，肯定是未删除的
     if (keys_1.KeysOfSimpleSQL.SIMPLE_INSERT === oldSqlSimpleName) {
         if (!params.data) {
             params.data = {};
         }
-        params.data.deleted_at = 0; // 默认值为 0； 0代表未删除
+        const dataObj = params.data;
+        dataObj.deleted_at = 0;
     }
-    // 删除操作，如果是软删除修改为update语句。
-    // 标准软删除：deleted_at 字段为0代表未删除，有任意时间字段代表已删除。
+    // DELETE 操作：如果是软删除，修改为 UPDATE 语句
+    // 标准软删除：deleted_at 字段为 0 代表未删除，有任意时间戳代表已删除
     if (keys_1.KeysOfSimpleSQL.SIMPLE_DELETE === oldSqlSimpleName) {
         if (!params.condition || Object.keys(params.condition).length === 0) {
             throw new Error('执行删除操作，必须指定删除条件');
         }
+        // 获取当前用户信息
+        const sessionInfo = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.userSession) === null || _a === void 0 ? void 0 : _a.getSessionInfo();
+        // 在原有 data 对象上添加软删除字段
         if (!params.data) {
             params.data = {};
         }
-        const sessionInfo = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.userSession) === null || _a === void 0 ? void 0 : _a.getSessionInfo();
-        params.data.deleted_at = Date.now(); // 默认值为 0； 0代表未删除
-        params.data.deleted_by = (sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.accountId) || "";
-        // 执行update操作
+        const dataObj = params.data;
+        dataObj.deleted_at = Date.now();
+        dataObj.deleted_by = (sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.accountId) || '';
+        // 改为执行 UPDATE 操作
         cfgModel.sqlSimpleName = keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE;
     }
-    // 查询操作。强制查询未删除的。
+    // QUERY 操作：强制查询未删除的记录
     if (keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName
         || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName
         || keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
         if (!params.condition) {
             params.condition = {};
         }
-        params.condition.deleted_at = 0; // 未删除
+        params.condition.deleted_at = 0;
     }
 }
 exports.fixSoftDelete = fixSoftDelete;

package/dist/service/flow/FlowConfigService.js

@@ -47,7 +47,7 @@ exports.ParsedFlowConfig = ParsedFlowConfig;
 let FlowConfigService = class FlowConfigService extends BaseService_1.BaseService {
     get flow_config() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getBbUtil(SystemDbName, SystemDbType, FlowModel_1.FLOW_TABLES.flow_config);
+        return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, FlowModel_1.FLOW_TABLES.flow_config);
     }
     toCacheKey(flow_code, flow_version) {
         if (!flow_code || typeof flow_code !== 'string') {

package/dist/service/flow/FlowInstanceCrudService.js

@@ -23,7 +23,7 @@ exports.getCurrentDateTime = getCurrentDateTime;
 let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_1.BaseService {
     get flowDB() {
         const { FlowDbName, FlowDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const util = this.curdProService.getBbUtil(FlowDbName, FlowDbType);
+        const util = this.curdProService.getQuickCrud(FlowDbName, FlowDbType);
         util.setBaseCfgModel({ maxLimit: 100000 });
         return util;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -22,12 +22,15 @@
     "dist/**/*.d.ts",
     "dist/**/*.html",
     "dist/**/*.ico",
+    "dist/**/*.md",
     "src/**/*.txt",
     "src/**/*.js",
     "src/**/*.ts",
     "src/**/*.d.ts",
     "src/**/*.html",
     "src/**/*.ico",
+    "src/**/*.md",
+    ".qoder/**/*.md",
     "index.d.ts",
     "tsconfig.json",
     ".prettierrc.js",

package/src/controller/gateway/AsyncTaskController.ts

@@ -111,7 +111,7 @@ export class AsyncTaskController extends BaseApiController {
       },
     };
     const res = await this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_QUERY_ONE);
-    const taskObj: SysAsyncTaskEntity = res.getOneObj();
+    const taskObj = res.getOneObj() as SysAsyncTaskEntity;
     if (!taskObj) {
       throw new CommonException('任务不存在');
     }

package/src/controller/manage/CrudStandardDesignApi.ts

@@ -62,34 +62,22 @@ export class CrudStandardDesignApi extends BaseApiController {
     const { databaseName } = this.ctx.request.body as any;
     const { dbType, dbName } = parseDatabaseName(databaseName);
 
-    if (dbType === SqlDbType.postgres) {
-      return this.getTableListOfPostgreSQL(dbName);
-    }
-
-    if (dbType === SqlDbType.sqlserver) {
-      return this.getTableListOfSqlserver(dbName);
-    }
-
-    const res = await this.curdMixService.executeSQL({
-      executeSql: 'SHOW TABLES',
-      sqlDatabase: dbName,
-      sqlDbType: SqlDbType.mysql,
-      crudType: KeyOfCrudTypes.SYS_QUERY,
-    });
-
-    const arr = JSON.parse(JSON.stringify(res));
-    const tableNames: string[] = arr.map(a => {
-      const v = Object.values(a);
-      const tableName = v[0];
-      return {
-        value: tableName,
-        label: tableName,
-        dbName,
-        dbType,
-        tableName,
-      };
-    });
-    return CommonResult.successRes(tableNames);
+    // 使用 CrudProTableMetaService 获取所有表和视图信息（跳过缓存，强制刷新）
+    const { tables } = await this.curdMixService.getAllTableInfos(
+      { sqlDatabase: dbName, sqlDbType: dbType },
+      { skipCache: true, refreshCache: true }
+    );
+
+    const result = tables.map(table => ({
+      value: table.name,
+      label: table.name,
+      dbName,
+      dbType,
+      tableName: table.name,
+      tableType: table.tableType,
+    }));
+
+    return CommonResult.successRes(result);
   }
 
   @Post('/getTableFields')
@@ -162,78 +150,6 @@ export class CrudStandardDesignApi extends BaseApiController {
     return this.executeSysSimpleSQL(SystemTables.sys_perm_func, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
   }
 
-  private async getTableListOfSqlserver(dbName: string): Promise<CommonResult> {
-    const dbConfig = this.sqlserver2Config[dbName];
-    if (!dbConfig) {
-      throw new CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-    }
-
-    const dbType = SqlDbType.sqlserver;
-
-    const sql = 'SELECT name as tablename FROM sys.tables';
-    const arr = await this.curdMixService.executeSQL({
-      executeSql: sql,
-      sqlDatabase: dbName,
-      sqlDbType: dbType,
-      crudType: KeyOfCrudTypes.SYS_QUERY,
-      executeSqlArgs: [],
-    });
-
-    const tableNames: string[] = arr.map(v => {
-      const tableName = v.tablename;
-      return {
-        value: tableName, //[dbName, dbType, tableName].join(SPLIT_CONST),
-        label: tableName,
-        dbName,
-        dbType,
-        tableName,
-      };
-    });
-    return CommonResult.successRes(tableNames);
-  }
-
-  private async getTableListOfPostgreSQL(dbName: string): Promise<CommonResult> {
-    const dbConfig = this.postgres2Config[dbName];
-    if (!dbConfig) {
-      throw new CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-    }
-
-    const dbType = SqlDbType.postgres;
-    const schemaname = 'public';
-
-    const tableListSql = '' + 'SELECT tablename\n' + 'FROM pg_tables\n' + `WHERE schemaname = '${schemaname}' \n` + 'ORDER BY tablename;';
-
-    const viewListSql = '' + 'SELECT viewname as tablename\n' + 'FROM pg_views\n' + `WHERE schemaname = '${schemaname}' \n` + 'ORDER BY viewname;';
-
-    const toSelectOptions = async (executeSql: string, tableType: string) => {
-      const arr = await this.curdMixService.executeSQL({
-        executeSql: executeSql,
-        sqlDatabase: dbName,
-        sqlDbType: dbType,
-        crudType: KeyOfCrudTypes.SYS_QUERY,
-        executeSqlArgs: [],
-      });
-      return arr.map(v => {
-        const tableName = v.tablename;
-        return {
-          value: tableName, //[dbName, dbType, tableName].join(SPLIT_CONST),
-          label: tableName,
-          dbName,
-          dbType,
-          tableName,
-          tableType,
-        };
-      });
-    };
-
-    const tableNames: any[] = await toSelectOptions(tableListSql, 'table');
-    const viewNames: any[] = await toSelectOptions(viewListSql, 'view');
-
-    const tableNameMerge = [...tableNames, ...viewNames];
-
-    return CommonResult.successRes(tableNameMerge);
-  }
-
   private async getTableFieldsOfSqlServer(dbName: string, tableName: string): Promise<CommonResult> {
     const dbConfig = this.sqlserver2Config[dbName];
     if (!dbConfig) {

package/src/index.ts

@@ -87,6 +87,8 @@ export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
 export * from './models/AsyncTaskModel';
+export * from './models/StandardColumns';
+
 export * from './schedule/index';
 
 export * from './libs/utils/common-dto';
@@ -111,5 +113,6 @@ export * from './libs/crud-pro/models/ExecuteContextFunc';
 export * from './libs/crud-pro/models/RequestCfgModel';
 export * from './libs/crud-pro/models/SqlSegArg';
 export * from './libs/crud-pro/models/ResModel';
+export * from './libs/crud-sharding/index';
 
 export * from './libs/global-config/global-config';

package/src/libs/crud-pro/CrudPro.ts

@@ -1,4 +1,4 @@
-import { ICrudProCfg, ILogger, IRequestCfgModel, IRequestModel, ISqlCfgModel, IVisitor } from './interfaces';
+import { ICrudProCfg, ILogger, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, IVisitor } from './interfaces';
 import { ExecuteContext } from './models/ExecuteContext';
 import { RequestModel } from './models/RequestModel';
 import { CurdProServiceHub } from './services/CurdProServiceHub';
@@ -110,7 +110,11 @@ class CrudPro {
     // 如果是 sqlSimpleName模式的 update/insert，则需要将 reqJson.data 部分根据真实的表结构进行过滤
     await this.filterDataByTableMetaIfNeeded(reqModel, cfgModel);
 
+    // 根据表结构字段类型，自动转换数据格式（如 PostgreSQL ARRAY 字段）
+    await this.convertDataFieldTypeIfNeeded(reqModel, cfgModel);
+
     // 参数校验
+    this.serviceHub.validateDataType(cfgModel, reqModel);
     this.serviceHub.validateByAllow(cfgModel, reqModel);
     this.serviceHub.validateByReject(cfgModel, reqModel);
     this.serviceHub.validateByCfg(cfgModel, reqModel);
@@ -148,6 +152,10 @@ class CrudPro {
     return this.serviceHub.getCachedCfgByMethod(method, isEnableCache);
   }
 
+  public async getAllTableInfos(query: ITableNamesQuery, options?: ITableNamesOptions): Promise<ITableListResult> {
+    return this.serviceHub.getAllTableInfos(query, options);
+  }
+
   /**
    * 如果是 INSERT/UPDATE 操作（sqlSimpleName 模式），根据真实表结构过滤 reqModel.data 中的字段
    * 避免传入不存在的字段导致 SQL 执行报错
@@ -215,6 +223,16 @@ class CrudPro {
     return insertOrUpdateTypes.includes(sqlSimpleName as KeysOfSimpleSQL);
   }
 
+  /**
+   * 根据表结构字段类型，自动转换数据格式
+   * 例如：PostgreSQL 的 ARRAY 类型字段，需要将 JSON 数组转为 PG 数组字面量格式
+   * @param reqModel 请求模型
+   * @param cfgModel 配置模型
+   */
+  private async convertDataFieldTypeIfNeeded(reqModel: RequestModel, cfgModel: RequestCfgModel): Promise<void> {
+    await this.serviceHub.convertDataTypeByTableMeta(reqModel, cfgModel);
+  }
+
   private async executeSQLList() {
     try {
       await this.serviceHub.executeSqlCfgModels();