File tree Expand file tree Collapse file tree 3 files changed +16
-2
lines changed Expand file tree Collapse file tree 3 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -102,6 +102,7 @@ export class ElementAssetTreeComponent implements OnInit {
102
102
isShowRMenu = false ;
103
103
rightClickSelectNode : any ;
104
104
isLoadTreeAsync : boolean ;
105
+ isOpenNewWindow : boolean ;
105
106
filterAssetCancel$ : Subject < boolean > = new Subject ( ) ;
106
107
favoriteAssets = [ ] ;
107
108
searchValue = '' ;
@@ -221,6 +222,8 @@ export class ElementAssetTreeComponent implements OnInit {
221
222
this . currentOrgID = this . _cookie . get ( 'X-JMS-LUNA-ORG' ) || this . _cookie . get ( 'X-JMS-ORG' ) ;
222
223
this . _settingSvc . afterInited ( ) . then ( ( state ) => {
223
224
this . isLoadTreeAsync = this . _settingSvc . isLoadTreeAsync ( ) ;
225
+ this . isOpenNewWindow = this . _settingSvc . isOpenNewWindow ( ) ;
226
+
224
227
if ( state ) {
225
228
if ( ! this . _settingSvc . hasXPack ( ) && this . currentOrgID === SYSTEM_ORG_ID ) {
226
229
this . currentOrgID = DEFAULT_ORG_ID ;
@@ -255,7 +258,11 @@ export class ElementAssetTreeComponent implements OnInit {
255
258
this . _dialog . open ( DisabledAssetsDialogComponent , config ) ;
256
259
return ;
257
260
}
258
- this . connectAsset ( treeNode ) . then ( ) ;
261
+ if ( this . isOpenNewWindow ) {
262
+ connectOnNewPage ( treeNode , 'auto' ) ;
263
+ } else {
264
+ this . connectAsset ( treeNode ) . then ( ) ;
265
+ }
259
266
}
260
267
261
268
onAssetTreeCheck ( event , treeId ) {
Original file line number Diff line number Diff line change @@ -281,7 +281,8 @@ export class Setting {
281
281
sqlClient = '1' ;
282
282
283
283
basic = {
284
- is_async_asset_tree : false
284
+ is_async_asset_tree : false ,
285
+ connect_default_open_method : 'new'
285
286
} ;
286
287
graphics = {
287
288
rdp_resolution : 'Auto' ,
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ export class SettingService {
13
13
settingKey = 'LunaSetting' ;
14
14
public initialized$ = new BehaviorSubject < boolean > ( false ) ;
15
15
public isLoadTreeAsync$ = new BehaviorSubject < boolean > ( true ) ;
16
+ public isOpenNewWindow$ = new BehaviorSubject < boolean > ( false ) ;
16
17
public appletConnectMethod$ = new BehaviorSubject < string > ( '' ) ;
17
18
public keyboardLayout$ = new BehaviorSubject < string > ( '' ) ;
18
19
public isDirectNavigation$ = new BehaviorSubject < boolean > ( false ) ;
@@ -127,6 +128,11 @@ export class SettingService {
127
128
return this . setting . basic . is_async_asset_tree ;
128
129
}
129
130
131
+ isOpenNewWindow ( ) {
132
+ return this . setting . basic . connect_default_open_method === 'new' ;
133
+ }
134
+
135
+
130
136
setAppletConnectMethod ( ) {
131
137
this . appletConnectMethod$ . next ( this . setting . graphics . applet_connection_method ) ;
132
138
}
You can’t perform that action at this time.
0 commit comments