Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
99ab8e18
Commit
99ab8e18
authored
Oct 24, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update 修改luna登录选择用户
parent
3dba488e
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
117 additions
and
53 deletions
+117
-53
angular.json
angular.json
+1
-1
connect.component.ts
src/app/elements/connect/connect.component.ts
+2
-2
dialog.html
src/app/elements/connect/dialog.html
+17
-2
MaterialModule.component.ts
src/app/plugins/MaterialModule.component.ts
+48
-48
theme.scss
src/theme.scss
+49
-0
layer.css
src/theme/default/layer.css
+0
-0
No files found.
angular.json
View file @
99ab8e18
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
"assets"
:
[
"assets"
:
[
"src/assets"
,
"src/assets"
,
"src/static"
,
"src/static"
,
"src/theme/default"
,
"src/favicon.ico"
"src/favicon.ico"
],
],
"styles"
:
[
"styles"
:
[
...
@@ -28,6 +27,7 @@
...
@@ -28,6 +27,7 @@
"node_modules/ngx-toastr/toastr.css"
,
"node_modules/ngx-toastr/toastr.css"
,
"src/sass/style.scss"
,
"src/sass/style.scss"
,
"src/styles.css"
,
"src/styles.css"
,
"src/theme.scss"
,
"src/assets/ztree/awesomeStyle/awesome.css"
"src/assets/ztree/awesomeStyle/awesome.css"
],
],
"scripts"
:
[
"scripts"
:
[
...
...
src/app/elements/connect/connect.component.ts
View file @
99ab8e18
...
@@ -107,8 +107,8 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
...
@@ -107,8 +107,8 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
if
(
systemUsers
.
length
>
1
)
{
if
(
systemUsers
.
length
>
1
)
{
return
new
Promise
<
SystemUser
>
(
resolve
=>
{
return
new
Promise
<
SystemUser
>
(
resolve
=>
{
const
dialogRef
=
this
.
_dialog
.
open
(
AssetTreeDialogComponent
,
{
const
dialogRef
=
this
.
_dialog
.
open
(
AssetTreeDialogComponent
,
{
height
:
'2
0
0px'
,
height
:
'2
5
0px'
,
width
:
'
3
00px'
,
width
:
'
5
00px'
,
data
:
{
users
:
systemUserMaxPriority
}
data
:
{
users
:
systemUserMaxPriority
}
});
});
...
...
src/app/elements/connect/dialog.html
View file @
99ab8e18
<h1
mat-dialog-title
>
{{"Found"|trans}} {{data.users.length}} {{"Users "|trans}}
</h1>
<h1
mat-dialog-title
>
{{"Found"|trans}} {{data.users.length}} {{"Users "|trans}}
</h1>
<mat-form-field
style=
"width: 100%"
>
<div
style=
"height: 110px"
>
<div
*
ngIf=
"data.users.length < 5"
>
<div>
<label>
{{'Choose a User'|trans}}:
</label>
</div>
<mat-radio-group
required
[
formControl
]="
UserSelectControl
"
[(
ngModel
)]="
selected
"
>
<mat-radio-button
*
ngFor=
"let u of data.users"
value=
"{{u.id}}"
style=
"padding-right: 10px"
>
{{u.name}}
</mat-radio-button>
</mat-radio-group>
</div>
<div
*
ngIf=
"data.users.length >= 5"
>
<mat-form-field
style=
"width: 100%"
>
<mat-select
[(
value
)]="
selected
"
<mat-select
[(
value
)]="
selected
"
[
compareWith
]="
compareFn
"
[
compareWith
]="
compareFn
"
[
formControl
]="
UserSelectControl
"
[
formControl
]="
UserSelectControl
"
placeholder=
"{{'Choose a User'|trans}}"
required
>
placeholder=
"{{'Choose a User'|trans}}"
required
>
<mat-option
*
ngFor=
"let u of data.users"
value=
"{{u.id}}"
>
{{u.name}}
</mat-option>
<mat-option
*
ngFor=
"let u of data.users"
value=
"{{u.id}}"
>
{{u.name}}
</mat-option>
</mat-select>
</mat-select>
</mat-form-field>
</div>
<mat-error
*
ngIf=
"UserSelectControl.hasError('required')"
>
{{"Please choose a User"|trans}}
</mat-error>
<mat-error
*
ngIf=
"UserSelectControl.hasError('required')"
>
{{"Please choose a User"|trans}}
</mat-error>
</mat-form-field>
</div>
<div
style=
"float: right"
>
<div
style=
"float: right"
>
<button
mat-raised-button
(
click
)="
onNoClick
()"
>
{{"Cancel"|trans}}
</button>
<button
mat-raised-button
(
click
)="
onNoClick
()"
>
{{"Cancel"|trans}}
</button>
<button
mat-raised-button
color=
"primary"
[
mat-dialog-close
]="
selected
"
cdkFocusInitial
>
{{"Confirm"|trans}}
</button>
<button
mat-raised-button
color=
"primary"
[
mat-dialog-close
]="
selected
"
cdkFocusInitial
>
{{"Confirm"|trans}}
</button>
...
...
src/app/plugins/MaterialModule.component.ts
View file @
99ab8e18
import
{
NgModule
}
from
'@angular/core'
;
import
{
NgModule
}
from
'@angular/core'
;
import
{
import
{
//
MatAutocompleteModule,
MatAutocompleteModule
,
MatButtonModule
,
MatButtonModule
,
//
MatButtonToggleModule,
MatButtonToggleModule
,
MatCardModule
,
MatCardModule
,
//
MatCheckboxModule,
MatCheckboxModule
,
MatChipsModule
,
MatChipsModule
,
//
MatDatepickerModule,
MatDatepickerModule
,
MatDialogModule
,
MatDialogModule
,
//
MatExpansionModule,
MatExpansionModule
,
//
MatGridListModule,
MatGridListModule
,
//
MatIconModule,
MatIconModule
,
MatInputModule
,
MatInputModule
,
//
MatListModule,
MatListModule
,
//
MatMenuModule,
MatMenuModule
,
//
MatNativeDateModule,
MatNativeDateModule
,
//
MatPaginatorModule,
MatPaginatorModule
,
//
MatProgressBarModule,
MatProgressBarModule
,
//
MatProgressSpinnerModule,
MatProgressSpinnerModule
,
MatRadioModule
,
MatRadioModule
,
//
MatRippleModule,
MatRippleModule
,
MatSelectModule
,
MatSelectModule
,
//
MatSidenavModule,
MatSidenavModule
,
//
MatSliderModule,
MatSliderModule
,
//
MatSlideToggleModule,
MatSlideToggleModule
,
//
MatSnackBarModule,
MatSnackBarModule
,
//
MatSortModule,
MatSortModule
,
//
MatTableModule,
MatTableModule
,
//
MatTabsModule,
MatTabsModule
,
//
MatToolbarModule,
MatToolbarModule
,
//
MatTooltipModule,
MatTooltipModule
,
//
MatStepperModule,
MatStepperModule
,
}
from
'@angular/material'
;
}
from
'@angular/material'
;
import
{
CdkTableModule
}
from
'@angular/cdk/table'
;
import
{
CdkTableModule
}
from
'@angular/cdk/table'
;
@
NgModule
({
@
NgModule
({
exports
:
[
exports
:
[
CdkTableModule
,
CdkTableModule
,
//
MatAutocompleteModule,
MatAutocompleteModule
,
MatButtonModule
,
MatButtonModule
,
//
MatButtonToggleModule,
MatButtonToggleModule
,
MatCardModule
,
MatCardModule
,
//
MatCheckboxModule,
MatCheckboxModule
,
MatChipsModule
,
MatChipsModule
,
//
MatStepperModule,
MatStepperModule
,
//
MatDatepickerModule,
MatDatepickerModule
,
MatDialogModule
,
MatDialogModule
,
//
MatExpansionModule,
MatExpansionModule
,
//
MatGridListModule,
MatGridListModule
,
//
MatIconModule,
MatIconModule
,
MatInputModule
,
MatInputModule
,
//
MatListModule,
MatListModule
,
//
MatMenuModule,
MatMenuModule
,
//
MatNativeDateModule,
MatNativeDateModule
,
//
MatPaginatorModule,
MatPaginatorModule
,
//
MatProgressBarModule,
MatProgressBarModule
,
//
MatProgressSpinnerModule,
MatProgressSpinnerModule
,
MatRadioModule
,
MatRadioModule
,
//
MatRippleModule,
MatRippleModule
,
MatSelectModule
,
MatSelectModule
,
//
MatSidenavModule,
MatSidenavModule
,
//
MatSliderModule,
MatSliderModule
,
//
MatSlideToggleModule,
MatSlideToggleModule
,
//
MatSnackBarModule,
MatSnackBarModule
,
//
MatSortModule,
MatSortModule
,
//
MatTableModule,
MatTableModule
,
//
MatTabsModule,
MatTabsModule
,
//
MatToolbarModule,
MatToolbarModule
,
//
MatTooltipModule,
MatTooltipModule
,
]
]
})
})
export
class
MaterialModule
{
export
class
MaterialModule
{
...
...
src/theme.scss
0 → 100644
View file @
99ab8e18
@import
'~@angular/material/theming'
;
@include
mat-core
();
$my-teal
:
(
50
:
#e0f2f1
,
100
:
#b2dfdb
,
200
:
#80cbc4
,
300
:
#4db6ac
,
400
:
#26a69a
,
500
:
#1ab394
,
600
:
#00897b
,
700
:
#00796b
,
800
:
#00695c
,
900
:
#004d40
,
A100
:
#a7ffeb
,
A200
:
#64ffda
,
A400
:
#1de9b6
,
A700
:
#00bfa5
,
contrast
:
(
50
:
$dark-primary-text
,
100
:
$dark-primary-text
,
200
:
$dark-primary-text
,
300
:
$dark-primary-text
,
400
:
$dark-primary-text
,
500
:
$light-primary-text
,
600
:
$light-primary-text
,
700
:
$light-primary-text
,
800
:
$light-primary-text
,
900
:
$light-primary-text
,
A100
:
$dark-primary-text
,
A200
:
$dark-primary-text
,
A400
:
$dark-primary-text
,
A700
:
$dark-primary-text
,
)
);
$candy-app-primary
:
mat-palette
(
$my-teal
,
500
);
$candy-app-accent
:
mat-palette
(
$my-teal
,
500
);
// The warn palette is optional (defaults to red).
$candy-app-warn
:
mat-palette
(
$mat-red
);
// Create the theme object (a Sass map containing all of the palettes).
$candy-app-theme
:
mat-light-theme
(
$candy-app-primary
,
$candy-app-accent
,
$candy-app-warn
);
// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
@include
angular-material-theme
(
$candy-app-theme
);
src/theme/default/layer.css
deleted
100644 → 0
View file @
3dba488e
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment