@bexis2/bexis2-core-ui 0.4.37 → 0.4.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/dist/components/Table/TableContent.svelte +2 -1
- package/dist/components/Table/utils.d.ts +2 -2
- package/dist/components/Table/utils.js +4 -1
- package/dist/components/page/Page.svelte +4 -1
- package/package.json +1 -1
- package/src/lib/components/Table/TableContent.svelte +3 -1
- package/src/lib/components/Table/utils.ts +6 -3
- package/src/lib/components/page/Page.svelte +4 -1
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@ import { SvelteComponent } from 'svelte';
|
|
|
2
2
|
import type { Writable } from 'svelte/store';
|
|
3
3
|
import { Receive } from '../../models/Models';
|
|
4
4
|
import type { FilterOptionsEnum } from '../../models/Enums';
|
|
5
|
-
import type { Columns, Filter, ServerColumn, ServerConfig } from '../../models/Models';
|
|
5
|
+
import type { Columns, Filter, OrderBy, ServerColumn, ServerConfig } from '../../models/Models';
|
|
6
6
|
export declare const minWidth: (id: string, columns: Columns | undefined) => number;
|
|
7
7
|
export declare const fixedWidth: (id: string, columns: Columns | undefined) => number;
|
|
8
8
|
export declare const cellStyle: (id: string, columns: Columns | undefined) => string;
|
|
@@ -23,7 +23,7 @@ export declare const missingValuesFn: (key: number | string, missingValues: {
|
|
|
23
23
|
}) => string | number;
|
|
24
24
|
export declare const updateTable: (pageSize: number, pageIndex: number, server: ServerConfig | undefined, filters: {
|
|
25
25
|
[key: string]: { [key in FilterOptionsEnum]?: number | string | Date; };
|
|
26
|
-
}, data: Writable<any[]>, serverItems: Writable<number> | undefined, columns: Columns | undefined, dispatch: any) => Promise<Receive>;
|
|
26
|
+
}, data: Writable<any[]>, serverItems: Writable<number> | undefined, columns: Columns | undefined, dispatch: any, order?: OrderBy[]) => Promise<Receive>;
|
|
27
27
|
export declare const convertServerColumns: (serverColumns: ServerColumn[], columns: Columns | undefined) => Columns;
|
|
28
28
|
export declare const getMaxCellHeightInRow: (tableRef: HTMLTableElement, resizable: "columns" | "rows" | "none" | "both", optionsComponent: typeof SvelteComponent | undefined, rowHeights: Writable<{
|
|
29
29
|
[key: number]: {
|
|
@@ -141,7 +141,7 @@ export const missingValuesFn = (key, missingValues) => {
|
|
|
141
141
|
return foundKey ? missingValues[foundKey] : key;
|
|
142
142
|
};
|
|
143
143
|
// Function to update the server-side table data
|
|
144
|
-
export const updateTable = async (pageSize, pageIndex, server, filters, data, serverItems, columns, dispatch) => {
|
|
144
|
+
export const updateTable = async (pageSize, pageIndex, server, filters, data, serverItems, columns, dispatch, order = []) => {
|
|
145
145
|
const { baseUrl, entityId, versionId, sendModel = new Send() } = server ?? {};
|
|
146
146
|
if (!sendModel)
|
|
147
147
|
throw new Error('Server-side configuration is missing');
|
|
@@ -150,6 +150,7 @@ export const updateTable = async (pageSize, pageIndex, server, filters, data, se
|
|
|
150
150
|
sendModel.version = versionId || -1;
|
|
151
151
|
sendModel.id = entityId || -1;
|
|
152
152
|
sendModel.filter = normalizeFilters(filters);
|
|
153
|
+
sendModel.order = order;
|
|
153
154
|
let fetchData;
|
|
154
155
|
try {
|
|
155
156
|
fetchData = await fetch(baseUrl || '', {
|
|
@@ -186,6 +187,8 @@ export const updateTable = async (pageSize, pageIndex, server, filters, data, se
|
|
|
186
187
|
data.set(tmpArr);
|
|
187
188
|
}
|
|
188
189
|
serverItems?.set(response.count);
|
|
190
|
+
console.log('Server data updated');
|
|
191
|
+
console.log(response);
|
|
189
192
|
return response;
|
|
190
193
|
};
|
|
191
194
|
// Function to convert server data to client data
|
package/package.json
CHANGED
|
@@ -303,6 +303,7 @@
|
|
|
303
303
|
const { hiddenColumnIds } = pluginStates.hideColumns;
|
|
304
304
|
|
|
305
305
|
const sortServer = (order: 'asc' | 'desc' | undefined, id: string) => {
|
|
306
|
+
|
|
306
307
|
if (!sendModel) throw new Error('Server-side configuration is missing');
|
|
307
308
|
// Set parameter for sorting
|
|
308
309
|
if (order === undefined) {
|
|
@@ -328,7 +329,8 @@
|
|
|
328
329
|
data,
|
|
329
330
|
serverItems,
|
|
330
331
|
columns,
|
|
331
|
-
dispatch
|
|
332
|
+
dispatch,
|
|
333
|
+
sendModel.order
|
|
332
334
|
);
|
|
333
335
|
isFetching = false;
|
|
334
336
|
|
|
@@ -4,7 +4,7 @@ import type { Writable } from 'svelte/store';
|
|
|
4
4
|
|
|
5
5
|
import { Send, Receive } from '$models/Models';
|
|
6
6
|
import type { FilterOptionsEnum } from '$models/Enums';
|
|
7
|
-
import type { Columns, Filter, ServerColumn, ServerConfig } from '$models/Models';
|
|
7
|
+
import type { Columns, Filter, OrderBy, ServerColumn, ServerConfig } from '$models/Models';
|
|
8
8
|
|
|
9
9
|
// Function to determine minWidth for a column to simplify the logic in the HTML
|
|
10
10
|
export const minWidth = (id: string, columns: Columns | undefined) => {
|
|
@@ -185,7 +185,8 @@ export const updateTable = async (
|
|
|
185
185
|
data: Writable<any[]>,
|
|
186
186
|
serverItems: Writable<number> | undefined,
|
|
187
187
|
columns: Columns | undefined,
|
|
188
|
-
dispatch: any
|
|
188
|
+
dispatch: any,
|
|
189
|
+
order: OrderBy[] = [],
|
|
189
190
|
) => {
|
|
190
191
|
const { baseUrl, entityId, versionId, sendModel = new Send() } = server ?? {};
|
|
191
192
|
|
|
@@ -196,6 +197,7 @@ export const updateTable = async (
|
|
|
196
197
|
sendModel.version = versionId || -1;
|
|
197
198
|
sendModel.id = entityId || -1;
|
|
198
199
|
sendModel.filter = normalizeFilters(filters);
|
|
200
|
+
sendModel.order = order;
|
|
199
201
|
|
|
200
202
|
let fetchData;
|
|
201
203
|
|
|
@@ -240,7 +242,8 @@ export const updateTable = async (
|
|
|
240
242
|
}
|
|
241
243
|
|
|
242
244
|
serverItems?.set(response.count);
|
|
243
|
-
|
|
245
|
+
console.log('Server data updated');
|
|
246
|
+
console.log(response);
|
|
244
247
|
return response;
|
|
245
248
|
};
|
|
246
249
|
// Function to convert server data to client data
|