Skip to content

Commit

Permalink
Merge pull request #65 from gewaer/fix-search-field
Browse files Browse the repository at this point in the history
  • Loading branch information
SparoHawk committed Oct 25, 2021
2 parents eb06d68 + 3166cc0 commit 20e37a7
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 17 deletions.
8 changes: 4 additions & 4 deletions dist/gw-browse.common.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/gw-browse.common.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/gw-browse.umd.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/gw-browse.umd.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/gw-browse.umd.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/gw-browse.umd.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gewaer/gw-browse",
"version": "0.2.16",
"version": "0.2.17",
"description": "Base browse component for the Gewaer platform.",
"main": "./dist/gw-browse.umd.min.js",
"files": [
Expand Down
6 changes: 2 additions & 4 deletions src/browse.vue
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,10 @@ export default {
searchableFields() {
return this.tableFields.filter(field => field.searchable).map(field => {
if (typeof field.name === "object") {
return field.name.searchName;
return field.searchField || field.name.searchName;
}
return field.name;
return field.searchField || field.name;
});
},
mainDateField() {
Expand Down Expand Up @@ -521,7 +521,6 @@ export default {
(this.showActionsDelete || this.showActionsEdit) && this.tableFields.push(this.vuetableActions);
});
},
getFixedFilters(searchOptions, params) {
let fixedFilters = Object.entries(searchOptions.fixedFilters || {});
const dateFilters = Object.entries(searchOptions.dates || {});
Expand All @@ -547,7 +546,6 @@ export default {
return params;
},
processTableFields(endpointFields) {
this.extraFields.forEach((fieldDefinition) => {
// find field to replace the render
Expand Down

0 comments on commit 20e37a7

Please sign in to comment.