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

package/dist/controller/base/BaseApiController.js

@@ -17,6 +17,7 @@ const global_config_1 = require("../../libs/global-config/global-config");
 const UserAccountService_1 = require("../../service/UserAccountService");
 const CurdMixUtils_1 = require("../../service/curd/CurdMixUtils");
 const BaseService_1 = require("../../service/base/BaseService");
+const moment = require("moment");
 let BaseApiController = class BaseApiController extends BaseService_1.BaseService {
     getUserSessionInfo() {
         if (!this.ctx.userSession) {
@@ -60,6 +61,10 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
         this.addAccountBasicInfoCfgModel(cfgModel);
         //自动关联工作台基本信息
         this.addWorkbenchBasicInfoCfgModel(cfgModel);
+        //sys系统表都是标准的，都有modified_at字段。
+        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE && body.data) {
+            body.data['modified_at'] = moment(Date.now()).format('YYYY-MM-DD HH:mm:ss.SSS');
+        }
         return await this.curdMixService.executeCrudByCfg(body, cfgModel);
     }
     get sysDBUtil() {

package/dist/controller/gateway/CrudStdGatewayController.d.ts

@@ -14,23 +14,23 @@ export declare class CrudStdGatewayController extends BaseApiController {
     /**
      * 列表查询: 分页查询
      */
-    getObjectList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    getObjectList(): Promise<any>;
     /**
      * 单个查询
      */
-    getObjectOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    getObjectOne(): Promise<any>;
     /**
      * 单个删除
      */
-    deleteObject(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    deleteObject(): Promise<any>;
     /**
      * 单个创建
      */
-    createObject(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    createObject(): Promise<any>;
     /**
      * 单个更新
      */
-    updateObject(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    updateObject(): Promise<any>;
     /**
      * 执行操作
      */

package/dist/controller/manage/AnyApiMangeApi.js

@@ -46,14 +46,14 @@ let AnyApiMangeApi = class AnyApiMangeApi extends BaseApiController_1.BaseApiCon
         fixBodyData(this.ctx.request.body);
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_anyapi, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteAnyApi() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_anyapi, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/AppLogMangeApi.js

@@ -34,7 +34,7 @@ let AppLogMangeApi = class AppLogMangeApi extends BaseApiController_1.BaseApiCon
     async updateAppLog() {
         return this.executeSysSimpleSQL('sys_app_log', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -42,7 +42,7 @@ let AppLogMangeApi = class AppLogMangeApi extends BaseApiController_1.BaseApiCon
     async deleteAppLog() {
         return this.executeSysSimpleSQL('sys_app_log', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

package/dist/controller/manage/AppMangeApi.js

@@ -34,7 +34,7 @@ let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiControlle
     async updateApp() {
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -42,7 +42,7 @@ let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiControlle
     async deleteApp() {
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

package/dist/controller/manage/AppPageMangeApi.js

@@ -35,14 +35,14 @@ let AppPageMangeApi = class AppPageMangeApi extends BaseApiController_1.BaseApiC
     async updateAppPage() {
         return this.executeSysSimpleSQL('sys_app_page', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteAppPage() {
         return this.executeSysSimpleSQL('sys_app_page', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/AppSchemaHistoryApi.js

@@ -31,14 +31,14 @@ let AppSchemaHistoryApi = class AppSchemaHistoryApi extends BaseApiController_1.
     async updateAppSchemaHistory() {
         return this.executeSysSimpleSQL(tableName, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteAppSchemaHistory() {
         return this.executeSysSimpleSQL(tableName, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/CrudMethodsMangeApi.js

@@ -32,14 +32,14 @@ let CrudMethodsMangeApi = class CrudMethodsMangeApi extends BaseApiController_1.
     async updateCrudMethod() {
         return this.executeSysSimpleSQL('sys_crud_methods', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteCrudMethod() {
         return this.executeSysSimpleSQL('sys_crud_methods', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/DataDictManageApi.js

@@ -32,7 +32,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
     async updateDataDict() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/DocLibManageApi.js

@@ -45,7 +45,7 @@ let DocLibManageApi = class DocLibManageApi extends BaseApiController_1.BaseApiC
     async updateDocLib() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_doc_lib, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'data.title': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
             updateCfg: {
@@ -56,7 +56,7 @@ let DocLibManageApi = class DocLibManageApi extends BaseApiController_1.BaseApiC
     async deleteDocLib() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_doc_lib, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },

package/dist/controller/manage/DocManageApi.js

@@ -71,7 +71,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
         const updateCfg = isPublish ? publishUpdateCfg : {};
         return this.executeSysSimpleSQL('sys_doc', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 ...updateCfg,
@@ -82,7 +82,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
     async deleteDoc() {
         return this.executeSysSimpleSQL('sys_doc', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },

package/dist/controller/manage/FileManageApi.js

@@ -30,7 +30,7 @@ let FileMangeApi = class FileMangeApi extends BaseApiController_1.BaseApiControl
     async updateFile() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_file, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/LowCodeTplManageApi.js

@@ -34,14 +34,14 @@ let LowCodeTplManageApi = class LowCodeTplManageApi extends BaseApiController_1.
     async updateLowCodeTpl() {
         return this.executeSysSimpleSQL(tableName, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteLowCodeTpl() {
         return this.executeSysSimpleSQL(tableName, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/MenuManageApi.js

@@ -39,7 +39,7 @@ let MenuManageApi = class MenuManageApi extends BaseApiController_1.BaseApiContr
     async updateMenu() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_menus, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {},
         });
@@ -47,7 +47,7 @@ let MenuManageApi = class MenuManageApi extends BaseApiController_1.BaseApiContr
     async deleteMenu() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_menus, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {},
         });

package/dist/controller/manage/ProxyApiMangeApi.js

@@ -35,14 +35,14 @@ let ProxyApiMangeApi = class ProxyApiMangeApi extends BaseApiController_1.BaseAp
     async updateProxyApi() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_proxyapi, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteProxyApi() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_proxyapi, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/SysConfigMangeApi.js

@@ -68,7 +68,7 @@ let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'data.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING, 'length:1,64'],
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },
@@ -78,7 +78,7 @@ let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.Base
     async deleteSysConfig() {
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },

package/dist/controller/manage/UserAccountManageApi.js

@@ -43,7 +43,7 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
     async updateUserAccount() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'data.login_name': LOGIN_NAME_VALIDATE,
                 'data.nick_name': [keys_1.KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
             },
@@ -70,7 +70,7 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
     async deleteUserAccount() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/WorkbenchMangeApi.js

@@ -43,7 +43,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
         this.workbenchService.clearCache();
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_workbench, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -53,7 +53,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
         this.workbenchService.clearCache();
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_workbench, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

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) {
@@ -47,8 +48,8 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
             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]);
         }
@@ -62,8 +63,8 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
             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,7 +30,6 @@ 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.sqlDbType === keys_1.SqlDbType.postgres) {
             // import { PoolClient } from 'pg';
@@ -41,21 +40,17 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
                 text: pgSql,
                 values: executeSqlArgs || [],
             });
-            sqlRes = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
         }
-        else if (sqlCfgModel.sqlDbType === 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);
     }

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

@@ -3,7 +3,7 @@ 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");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
 class CrudProTableMetaCache {
     constructor() {
         this.cacheMap = {};
@@ -50,7 +50,8 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
     }
     async loadTableColumnInfo(baseInfo) {
         if (baseInfo.sqlDbType === keys_1.SqlDbType.mysql) {
-            const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+            const queryRes = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+            const tableDescribe = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, baseInfo.sqlDbType);
             const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
             return tableDescribe2.map(fieldObj => {
                 return fieldObj['Field'];
@@ -66,8 +67,8 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
         ORDER BY ordinal_position;
       `.trim();
             const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
-            const rows = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
-            return rows.map(fieldObj => {
+            const tableDescribe = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, baseInfo.sqlDbType);
+            return tableDescribe.map(fieldObj => {
                 return fieldObj['column_name'];
             });
         }

package/dist/libs/crud-pro/utils/sqlConvert/convertMix.d.ts

@@ -0,0 +1,3 @@
+import { SqlDbType } from "../../models/keys";
+declare function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any;
+export { pickAndConvertRowsByMix };

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pickAndConvertRowsByMix = void 0;
+const keys_1 = require("../../models/keys");
+const convertPgType_1 = require("./convertPgType");
+const _ = require("lodash");
+function pickAndConvertRowsByMix(connectionQueryRes, sqlDbType) {
+    if (!connectionQueryRes) {
+        throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ');
+    }
+    if (sqlDbType === keys_1.SqlDbType.postgres) {
+        return (0, convertPgType_1.pickAndConvertPgRows)(connectionQueryRes);
+    }
+    if (sqlDbType === keys_1.SqlDbType.mysql) {
+        return connectionQueryRes[0];
+    }
+    if (sqlDbType === keys_1.SqlDbType.sqlserver) {
+        return _.get(connectionQueryRes, 'recordsets[0]') || [];
+    }
+    throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType);
+}
+exports.pickAndConvertRowsByMix = pickAndConvertRowsByMix;

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -20,7 +20,13 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const errorToString_1 = require("../../libs/utils/errorToString");
 const schedule_1 = require("../../schedule");
 const RedisKeys_1 = require("../../models/RedisKeys");
-const END_STATUS_LIST = [AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED, AsyncTaskModel_1.SysAsyncTaskStatus.FAILED, AsyncTaskModel_1.SysAsyncTaskStatus.PART_SUCCEEDED];
+const END_STATUS_LIST = [
+    AsyncTaskModel_1.SysAsyncTaskStatus.PART_SUCCEEDED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.FAILED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.CANCELLED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.PAUSED,
+];
 class AsyncTaskRunner {
     constructor() {
         this.isBusy = false;

package/dist/service/crudstd/CrudStdService.d.ts

@@ -19,7 +19,7 @@ export declare class CrudStdService extends ApiBaseService {
     /**
      * 执行普通CRUD
      */
-    executeStdQuery(appCode: string, settingKey: string, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
+    executeStdQuery(appCode: string, settingKey: string, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<any>;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
      * @param appCode

package/dist/service/crudstd/CrudStdService.js

@@ -37,6 +37,20 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         if (!appInfo || appInfo.status !== 1) {
             throw new devops_1.BizException('应用不存在或已下线：' + appCode);
         }
+        // 查询列表功能
+        if (settingKey === exports.SPECIAL_SETTING_KEY.QUERY_LIST) {
+            // 正确启用了自定义查询功能
+            const customQueryApi = _.get(stdCrudCfgObj, 'othersSetting.values.customQueryApi');
+            if (typeof customQueryApi === 'string') {
+                const customQueryApiArr = customQueryApi.split('.');
+                const serviceName = customQueryApiArr[0] || "";
+                const serviceFunc = customQueryApiArr[1] || "";
+                if (serviceName.endsWith('Service')) {
+                    const serviceObj = await this.ctx.requestContext.getAsync(serviceName);
+                    return serviceObj[serviceFunc](params);
+                }
+            }
+        }
         const databaseName = stdCrudCfgObj.tableBaseInfo.databaseName;
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
         const cfgModel = {

package/package.json

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

package/src/controller/base/BaseApiController.ts

@@ -7,6 +7,8 @@ import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { UserAccountService } from '@/service/UserAccountService';
 import { RelatedType } from '@/service/curd/CurdMixUtils';
 import { BaseService } from '@/service/base/BaseService';
+import * as moment from 'moment';
+
 
 export interface IExecuteSimpleSqlParams {
   updateCfg?: Record<string, IFuncCfgModel>;
@@ -75,6 +77,11 @@ export class BaseApiController extends BaseService {
     //自动关联工作台基本信息
     this.addWorkbenchBasicInfoCfgModel(cfgModel);
 
+    //sys系统表都是标准的，都有modified_at字段。
+    if(sqlSimpleName === KeysOfSimpleSQL.SIMPLE_UPDATE && body.data) {
+      body.data['modified_at'] =  moment(Date.now()).format('YYYY-MM-DD HH:mm:ss.SSS');
+    }
+
     return await this.curdMixService.executeCrudByCfg(body, cfgModel);
   }
 

package/src/controller/manage/AnyApiMangeApi.ts

@@ -50,7 +50,7 @@ export class AnyApiMangeApi extends BaseApiController {
 
     return this.executeSysSimpleSQL(SystemTables.sys_anyapi, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }
@@ -59,7 +59,7 @@ export class AnyApiMangeApi extends BaseApiController {
   async deleteAnyApi() {
     return this.executeSysSimpleSQL(SystemTables.sys_anyapi, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/AppLogMangeApi.ts

@@ -35,7 +35,7 @@ export class AppLogMangeApi extends BaseApiController {
   async updateAppLog() {
     return this.executeSysSimpleSQL('sys_app_log', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.app_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });
@@ -45,7 +45,7 @@ export class AppLogMangeApi extends BaseApiController {
   async deleteAppLog() {
     return this.executeSysSimpleSQL('sys_app_log', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.app_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });

package/src/controller/manage/AppMangeApi.ts

@@ -35,7 +35,7 @@ export class AppMangeApi extends BaseApiController {
   async updateApp() {
     return this.executeSysSimpleSQL('sys_app', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.app_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });
@@ -45,7 +45,7 @@ export class AppMangeApi extends BaseApiController {
   async deleteApp() {
     return this.executeSysSimpleSQL('sys_app', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.app_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });

package/src/controller/manage/AppPageMangeApi.ts

@@ -36,7 +36,7 @@ export class AppPageMangeApi extends BaseApiController {
   async updateAppPage() {
     return this.executeSysSimpleSQL('sys_app_page', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }
@@ -45,7 +45,7 @@ export class AppPageMangeApi extends BaseApiController {
   async deleteAppPage() {
     return this.executeSysSimpleSQL('sys_app_page', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/AppSchemaHistoryApi.ts

@@ -33,7 +33,7 @@ export class AppSchemaHistoryApi extends BaseApiController {
   async updateAppSchemaHistory() {
     return this.executeSysSimpleSQL(tableName, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }
@@ -42,7 +42,7 @@ export class AppSchemaHistoryApi extends BaseApiController {
   async deleteAppSchemaHistory() {
     return this.executeSysSimpleSQL(tableName, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/CrudMethodsMangeApi.ts

@@ -33,7 +33,7 @@ export class CrudMethodsMangeApi extends BaseApiController {
   async updateCrudMethod() {
     return this.executeSysSimpleSQL('sys_crud_methods', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }
@@ -42,7 +42,7 @@ export class CrudMethodsMangeApi extends BaseApiController {
   async deleteCrudMethod() {
     return this.executeSysSimpleSQL('sys_crud_methods', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/DataDictManageApi.ts

@@ -33,7 +33,7 @@ export class DataDictManageApi extends BaseApiController {
   async updateDataDict() {
     return this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/DocLibManageApi.ts

@@ -46,7 +46,7 @@ export class DocLibManageApi extends BaseApiController {
   async updateDocLib() {
     return this.executeSysSimpleSQL(SystemTables.sys_doc_lib, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'data.title': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
       updateCfg: {
@@ -59,7 +59,7 @@ export class DocLibManageApi extends BaseApiController {
   async deleteDocLib() {
     return this.executeSysSimpleSQL(SystemTables.sys_doc_lib, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {
         'condition.workbench_code': { contextAsString: CTX_WORKBENCH_CODE },

package/src/controller/manage/DocManageApi.ts

@@ -76,7 +76,7 @@ export class DocManageApi extends BaseApiController {
     const updateCfg = isPublish ? publishUpdateCfg : {};
     return this.executeSysSimpleSQL('sys_doc', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {
         ...updateCfg,
@@ -89,7 +89,7 @@ export class DocManageApi extends BaseApiController {
   async deleteDoc() {
     return this.executeSysSimpleSQL('sys_doc', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {
         'condition.workbench_code': { contextAsString: CTX_WORKBENCH_CODE },

package/src/controller/manage/FileManageApi.ts

@@ -32,7 +32,7 @@ export class FileMangeApi extends BaseApiController {
   async updateFile() {
     return this.executeSysSimpleSQL(SystemTables.sys_file, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/LowCodeTplManageApi.ts

@@ -36,7 +36,7 @@ export class LowCodeTplManageApi extends BaseApiController {
   async updateLowCodeTpl() {
     return this.executeSysSimpleSQL(tableName, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }
@@ -45,7 +45,7 @@ export class LowCodeTplManageApi extends BaseApiController {
   async deleteLowCodeTpl() {
     return this.executeSysSimpleSQL(tableName, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/MenuManageApi.ts

@@ -40,7 +40,7 @@ export class MenuManageApi extends BaseApiController {
   async updateMenu() {
     return this.executeSysSimpleSQL(SystemTables.sys_menus, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {},
     });
@@ -50,7 +50,7 @@ export class MenuManageApi extends BaseApiController {
   async deleteMenu() {
     return this.executeSysSimpleSQL(SystemTables.sys_menus, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {},
     });

package/src/controller/manage/ProxyApiMangeApi.ts

@@ -36,7 +36,7 @@ export class ProxyApiMangeApi extends BaseApiController {
   async updateProxyApi() {
     return this.executeSysSimpleSQL(SystemTables.sys_proxyapi, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }
@@ -45,7 +45,7 @@ export class ProxyApiMangeApi extends BaseApiController {
   async deleteProxyApi() {
     return this.executeSysSimpleSQL(SystemTables.sys_proxyapi, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/SysConfigMangeApi.ts

@@ -73,7 +73,7 @@ export class SysConfigMangeApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_configs', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
         'data.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING, 'length:1,64'],
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {
         'condition.workbench_code': { contextAsString: CTX_WORKBENCH_CODE },
@@ -85,7 +85,7 @@ export class SysConfigMangeApi extends BaseApiController {
   async deleteSysConfig() {
     return this.executeSysSimpleSQL('sys_configs', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
       updateCfg: {
         'condition.workbench_code': { contextAsString: CTX_WORKBENCH_CODE },

package/src/controller/manage/UserAccountManageApi.ts

@@ -44,7 +44,7 @@ export class UserAccountManageApi extends BaseApiController {
   async updateUserAccount() {
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'data.login_name': LOGIN_NAME_VALIDATE,
         'data.nick_name': [KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
       },
@@ -77,7 +77,7 @@ export class UserAccountManageApi extends BaseApiController {
   async deleteUserAccount() {
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/WorkbenchMangeApi.ts

@@ -51,7 +51,7 @@ export class WorkbenchMangeApi extends BaseApiController {
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });
@@ -64,7 +64,7 @@ export class WorkbenchMangeApi extends BaseApiController {
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });

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

@@ -3,8 +3,10 @@ import { CrudProServiceBase } from './CrudProServiceBase';
 import { IRequestCfgModel } from '../interfaces';
 import { MixinUtils } from '../utils/MixinUtils';
 import { ICurdProServiceHub } from '../models/ServiceHub';
+import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 import MemoryRefreshCache from '../utils/MemoryRefreshCache';
 
+
 const methodCache = new MemoryRefreshCache();
 
 function parseMethodInfo(methodInfo: any): any {
@@ -55,8 +57,8 @@ class CrudProCachedCfgService extends CrudProServiceBase {
       sqlDbType: sysDatabaseDbType,
     };
 
-    const [rows] = await this.executeUnsafeQuery(baseInfo, sql, [method]);
-    const rows2: any[] = rows as object[];
+    const queryRes = await this.executeUnsafeQuery(baseInfo, sql, [method]);
+    const rows2: any[] = pickAndConvertRowsByMix(queryRes, sysDatabaseDbType)
     if (rows2.length > 0) {
       return parseMethodInfo(rows2[0]);
     }
@@ -71,8 +73,8 @@ class CrudProCachedCfgService extends CrudProServiceBase {
       sqlDatabase: sysDatabaseName,
       sqlDbType: sysDatabaseDbType,
     };
-    const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
-    const rows2: any[] = rows as object[];
+    const queryRes = await this.executeUnsafeQuery(baseInfo, sql);
+    const rows2: any[] = pickAndConvertRowsByMix(queryRes, sysDatabaseDbType)
     return rows2.map(row => {
       return parseMethodInfo(row);
     });

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

@@ -4,7 +4,7 @@ import { CrudProServiceBase } from './CrudProServiceBase';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { KeyOfCrudTypes, KeysOfCustomSQL, KeysOfSqlResPicker, SqlDbType } from '../models/keys';
 import { CommonException, Exceptions } from '../exceptions';
-import { pickAndConvertPgRows } from '../utils/sqlConvert/convertPgType';
+import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 import { replaceQuestionMarks } from '../utils/sqlConvert/convertPgSql';
 import { replaceQuestionMarksForMssql } from '../utils/sqlConvert/convertMsSql';
 import { ModelUtils } from '../utils/ModelUtils';
@@ -35,7 +35,6 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
     const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
 
-    let sqlRes: any;
     let queryRes: any;
 
     if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
@@ -43,29 +42,26 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
       const pgClient: PoolClient = connection as any;
       const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql);
-
       this.logger.info('executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
-
       queryRes = await pgClient.query({
         text: pgSql,
         values: executeSqlArgs || [],
       });
-      sqlRes = pickAndConvertPgRows(queryRes);
-    } else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
-      const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql);
 
+    } else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) { // SQLServer
+      
+      const mssql = 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 {
-      this.logger.info('executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
 
-      // MYSQL
+    } else { // MYSQL
+
+      this.logger.info('executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
       queryRes = await connection.query(sqlCfgModel.executeSql, executeSqlArgs);
-      sqlRes = queryRes[0];
+
     }
 
+    const sqlRes = pickAndConvertRowsByMix(queryRes, sqlCfgModel.sqlDbType);
     const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);
     exeCtx.setResModelItem(sqlCfgModel.resName, resObject);
   }

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

@@ -2,7 +2,7 @@ import { CrudProServiceBase } from './CrudProServiceBase';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { IExecuteUnsafeQueryCtx, ITableMeta } from '../interfaces';
 import { SqlDbType } from '../models/keys';
-import { pickAndConvertPgRows } from '../utils/sqlConvert/convertPgType';
+import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 
 class CrudProTableMetaCache {
   private cacheMap: Record<string, ITableMeta> = {};
@@ -57,7 +57,8 @@ class CrudProTableMetaService extends CrudProServiceBase {
 
   private async loadTableColumnInfo(baseInfo: IExecuteUnsafeQueryCtx): Promise<string[]> {
     if (baseInfo.sqlDbType === SqlDbType.mysql) {
-      const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+      const queryRes = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+      const tableDescribe = pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
       const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
       return tableDescribe2.map(fieldObj => {
         return fieldObj['Field'];
@@ -72,8 +73,8 @@ class CrudProTableMetaService extends CrudProServiceBase {
         ORDER BY ordinal_position;
       `.trim();
       const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
-      const rows = pickAndConvertPgRows(queryRes);
-      return rows.map(fieldObj => {
+      const tableDescribe = pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
+      return tableDescribe.map(fieldObj => {
         return fieldObj['column_name'];
       });
     }

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

@@ -0,0 +1,26 @@
+import { SqlDbType } from "../../models/keys";
+import { pickAndConvertPgRows } from "./convertPgType";
+import * as _ from 'lodash'
+
+function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any {
+    if (!connectionQueryRes) {
+        throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ')
+    }
+
+    if (sqlDbType === SqlDbType.postgres) {
+        return pickAndConvertPgRows(connectionQueryRes);
+    }
+
+    if (sqlDbType === SqlDbType.mysql) {
+        return connectionQueryRes[0];
+    }
+
+    if (sqlDbType === SqlDbType.sqlserver) {
+        return _.get(connectionQueryRes, 'recordsets[0]') || [];
+    }
+    throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType)
+}
+
+export {
+    pickAndConvertRowsByMix
+}

package/src/service/asyncTask/AsyncTaskRunnerService.ts

@@ -11,7 +11,13 @@ import { errorToString } from '@/libs/utils/errorToString';
 import { ANONYMOUS_CONTEXT } from '@/schedule';
 import { RedisKeys } from '@/models/RedisKeys';
 
-const END_STATUS_LIST = [SysAsyncTaskStatus.SUCCEEDED, SysAsyncTaskStatus.FAILED, SysAsyncTaskStatus.PART_SUCCEEDED];
+const END_STATUS_LIST = [
+  SysAsyncTaskStatus.PART_SUCCEEDED,
+  SysAsyncTaskStatus.SUCCEEDED,
+  SysAsyncTaskStatus.FAILED,
+  SysAsyncTaskStatus.CANCELLED,
+  SysAsyncTaskStatus.PAUSED,
+];
 
 class AsyncTaskRunner {
   isBusy = false;
@@ -27,7 +33,7 @@ class AsyncTaskRunner {
     for (let i = 0; i < taskList.length; i++) {
       const taskElement = taskList[i];
       taskElement.task_status = SysAsyncTaskStatus.RUNNING;
-      
+
       try {
         // 任务状态的设置在自定义的执行器里面。
         await this.executeTask(taskElement);

package/src/service/crudstd/CrudStdService.ts

@@ -46,6 +46,23 @@ export class CrudStdService extends ApiBaseService {
       throw new BizException('应用不存在或已下线：' + appCode);
     }
 
+
+    // 查询列表功能
+    if(settingKey === SPECIAL_SETTING_KEY.QUERY_LIST) {
+      // 正确启用了自定义查询功能
+      const customQueryApi:string = _.get(stdCrudCfgObj, 'othersSetting.values.customQueryApi');
+      if(typeof customQueryApi === 'string') {
+        const customQueryApiArr = customQueryApi.split('.');
+        const serviceName = customQueryApiArr[0] || "";
+        const serviceFunc = customQueryApiArr[1] || "";
+        if(serviceName.endsWith('Service')){
+           const serviceObj = await this.ctx.requestContext.getAsync(serviceName);
+           return serviceObj[serviceFunc](params);
+        }
+      }
+    }
+
+
     const databaseName = stdCrudCfgObj.tableBaseInfo.databaseName;
 
     const { dbType, dbName } = parseDatabaseName(databaseName);