Merge pull request #1411 from jumpserver/dev

merge: v4.10.4-lts

Author: baijiangjie

.github/workflows/release-drafter.yml

@@ -42,8 +42,8 @@ jobs:
         run: |
           mkdir -p build
           rm -rf build/*
-          cp -R src/assets/i18n luna/
-          mv luna luna-${{ steps.get_version.outputs.TAG }}
+          cp -R src/assets/i18n dist/luna/
+          mv dist/luna luna-${{ steps.get_version.outputs.TAG }}
           tar -czf luna-${{ steps.get_version.outputs.TAG }}.tar.gz luna-${{ steps.get_version.outputs.TAG }}
           echo $(md5sum luna-${{ steps.get_version.outputs.TAG }}.tar.gz | awk '{print $1}') > build/luna-${{ steps.get_version.outputs.TAG }}.tar.gz.md5
           mv luna-${{ steps.get_version.outputs.TAG }}.tar.gz build/
@@ -57,5 +57,3 @@ jobs:
             build/luna-${{ steps.get_version.outputs.TAG }}.tar.gz.md5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-

angular.json

@@ -49,13 +49,19 @@
             "scripts": [
               "jquery/dist/jquery.min.js",
               "@ztree/ztree_v3/js/jquery.ztree.all.min.js",
-              "@ztree/ztree_v3/js/jquery.ztree.exhide.min.js",
-              "asciinema-player/dist/bundle/asciinema-player.min.js"
+              "@ztree/ztree_v3/js/jquery.ztree.exhide.min.js"
             ]
           },
           "configurations": {
             "production": {
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "baseHref": "/luna/",
               "outputPath": {
@@ -68,8 +74,13 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "5mb",
+                  "maximumWarning": "4mb",
                   "maximumError": "6mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "200kb",
+                  "maximumError": "300kb"
                 }
               ],
               "fileReplacements": [

src/app/app.module.ts

@@ -1,50 +1,47 @@
-import {BrowserModule} from '@angular/platform-browser';
-import {NgModule} from '@angular/core';
-import {HttpClient, provideHttpClient} from '@angular/common/http';
-import {APP_BASE_HREF, CommonModule} from '@angular/common';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms'; // <-- NgModel lives here
-import {NGXLogger} from 'ngx-logger';
-import {CookieService} from 'ngx-cookie-service';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
-import {DragDropModule} from '@angular/cdk/drag-drop';
-import {CodeEditorModule} from '@acrodata/code-editor';
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { HttpClient, provideHttpClient } from '@angular/common/http';
+import { APP_BASE_HREF, CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'; // <-- NgModel lives here
+import { NGXLogger } from 'ngx-logger';
+import { CookieService } from 'ngx-cookie-service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { DragDropModule } from '@angular/cdk/drag-drop';
+import { CodeEditorModule } from '@acrodata/code-editor';
 
 // service
-import {AllServices} from '@app/services';
+import { AllServices } from '@app/services';
 
 // Angular split
-import {AppRouterModule} from './router.module';
-import {SharedPipeModule} from './pipes/pipes';
-import {AppComponent} from './pages/app.component';
-import {ElementComponents} from './elements/elements.component';
-import {PluginModules} from './plugins/plugins';
-import {ClipboardService} from 'ngx-clipboard';
-import {version} from '../environments/environment';
-import {BehaviorSubject, forkJoin, Observable, of} from 'rxjs';
-import {FileInputAccessorModule} from 'file-input-accessor';
-import {catchError, mergeMap} from 'rxjs/operators';
-import {PagesComponents} from './pages/pages.component';
-
+import { AppRouterModule } from './router.module';
+import { SharedPipeModule } from './pipes/pipes';
+import { AppComponent } from './pages/app.component';
+import { ElementComponents } from './elements/elements.component';
+import { PluginModules } from './plugins/plugins';
+import { ClipboardService } from 'ngx-clipboard';
+import { environment, version } from '../environments/environment';
+import { BehaviorSubject, forkJoin, Observable, of } from 'rxjs';
+import { FileInputAccessorModule } from 'file-input-accessor';
+import { catchError, mergeMap } from 'rxjs/operators';
+import { PagesComponents } from './pages/pages.component';
 
 export class CustomLoader implements TranslateLoader {
-
-  constructor(private http: HttpClient) {
-  }
+  constructor(private http: HttpClient) {}
 
   public getTranslation(lang: String): Observable<any> {
     const remote = '/api/v1/settings/i18n/luna/?lang=' + lang + '&v=' + version;
-    const local = '/luna/assets/i18n/' + lang + '.json';
+    let local = '/assets/i18n/' + lang + '.json';
+    const isProd = environment.production;
+    if (isProd) {
+      local = '/luna' + local;
+    }
 
     return forkJoin([
-      this.http.get(remote).pipe(
-        catchError(() => of({}))
-      ),
-      this.http.get(local).pipe(
-        catchError(() => of({}))
-      )
+      this.http.get(remote).pipe(catchError(() => of({}))),
+      this.http.get(local).pipe(catchError(() => of({})))
     ]).pipe(
-      mergeMap((res) => {
+      mergeMap(res => {
         const finalRes = Object.assign({}, res[1], res[0]);
         return new BehaviorSubject(finalRes);
       })
@@ -71,22 +68,17 @@ export class CustomLoader implements TranslateLoader {
         deps: [HttpClient]
       }
     }),
-    ...PluginModules,
+    ...PluginModules
   ],
-  declarations: [
-    AppComponent,
-    ...ElementComponents,
-    ...PagesComponents
-  ] as any[],
+  declarations: [AppComponent, ...ElementComponents, ...PagesComponents] as any[],
   bootstrap: [AppComponent],
   providers: [
     ...AllServices,
-    {provide: APP_BASE_HREF, useValue: '/luna/'},
+    { provide: APP_BASE_HREF, useValue: '/luna/' },
     CookieService,
     NGXLogger,
     ClipboardService,
     provideHttpClient()
   ]
 })
-export class AppModule {
-}
+export class AppModule {}

src/app/elements/asset-tree/asset-tree.component.scss

@@ -23,8 +23,8 @@
     .tree-type-banner {
       position: relative;
       display: flex;
-      height: 31px;
-      line-height: 31px;
+      height: 30px;
+      line-height: 30px;
       padding-right: 11px;
       padding-left: 15px;
       overflow: hidden;
@@ -42,15 +42,15 @@
         .tree-icon-rotate {
           @include flex(center);
           height: 30px;
-          padding-top: 3px;
-          padding-right: 3px;
+          // padding-top: 3px;
+          // padding-right: 3px;
           font-size: 16px;
           color: var(--el-text-color-light);
         }
 
         .tree-type-banner-label {
           margin-left: 7px;
-          padding-top: 2px;
+          // padding-top: 2px;
           font-size: 13px;
           cursor: pointer;
           @include overflowText;
@@ -69,16 +69,16 @@
         // 刷新按钮不需要 padding-right
         .fa-refresh.tree-banner-icon {
           padding-right: 0;
-          margin-top: 2px;
+          // margin-top: 2px;
         }
 
         // 批量操作按钮需要给一些 padding-top 使得看上去垂直居中
         .fa-square-o.tree-banner-icon {
-          padding-top: 2px;
+          // padding-top: 2px;
         }
 
         .fa-check-square.tree-banner-icon {
-          padding-top: 2px;
+          // padding-top: 2px;
         }
 
         .tree-banner-icon {
@@ -143,9 +143,14 @@
       position: relative;
       padding: 5px 10px;
       min-height: 40px;
-      overflow-x: auto;
       height: calc(100% - 31px);
       background-color: var(--el-asset-tree-bg-color);
+      overflow: hidden;
+      scrollbar-gutter: stable both-edges;
+
+      &:hover {
+        overflow: auto;
+      }
 
       .tree-type-loading {
         position: absolute;

src/app/elements/asset-tree/asset-tree.component.ts

@@ -118,6 +118,8 @@ export class ElementAssetTreeComponent implements OnInit {
     const treeChecked = tree.setting && tree.setting.check && tree.setting.check.enable;
     const viewList = this._viewSrv.viewList;
 
+    const isK8s = cnode.meta.data.platform_type === 'k8s';
+
     return [
       {
         id: 'batch-connect',
@@ -130,7 +132,7 @@ export class ElementAssetTreeComponent implements OnInit {
         id: 'connect',
         name: 'Connect',
         fa: 'fa-terminal',
-        hide: cnode.isParent,
+        hide: cnode.isParent || isK8s,
         click: this.onMenuConnect.bind(this)
       },
       {
@@ -144,7 +146,7 @@ export class ElementAssetTreeComponent implements OnInit {
         id: 'split-connect',
         name: 'Split connect',
         fa: 'fa-columns',
-        hide: viewList.length <= 0 || cnode.isParent,
+        hide: viewList.length <= 0 || cnode.isParent || isK8s,
         click: this.onMenuConnect.bind(this, true)
       },
       {
@@ -221,21 +223,27 @@ export class ElementAssetTreeComponent implements OnInit {
   }
 
   handleMenuClick(menu: any) {
-    console.log('menu', menu);
     menu.click();
     this.hideRMenu();
   }
 
   onNodeClick(event, treeId, treeNode, clickFlag) {
     const ztree = this.trees.find(t => t.name === treeId).ztree;
+
     if (treeNode.isParent) {
       ztree.expandNode(treeNode);
       return;
     }
+
     if (treeNode.chkDisabled) {
       this._message.warning(this._i18n.instant('DisabledAsset'));
       return;
     }
+
+    if (treeNode.meta.data.platform_type === 'k8s') {
+      return connectOnNewPage(treeNode, 'auto');
+    }
+
     if (this.isOpenNewWindow) {
       connectOnNewPage(treeNode, 'auto');
     } else {
@@ -574,13 +582,13 @@ export class ElementAssetTreeComponent implements OnInit {
         const i = this.favoriteAssets.indexOf(assetId);
         this.favoriteAssets.splice(i, 1);
         const msg = this._i18n.instant('Disfavor') + ' ' + this._i18n.instant('success');
-        this._toastr.success(msg, '');
+        this._toastr.success(msg, '', { nzClass: 'custom-success-notification' });
       });
     } else {
       this._http.favoriteAsset(assetId, true).subscribe(() => {
         this.favoriteAssets.push(assetId);
         const msg = this._i18n.instant('Favorite') + ' ' + this._i18n.instant('success');
-        this._toastr.success(msg, '');
+        this._toastr.success(msg, '', { nzClass: 'custom-success-notification' });
       });
     }
   }

src/app/elements/chat/chat.component.html

@@ -25,7 +25,6 @@
     </div>
   </div>
 </div>
-<elements-drawer [view]="currentView"></elements-drawer>
 
 <!--   <div [hidden]="!showBtn || chatAIShown || !isShowSetting" id="dragBox"> -->
 <!--     <div -->

src/app/elements/chat/chat.component.scss

@@ -9,7 +9,7 @@ nz-float-button {
   position: fixed;
   bottom: 200px;
   right: 5px;
-  z-index: 1000;
+  z-index: 99999;
   cursor: move;
   user-select: none;
   overflow: visible;

src/app/elements/chat/chat.component.ts

@@ -54,6 +54,12 @@ export class ElementChatComponent implements OnInit, OnDestroy, AfterViewInit {
 
   get isShowSetting() {
     const connectMethods = ['koko', 'lion', 'tinker', 'panda'];
+
+    // sftp 或 k8s 不展示设置按钮
+    if (this.currentView.protocol === 'sftp' || this.currentView.protocol === 'k8s') {
+      return false;
+    }
+
     return (
       this.currentView.hasOwnProperty('connectMethod') &&
       this.currentView.connected &&
@@ -209,14 +215,7 @@ export class ElementChatComponent implements OnInit, OnDestroy, AfterViewInit {
 
   handleShowDrawer() {
     if (this.currentView.iframeElement) {
-      switch (this.currentView.connectMethod.component) {
-        case 'koko':
-          this._drawerStateService.sendComponentMessage({ name: 'OPEN_SETTING' });
-          break;
-        default:
-          this.currentView.iframeElement.postMessage({ name: 'OPEN' }, '*');
-          break;
-      }
+      this.currentView.iframeElement.postMessage({ name: 'OPEN' }, '*');
     }
   }