浏览代码

search select fixes

master
Florian Eisenmenger 1年前
父节点
当前提交
6d0bf0cb86
共有 7 个文件被更改,包括 21 次插入2 次删除
  1. +4
    -1
      matsen-tool/src/app/_components/search-select/search-select.component.html
  2. +7
    -1
      matsen-tool/src/app/_components/search-select/search-select.component.ts
  3. +2
    -0
      matsen-tool/src/app/_views/documents/new-document/new-document.component.html
  4. +3
    -0
      matsen-tool/src/app/_views/products/assign-product/assign-product.component.html
  5. +2
    -0
      matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html
  6. +1
    -0
      matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html
  7. +2
    -0
      matsen-tool/src/app/_views/tasks/new-task/new-task.component.html

+ 4
- 1
matsen-tool/src/app/_components/search-select/search-select.component.html 查看文件

@@ -26,7 +26,10 @@
</ng-container> </ng-container>
<ng-container *ngIf="column.columnType == COLUMN_TYPE_IMAGE"> <ng-container *ngIf="column.columnType == COLUMN_TYPE_IMAGE">
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<img src="{{ getElementValue(element, column) }}" width="40" height="40"/>
<img *ngIf="element.imageUrl !== null && element.imageUrl !== undefined"
src="{{ getElementValue(element, column) }}" width="40" height="40"/>
<img *ngIf="element.imageUrl === null || element.imageUrl === undefined"
src="/assets/images/icons/dummy-product.png" width="40" height="40" alt="" />
</td> </td>
</ng-container> </ng-container>
<ng-container *ngIf="column.columnType == COLUMN_TYPE_TEXT"> <ng-container *ngIf="column.columnType == COLUMN_TYPE_TEXT">


+ 7
- 1
matsen-tool/src/app/_components/search-select/search-select.component.ts 查看文件

@@ -19,6 +19,8 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
@Input() public getDataFunction!: Function; @Input() public getDataFunction!: Function;
@Input() public dataSource: any; @Input() public dataSource: any;
@Input() public searchSelectColDefs!: SearchInputColDef[]; @Input() public searchSelectColDefs!: SearchInputColDef[];
@Input() public displayedDataField!: string;
@Input() public displayedDataSubResource!: string;


@Output() rowSelected = new EventEmitter<any>(); @Output() rowSelected = new EventEmitter<any>();


@@ -90,7 +92,11 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
console.log(row, index); console.log(row, index);
this.selectedRowIndex = index; this.selectedRowIndex = index;
this.documentForm.get(this.formId)?.setValue(row.id); this.documentForm.get(this.formId)?.setValue(row.id);
this.paragraphRef.nativeElement.textContent = row.fullName;
if (this.displayedDataSubResource !== undefined) {
this.paragraphRef.nativeElement.textContent = row[this.displayedDataSubResource][this.displayedDataField];
} else {
this.paragraphRef.nativeElement.textContent = row[this.displayedDataField];
}
this.searchBoxFilled = true; this.searchBoxFilled = true;
this.searchBoxOpen = false; this.searchBoxOpen = false;
} }


+ 2
- 0
matsen-tool/src/app/_views/documents/new-document/new-document.component.html 查看文件

@@ -20,6 +20,7 @@
[getDataFunction]="getPartners" [getDataFunction]="getPartners"
[dataSource]="dataSourcePartners" [dataSource]="dataSourcePartners"
[searchSelectColDefs]="colDefPartners" [searchSelectColDefs]="colDefPartners"
[displayedDataField]="'name'"
> >
</app-search-select> </app-search-select>
<input type="hidden" formControlName="partner"/> <input type="hidden" formControlName="partner"/>
@@ -33,6 +34,7 @@
[getDataFunction]="getProducts" [getDataFunction]="getProducts"
[dataSource]="dataSourceProducts" [dataSource]="dataSourceProducts"
[searchSelectColDefs]="colDefProducts" [searchSelectColDefs]="colDefProducts"
[displayedDataField]="'name'"
> >
</app-search-select> </app-search-select>
<input type="hidden" formControlName="product"/> <input type="hidden" formControlName="product"/>


+ 3
- 0
matsen-tool/src/app/_views/products/assign-product/assign-product.component.html 查看文件

