Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vue-unistra
formbuilder
Commits
eb118eaa
Commit
eb118eaa
authored
Jan 26, 2022
by
MARCO Jonathan
Browse files
🔀
Merge branch 'release/3.0.29'
parents
8a84377c
8529fd0b
Pipeline
#72191
passed with stage
in 14 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
package.json
View file @
eb118eaa
{
"name"
:
"@vue-unistra/formbuilder"
,
"version"
:
"3.0.2
8
"
,
"version"
:
"3.0.2
9
"
,
"main"
:
"dist/index.js"
,
"files"
:
[
"dist/*"
,
...
...
src/components/formbuilder/settings/tabs/conditional/UsfTabConditionalArea/UsfTabConditionalArea.vue
View file @
eb118eaa
...
...
@@ -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
View file @
eb118eaa
...
...
@@ -74,7 +74,7 @@ export default Vue.extend({
if
(
key
===
'
unit
'
)
{
maxFileSize
=
value
*
this
.
maxFileSize
;
}
this
.
u
pdateField
(
'
max
'
,
maxFileSize
);
this
.
onU
pdateField
(
maxFileSize
,
'
max
'
);
},
},
});
...
...
src/services/ConditionService/index.ts
View file @
eb118eaa
...
...
@@ -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
'
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment