midway-fatcms 0.0.3 → 0.0.4

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -1,267 +1,267 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrudStandardDesignApi = void 0;
-const core_1 = require("@midwayjs/core");
-const BaseApiController_1 = require("../base/BaseApiController");
-const parseCreateSql_1 = require("../../libs/utils/parseCreateSql");
-const permission_middleware_1 = require("../../middleware/permission.middleware");
-const SystemPerm_1 = require("../../models/SystemPerm");
-const keys_1 = require("../../libs/crud-pro/models/keys");
-const SystemTables_1 = require("../../models/SystemTables");
-const exceptions_1 = require("../../libs/crud-pro/exceptions");
-const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
-const common_dto_1 = require("../../libs/utils/common-dto");
-function getObjectKeysWithValue(obj) {
-    const keys = Object.keys(obj || {});
-    return keys.filter((key) => {
-        const valueObj = obj[key];
-        const valueKeys = Object.keys(valueObj || {});
-        return valueKeys.length > 0;
-    });
-}
-let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiController_1.BaseApiController {
-    async getDataBaseList() {
-        const mysqlList = getObjectKeysWithValue(this.mysql2Config);
-        const postgresList = getObjectKeysWithValue(this.postgres2Config);
-        const sqlServerList = getObjectKeysWithValue(this.sqlserver2Config);
-        const toSelectList = (dbCfgNameList, dbType) => {
-            return dbCfgNameList.map(dbName => {
-                const value = (0, DatabaseName_1.toDatabaseNameStr)(dbType, dbName);
-                return { value, label: value, dbName, dbType };
-            });
-        };
-        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].filter((obj) => {
-            const value = '' + obj.value;
-            return !value.endsWith('_fatcms_inner_demo_config');
-        });
-        return {
-            success: true,
-            data: databaseList,
-        };
-    }
-    async getTableList() {
-        const { databaseName } = this.ctx.request.body;
-        const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
-        if (dbType === keys_1.SqlDbType.postgres) {
-            return this.getTableListOfPostgreSQL(dbName);
-        }
-        if (dbType === keys_1.SqlDbType.sqlserver) {
-            return this.getTableListOfSqlserver(dbName);
-        }
-        const res = await this.curdMixService.executeSQL({
-            executeSql: 'SHOW TABLES',
-            sqlDatabase: dbName,
-            sqlDbType: keys_1.SqlDbType.mysql,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-        });
-        const arr = JSON.parse(JSON.stringify(res));
-        const tableNames = arr.map(a => {
-            const v = Object.values(a);
-            const tableName = v[0];
-            return {
-                value: tableName,
-                label: tableName,
-                dbName,
-                dbType,
-                tableName,
-            };
-        });
-        return common_dto_1.CommonResult.successRes(tableNames);
-    }
-    async getTableFields() {
-        const { databaseName, tableName } = this.ctx.request.body;
-        const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
-        if (dbType === keys_1.SqlDbType.postgres) {
-            return this.getTableFieldsOfPostgreSQL(dbName, tableName);
-        }
-        if (dbType === keys_1.SqlDbType.sqlserver) {
-            return this.getTableFieldsOfSqlServer(dbName, tableName);
-        }
-        const tableDescribe = await this.curdMixService.executeSQL({
-            executeSql: 'describe ' + tableName,
-            sqlDatabase: dbName,
-            sqlDbType: keys_1.SqlDbType.mysql,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-        });
-        const tableCreate = await this.curdMixService.executeSQL({
-            executeSql: 'show create table ' + tableName,
-            sqlDatabase: dbName,
-            sqlDbType: keys_1.SqlDbType.mysql,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-        });
-        const tableCreateStr = tableCreate[0]['Create Table'];
-        const { fieldsTitleMap, tableTitle } = (0, parseCreateSql_1.parseCreateSqlToTitleMap)(tableCreateStr);
-        const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
-        const fields = tableDescribe2.map(fieldObj => {
-            const { Default, Extra, Field, Key, Null, Type } = fieldObj;
-            const fieldTitle = fieldsTitleMap[Field];
-            return {
-                fieldIndex: Field || '',
-                fieldTitle: fieldTitle || Field || '',
-                isNullable: Null,
-                defaultValue: Default,
-                extra: Extra,
-                key: Key,
-                type: Type,
-            };
-        });
-        return {
-            success: true,
-            data: {
-                fields,
-                tableName,
-                tableTitle,
-            },
-        };
-    }
-    /**
-     * 获取角色列表
-     */
-    async getRoleOptionsList() {
-        return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_perm_role, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
-    }
-    /**
-     * 获取功能点列表
-     */
-    async getFuncOptionsList() {
-        return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_perm_func, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
-    }
-    async getTableListOfSqlserver(dbName) {
-        const dbConfig = this.sqlserver2Config[dbName];
-        if (!dbConfig) {
-            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-        }
-        const dbType = keys_1.SqlDbType.sqlserver;
-        const sql = 'SELECT name as tablename FROM sys.tables';
-        const arr = await this.curdMixService.executeSQL({
-            executeSql: sql,
-            sqlDatabase: dbName,
-            sqlDbType: 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);
-    }
-    async getTableListOfPostgreSQL(dbName) {
-        const dbConfig = this.postgres2Config[dbName];
-        if (!dbConfig) {
-            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-        }
-        const dbType = keys_1.SqlDbType.postgres;
-        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,
-                sqlDbType: 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);
-        }
-        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;';
-        const dbType = keys_1.SqlDbType.sqlserver;
-        const columnArray = await this.curdMixService.executeSQL({
-            executeSql: columnArraySql,
-            sqlDatabase: dbName,
-            sqlDbType: dbType,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-            executeSqlArgs: [],
-        });
-        const fields = columnArray.map(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 || '',
-                isNullable: is_nullable,
-                defaultValue: column_default || '',
-                extra: others,
-                // key: column_name, // 索引
-                type: data_type,
-                is_identity: is_identity,
-            };
-        });
-        return common_dto_1.CommonResult.successRes({
-            fields,
-            tableName,
-            tableTitle: tableName,
-        });
-    }
-    async getTableFieldsOfPostgreSQL(dbName, tableName) {
-        const dbConfig = this.postgres2Config[dbName];
-        if (!dbConfig) {
-            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
-        }
-        const schemaname = 'public';
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudStandardDesignApi = void 0;
+const core_1 = require("@midwayjs/core");
+const BaseApiController_1 = require("../base/BaseApiController");
+const parseCreateSql_1 = require("../../libs/utils/parseCreateSql");
+const permission_middleware_1 = require("../../middleware/permission.middleware");
+const SystemPerm_1 = require("../../models/SystemPerm");
+const keys_1 = require("../../libs/crud-pro/models/keys");
+const SystemTables_1 = require("../../models/SystemTables");
+const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const common_dto_1 = require("../../libs/utils/common-dto");
+function getObjectKeysWithValue(obj) {
+    const keys = Object.keys(obj || {});
+    return keys.filter((key) => {
+        const valueObj = obj[key];
+        const valueKeys = Object.keys(valueObj || {});
+        return valueKeys.length > 0;
+    });
+}
+let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiController_1.BaseApiController {
+    async getDataBaseList() {
+        const mysqlList = getObjectKeysWithValue(this.mysql2Config);
+        const postgresList = getObjectKeysWithValue(this.postgres2Config);
+        const sqlServerList = getObjectKeysWithValue(this.sqlserver2Config);
+        const toSelectList = (dbCfgNameList, dbType) => {
+            return dbCfgNameList.map(dbName => {
+                const value = (0, DatabaseName_1.toDatabaseNameStr)(dbType, dbName);
+                return { value, label: value, dbName, dbType };
+            });
+        };
+        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].filter((obj) => {
+            const value = '' + obj.value;
+            return !value.endsWith('_fatcms_inner_demo_config');
+        });
+        return {
+            success: true,
+            data: databaseList,
+        };
+    }
+    async getTableList() {
+        const { databaseName } = this.ctx.request.body;
+        const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
+        if (dbType === keys_1.SqlDbType.postgres) {
+            return this.getTableListOfPostgreSQL(dbName);
+        }
+        if (dbType === keys_1.SqlDbType.sqlserver) {
+            return this.getTableListOfSqlserver(dbName);
+        }
+        const res = await this.curdMixService.executeSQL({
+            executeSql: 'SHOW TABLES',
+            sqlDatabase: dbName,
+            sqlDbType: keys_1.SqlDbType.mysql,
+            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+        });
+        const arr = JSON.parse(JSON.stringify(res));
+        const tableNames = arr.map(a => {
+            const v = Object.values(a);
+            const tableName = v[0];
+            return {
+                value: tableName,
+                label: tableName,
+                dbName,
+                dbType,
+                tableName,
+            };
+        });
+        return common_dto_1.CommonResult.successRes(tableNames);
+    }
+    async getTableFields() {
+        const { databaseName, tableName } = this.ctx.request.body;
+        const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
+        if (dbType === keys_1.SqlDbType.postgres) {
+            return this.getTableFieldsOfPostgreSQL(dbName, tableName);
+        }
+        if (dbType === keys_1.SqlDbType.sqlserver) {
+            return this.getTableFieldsOfSqlServer(dbName, tableName);
+        }
+        const tableDescribe = await this.curdMixService.executeSQL({
+            executeSql: 'describe ' + tableName,
+            sqlDatabase: dbName,
+            sqlDbType: keys_1.SqlDbType.mysql,
+            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+        });
+        const tableCreate = await this.curdMixService.executeSQL({
+            executeSql: 'show create table ' + tableName,
+            sqlDatabase: dbName,
+            sqlDbType: keys_1.SqlDbType.mysql,
+            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+        });
+        const tableCreateStr = tableCreate[0]['Create Table'];
+        const { fieldsTitleMap, tableTitle } = (0, parseCreateSql_1.parseCreateSqlToTitleMap)(tableCreateStr);
+        const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
+        const fields = tableDescribe2.map(fieldObj => {
+            const { Default, Extra, Field, Key, Null, Type } = fieldObj;
+            const fieldTitle = fieldsTitleMap[Field];
+            return {
+                fieldIndex: Field || '',
+                fieldTitle: fieldTitle || Field || '',
+                isNullable: Null,
+                defaultValue: Default,
+                extra: Extra,
+                key: Key,
+                type: Type,
+            };
+        });
+        return {
+            success: true,
+            data: {
+                fields,
+                tableName,
+                tableTitle,
+            },
+        };
+    }
+    /**
+     * 获取角色列表
+     */
+    async getRoleOptionsList() {
+        return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_perm_role, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+    }
+    /**
+     * 获取功能点列表
+     */
+    async getFuncOptionsList() {
+        return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_perm_func, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+    }
+    async getTableListOfSqlserver(dbName) {
+        const dbConfig = this.sqlserver2Config[dbName];
+        if (!dbConfig) {
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
+        }
+        const dbType = keys_1.SqlDbType.sqlserver;
+        const sql = 'SELECT name as tablename FROM sys.tables';
+        const arr = await this.curdMixService.executeSQL({
+            executeSql: sql,
+            sqlDatabase: dbName,
+            sqlDbType: 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);
+    }
+    async getTableListOfPostgreSQL(dbName) {
+        const dbConfig = this.postgres2Config[dbName];
+        if (!dbConfig) {
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
+        }
+        const dbType = keys_1.SqlDbType.postgres;
+        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,
+                sqlDbType: 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);
+        }
+        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;';
+        const dbType = keys_1.SqlDbType.sqlserver;
+        const columnArray = await this.curdMixService.executeSQL({
+            executeSql: columnArraySql,
+            sqlDatabase: dbName,
+            sqlDbType: dbType,
+            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+            executeSqlArgs: [],
+        });
+        const fields = columnArray.map(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 || '',
+                isNullable: is_nullable,
+                defaultValue: column_default || '',
+                extra: others,
+                // key: column_name, // 索引
+                type: data_type,
+                is_identity: is_identity,
+            };
+        });
+        return common_dto_1.CommonResult.successRes({
+            fields,
+            tableName,
+            tableTitle: tableName,
+        });
+    }
+    async getTableFieldsOfPostgreSQL(dbName, tableName) {
+        const dbConfig = this.postgres2Config[dbName];
+        if (!dbConfig) {
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
+        }
+        const schemaname = 'public';
         const columnArraySql = `
 
     SELECT
@@ -270,46 +270,46 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
       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({
-            executeSql: columnArraySql,
-            sqlDatabase: dbName,
-            sqlDbType: dbType,
-            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: commentMap[column_name] || column_name || '',
-                isNullable: is_nullable,
-                defaultValue: column_default || '',
-                extra: others,
-                // key: column_name, // 索引
-                type: data_type,
-                is_identity: is_identity,
-            };
-        });
-        return {
-            success: true,
-            data: {
-                fields,
-                tableName,
-                tableTitle: tableName,
-            },
-        };
-    }
-    /**
-     * 获取PostgreSQL建表语句的注释
-     * @param dbName
-     * @param schemaname
-     * @param tableName
-     * @returns
-     */
-    async getTableFieldsCommentsMapOfPostgreSQL(dbName, schemaname, tableName) {
+    `.trim();
+        const dbType = keys_1.SqlDbType.postgres;
+        const columnArray = await this.curdMixService.executeSQL({
+            executeSql: columnArraySql,
+            sqlDatabase: dbName,
+            sqlDbType: dbType,
+            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: commentMap[column_name] || column_name || '',
+                isNullable: is_nullable,
+                defaultValue: column_default || '',
+                extra: others,
+                // key: column_name, // 索引
+                type: data_type,
+                is_identity: is_identity,
+            };
+        });
+        return {
+            success: true,
+            data: {
+                fields,
+                tableName,
+                tableTitle: tableName,
+            },
+        };
+    }
+    /**
+     * 获取PostgreSQL建表语句的注释
+     * @param dbName
+     * @param schemaname
+     * @param tableName
+     * @returns
+     */
+    async getTableFieldsCommentsMapOfPostgreSQL(dbName, schemaname, tableName) {
         const commentArraySql = `
             SELECT
                 n.nspname AS schema_name,
@@ -330,66 +330,66 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 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'),
-    __metadata("design:type", Object)
-], CrudStandardDesignApi.prototype, "mysql2Config", void 0);
-__decorate([
-    (0, core_1.Config)('postgres2'),
-    __metadata("design:type", Object)
-], CrudStandardDesignApi.prototype, "postgres2Config", void 0);
-__decorate([
-    (0, core_1.Config)('sqlserver2'),
-    __metadata("design:type", Object)
-], CrudStandardDesignApi.prototype, "sqlserver2Config", void 0);
-__decorate([
-    (0, core_1.Post)('/getDataBaseList'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], CrudStandardDesignApi.prototype, "getDataBaseList", null);
-__decorate([
-    (0, core_1.Post)('/getTableList'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], CrudStandardDesignApi.prototype, "getTableList", null);
-__decorate([
-    (0, core_1.Post)('/getTableFields'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], CrudStandardDesignApi.prototype, "getTableFields", null);
-__decorate([
-    (0, core_1.Post)('/getRoleOptionsList'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], CrudStandardDesignApi.prototype, "getRoleOptionsList", null);
-__decorate([
-    (0, core_1.Post)('/getFuncOptionsList'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], CrudStandardDesignApi.prototype, "getFuncOptionsList", null);
-CrudStandardDesignApi = __decorate([
-    (0, core_1.Controller)('/ns/api/manage/CrudStandardDesignApi', { middleware: [(0, permission_middleware_1.checkPermission)(SystemPerm_1.SystemFuncCode.CrudStandardDesignRead)] })
-], CrudStandardDesignApi);
-exports.CrudStandardDesignApi = CrudStandardDesignApi;
+    `;
+        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'),
+    __metadata("design:type", Object)
+], CrudStandardDesignApi.prototype, "mysql2Config", void 0);
+__decorate([
+    (0, core_1.Config)('postgres2'),
+    __metadata("design:type", Object)
+], CrudStandardDesignApi.prototype, "postgres2Config", void 0);
+__decorate([
+    (0, core_1.Config)('sqlserver2'),
+    __metadata("design:type", Object)
+], CrudStandardDesignApi.prototype, "sqlserver2Config", void 0);
+__decorate([
+    (0, core_1.Post)('/getDataBaseList'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], CrudStandardDesignApi.prototype, "getDataBaseList", null);
+__decorate([
+    (0, core_1.Post)('/getTableList'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], CrudStandardDesignApi.prototype, "getTableList", null);
+__decorate([
+    (0, core_1.Post)('/getTableFields'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], CrudStandardDesignApi.prototype, "getTableFields", null);
+__decorate([
+    (0, core_1.Post)('/getRoleOptionsList'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], CrudStandardDesignApi.prototype, "getRoleOptionsList", null);
+__decorate([
+    (0, core_1.Post)('/getFuncOptionsList'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], CrudStandardDesignApi.prototype, "getFuncOptionsList", null);
+CrudStandardDesignApi = __decorate([
+    (0, core_1.Controller)('/ns/api/manage/CrudStandardDesignApi', { middleware: [(0, permission_middleware_1.checkPermission)(SystemPerm_1.SystemFuncCode.CrudStandardDesignRead)] })
+], CrudStandardDesignApi);
+exports.CrudStandardDesignApi = CrudStandardDesignApi;