midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.22

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",
+        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,30 +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 {
+    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',
-            "Expires": new Date(Date.now() + 31536000000).toUTCString()
+            'Cache-Control': 'public, max-age=31536000',
+            Expires: new Date(Date.now() + 31536000000).toUTCString(),
         };
         try {
             // 检查本地文件是否存在.头文件
@@ -70,16 +83,17 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
                 const headerDataStr = await fs.readFile(localHeaderPath, 'utf8');
                 const headerData = (0, functions_1.parseJsonObject)(headerDataStr);
                 if (headerData) {
-                    headers["content-type"] = headerData["content-type"];
-                    headers["content-length"] = headerData["content-length"];
-                    headers["last-modified"] = headerData["last-modified"];
-                    headers["etag"] = headerData["etag"];
-                    headers["cache-control"] = headerData["cache-control"];
-                    headers["accept-ranges"] = headerData["accept-ranges"];
+                    headers['content-type'] = headerData['content-type'];
+                    headers['content-length'] = headerData['content-length'];
+                    headers['last-modified'] = headerData['last-modified'];
+                    headers['etag'] = headerData['etag'];
+                    headers['cache-control'] = headerData['cache-control'];
+                    headers['accept-ranges'] = headerData['accept-ranges'];
                 }
             }
         }
         catch (error) {
+            console.debug('[StaticController]responseLocalFile', error);
         }
         try {
             // 检查本地文件是否存在
@@ -107,10 +121,12 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         return false;
     }
     async proxyStaticFile(ossName, relativePath) {
+        this.initNotFoundList();
+        const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
         // 构建本地路径和远程路径
-        const localFilePath = path.join(localDir, ossName, "files", relativePath);
-        const localHeaderPath = path.join(localDir, ossName, "headers", relativePath);
+        const localFilePath = path.join(localDir, 'files', ossName, relativePath);
+        const localHeaderPath = path.join(localDir, 'headers', ossName, relativePath);
         const remoteUrl = `${PATH_CONFIG.remoteBaseUrl}/${relativePath}`;
         // 检查是否在404列表中
         if (notFoundList.has(relativePath)) {
@@ -157,10 +173,11 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
             return this.ctx.render('500', { errorMsg: msg });
         }
         this.ctx.status = 500;
-        return this.ctx.render('500', { errorMsg: "未知异常" });
+        return this.ctx.render('500', { errorMsg: '未知异常' });
     }
     // 保存404列表
     async saveNotFoundList() {
+        const { notFoundListFile } = this.getLocalPaths();
         try {
             // 确保存储404列表的目录存在
             const dir = path.dirname(notFoundListFile);
@@ -174,13 +191,15 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
     // 封装https请求为异步函数
     async httpsGet(url) {
         return new Promise((resolve, reject) => {
-            https.get(url, (res) => {
+            https
+                .get(url, res => {
                 resolve({
                     statusCode: res.statusCode || 500,
                     headers: res.headers,
-                    body: res
+                    body: res,
                 });
-            }).on('error', (err) => {
+            })
+                .on('error', err => {
                 reject(err);
             });
         });
@@ -203,11 +222,11 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
             // 使用管道将响应流写入文件
             await new Promise((resolve, reject) => {
                 body.pipe(fileStream);
-                body.on('error', (err) => {
+                body.on('error', err => {
                     reject(new Error(`读取响应流失败: ${err.message}`));
                 });
                 fileStream.on('finish', resolve);
-                fileStream.on('error', (err) => {
+                fileStream.on('error', err => {
                     reject(new Error(`写入文件失败: ${err.message}`));
                 });
             });
@@ -242,7 +261,7 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
             '.txt': 'text/plain',
             '.pdf': 'application/pdf',
             '.mp4': 'video/mp4',
-            '.ico': 'image/x-icon'
+            '.ico': 'image/x-icon',
         };
         return mimeTypes[extname] || 'application/octet-stream';
     }

package/dist/controller/helpers.controller.d.ts

@@ -3,7 +3,7 @@ import { Context } from '@midwayjs/koa';
 import { CurdMixService } from '../service/curd/CurdMixService';
 import { CommonResult } from '../libs/utils/common-dto';
 export declare class HelpersApi {
-    ctx: Context;
+    protected ctx: Context;
     private midwayWebRouterService;
     protected curdMixService: CurdMixService;
     getApiEnv(): Promise<{

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/AnyApiMangeApi.js

@@ -46,14 +46,14 @@ let AnyApiMangeApi = class AnyApiMangeApi extends BaseApiController_1.BaseApiCon
         fixBodyData(this.ctx.request.body);
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_anyapi, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteAnyApi() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_anyapi, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/AppLogMangeApi.js

@@ -34,7 +34,7 @@ let AppLogMangeApi = class AppLogMangeApi extends BaseApiController_1.BaseApiCon
     async updateAppLog() {
         return this.executeSysSimpleSQL('sys_app_log', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -42,7 +42,7 @@ let AppLogMangeApi = class AppLogMangeApi extends BaseApiController_1.BaseApiCon
     async deleteAppLog() {
         return this.executeSysSimpleSQL('sys_app_log', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

package/dist/controller/manage/AppMangeApi.js

@@ -34,7 +34,7 @@ let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiControlle
     async updateApp() {
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -42,7 +42,7 @@ let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiControlle
     async deleteApp() {
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

package/dist/controller/manage/AppPageMangeApi.js

@@ -35,14 +35,14 @@ let AppPageMangeApi = class AppPageMangeApi extends BaseApiController_1.BaseApiC
     async updateAppPage() {
         return this.executeSysSimpleSQL('sys_app_page', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteAppPage() {
         return this.executeSysSimpleSQL('sys_app_page', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/AppSchemaHistoryApi.js

@@ -31,14 +31,14 @@ let AppSchemaHistoryApi = class AppSchemaHistoryApi extends BaseApiController_1.
     async updateAppSchemaHistory() {
         return this.executeSysSimpleSQL(tableName, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteAppSchemaHistory() {
         return this.executeSysSimpleSQL(tableName, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/CrudMethodsMangeApi.js

@@ -32,14 +32,14 @@ let CrudMethodsMangeApi = class CrudMethodsMangeApi extends BaseApiController_1.
     async updateCrudMethod() {
         return this.executeSysSimpleSQL('sys_crud_methods', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }
     async deleteCrudMethod() {
         return this.executeSysSimpleSQL('sys_crud_methods', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

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

@@ -1,6 +1,6 @@
 import { BaseApiController } from '../base/BaseApiController';
 import { SqlDbType } from '../../libs/crud-pro/models/keys';
-import { CommonResult } from "../../libs/utils/common-dto";
+import { CommonResult } from '../../libs/utils/common-dto';
 export declare class CrudStandardDesignApi extends BaseApiController {
     private mysql2Config;
     private postgres2Config;

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,10 @@ 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,
@@ -53,7 +55,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const res = await this.curdMixService.executeSQL({
             executeSql: 'SHOW TABLES',
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const arr = JSON.parse(JSON.stringify(res));
@@ -65,7 +67,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 label: tableName,
                 dbName,
                 dbType,
-                tableName
+                tableName,
             };
         });
         return common_dto_1.CommonResult.successRes(tableNames);
@@ -82,13 +84,13 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const tableDescribe = await this.curdMixService.executeSQL({
             executeSql: 'describe ' + tableName,
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const tableCreate = await this.curdMixService.executeSQL({
             executeSql: 'show create table ' + tableName,
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const tableCreateStr = tableCreate[0]['Create Table'];
@@ -131,17 +133,14 @@ 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,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [],
         });
@@ -150,8 +149,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,70 +159,73 @@ 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,
+                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);
+            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,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [],
         });
@@ -232,11 +235,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 +251,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,12 +262,12 @@ 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,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [schemaname, tableName],
         });
@@ -274,11 +277,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/dist/controller/manage/DataDictManageApi.d.ts

@@ -1,7 +1,7 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
 export declare class DataDictManageApi extends BaseApiController {
-    ctx: Context;
+    protected ctx: Context;
     getDataDictList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getDataDictOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     createDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/DataDictManageApi.js

@@ -32,7 +32,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
     async updateDataDict() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

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

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import { CommonResult } from "../../libs/utils/common-dto";
+import { CommonResult } from '../../libs/utils/common-dto';
 export declare class DeployManageApi extends BaseApiController {
     protected ctx: Context;
     private fileCenterService;