midway-fatcms 0.0.1-beta.10 → 0.0.1-beta.12

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

@@ -7,9 +7,9 @@ import { BaseService } from '../base/BaseService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
 export declare class DBUtils {
     private readonly sqlDatabase;
-    private readonly sqlDdType;
+    private readonly sqlDbType;
     private readonly curdProService;
-    constructor(sqlDatabase: string, sqlDdType: SqlDbType, curdProService: CurdProService);
+    constructor(sqlDatabase: string, sqlDbType: SqlDbType, curdProService: CurdProService);
     getOne(reqJson: IRequestModel, sqlTable: string): Promise<any>;
     getList(reqJson: IRequestModel, sqlTable: string): Promise<any[]>;
 }
@@ -34,6 +34,6 @@ export declare class CurdProService extends BaseService {
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
     private applyStandardUpdateCfg;
-    getBbUtil(database: string, sqlDdType: SqlDbType): DBUtils;
+    getBbUtil(database: string, sqlDbType: SqlDbType): DBUtils;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
 }

package/dist/service/curd/CurdProService.js

@@ -65,15 +65,15 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
         }
         const dataBaseName = sqlCfgModel.sqlDatabase;
-        const sqlDdType = sqlCfgModel.sqlDdType;
-        if (sqlDdType === keys_1.SqlDbType.postgres) {
+        const sqlDbType = sqlCfgModel.sqlDbType;
+        if (sqlDbType === keys_1.SqlDbType.postgres) {
             const dbConfig = _.get(this.postgres2Config, dataBaseName);
             if (!dbConfig) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
             }
             return (0, PostgresUtils_1.getConnectionPool)(dataBaseName, dbConfig);
         }
-        if (sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (sqlDbType === keys_1.SqlDbType.sqlserver) {
             const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
             if (!dbConfig) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
@@ -98,9 +98,9 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
     }
 }
 class DBUtils {
-    constructor(sqlDatabase, sqlDdType, curdProService) {
+    constructor(sqlDatabase, sqlDbType, curdProService) {
         this.sqlDatabase = sqlDatabase;
-        this.sqlDdType = sqlDdType;
+        this.sqlDbType = sqlDbType;
         this.curdProService = curdProService;
     }
     async getOne(reqJson, sqlTable) {
@@ -108,7 +108,7 @@ class DBUtils {
             sqlTable,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: this.sqlDatabase,
-            sqlDdType: this.sqlDdType,
+            sqlDbType: this.sqlDbType,
             updateCfg: {},
         };
         const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
@@ -119,7 +119,7 @@ class DBUtils {
             sqlTable,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: this.sqlDatabase,
-            sqlDdType: this.sqlDdType,
+            sqlDbType: this.sqlDbType,
             updateCfg: {},
         };
         const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
@@ -287,8 +287,8 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
             Object.assign(cfgModel.updateCfg, updateCfgObj3);
         }
     }
-    getBbUtil(database, sqlDdType) {
-        return new DBUtils(database, sqlDdType, this);
+    getBbUtil(database, sqlDbType) {
+        return new DBUtils(database, sqlDbType, this);
     }
     async getCachedCfgByMethod(method) {
         const curdPro = this.getCrudPro();

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -89,7 +89,7 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const upstreamMap = {};
@@ -108,7 +108,7 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_proxyapi,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const rows0 = res.getResRows();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.10",
+  "version": "0.0.1-beta.12",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/base/BaseApiController.ts

@@ -40,7 +40,7 @@ export class BaseApiController extends BaseService {
       executeSql: executeSql,
       executeSqlArgs: executeSqlArgs,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
     });
   }
@@ -61,7 +61,7 @@ export class BaseApiController extends BaseService {
       sqlTable,
       sqlSimpleName,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       updateCfg: {},
     };
 

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -101,7 +101,7 @@ export class CrudMtdGatewayController extends ApiBaseService {
     const cfgModel = methodInfo as IRequestCfgModel2;
     const { dbType, dbName } = parseDatabaseName(cfgModel.sqlDatabase);
     cfgModel.sqlDatabase = dbName;
-    cfgModel.sqlDdType = dbType;
+    cfgModel.sqlDbType = dbType;
 
     // 业务系统自定义的修改cfgModel
     await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);

package/src/controller/gateway/DocGatewayController.ts

@@ -53,7 +53,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
   }
 
@@ -85,7 +85,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
 
@@ -128,7 +128,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
   }
@@ -153,7 +153,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc_lib,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const docLibInfo = s.getOneObj();

