midway-fatcms 0.0.1-beta.1 → 0.0.1-beta.10

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 分钟
@@ -134,13 +171,13 @@ exports.default = (appInfo) => {
         // 使用浏览器插件配置header信息：插件名：ModHeader - Modify HTTP headers
         // 默认值：配置key：fatcmsdebug, 配置value: headerSecret的值
         fatcmsDebug: {
-            headerKey: 'euhvfvv5sDt19dNoerVFamhNYlLJ8ZDDYcRZhMJWNRxALxtrxLPqJSks9sRZEpKY',
-            headerSecret: 'IlddQO1fO8X7KSwnF3KazNaNHK05Y0kYaD+1z3yGlfZpz0+aAF5hDzf7KQk2dyx0',
+            headerKey: 'fatcmsDebug',
+            headerSecret: '111',
         },
         // 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
         fatcmsSAEnable: {
-            headerKey: 'WyuX2jf8hehgXAjV5Bf22hvbK/KTEiHCM8eiQeI0FETm/UFXkcLnn3GSTUfwVrrE',
-            headerSecret: 'lzt19Ef6HxSqg2rp6Q1M3YT+uMrTecmAm3cX1mwFZGqoXknwWdj5fTJil1Vr9AeHDIUFuOOxrU1kSSVa6h/Ppw==',
+            headerKey: 'fatcmsSAEnable',
+            headerSecret: '222',
         },
         // 是否启用内置的定时任务
         fatcmsScheduleService: true,

package/dist/controller/base/BaseApiController.js

@@ -13,7 +13,7 @@ exports.BaseApiController = void 0;
 const core_1 = require("@midwayjs/core");
 const CurdMixService_1 = require("../../service/curd/CurdMixService");
 const keys_1 = require("../../libs/crud-pro/models/keys");
-const SystemTables_1 = require("../../models/SystemTables");
+const global_config_1 = require("../../libs/global-config/global-config");
 const UserAccountService_1 = require("../../service/UserAccountService");
 const CurdMixUtils_1 = require("../../service/curd/CurdMixUtils");
 const BaseService_1 = require("../../service/base/BaseService");
@@ -25,11 +25,12 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
         return this.ctx.userSession.getSessionInfo();
     }
     async executeSysSQL(executeSql, executeSqlArgs) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         return await this.curdMixService.executeSQL({
             executeSql: executeSql,
             executeSqlArgs: executeSqlArgs,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
     }
@@ -41,14 +42,15 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
      * @protected
      */
     async executeSysSimpleSQL(sqlTable, sqlSimpleName, params) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const body = this.ctx.request.body;
         const req = this.ctx.req;
         const cfgModel = {
             method: `${req.method}:${req.url}`,
             sqlTable,
             sqlSimpleName,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             updateCfg: {},
         };
         if (params && typeof params === 'object') {
@@ -61,7 +63,8 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
         return await this.curdMixService.executeCrudByCfg(body, cfgModel);
     }
     get sysDBUtil() {
-        return this.curdMixService.getBbUtil(SystemTables_1.SystemDbName, SystemTables_1.SystemDbType);
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        return this.curdMixService.getBbUtil(SystemDbName, SystemDbType);
     }
     addAccountBasicInfoCfgModel(cfgModel) {
         let columnsRelation = cfgModel.columnsRelation;

package/dist/controller/gateway/CrudMtdGatewayController.js

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

package/dist/controller/gateway/DocGatewayController.js

@@ -16,6 +16,7 @@ exports.DocGatewayController = void 0;
 const core_1 = require("@midwayjs/core");
 const BaseApiController_1 = require("../base/BaseApiController");
 const SystemTables_1 = require("../../models/SystemTables");
+const global_config_1 = require("../../libs/global-config/global-config");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const common_dto_1 = require("../../libs/utils/common-dto");
@@ -40,6 +41,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         if (nxRes !== 'OK') {
             return;
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         await this.curdMixService.executeCrudByCfg({
             data: {
                 pv: pv + 1
@@ -51,8 +53,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
     }
     /**
@@ -66,6 +68,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         if (!docLibInfoRes.success) {
             return docLibInfoRes;
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({
             condition: {
                 id: parseInt(docId),
@@ -74,8 +77,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         // 更新PV数据
         const docObj = res.getOneObj();
@@ -94,6 +97,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         if (!docLibInfoRes.success) {
             return docLibInfoRes;
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         return this.curdMixService.executeCrudByCfg({
             columns: 'id,title,doc_category_code,sort_index',
             orderBy: 'sort_index+,id-',
@@ -106,8 +110,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
     }
     /**
@@ -116,6 +120,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
      */
     async getDocLibInfo(docLibId) {
         checkIsNumber(docLibId, 'docLibId');
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const s = await this.curdMixService.executeCrudByCfg({
             condition: {
                 id: parseInt(docLibId),
@@ -123,8 +128,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc_lib,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const docLibInfo = s.getOneObj();
         if (!docLibInfo) {

package/dist/controller/gateway/StaticController.d.ts

@@ -11,6 +11,9 @@ interface HttpGetRes {
  */
 export declare class StaticController extends BaseApiController {
     protected ctx: Context;
+    constructor();
+    private getLocalPaths;
+    private initNotFoundList;
     private responseLocalFile;
     proxyStaticFile(ossName: string, relativePath: string): Promise<string>;
     saveNotFoundList(): Promise<void>;

package/dist/controller/gateway/StaticController.js

@@ -20,17 +20,17 @@ const fs2 = require("fs");
 const path = require("path");
 const https = require("https");
 const functions_1 = require("../../libs/utils/functions");
-const localDir = path.join(__dirname, '../../../public/static'); // 本地文件存储目录
-const notFoundListFile = path.join(localDir, '__404__list.json'); // 404列表文件
 function getPathConfig(ossName) {
     const remoteBaseUrlMap = {
         "cdnjsx": 'https://cdnjsx.oss-cn-shanghai.aliyuncs.com',
         "i.alicdn.com": "https://i.alicdn.com",
         "img.alicdn.com": "https://img.alicdn.com",
+        "at.alicdn.com": "https://at.alicdn.com",
     };
-    const remoteBaseUrl = remoteBaseUrlMap[ossName];
+    let remoteBaseUrl = remoteBaseUrlMap[ossName];
     if (!remoteBaseUrl) {
-        throw new Error(`ossName: ${ossName} 未配置`);
+        console.error(`getPathConfig ossName: ${ossName} 未配置`);
+        remoteBaseUrl = `https://${ossName}`;
     }
     return {
         remoteBaseUrl,
@@ -38,26 +38,43 @@ function getPathConfig(ossName) {
 }
 // 404列表缓存
 let notFoundList = new Set();
-// 初始化：加载404列表
-async function init() {
-    try {
-        // 确保本地存储目录存在
-        await fs.mkdir(localDir, { recursive: true });
-        const data = await fs.readFile(notFoundListFile, 'utf8');
-        notFoundList = new Set(JSON.parse(data));
-        console.log(`已加载${notFoundList.size}个404记录`);
-    }
-    catch (error) {
-        if (error.code !== 'ENOENT') {
-            console.error('读取404列表失败:', error);
-        }
-    }
-}
-init();
+let notFoundListIsInit = false;
 /**
  * 静态文件代理功能
  */
 let StaticController = class StaticController extends BaseApiController_1.BaseApiController {
+    constructor() {
+        super();
+        this.initNotFoundList();
+    }
+    getLocalPaths() {
+        const appDir = this.app.getAppDir();
+        const localDir = path.join(appDir, './public/static'); // 本地文件存储目录
+        const notFoundListFile = path.join(localDir, '__404__list.json'); // 404列表文件
+        return {
+            localDir,
+            notFoundListFile
+        };
+    }
+    async initNotFoundList() {
+        if (notFoundListIsInit) {
+            return;
+        }
+        notFoundListIsInit = true;
+        const { localDir, notFoundListFile } = this.getLocalPaths();
+        try {
+            // 确保本地存储目录存在
+            await fs.mkdir(localDir, { recursive: true });
+            const data = await fs.readFile(notFoundListFile, 'utf8');
+            notFoundList = new Set(JSON.parse(data));
+            console.log(`已加载${notFoundList.size}个404记录`);
+        }
+        catch (error) {
+            if (error.code !== 'ENOENT') {
+                console.error('读取404列表失败:', error);
+            }
+        }
+    }
     async responseLocalFile(localFilePath, localHeaderPath, relativePath) {
         const headers = {
             "Cache-Control": 'public, max-age=31536000',
@@ -107,6 +124,7 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         return false;
     }
     async proxyStaticFile(ossName, relativePath) {
+        const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
         // 构建本地路径和远程路径
         const localFilePath = path.join(localDir, ossName, "files", relativePath);
@@ -161,6 +179,7 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
     }
     // 保存404列表
     async saveNotFoundList() {
+        const { notFoundListFile } = this.getLocalPaths();
         try {
             // 确保存储404列表的目录存在
             const dir = path.dirname(notFoundListFile);
@@ -260,6 +279,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], StaticController.prototype, "proxyStaticFile", null);
 StaticController = __decorate([
-    (0, core_1.Controller)('/ns/static')
+    (0, core_1.Controller)('/ns/static'),
+    __metadata("design:paramtypes", [])
 ], StaticController);
 exports.StaticController = StaticController;

package/dist/controller/home.controller.js

@@ -31,13 +31,13 @@ let HomeController = class HomeController extends BaseApiController_1.BaseApiCon
         }
         const html_content = workbenchInfo.html_content || '未配置HTML模版';
         const userInfo = this.getUserSessionInfo();
-        const fatcmscsrftoken = await crypto_utils_1.privateAES.time_encrypt_utf8_base64("" + Date.now());
+        const fatcmscsrftoken = await crypto_utils_1.privateAES.time_encrypt_utf8_base64('' + Date.now());
         const utils = (0, render_utils_1.createRenderUtils)({
             ctx: this.ctx,
             userInfo,
             workbenchInfo,
             package_assets: workbenchInfo.package_assets,
-            fatcmscsrftoken
+            fatcmscsrftoken,
         });
         return this.ctx.renderString(html_content, { workbenchInfo, userInfo, utils }, { viewEngine: 'ejs' });
     }

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 {