@@ -10,6 +10,7 @@
[getDataFunction]="getUnassignedProducts" [getDataFunction]="getUnassignedProducts"
[dataSource]="dataSourceProducts" [dataSource]="dataSourceProducts"
[searchSelectColDefs]="colDefProducts" [searchSelectColDefs]="colDefProducts"
[displayedDataField]="'name'"
> >
<input type="hidden" formControlName="productIri" value="{{partnerProduct.productIri}}"/> <input type="hidden" formControlName="productIri" value="{{partnerProduct.productIri}}"/>
</app-search-select> </app-search-select>
@@ -22,6 +23,8 @@
[getDataFunction]="getUnassignedPartnerProducts" [getDataFunction]="getUnassignedPartnerProducts"
[dataSource]="dataSourcePartnerProducts" [dataSource]="dataSourcePartnerProducts"
[searchSelectColDefs]="colDefPartnerProducts" [searchSelectColDefs]="colDefPartnerProducts"
[displayedDataField]="'name'"
[displayedDataSubResource]="'product'"
> >
<input type="hidden" formControlName="partnerProductIri" value="{{contactPartnerProduct.partnerProductIri}}"/> <input type="hidden" formControlName="partnerProductIri" value="{{contactPartnerProduct.partnerProductIri}}"/>
</app-search-select> </app-search-select>


+ 2
- 0
matsen-tool/src/app/_views/sales/new-sale/new-sale.component.html 查看文件

@@ -11,6 +11,7 @@
[getDataFunction]="getPartners" [getDataFunction]="getPartners"
[dataSource]="dataSourcePartners" [dataSource]="dataSourcePartners"
[searchSelectColDefs]="colDefPartners" [searchSelectColDefs]="colDefPartners"
[displayedDataField]="'name'"
> >
</app-search-select> </app-search-select>
<input type="hidden" formControlName="partnerIri"/> <input type="hidden" formControlName="partnerIri"/>
@@ -24,6 +25,7 @@
[getDataFunction]="getProducts" [getDataFunction]="getProducts"
[dataSource]="dataSourceProducts" [dataSource]="dataSourceProducts"
[searchSelectColDefs]="colDefProducts" [searchSelectColDefs]="colDefProducts"
[displayedDataField]="'name'"
> >
</app-search-select> </app-search-select>
<input type="hidden" formControlName="productIri"/> <input type="hidden" formControlName="productIri"/>


+ 1
- 0
matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html 查看文件

@@ -19,6 +19,7 @@
[getDataFunction]="getContacts" [getDataFunction]="getContacts"
[dataSource]="dataSourceContacts" [dataSource]="dataSourceContacts"
[searchSelectColDefs]="colDefContacts" [searchSelectColDefs]="colDefContacts"
[displayedDataField]="'fullName'"
> >
</app-search-select> </app-search-select>
<input type="hidden" formControlName="contactIri" value="{{taskNote.contactIri}}"/> <input type="hidden" formControlName="contactIri" value="{{taskNote.contactIri}}"/>


+ 2
- 0
matsen-tool/src/app/_views/tasks/new-task/new-task.component.html 查看文件

@@ -27,6 +27,7 @@
[getDataFunction]="getProducts" [getDataFunction]="getProducts"
[dataSource]="dataSourceProducts" [dataSource]="dataSourceProducts"
[searchSelectColDefs]="colDefProducts" [searchSelectColDefs]="colDefProducts"
[displayedDataField]="'name'"
> >
<input type="hidden" formControlName="productIri" value="{{task.productIri}}"/> <input type="hidden" formControlName="productIri" value="{{task.productIri}}"/>
</app-search-select> </app-search-select>
@@ -42,6 +43,7 @@
[getDataFunction]="getUsers" [getDataFunction]="getUsers"
[dataSource]="dataSourceUsers" [dataSource]="dataSourceUsers"
[searchSelectColDefs]="colDefUsers" [searchSelectColDefs]="colDefUsers"
[displayedDataField]="'fullName'"
> >
<input type="hidden" formControlName="assignedToIri" value="{{task.productIri}}"/> <input type="hidden" formControlName="assignedToIri" value="{{task.productIri}}"/>
</app-search-select> </app-search-select>


正在加载...
取消
保存