Commit 99ab8e18 authored by ibuler's avatar ibuler

[Update 修改luna登录选择用户

parent 3dba488e
...@@ -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": [
......
...@@ -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: '200px', height: '250px',
width: '300px', width: '500px',
data: {users: systemUserMaxPriority} data: {users: systemUserMaxPriority}
}); });
......
<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">
<mat-select [(value)]="selected" <div *ngIf="data.users.length < 5">
[compareWith]="compareFn" <div>
[formControl]="UserSelectControl" <label>{{'Choose a User'|trans}}: </label>
placeholder="{{'Choose a User'|trans}}" required> </div>
<mat-option *ngFor="let u of data.users" value="{{u.id}}">{{u.name}}</mat-option> <mat-radio-group required [formControl]="UserSelectControl" [(ngModel)]="selected">
</mat-select> <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"
[compareWith]="compareFn"
[formControl]="UserSelectControl"
placeholder="{{'Choose a User'|trans}}" required>
<mat-option *ngFor="let u of data.users" value="{{u.id}}">{{u.name}}</mat-option>
</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>
......
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 {
......
@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);
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment