carloshra/nexus-spa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v19' into v19

Browse Source 
# Conflicts:
#	src/views/uikit/tabledoc.ts
This commit is contained in:
Çetin
2025-01-06 16:04:31 +03:00
parent 9a18016deb c751c9c938
commit d4aad54ff7
9 changed files with 213 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/uikit/inputdoc.ts
View File

@@ -202,7 +202,7 @@ import { ToggleButtonModule } from 'primeng/togglebutton';
</div>
</p-fluid>
<p-fluid class="flex mt-20">
<p-fluid class="flex mt-8">
<div class="card flex flex-col gap-6 w-full">
<div class="font-semibold text-xl">InputGroup</div>
<div class="flex flex-col md:flex-row gap-6">

21
src/views/uikit/tabledoc.ts
View File

@@ -286,19 +286,24 @@ interface expandedRows {
<p-table [value]="product.orders" dataKey="id" responsiveLayout="scroll">
<ng-template pTemplate="header">
<tr>
<th pSortableColumn="id">Id
<th pSortableColumn="id">
Id
<p-sortIcon field="price"></p-sortIcon>
</th>
<th pSortableColumn="customer">Customer
<th pSortableColumn="customer">
Customer
<p-sortIcon field="customer"></p-sortIcon>
</th>
<th pSortableColumn="date">Date
<th pSortableColumn="date">
Date
<p-sortIcon field="date"></p-sortIcon>
</th>
<th pSortableColumn="amount">Amount
<th pSortableColumn="amount">
Amount
<p-sortIcon field="amount"></p-sortIcon>
</th>
<th pSortableColumn="stats">Status
<th pSortableColumn="stats">
Status
<p-sortIcon field="status"></p-sortIcon>
</th>
<th style="width: 4rem"></th>
@@ -309,9 +314,9 @@ interface expandedRows {
<td>{{ order.id }}</td>
<td>{{ order.customer }}</td>
<td>{{ order.date }}</td>
<td>{{ order.amount | currency:'USD' }}</td>
<td><span
[class]="'order-badge order-' + order.status.toLowerCase()">{{ order.status }}</span>
<td>{{ order.amount | currency: 'USD' }}</td>
<td>
<span [class]="'order-badge order-' + order.status.toLowerCase()">{{ order.status }}</span>
</td>
<td>
<p-button type="button" icon="pi pi-search"></p-button>