midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.6

package/dist/config/config.default.js

@@ -13,7 +13,13 @@ exports.default = (appInfo) => {
          * 内置超级管理员用户
          * 可以使用这个工具生成：http://127.0.0.1:7002/ns/api/helpers/generateDatabasePassword?loginName=xxxx&pw0=xxxx
          */
-        superAdminList: [{ pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88', pwd_md5: 'e334410fca1fd49972f63bf91f3be1be', login_name: 'superadmin' }],
+        superAdminList: [
+            {
+                pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88',
+                pwd_md5: 'e334410fca1fd49972f63bf91f3be1be',
+                login_name: 'superadmin',
+            },
+        ],
         // use for cookie sign key, should change to your own and keep security
         keys: '1715169944707_323',
         koa: {
@@ -29,7 +35,11 @@ exports.default = (appInfo) => {
             jsonLimit: '1mb',
             textLimit: '1mb',
             xmlLimit: '1mb',
-            ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
+            ignore: [
+                '/ns/gw/proxy/*',
+                '/ns/gw/file/uploadFile',
+                '/ns/api/manage/deploy/uploadAssets',
+            ], // 忽略代理路径的 body 解析
         },
         mysql2: {
             fatcms: {
@@ -45,7 +55,7 @@ exports.default = (appInfo) => {
             },
         },
         postgres2: {
-            postgres_test1: {
+            postgres_test_fatcms_inner_demo_config: {
                 user: 'postgres',
                 host: '127.0.0.1',
                 database: 'postgres',
@@ -54,10 +64,10 @@ exports.default = (appInfo) => {
                 max: 20,
                 idleTimeoutMillis: 30000,
                 connectionTimeoutMillis: 2000, // 连接超时时间（毫秒）
-            }
+            },
         },
         sqlserver2: {
-            sqlserver_master: {
+            sqlserver_master_fatcms_inner_demo_config: {
                 user: 'sa',
                 password: '123456',
                 server: '127.0.0.1',
@@ -65,19 +75,19 @@ exports.default = (appInfo) => {
                 database: 'master',
                 options: {
                     encrypt: false,
-                    trustServerCertificate: true // 信任自签名证书
+                    trustServerCertificate: true, // 信任自签名证书
                 },
                 pool: {
                     max: 30,
                     min: 1,
-                    idleTimeoutMillis: 30000 // 连接空闲超时时间（毫秒）
-                }
-            }
+                    idleTimeoutMillis: 30000, // 连接空闲超时时间（毫秒）
+                },
+            },
         },
         redis: {
             client: {
                 port: 6379,
-                host: "127.0.0.1", // Redis host
+                host: '127.0.0.1', // Redis host
             },
         },
         oss: {
@@ -105,7 +115,34 @@ exports.default = (appInfo) => {
             fileSize: '20mb',
             limit: '20mb',
             // whitelist: string[]，文件扩展名白名单
-            whitelist: ['.jpg', '.jpeg', '.png', '.gif', '.pdf', '.zip', '.xlsx', '.docx', '.pptx', '.txt', '.md', '.json', '.js', '.cjs', '.ejs', '.jsx', '.css', '.java', '.ts', '.tsx', '.less', '.scss', '.html', '.ttf', '.map', '.svg'],
+            whitelist: [
+                '.jpg',
+                '.jpeg',
+                '.png',
+                '.gif',
+                '.pdf',
+                '.zip',
+                '.xlsx',
+                '.docx',
+                '.pptx',
+                '.txt',
+                '.md',
+                '.json',
+                '.js',
+                '.cjs',
+                '.ejs',
+                '.jsx',
+                '.css',
+                '.java',
+                '.ts',
+                '.tsx',
+                '.less',
+                '.scss',
+                '.html',
+                '.ttf',
+                '.map',
+                '.svg',
+            ],
             // tmpdir: string，上传的文件临时存储路径
             tmpdir: (0, path_1.join)((0, os_1.tmpdir)(), 'fatcms-upload-files'),
             // cleanTimeout: number，上传的文件在临时目录中多久之后自动删除，默认为 5 分钟

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -26,8 +26,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const postgresList = Object.keys(this.postgres2Config || {});
         const sqlServerList = Object.keys(this.sqlserver2Config || {});
         const toSelectList = (dbCfgNameList, dbType) => {
-            return dbCfgNameList.map(item => {
-                const dbName = item;
+            return dbCfgNameList.map(dbName => {
                 const value = (0, DatabaseName_1.toDatabaseNameStr)(dbType, dbName);
                 return { value, label: value, dbName, dbType };
             });
@@ -35,7 +34,14 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const mysqlObjList = toSelectList(mysqlList, keys_1.SqlDbType.mysql);
         const postgresObjList = toSelectList(postgresList, keys_1.SqlDbType.postgres);
         const sqlserverObjList = toSelectList(sqlServerList, keys_1.SqlDbType.sqlserver);
-        const databaseList = [...mysqlObjList, ...postgresObjList, ...sqlserverObjList];
+        const databaseList = [
+            ...mysqlObjList,
+            ...postgresObjList,
+            ...sqlserverObjList,
+        ].filter((obj) => {
+            const value = '' + obj.value;
+            return !value.endsWith('_fatcms_inner_demo_config');
+        });
         return {
             success: true,
             data: databaseList,
@@ -131,13 +137,10 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableListOfSqlserver(dbName) {
         const dbConfig = this.sqlserver2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
         const dbType = keys_1.SqlDbType.sqlserver;
-        const sql = "" +
-            "SELECT name as tablename \n" +
-            "FROM sys.tables" +
-            "";
+        const sql = 'SELECT name as tablename FROM sys.tables';
         const arr = await this.curdMixService.executeSQL({
             executeSql: sql,
             sqlDatabase: dbName,
@@ -150,8 +153,9 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
             return {
                 value: tableName,
                 label: tableName,
-                dbName, dbType,
-                tableName
+                dbName,
+                dbType,
+                tableName,
             };
         });
         return common_dto_1.CommonResult.successRes(tableNames);
@@ -159,65 +163,76 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableListOfPostgreSQL(dbName) {
         const dbConfig = this.postgres2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
-        const schemaname = "public";
-        const sql = "" +
-            "SELECT tablename\n" +
-            "FROM pg_tables\n" +
-            `WHERE schemaname = '${schemaname}' \n` +
-            "ORDER BY tablename;";
         const dbType = keys_1.SqlDbType.postgres;
-        const arr = await this.curdMixService.executeSQL({
-            executeSql: sql,
-            sqlDatabase: dbName,
-            sqlDdType: dbType,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-            executeSqlArgs: [],
-        });
-        const tableNames = arr.map(v => {
-            const tableName = v.tablename;
-            return {
-                value: tableName,
-                label: tableName,
-                dbName, dbType,
-                tableName
-            };
-        });
-        return common_dto_1.CommonResult.successRes(tableNames);
+        const schemaname = 'public';
+        const tableListSql = '' +
+            'SELECT tablename\n' +
+            'FROM pg_tables\n' +
+            `WHERE schemaname = '${schemaname}' \n` +
+            'ORDER BY tablename;';
+        const viewListSql = '' +
+            'SELECT viewname as tablename\n' +
+            'FROM pg_views\n' +
+            `WHERE schemaname = '${schemaname}' \n` +
+            'ORDER BY viewname;';
+        const toSelectOptions = async (executeSql, tableType) => {
+            const arr = await this.curdMixService.executeSQL({
+                executeSql: executeSql,
+                sqlDatabase: dbName,
+                sqlDdType: dbType,
+                crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+                executeSqlArgs: [],
+            });
+            return arr.map(v => {
+                const tableName = v.tablename;
+                return {
+                    value: tableName,
+                    label: tableName,
+                    dbName,
+                    dbType,
+                    tableName,
+                    tableType,
+                };
+            });
+        };
+        const tableNames = await toSelectOptions(tableListSql, 'table');
+        const viewNames = await toSelectOptions(viewListSql, 'view');
+        const tableNameMerge = [...tableNames, ...viewNames];
+        return common_dto_1.CommonResult.successRes(tableNameMerge);
     }
     async getTableFieldsOfSqlServer(dbName, tableName) {
         const dbConfig = this.sqlserver2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
-        const columnArraySql = "" +
-            "\n" +
-            "SELECT\n" +
-            "    c.name AS column_name,\n" +
-            "    t.name AS data_type,\n" +
-            "    c.max_length AS max_length,\n" +
-            "    c.precision,\n" +
-            "    c.scale,\n" +
-            "    c.is_nullable,\n" +
-            "    c.is_identity,\n" +
-            "    dc.definition AS column_default,  \n" +
-            "    ep.value AS column_description  \n" +
-            "FROM\n" +
-            "    sys.columns c\n" +
-            "        JOIN\n" +
-            "    sys.types t ON c.user_type_id = t.user_type_id\n" +
-            "        LEFT JOIN\n" +
-            "    sys.default_constraints dc\n" +
-            "    ON c.default_object_id = dc.object_id  \n" +
-            "        LEFT JOIN\n" +
-            "    sys.extended_properties ep\n" +
-            "    ON c.object_id = ep.major_id\n" +
-            "        AND c.column_id = ep.minor_id\n" +
-            "WHERE\n" +
+        const columnArraySql = '' +
+            'SELECT\n' +
+            '    c.name AS column_name,\n' +
+            '    t.name AS data_type,\n' +
+            '    c.max_length AS max_length,\n' +
+            '    c.precision,\n' +
+            '    c.scale,\n' +
+            '    c.is_nullable,\n' +
+            '    c.is_identity,\n' +
+            '    dc.definition AS column_default,  \n' +
+            '    ep.value AS column_description  \n' +
+            'FROM\n' +
+            '    sys.columns c\n' +
+            '        JOIN\n' +
+            '    sys.types t ON c.user_type_id = t.user_type_id\n' +
+            '        LEFT JOIN\n' +
+            '    sys.default_constraints dc\n' +
+            '    ON c.default_object_id = dc.object_id  \n' +
+            '        LEFT JOIN\n' +
+            '    sys.extended_properties ep\n' +
+            '    ON c.object_id = ep.major_id\n' +
+            '        AND c.column_id = ep.minor_id\n' +
+            'WHERE\n' +
             `    c.object_id = OBJECT_ID('${tableName}')  \n` +
-            " ORDER BY\n" +
-            "    c.column_id;";
+            ' ORDER BY\n' +
+            '    c.column_id;';
         const dbType = keys_1.SqlDbType.sqlserver;
         const columnArray = await this.curdMixService.executeSQL({
             executeSql: columnArraySql,
@@ -232,11 +247,11 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 fieldIndex: column_name || '',
                 fieldTitle: column_description || column_name || '',
                 isNullable: is_nullable,
-                defaultValue: column_default || "",
+                defaultValue: column_default || '',
                 extra: others,
                 // key: column_name, // 索引
                 type: data_type,
-                is_identity: is_identity
+                is_identity: is_identity,
             };
         });
         return common_dto_1.CommonResult.successRes({
@@ -248,9 +263,9 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableFieldsOfPostgreSQL(dbName, tableName) {
         const dbConfig = this.postgres2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
-        const schemaname = "public";
+        const schemaname = 'public';
         const columnArraySql = `
 
     SELECT
@@ -259,7 +274,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
       WHERE table_schema = $1 and table_name = $2
       ORDER BY ordinal_position;
 
-`.trim();
+    `.trim();
         const dbType = keys_1.SqlDbType.postgres;
         const columnArray = await this.curdMixService.executeSQL({
             executeSql: columnArraySql,
@@ -274,11 +289,11 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 fieldIndex: column_name || '',
                 fieldTitle: column_name || '',
                 isNullable: is_nullable,
-                defaultValue: column_default || "",
+                defaultValue: column_default || '',
                 extra: others,
                 // key: column_name, // 索引
                 type: data_type,
-                is_identity: is_identity
+                is_identity: is_identity,
             };
         });
         return {

package/package.json

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

package/src/config/config.default.ts

@@ -3,24 +3,25 @@ import { tmpdir } from 'os';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 
-
-
 export default (appInfo: any) => {
   return {
-
     siteFile: {
       favicon: readFileSync(join(__dirname, '../views/static/favicon.ico')),
     },
 
-    encryptedFieldList: [
-
-    ],
+    encryptedFieldList: [],
 
     /**
      * 内置超级管理员用户
      * 可以使用这个工具生成：http://127.0.0.1:7002/ns/api/helpers/generateDatabasePassword?loginName=xxxx&pw0=xxxx
      */
-    superAdminList: [{ pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88', pwd_md5: 'e334410fca1fd49972f63bf91f3be1be', login_name: 'superadmin' }],
+    superAdminList: [
+      {
+        pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88',
+        pwd_md5: 'e334410fca1fd49972f63bf91f3be1be',
+        login_name: 'superadmin',
+      },
+    ],
 
     // use for cookie sign key, should change to your own and keep security
     keys: '1715169944707_323',
@@ -40,7 +41,11 @@ export default (appInfo: any) => {
       jsonLimit: '1mb',
       textLimit: '1mb',
       xmlLimit: '1mb',
-      ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
+      ignore: [
+        '/ns/gw/proxy/*',
+        '/ns/gw/file/uploadFile',
+        '/ns/api/manage/deploy/uploadAssets',
+      ], // 忽略代理路径的 body 解析
     },
 
     mysql2: {
@@ -57,7 +62,7 @@ export default (appInfo: any) => {
       },
     },
     postgres2: {
-      postgres_test1: {
+      postgres_test_fatcms_inner_demo_config: {
         user: 'postgres',
         host: '127.0.0.1',
         database: 'postgres',
@@ -66,12 +71,11 @@ export default (appInfo: any) => {
         max: 20, // 连接池最大连接数
         idleTimeoutMillis: 30000, // 空闲连接超时时间（毫秒）
         connectionTimeoutMillis: 2000, // 连接超时时间（毫秒）
-      }
+      },
     },
 
-
     sqlserver2: {
-      sqlserver_master: {
+      sqlserver_master_fatcms_inner_demo_config: {
         user: 'sa',
         password: '123456', // 你的SA密码
         server: '127.0.0.1',
@@ -79,20 +83,20 @@ export default (appInfo: any) => {
         database: 'master', // 默认数据库
         options: {
           encrypt: false, // Docker容器内通常不需要加密
-          trustServerCertificate: true // 信任自签名证书
+          trustServerCertificate: true, // 信任自签名证书
         },
         pool: {
-          max: 30,          // 最大连接数
-          min: 1,           // 最小连接数
-          idleTimeoutMillis: 30000  // 连接空闲超时时间（毫秒）
-        }
-      }
+          max: 30, // 最大连接数
+          min: 1, // 最小连接数
+          idleTimeoutMillis: 30000, // 连接空闲超时时间（毫秒）
+        },
+      },
     },
 
     redis: {
       client: {
         port: 6379, // Redis port
-        host: "127.0.0.1", // Redis host
+        host: '127.0.0.1', // Redis host
       },
     },
 
@@ -122,7 +126,34 @@ export default (appInfo: any) => {
       fileSize: '20mb',
       limit: '20mb',
       // whitelist: string[]，文件扩展名白名单
-      whitelist: ['.jpg', '.jpeg', '.png', '.gif', '.pdf', '.zip', '.xlsx', '.docx', '.pptx', '.txt', '.md', '.json', '.js', '.cjs', '.ejs', '.jsx', '.css', '.java', '.ts', '.tsx', '.less', '.scss', '.html', '.ttf', '.map', '.svg'],
+      whitelist: [
+        '.jpg',
+        '.jpeg',
+        '.png',
+        '.gif',
+        '.pdf',
+        '.zip',
+        '.xlsx',
+        '.docx',
+        '.pptx',
+        '.txt',
+        '.md',
+        '.json',
+        '.js',
+        '.cjs',
+        '.ejs',
+        '.jsx',
+        '.css',
+        '.java',
+        '.ts',
+        '.tsx',
+        '.less',
+        '.scss',
+        '.html',
+        '.ttf',
+        '.map',
+        '.svg',
+      ],
       // tmpdir: string，上传的文件临时存储路径
       tmpdir: join(tmpdir(), 'fatcms-upload-files'),
       // cleanTimeout: number，上传的文件在临时目录中多久之后自动删除，默认为 5 分钟
@@ -148,7 +179,9 @@ export default (appInfo: any) => {
     ejs: {},
 
     info: {
-      infoPath: `/_my_info_${Date.now()}_${Math.floor(Math.random() * 1000000)}`, // 实际上隐藏了info路径
+      infoPath: `/_my_info_${Date.now()}_${Math.floor(
+        Math.random() * 1000000
+      )}`, // 实际上隐藏了info路径
     },
 
     // 使用浏览器插件配置header信息：插件名：ModHeader - Modify HTTP headers
@@ -166,7 +199,5 @@ export default (appInfo: any) => {
 
     // 是否启用内置的定时任务
     fatcmsScheduleService: true,
-
-
   } as MidwayConfig;
 };

package/src/controller/home.controller.ts

@@ -1,9 +1,9 @@
-import {Controller, Get, Inject} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {BaseApiController} from './base/BaseApiController';
-import {WorkbenchService} from '../service/WorkbenchService';
-import {createRenderUtils} from "../libs/utils/render-utils";
-import {privateAES} from "../libs/utils/crypto-utils";
+import { Controller, Get, Inject } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from './base/BaseApiController';
+import { WorkbenchService } from '../service/WorkbenchService';
+import { createRenderUtils } from "../libs/utils/render-utils";
+import { privateAES } from "../libs/utils/crypto-utils";
 
 
 

package/src/controller/manage/CrudStandardDesignApi.ts

@@ -4,13 +4,11 @@ import { BaseApiController } from '../base/BaseApiController';
 import { parseCreateSqlToTitleMap } from '../../libs/utils/parseCreateSql';
 import { checkPermission } from '../../middleware/permission.middleware';
 import { SystemFuncCode } from '../../models/SystemPerm';
-import {KeyOfCrudTypes, KeysOfSimpleSQL, SqlDbType} from '../../libs/crud-pro/models/keys';
+import { KeyOfCrudTypes, KeysOfSimpleSQL, SqlDbType } from '../../libs/crud-pro/models/keys';
 import { SystemTables } from '../../models/SystemTables';
-import {CommonException} from "../../libs/crud-pro/exceptions";
-import {parseDatabaseName, toDatabaseNameStr} from "../../libs/crud-pro/utils/DatabaseName";
-import {CommonResult} from "../../libs/utils/common-dto";
-
-
+import { CommonException } from "../../libs/crud-pro/exceptions";
+import { parseDatabaseName, toDatabaseNameStr } from "../../libs/crud-pro/utils/DatabaseName";
+import { CommonResult } from "../../libs/utils/common-dto";
 
 
 @Controller('/ns/api/manage/CrudStandardDesignApi', { middleware: [checkPermission(SystemFuncCode.CrudStandardDesignRead)] })
@@ -30,19 +28,25 @@ export class CrudStandardDesignApi extends BaseApiController {
     const postgresList = Object.keys(this.postgres2Config || {});
     const sqlServerList = Object.keys(this.sqlserver2Config || {});
 
-    const toSelectList= (dbCfgNameList:string[], dbType: SqlDbType)=> {
-      return dbCfgNameList.map(item => {
-        const dbName = item;
+    const toSelectList = (dbCfgNameList: string[], dbType: SqlDbType) => {
+      return dbCfgNameList.map(dbName => {
         const value = toDatabaseNameStr(dbType, dbName);
-        return {value, label: value, dbName, dbType}
+        return { value, label: value, dbName, dbType };
       });
-    }
+    };
 
     const mysqlObjList = toSelectList(mysqlList, SqlDbType.mysql);
     const postgresObjList = toSelectList(postgresList, SqlDbType.postgres);
     const sqlserverObjList = toSelectList(sqlServerList, SqlDbType.sqlserver);
 
-    const databaseList = [...mysqlObjList, ...postgresObjList, ...sqlserverObjList];
+    const databaseList = [
+      ...mysqlObjList,
+      ...postgresObjList,
+      ...sqlserverObjList,
+    ].filter((obj: any) => {
+      const value = '' + obj.value;
+      return !value.endsWith('_fatcms_inner_demo_config');
+    });
 
     return {
       success: true,
@@ -51,7 +55,7 @@ export class CrudStandardDesignApi extends BaseApiController {
   }
 
   @Post('/getTableList')
-  async getTableList():  Promise<CommonResult> {
+  async getTableList(): Promise<CommonResult> {
     const { databaseName } = this.ctx.request.body as any;
     const { dbType, dbName } = parseDatabaseName(databaseName);
 
@@ -144,7 +148,10 @@ export class CrudStandardDesignApi extends BaseApiController {
    */
   @Post('/getRoleOptionsList')
   async getRoleOptionsList() {
-    return this.executeSysSimpleSQL(SystemTables.sys_perm_role, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+    return this.executeSysSimpleSQL(
+      SystemTables.sys_perm_role,
+      KeysOfSimpleSQL.SIMPLE_QUERY_PAGE
+    );
   }
 
   /**
@@ -152,21 +159,24 @@ export class CrudStandardDesignApi extends BaseApiController {
    */
   @Post('/getFuncOptionsList')
   async getFuncOptionsList() {
-    return this.executeSysSimpleSQL(SystemTables.sys_perm_func, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+    return this.executeSysSimpleSQL(
+      SystemTables.sys_perm_func,
+      KeysOfSimpleSQL.SIMPLE_QUERY_PAGE
+    );
   }
 
   private async getTableListOfSqlserver(dbName: string): Promise<CommonResult> {
     const dbConfig = this.sqlserver2Config[dbName];
     if (!dbConfig) {
-      throw new CommonException("DB_NOT_FOUND","数据库配置没有找到：" +dbName);
+      throw new CommonException(
+        'DB_NOT_FOUND',
+        '数据库配置没有找到：' + dbName
+      );
     }
 
     const dbType = SqlDbType.sqlserver;
 
-    const sql = "" +
-      "SELECT name as tablename \n" +
-      "FROM sys.tables" +
-      "";
+    const sql = 'SELECT name as tablename FROM sys.tables';
     const arr = await this.curdMixService.executeSQL({
       executeSql: sql,
       sqlDatabase: dbName,
@@ -177,92 +187,111 @@ export class CrudStandardDesignApi extends BaseApiController {
 
 
     const tableNames: string[] = arr.map(v => {
-      const tableName = v.tablename
+      const tableName = v.tablename;
       return {
-        value: tableName , //[dbName, dbType, tableName].join(SPLIT_CONST),
+        value: tableName, //[dbName, dbType, tableName].join(SPLIT_CONST),
         label: tableName,
-        dbName, dbType,
-        tableName
-      }
+        dbName,
+        dbType,
+        tableName,
+      };
     });
     return CommonResult.successRes(tableNames);
-
   }
 
-
   private async getTableListOfPostgreSQL(dbName: string): Promise<CommonResult> {
 
     const dbConfig = this.postgres2Config[dbName];
     if (!dbConfig) {
-      throw new CommonException("DB_NOT_FOUND","数据库配置没有找到：" +dbName);
+      throw new CommonException(
+        'DB_NOT_FOUND',
+        '数据库配置没有找到：' + dbName
+      );
     }
 
+    const dbType = SqlDbType.postgres;
+    const schemaname = 'public';
 
-    const schemaname = "public"
-
-    const sql = "" +
-      "SELECT tablename\n" +
-      "FROM pg_tables\n" +
+    const tableListSql =
+      '' +
+      'SELECT tablename\n' +
+      'FROM pg_tables\n' +
       `WHERE schemaname = '${schemaname}' \n` +
-      "ORDER BY tablename;"
+      'ORDER BY tablename;';
 
-    const dbType = SqlDbType.postgres;
+    const viewListSql =
+      '' +
+      'SELECT viewname as tablename\n' +
+      'FROM pg_views\n' +
+      `WHERE schemaname = '${schemaname}' \n` +
+      'ORDER BY viewname;';
+
+    const toSelectOptions = async (executeSql: string, tableType: string) => {
+      const arr = await this.curdMixService.executeSQL({
+        executeSql: executeSql,
+        sqlDatabase: dbName,
+        sqlDdType: dbType,
+        crudType: KeyOfCrudTypes.SYS_QUERY,
+        executeSqlArgs: [],
+      });
+      return arr.map(v => {
+        const tableName = v.tablename;
+        return {
+          value: tableName, //[dbName, dbType, tableName].join(SPLIT_CONST),
+          label: tableName,
+          dbName,
+          dbType,
+          tableName,
+          tableType,
+        };
+      });
+    };
 
-    const arr = await this.curdMixService.executeSQL({
-      executeSql: sql,
-      sqlDatabase: dbName,
-      sqlDdType: dbType,
-      crudType: KeyOfCrudTypes.SYS_QUERY,
-      executeSqlArgs: [],
-    });
+    const tableNames: any[] = await toSelectOptions(tableListSql, 'table');
+    const viewNames: any[] = await toSelectOptions(viewListSql, 'view');
 
+    const tableNameMerge = [...tableNames, ...viewNames];
 
-    const tableNames: string[] = arr.map(v => {
-      const tableName = v.tablename
-      return {
-        value: tableName , //[dbName, dbType, tableName].join(SPLIT_CONST),
-        label: tableName,
-        dbName, dbType,
-        tableName
-      }
-    });
-    return CommonResult.successRes(tableNames);
+    return CommonResult.successRes(tableNameMerge);
   }
 
 
   private async getTableFieldsOfSqlServer(dbName: string, tableName: string): Promise<CommonResult> {
     const dbConfig = this.sqlserver2Config[dbName];
     if (!dbConfig) {
-      throw new CommonException("DB_NOT_FOUND","数据库配置没有找到：" +dbName);
+      throw new CommonException(
+        'DB_NOT_FOUND',
+        '数据库配置没有找到：' + dbName
+      );
     }
 
-    const columnArraySql = "" +
-      "\n" +
-      "SELECT\n" +
-      "    c.name AS column_name,\n" +
-      "    t.name AS data_type,\n" +
-      "    c.max_length AS max_length,\n" +
-      "    c.precision,\n" +
-      "    c.scale,\n" +
-      "    c.is_nullable,\n" +
-      "    c.is_identity,\n" +
-      "    dc.definition AS column_default,  \n" +
-      "    ep.value AS column_description  \n" +
-      "FROM\n" +
-      "    sys.columns c\n" +
-      "        JOIN\n" +
-      "    sys.types t ON c.user_type_id = t.user_type_id\n" +
-      "        LEFT JOIN\n" +
-      "    sys.default_constraints dc\n" +
-      "    ON c.default_object_id = dc.object_id  \n" +
-      "        LEFT JOIN\n" +
-      "    sys.extended_properties ep\n" +
-      "    ON c.object_id = ep.major_id\n" +
-      "        AND c.column_id = ep.minor_id\n" +
-      "WHERE\n" +
+    const columnArraySql =
+      '' +
+      'SELECT\n' +
+      '    c.name AS column_name,\n' +
+      '    t.name AS data_type,\n' +
+      '    c.max_length AS max_length,\n' +
+      '    c.precision,\n' +
+      '    c.scale,\n' +
+      '    c.is_nullable,\n' +
+      '    c.is_identity,\n' +
+      '    dc.definition AS column_default,  \n' +
+      '    ep.value AS column_description  \n' +
+      'FROM\n' +
+      '    sys.columns c\n' +
+      '        JOIN\n' +
+      '    sys.types t ON c.user_type_id = t.user_type_id\n' +
+      '        LEFT JOIN\n' +
+      '    sys.default_constraints dc\n' +
+      '    ON c.default_object_id = dc.object_id  \n' +
+      '        LEFT JOIN\n' +
+      '    sys.extended_properties ep\n' +
+      '    ON c.object_id = ep.major_id\n' +
+      '        AND c.column_id = ep.minor_id\n' +
+      'WHERE\n' +
       `    c.object_id = OBJECT_ID('${tableName}')  \n` +
-      " ORDER BY\n" +
-      "    c.column_id;";
+      ' ORDER BY\n' +
+      '    c.column_id;';
 
     const dbType = SqlDbType.sqlserver;
 
@@ -275,16 +304,25 @@ export class CrudStandardDesignApi extends BaseApiController {
     });
 
     const fields = columnArray.map(columnObj => {
-      const {column_name,is_nullable,column_default,data_type,is_identity,column_description, ...others } = columnObj;
+      const {
+        column_name,
+        is_nullable,
+        column_default,
+        data_type,
+        is_identity,
+        column_description,
+        ...others
+      } = columnObj;
+
       return {
         fieldIndex: column_name || '',
-        fieldTitle: column_description || column_name ||  '',
+        fieldTitle: column_description || column_name || '',
         isNullable: is_nullable,
-        defaultValue: column_default || "",
+        defaultValue: column_default || '',
         extra: others,
         // key: column_name, // 索引
         type: data_type,
-        is_identity: is_identity
+        is_identity: is_identity,
       };
     });
 
@@ -293,17 +331,18 @@ export class CrudStandardDesignApi extends BaseApiController {
       tableName,
       tableTitle: tableName,
     });
-
-
   }
 
   private async getTableFieldsOfPostgreSQL(dbName: string, tableName: string) {
     const dbConfig = this.postgres2Config[dbName];
     if (!dbConfig) {
-      throw new CommonException("DB_NOT_FOUND","数据库配置没有找到：" +dbName);
+      throw new CommonException(
+        'DB_NOT_FOUND',
+        '数据库配置没有找到：' + dbName
+      );
     }
 
-    const schemaname = "public"
+    const schemaname = 'public';
 
     const columnArraySql = `
 
@@ -313,7 +352,7 @@ export class CrudStandardDesignApi extends BaseApiController {
       WHERE table_schema = $1 and table_name = $2
       ORDER BY ordinal_position;
 
-`.trim();
+    `.trim();
 
     const dbType = SqlDbType.postgres;
 
@@ -322,22 +361,28 @@ export class CrudStandardDesignApi extends BaseApiController {
       sqlDatabase: dbName,
       sqlDdType: dbType,
       crudType: KeyOfCrudTypes.SYS_QUERY,
-      executeSqlArgs: [ schemaname, tableName],
+      executeSqlArgs: [schemaname, tableName],
     });
 
-
-
     const fields = columnArray.map(columnObj => {
-      const {column_name,is_nullable,column_default,data_type,is_identity, ...others } = columnObj;
+      const {
+        column_name,
+        is_nullable,
+        column_default,
+        data_type,
+        is_identity,
+        ...others
+      } = columnObj;
+
       return {
         fieldIndex: column_name || '',
         fieldTitle: column_name || '',
         isNullable: is_nullable,
-        defaultValue: column_default || "",
+        defaultValue: column_default || '',
         extra: others,
         // key: column_name, // 索引
         type: data_type,
-        is_identity: is_identity
+        is_identity: is_identity,
       };
     });