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

package/dist/controller/base/BaseApiController.js

@@ -30,7 +30,7 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
             executeSql: executeSql,
             executeSqlArgs: executeSqlArgs,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
     }
@@ -50,7 +50,7 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
             sqlTable,
             sqlSimpleName,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             updateCfg: {},
         };
         if (params && typeof params === 'object') {

package/dist/controller/gateway/CrudMtdGatewayController.js

@@ -84,7 +84,7 @@ let CrudMtdGatewayController = class CrudMtdGatewayController extends ApiBaseSer
         const cfgModel = methodInfo;
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(cfgModel.sqlDatabase);
         cfgModel.sqlDatabase = dbName;
-        cfgModel.sqlDdType = dbType;
+        cfgModel.sqlDbType = dbType;
         // 业务系统自定义的修改cfgModel
         await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
         return this.curdMixService.executeCrudByCfg(reqJson, cfgModel);

package/dist/controller/gateway/DocGatewayController.js

@@ -54,7 +54,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
     }
     /**
@@ -78,7 +78,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         // 更新PV数据
         const docObj = res.getOneObj();
@@ -111,7 +111,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
     }
     /**
@@ -129,7 +129,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlTable: SystemTables_1.SystemTables.sys_doc_lib,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const docLibInfo = s.getOneObj();
         if (!docLibInfo) {

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -59,7 +59,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const res = await this.curdMixService.executeSQL({
             executeSql: 'SHOW TABLES',
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const arr = JSON.parse(JSON.stringify(res));
@@ -88,13 +88,13 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const tableDescribe = await this.curdMixService.executeSQL({
             executeSql: 'describe ' + tableName,
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const tableCreate = await this.curdMixService.executeSQL({
             executeSql: 'show create table ' + tableName,
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const tableCreateStr = tableCreate[0]['Create Table'];
@@ -144,7 +144,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const arr = await this.curdMixService.executeSQL({
             executeSql: sql,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [],
         });
@@ -181,7 +181,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
             const arr = await this.curdMixService.executeSQL({
                 executeSql: executeSql,
                 sqlDatabase: dbName,
-                sqlDdType: dbType,
+                sqlDbType: dbType,
                 crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
                 executeSqlArgs: [],
             });
@@ -237,7 +237,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const columnArray = await this.curdMixService.executeSQL({
             executeSql: columnArraySql,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [],
         });
@@ -279,7 +279,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const columnArray = await this.curdMixService.executeSQL({
             executeSql: columnArraySql,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [schemaname, tableName],
         });

package/dist/controller/manage/DeployManageApi.js

@@ -121,7 +121,7 @@ let DeployManageApi = class DeployManageApi extends BaseApiController_1.BaseApiC
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_workbench,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE
         });
         const app = await this.curdMixService.executeCrudByCfg({
@@ -134,7 +134,7 @@ let DeployManageApi = class DeployManageApi extends BaseApiController_1.BaseApiC
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE
         });
         this.workbenchService.clearCache();

package/dist/controller/manage/SuperAdminManageApi.js

@@ -39,7 +39,7 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
                 sqlTable: SystemTables_1.SystemTables.sys_perm_func,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
                 sqlDatabase: SystemDbName,
-                sqlDdType: SystemDbType,
+                sqlDbType: SystemDbType,
             });
         }
         return common_dto_1.CommonResult.successRes();
@@ -63,7 +63,7 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
                 sqlTable: SystemTables_1.SystemTables.sys_perm_role,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
                 sqlDatabase: SystemDbName,
-                sqlDdType: SystemDbType,
+                sqlDbType: SystemDbType,
             });
         }
         return common_dto_1.CommonResult.successRes();
@@ -86,7 +86,7 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
                 sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
                 sqlDatabase: SystemDbName,
-                sqlDdType: SystemDbType,
+                sqlDbType: SystemDbType,
             });
         }
         for (let i = 0; i < funcCodeList.length; i++) {
@@ -102,7 +102,7 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
                     sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
                     sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
                     sqlDatabase: SystemDbName,
-                    sqlDdType: SystemDbType,
+                    sqlDbType: SystemDbType,
                 });
             }
         }

package/dist/controller/render/AppRenderController.js

@@ -33,7 +33,7 @@ let AppRenderController = class AppRenderController extends BaseApiController_1.
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const { row: appInfo } = res.getResModel();
         if (!appInfo) {

package/dist/controller/test.controller.js

@@ -21,7 +21,7 @@ let TestApiController = class TestApiController extends BaseApiController_1.Base
             sqlTable: "test_table1",
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: "postgres_test1",
-            sqlDdType: keys_1.SqlDbType.postgres,
+            sqlDbType: keys_1.SqlDbType.postgres,
             updateCfg: {},
         };
         return this.curdMixService.executeCrudByCfg({

package/dist/libs/crud-pro/interfaces.d.ts

@@ -86,7 +86,7 @@ export interface IBaseCfgModel {
     sqlTable?: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit?: number;
     columns?: string | string[];
     columnsRelation?: ColumnRelation[];

package/dist/libs/crud-pro/models/RequestCfgModel.d.ts

@@ -13,7 +13,7 @@ declare class RequestCfgModel {
     sqlTable: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit: number;
     method: string;
     transactionEnable: boolean;

package/dist/libs/crud-pro/models/SqlCfgModel.d.ts

@@ -6,7 +6,7 @@ declare class SqlCfgModel {
     sqlTable: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit: number;
     resName: string;
     resPicker: KeysOfSqlResPicker;

package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js

@@ -32,7 +32,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
         let sqlRes;
         let queryRes;
-        if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) { // import { PoolClient } from 'pg';
+        if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) { // import { PoolClient } from 'pg';
             const pgClient = connection;
             const pgSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql);
             this.logger.info('executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
@@ -42,7 +42,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             });
             sqlRes = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
         }
-        else if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
             this.logger.info('executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
             // SQLServer
@@ -198,13 +198,13 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         }
         // 增删改res的内容是修改结果：包括： insert\delete\update
         if (keys_1.KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
-            if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+            if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
                 return {
                     insertId: _.get(queryRes, 'rows[0].id'),
                     affectedRows: _.get(queryRes, 'rowCount')
                 };
             }
-            if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+            if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
                 return {
                     insertId: _.get(queryRes, 'recordset[0].id'),
                     affectedRows: _.get(queryRes, 'rowsAffected[0]')

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.js

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

package/dist/libs/crud-pro/services/CrudProGenSqlService.js

@@ -91,10 +91,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForDelete(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             return 'delete from @@table where @@asWhere:condition ';
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return 'delete from @@table where @@asWhere:condition ';
         }
         return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
@@ -105,7 +105,7 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForDuplicateInsert(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             const uniqueColumn = cfgModel.uniqueColumn; // id
             if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL);
@@ -115,7 +115,7 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             }).join(",");
             return `insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) ON CONFLICT (${unique_column}) DO UPDATE set @@asUpdate:data `; // 关键字的前后，必须有空格
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             const uniqueColumn = cfgModel.uniqueColumn; // id
             if (uniqueColumn.length !== 1) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
@@ -144,10 +144,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForInsert(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
         }
         return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
@@ -156,10 +156,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const exeCtx = this.getExecuteContext();
         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_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
+            sqlCfgModel.sqlDbType = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDbType, sqlDbType);
             sqlCfgModel.sqlDatabase = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
             sqlCfgModel.sqlSchema = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
             sqlCfgModel.sqlTable = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);

package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.js

@@ -198,10 +198,10 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         const maxLimit = ModelUtils_1.ModelUtils.getMaxLimit(sqlCfg, requestCfg);
         const reqLimit = req.limit;
         const limit = Math.min(maxLimit, reqLimit);
-        if (sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
             return new SqlSegArg_1.SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
         }
-        if (sqlCfg.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (sqlCfg.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return new SqlSegArg_1.SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [req.offset, limit]);
         }
         return new SqlSegArg_1.SqlSegArg(' limit ?,? ', [req.offset, limit]);

package/dist/libs/crud-pro/utils/sqlConvert/convertColumnName.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toSqlColumnNamesJoin = exports.toSqlColumnName = void 0;
 const keys_1 = require("../../models/keys");
 function toSqlColumnName(columnName, sqlCfgModel) {
-    if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
         return '"' + columnName + '"';
     }
-    if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
         return '[' + columnName + ']';
     }
     return '`' + columnName + '`';

package/dist/service/AuthService.js

@@ -180,7 +180,7 @@ let AuthService = class AuthService {
             sqlTable: SystemTables_1.SystemTables.sys_perm_user_role,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const rows = res.getResModel().rows || [];
         const roleCodes = rows.map(({ role_code }) => {
@@ -205,7 +205,7 @@ let AuthService = class AuthService {
             sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const rows = res.getResModel().rows || [];
         const funcCodes = rows.map(({ func_code }) => {

package/dist/service/EnumInfoService.js

@@ -78,7 +78,7 @@ let EnumInfoService = class EnumInfoService {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const obj = res1.getOneObj();
         if (!obj) {
@@ -95,7 +95,7 @@ let EnumInfoService = class EnumInfoService {
             sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const obj = res1.getResRows();
         if (!obj) {

package/dist/service/FileCenterService.js

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

package/dist/service/SysConfigService.js

@@ -28,7 +28,7 @@ let SysConfigService = class SysConfigService extends BaseService_1.BaseService
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         return res1.getOneObj();
     }

package/dist/service/UserAccountService.js

@@ -33,7 +33,7 @@ let UserAccountService = class UserAccountService {
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const { row } = query.getResModel();
         return row;
@@ -56,7 +56,7 @@ let UserAccountService = class UserAccountService {
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         };
         const reqJson = {
             columns: columns,
@@ -88,7 +88,7 @@ let UserAccountService = class UserAccountService {
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         return common_dto_1.CommonResult.successRes(res1.getResModel());
     }

package/dist/service/VisitStatService.js

@@ -77,7 +77,7 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
                         }, {
                             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
                             sqlDatabase: SystemDbName,
-                            sqlDdType: SystemDbType,
+                            sqlDbType: SystemDbType,
                             sqlTable: SystemTables_1.SystemTables.sys_visit_stats,
                         });
                         await client.del(key);

package/dist/service/WorkbenchService.js

@@ -47,7 +47,7 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
                 sqlDatabase: SystemDbName,
-                sqlDdType: SystemDbType,
+                sqlDbType: SystemDbType,
             });
             listData = res.getResRows();
             lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);

package/dist/service/anyapi/AnyApiService.js

@@ -72,7 +72,7 @@ let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService
             method: `get_sys_anyapi_${methodCode}`,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
             updateCfg: {},
         });
         const obj = res.getOneObj();

package/dist/service/crudstd/CrudStdService.js

@@ -40,7 +40,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
         const cfgModel = {
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
             sqlSimpleName,
         };
@@ -121,7 +121,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
     }

package/dist/service/curd/CurdMixByAccountService.js

@@ -47,7 +47,7 @@ let CurdMixByAccountService = class CurdMixByAccountService {
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         };
         const reqJson = {
             columns: ['nick_name', 'avatar', 'account_id'],

package/dist/service/curd/CurdMixByDictService.js

@@ -63,7 +63,7 @@ let CurdMixByDictService = class CurdMixByDictService {
                 sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
                 sqlDatabase: SystemDbName,
-                sqlDdType: SystemDbType,
+                sqlDbType: SystemDbType,
             });
             selectedRows = res1.getResRows();
             //放到缓存里

package/dist/service/curd/CurdMixByLinkToCustomService.js

@@ -101,7 +101,7 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
             sqlTable,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             maxLimit: 4000,
         });
         const rows = res1.getResRows();

package/dist/service/curd/CurdMixBySysConfigService.js

@@ -34,7 +34,7 @@ let CurdMixBySysConfigService = class CurdMixBySysConfigService {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
             sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
+            sqlDbType: SystemDbType,
         });
         const rows = res1.getResRows();
         const multiKeyMap = new MultiKeyMap_1.MultiKeyMap();

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -39,7 +39,7 @@ let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
                 sqlDatabase: SystemDbName,
-                sqlDdType: SystemDbType,
+                sqlDbType: SystemDbType,
             });
             const workbenchList = res.getResRows();
             workbenchListMap = MixinUtils_1.MixinUtils.toNewMap(workbenchList, (obj) => obj.workbench_code);

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

@@ -10,7 +10,7 @@ export declare class CurdMixService {
     private curdMixByLinkToCustomService;
     private prepare;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    getBbUtil(database: string, sqlDdType: SqlDbType): import("./CurdProService").DBUtils;
+    getBbUtil(database: string, sqlDbType: SqlDbType): import("./CurdProService").DBUtils;
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
     executeCrud(reqJson: IRequestModel): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;

package/dist/service/curd/CurdMixService.js

@@ -30,9 +30,9 @@ let CurdMixService = class CurdMixService {
         this.prepare();
         return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
     }
-    getBbUtil(database, sqlDdType) {
+    getBbUtil(database, sqlDbType) {
         this.prepare();
-        return this.curdProService.getBbUtil(database, sqlDdType);
+        return this.curdProService.getBbUtil(database, sqlDbType);
     }
     async executeSQL(sqlCfgModel) {
         this.prepare();