midway-fatcms 0.0.12 → 0.0.15

package/dist/controller/base/BaseApiController.d.ts

@@ -5,6 +5,7 @@ import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { UserAccountService } from '../../service/UserAccountService';
 import { BaseService } from '../../service/base/BaseService';
 import { ConfigChangelogService } from '../../service/ConfigChangelogService';
+import { ActionLogService } from '../../service/ActionLogService';
 export interface IExecuteSimpleSqlParams {
     updateCfg?: Record<string, IFuncCfgModel>;
     allowCfg?: Record<string, string[]>;
@@ -28,6 +29,7 @@ export declare class BaseApiController extends BaseService {
     protected ctx: Context;
     protected curdMixService: CurdMixService;
     protected userAccountService: UserAccountService;
+    protected actionLogService: ActionLogService;
     protected configChangelogService: ConfigChangelogService;
     /**
      * 检查用户是否在指定时间内重复执行了某个操作

package/dist/controller/base/BaseApiController.js

@@ -24,6 +24,7 @@ const aes_128_cbc_1 = require("aes-128-cbc");
 const md5 = require("md5");
 const AsymmetricCrypto_1 = require("../../libs/utils/AsymmetricCrypto");
 const ConfigChangelogService_1 = require("../../service/ConfigChangelogService");
+const ActionLogService_1 = require("../../service/ActionLogService");
 let BaseApiController = class BaseApiController extends BaseService_1.BaseService {
     /**
      * 检查用户是否在指定时间内重复执行了某个操作
@@ -310,6 +311,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", UserAccountService_1.UserAccountService)
 ], BaseApiController.prototype, "userAccountService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", ActionLogService_1.ActionLogService)
+], BaseApiController.prototype, "actionLogService", void 0);
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", ConfigChangelogService_1.ConfigChangelogService)

package/dist/controller/gateway/DocGatewayController.js

@@ -20,6 +20,7 @@ const global_config_1 = require("../../libs/global-config/global-config");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const functions_1 = require("../../libs/utils/functions");
 const fatcms_request_1 = require("../../libs/utils/fatcms-request");
 function checkIsNumber(value, name) {
     if (value === null || value === '' || typeof value === 'undefined') {
@@ -82,12 +83,13 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlDatabase: SystemDbName,
             sqlDbType: SystemDbType,
         });
-        // 更新PV数据
         const docObj = res.getOneObj();
-        if (docObj) {
-            const pv = parseInt(docObj.pv) || 0;
-            await this.updateDocPV(docId, docLibId, pv);
+        if (!(0, functions_1.isEntityOK)(docObj)) {
+            return common_dto_1.CommonResult.errorRes("文档不存在");
         }
+        // 更新PV数据
+        const pv = parseInt(docObj.pv) || 0;
+        await this.updateDocPV(docId, docLibId, pv);
         return res;
     }
     /**
@@ -134,7 +136,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlDbType: SystemDbType,
         });
         const docLibInfo = s.getOneObj();
-        if (!docLibInfo) {
+        if (!(0, functions_1.isEntityOK)(docLibInfo)) {
             throw '此文档库查询失败';
         }
         const workbench_code_array = docLibInfo.workbench_code_array;

package/dist/controller/gateway/PublicApiController.js

@@ -58,8 +58,28 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         const workbenchMenuCodeSet = new Set(workbenchMenuCodeArray);
         const allMenuList = await this.sysMenuService.getCachedMenusList();
         const menuList = allMenuList.filter(e => {
-            return workbenchMenuCodeSet.has(e.menu_code) && e.status === 1;
+            return workbenchMenuCodeSet.has(e.menu_code) && (0, functions_1.isEntityOK)(e);
         });
+        const addPermissionInfo = (menu_list, level) => {
+            if (!Array.isArray(menu_list)) {
+                return [];
+            }
+            if (level > 10) {
+                return menu_list;
+            }
+            return menu_list.map(e => {
+                if (Array.isArray(e.children)) {
+                    e.children = addPermissionInfo(e.children, level + 1);
+                }
+                const view_auth_config = e.view_auth_config;
+                const view_auth_type = e.view_auth_type || keys_1.KeysOfAuthType.byFuncCode;
+                if (!view_auth_config) {
+                    return { ...e, hasPermission: true };
+                }
+                const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
+                return { ...e, hasPermission };
+            });
+        };
         const mapResult = {};
         for (let i = 0; i < menuList.length; i++) {
             const rowElement = cloneObject(menuList[i]);
@@ -69,7 +89,8 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
             const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
             const menu_config_content = rowElement.menu_config_content;
             delete rowElement.menu_config_content;
-            const menu_list = (0, functions_1.parseJsonObject)(menu_config_content) || [];
+            let menu_list = (0, functions_1.parseJsonObject)(menu_config_content) || [];
+            menu_list = addPermissionInfo(menu_list, 0);
             mapResult[menu_code] = { ...rowElement, menu_list, hasPermission };
         }
         // 特殊的devops菜单
@@ -97,10 +118,18 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
             resultData.appData = await this.sysAppService.deletePrivateField(appInfo);
         }
         if (pathname && workbenchCode) {
-            resultData.pageData = await this.sysAppService.getSysAppPageOne({
+            const pageData = await this.sysAppService.getSysAppPageOne({
                 page_path: pathname,
                 workbench_code: workbenchCode
             });
+            if (pageData) {
+                const clonePageInfo = { ...pageData };
+                const view_auth_config = clonePageInfo.view_auth_config;
+                const view_auth_type = clonePageInfo.view_auth_type;
+                const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
+                clonePageInfo.hasPermission = hasPermission;
+                resultData.pageData = clonePageInfo;
+            }
         }
         return common_dto_1.CommonResult.successRes(resultData);
     }

package/dist/controller/helpers.controller.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
 import { Context } from '@midwayjs/koa';
 import { CommonResult } from '../libs/utils/common-dto';
+import { ActionLogService } from '../service/ActionLogService';
 export declare class HelpersApi {
     protected ctx: Context;
     private midwayWebRouterService;
+    protected actionLogService: ActionLogService;
     getApiEnv(): Promise<{
         env: string;
         href: string;

package/dist/controller/helpers.controller.js

@@ -24,6 +24,7 @@ const SystemPerm_1 = require("../models/SystemPerm");
 const permission_middleware_1 = require("../middleware/permission.middleware");
 const CacheRefreshRedisSubscriber_1 = require("../service/base/cache-refresh/CacheRefreshRedisSubscriber");
 const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
+const ActionLogService_1 = require("../service/ActionLogService");
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript?prefix=/ns/api/manage
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript
 // http://127.0.0.1:7002/ns/api/helpers/getApiEnv
@@ -141,6 +142,12 @@ let HelpersApi = class HelpersApi {
             const cacheName = cacheNameParam;
             const cacheServiceFactory = await this.ctx.requestContext.getAsync(CacheServiceFactory_1.CacheServiceFactory);
             await cacheServiceFactory.refreshByCacheName(cacheName, this.ctx);
+            await this.actionLogService.insertActionLogTable({
+                actionModule: '系统工具',
+                actionName: '刷新缓存',
+                actionMessage: '刷新缓存成功',
+                actionTarget: cacheNameParam
+            });
             return common_dto_1.CommonResult.successRes({
                 message: `业务缓存 ${cacheName} 已刷新`,
                 cacheName,
@@ -148,6 +155,12 @@ let HelpersApi = class HelpersApi {
         }
         const category = categoryParam ? categoryParam : undefined;
         await (0, CacheRefreshRedisSubscriber_1.refreshCacheWithBroadcast)(this.ctx, category);
+        await this.actionLogService.insertActionLogTable({
+            actionModule: '系统工具',
+            actionName: '刷新缓存',
+            actionMessage: '刷新缓存成功',
+            actionTarget: cacheNameParam
+        });
         return common_dto_1.CommonResult.successRes({
             message: `缓存已刷新${category ? '(' + category + ')' : '(全部)'}（已广播集群）`,
             category: category || 'ALL',
@@ -184,6 +197,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayWebRouterService)
 ], HelpersApi.prototype, "midwayWebRouterService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", ActionLogService_1.ActionLogService)
+], HelpersApi.prototype, "actionLogService", void 0);
 __decorate([
     (0, core_1.Get)('/getApiEnv'),
     __metadata("design:type", Function),

package/dist/controller/home.controller.js

@@ -16,12 +16,13 @@ const WorkbenchService_1 = require("../service/WorkbenchService");
 const render_utils_1 = require("../libs/utils/render-utils");
 const crypto_utils_1 = require("../libs/utils/crypto-utils");
 const AuthService_1 = require("../service/AuthService");
+const functions_1 = require("../libs/utils/functions");
 let HomeController = class HomeController extends BaseApiController_1.BaseApiController {
     async home() {
         const host = this.ctx.request.host;
         const hostname = this.ctx.request.hostname;
         const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
-        if (!workbenchInfo || workbenchInfo.status !== 1) {
+        if (!(0, functions_1.isEntityOK)(workbenchInfo)) {
             this.logInfo(`域名不存在：hostname = ${hostname}, host=${host}`);
             const infos = {
                 host,

package/dist/controller/manage/DataDictManageApi.d.ts

@@ -6,6 +6,8 @@ export declare class DataDictManageApi extends BaseApiController {
     getDataDictList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getDataDictOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     createDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    /** 查询 dict_code 是否仅被软删除记录占用（不含 deleted_at=0 的活跃记录） */
+    private isSoftDeletedDictCode;
     updateDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     deleteDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext | CommonResult>;
     getDataDictItemList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/DataDictManageApi.js

@@ -18,6 +18,8 @@ const cacherefresh_middleware_1 = require("../../middleware/cacherefresh.middlew
 const bizmodels_1 = require("../../models/bizmodels");
 const SystemPerm_1 = require("../../models/SystemPerm");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const global_config_1 = require("../../libs/global-config/global-config");
 let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.BaseApiController {
     async getDataDictList() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -30,18 +32,48 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         });
     }
     async createDataDict() {
-        return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
-            enableSoftDelete: true,
-            validateCfg: {
-                'data.dict_code': [keys_1.KeysOfValidators.REQUIRED],
-            },
+        var _a;
+        const body = this.ctx.request.body;
+        const dict_code = (_a = body === null || body === void 0 ? void 0 : body.data) === null || _a === void 0 ? void 0 : _a.dict_code;
+        try {
+            return await this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
+                enableSoftDelete: true,
+                validateCfg: {
+                    'data.dict_code': [keys_1.KeysOfValidators.REQUIRED],
+                },
+            });
+        }
+        catch (e) {
+            if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY && dict_code) {
+                const isSoftDeleted = await this.isSoftDeletedDictCode(dict_code);
+                if (isSoftDeleted) {
+                    throw new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY, '该 dict_code 对应的数据曾被软删除，无法直接创建。请联系 DBA 处理，或更换 dict_code 后重试。');
+                }
+            }
+            throw e;
+        }
+    }
+    /** 查询 dict_code 是否仅被软删除记录占用（不含 deleted_at=0 的活跃记录） */
+    async isSoftDeletedDictCode(dict_code) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const result = await this.curdMixService.executeCrudByCfg({ condition: { dict_code } }, {
+            sqlTable: 'sys_data_dict',
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            enableSoftDelete: false,
         });
