diff --git a/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.html b/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.html new file mode 100644 index 0000000..76219ee --- /dev/null +++ b/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.html @@ -0,0 +1,20 @@ + +
+
+ + {{asset.name}} + + +
+ +
+ + + + +
+ + +
+
+
diff --git a/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.scss b/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.ts b/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.ts new file mode 100644 index 0000000..b28ffb4 --- /dev/null +++ b/src/app/_modules/form-fields/types/document/field-document-meta/field-document-meta.component.ts @@ -0,0 +1,43 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import {FormGroup, FormControl} from "@angular/forms"; + +@Component({ + selector: 'field-document-meta', + templateUrl: './field-document-meta.component.html', + styleUrls: ['./field-document-meta.component.scss'] +}) +export class FieldDocumentMetaComponent { + + @Input() asset: any; + @Output() delete = new EventEmitter; + + public formGroup: FormGroup; + public edit:any; + + + ngOnInit(){ + console.log(this.asset) + this.default() + } + + default(){ + this.formGroup = new FormGroup({ + name: new FormControl(this.asset.name), + description: new FormControl(this.asset.description), + }); + } + + setFile(asset){ + console.log(this.asset, this.formGroup.value) + this.edit = {off:true}; + } + + close(){ + this.edit = {off:true}; + } + + del(){ + this.delete.emit(this.asset) + } + +} diff --git a/src/app/_modules/form-fields/types/document/form-field-document.module.ts b/src/app/_modules/form-fields/types/document/form-field-document.module.ts index 9787a8e..737c0ee 100644 --- a/src/app/_modules/form-fields/types/document/form-field-document.module.ts +++ b/src/app/_modules/form-fields/types/document/form-field-document.module.ts @@ -7,6 +7,7 @@ import {FieldDocumentSingleComponent} from "@app/_modules/form-fields/types/docu import {FieldDocumentMultipleComponent} from "@app/_modules/form-fields/types/document/multiple/field-document-multiple.component"; import { WidjetModule } from '@app/_modules/widjet/widjet.module'; import { FormsModule } from '@angular/forms'; +import { FieldDocumentMetaComponent } from './field-document-meta/field-document-meta.component'; @NgModule({ imports: [ @@ -19,7 +20,8 @@ import { FormsModule } from '@angular/forms'; FormFieldDocumentComponent, FieldDocumentReadonlyComponent, FieldDocumentSingleComponent, - FieldDocumentMultipleComponent + FieldDocumentMultipleComponent, + FieldDocumentMetaComponent ], exports: [ FormFieldDocumentComponent diff --git a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html index b815deb..100944a 100644 --- a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html +++ b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html @@ -10,15 +10,8 @@
-
- - {{asset.name}} - - - - - -
{{asset|json}}
+
+
diff --git a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts index 7830e1b..b307449 100644 --- a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts +++ b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts @@ -96,7 +96,4 @@ export class FieldDocumentMultipleComponent { }); } - setFile(asset){ - console.log(asset) - } } diff --git a/src/app/_modules/widjet/drop-down/drop-down.component.scss b/src/app/_modules/widjet/drop-down/drop-down.component.scss index 6cf782f..ff9d9c7 100644 --- a/src/app/_modules/widjet/drop-down/drop-down.component.scss +++ b/src/app/_modules/widjet/drop-down/drop-down.component.scss @@ -1,3 +1,6 @@ +:host{ + cursor: pointer; +} .invisible{ display: none; @@ -9,3 +12,4 @@ display: inline-flex; } + diff --git a/src/app/_modules/widjet/drop-down/drop-down.component.ts b/src/app/_modules/widjet/drop-down/drop-down.component.ts index 7c94bfe..aaf2e30 100644 --- a/src/app/_modules/widjet/drop-down/drop-down.component.ts +++ b/src/app/_modules/widjet/drop-down/drop-down.component.ts @@ -10,11 +10,17 @@ export class DropDownComponent { @Input() ico = 'drop_down_24'; @Input() angle = [0,-180]; @Input() visible = false; + @Input() order: { + on:boolean, + off:boolean + }; @Input() target:HTMLElement; @Output() toggle = new EventEmitter() ngOnChanges(){ + if (this.order?.on === true) this.visible = true; + if (this.order?.off === true) this.visible = false; this.setToggle() } diff --git a/src/assets/css/_forms.scss b/src/assets/css/_forms.scss index 978693b..5ebbcc0 100644 --- a/src/assets/css/_forms.scss +++ b/src/assets/css/_forms.scss @@ -200,14 +200,22 @@ form-field-document{ .values { .item { - height: 60px; - font-size: 20px; - display: flex; - flex-direction: row; - align-items: center; - margin-top: 10px; - gap:8px; - + margin-top: $p; + .doc-item-header{ + display: flex; + align-items: flex-start; + gap: $pxs; + } + .doc-item-form{ + input{ + margin-bottom: $pxs; + } + .doc-item-form-bar{ + display: flex; + justify-content: flex-end; + gap: $pxs; + } + } } } } \ No newline at end of file diff --git a/src/vniigaz-v2/css/_forms.scss b/src/vniigaz-v2/css/_forms.scss index c35f3d5..add06a5 100644 --- a/src/vniigaz-v2/css/_forms.scss +++ b/src/vniigaz-v2/css/_forms.scss @@ -206,23 +206,28 @@ form-field-document{ .values { .item { - height: 60px; - font-size: 20px; - display: flex; - flex-direction: row; - align-items: center; - margin-top: 10px; - gap:8px; - flex-wrap: wrap; - input{ - flex-basis: 100%; + margin-top: $p; + .doc-item-header{ + display: flex; + align-items: flex-start; + gap: $pxs; + } + .doc-item-form{ + input{ + margin-bottom: $pxs; + } + .doc-item-form-bar{ + display: flex; + justify-content: flex-end; + gap: $pxs; + } } } } } .field { - display: flex; + flex-direction: column; width: 100%; margin: 0 0 24px;