@formio/js 5.1.0-dev.6065.68180ce → 5.1.0-dev.6066.c5295e7
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.
- package/dist/formio.form.js +1 -1
- package/dist/formio.form.min.js +1 -1
- package/dist/formio.full.js +2 -2
- package/dist/formio.full.min.js +1 -1
- package/lib/cjs/WebformBuilder.js +1 -1
- package/lib/cjs/components/_classes/component/editForm/utils.js +1 -1
- package/lib/mjs/WebformBuilder.js +1 -1
- package/lib/mjs/components/_classes/component/editForm/utils.js +1 -1
- package/package.json +1 -1
|
@@ -1624,7 +1624,7 @@ class WebformBuilder extends Component_1.default {
|
|
|
1624
1624
|
}
|
|
1625
1625
|
hasEditTabs(type) {
|
|
1626
1626
|
// If the component type does not exist then it has no edit tabs
|
|
1627
|
-
if (!Components_1.default.components[type]) {
|
|
1627
|
+
if (!Components_1.default.components[type === 'custom' ? 'unknown' : type]) {
|
|
1628
1628
|
return false;
|
|
1629
1629
|
}
|
|
1630
1630
|
const editTabs = (0, formUtils_1.getComponent)(Components_1.default.components[type === 'custom' ? 'unknown' : type].editForm().components, 'tabs', true).components;
|
|
@@ -11,7 +11,7 @@ const EditFormUtils = {
|
|
|
11
11
|
},
|
|
12
12
|
unifyComponents(objValue, srcValue) {
|
|
13
13
|
if (objValue.key && srcValue.key) {
|
|
14
|
-
if (
|
|
14
|
+
if (objValue.skipMerge || srcValue.skipMerge) {
|
|
15
15
|
return false;
|
|
16
16
|
}
|
|
17
17
|
if (objValue.key === srcValue.key) {
|
|
@@ -1627,7 +1627,7 @@ export default class WebformBuilder extends Component {
|
|
|
1627
1627
|
}
|
|
1628
1628
|
hasEditTabs(type) {
|
|
1629
1629
|
// If the component type does not exist then it has no edit tabs
|
|
1630
|
-
if (!Components.components[type]) {
|
|
1630
|
+
if (!Components.components[type === 'custom' ? 'unknown' : type]) {
|
|
1631
1631
|
return false;
|
|
1632
1632
|
}
|
|
1633
1633
|
const editTabs = getComponent(Components.components[type === 'custom' ? 'unknown' : type].editForm().components, 'tabs', true).components;
|
|
@@ -6,7 +6,7 @@ const EditFormUtils = {
|
|
|
6
6
|
},
|
|
7
7
|
unifyComponents(objValue, srcValue) {
|
|
8
8
|
if (objValue.key && srcValue.key) {
|
|
9
|
-
if (
|
|
9
|
+
if (objValue.skipMerge || srcValue.skipMerge) {
|
|
10
10
|
return false;
|
|
11
11
|
}
|
|
12
12
|
if (objValue.key === srcValue.key) {
|