midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.22

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from './controller/gateway/FileController';
 export * from './controller/gateway/ProxyApiGatewayController';
 export * from './controller/gateway/PublicApiController';
 export * from './controller/gateway/StaticController';
+export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
@@ -30,10 +31,6 @@ export * from './controller/manage/SysConfigMangeApi';
 export * from './controller/manage/SystemInfoManageApi';
 export * from './controller/manage/UserAccountManageApi';
 export * from './controller/manage/WorkbenchMangeApi';
-export * from './controller/medstatistic/MedAdminController';
-export * from './controller/medstatistic/MedClientController';
-export * from './controller/medstatistic/MedMessageService';
-export * from './controller/medstatistic/MedScoreService';
 export * from './controller/myinfo/AuthController';
 export * from './controller/myinfo/MyInfoController';
 export * from './controller/render/AppRenderController';
@@ -67,5 +64,38 @@ export * from './service/curd/CurdMixBySysConfigService';
 export * from './service/curd/CurdMixByWorkbenchService';
 export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
+export * from './service/curd/CrudProQuick';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './service/asyncTask/AsyncTaskService';
+export * from './service/asyncTask/AsyncTaskRunnerService';
+export * from './models/userSession';
+export * from './models/bizmodels';
+export * from './models/SystemEntities';
+export * from './models/SystemPerm';
+export * from './models/contextLogger';
+export * from './models/devops';
+export * from './models/SystemTables';
+export * from './models/AsyncTaskModel';
+export * from './schedule/index';
+export * from './libs/utils/common-dto';
+export * from './libs/utils/crypto-utils';
+export * from './libs/utils/fatcms-request';
+export * from './libs/utils/functions';
+export * from './libs/utils/ordernum-utils';
+export * from './libs/utils/parseConfig';
+export * from './libs/crud-pro/CrudPro';
+export * from './libs/crud-pro/defaultConfigs';
+export * from './libs/crud-pro/exceptions';
+export * from './libs/crud-pro/interfaces';
+export * from './libs/crud-pro/models/ExecuteContext';
+export * from './libs/crud-pro/models/FuncContext';
+export * from './libs/crud-pro/models/RequestModel';
+export * from './libs/crud-pro/models/SqlCfgModel';
+export * from './libs/crud-pro/models/Transaction';
+export * from './libs/crud-pro/models/keys';
+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/global-config/global-config';

package/dist/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./controller/gateway/FileController"), exports);
 __exportStar(require("./controller/gateway/ProxyApiGatewayController"), exports);
 __exportStar(require("./controller/gateway/PublicApiController"), exports);
 __exportStar(require("./controller/gateway/StaticController"), exports);
+__exportStar(require("./controller/gateway/AsyncTaskController"), exports);
 __exportStar(require("./controller/helpers.controller"), exports);
 __exportStar(require("./controller/home.controller"), exports);
 __exportStar(require("./controller/manage/AnyApiMangeApi"), exports);
@@ -48,10 +49,6 @@ __exportStar(require("./controller/manage/SysConfigMangeApi"), exports);
 __exportStar(require("./controller/manage/SystemInfoManageApi"), exports);
 __exportStar(require("./controller/manage/UserAccountManageApi"), exports);
 __exportStar(require("./controller/manage/WorkbenchMangeApi"), exports);
-__exportStar(require("./controller/medstatistic/MedAdminController"), exports);
-__exportStar(require("./controller/medstatistic/MedClientController"), exports);
-__exportStar(require("./controller/medstatistic/MedMessageService"), exports);
-__exportStar(require("./controller/medstatistic/MedScoreService"), exports);
 __exportStar(require("./controller/myinfo/AuthController"), exports);
 __exportStar(require("./controller/myinfo/MyInfoController"), exports);
 __exportStar(require("./controller/render/AppRenderController"), exports);
@@ -85,5 +82,38 @@ __exportStar(require("./service/curd/CurdMixBySysConfigService"), exports);
 __exportStar(require("./service/curd/CurdMixByWorkbenchService"), exports);
 __exportStar(require("./service/curd/CurdMixService"), exports);
 __exportStar(require("./service/curd/CurdProService"), exports);
