cc-core-cli 1.0.56 → 1.0.58

package/template/admin/public/static/styles/layout.less

@@ -43,7 +43,7 @@ html {
 
     .main-body {
         padding: 0 26px;
-        display :grid;
+        display: grid;
         // width: calc(100% - 250px);
 
         &.collapsed {
@@ -280,7 +280,7 @@ html {
         .ant-card-body {
             border: none;
             // padding: 12px 16px;
-            padding : 0px;
+            padding: 0px;
             .ant-page-header {
                 padding: 0;
             }
@@ -313,7 +313,8 @@ html {
             }
 
             .ant-breadcrumb-link {
-                a {
+                cursor: pointer;
+                .hover-link-breadcrumb {
                     color: @text-color;
 
                     &:hover {
@@ -420,11 +421,10 @@ html {
     &.sider-collapsed {
         z-index: 12;
         // position: absolute;
-        
 
         .header-title,
         .icon-collapsed {
-            display: none !important ;                                                                   
+            display: none !important ;
         }
 
         .logo-collapsed {
@@ -466,21 +466,20 @@ html {
         }
 
         &:hover {
-            
             .header-title,
-            .icon-collapsed {                
-                display: inline-block !important;                                      
-                justify-content: flex-end;                
+            .icon-collapsed {
+                display: inline-block !important;
+                justify-content: flex-end;
             }
             .icon-collapsed {
-                justify-content: flex-end;     
+                justify-content: flex-end;
                 display: flex !important;
             }
 
             .logo-collapsed {
                 width: 80%;
             }
-            
+
             .main-sider {
                 .ant-menu {
                     .ant-menu-submenu
@@ -537,17 +536,17 @@ html {
             .label {
                 white-space: nowrap;
                 overflow: hidden;
-                text-overflow: ellipsis;            
+                text-overflow: ellipsis;
                 font-size: 15px;
                 font-weight: 500;
-            }                       
+            }
         }
 
-        .icon-collapsed {            
-            padding: 0px !important;   
+        .icon-collapsed {
+            padding: 0px !important;
             justify-content: flex-end;
             display: flex;
-                                
+
             .anticon {
                 svg {
                     cursor: pointer;
@@ -571,9 +570,9 @@ html {
     }
 
     .main-sider {
-        height: calc(100vh - 68px);        
+        height: calc(100vh - 68px);
         overflow: auto;
-        // width: 250px;        
+        // width: 250px;
         transition: width 0.2s;
         z-index: 12;
 
@@ -1247,8 +1246,6 @@ html {
     background-color: @primary-color !important;
 }
 
-
-
 // ********* custom menu Lv4-5 **********
 
 .layouts-card-header {
@@ -1257,31 +1254,34 @@ html {
     }
 }
 
-.layouts-sub-sider-horizontal {    
+.layouts-sub-sider-horizontal {
     border-top: solid 1px #e9e9e9;
-    .ant-menu {       
-        .ant-menu-item {            
-            padding: 0px !important;            
-            margin-top: 0;            
-        }        
+    .ant-menu {
+        .ant-menu-item {
+            padding: 0px !important;
+            margin-top: 0;
+        }
     }
-    
+
     .ant-menu-submenu-title {
         .menu-label {
             transition: padding 0.2s;
-        }        
+        }
     }
 
     .ant-typography.ant-typography-secondary {
-        color: @menu-item-color;     
+        color: @menu-item-color;
     }
 
-    .ant-menu-item .ant-menu-item-icon, .ant-menu-submenu-title .ant-menu-item-icon, .ant-menu-item .anticon, .ant-menu-submenu-title .anticon{
+    .ant-menu-item .ant-menu-item-icon,
+    .ant-menu-submenu-title .ant-menu-item-icon,
+    .ant-menu-item .anticon,
+    .ant-menu-submenu-title .anticon {
         margin-right: 5px !important;
     }
-    
+
     .ant-menu-item {
-        a {            
+        a {
             color: @menu-item-color;
 
             &:hover {
@@ -1293,48 +1293,59 @@ html {
         color: @menu-item-active-bg;
     }
 
-    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item:hover, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu:hover, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-active, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-active, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-open, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-open, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-selected, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-selected {
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item:hover,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu:hover,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-active,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-active,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-open,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-open,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-selected,
+    .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-selected {
         color: @menu-item-active-bg !important;
         border-bottom: 2px solid @menu-item-active-bg !important;
     }
 
-    .ant-menu-item:hover, .ant-menu-item-active, .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, .ant-menu-submenu-active, .ant-menu-submenu-title:hover {
-        color: @menu-item-group-title-color !important;        
+    .ant-menu-item:hover,
+    .ant-menu-item-active,
+    .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open,
+    .ant-menu-submenu-active,
+    .ant-menu-submenu-title:hover {
+        color: @menu-item-group-title-color !important;
     }
-    
 }
 
 .menu-item-a {
-    display: block !important;    
+    display: block !important;
 }
 
 .sum-menu-item {
     .ant-menu.ant-menu-sub.ant-menu-vertical {
-        background-color: @menu-popup-bg !important;    
-        border-radius: 0px !important;    
+        background-color: @menu-popup-bg !important;
+        border-radius: 0px !important;
     }
 
-    .ant-menu-item-selected a, .ant-menu-item-selected a:hover {
+    .ant-menu-item-selected a,
+    .ant-menu-item-selected a:hover {
         color: @menu-item-active-bg;
     }
 
-    .ant-menu-item-selected a, .ant-menu-item-selected a {
-        color:@menu-item-active-bg;
+    .ant-menu-item-selected a,
+    .ant-menu-item-selected a {
+        color: @menu-item-active-bg;
     }
 
     .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
-        background-color: unset !important;                
+        background-color: unset !important;
     }
 
     .ant-menu-item a:hover {
-        color:  @menu-item-active-bg;
+        color: @menu-item-active-bg;
     }
 }
 
 // ********* end custom menu Lv4-5 **********
 
-
-// 
+//
 .drawer-menu-resize {
     display: flex;
     position: relative;
@@ -1350,16 +1361,46 @@ html {
         z-index: 100;
     }
 
-    .drawer-content {            
-        overflow: auto;     
-        transition: width 0.2s; 
+    .drawer-content {
+        overflow: auto;
+        transition: width 0.2s;
     }
     .open-drawer {
         transition: width 0.2s;
     }
-    
 }
 
 .drawer-menu-resize-collapsed {
-    transition: transform .3s cubic-bezier(0, .52, 0, 1);    
-}
+    transition: transform 0.3s cubic-bezier(0, 0.52, 0, 1);
+}
+
+.draggable-tree {
+    .ant-tree-switcher_close {
+        display: none;
+    }
+
+    .ant-tree-switcher-noop {
+        display: none;
+    }
+
+    .ant-tree-switcher_open {
+        display: none;
+    }
+
+    .icon-collapse-render {
+        display: flex;
+        width: 12px;
+        padding: 15px;
+        align-items: center;
+        justify-content: center;
+        flex: 0 0 auto;
+        touch-action: none;
+        cursor: var(--cursor, pointer);
+        border-radius: 5px;
+        border: none;
+        outline: none;
+        appearance: none;
+        background-color: transparent;
+        -webkit-tap-highlight-color: transparent;
+    }
+}

package/template/core/src/app_cluster.service.ts

@@ -34,6 +34,7 @@ export class AppClusterService {
           `A worker is now connected to ${address.address}:${address.port}`
         );
         const http: AxiosInstance = axios.create();
+        http.get(`${CONST.INTERNAL_DOMAIN}/entities/init_data`);
         http.get(`${CONST.INTERNAL_DOMAIN}/user_role/reload_system`);
         http.get(`${CONST.INTERNAL_DOMAIN}/translate/generate`);
         http.get(`${CONST.INTERNAL_DOMAIN}/setting/update_version`);

package/template/core/src/core/core.controller.ts

@@ -37,7 +37,7 @@ export class CoreController {
   @Get("/:entity/init")
   async init(@Param() params: any): Promise<string> {
     if (
-      !["mail_setting", "sftp_setting"].includes(params.entity) &&
+      !["mail_setting"].includes(params.entity) &&
       params.entity.indexOf("_setting") !== -1
     ) {
       return "Not implement yet.";
@@ -45,6 +45,11 @@ export class CoreController {
     return this.service.init(params.entity);
   }
 
+  @Get("/:entity/init_data")
+  async initData(@Param() params: any): Promise<void> {
+    await this.service.initData(params.entity);
+  }
+
   @Basic()
   @Get("/:entity")
   async search(
@@ -52,7 +57,7 @@ export class CoreController {
     @Query() query: any
   ): Promise<SearchResultDto> {
     if (
-      !["mail_setting", "sftp_setting"].includes(params.entity) &&
+      !["mail_setting"].includes(params.entity) &&
       params.entity.indexOf("_setting") !== -1
     ) {
       return this.serviceSetting.getSetting(params.entity);
@@ -150,7 +155,7 @@ export class CoreController {
     @Query() query: any
   ): Promise<any> {
     if (
-      !["mail_setting", "sftp_setting"].includes(params.entity) &&
+      !["mail_setting"].includes(params.entity) &&
       params.entity.indexOf("_setting") !== -1
     ) {
       return this.serviceSetting.getSetting(params.entity, params.key);

package/template/core/src/core/core.module.ts

@@ -15,6 +15,7 @@ import {
   ApiKeyModule,
   AttachmentModule,
   CommentDataModule,
+  CompanyModule,
   CustomFunctionModule,
   DeployModule,
   ExecutionLogModule,
@@ -58,6 +59,7 @@ const RUN_CUSTOM_MODULES =
     AttachmentModule,
     AuditLogModule,
     CommentDataModule,
+    CompanyModule,
     CustomFunctionModule,
     DeployModule,
     ExecutionLogModule,

package/template/core/src/core/core.service.ts

@@ -17,6 +17,7 @@ import {
   AuditLogService,
   CommentDataService,
   CustomFunctionService,
+  CompanyService,
   AddressService,
   CountryService,
   ProvinceService,
@@ -166,6 +167,7 @@ export class CoreService implements OnModuleInit {
   @Inject(CommentDataService)
   private readonly _commentDataService: CommentDataService;
   @Inject(CountryService) private readonly _countryService: CountryService;
+  @Inject(CompanyService) private readonly _companyService: CompanyService;
   @Inject(CustomFunctionService)
   private readonly _customFunctionService: CustomFunctionService;
   @Inject(DeployDestinationService)
@@ -272,6 +274,8 @@ export class CoreService implements OnModuleInit {
         return this._commentDataService;
       case "country":
         return this._countryService;
+      case "company":
+        return this._companyService;
       case "custom_function":
         return this._customFunctionService;
       case "deploy_destination":
@@ -367,6 +371,11 @@ export class CoreService implements OnModuleInit {
     return service.init();
   }
 
+  public async initData(entityName: string): Promise<void> {
+    const service = await this._getService(entityName);
+    await service.initData();
+  }
+
   public async search(
     entityName: string,
     keywords: string,

package/template/core/src/main.ts

@@ -144,7 +144,6 @@ async function initial(app: NestFastifyApplication) {
   await initialService(app, LanguageService);
   await initialService(app, TranslateService);
   await initialService(app, ActivityLogService);
-  await initialService(app, TemplateService);
   await initialService(app, AttachmentService);
   await initialService(app, AuditLogService);
 
@@ -196,6 +195,7 @@ async function initial(app: NestFastifyApplication) {
 
   await initialCustomService(app);
 
+  await initialService(app, TemplateService);
   await initialService(app, ImportExportService);
   await initialService(app, ImportExportLogService);