Add linkOperator visibleElements property

conterra · Feb 1, 2024 · 01dd95e · 01dd95e
1 parent 1c76d4a
commit 01dd95e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 3 deletions.
diff --git a/src/main/js/apps/sample/app.json b/src/main/js/apps/sample/app.json
@@ -46,12 +46,14 @@
                     "defaultMode": {
                         "spatialRelation": true,
                         "spatialInputActions": false,
+                        "linkOperator": true,
                         "sortSelect": false,
                         "fieldInfos": false,
                         "replaceOpenedTables": true
                     },
                     "predefinedMode": {
-                        "spatialRelation": true,
+                        "spatialRelation": false,
+                        "linkOperator": false,
                         "sortSelect": false,
                         "fieldInfos": false,
                         "replaceOpenedTables": true
@@ -206,6 +208,11 @@
                     "iconClass": "icon-custom-info",
                     "complexQuery": {
                         "$or": [
+                            {
+                                "gattung": {
+                                    "$eq": "Ahorn (Acer)"
+                                }
+                            },
                             {
                                 "gattung": {
                                     "$eq": "Ahorn (Acer)"
@@ -218,9 +225,17 @@
                         "editable": true,
                         "editOptions": {
                             "spatialRelation": true,
-                            "linkOperator": true,
+                            "linkOperator": false,
                             "editFields": [
                                 {
+                                    "label": "Baumart 1",
+                                    "field": false,
+                                    "relationalOperator": false,
+                                    "value": true
+                                },
+
+                                {
+                                    "label": "Baumart 2",
                                     "field": false,
                                     "relationalOperator": false,
                                     "value": true

diff --git a/src/main/js/bundles/dn_querybuilder/EditableQueryBuilderWidgetFactory.js b/src/main/js/bundles/dn_querybuilder/EditableQueryBuilderWidgetFactory.js
@@ -61,6 +61,7 @@ export default class EditableQueryBuilderWidgetFactory {
         vm.visibleElements = {
             fieldInfos: model.visibleElements.predefinedMode.fieldInfos,
             spatialRelation: model.visibleElements.predefinedMode.spatialRelation,
+            linkOperator: model.visibleElements.predefinedMode.linkOperator,
             spatialInputActions: false,
             sortSelect: model.visibleElements.predefinedMode.sortSelect,
             replaceOpenedTables: model.visibleElements.predefinedMode.replaceOpenedTables

diff --git a/src/main/js/bundles/dn_querybuilder/FilterQueryBuilderWidgetFactory.js b/src/main/js/bundles/dn_querybuilder/FilterQueryBuilderWidgetFactory.js
@@ -134,6 +134,7 @@ export default class FilterQueryBuilderWidgetFactory {
         vm.enableDistinctValues = model.enableDistinctValues;
         vm.visibleElements = {
             fieldInfos: model.visibleElements.filterMode.fieldInfos,
+            linkOperator: true,
             spatialRelation: model.visibleElements.filterMode.spatialRelation,
             spatialInputActions: false,
             sortSelect: false

diff --git a/src/main/js/bundles/dn_querybuilder/QueryBuilderWidget.vue b/src/main/js/bundles/dn_querybuilder/QueryBuilderWidget.vue
@@ -132,7 +132,7 @@
                     </v-flex>
                 </v-layout>
                 <v-layout
-                    v-if="fieldQueriesLength > 1"
+                    v-if="fieldQueriesLength > 1 && visibleElements.linkOperator"
                     :aria-label="i18n.linkOperator"
                     role="group"
                     row
@@ -400,6 +400,7 @@
                 spatialRelation: "everywhere",
                 visibleElements: {
                     spatialRelation: true,
+                    linkOperator: true,
                     spatialInputActions: false,
                     sortSelect: false,
                     fieldInfos: false,

diff --git a/src/main/js/bundles/dn_querybuilder/QueryBuilderWidgetFactory.js b/src/main/js/bundles/dn_querybuilder/QueryBuilderWidgetFactory.js
@@ -56,6 +56,7 @@ export default class QueryBuilderWidgetFactory {
         vm.visibleElements = {
             fieldInfos: model.visibleElements.defaultMode.fieldInfos,
             spatialRelation: model.visibleElements.defaultMode.spatialRelation,
+            linkOperator: model.visibleElements.defaultMode.linkOperator,
             spatialInputActions: model.visibleElements.defaultMode.spatialInputActions,
             sortSelect: model.visibleElements.defaultMode.sortSelect,
             replaceOpenedTables: model.visibleElements.defaultMode.replaceOpenedTables

diff --git a/src/main/js/bundles/dn_querybuilder/README.md b/src/main/js/bundles/dn_querybuilder/README.md
@@ -152,12 +152,14 @@ To use a store with the Query Builder bundle, add the value _querybuilder_ to th
         "defaultMode": {
             "spatialRelation": true,
             "spatialInputActions": false,
+            "linkOperator": true,
             "sortSelect": false,
             "fieldInfos": false,
             "replaceOpenedTables": false
         },
         "predefinedMode": {
             "spatialRelation": true,
+            "linkOperator": true,
             "sortSelect": false,
             "fieldInfos": false,
             "replaceOpenedTables": false

diff --git a/src/main/js/bundles/dn_querybuilder/manifest.json b/src/main/js/bundles/dn_querybuilder/manifest.json
@@ -198,12 +198,14 @@
                     "defaultMode": {
                         "spatialRelation": true,
                         "spatialInputActions": false,
+                        "linkOperator": true,
                         "sortSelect": false,
                         "fieldInfos": false,
                         "replaceOpenedTables": false
                     },
                     "predefinedMode": {
                         "spatialRelation": true,
+                        "linkOperator": true,
                         "sortSelect": false,
                         "fieldInfos": false,
                         "replaceOpenedTables": false