@dative-gpi/foundation-core-components 0.0.90 → 0.0.92

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.
Files changed (2) hide show
  1. package/components/lists/FSDataTable.vue +27 -31
  2. package/package.json +7 -7
package/components/lists/FSDataTable.vue CHANGED
@@ -63,33 +63,32 @@ export default defineComponent({
63
63
  const innerSortBy: Ref<FSDataTableOrder | null> = ref(null);
64
64
  const innerMode: Ref<"table" | "iterator"> = ref("table");
65
65
  const innerRowsPerPage = ref(10);
66
+
66
67
  const innerFilters = ref<{ [key: string]: FSDataTableFilter[] }>({});
67
68
  const innerPage = ref(1);
68
69
 
69
70
  const reset = (): void => {
70
- if (router && router.currentRoute.value.query[props.tableCode]) {
71
- const query = JSON.parse(router.currentRoute.value.query[props.tableCode] as string);
72
- // innerHeaders.value = query.columns;
73
- // innerFilters.value = query.filters;
74
- innerRowsPerPage.value = query.rowsPerPage;
75
- innerSortBy.value = query.sortByKey ? {
76
- key: query.sortByKey,
77
- order: query.sortByOrder
78
- } : null;
79
- innerMode.value = query.mode;
80
- innerPage.value = query.page;
71
+ if (router && router.currentRoute.value.meta[props.tableCode]) {
72
+ const meta = router.currentRoute.value.meta[props.tableCode] as any;
73
+ innerHeaders.value = meta.columns;
74
+ innerRowsPerPage.value = meta.rowsPerPage;
75
+ innerSortBy.value = meta.sortBy;
76
+ innerMode.value = meta.mode;
77
+
78
+ innerFilters.value = meta.filters;
79
+ innerPage.value = meta.page;
81
80
  }
82
81
  else if (userOrganisationTable.value) {
82
+ innerHeaders.value = userOrganisationTable.value.columns;
83
83
  innerRowsPerPage.value = userOrganisationTable.value.rowsPerPage;
84
- innerSortBy.value = userOrganisationTable.value.sortByKey ? {
85
- key: userOrganisationTable.value.sortByKey!,
86
- order: userOrganisationTable.value.sortByOrder!
87
- } : null;
84
+ if (userOrganisationTable.value.sortByKey && userOrganisationTable.value.sortByOrder) {
85
+ innerSortBy.value = {
86
+ key: userOrganisationTable.value.sortByKey,
87
+ order: userOrganisationTable.value.sortByOrder
88
+ };
89
+ }
88
90
  innerMode.value = userOrganisationTable.value.mode;
89
91
  }
90
- if (userOrganisationTable.value) {
91
- innerHeaders.value = userOrganisationTable.value.columns;
92
- }
93
92
  };
94
93
 
95
94
  const updateHeaders = (value: FSDataTableColumn[]): void => {
@@ -139,20 +138,17 @@ export default defineComponent({
139
138
 
140
139
  const updateRouter = (): void => {
141
140
  if (router) {
142
- router.replace({
143
- query: {
144
- ...router.currentRoute.value.query,
145
- [props.tableCode]: JSON.stringify({
146
- // columns: innerHeaders.value,
147
- // filters: innerFilters.value,
148
- rowsPerPage: innerRowsPerPage.value,
149
- sortByKey: innerSortBy.value?.key,
150
- sortByOrder: innerSortBy.value?.order,
151
- mode: innerMode.value,
152
- page: innerPage.value
153
- })
141
+ router.currentRoute.value.meta = {
142
+ ...router.currentRoute.value.meta,
143
+ [props.tableCode]: {
144
+ columns: innerHeaders.value,
145
+ filters: innerFilters.value,
146
+ rowsPerPage: innerRowsPerPage.value,
147
+ sortBy: innerSortBy.value,
148
+ mode: innerMode.value,
149
+ page: innerPage.value
154
150
  }
155
- });
151
+ };
156
152
  }
157
153
  };
158
154
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-core-components",
3
3
  "sideEffects": false,
4
- "version": "0.0.90",
4
+ "version": "0.0.92",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,11 +10,11 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-core-domain": "0.0.90",
14
- "@dative-gpi/foundation-core-services": "0.0.90",
15
- "@dative-gpi/foundation-shared-components": "0.0.90",
16
- "@dative-gpi/foundation-shared-domain": "0.0.90",
17
- "@dative-gpi/foundation-shared-services": "0.0.90",
13
+ "@dative-gpi/foundation-core-domain": "0.0.92",
14
+ "@dative-gpi/foundation-core-services": "0.0.92",
15
+ "@dative-gpi/foundation-shared-components": "0.0.92",
16
+ "@dative-gpi/foundation-shared-domain": "0.0.92",
17
+ "@dative-gpi/foundation-shared-services": "0.0.92",
18
18
  "color": "^4.2.3",
19
19
  "vue": "^3.4.23",
20
20
  "vuedraggable": "^4.1.0"
@@ -24,5 +24,5 @@
24
24
  "sass": "^1.69.5",
25
25
  "sass-loader": "^13.3.2"
26
26
  },
27
- "gitHead": "a9e61e5e740657f46604e90282f71fc058a81acd"
27
+ "gitHead": "9c937d9f684b22f0230cd801b4f6bbe7adac8176"
28
28
  }