midway-fatcms 0.0.1-beta.44 → 0.0.1-beta.45

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

@@ -35,4 +35,12 @@ export declare class CrudStandardDesignApi extends BaseApiController {
     private getTableListOfPostgreSQL;
     private getTableFieldsOfSqlServer;
     private getTableFieldsOfPostgreSQL;
+    /**
+     * 获取PostgreSQL建表语句的注释
+     * @param dbName
+     * @param schemaname
+     * @param tableName
+     * @returns
+     */
+    private getTableFieldsCommentsMapOfPostgreSQL;
 }

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -254,14 +254,14 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
             throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
         const schemaname = 'public';
-        const columnArraySql = `
-
-    SELECT
-      *
-      FROM information_schema.columns
-      WHERE table_schema = $1 and table_name = $2
-      ORDER BY ordinal_position;
-
+        const columnArraySql = `
+
+    SELECT
+      *
+      FROM information_schema.columns
+      WHERE table_schema = $1 and table_name = $2
+      ORDER BY ordinal_position;
+
     `.trim();
         const dbType = keys_1.SqlDbType.postgres;
         const columnArray = await this.curdMixService.executeSQL({
@@ -271,11 +271,12 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [schemaname, tableName],
         });
+        const commentMap = await this.getTableFieldsCommentsMapOfPostgreSQL(dbName, schemaname, tableName);
         const fields = columnArray.map(columnObj => {
             const { column_name, is_nullable, column_default, data_type, is_identity, ...others } = columnObj;
             return {
                 fieldIndex: column_name || '',
-                fieldTitle: column_name || '',
+                fieldTitle: commentMap[column_name] || column_name || '',
                 isNullable: is_nullable,
                 defaultValue: column_default || '',
                 extra: others,
@@ -293,6 +294,50 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
             },
         };
     }
+    /**
+     * 获取PostgreSQL建表语句的注释
+     * @param dbName
+     * @param schemaname
+     * @param tableName
+     * @returns
+     */
+    async getTableFieldsCommentsMapOfPostgreSQL(dbName, schemaname, tableName) {
+        const commentArraySql = `
+            SELECT
+                n.nspname AS schema_name,
+                c.relname AS table_name,  
+                a.attname AS column_name,  
+                d.description AS column_comment 
+            FROM
+                pg_class c
+            JOIN
+                pg_namespace n ON c.relnamespace = n.oid
+            JOIN
+                pg_attribute a ON c.oid = a.attrelid
+            LEFT JOIN
+                pg_description d ON c.oid = d.objoid AND a.attnum = d.objsubid
+            WHERE
+                n.nspname = $1 
+                AND c.relname = $2  
+                AND a.attnum > 0  
+            ORDER BY
+                a.attnum
+    `;
+        const dbType = keys_1.SqlDbType.postgres;
+        const commentArray = await this.curdMixService.executeSQL({
+            executeSql: commentArraySql,
+            sqlDatabase: dbName,
+            sqlDbType: dbType,
+            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+            executeSqlArgs: [schemaname, tableName],
+        });
+        const map = {};
+        commentArray.forEach(commentObj => {
+            const { column_name, column_comment } = commentObj;
+            map[column_name] = (0, parseCreateSql_1.parseTableFieldTitleFromComment)(column_comment);
+        });
+        return map;
+    }
 };
 __decorate([
     (0, core_1.Config)('mysql2'),

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

@@ -1,13 +1,24 @@
+import { IRequestCfgModel, IRequestModel } from '../crud-pro/interfaces';
+import { ExecuteContext } from '../crud-pro/models/ExecuteContext';
 import { SqlDbType } from '../crud-pro/models/keys';
+import { Context } from '@midwayjs/koa';
 interface IGlobalStaticConfig {
     /**
-     * CrudStd: 业务系统自定义的修改cfgModel
+     * CrudStd: 业务系统自定义的修改：查询前的查询条件：cfgModel
      * @param reqJson
      * @param cfgModel
      * @param appInfo
      * @param ctx
      */
-    bizUpdateCfgModelForCrudStd(reqJson: any, cfgModel: any, appInfo: any, ctx: any): Promise<any>;
+    bizUpdateCfgModelForCrudStd(reqJson: IRequestModel, cfgModel: IRequestCfgModel, appInfo: any, ctx: Context): Promise<any>;
+    /**
+     * CrudStd:  业务系统自定义的修改：查询后的返回值。
+     * @param reqJson
+     * @param cfgModel
+     * @param appInfo
+     * @param ctx
+     */
+    bizUpdateExecuteContextForCrudStd(reqJson: IRequestModel, cfgModel: IRequestCfgModel, appInfo: any, ctx: Context, executeContext: ExecuteContext): Promise<any>;
     /**
      * CrudMtd: 业务系统自定义的修改cfgModel
      * @param reqJson

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

@@ -9,6 +9,7 @@ class GlobalStaticConfig {
     constructor() {
         this.configObject = {
             bizUpdateCfgModelForCrudStd: noop,
+            bizUpdateExecuteContextForCrudStd: noop,
             bizUpdateCfgModelForCrudMtd: noop,
             bizUpdateCfgModelForCrudPro: noop,
             generateUserAccountId: null,
@@ -17,7 +18,7 @@ class GlobalStaticConfig {
             },
             SystemDbName: 'fatcms',
             SystemDbType: keys_1.SqlDbType.mysql,
-            maxPageSizeOfExportExcel: 1000
+            maxPageSizeOfExportExcel: 1000,
         };
     }
     getConfig() {

package/dist/libs/utils/parseCreateSql.d.ts

@@ -1,5 +1,10 @@
+/**
+ * 移除引号
+ * @param s
+ */
+declare function parseTableFieldTitleFromComment(s: string): string;
 declare function parseCreateSqlToTitleMap(createSqlStr: string): {
     tableTitle: string;
     fieldsTitleMap: {};
 };
-export { parseCreateSqlToTitleMap };
+export { parseCreateSqlToTitleMap, parseTableFieldTitleFromComment };

package/dist/libs/utils/parseCreateSql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCreateSqlToTitleMap = void 0;
+exports.parseTableFieldTitleFromComment = exports.parseCreateSqlToTitleMap = void 0;
 function isChineseChar(char) {
     const reg = /[\u4e00-\u9fff]/;
     return reg.test(char);
@@ -34,6 +34,7 @@ function parseTableFieldTitleFromComment(s) {
     }
     return arr.join('');
 }
+exports.parseTableFieldTitleFromComment = parseTableFieldTitleFromComment;
 /**
  * 从最后一行中提取表格的标题
  * @param arr

package/dist/service/crudstd/CrudStdService.js

@@ -69,9 +69,12 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
         // 根据表结构的数据类型，修正数据类型
         await this.fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, { dbType, dbName });
-        // 业务系统自定义的修改cfgModel
+        // 业务系统自定义的修改：查询前的查询条件：cfgModel
         await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
-        return await this.curdMixService.executeCrudByCfg(params, cfgModel);
+        const crudExeCtx = await this.curdMixService.executeCrudByCfg(params, cfgModel);
+        // 业务系统自定义的修改：查询后的返回值。
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateExecuteContextForCrudStd(params, cfgModel, appInfo, this.ctx, crudExeCtx);
+        return crudExeCtx;
     }
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息

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

@@ -1,6 +1,7 @@
 import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel } 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';
 export interface ILinkColumnRelationParam {
     columnsRelations: ColumnRelation[];
 }
@@ -12,10 +13,10 @@ export declare class CurdMixService {
     private curdMixByWorkbenchService;
     private curdMixByLinkToCustomService;
     private prepare;
-    executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext>;
     getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): import("./CrudProQuick").CrudProQuick;
     executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any>;
-    executeCrud(reqJson: IRequestModel): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    executeCrud(reqJson: IRequestModel): Promise<ExecuteContext>;
     getCachedCfgByMethod(method: string): Promise<IRequestCfgModel>;
     /**
      * 根据配置的关联关系，直接关联数据

package/package.json

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