+        const row = result.getOneObj();
+        if (!row) {
+            return false;
+        }
+        return Number(row.deleted_at) !== 0;
     }
     async updateDataDict() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
         });
     }
@@ -55,7 +87,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
                 'condition.dict_code': [keys_1.KeysOfValidators.REQUIRED],
             },
         });
@@ -85,7 +117,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_data_dict_item', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
         });
     }
@@ -93,7 +125,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_data_dict_item', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
                 'condition.dict_code': [keys_1.KeysOfValidators.REQUIRED],
             },
         });

package/dist/controller/manage/DocManageApi.js

@@ -75,7 +75,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
         return this.executeSysSimpleSQL('sys_doc', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
             updateCfg: {
                 ...updateCfg,
@@ -87,7 +87,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
         return this.executeSysSimpleSQL('sys_doc', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },

package/dist/controller/myinfo/AuthController.js

@@ -53,6 +53,12 @@ let AuthController = class AuthController extends BaseApiController_1.BaseApiCon
         }
         const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
         this.ctx.cookies.set(userSession_1.SESSION_ID_KEY, userSessionInfo.sessionId, userSession_1.sessionCookieCfg);
+        await this.actionLogService.insertActionLogTable({
+            actionModule: '用户账号',
+            actionName: '登录',
+            actionMessage: '登录成功',
+            actionTarget: `${userSessionInfo === null || userSessionInfo === void 0 ? void 0 : userSessionInfo.nickName}(${userSessionInfo === null || userSessionInfo === void 0 ? void 0 : userSessionInfo.accountId})`
+        });
         return common_dto_1.CommonResult.successMsg('登录成功', removePrivateField(userSessionInfo));
     }
     /**
@@ -87,12 +93,22 @@ let AuthController = class AuthController extends BaseApiController_1.BaseApiCon
      * 修改我自己的密码
      */
     async changeMyPassword() {
+        var _a;
         const { unsaltedPwd } = this.ctx.request.body;
         const loginName = this.ctx.userSession.getSessionInfo().loginName;
         if (loginName === 'devopsviewer') {
             return common_dto_1.CommonResult.errorRes('开放体验账号不支持修改密码');
         }
-        return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+        const res = await this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+        if (res.success) {
+            await this.actionLogService.insertActionLogTable({
+                actionModule: '用户账号',
+                actionName: '修改密码',
+                actionMessage: '修改密码成功',
+                actionTarget: (_a = this.ctx.userSession.getSessionInfo()) === null || _a === void 0 ? void 0 : _a.nickName
+            });
+        }
+        return res;
     }
     /**
      * 校验权限接口，给前端用的。用于界面按钮级权限控制

package/dist/controller/render/AppRenderController.js

@@ -20,6 +20,7 @@ const render_utils_1 = require("../../libs/utils/render-utils");
 const crypto_utils_1 = require("../../libs/utils/crypto-utils");
 const SysAppService_1 = require("../../service/SysAppService");
 const AuthService_1 = require("../../service/AuthService");
+const functions_1 = require("../../libs/utils/functions");
 /**
  * 渲染独立外部应用
  */
