midway-fatcms 0.0.6 → 0.0.8

package/dist/service/SysDictDataService.js

@@ -20,11 +20,19 @@ const bizmodels_1 = require("../models/bizmodels");
 let SysDictDataService = class SysDictDataService extends BaseService_1.BaseService {
     get sys_data_dict_item() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, SystemTables_1.SystemTables.sys_data_dict_item);
+        return this.curdProService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
+        });
     }
     // private get sys_data_dict(){
     //   const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    //   return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, SystemTables.sys_data_dict)
+    //   return this.curdProService.getQuickCrud({
+    //     sqlDatabase: SystemDbName,
+    //     sqlDbType: SystemDbType,
+    //     sqlTable: SystemTables.sys_data_dict,
+    //   })
     // }
     async getDataDictItemsByDictCode(dict_code) {
         if (!dict_code || typeof dict_code !== 'string') {
@@ -34,14 +42,16 @@ let SysDictDataService = class SysDictDataService extends BaseService_1.BaseServ
             cacheKey: dict_code,
             cacheName: bizmodels_1.CacheNameEnum.GetDataDictItemsByDictCode,
             getter: async () => {
-                return await this.sys_data_dict_item.getList({
+                const res = await this.sys_data_dict_item.findList({
                     condition: { dict_code, status: 1, deleted_at: 0 }
                 });
+                return res.rows;
             },
         });
     }
     async removeCacheByDictItemId(dict_item_id) {
-        const dictItemObj = await this.sys_data_dict_item.getUniqueOne({ condition: { id: dict_item_id } });
+        const res = await this.sys_data_dict_item.findOne({ condition: { id: dict_item_id } });
+        const dictItemObj = res.row;
         return this.removeCacheByDictCode(dictItemObj['dict_code']);
     }
     // public async removeCacheByDictId(dict_id: string) {

package/dist/service/SysMenuService.js

@@ -20,7 +20,11 @@ const bizmodels_1 = require("../models/bizmodels");
 let SysMenuService = class SysMenuService extends BaseService_1.BaseService {
     get sys_menus_table() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, SystemTables_1.SystemTables.sys_menus);
+        return this.curdProService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: SystemTables_1.SystemTables.sys_menus,
+        });
     }
     /**
      * 获取所有菜单列表
@@ -31,9 +35,10 @@ let SysMenuService = class SysMenuService extends BaseService_1.BaseService {
             cacheKey: bizmodels_1.CacheNameEnum.GetSysMenusList,
             cacheName: bizmodels_1.CacheNameEnum.GetSysMenusList,
             getter: async () => {
-                return await this.sys_menus_table.getList({
+                const res = await this.sys_menus_table.findList({
                     condition: {}
                 });
+                return res.rows;
             },
         });
     }

package/dist/service/curd/CurdMixService.d.ts

@@ -1,7 +1,8 @@
-import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery } from '../../libs/crud-pro/interfaces';
+import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, ExecuteSQLResult } from '../../libs/crud-pro/interfaces';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-import { SqlDbType } from '../../libs/crud-pro/models/keys';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
+import { ShardingCrudPro } from "../../libs/crud-sharding";
+import { IGetQuickCrudParam, IGetShardingCrudParam } from './CurdProService';
 export interface ILinkColumnRelationParam {
     columnsRelations: ColumnRelation[];
 }
@@ -14,8 +15,9 @@ export declare class CurdMixService {
     private curdMixByLinkToCustomService;
     private prepare;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
-    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): import("./CrudProQuick").CrudProQuick;
-    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
+    getQuickCrud(param: IGetQuickCrudParam): import("../..").CrudProQuick;
+    getShardingCrud(param: IGetShardingCrudParam): ShardingCrudPro;
+    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<ExecuteSQLResult>;
     executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
     /**

package/dist/service/curd/CurdMixService.js

@@ -30,9 +30,23 @@ let CurdMixService = class CurdMixService {
         this.prepare();
         return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
     }
-    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
+    // /**
+    //  * @deprecated 请使用 getQuickCrud 替代
+    //  * @param sqlDatabase
+    //  * @param sqlDbType
+    //  * @param sqlTable
+    //  */
+    // getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
+    //   this.prepare();
+    //   return this.curdProService.getQuickCrud({ sqlDatabase, sqlDbType, sqlTable });
+    // }
+    getQuickCrud(param) {
         this.prepare();
-        return this.curdProService.getQuickCrud(sqlDatabase, sqlDbType, sqlTable);
+        return this.curdProService.getQuickCrud(param);
+    }
+    getShardingCrud(param) {
+        this.prepare();
+        return this.curdProService.getShardingCrud(param);
     }
     async executeSQL(sqlCfgModel) {
         this.prepare();

package/dist/service/curd/CurdProService.d.ts

@@ -1,12 +1,34 @@
 import { Context } from '@midwayjs/koa';
-import { IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery } from '../../libs/crud-pro/interfaces';
+import { IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, ExecuteSQLResult } from '../../libs/crud-pro/interfaces';
 import { SqlDbType } from '../../libs/crud-pro/models/keys';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { RelatedType } from './CurdMixUtils';
 import { BaseService } from '../base/BaseService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-import { CrudProQuick } from './CrudProQuick';
+import { CrudProQuick } from '../../libs/crud-pro-quick';
 import { ShardingCrudPro, IShardingConfig } from '../../libs/crud-sharding';
+/**
+ * getQuickCrud 参数接口
+ */
+export interface IGetQuickCrudParam {
+    /** 数据库名 */
+    sqlDatabase: string;
+    /** 数据库类型 */
+    sqlDbType: SqlDbType;
+    /** 表名（可选） */
+    sqlTable?: string;
+}
+/**
+ * getShardingCrud 参数接口
+ */
+export interface IGetShardingCrudParam {
+    /** 数据库名 */
+    sqlDatabase: string;
+    /** 数据库类型 */
+    sqlDbType: SqlDbType;
+    /** 分表配置 */
+    shardingConfig: IShardingConfig;
+}
 export declare class CurdProService extends BaseService {
     protected ctx: Context;
     private mysql2Config;
@@ -26,49 +48,43 @@ export declare class CurdProService extends BaseService {
      * @param reqJson
      */
     executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
-    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
+    executeSQL(sqlCfgModel: ISqlCfgModel): Promise<ExecuteSQLResult>;
     executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
-    /**
-     * 获取 CrudProQuick 工具类（已废弃）
-     *
-     * @deprecated 请使用 getQuickCrud 替代
-     * @param sqlDatabase 数据库名
-     * @param sqlDbType 数据库类型
-     * @param sqlTable 表名（可选）
-     * @returns CrudProQuick 实例
-     */
-    getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick;
     /**
      * 获取 CrudProQuick 工具类
      *
      * 提供快速 CRUD 操作的便捷方法，封装了常用的数据库操作。
      *
-     * @param sqlDatabase 数据库名
-     * @param sqlDbType 数据库类型
-     * @param sqlTable 表名（可选）
+     * @param param 参数对象
      * @returns CrudProQuick 实例
      *
      * @example
-     * const quick = curdProService.getQuickCrud('mydb', SqlDbType.mysql, 't_user');
-     * const users = await quick.query({ status: 'active' });
+     * const quick = curdProService.getQuickCrud({
+     *   sqlDatabase: 'mydb',
+     *   sqlDbType: SqlDbType.mysql,
+     *   sqlTable: 't_user',
+     * });
+     * const users = await quick.find({ status: 'active' });
      */
-    getQuickCrud(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick;
+    getQuickCrud(param: IGetQuickCrudParam): CrudProQuick;
     /**
      * 获取分表 CRUD 操作器
      *
-     * @param sqlDatabase 数据库名
-     * @param sqlDbType 数据库类型
-     * @param shardingConfig 分表配置
+     * @param param 参数对象
      * @returns ShardingCrudPro 实例
      *
      * @example
-     * const sharding = curdProService.getShardingCrud('mydb', SqlDbType.mysql, {
-     *   type: ShardingType.MONTH,
-     *   baseTable: 't_order',
-     *   timeColumn: 'created_at',
+     * const sharding = curdProService.getShardingCrud({
+     *   sqlDatabase: 'mydb',
+     *   sqlDbType: SqlDbType.mysql,
+     *   shardingConfig: {
+     *     type: ShardingType.MONTH,
+     *     baseTable: 't_order',
+     *     timeColumn: 'created_at',
+     *   },
      * });
      */
-    getShardingCrud(sqlDatabase: string, sqlDbType: SqlDbType, shardingConfig: IShardingConfig): ShardingCrudPro;
+    getShardingCrud(param: IGetShardingCrudParam): ShardingCrudPro;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
     getAllTableInfos(query: ITableNamesQuery, options?: ITableNamesOptions): Promise<ITableListResult>;
 }

package/dist/service/curd/CurdProService.js

@@ -20,11 +20,11 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const ExecuteContextFunc_1 = require("../../libs/crud-pro/models/ExecuteContextFunc");
 const BaseService_1 = require("../base/BaseService");
-const CrudProQuick_1 = require("./CrudProQuick");
+const crud_pro_quick_1 = require("../../libs/crud-pro-quick");
 const crud_sharding_1 = require("../../libs/crud-sharding");
 const fixCfgModel_1 = require("./fixCfgModel");
 const global_config_1 = require("../../libs/global-config/global-config");
-const fixSoftDelete_1 = require("../../service/curd/fixSoftDelete");
+const fixSoftDelete_1 = require("../../libs/crud-pro-quick/fixSoftDelete");
 function toVisitor(ctx) {
     const workbenchInfo = ctx.workbenchInfo;
     const userSession = ctx.userSession;
@@ -177,57 +177,56 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
         // 应用标准的updateCfg。
         (0, fixCfgModel_1.fixCfgModel)(cfgModel);
         // 应用软删除动作。
-        (0, fixSoftDelete_1.fixSoftDelete)(cfgModel.sqlSimpleName, cfgModel, reqJson, this.ctx);
+        (0, fixSoftDelete_1.fixSoftDelete)(cfgModel.sqlSimpleName, cfgModel, reqJson, curdPro.getVisitor());
         return await curdPro.executeCrudByCfg(reqJson, cfgModel);
     }
-    /**
-     * 获取 CrudProQuick 工具类（已废弃）
-     *
-     * @deprecated 请使用 getQuickCrud 替代
-     * @param sqlDatabase 数据库名
-     * @param sqlDbType 数据库类型
-     * @param sqlTable 表名（可选）
-     * @returns CrudProQuick 实例
-     */
-    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
-        return this.getQuickCrud(sqlDatabase, sqlDbType, sqlTable);
-    }
     /**
      * 获取 CrudProQuick 工具类
      *
      * 提供快速 CRUD 操作的便捷方法，封装了常用的数据库操作。
      *
-     * @param sqlDatabase 数据库名
-     * @param sqlDbType 数据库类型
-     * @param sqlTable 表名（可选）
+     * @param param 参数对象
      * @returns CrudProQuick 实例
      *
      * @example
-     * const quick = curdProService.getQuickCrud('mydb', SqlDbType.mysql, 't_user');
-     * const users = await quick.query({ status: 'active' });
+     * const quick = curdProService.getQuickCrud({
+     *   sqlDatabase: 'mydb',
+     *   sqlDbType: SqlDbType.mysql,
+     *   sqlTable: 't_user',
+     * });
+     * const users = await quick.find({ status: 'active' });
      */
-    getQuickCrud(sqlDatabase, sqlDbType, sqlTable) {
-        const curdPro = this.getCrudPro();
-        return new CrudProQuick_1.CrudProQuick({ curdPro, sqlDatabase, sqlDbType, sqlTable, ctx: this.ctx });
+    getQuickCrud(param) {
+        const { sqlDatabase, sqlDbType, sqlTable } = param;
+        // 传入工厂函数，每次需要时创建新的 CrudPro 实例
+        return new crud_pro_quick_1.CrudProQuick({
+            crudProFactory: () => this.getCrudPro(),
+            sqlDatabase,
+            sqlDbType,
+            sqlTable,
+        });
     }
     /**
      * 获取分表 CRUD 操作器
      *
-     * @param sqlDatabase 数据库名
-     * @param sqlDbType 数据库类型
-     * @param shardingConfig 分表配置
+     * @param param 参数对象
      * @returns ShardingCrudPro 实例
      *
      * @example
-     * const sharding = curdProService.getShardingCrud('mydb', SqlDbType.mysql, {
-     *   type: ShardingType.MONTH,
-     *   baseTable: 't_order',
-     *   timeColumn: 'created_at',
+     * const sharding = curdProService.getShardingCrud({
+     *   sqlDatabase: 'mydb',
+     *   sqlDbType: SqlDbType.mysql,
+     *   shardingConfig: {
+     *     type: ShardingType.MONTH,
+     *     baseTable: 't_order',
+     *     timeColumn: 'created_at',
+     *   },
      * });
      */
-    getShardingCrud(sqlDatabase, sqlDbType, shardingConfig) {
-        const curdPro = this.getCrudPro();
-        const sharding = new crud_sharding_1.ShardingCrudPro(curdPro, shardingConfig);
+    getShardingCrud(param) {
+        const { sqlDatabase, sqlDbType, shardingConfig } = param;
+        // 传入工厂函数，每次需要时创建新的 CrudPro 实例
+        const sharding = new crud_sharding_1.ShardingCrudPro(() => this.getCrudPro(), shardingConfig);
         sharding.setBaseCfg({ sqlDatabase, sqlDbType });
         return sharding;
     }

package/dist/service/flow/FlowConfigService.js

@@ -47,7 +47,11 @@ exports.ParsedFlowConfig = ParsedFlowConfig;
 let FlowConfigService = class FlowConfigService extends BaseService_1.BaseService {
     get flow_config() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, FlowModel_1.FLOW_TABLES.flow_config);
+        return this.curdProService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: FlowModel_1.FLOW_TABLES.flow_config,
+        });
     }
     toCacheKey(flow_code, flow_version) {
         if (!flow_code || typeof flow_code !== 'string') {
@@ -64,9 +68,10 @@ let FlowConfigService = class FlowConfigService extends BaseService_1.BaseServic
             cacheKey: cacheKey,
             cacheName: bizmodels_1.CacheNameEnum.GetFlowConfigOne,
             getter: async () => {
-                return await this.flow_config.getUniqueOne({
+                const res = await this.flow_config.findUniqueOne({
                     condition: { flow_code, flow_version, deleted_at: 0 }
                 });
+                return res.row;
             },
         });
     }

package/dist/service/flow/FlowInstanceCrudService.js

@@ -23,7 +23,10 @@ exports.getCurrentDateTime = getCurrentDateTime;
 let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_1.BaseService {
     get flowDB() {
         const { FlowDbName, FlowDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const util = this.curdProService.getQuickCrud(FlowDbName, FlowDbType);
+        const util = this.curdProService.getQuickCrud({
+            sqlDatabase: FlowDbName,
+            sqlDbType: FlowDbType,
+        });
         util.setBaseCfgModel({ maxLimit: 100000 });
         return util;
     }
@@ -67,7 +70,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
             modified_at: getCurrentDateTime(),
             deleted_at: 0,
         };
-        const nodeInstanceId = await this.flowDB.insertObject({
+        const nodeInstanceId = await this.flowDB.insert({
             data: nodeInstance,
         }, FlowModel_1.FLOW_TABLES.flow_instance_node);
         nodeInstance.id = nodeInstanceId.insertId;
@@ -89,7 +92,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
             modified_at: getCurrentDateTime(),
             deleted_at: 0,
         };
-        const taskInstanceId = await this.flowDB.insertObject({
+        const taskInstanceId = await this.flowDB.insert({
             data: taskInstance,
         }, FlowModel_1.FLOW_TABLES.flow_instance_task);
         taskInstance.id = taskInstanceId.insertId;
@@ -99,7 +102,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (updateNodeInstance.id) {
             updateNodeInstance.modified_by = this.getCurrentUserAccountId();
             updateNodeInstance.modified_at = getCurrentDateTime();
-            await this.flowDB.updateObject({
+            await this.flowDB.update({
                 condition: {
                     id: updateNodeInstance.id,
                 },
@@ -110,7 +113,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         else {
             updateNodeInstance.created_by = this.getCurrentUserAccountId();
             updateNodeInstance.created_at = getCurrentDateTime();
-            const res = await this.flowDB.insertObject({
+            const res = await this.flowDB.insert({
                 data: updateNodeInstance,
             }, FlowModel_1.FLOW_TABLES.flow_instance_node);
             return res.insertId || '';
@@ -124,7 +127,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (taskInstance.id) {
             taskInstance.modified_by = this.getCurrentUserAccountId();
             taskInstance.modified_at = getCurrentDateTime();
-            await this.flowDB.updateObject({
+            await this.flowDB.update({
                 condition: {
                     id: taskInstance.id,
                 },
@@ -135,7 +138,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         else {
             taskInstance.created_by = this.getCurrentUserAccountId();
             taskInstance.created_at = getCurrentDateTime();
-            const res = await this.flowDB.insertObject({
+            const res = await this.flowDB.insert({
                 data: taskInstance,
             }, FlowModel_1.FLOW_TABLES.flow_instance_task);
             return res.insertId || '';
@@ -155,7 +158,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (flowInstance.id) {
             flowInstance.modified_by = this.getCurrentUserAccountId();
             flowInstance.modified_at = getCurrentDateTime();
-            await this.flowDB.updateObject({
+            await this.flowDB.update({
                 condition: {
                     id: flowInstance.id,
                 },
@@ -166,7 +169,7 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         else {
             flowInstance.created_by = this.getCurrentUserAccountId();
             flowInstance.created_at = getCurrentDateTime();
-            const res = await this.flowDB.insertObject({
+            const res = await this.flowDB.insert({
                 data: flowInstance,
             }, FlowModel_1.FLOW_TABLES.flow_instance);
             return res.insertId || '';
@@ -186,10 +189,10 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         else {
             throw new Error('flow_instance_id is required');
         }
-        const res = await this.flowDB.getUniqueOne({
+        const res = await this.flowDB.findUniqueOne({
             condition: condition,
         }, FlowModel_1.FLOW_TABLES.flow_instance_node);
-        return res;
+        return res.row;
     }
     async getFlowInstance(flow_instance_id, ticket_no) {
         const condition = {};
@@ -202,10 +205,10 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (Object.keys(condition).length === 0) {
             throw new Error('flow_instance_id or ticket_no is required');
         }
-        const res = await this.flowDB.getUniqueOne({
+        const res = await this.flowDB.findUniqueOne({
             condition: condition,
         }, FlowModel_1.FLOW_TABLES.flow_instance);
-        return res;
+        return res.row;
     }
     async getTaskInstance(task_instance_id) {
         const condition = {};
@@ -215,10 +218,10 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (Object.keys(condition).length === 0) {
             throw new Error('task_instance_id is required');
         }
-        const res = await this.flowDB.getUniqueOne({
+        const res = await this.flowDB.findUniqueOne({
             condition: condition,
         }, FlowModel_1.FLOW_TABLES.flow_instance_task);
-        return res;
+        return res.row;
     }
     async getTaskInstanceListByFlowInstanceId(flow_instance_id) {
         const condition = {};
@@ -228,10 +231,10 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (Object.keys(condition).length === 0) {
             throw new Error('flow_instance_id is required');
         }
-        const res = await this.flowDB.getList({
+        const res = await this.flowDB.findList({
             condition: condition,
         }, FlowModel_1.FLOW_TABLES.flow_instance_task);
-        return res;
+        return res.rows;
     }
     async getNodeInstanceListByFlowInstanceId(flowInstanceId) {
         const condition = {};
@@ -241,10 +244,10 @@ let FlowInstanceCrudService = class FlowInstanceCrudService extends BaseService_
         if (Object.keys(condition).length === 0) {
             throw new Error('flowInstanceId is required');
         }
-        const res = await this.flowDB.getList({
+        const res = await this.flowDB.findList({
             condition: condition,
         }, FlowModel_1.FLOW_TABLES.flow_instance_node);
-        return res;
+        return res.rows;
     }
 };
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -30,6 +30,7 @@
     "src/**/*.html",
     "src/**/*.ico",
     "src/**/*.md",
+    ".qoder/**/*.md",
     "index.d.ts",
     "tsconfig.json",
     ".prettierrc.js",

package/src/controller/base/BaseApiController.ts

@@ -122,11 +122,6 @@ export class BaseApiController extends BaseService {
   }
 
 
-  protected get sysDBUtil() {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdMixService.getBbUtil(SystemDbName, SystemDbType);
-  }
-
   private addAccountBasicInfoCfgModel(cfgModel: IRequestCfgModel) {
     let columnsRelation = cfgModel.columnsRelation;
     if (!columnsRelation) {

package/src/controller/gateway/DocGatewayController.ts

@@ -122,7 +122,7 @@ export class DocGatewayController extends BaseApiController {
         condition: {
           doc_lib_id: parseInt(docLibId),
           doc_category_code: {
-            $notNull: '',
+            $notNull: true,
           },
         },
       },

package/src/controller/manage/CrudStandardDesignApi.ts

@@ -4,6 +4,7 @@ import { parseCreateSqlToTitleMap, parseTableFieldTitleFromComment } from '@/lib
 import { checkPermission } from '@/middleware/permission.middleware';
 import { SystemFuncCode } from '@/models/SystemPerm';
 import { KeyOfCrudTypes, KeysOfSimpleSQL, SqlDbType } from '@/libs/crud-pro/models/keys';
+import { ExecuteSQLRowsResult } from '@/libs/crud-pro/interfaces';
 import { SystemTables } from '@/models/SystemTables';
 import { CommonException } from '@/libs/crud-pro/exceptions';
 import { parseDatabaseName, toDatabaseNameStr } from '@/libs/crud-pro/utils/DatabaseName';
@@ -192,7 +193,7 @@ export class CrudStandardDesignApi extends BaseApiController {
       sqlDbType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
       executeSqlArgs: [],
-    });
+    }) as ExecuteSQLRowsResult;
 
     const fields = columnArray.map(columnObj => {
       const { column_name, is_nullable, column_default, data_type, is_identity, column_description, ...others } = columnObj;
@@ -242,7 +243,7 @@ export class CrudStandardDesignApi extends BaseApiController {
       sqlDbType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
       executeSqlArgs: [schemaname, tableName],
-    });
+    }) as ExecuteSQLRowsResult;
 
     const commentMap = await this.getTableFieldsCommentsMapOfPostgreSQL(dbName, schemaname, tableName);
 
@@ -309,7 +310,7 @@ export class CrudStandardDesignApi extends BaseApiController {
       sqlDbType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
       executeSqlArgs: [schemaname, tableName],
-    });
+    }) as ExecuteSQLRowsResult;
 
     const map: any = {};
     commentArray.forEach(commentObj => {

package/src/controller/manage/FlowConfigManageApi.ts

@@ -46,7 +46,8 @@ export class FlowConfigManageApi extends BaseApiController {
   @Post('/updateFlowConfig')
   async updateFlowConfig() {
     const body: IRequestModel = this.ctx.request.body as any;
-    const { flow_code, flow_version } = body.condition;
+    const flow_code = String(body.condition.flow_code);
+    const flow_version = Number(body.condition.flow_version);
 
     await this.flowConfigService.remove_cache_flow_config_one(flow_code, flow_version);
 
@@ -63,7 +64,8 @@ export class FlowConfigManageApi extends BaseApiController {
   @Post('/deleteFlowConfig')
   async deleteFlowConfig() {
     const body: IRequestModel = this.ctx.request.body as any;
-    const { flow_code, flow_version } = body.condition;
+    const flow_code = String(body.condition.flow_code);
+    const flow_version = Number(body.condition.flow_version);
     await this.flowConfigService.remove_cache_flow_config_one(flow_code, flow_version);
 
     return this.executeSysSimpleSQL(FLOW_TABLES.flow_config, KeysOfSimpleSQL.SIMPLE_DELETE, {

package/src/controller/manage/SysConfigMangeApi.ts

@@ -61,7 +61,12 @@ export class SysConfigMangeApi extends BaseApiController {
       return CommonResult.errorRes('id不能为空');
     }
 
-    const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({ condition: body.condition }, SystemTables.sys_configs);
+    const sysConfigRes = await this.curdMixService.getQuickCrud({
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      sqlTable: SystemTables.sys_configs,
+    }).findOne({ condition: body.condition });
+    const sysConfig = sysConfigRes.row;
     if (!sysConfig) {
       return CommonResult.errorRes('配置项不存在');
     }

package/src/controller/manage/UserAccountManageApi.ts

@@ -55,9 +55,14 @@ export class UserAccountManageApi extends BaseApiController {
       return CommonResult.errorRes('id不能为空');
     }
 
-    const userAccountInfo = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({
+    const userAccountInfoRes = await this.curdMixService.getQuickCrud({
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      sqlTable: SystemTables.sys_user_account,
+    }).findUniqueOne({
       condition: body.condition
-    }, SystemTables.sys_user_account);
+    });
+    const userAccountInfo = userAccountInfoRes.row;
 
     if (!userAccountInfo) {
       return CommonResult.errorRes('用户信息不存在');

package/src/index.ts

@@ -70,7 +70,7 @@ export * from './service/curd/CurdMixByWorkbenchService';
 export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdMixUtils';
 export * from './service/curd/CurdProService';
-export * from './service/curd/CrudProQuick';
+export * from './libs/crud-pro-quick';
 export * from './service/flow/FlowConfigService';
 export * from './service/flow/FlowInstanceService';
 export * from './service/flow/FlowInstanceCrudService';
@@ -87,7 +87,6 @@ export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
 export * from './models/AsyncTaskModel';
-export * from './models/StandardColumns';
 
 export * from './schedule/index';
 
@@ -114,5 +113,6 @@ export * from './libs/crud-pro/models/RequestCfgModel';
 export * from './libs/crud-pro/models/SqlSegArg';
 export * from './libs/crud-pro/models/ResModel';
 export * from './libs/crud-sharding/index';
+export * from './libs/crud-pro-quick/index';
 
 export * from './libs/global-config/global-config';