package/src/controller/manage/CrudStandardDesignApi.ts

@@ -70,7 +70,7 @@ export class CrudStandardDesignApi extends BaseApiController {
     const res = await this.curdMixService.executeSQL({
       executeSql: 'SHOW TABLES',
       sqlDatabase: dbName,
-      sqlDdType: SqlDbType.mysql,
+      sqlDbType: SqlDbType.mysql,
       crudType: KeyOfCrudTypes.SYS_QUERY,
     });
 
@@ -105,13 +105,13 @@ export class CrudStandardDesignApi extends BaseApiController {
     const tableDescribe = await this.curdMixService.executeSQL({
       executeSql: 'describe ' + tableName,
       sqlDatabase: dbName,
-      sqlDdType: SqlDbType.mysql,
+      sqlDbType: SqlDbType.mysql,
       crudType: KeyOfCrudTypes.SYS_QUERY,
     });
     const tableCreate = await this.curdMixService.executeSQL({
       executeSql: 'show create table ' + tableName,
       sqlDatabase: dbName,
-      sqlDdType: SqlDbType.mysql,
+      sqlDbType: SqlDbType.mysql,
       crudType: KeyOfCrudTypes.SYS_QUERY,
     });
 
@@ -180,7 +180,7 @@ export class CrudStandardDesignApi extends BaseApiController {
     const arr = await this.curdMixService.executeSQL({
       executeSql: sql,
       sqlDatabase: dbName,
-      sqlDdType: dbType,
+      sqlDbType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
       executeSqlArgs: [],
     });
@@ -230,7 +230,7 @@ export class CrudStandardDesignApi extends BaseApiController {
       const arr = await this.curdMixService.executeSQL({
         executeSql: executeSql,
         sqlDatabase: dbName,
-        sqlDdType: dbType,
+        sqlDbType: dbType,
         crudType: KeyOfCrudTypes.SYS_QUERY,
         executeSqlArgs: [],
       });
@@ -298,7 +298,7 @@ export class CrudStandardDesignApi extends BaseApiController {
     const columnArray = await this.curdMixService.executeSQL({
       executeSql: columnArraySql,
       sqlDatabase: dbName,
-      sqlDdType: dbType,
+      sqlDbType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
       executeSqlArgs: [],
     });
@@ -359,7 +359,7 @@ export class CrudStandardDesignApi extends BaseApiController {
     const columnArray = await this.curdMixService.executeSQL({
       executeSql: columnArraySql,
       sqlDatabase: dbName,
-      sqlDdType: dbType,
+      sqlDbType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
       executeSqlArgs: [schemaname, tableName],
     });

package/src/controller/manage/DeployManageApi.ts

@@ -141,7 +141,7 @@ export class DeployManageApi extends BaseApiController {
     },{
       sqlTable: SystemTables.sys_workbench,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE
     });
 
@@ -157,7 +157,7 @@ export class DeployManageApi extends BaseApiController {
     },{
       sqlTable: SystemTables.sys_app,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE
     });
 

package/src/controller/manage/SuperAdminManageApi.ts

@@ -41,7 +41,7 @@ export class SuperAdminManageApi extends BaseApiController {
           sqlTable: SystemTables.sys_perm_func,
           sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
           sqlDatabase: SystemDbName,
-          sqlDdType: SystemDbType,
+          sqlDbType: SystemDbType,
         }
       );
     }
@@ -75,7 +75,7 @@ export class SuperAdminManageApi extends BaseApiController {
           sqlTable: SystemTables.sys_perm_role,
           sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
           sqlDatabase: SystemDbName,
-          sqlDdType: SystemDbType,
+          sqlDbType: SystemDbType,
         }
       );
     }
@@ -106,7 +106,7 @@ export class SuperAdminManageApi extends BaseApiController {
           sqlTable: SystemTables.sys_perm_role_func,
           sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
           sqlDatabase: SystemDbName,
-          sqlDdType: SystemDbType,
+          sqlDbType: SystemDbType,
         }
       );
     }
@@ -125,7 +125,7 @@ export class SuperAdminManageApi extends BaseApiController {
             sqlTable: SystemTables.sys_perm_role_func,
             sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
           }
         );
       }

package/src/controller/render/AppRenderController.ts

@@ -33,7 +33,7 @@ export class AppRenderController extends BaseApiController {
         sqlTable: SystemTables.sys_app,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
 

package/src/controller/test.controller.ts

@@ -22,7 +22,7 @@ export class TestApiController extends BaseApiController{
       sqlTable: "test_table1",
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: "postgres_test1",
-      sqlDdType: SqlDbType.postgres,
+      sqlDbType: SqlDbType.postgres,
       updateCfg: {},
     };
 

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

@@ -102,7 +102,7 @@ export interface IBaseCfgModel {
   sqlTable?: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit?: number; // 最大一次性返回的数量
   columns?: string | string[]; // "columns": "id,name,age,sex,addr",
   columnsRelation?: ColumnRelation[];

package/src/libs/crud-pro/models/RequestCfgModel.ts

@@ -38,7 +38,7 @@ class RequestCfgModel {
   sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit = DEFAULT_MAX_LIMIT; // 最大一次性返回的数量
   method: string; // 不能为空
   transactionEnable: boolean; // 是否开启事务，默认不开启，每条语句都是autocommit

package/src/libs/crud-pro/models/SqlCfgModel.ts

@@ -11,7 +11,7 @@ class SqlCfgModel {
   sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit: number; // 最大一次性返回的数量
   resName: string;
   resPicker: KeysOfSqlResPicker;

package/src/libs/crud-pro/services/CrudProExecuteSqlService.ts

@@ -39,7 +39,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     let sqlRes: any;
     let queryRes : any;
 
-    if (sqlCfgModel.sqlDdType === SqlDbType.postgres) { // import { PoolClient } from 'pg';
+    if (sqlCfgModel.sqlDbType === SqlDbType.postgres) { // import { PoolClient } from 'pg';
 
       const pgClient: PoolClient = connection as any;
       const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql);
@@ -55,7 +55,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     }
 
-    else if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+    else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
 
       const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql);
 
@@ -245,14 +245,14 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     // 增删改res的内容是修改结果：包括： insert\delete\update
     if (KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
-      if (sqlCfgModel.sqlDdType === SqlDbType.postgres) {
+      if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
         return {
           insertId: _.get(queryRes,'rows[0].id'),
           affectedRows: _.get(queryRes,'rowCount')
         }
       }
 
-      if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+      if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
         return {
           insertId: _.get(queryRes,'recordset[0].id'),
           affectedRows: _.get(queryRes,'rowsAffected[0]')

package/src/libs/crud-pro/services/CrudProGenSqlCondition.ts

@@ -212,8 +212,8 @@ class CrudProGenSqlCondition {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat(?, '%')`; // like前缀匹配
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} like concat(?, '%')`; // like前缀匹配
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} like concat(?::text, '%')`; // like前缀匹配
           }
 
         } else if (equalsIgnoreCase(KeysOfConditions.$NOT_LIKE, compare)) {
@@ -221,8 +221,8 @@ class CrudProGenSqlCondition {
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat(?, '%')`;
 
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} not like concat(?, '%')`;
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} not like concat(?::text, '%')`;
           }
 
         }
@@ -232,16 +232,16 @@ class CrudProGenSqlCondition {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat('%', ?, '%')`; // like包含
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} like concat('%', ?, '%')`; // like包含
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} like concat('%', ?::text, '%')`; // like包含
           }
 
         } else if (equalsIgnoreCase(KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`;  // like不包含
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} not like concat('%',?, '%')`;  // like不包含
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} not like concat('%',?::text, '%')`;  // like不包含
           }
 
         }

package/src/libs/crud-pro/services/CrudProGenSqlService.ts

@@ -97,10 +97,10 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @private
    */
   private generateOriginSqlForDelete(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'delete from @@table where @@asWhere:condition ';
     }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       return 'delete from @@table where @@asWhere:condition ';
     }
     return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
@@ -112,7 +112,7 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @private
    */
   private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       const uniqueColumn = cfgModel.uniqueColumn ; // id
       if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
         throw new CommonException(Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL)
@@ -124,7 +124,7 @@ class CrudProGenSqlService extends CrudProServiceBase {
     }
 
 
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       const uniqueColumn = cfgModel.uniqueColumn ; // id
       if (uniqueColumn.length !== 1) {
         throw new CommonException(Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
@@ -160,10 +160,10 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @private
    */
   private generateOriginSqlForInsert(cfgModel: RequestCfgModel): string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
     }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
     }
     return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
