midway-fatcms 0.0.1-beta.56 → 0.0.1-beta.57

package/src/service/crudstd/CrudStdService.ts

@@ -4,18 +4,18 @@ import * as ejs from 'ejs';
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { CurdMixService } from '../curd/CurdMixService';
-import { IRequestCfgModel, IRequestModel } from '../../libs/crud-pro/interfaces';
-import { KeysOfAuthType, KeysOfSimpleSQL, SqlDbType } from '../../libs/crud-pro/models/keys';
-import { parseJsonObject } from '../../libs/utils/functions';
-import { ICrudStdAppInfo, ICrudStdAppInfoForSettingKey } from '../../models/bizmodels';
-import { BizException } from '../../models/devops';
-import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
-import { SystemTables } from '../../models/SystemTables';
+import { IRequestCfgModel, IRequestModel } from '@/libs/crud-pro/interfaces';
+import { KeysOfAuthType, KeysOfSimpleSQL, SqlDbType } from '@/libs/crud-pro/models/keys';
+import { parseJsonObject } from '@/libs/utils/functions';
+import { ICrudStdAppInfo, ICrudStdAppInfoForSettingKey } from '@/models/bizmodels';
+import { BizException } from '@/models/devops';
+import { ExecuteContext } from '@/libs/crud-pro/models/ExecuteContext';
+import { SystemTables } from '@/models/SystemTables';
 import { CrudStdActionService } from './CrudStdActionService';
 import { CrudStdRelationService } from './CrudStdRelationService';
 import { ApiBaseService } from '../base/ApiBaseService';
-import { parseDatabaseName } from '../../libs/crud-pro/utils/DatabaseName';
-import { GLOBAL_STATIC_CONFIG } from '../../libs/global-config/global-config';
+import { parseDatabaseName } from '@/libs/crud-pro/utils/DatabaseName';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 
 
