🔀 Merge branch 'release/3.0.29'

package.json

 {
   "name": "@vue-unistra/formbuilder",
-  "version": "3.0.28",
+  "version": "3.0.29",
   "main": "dist/index.js",
   "files": [
     "dist/*",

src/components/formbuilder/settings/tabs/conditional/UsfTabConditionalArea/UsfTabConditionalArea.vue

@@ -66,7 +66,9 @@
 <script lang="ts">
 import Vue, {PropType} from 'vue';
 import {UsfTabConditionalBasicSelect} from '../UsfTabConditionalBasicSelect';
-import {InputSelectionItem} from '@form-plugin/components/formbuilder/settings/tabs/conditional/UsfTabConditionalBasicSelect';
+import {
+  InputSelectionItem,
+} from '@form-plugin/components/formbuilder/settings/tabs/conditional/UsfTabConditionalBasicSelect';
 import {Field, FieldCondition} from '#form-plugin/models/form';
 import {mapActions, mapGetters} from 'vuex';
 import {UsfTabConditionalDraggableContainer} from '../UsfTabConditionalDraggableContainer';
@@ -184,7 +186,11 @@ export default Vue.extend({
     conditionalBasicItems(): InputSelectionItem[] {
       return [
         ...this.userTemplatesAttributes,
-        ...this.otherInputs,
+        ...this.otherInputs.sort((a, b) => {
+          if (a.name < b.name) return -1;
+          if (a.name > b.name) return 1;
+          return 0;
+        }),
       ];
     },
   },

src/components/formbuilder/settings/tabs/validation/UsfTabValidationFile/UsfTabValidationFile.vue

@@ -74,7 +74,7 @@ export default Vue.extend({
       if (key === 'unit') {
         maxFileSize = value * this.maxFileSize;
       }
-      this.updateField('max', maxFileSize);
+      this.onUpdateField(maxFileSize, 'max');
     },
   },
 });

src/services/ConditionService/index.ts

@@ -96,7 +96,10 @@ const conditionsCheckOneByOne = (
         parentArray.push(subConditionArray[0]);
         i = subConditionIFinal;
     } else {
-        if ((conditions[i].type === 'item' && conditions[i].value === '(' && i === conditions.length - 1) || i !== conditions.length - 1) {
+        if (
+            (conditions[i].type === 'item' && conditions[i].value === '(' && i === conditions.length - 1) ||
+            (i !== conditions.length - 1 && conditions[i + 1].value !== ')')
+        ) {
             throw new Error('Invalid condition');
         }
     }