@@ -28,13 +29,9 @@ let AppRenderController = class AppRenderController extends BaseApiController_1.
         const appPathArr = appPath.split('/');
         const appCode = appPathArr[0];
         const appInfo = await this.sysAppService.getSysAppOne(appCode);
-        if (!appInfo) {
+        if (!(0, functions_1.isEntityOK)(appInfo)) {
             this.ctx.status = 404;
-            return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
-        }
-        if (appInfo.status !== 1) {
-            this.ctx.status = 404;
-            return this.ctx.render('404_app', { appCode, errorMsg: ' 应用已下线' });
+            return this.ctx.render('404_app', { appCode, errorMsg: '应用不存在或已下线' });
         }
         const isSupportWorkbench = await this.isSupportCurrentWorkbench(appInfo);
         if (!isSupportWorkbench) {
@@ -42,6 +39,10 @@ let AppRenderController = class AppRenderController extends BaseApiController_1.
             return this.ctx.render('404_app', { appCode, errorMsg: ' 应用没有绑定此站点' });
         }
         const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
+        if (!(0, functions_1.isEntityOK)(workbenchInfo)) {
+            this.ctx.status = 404;
+            return this.ctx.render('404_app', { appCode, errorMsg: '站点不存在或已下线' });
+        }
         const html_content = appInfo.html_content || '<b style="color: red">错误：未配置HTML模版，请检查!!</b>';
         const userInfo = await this.getUserAndRefreshSessionInfo();
         // 形如(不带域名)：/ns/app/abc-app-path?aa=2332

package/dist/index.d.ts

@@ -12,7 +12,6 @@ export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
-export * from './controller/manage/AppLogMangeApi';
 export * from './controller/manage/AppMangeApi';
 export * from './controller/manage/AppPageMangeApi';
 export * from './controller/manage/AppSchemaHistoryApi';
@@ -48,6 +47,7 @@ export * from './middleware/tx.middleware';
 export * from './middleware/permission.middleware';
 export * from './middleware/redislock.middleware';
 export * from './service/AuthService';
+export * from './service/ActionLogService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
 export * from './service/SysConfigService';

package/dist/index.js

@@ -30,7 +30,6 @@ __exportStar(require("./controller/gateway/AsyncTaskController"), exports);
 __exportStar(require("./controller/helpers.controller"), exports);
 __exportStar(require("./controller/home.controller"), exports);
 __exportStar(require("./controller/manage/AnyApiMangeApi"), exports);
-__exportStar(require("./controller/manage/AppLogMangeApi"), exports);
 __exportStar(require("./controller/manage/AppMangeApi"), exports);
 __exportStar(require("./controller/manage/AppPageMangeApi"), exports);
 __exportStar(require("./controller/manage/AppSchemaHistoryApi"), exports);
@@ -66,6 +65,7 @@ __exportStar(require("./middleware/tx.middleware"), exports);
 __exportStar(require("./middleware/permission.middleware"), exports);
 __exportStar(require("./middleware/redislock.middleware"), exports);
 __exportStar(require("./service/AuthService"), exports);
+__exportStar(require("./service/ActionLogService"), exports);
 __exportStar(require("./service/EnumInfoService"), exports);
 __exportStar(require("./service/FileCenterService"), exports);
 __exportStar(require("./service/SysConfigService"), exports);

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

@@ -119,7 +119,6 @@ declare class CrudPro {
      */
     private convertConditionTypeIfNeeded;
     private executeSQLList;
-    private parseRunSqlException;
     private afterExecuteSQLList;
     private beforeExecuteSQLList;
 }

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

@@ -7,6 +7,7 @@ const CurdProServiceHub_1 = require("./services/CurdProServiceHub");
 const exceptions_1 = require("./exceptions");
 const RequestCfgModel_1 = require("./models/RequestCfgModel");
 const MixinUtils_1 = require("./utils/MixinUtils");
+const SqlErrorParseUtils_1 = require("./utils/SqlErrorParseUtils");
 const keys_1 = require("./models/keys");
 class CrudPro {
     constructor() {
@@ -355,19 +356,9 @@ class CrudPro {
             const message = MixinUtils_1.MixinUtils.getErrorMessage(e);
             const logger = this.executeContext.getLogger();
             logger.error('RUN_SQL_EXCEPTION', message);
-            throw this.parseRunSqlException(e || {});
+            throw SqlErrorParseUtils_1.SqlErrorParseUtils.parseRunSqlException(e || {});
         }
     }
-    parseRunSqlException(e) {
-        const sqlMessage = '' + e.sqlMessage;
-        if (e.code === 'ER_DUP_ENTRY' && sqlMessage.startsWith('Duplicate entry')) {
-            return new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY, '此对象实体已存在，不能创建重复对象');
-        }
-        if (e.code === 'ER_NO_SUCH_TABLE') {
-            return new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE, '查询的表不存在：' + sqlMessage);
-        }
-        return e;
-    }
     async afterExecuteSQLList() {
         return this.executeContext.contextFunc.afterExecuteSQLList();
     }

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