@@ -95,6 +95,7 @@ export class CrudStdService extends ApiBaseService {
 
     // 接口返回最大值
     const maxLimit = _.get(stdCrudCfgObj, 'othersSetting.values.maxLimit');
+
     if (typeof maxLimit === 'number' && maxLimit > 0) {
       cfgModel.maxLimit = maxLimit;
     }
@@ -103,6 +104,9 @@ export class CrudStdService extends ApiBaseService {
       throw new BizException('没有权限');
     }
 
+    // 软删除操作。
+    await this.fixCfgModelAndParamBySoftDelete(params, cfgModel, appInfo, sqlSimpleName);
+
     // 根据用户配置，设置关联查询的数据信息。
     await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
 
@@ -274,7 +278,7 @@ export class CrudStdService extends ApiBaseService {
  * @private
  */
   public async getParsedCrudStdAppInfo(appCode: string): Promise<ICrudStdAppInfo> {
-    const cacheKey = "getParsedCrudStdAppInfo:" + appCode;
+    const cacheKey = 'getParsedCrudStdAppInfo:' + appCode;
     let appInfo: ICrudStdAppInfo = this.getFromCtxCache(cacheKey) as any;
     if (!appInfo) {
       appInfo = await this.getParsedCrudStdAppInfoPrivate(appCode);
@@ -334,6 +338,44 @@ export class CrudStdService extends ApiBaseService {
 
 
 
+  private async fixCfgModelAndParamBySoftDelete(params: IRequestModelCrudProExt, cfgModel: IRequestCfgModel, appInfo: ICrudStdAppInfoForSettingKey, sqlSimpleName: KeysOfSimpleSQL) {
+    const stdCrudCfgObj = appInfo.stdCrudCfgObj;
+    //删除策略
+    const deleteStrategy = _.get(stdCrudCfgObj, 'othersSetting.values.deleteStrategy');
+  
+    if(deleteStrategy !== 'soft') {
+      return;
+    }
+
+    // 删除操作，如果是软删除修改为update语句。
+    // 标准软删除：deleted_at 字段为0代表未删除，有任意时间字段代表已删除。
+    if(KeysOfSimpleSQL.SIMPLE_DELETE === sqlSimpleName) {
+      const userSession =  this.ctx?.userSession?.getSessionInfo();
+      if(!params.data) {
+        params.data = {};
+      }
+      params.data.deleted_at = Date.now(); // 默认值为 0； 0代表未删除
+      params.data.deleted_by = userSession?.accountId || "";
+
+      // 执行update操作
+      cfgModel.sqlSimpleName = KeysOfSimpleSQL.SIMPLE_UPDATE;
+
+      if(!params.condition || Object.keys(params.condition).length === 0) {
+        throw new Error('执行删除操作，必须指定删除条件')
+      }
+    }
+
+    // 查询操作。强制查询未删除的。
+    if (KeysOfSimpleSQL.SIMPLE_QUERY_ONE === sqlSimpleName || KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === sqlSimpleName) {
+      if(!params.condition) {
+        params.condition = {};
+      }
+      params.condition.deleted_at = 0; // 未删除
+    }
+
+
+  }
+
   private async fixCfgModelByFilterValue(params: IRequestModelCrudProExt, cfgModel: IRequestCfgModel, appInfo: ICrudStdAppInfoForSettingKey, arg3: { dbType: SqlDbType; dbName: string }) {
 
     const { filterValue } = params || {};

package/src/service/curd/CrudProQuick.ts

@@ -49,9 +49,9 @@ export class CrudProQuick {
   /**
    * 随便获取一个。不推荐使用。建议使用getUniqueOne。
    * @deprecated
-   * @param reqJson 
-   * @param sqlTable 
-   * @returns 
+   * @param reqJson
+   * @param sqlTable
+   * @returns
    */
   public async getOne(reqJson: IRequestModel, sqlTable?: string): Promise<any> {
     const cfgModel: IRequestCfgModel = {
@@ -62,12 +62,11 @@ export class CrudProQuick {
     return res.getOneObj();
   }
 
-
   /**
    * 期望获取唯一的一个对象，如果数据库中的数量不唯一，则报错。
-   * @param reqJson 
-   * @param sqlTable 
-   * @returns 
+   * @param reqJson
+   * @param sqlTable
+   * @returns
    */
   public async getUniqueOne(reqJson: IRequestModel, sqlTable?: string): Promise<any> {
     const cfgModel: IRequestCfgModel = {
@@ -77,24 +76,23 @@ export class CrudProQuick {
     reqJson.pageNo = 1;
     reqJson.pageSize = 1;
     const res = await this.executeCrudByCfg(reqJson, cfgModel);
-    const resModel =  res.getResModel();
+    const resModel = res.getResModel();
     const total_count = resModel.total_count;
     const rows = resModel.rows;
-    if(total_count === 0) {
+    if (total_count === 0) {
       return null;
     }
-    if(total_count > 1) {
-      throw new Error(`[CrudProQuick][getUniqueOne] only one object is required, but got ${total_count}`)
+    if (total_count > 1) {
+      throw new Error(`[CrudProQuick][getUniqueOne] only one object is required, but got ${total_count}`);
     }
     return rows[0];
   }
 
-
   /**
    * 获取数据列表
-   * @param reqJson 
+   * @param reqJson
    * @param sqlTable 数据库表名称
-   * @returns 
+   * @returns
    */
   public async getList(reqJson: IRequestModel, sqlTable?: string): Promise<any[]> {
     const cfgModel: IRequestCfgModel = {

package/src/service/curd/CurdMixUtils.ts

@@ -286,7 +286,6 @@ class CrudMixUtils {
       return;
     }
 
-
     const accountId = _.get(row, sourceColumn);
     if (!accountId) {
       return;
@@ -295,7 +294,6 @@ class CrudMixUtils {
     const { toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
     const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
 
-
     const getValue = (code: string) => {
       if (!map) {
         return null;

package/src/service/curd/CurdProService.ts

@@ -34,7 +34,7 @@ function toVisitor(ctx: Context): IVisitorExt {
       roleCodes: [],
       functionCodes: [],
       workbenchCode: workbenchInfo?.workbench_code || '',
-      bizExt: {}
+      bizExt: {},
     };
   }
 
@@ -49,7 +49,7 @@ function toVisitor(ctx: Context): IVisitorExt {
     roleCodes: sessionInfo.roleCodes || [],
     functionCodes: sessionInfo.functionCodes || [],
     workbenchCode: workbenchInfo?.workbench_code || '',
-    bizExt: sessionInfo.bizExt || {}
+    bizExt: sessionInfo.bizExt || {},
   };
 }
 

package/src/service/proxyapi/ProxyApiLoadService.ts

@@ -5,7 +5,7 @@ import { BaseService } from '../base/BaseService';
 import { getRouteTrie, RouteTrie } from './RouteTrie';
 import { RouteHandler } from './RouteHandler';
 import { CurdProService } from '../curd/CurdProService';
-import { SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { IProxyApiEntity, IUpstreamInfo } from '../../models/SystemEntities';
 import { parseJsonObject } from '../../libs/utils/functions';
@@ -86,7 +86,6 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
   }
 
   private async buildUpstreamMap() {
-
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     //       biz_tag={'upstream'}
@@ -114,10 +113,8 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
   }
 
   private async loadProxyApiEntity(workbench_code: string, upstreamMap: Record<string, IUpstreamInfo>): Promise<IProxyApiEntity[]> {
-
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
-
     const res = await this.curdProService.executeCrudByCfg(
       {
         condition: {},
@@ -170,5 +167,4 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
       }
     }
   }
-
 }