@@ -177,12 +177,12 @@ class CrudProGenSqlService extends CrudProServiceBase {
 
     const reqCfgModel = exeCtx.getCfgModel();
     const sqlCfgList = reqCfgModel.sqlCfgList || [];
-    const { sqlTable, sqlSchema, sqlDatabase, sqlDdType, maxLimit, columns, columnsRelation } = reqCfgModel;
+    const { sqlTable, sqlSchema, sqlDatabase, sqlDbType, maxLimit, columns, columnsRelation } = reqCfgModel;
 
     for (let i = 0; i < sqlCfgList.length; i++) {
       const sqlCfgModel = sqlCfgList[i];
 
-      sqlCfgModel.sqlDdType = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
+      sqlCfgModel.sqlDbType = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDbType, sqlDbType);
       sqlCfgModel.sqlDatabase = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
       sqlCfgModel.sqlSchema = MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
       sqlCfgModel.sqlTable = MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);

package/src/libs/crud-pro/services/CrudProOriginToExecuteSql.ts

@@ -226,11 +226,11 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
     const reqLimit = req.limit;
     const limit = Math.min(maxLimit, reqLimit);
 
-    if (sqlCfg.sqlDdType === SqlDbType.postgres) {
+    if (sqlCfg.sqlDbType === SqlDbType.postgres) {
       return new SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
     }
 
-    if (sqlCfg.sqlDdType === SqlDbType.sqlserver) {
+    if (sqlCfg.sqlDbType === SqlDbType.sqlserver) {
       return new SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [ req.offset, limit]);
     }
 

package/src/libs/crud-pro/utils/sqlConvert/convertColumnName.ts

@@ -3,10 +3,10 @@ import {SqlDbType} from "../../models/keys";
 
 
 function toSqlColumnName(columnName: string, sqlCfgModel: SqlCfgModel): string {
-  if (sqlCfgModel.sqlDdType === SqlDbType.postgres) {
+  if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
     return '"' + columnName + '"';
   }
-  if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+  if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
     return '[' + columnName + ']';
   }
   return '`' + columnName + '`';

package/src/service/AuthService.ts

@@ -215,7 +215,7 @@ export class AuthService {
         sqlTable: SystemTables.sys_perm_user_role,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res.getResModel().rows || [];
@@ -246,7 +246,7 @@ export class AuthService {
         sqlTable: SystemTables.sys_perm_role_func,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res.getResModel().rows || [];

package/src/service/EnumInfoService.ts

@@ -99,7 +99,7 @@ export class EnumInfoService {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const obj = res1.getOneObj();
@@ -122,7 +122,7 @@ export class EnumInfoService {
         sqlTable: SystemTables.sys_data_dict_item,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const obj = res1.getResRows();

package/src/service/FileCenterService.ts

@@ -114,7 +114,7 @@ class FileDB {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       validateCfg: {
         'condition.file_key': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
@@ -131,7 +131,7 @@ class FileDB {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg(
       {
@@ -150,7 +150,7 @@ class FileDB {
       sqlTable: 'sys_assets_log',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg({ data: fileInfo }, cfgModel);
   }
@@ -161,7 +161,7 @@ class FileDB {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_DELETE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       validateCfg: {
         'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMBER],
       },

package/src/service/SysConfigService.ts

@@ -29,7 +29,7 @@ export class SysConfigService extends BaseService {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     return res1.getOneObj();

package/src/service/UserAccountService.ts

@@ -34,7 +34,7 @@ export class UserAccountService {
         sqlTable: SystemTables.sys_user_account,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const { row } = query.getResModel();
@@ -63,7 +63,7 @@ export class UserAccountService {
       sqlTable: SystemTables.sys_user_account,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
 
     const reqJson: IRequestModel = {
@@ -102,7 +102,7 @@ export class UserAccountService {
         sqlTable: SystemTables.sys_user_account,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     return CommonResult.successRes(res1.getResModel());

package/src/service/VisitStatService.ts

@@ -90,7 +90,7 @@ export class VisitStatService extends BaseService implements IScheduleService {
             }, {
               sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
               sqlDatabase: SystemDbName,
-              sqlDdType: SystemDbType,
+              sqlDbType: SystemDbType,
               sqlTable: SystemTables.sys_visit_stats,
             })
 

package/src/service/WorkbenchService.ts

@@ -54,7 +54,7 @@ export class WorkbenchService extends BaseService implements IScheduleService {
         sqlTable: SystemTables.sys_workbench,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
       listData = res.getResRows();
       lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);

package/src/service/anyapi/AnyApiService.ts

@@ -90,7 +90,7 @@ export class AnyApiService extends ApiBaseService {
         method: `get_sys_anyapi_${methodCode}`,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
         updateCfg: {},
       }
     );