@@ -79,6 +79,12 @@ export declare enum Exceptions {
     RUN_SQL_EXCEPTION = "RUN_SQL_EXCEPTION",
     RUN_SQL_EXCEPTION_ER_DUP_ENTRY = "RUN_SQL_EXCEPTION_ER_DUP_ENTRY",
     RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE = "RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE",
+    RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED = "RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED",
+    RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND = "RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND",
+    RUN_SQL_EXCEPTION_ER_NOT_NULL = "RUN_SQL_EXCEPTION_ER_NOT_NULL",
+    RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG = "RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG",
+    RUN_SQL_EXCEPTION_ER_BAD_FIELD = "RUN_SQL_EXCEPTION_ER_BAD_FIELD",
+    RUN_SQL_EXCEPTION_ER_DEADLOCK = "RUN_SQL_EXCEPTION_ER_DEADLOCK",
     RUN_IS_NEED_EXECUTE_ERR = "RUN_IS_NEED_EXECUTE_ERR",
     RUN_PICK_ERR_VISITOR_NULL = "RUN_PICK_ERR_VISITOR_NULL",
     RUN_PICK_ERR_VISITOR_FIELD = "RUN_PICK_ERR_VISITOR_FIELD",

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

@@ -83,6 +83,12 @@ var Exceptions;
     Exceptions["RUN_SQL_EXCEPTION"] = "RUN_SQL_EXCEPTION";
     Exceptions["RUN_SQL_EXCEPTION_ER_DUP_ENTRY"] = "RUN_SQL_EXCEPTION_ER_DUP_ENTRY";
     Exceptions["RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE"] = "RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE";
+    Exceptions["RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED"] = "RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED";
+    Exceptions["RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND"] = "RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND";
+    Exceptions["RUN_SQL_EXCEPTION_ER_NOT_NULL"] = "RUN_SQL_EXCEPTION_ER_NOT_NULL";
+    Exceptions["RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG"] = "RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG";
+    Exceptions["RUN_SQL_EXCEPTION_ER_BAD_FIELD"] = "RUN_SQL_EXCEPTION_ER_BAD_FIELD";
+    Exceptions["RUN_SQL_EXCEPTION_ER_DEADLOCK"] = "RUN_SQL_EXCEPTION_ER_DEADLOCK";
     Exceptions["RUN_IS_NEED_EXECUTE_ERR"] = "RUN_IS_NEED_EXECUTE_ERR";
     Exceptions["RUN_PICK_ERR_VISITOR_NULL"] = "RUN_PICK_ERR_VISITOR_NULL";
     Exceptions["RUN_PICK_ERR_VISITOR_FIELD"] = "RUN_PICK_ERR_VISITOR_FIELD";

package/dist/libs/crud-pro/utils/SqlErrorParseUtils.d.ts

@@ -0,0 +1,22 @@
+import { CommonException } from '../exceptions';
+declare const SqlErrorParseUtils: {
+    /**
+     * 从驱动原始错误中提取可读 SQL 错误信息（兼容 MySQL / PostgreSQL / SQL Server）
+     */
+    getSqlErrorMessage(e: any): string;
+    isDuplicateEntryError(e: any, sqlMessage?: string): boolean;
+    isNoSuchTableError(e: any, sqlMessage?: string): boolean;
+    /** 外键约束：父记录被引用，无法删除或修改 */
+    isForeignKeyParentReferencedError(e: any, sqlMessage?: string): boolean;
+    /** 外键约束：关联的主数据不存在 */
+    isForeignKeyParentNotFoundError(e: any, sqlMessage?: string): boolean;
+    isNotNullViolationError(e: any, sqlMessage?: string): boolean;
+    isDataTooLongError(e: any, sqlMessage?: string): boolean;
+    isBadFieldError(e: any, sqlMessage?: string): boolean;
+    isDeadlockError(e: any, sqlMessage?: string): boolean;
+    /**
+     * 将数据库驱动原始错误规范化为 CommonException
+     */
+    parseRunSqlException(e: any): CommonException;
+};
+export { SqlErrorParseUtils };