+__exportStar(require("./service/curd/CrudProQuick"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiLoadService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskRunnerService"), exports);
+__exportStar(require("./models/userSession"), exports);
+__exportStar(require("./models/bizmodels"), exports);
+__exportStar(require("./models/SystemEntities"), exports);
+__exportStar(require("./models/SystemPerm"), exports);
+__exportStar(require("./models/contextLogger"), exports);
+__exportStar(require("./models/devops"), exports);
+__exportStar(require("./models/SystemTables"), exports);
+__exportStar(require("./models/AsyncTaskModel"), exports);
+__exportStar(require("./schedule/index"), exports);
+__exportStar(require("./libs/utils/common-dto"), exports);
+__exportStar(require("./libs/utils/crypto-utils"), exports);
+__exportStar(require("./libs/utils/fatcms-request"), exports);
+__exportStar(require("./libs/utils/functions"), exports);
+__exportStar(require("./libs/utils/ordernum-utils"), exports);
+__exportStar(require("./libs/utils/parseConfig"), exports);
+__exportStar(require("./libs/crud-pro/CrudPro"), exports);
+__exportStar(require("./libs/crud-pro/defaultConfigs"), exports);
+__exportStar(require("./libs/crud-pro/exceptions"), exports);
+__exportStar(require("./libs/crud-pro/interfaces"), exports);
+__exportStar(require("./libs/crud-pro/models/ExecuteContext"), exports);
+__exportStar(require("./libs/crud-pro/models/FuncContext"), exports);
+__exportStar(require("./libs/crud-pro/models/RequestModel"), exports);
+__exportStar(require("./libs/crud-pro/models/SqlCfgModel"), exports);
+__exportStar(require("./libs/crud-pro/models/Transaction"), exports);
+__exportStar(require("./libs/crud-pro/models/keys"), exports);
+__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/global-config/global-config"), exports);

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

@@ -32,5 +32,6 @@ declare class CrudPro {
     private executeSQLList;
     private parseRunSqlException;
     private afterExecuteSQLList;
+    private beforeExecuteSQLList;
 }
 export { CrudPro };

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

@@ -75,6 +75,8 @@ class CrudPro {
     async executeCrudByCfg(reqJson, cfgJson) {
         const logger = this.executeContext.getLogger();
         logger.info('CurdPro executeCrudByCfg', cfgJson);
+        // 在执行之前可以根据业务需要修改需要执行的内容。
+        await this.beforeExecuteSQLList(reqJson, cfgJson);
         const exeCtx = this.executeContext;
         if (!cfgJson.method) {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_METHOD_EMPTY, JSON.stringify(cfgJson));
@@ -127,5 +129,8 @@ class CrudPro {
     async afterExecuteSQLList() {
         return this.executeContext.contextFunc.afterExecuteSQLList();
     }
+    async beforeExecuteSQLList(reqJson, cfgJson) {
+        return this.executeContext.contextFunc.beforeExecuteSQLList(reqJson, cfgJson);
+    }
 }
 exports.CrudPro = CrudPro;

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_LIMIT = exports.DEFAULT_MAX_LIMIT = exports.defaultCrudProCfg = void 0;
+const keys_1 = require("./models/keys");
 exports.defaultCrudProCfg = {
     sysDatabaseName: 'fatcms',
+    sysDatabaseDbType: keys_1.SqlDbType.mysql,
     sysConfigTableName: 'sys_configs',
     dictItemTableName: 'sys_data_dict_item',
     methodsTableName: 'sys_crud_methods',

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

@@ -1,6 +1,7 @@
 import { KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType } from './models/keys';
 export interface ICrudProCfg {
     sysDatabaseName?: string;
+    sysDatabaseDbType?: SqlDbType;
     methodsTableName?: string;
     methodsCacheTime?: number;
     dictItemTableName?: string;
@@ -86,7 +87,7 @@ export interface IBaseCfgModel {
     sqlTable?: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit?: number;
     columns?: string | string[];
     columnsRelation?: ColumnRelation[];
@@ -154,4 +155,9 @@ export interface ILogger {
     error(msg: any, ...args: any[]): void;
     warn(msg: any, ...args: any[]): void;
 }
+export interface IExecuteUnsafeQueryCtx {
+    sqlTable: string;
+    sqlDatabase: string;
+    sqlDbType: SqlDbType;
+}
 export {};

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

@@ -4,6 +4,7 @@ import { SqlCfgModel } from './SqlCfgModel';
 import { Transaction } from './Transaction';
 import { ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
+import { ResModelFlexible } from './ResModel';
 declare class ExecuteContext {
     private transaction;
     private logger;
@@ -24,7 +25,7 @@ declare class ExecuteContext {
     getVisitor(): IVisitor;
     getReqModel(): RequestModel;
     setReqModel(reqModel: RequestModel): void;
-    getResModel(): Record<string, any>;
+    getResModel(): ResModelFlexible;
     getOneObj(): any;
     getResRows(): any[];
     setResModelItem(resName: string, data: any): void;

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

@@ -1,4 +1,4 @@
-import { IConnectionPool } from '../interfaces';
+import { IConnectionPool, IRequestCfgModel, IRequestModel } from '../interfaces';
 import { ExecuteContext } from './ExecuteContext';
 import { SqlCfgModel } from './SqlCfgModel';
 import { RequestCfgModel } from './RequestCfgModel';
@@ -10,6 +10,7 @@ export interface IExecuteContextFunc {
     getFunctionMap(): any;
     validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): Promise<any>;
     afterExecuteSQLList(): Promise<any>;
+    beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
 }
 export declare class BaseExecuteContextFunc implements IExecuteContextFunc {
     private executeContext;
@@ -26,6 +27,12 @@ export declare class BaseExecuteContextFunc implements IExecuteContextFunc {
      * @param exeCtx
      */
     afterExecuteSQLList(): Promise<any>;
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
     getExecuteContext(): ExecuteContext;
     setExecuteContext(executeContext: ExecuteContext): void;
 }

package/dist/libs/crud-pro/models/ExecuteContextFunc.js

@@ -54,6 +54,14 @@ class BaseExecuteContextFunc {
     afterExecuteSQLList() {
         return null;
     }
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    beforeExecuteSQLList(reqJson, cfgJson) {
+        return Promise.resolve();
+    }
     getExecuteContext() {
         return this.executeContext;
     }

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/ResModel.d.ts

@@ -0,0 +1,16 @@
+interface ResModelAffected {
+    insertId?: string | number;
+    affectedRows: number;
+}
+interface ResModelStandard {
+    row?: any;
+    rows?: any[];
+    total_count?: number;
+    affected?: ResModelAffected;
+    insert_affected?: ResModelAffected;
+    update_affected?: ResModelAffected;
+}
+declare type ResModelFlexible = ResModelStandard & {
+    [key: string]: any;
+};
+export { ResModelAffected, ResModelStandard, ResModelFlexible };

package/dist/libs/crud-pro/models/ResModel.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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/models/TransactionSqlServer.js

@@ -39,7 +39,7 @@ class TransactionSqlServer {
                     }
                 }
                 return request.query(sql);
-            }
+            },
         };
     }
     /**

package/dist/libs/crud-pro/services/CrudProCachedCfgService.d.ts

@@ -4,6 +4,7 @@ import { ICurdProServiceHub } from '../models/ServiceHub';
 declare class CrudProCachedCfgService extends CrudProServiceBase {
     constructor(serviceHub: ICurdProServiceHub);
     getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null>;
+    private getCachedCfgByMethodInner;
     private loadMethodInfo;
     private loadMethodInfoList;
 }

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

@@ -4,6 +4,7 @@ exports.CrudProCachedCfgService = void 0;
 const humps_1 = require("humps");
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const MixinUtils_1 = require("../utils/MixinUtils");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
 const MemoryRefreshCache_1 = require("../utils/MemoryRefreshCache");
 const methodCache = new MemoryRefreshCache_1.default();
 function parseMethodInfo(methodInfo) {
@@ -17,42 +18,53 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
         super(serviceHub);
     }
     async getCachedCfgByMethod(method, isEnableCache) {
+        const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
+        if (!methodInfo) {
+            return null;
+        }
+        return { ...methodInfo };
+    }
+    async getCachedCfgByMethodInner(method, isEnableCache) {
         // 不使用缓存
         if (!isEnableCache) {
             return await this.loadMethodInfo(method);
         }
         methodCache.setProps({
-            keepTime: 2000,
+            keepTime: 1000 * 60 * 2,
             requestFn: () => this.loadMethodInfoList(),
             getKeyFn: item => item.method,
         });
-        return await methodCache.getItem(method);
+        const methodInfo = await methodCache.getItem(method);
+        if (methodInfo) {
+            return methodInfo;
+        }
+        return await this.loadMethodInfo(method);
     }
     async loadMethodInfo(method) {
-        const { methodsTableName, sysDatabaseName } = this.getContextCfg();
-        const sql = `select *
-                 from ${methodsTableName}
-                 where method = ? `; // 全部加载到内存
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
+        const sql = `select * from ${methodsTableName} where method = ? `; // 全部加载到内存
         const baseInfo = {
-            tableName: methodsTableName,
-            dbName: sysDatabaseName,
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
         };
-        const [rows] = await this.executeUnsafeQuery(baseInfo, sql, [method]);
-        const rows2 = rows;
+        const queryRes = await this.executeUnsafeQuery(baseInfo, sql, [method]);
+        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
         if (rows2.length > 0) {
             return parseMethodInfo(rows2[0]);
         }
         return null;
     }
     async loadMethodInfoList() {
-        const { methodsTableName, sysDatabaseName } = this.getContextCfg();
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
         const sql = `select * from ${methodsTableName}`; // 全部加载到内存
         const baseInfo = {
-            tableName: methodsTableName,
-            dbName: sysDatabaseName,
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
         };
-        const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
-        const rows2 = rows;
+        const queryRes = await this.executeUnsafeQuery(baseInfo, sql);
+        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
         return rows2.map(row => {
             return parseMethodInfo(row);
         });

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

@@ -5,7 +5,7 @@ const _ = require("lodash");
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const keys_1 = require("../models/keys");
 const exceptions_1 = require("../exceptions");
-const convertPgType_1 = require("../utils/sqlConvert/convertPgType");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
 const convertPgSql_1 = require("../utils/sqlConvert/convertPgSql");
 const convertMsSql_1 = require("../utils/sqlConvert/convertMsSql");
 const ModelUtils_1 = require("../utils/ModelUtils");
@@ -30,36 +30,32 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const exeCtx = this.getExecuteContext();
         const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
         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);
             queryRes = await pgClient.query({
                 text: pgSql,
-                values: executeSqlArgs || []
+                values: executeSqlArgs || [],
             });
-            sqlRes = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
         }
-        else if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) { // SQLServer
             const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
             this.logger.info('executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
-            // SQLServer
             queryRes = await connection.query(mssql, executeSqlArgs);
-            sqlRes = _.get(queryRes, 'recordsets[0]') || [];
         }
-        else {
+        else { // MYSQL
             this.logger.info('executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
-            // MYSQL
             queryRes = await connection.query(sqlCfgModel.executeSql, executeSqlArgs);
-            sqlRes = queryRes[0];
         }
+        const sqlRes = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sqlCfgModel.sqlDbType);
         const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);
         exeCtx.setResModelItem(sqlCfgModel.resName, resObject);
     }
     handleExecuteSqlArgsByResModel(exeCtx, executeSqlArgs) {
-        return executeSqlArgs.map((arg) => {
+        return executeSqlArgs.map(arg => {
             if (arg && typeof arg === 'object' && typeof arg.___GENERATE_GET_RES_ATTR___ === 'string') {
                 const word = arg.___GENERATE_GET_RES_ATTR___;
                 if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER)) {
@@ -70,7 +66,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
                 }
                 if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
                     const resName = MixinUtils_1.MixinUtils.removeStringPrefix(word, keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING);
-                    return String(exeCtx.getResModelItemLodash(resName) || "");
+                    return String(exeCtx.getResModelItemLodash(resName) || '');
                 }
             }
             return arg;
@@ -198,16 +194,16 @@ 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')
+                    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]')
+                    affectedRows: _.get(queryRes, 'rowsAffected[0]'),
                 };
             }
             return sqlRes;

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.d.ts

@@ -1,5 +1,5 @@
 import { SqlSegArg } from '../models/SqlSegArg';
-import { SqlCfgModel } from "../models/SqlCfgModel";
+import { SqlCfgModel } from '../models/SqlCfgModel';
 declare class CrudProGenSqlCondition {
     private readonly sqlCfg;
     constructor(sqlCfg: SqlCfgModel);

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

@@ -16,10 +16,8 @@ const createFunc = (sqlCfg) => {
         },
         toMatchSqlColumnName: (columnName) => {
             const arr = columnName.split(',');
-            return arr
-                .map(s => (0, convertColumnName_1.toSqlColumnName)(s.trim(), sqlCfg))
-                .join(',');
-        }
+            return arr.map(s => (0, convertColumnName_1.toSqlColumnName)(s.trim(), sqlCfg)).join(',');
+        },
     };
 };
 class ValueChecker {
@@ -192,29 +190,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,35 +105,26 @@ 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);
             }
-            const unique_column = uniqueColumn.map((s) => {
+            const unique_column = uniqueColumn
+                .map(s => {
                 return `"${s}"`;
-            }).join(",");
+            })
+                .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);
             }
             const uniqueColumnStr = uniqueColumn[0];
-            const uniqueColumnVal = "@@data." + uniqueColumnStr;
-            const sql = "" +
-                `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` +
-                "BEGIN\n" +
-                "    UPDATE @@table\n" +
-                "    SET @@asUpdate:data\n" +
-                `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` +
-                "END\n" +
-                "ELSE\n" +
-                "BEGIN\n" +
-                "    INSERT INTO @@table ( @@asInsertKeys:data )\n" +
-                "    VALUES ( @@asInsertValues:data );\n" +
-                "END";
+            const uniqueColumnVal = '@@data.' + uniqueColumnStr;
+            const sql = '' + `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` + 'BEGIN\n' + '    UPDATE @@table\n' + '    SET @@asUpdate:data\n' + `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` + 'END\n' + 'ELSE\n' + 'BEGIN\n' + '    INSERT INTO @@table ( @@asInsertKeys:data )\n' + '    VALUES ( @@asInsertValues:data );\n' + 'END';
             return sql;
         }
         return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )  on duplicate key update @@asUpdate:data '; // 关键字的前后，必须有空格
@@ -144,10 +135,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 +147,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);