midway-fatcms 0.0.4 → 0.0.6

package/dist/controller/manage/CrudStandardDesignApi.d.ts

@@ -31,8 +31,6 @@ export declare class CrudStandardDesignApi extends BaseApiController {
      * 获取功能点列表
      */
     getFuncOptionsList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    private getTableListOfSqlserver;
-    private getTableListOfPostgreSQL;
     private getTableFieldsOfSqlServer;
     private getTableFieldsOfPostgreSQL;
     /**

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -54,31 +54,17 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableList() {
         const { databaseName } = this.ctx.request.body;
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
-        if (dbType === keys_1.SqlDbType.postgres) {
-            return this.getTableListOfPostgreSQL(dbName);
-        }
-        if (dbType === keys_1.SqlDbType.sqlserver) {
-            return this.getTableListOfSqlserver(dbName);
-        }
-        const res = await this.curdMixService.executeSQL({
-            executeSql: 'SHOW TABLES',
-            sqlDatabase: dbName,
-            sqlDbType: keys_1.SqlDbType.mysql,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-        });
-        const arr = JSON.parse(JSON.stringify(res));
-        const tableNames = arr.map(a => {
-            const v = Object.values(a);
-            const tableName = v[0];
-            return {
-                value: tableName,
-                label: tableName,
-                dbName,
-                dbType,
-                tableName,
-            };
-        });
-        return common_dto_1.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 common_dto_1.CommonResult.successRes(result);
     }
     async getTableFields() {
         const { databaseName, tableName } = this.ctx.request.body;
@@ -138,66 +124,6 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getFuncOptionsList() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_perm_func, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
     }
-    async getTableListOfSqlserver(dbName) {
-        const dbConfig = this.sqlserver2Config[dbName];
-        if (!dbConfig) {
-            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-        }
-        const dbType = keys_1.SqlDbType.sqlserver;
-        const sql = 'SELECT name as tablename FROM sys.tables';
-        const arr = await this.curdMixService.executeSQL({
-            executeSql: sql,
-            sqlDatabase: dbName,
-            sqlDbType: dbType,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-            executeSqlArgs: [],
-        });
-        const tableNames = arr.map(v => {
-            const tableName = v.tablename;
-            return {
-                value: tableName,
-                label: tableName,
-                dbName,
-                dbType,
-                tableName,
-            };
-        });
-        return common_dto_1.CommonResult.successRes(tableNames);
-    }
-    async getTableListOfPostgreSQL(dbName) {
-        const dbConfig = this.postgres2Config[dbName];
-        if (!dbConfig) {
-            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-        }
-        const dbType = keys_1.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, tableType) => {
-            const arr = await this.curdMixService.executeSQL({
-                executeSql: executeSql,
-                sqlDatabase: dbName,
-                sqlDbType: dbType,
-                crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-                executeSqlArgs: [],
-            });
-            return arr.map(v => {
-                const tableName = v.tablename;
-                return {
-                    value: tableName,
-                    label: tableName,
-                    dbName,
-                    dbType,
-                    tableName,
-                    tableType,
-                };
-            });
-        };
-        const tableNames = await toSelectOptions(tableListSql, 'table');
-        const viewNames = await toSelectOptions(viewListSql, 'view');
-        const tableNameMerge = [...tableNames, ...viewNames];
-        return common_dto_1.CommonResult.successRes(tableNameMerge);
-    }
     async getTableFieldsOfSqlServer(dbName, tableName) {
         const dbConfig = this.sqlserver2Config[dbName];
         if (!dbConfig) {

package/dist/index.d.ts

@@ -87,6 +87,7 @@ 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';
 export * from './libs/utils/crypto-utils';
@@ -108,4 +109,5 @@ 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/dist/index.js

@@ -105,6 +105,7 @@ __exportStar(require("./models/contextLogger"), exports);
 __exportStar(require("./models/devops"), exports);
 __exportStar(require("./models/SystemTables"), exports);
 __exportStar(require("./models/AsyncTaskModel"), exports);
+__exportStar(require("./models/StandardColumns"), exports);
 __exportStar(require("./schedule/index"), exports);
 __exportStar(require("./libs/utils/common-dto"), exports);
 __exportStar(require("./libs/utils/crypto-utils"), exports);
@@ -126,4 +127,5 @@ __exportStar(require("./libs/crud-pro/models/ExecuteContextFunc"), exports);
 __exportStar(require("./libs/crud-pro/models/RequestCfgModel"), exports);
 __exportStar(require("./libs/crud-pro/models/SqlSegArg"), exports);
 __exportStar(require("./libs/crud-pro/models/ResModel"), exports);
+__exportStar(require("./libs/crud-sharding/index"), exports);
 __exportStar(require("./libs/global-config/global-config"), exports);

package/dist/libs/crud-pro/CrudPro.d.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 { Transaction } from './models/Transaction';
 import { IExecuteContextFunc } from './models/ExecuteContextFunc';
@@ -29,6 +29,7 @@ declare class CrudPro {
      */
     executeCrudByCfg(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<ExecuteContext>;
     getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel>;
+    getAllTableInfos(query: ITableNamesQuery, options?: ITableNamesOptions): Promise<ITableListResult>;
     /**
      * 如果是 INSERT/UPDATE 操作（sqlSimpleName 模式），根据真实表结构过滤 reqModel.data 中的字段
      * 避免传入不存在的字段导致 SQL 执行报错
@@ -43,6 +44,13 @@ declare class CrudPro {
      * @returns 是否为 INSERT/UPDATE 类型
      */
     private isSimpleInsertOrUpdateType;
+    /**
+     * 根据表结构字段类型，自动转换数据格式
+     * 例如：PostgreSQL 的 ARRAY 类型字段，需要将 JSON 数组转为 PG 数组字面量格式
+     * @param reqModel 请求模型
+     * @param cfgModel 配置模型
+     */
+    private convertDataFieldTypeIfNeeded;
     private executeSQLList;
     private parseRunSqlException;
     private afterExecuteSQLList;

package/dist/libs/crud-pro/CrudPro.js

@@ -89,7 +89,10 @@ class CrudPro {
         exeCtx.setCfgModel(cfgModel);
         // 如果是 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);
@@ -118,6 +121,9 @@ class CrudPro {
     async getCachedCfgByMethod(method, isEnableCache) {
         return this.serviceHub.getCachedCfgByMethod(method, isEnableCache);
     }
+    async getAllTableInfos(query, options) {
+        return this.serviceHub.getAllTableInfos(query, options);
+    }
     /**
      * 如果是 INSERT/UPDATE 操作（sqlSimpleName 模式），根据真实表结构过滤 reqModel.data 中的字段
      * 避免传入不存在的字段导致 SQL 执行报错
@@ -176,6 +182,15 @@ class CrudPro {
         ];
         return insertOrUpdateTypes.includes(sqlSimpleName);
     }
+    /**
+     * 根据表结构字段类型，自动转换数据格式
+     * 例如：PostgreSQL 的 ARRAY 类型字段，需要将 JSON 数组转为 PG 数组字面量格式
+     * @param reqModel 请求模型
+     * @param cfgModel 配置模型
+     */
+    async convertDataFieldTypeIfNeeded(reqModel, cfgModel) {
+        await this.serviceHub.convertDataTypeByTableMeta(reqModel, cfgModel);
+    }
     async executeSQLList() {
         try {
             await this.serviceHub.executeSqlCfgModels();