From c6c19cb7da0b544bf451e87cac49830ac6ba99ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B9=8F?= <commdev666@163.com>
Date: Fri, 17 Mar 2023 14:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=A3=E6=9E=90=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/base/service/sys/menu.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/modules/base/service/sys/menu.ts b/src/modules/base/service/sys/menu.ts
index cf5c5b8..a51a50f 100644
--- a/src/modules/base/service/sys/menu.ts
+++ b/src/modules/base/service/sys/menu.ts
@@ -202,11 +202,12 @@ export class BaseSysMenuService extends BaseService {
     );
     eval(code);
     await tempDataSource.buildMetadatas();
-    const columns = tempDataSource.getMetadata(className).columns;
+    const columnArr = tempDataSource.getMetadata(className).columns;
     await tempDataSource.destroy();
     const fileName = await this.fileName(controller);
-    return {
-      columns: columns.map(e => {
+    const commColums = [];
+    const columns = _.filter(
+      columnArr.map(e => {
         return {
           propertyName: e.propertyName,
           type: typeof e.type == 'string' ? e.type : e.type.name.toLowerCase(),
@@ -215,6 +216,15 @@ export class BaseSysMenuService extends BaseService {
           nullable: e.isNullable,
         };
       }),
+      o => {
+        if (['createTime', 'updateTime'].includes(o.propertyName)) {
+          commColums.push(o);
+        }
+        return o && !['createTime', 'updateTime'].includes(o.propertyName);
+      }
+    ).concat(commColums);
+    return {
+      columns,
       path: `/admin/${module}/${fileName}`,
     };
   }