midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.9

package/dist/controller/gateway/CrudMtdGatewayController.js

@@ -22,6 +22,7 @@ const ApiBaseService_1 = require("../../service/base/ApiBaseService");
 const CurdProService_1 = require("../../service/curd/CurdProService");
 const CurdMixService_1 = require("../../service/curd/CurdMixService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
 const QUERY_AS_LIST = ['condition', 'data'];
 function pickAsQuery(query_as_pick, query) {
     if (query_as_pick && typeof query_as_pick === 'string') {
@@ -84,6 +85,8 @@ let CrudMtdGatewayController = class CrudMtdGatewayController extends ApiBaseSer
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(cfgModel.sqlDatabase);
         cfgModel.sqlDatabase = dbName;
         cfgModel.sqlDdType = dbType;
+        // 业务系统自定义的修改cfgModel
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
         return this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
     }
 };

package/dist/libs/global-config/global-config.d.ts

@@ -1,11 +1,21 @@
-import { SqlDbType } from "../crud-pro/models/keys";
+import { SqlDbType } from '../crud-pro/models/keys';
 interface IGlobalStaticConfig {
     /**
      * CrudStd: 业务系统自定义的修改cfgModel
+     * @param reqJson
      * @param cfgModel
      * @param appInfo
+     * @param ctx
      */
-    addCfgModelForCrudStdService(cfgModel: any, appInfo: any): Promise<any>;
+    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>;
     SystemDbName: string;
     SystemDbType: SqlDbType;
 }

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

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

package/dist/service/crudstd/CrudStdService.js

@@ -55,7 +55,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
         // 业务系统自定义的修改cfgModel
-        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().addCfgModelForCrudStdService(cfgModel, appInfo);
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
         return await this.curdMixService.executeCrudByCfg(params, cfgModel);
     }
     /**

package/package.json

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

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -8,7 +8,8 @@ import { API_BASE_TYPE, ApiBaseService } from '../../service/base/ApiBaseService
 import { CurdProService } from '../../service/curd/CurdProService';
 import { CurdMixService } from '../../service/curd/CurdMixService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-import {parseDatabaseName} from "../../libs/crud-pro/utils/DatabaseName";
+import { parseDatabaseName } from "../../libs/crud-pro/utils/DatabaseName";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const QUERY_AS_LIST = ['condition', 'data'];
 
@@ -102,6 +103,9 @@ export class CrudMtdGatewayController extends ApiBaseService {
     cfgModel.sqlDatabase = dbName;
     cfgModel.sqlDdType = dbType;
 
+    // 业务系统自定义的修改cfgModel
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
+
     return this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
   }
 }

package/src/libs/global-config/global-config.ts

@@ -1,47 +1,54 @@
-import { SqlDbType } from "../crud-pro/models/keys";
+import { SqlDbType } from '../crud-pro/models/keys';
 
 interface IGlobalStaticConfig {
-    /**
-     * CrudStd: 业务系统自定义的修改cfgModel
-     * @param cfgModel 
-     * @param appInfo 
-     */
-    addCfgModelForCrudStdService(cfgModel: any, appInfo: any): Promise<any>;
-
-    SystemDbName: string,
-    SystemDbType: SqlDbType;
+  /**
+   * 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>;
+
+  SystemDbName: string;
+  SystemDbType: SqlDbType;
 }
 
-
-function noop() { }
-
+const noop = () => {
+  return Promise.resolve();
+};
 
 class GlobalStaticConfig {
-    private configObject: any;
-    constructor() {
-        this.configObject = {
-            addCfgModelForCrudStdService: noop,
-            SystemDbName: 'fatcms',
-            SystemDbType: SqlDbType.mysql
-        };
-    }
-    public getConfig(): IGlobalStaticConfig {
-        return this.configObject as IGlobalStaticConfig;
-    }
-
-    public setConfig(configObject: any) {
-        if (!configObject || typeof configObject !== 'object') {
-            throw new Error("参数configObject不能为空")
-        }
-        Object.assign(this.configObject, configObject)
+  private configObject: IGlobalStaticConfig;
+  constructor() {
+    this.configObject = {
+      bizUpdateCfgModelForCrudStd: noop,
+      bizUpdateCfgModelForCrudMtd: noop,
+      SystemDbName: 'fatcms',
+      SystemDbType: SqlDbType.mysql,
+    };
+  }
+  public getConfig(): IGlobalStaticConfig {
+    return this.configObject as IGlobalStaticConfig;
+  }
+
+  public setConfig(configObject: any) {
+    if (!configObject || typeof configObject !== 'object') {
+      throw new Error('参数configObject不能为空');
     }
+    Object.assign(this.configObject, configObject);
+  }
 }
 
-
 const GLOBAL_STATIC_CONFIG = new GlobalStaticConfig();
 
-
-
-export {
-    GLOBAL_STATIC_CONFIG
-}
+export { GLOBAL_STATIC_CONFIG };

package/src/service/anyapi/AnyApiService.ts

@@ -81,10 +81,8 @@ export class AnyApiService extends ApiBaseService {
   }
 
   private async _getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
-
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
-
     const res = await this.curdMixService.executeCrudByCfg(
       { condition: { method: methodCode } },
       {

package/src/service/crudstd/CrudStdService.ts

@@ -70,7 +70,7 @@ export class CrudStdService extends ApiBaseService {
     await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
 
     // 业务系统自定义的修改cfgModel
-    await GLOBAL_STATIC_CONFIG.getConfig().addCfgModelForCrudStdService(cfgModel, appInfo);
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
 
     return await this.curdMixService.executeCrudByCfg(params, cfgModel);
   }