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

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -5,10 +5,11 @@ import { LRUCache } from 'lru-cache';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
 import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const lruCache = new LRUCache<string, any>({
   max: 500,
@@ -29,6 +30,9 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   private async loadWorkbenchListMap() {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     let workbenchListMap = lruCache.get('workbenchListMap');
     if (!workbenchListMap) {
       const reqJson = {
@@ -39,7 +43,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_workbench,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
       const workbenchList = res.getResRows();
       workbenchListMap = MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);

package/src/service/curd/CurdMixService.ts

@@ -8,7 +8,7 @@ import { RelatedType } from './CurdMixUtils';
 import { CurdMixByWorkbenchService } from './CurdMixByWorkbenchService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
 import {CurdMixByLinkToCustomService} from "./CurdMixByLinkToCustomService";
-import {SqlDbType} from "../../libs/crud-pro/models/keys";
+import {SqlDbType} from "@/libs/crud-pro/models/keys";
 
 @Provide()
 export class CurdMixService {
@@ -44,9 +44,9 @@ export class CurdMixService {
     return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  getBbUtil(database: string, sqlDdType: SqlDbType) {
+  getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
     this.prepare();
-    return this.curdProService.getBbUtil(database, sqlDdType);
+    return this.curdProService.getBbUtil(sqlDatabase, sqlDbType, sqlTable);
   }
 
   async executeSQL(sqlCfgModel: ISqlCfgModel) {

package/src/service/curd/CurdMixUtils.ts

@@ -1,12 +1,12 @@
-import {ColumnRelation, CopyAttr} from '../../libs/crud-pro/interfaces';
-import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
-import { KeyOfCrudTypes } from '../../libs/crud-pro/models/keys';
-import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
-import { SqlCfgModel } from '../../libs/crud-pro/models/SqlCfgModel';
-import { RequestCfgModel } from '../../libs/crud-pro/models/RequestCfgModel';
+import { ColumnRelation, CopyAttr } from '@/libs/crud-pro/interfaces';
+import { ExecuteContext } from '@/libs/crud-pro/models/ExecuteContext';
+import { KeyOfCrudTypes } from '@/libs/crud-pro/models/keys';
+import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
+import { SqlCfgModel } from '@/libs/crud-pro/models/SqlCfgModel';
+import { RequestCfgModel } from '@/libs/crud-pro/models/RequestCfgModel';
 import * as _ from 'lodash';
-import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
-import { parseJsonObject } from '../../libs/utils/functions';
+import { MultiKeyMap } from '@/libs/crud-pro/utils/MultiKeyMap';
+import { parseJsonObject } from '@/libs/utils/functions';
 
 enum RelatedType {
   dict = 'dict', // 关联数据字典
@@ -33,7 +33,7 @@ function getColumnsRelationAll(sqlCfg: SqlCfgModel, cfgModel: RequestCfgModel):
 
 
 
-function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ){
+function copyBySingleSourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any) {
   // const codeObject = map.get(sourceValue);
   const codeObject = getValue(sourceValue);
   if (typeof codeObject === 'undefined' || codeObject === null) {
@@ -59,46 +59,54 @@ function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyA
 
 
 
-function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ): boolean {
-  let isSetArray = false;
-  // 支持关联JSON数组
-  if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
-    const codes = parseJsonObject(sourceValue);
-    if (Array.isArray(codes)) {
-      for (let codeIndex = 0; codeIndex < codes.length; codeIndex++) {
-        const code = codes[codeIndex];
-        // const codeObject = map.get(code);
-        const codeObject = getValue(code);
-        if (codeObject) {
-          if (Array.isArray(targetColumns)) {
-            for (let i = 0; i < targetColumns.length; i++) {
-              const targetColumn = targetColumns[i];
 
-              if (targetColumn.from === '*') {
 
-                const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
-                _.set(row, toStr, codeObject);
 
-                isSetArray = true;
 
-              } else {
+function copyByArraySourceValueInner(row: any, codes: any[], targetColumns: CopyAttr[], getValue: any, resultObj: any) {
+
+  for (let codeIndex = 0; codeIndex < codes.length; codeIndex++) {
+    const code = codes[codeIndex];
+    // const codeObject = map.get(code);
+    const codeObject = getValue(code);
+    if (codeObject) {
+      if (Array.isArray(targetColumns)) {
+        for (let i = 0; i < targetColumns.length; i++) {
+          const targetColumn = targetColumns[i];
+
+          if (targetColumn.from === '*') {
 
-                const dictAttrValue = _.get(codeObject, targetColumn.from);
-                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
-                  const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
-                  _.set(row, toStr, dictAttrValue);
-                  isSetArray = true;
+            const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
+            _.set(row, toStr, codeObject);
 
-                }
-              }
+            resultObj.isSetArray = true;
+          } else {
+            const dictAttrValue = _.get(codeObject, targetColumn.from);
+            if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
+              const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
+              _.set(row, toStr, dictAttrValue);
+              resultObj.isSetArray = true;
             }
           }
         }
       }
     }
   }
+}
 
-  return isSetArray;
+function copyByArraySourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any): boolean {
+  const resultObj = {isSetArray: false }
+  // 支持关联JSON数组。使用 字符串存储的类型
+  if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
+    const codes = parseJsonObject(sourceValue);
+    if (Array.isArray(codes)) {
+      copyByArraySourceValueInner(row, codes, targetColumns, getValue, resultObj);
+    }
+  } else if(Array.isArray(sourceValue)) {
+    // 直接使用JSON或者postgres的数组存储的类型
+    copyByArraySourceValueInner(row, sourceValue, targetColumns, getValue, resultObj);
+  }
+  return resultObj.isSetArray;
 }
 
 
@@ -134,7 +142,7 @@ class CrudMixUtils {
         }
       }
     }
-    return _.uniqBy(relationResult,(obj: ColumnRelation)=> {
+    return _.uniqBy(relationResult, (obj: ColumnRelation) => {
       return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
     });
   }
@@ -191,7 +199,7 @@ class CrudMixUtils {
     }
 
     const sourceValue = _.get(row, sourceColumn);
-    if (typeof sourceValue ==='undefined' || sourceValue ===null) {
+    if (typeof sourceValue === 'undefined' || sourceValue === null) {
       return;
     }
 
@@ -216,7 +224,7 @@ class CrudMixUtils {
    * @param columnRelation
    */
   public copyColumnRelationToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
-    const {sourceColumn, targetColumns} = columnRelation;
+    const { sourceColumn, targetColumns } = columnRelation;
     if (!sourceColumn || !targetColumns) {
       return;
     }
@@ -243,6 +251,41 @@ class CrudMixUtils {
 
   }
 
+
+  /**
+  * 专门COPY用户信息到row上面。无relatedCode模式
+  * @param row
+  * @param map
+  * @param columnRelation
+  */
+  public copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
+    const { targetColumns } = columnRelation;
+    if (!targetColumns) {
+      return;
+    }
+
+    const tmpSourceColumn = '__fatcmsUserAccountId__';
+
+    const sourceValue = _.get(row, tmpSourceColumn);
+    if (!sourceValue) {
+      return;
+    }
+
+    const getValue = (code: string) => {
+      if (!map) {
+        return null;
+      }
+      if (typeof map.get === 'function') {
+        return map.get(`${code}`);
+      }
+      return map[code];
+    };
+
+    const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+    if (!isSetArray) {
+      copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+    }
+  }
 }
 
 export { CrudMixUtils, RelatedType, FuncRowColumnRelation };

package/src/service/curd/CurdProService.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 import {Config, Inject, Provide} from '@midwayjs/core';
-import {CrudPro} from '../../libs/crud-pro/CrudPro';
+import {CrudPro} from '@/libs/crud-pro/CrudPro';
 import {Context} from '@midwayjs/koa';
 import {
   IConnectionPool,
@@ -8,27 +8,26 @@ import {
   IRequestCfgModel,
   IRequestModel,
   ISqlCfgModel
-} from '../../libs/crud-pro/interfaces';
-import {SqlCfgModel} from '../../libs/crud-pro/models/SqlCfgModel';
+} from '@/libs/crud-pro/interfaces';
+import {SqlCfgModel} from '@/libs/crud-pro/models/SqlCfgModel';
 import {getConnectionPool as getMySQLConnectionPool} from '../../libs/crud-pro/utils/pool/MySQLUtils';
 import {getConnectionPool as getPostgresConnectionPool} from '../../libs/crud-pro/utils/pool/PostgresUtils';
 import {getConnectionPool as getSqlServerConnectionPool} from '../../libs/crud-pro/utils/pool/SqlServerUtils';
-import {KeysOfSimpleSQL, SqlDbType} from '../../libs/crud-pro/models/keys';
-import {CommonException, Exceptions} from '../../libs/crud-pro/exceptions';
-import {UserSessionInfo} from '../../models/userSession';
-import {BaseExecuteContextFunc} from '../../libs/crud-pro/models/ExecuteContextFunc';
-import {ExecuteContext, IExecuteContextHandler} from '../../libs/crud-pro/models/ExecuteContext';
+import { SqlDbType} from '@/libs/crud-pro/models/keys';
+import {CommonException, Exceptions} from '@/libs/crud-pro/exceptions';
+import {UserSessionInfo} from '@/models/userSession';
+import {BaseExecuteContextFunc} from '@/libs/crud-pro/models/ExecuteContextFunc';
+import {ExecuteContext, IExecuteContextHandler} from '@/libs/crud-pro/models/ExecuteContext';
 import {RelatedType} from './CurdMixUtils';
 import {BaseService} from '../base/BaseService';
 import {
-  CTX_VISITOR_ACCOUNT_TYPE,
-  CTX_VISITOR_AVATAR,
-  CTX_VISITOR_ID,
-  CTX_VISITOR_NICKNAME,
   IRequestCfgModel2,
   IVisitorExt,
-} from '../../models/bizmodels';
-import {IWorkbenchEntity} from '../../models/SystemEntities';
+} from '@/models/bizmodels';
+import {IWorkbenchEntity} from '@/models/SystemEntities';
+import {CrudProQuick} from "@/service/curd/CrudProQuick";
+import {fixCfgModel} from "./fixCfgModel";
+import {GLOBAL_STATIC_CONFIG} from "@/libs/global-config/global-config";
 
 function toVisitor(ctx: Context): IVisitorExt {
   const workbenchInfo: IWorkbenchEntity = ctx.workbenchInfo;
@@ -82,19 +81,21 @@ class MyContextFunc extends BaseExecuteContextFunc {
       throw new CommonException(Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
     }
     const dataBaseName = sqlCfgModel.sqlDatabase;
-    const sqlDdType = sqlCfgModel.sqlDdType;
+    const sqlDbType = sqlCfgModel.sqlDbType;
 
-    if (sqlDdType === SqlDbType.postgres) {
+    if (sqlDbType === SqlDbType.postgres) {
       const dbConfig = _.get(this.postgres2Config, dataBaseName);
       if (!dbConfig) {
+        console.error('postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
       }
       return getPostgresConnectionPool(dataBaseName, dbConfig);
     }
 
-    if (sqlDdType === SqlDbType.sqlserver) {
+    if (sqlDbType === SqlDbType.sqlserver) {
       const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
       if (!dbConfig) {
+        console.error('sqlserver配置中不存在此数据库', JSON.stringify(sqlCfgModel));
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
       }
       return getSqlServerConnectionPool(dataBaseName, dbConfig);
@@ -102,6 +103,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
     const dbConfig = _.get(this.mysql2Config, dataBaseName);
     if (!dbConfig) {
+      console.error('MySQL配置中不存在此数据库', JSON.stringify(sqlCfgModel));
       throw new CommonException(Exceptions.DB_NOT_FOUND, 'MySQL配置中不存在此数据库:' + dataBaseName);
     }
     return getMySQLConnectionPool(dataBaseName, dbConfig);
@@ -118,50 +120,23 @@ class MyContextFunc extends BaseExecuteContextFunc {
     }
     return null;
   }
-}
-
-export class DBUtils {
-  private readonly sqlDatabase: string;
-  private readonly sqlDdType: SqlDbType;
-  private readonly curdProService: CurdProService;
 
-  constructor(sqlDatabase: string, sqlDdType: SqlDbType, curdProService: CurdProService) {
-    this.sqlDatabase = sqlDatabase;
-    this.sqlDdType = sqlDdType;
-    this.curdProService = curdProService;
-  }
 
-  public async getOne(reqJson: IRequestModel, sqlTable: string): Promise<any> {
-    const cfgModel: IRequestCfgModel = {
-      sqlTable,
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-      sqlDatabase: this.sqlDatabase,
-      sqlDdType: this.sqlDdType,
-      updateCfg: {},
-    };
-    const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-    return res.getOneObj();
+  /**
+   * 在执行之前可以根据业务需要修改需要执行的内容
+   * @param reqJson
+   * @param cfgJson
+   */
+  async beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any> {
+    const { bizUpdateCfgModelForCrudPro } = GLOBAL_STATIC_CONFIG.getConfig();
+    if (typeof bizUpdateCfgModelForCrudPro === "function") {
+      await bizUpdateCfgModelForCrudPro(reqJson, cfgJson)
+    }
+    return Promise.resolve();
   }
 
-  public async getList(reqJson: IRequestModel, sqlTable: string): Promise<any[]> {
-    const cfgModel: IRequestCfgModel = {
-      sqlTable,
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: this.sqlDatabase,
-      sqlDdType: this.sqlDdType,
-      updateCfg: {},
-    };
-    const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-    return res.getResRows();
-  }
 }
 
-function isSimpleQuery(sqlSimpleName: KeysOfSimpleSQL): boolean {
-  return sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY ||
-  sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
-  sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
-  sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_ONE
-}
 
 @Provide()
 export class CurdProService extends BaseService {
@@ -196,9 +171,15 @@ export class CurdProService extends BaseService {
 
     const crudPro = new CrudPro();
     crudPro.transaction = this.ctx.transaction;
-    crudPro.logger = this.getContextLogger();
+    crudPro.logger = this.getContextLogger() as any;
     crudPro.visitor = visitor;
-    crudPro.contextCfg = this.crudProCfg;
+
+    const crudProCfg: ICrudProCfg = this.crudProCfg || {};
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    crudProCfg.sysDatabaseName = SystemDbName;
+    crudProCfg.sysDatabaseDbType = SystemDbType;
+
+    crudPro.contextCfg = crudProCfg;
 
     crudPro.contextFunc = new MyContextFunc({
       mysql2Config: this.mysql2Config,
@@ -213,7 +194,7 @@ export class CurdProService extends BaseService {
    * 依赖缓存中与加载的配置
    * @param reqJson
    */
-  async executeCrud(reqJson: IRequestModel) {
+  async executeCrud(reqJson: IRequestModel): Promise<ExecuteContext> {
     if (!reqJson.method) {
       throw new Error('Method not implemented');
     }
@@ -234,141 +215,16 @@ export class CurdProService extends BaseService {
   // 直接执行一个请求
   async executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext> {
     this.logInfo('executeCrudByCfg', cfgModel);
-
-    if (!cfgModel.method) {
-      const req = this.ctx.req;
-      if (req) {
-        cfgModel.method = `${req.method}:${req.url}`;
-      } else {
-        cfgModel.method = 'anonymous';
-      }
-    }
-
-    if (!cfgModel.updateCfg) {
-      cfgModel.updateCfg = {};
-    }
-
-    // 应用标准的updateCfg
-    this.applyStandardUpdateCfg(cfgModel);
-
     const curdPro = this.getCrudPro();
-    return await curdPro.executeCrudByCfg(reqJson, cfgModel);
-  }
-
 
-  private applyStandardUpdateCfg( cfgModel: IRequestCfgModel2 ){
-
-    const sqlSimpleName = cfgModel.sqlSimpleName;
-
-    const enableStandardUpdateCfg = cfgModel.enableStandardUpdateCfg; // 用于设置data字段
-    const enableStandardUpdateCfgCondition = cfgModel.enableStandardUpdateCfgCondition; // 用于设置condition字段
-
-    // 彻底关闭
-    if (enableStandardUpdateCfg === false) {
-      return ;
-    }
-
-    const getDataCfgArray = ()=>{
-      // 明确有配置
-      if (Array.isArray(enableStandardUpdateCfg)) {
-        if (enableStandardUpdateCfg.includes('null')) {
-          return [];
-        }
-        return enableStandardUpdateCfg;
-      }
-      // update 、insert 添加 by
-      return ['by']; // 创建/修改语句默认添加by
-    }
-
-    const getConditionCfgArray = ()=>{
-      // 明确有配置
-      if (Array.isArray(enableStandardUpdateCfgCondition)) {
-        if (enableStandardUpdateCfgCondition.includes('null')) {
-          return [];
-        }
-        return enableStandardUpdateCfgCondition;
-      }
-      return [];
-    }
-
-
-    const dataCfgArray = getDataCfgArray();
-    const conditionCfgArray = getConditionCfgArray();
-
-    const mapping = {
-
-      'condition.created_by': {contextAsString: CTX_VISITOR_ID},
-      'condition.created_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
-
-      'data.created_by': {contextAsString: CTX_VISITOR_ID},
-      'data.created_avatar': {contextAsString: CTX_VISITOR_AVATAR},
-      'data.created_nickname': {contextAsString: CTX_VISITOR_NICKNAME},
-      'data.created_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
-
-      'data.modified_by': {contextAsString: CTX_VISITOR_ID},
-      'data.modified_avatar': {contextAsString: CTX_VISITOR_AVATAR},
-      'data.modified_nickname': {contextAsString: CTX_VISITOR_NICKNAME},
-      'data.modified_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
-    };
-
-
-    const buildUpdateCfgBy = (cfgArray: string[], prefix: string): any => {
-      const obj: any = {};
-      if (Array.isArray(cfgArray)) {
-        for (let i = 0; i < cfgArray.length; i++) {
-          const suffix = cfgArray[i];
-          if (suffix) {
-            const key = `${prefix}_${suffix}`
-            obj[key] = mapping[key]
-          }
-        }
-      }
-      return obj;
-    }
-
-    // 查询语句
-    if (isSimpleQuery(sqlSimpleName) ) {
-      const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 查询用户本人创建的
-      Object.assign(cfgModel.updateCfg, updateCfgObj);
-    }
-
-    // 删除语句
-    if (sqlSimpleName === KeysOfSimpleSQL.SIMPLE_DELETE) {
-      const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
-      Object.assign(cfgModel.updateCfg, updateCfgObj);
-    }
-
-    // 插入语句
-    if (sqlSimpleName === KeysOfSimpleSQL.SIMPLE_INSERT) {
-      const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray,'data.created')
-      Object.assign(cfgModel.updateCfg, updateCfgObj1);
-    }
-
-    // 更新语句
-    if (sqlSimpleName === KeysOfSimpleSQL.SIMPLE_UPDATE) {
-      const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray,'data.modified')
-      const updateCfgObj2 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
-      Object.assign(cfgModel.updateCfg, updateCfgObj1);
-      Object.assign(cfgModel.updateCfg, updateCfgObj2);
-    }
-
-    // 插入或更新
-    if (sqlSimpleName === KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
-      sqlSimpleName === KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
-      const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray,'data.created')
-      const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray,'data.modified')
-      const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
-      Object.assign(cfgModel.updateCfg, updateCfgObj1);
-      Object.assign(cfgModel.updateCfg, updateCfgObj2);
-      Object.assign(cfgModel.updateCfg, updateCfgObj3);
-    }
+    // 应用标准的updateCfg。
+    fixCfgModel(cfgModel);
+    return await curdPro.executeCrudByCfg(reqJson, cfgModel);
   }
 
-
-
-
-  getBbUtil(database: string, sqlDdType: SqlDbType): DBUtils {
-    return new DBUtils(database, sqlDdType, this);
+  getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick {
+    const curdPro = this.getCrudPro();
+    return new CrudProQuick(curdPro, sqlDatabase, sqlDbType, sqlTable);
   }
 
   public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {