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

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

@@ -17,25 +17,35 @@ 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;
@@ -45,11 +55,12 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
         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;

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

@@ -32,17 +32,18 @@ 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);
             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) {
             const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
             this.logger.info('executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
             // SQLServer
@@ -59,7 +60,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         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 +71,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 +199,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);

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

@@ -100,8 +100,7 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         else if (word === keys_1.KeysOfCustomSQL.SQL_ORDER_BYS) {
             return this.generateOrderBys(reqModel, sqlCfg);
         }
-        else if ((word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) ||
-            word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
+        else if ((word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) || word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
             return this.generateGetAttr(reqModel, word); //// data.xxx, condition.xxx
         }
         else if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER) || word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
@@ -198,10 +197,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]);
@@ -219,9 +218,11 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         return new SqlSegArg_1.SqlSegArg(sql);
     }
     generatePickResAs(req, world) {
-        return new SqlSegArg_1.SqlSegArg(' ? ', [{
+        return new SqlSegArg_1.SqlSegArg(' ? ', [
+            {
                 ___GENERATE_GET_RES_ATTR___: world,
-            }]);
+            },
+        ]);
     }
     generateGetAttr(req, word) {
         const attrName = MixinUtils_1.MixinUtils.removeStringPrefix(word, '@@');

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

@@ -1,12 +1,8 @@
 import { ICurdProServiceHub } from '../models/ServiceHub';
-import { ICrudProCfg, ILogger, IPoolConnectionClient } from '../interfaces';
+import { ICrudProCfg, IExecuteUnsafeQueryCtx, ILogger, IPoolConnectionClient } from '../interfaces';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { ExecuteContext } from '../models/ExecuteContext';
 import { IExecuteContextFunc } from '../models/ExecuteContextFunc';
-interface ExecuteUnsafeQueryCtx {
-    tableName: string;
-    dbName: string;
-}
 declare class CrudProServiceBase {
     protected serviceHub: ICurdProServiceHub;
     constructor(serviceHub: ICurdProServiceHub);
@@ -21,7 +17,7 @@ declare class CrudProServiceBase {
      * @param values
      * @protected
      */
-    protected executeUnsafeQuery(obj: ExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
+    protected executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
     protected getContextCfg(): ICrudProCfg;
     protected getExecuteFunction(funcName: string): any;
 }

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

@@ -45,8 +45,9 @@ class CrudProServiceBase {
      */
     async executeUnsafeQuery(obj, sql, values) {
         const sqlCfgModel = {
-            sqlTable: obj.tableName,
-            sqlDatabase: obj.dbName,
+            sqlTable: obj.sqlTable,
+            sqlDatabase: obj.sqlDatabase,
+            sqlDbType: obj.sqlDbType,
             columns: [],
             columnsRelation: [],
             maxLimit: defaultConfigs_1.DEFAULT_MAX_LIMIT,

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

@@ -4,5 +4,6 @@ import { ITableMeta } from '../interfaces';
 declare class CrudProTableMetaService extends CrudProServiceBase {
     getTableMeta(sqlCfgModel: SqlCfgModel): Promise<ITableMeta>;
     private loadTableMeta;
+    private loadTableColumnInfo;
 }
 export { CrudProTableMetaService };

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudProTableMetaService = void 0;
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
+const keys_1 = require("../models/keys");
+const convertPgType_1 = require("../utils/sqlConvert/convertPgType");
 class CrudProTableMetaCache {
     constructor() {
         this.cacheMap = {};
@@ -39,15 +41,37 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
             tableColumns: [],
         };
         const baseInfo = {
-            tableName: sqlCfgModel.sqlTable,
-            dbName: sqlCfgModel.sqlDatabase,
+            sqlTable: sqlCfgModel.sqlTable,
+            sqlDatabase: sqlCfgModel.sqlDatabase,
+            sqlDbType: sqlCfgModel.sqlDbType,
         };
-        const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + sqlCfgModel.sqlTable);
-        const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
-        obj.tableColumns = tableDescribe2.map(fieldObj => {
-            return fieldObj['Field'];
-        });
+        obj.tableColumns = await this.loadTableColumnInfo(baseInfo);
         return obj;
     }
+    async loadTableColumnInfo(baseInfo) {
+        if (baseInfo.sqlDbType === keys_1.SqlDbType.mysql) {
+            const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+            const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
+            return tableDescribe2.map(fieldObj => {
+                return fieldObj['Field'];
+            });
+        }
+        else if (baseInfo.sqlDbType === keys_1.SqlDbType.postgres) {
+            const schemaname = 'public';
+            const columnArraySql = `
+      SELECT
+        *
+        FROM information_schema.columns
+        WHERE table_schema = '${schemaname}' and table_name = '${baseInfo.sqlTable}'
+        ORDER BY ordinal_position;
+      `.trim();
+            const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
+            const rows = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
+            return rows.map(fieldObj => {
+                return fieldObj['column_name'];
+            });
+        }
+        throw new Error('暂不支持的数据库类型：' + baseInfo.sqlDbType);
+    }
 }
 exports.CrudProTableMetaService = CrudProTableMetaService;

package/dist/libs/crud-pro/utils/DatabaseName.js

@@ -2,14 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toDatabaseNameStr = exports.parseDatabaseName = exports.SPLIT_CONST = void 0;
 const keys_1 = require("../models/keys");
-const SPLIT_CONST = "_________";
+const SPLIT_CONST = '_________';
 exports.SPLIT_CONST = SPLIT_CONST;
+const PREFIX_MYSQL = `${keys_1.SqlDbType.mysql}${SPLIT_CONST}`;
+const PREFIX_POSTGRES = `${keys_1.SqlDbType.postgres}${SPLIT_CONST}`;
+const PREFIX_SQLSERVER = `${keys_1.SqlDbType.sqlserver}${SPLIT_CONST}`;
 function parseDatabaseName(databaseName) {
     const dbNameArr = databaseName.split(SPLIT_CONST);
+    if (databaseName.startsWith(PREFIX_MYSQL)) {
+        return {
+            dbType: keys_1.SqlDbType.mysql,
+            dbName: dbNameArr[1],
+        };
+    }
+    if (databaseName.startsWith(PREFIX_POSTGRES)) {
+        return {
+            dbType: keys_1.SqlDbType.postgres,
+            dbName: dbNameArr[1],
+        };
+    }
+    if (databaseName.startsWith(PREFIX_SQLSERVER)) {
+        return {
+            dbType: keys_1.SqlDbType.sqlserver,
+            dbName: dbNameArr[1],
+        };
+    }
     if (dbNameArr.length === 1) {
         return {
             dbType: keys_1.SqlDbType.mysql,
-            dbName: dbNameArr[0]
+            dbName: dbNameArr[0],
         };
     }
     if (dbNameArr.length > 1) {
@@ -17,7 +38,7 @@ function parseDatabaseName(databaseName) {
         const dbType = dbType0;
         return {
             dbType,
-            dbName
+            dbName,
         };
     }
     return null;

package/dist/libs/crud-pro/utils/MixinUtils.js

@@ -43,7 +43,7 @@ const MixinUtils = {
         return !str1 && !str2;
     },
     startsWith(str1, str2) {
-        if (typeof str1 === "string" && typeof str2 === "string") {
+        if (typeof str1 === 'string' && typeof str2 === 'string') {
             return str1.startsWith(str2);
         }
         return false;

package/dist/libs/crud-pro/utils/ValidateUtils.js

@@ -147,7 +147,7 @@ function validateByCfgString(validateCfg, itemValue, errPath) {
         return;
     }
     // 必填
-    if ("required" === validateCfg) {
+    if ('required' === validateCfg) {
         if (isEmpty(itemValue)) {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
         }

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/libs/global-config/global-config.d.ts

@@ -0,0 +1,45 @@
+import { SqlDbType } from '../crud-pro/models/keys';
+interface IGlobalStaticConfig {
+    /**
+     * CrudStd: 业务系统自定义的修改cfgModel
+     * @param reqJson
+     * @param cfgModel
+     * @param appInfo
+     * @param ctx
+     */
+    bizUpdateCfgModelForCrudStd(reqJson: any, cfgModel: any, appInfo: any, ctx: any): Promise<any>;
+    /**
+     * CrudMtd: 业务系统自定义的修改cfgModel
+     * @param reqJson
+     * @param cfgModel
+     * @param methodInfo
+     * @param ctx
+     */
+    bizUpdateCfgModelForCrudMtd(reqJson: any, cfgModel: any, methodInfo: any, ctx: any): Promise<any>;
+    /**
+     * CrudPro: 业务系统自定义的修改cfgModel。这是最底层的！！全局的！！全局的！！全局的！！！
+     * @param reqJson
+     * @param cfgModel
+     */
+    bizUpdateCfgModelForCrudPro(reqJson: any, cfgModel: any): Promise<any>;
+    /**
+     * 生成用户的账号ID，业务系统可以生成类似工号的ID
+     * @param userSubmitData
+     */
+    generateUserAccountId(userSubmitData: any): Promise<string>;
+    /**
+     * 将业务系统表中的userId映射为fatcms的UserAccountId
+     * @param bizTableUserId 业余系统表中的UserId
+     */
+    toFatcmsUserAccountId(bizTableUserId: any): string;
+    SystemDbName: string;
+    SystemDbType: SqlDbType;
+}
+declare class GlobalStaticConfig {
+    private configObject;
+    constructor();
+    getConfig(): IGlobalStaticConfig;
+    setConfig(configObject: any): void;
+}
+declare const GLOBAL_STATIC_CONFIG: GlobalStaticConfig;
+export { GLOBAL_STATIC_CONFIG };

package/dist/libs/global-config/global-config.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLOBAL_STATIC_CONFIG = void 0;
+const keys_1 = require("../crud-pro/models/keys");
+const noop = () => {
+    return Promise.resolve();
+};
+class GlobalStaticConfig {
+    constructor() {
+        this.configObject = {
+            bizUpdateCfgModelForCrudStd: noop,
+            bizUpdateCfgModelForCrudMtd: noop,
+            bizUpdateCfgModelForCrudPro: noop,
+            generateUserAccountId: null,
+            toFatcmsUserAccountId: (bizTableUserId) => {
+                return bizTableUserId;
+            },
+            SystemDbName: 'fatcms',
+            SystemDbType: keys_1.SqlDbType.mysql,
+        };
+    }
+    getConfig() {
+        return this.configObject;
+    }
+    setConfig(configObject) {
+        if (!configObject || typeof configObject !== 'object') {
+            throw new Error('参数configObject不能为空');
+        }
+        Object.assign(this.configObject, configObject);
+    }
+}
+const GLOBAL_STATIC_CONFIG = new GlobalStaticConfig();
+exports.GLOBAL_STATIC_CONFIG = GLOBAL_STATIC_CONFIG;

package/dist/libs/utils/errorToString.d.ts

@@ -0,0 +1,2 @@
+declare function errorToString(error: any): string;
+export { errorToString };

package/dist/libs/utils/errorToString.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorToString = void 0;
+function errorToString(error) {
+    var _a;
+    // 处理非错误对象的情况
+    if (typeof error === 'undefined') {
+        return 'Error: undefined was thrown';
+    }
+    if (error === null) {
+        return 'Error: null was thrown';
+    }
+    // 处理原始值类型
+    const primitiveTypes = ['string', 'number', 'boolean', 'symbol'];
+    if (primitiveTypes.includes(typeof error)) {
+        return `Error: A primitive value was thrown\nValue: ${String(error)}`;
+    }
+    // 处理 Error 对象
+    if (error instanceof Error) {
+        const errorDetails = [];
+        errorDetails.push(`Error: ${error.name || 'Error'}`);
+        errorDetails.push(`Message: ${error.message || 'No error message'}`);
+        if (error.stack) {
+            errorDetails.push('Stack Trace:');
+            errorDetails.push(error.stack);
+        }
+        const extraProperties = ['code', 'fileName', 'lineNumber', 'columnNumber'];
+        extraProperties.forEach(prop => {
+            if (error[prop] !== undefined) {
+                errorDetails.push(`${prop}: ${error[prop]}`);
+            }
+        });
+        const customProps = Object.keys(error).filter(key => !['name', 'message', 'stack', ...extraProperties].includes(key));
+        if (customProps.length > 0) {
+            errorDetails.push('Custom Properties:');
+            customProps.forEach(prop => {
+                try {
+                    const value = JSON.stringify(error[prop], null, 2) || String(error[prop]);
+                    errorDetails.push(`  ${prop}: ${value}`);
+                }
+                catch (e) {
+                    errorDetails.push(`  ${prop}: [Object cannot be serialized]`);
+                }
+            });
+        }
+        return errorDetails.join('\n');
+    }
+    // 处理普通对象
+    try {
+        const objectDetails = JSON.stringify(error, null, 2);
+        return `Error: A plain object was thrown\nObject: ${objectDetails}`;
+    }
+    catch (e) {
+        return `Error: An object was thrown but could not be serialized\nType: ${((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) || 'Unknown'}`;
+    }
+}
+exports.errorToString = errorToString;