@formio/js 5.1.0-dev.6064.1c8db05 → 5.1.0-dev.6065.68180ce
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/components/_classes/component/editForm/utils.js +1 -1
- package/lib/cjs/components/address/editForm/Address.edit.display.d.ts +0 -4
- package/lib/cjs/components/address/editForm/Address.edit.display.js +0 -1
- package/lib/mjs/components/_classes/component/editForm/utils.js +1 -1
- package/lib/mjs/components/address/editForm/Address.edit.display.d.ts +0 -4
- package/lib/mjs/components/address/editForm/Address.edit.display.js +0 -1
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ const EditFormUtils = {
|
|
|
11
11
|
},
|
|
12
12
|
unifyComponents(objValue, srcValue) {
|
|
13
13
|
if (objValue.key && srcValue.key) {
|
|
14
|
-
if (objValue.skipMerge || srcValue.skipMerge) {
|
|
14
|
+
if ((objValue.skipMerge || srcValue.skipMerge) && !objValue.ignore) {
|
|
15
15
|
return false;
|
|
16
16
|
}
|
|
17
17
|
if (objValue.key === srcValue.key) {
|
|
@@ -8,7 +8,6 @@ declare const _default: ({
|
|
|
8
8
|
customConditional: ({ data }: {
|
|
9
9
|
data: any;
|
|
10
10
|
}) => boolean;
|
|
11
|
-
defaultValue?: undefined;
|
|
12
11
|
placeholder?: undefined;
|
|
13
12
|
validate?: undefined;
|
|
14
13
|
} | {
|
|
@@ -16,7 +15,6 @@ declare const _default: ({
|
|
|
16
15
|
type: string;
|
|
17
16
|
input: boolean;
|
|
18
17
|
key: string;
|
|
19
|
-
defaultValue: string;
|
|
20
18
|
label: string;
|
|
21
19
|
placeholder: string;
|
|
22
20
|
tooltip: string;
|
|
@@ -34,7 +32,6 @@ declare const _default: ({
|
|
|
34
32
|
label: string;
|
|
35
33
|
tooltip: string;
|
|
36
34
|
customConditional?: undefined;
|
|
37
|
-
defaultValue?: undefined;
|
|
38
35
|
placeholder?: undefined;
|
|
39
36
|
validate?: undefined;
|
|
40
37
|
} | {
|
|
@@ -48,7 +45,6 @@ declare const _default: ({
|
|
|
48
45
|
customConditional: ({ data }: {
|
|
49
46
|
data: any;
|
|
50
47
|
}) => any;
|
|
51
|
-
defaultValue?: undefined;
|
|
52
48
|
validate?: undefined;
|
|
53
49
|
})[];
|
|
54
50
|
export default _default;
|
|
@@ -15,7 +15,6 @@ exports.default = [
|
|
|
15
15
|
type: 'textfield',
|
|
16
16
|
input: true,
|
|
17
17
|
key: 'switchToManualModeLabel',
|
|
18
|
-
defaultValue: 'Can\'t find address? Switch to manual mode.',
|
|
19
18
|
label: 'Switch To Manual Mode Label',
|
|
20
19
|
placeholder: 'Switch To Manual Mode Label',
|
|
21
20
|
tooltip: 'The label for the checkbox used to switch to manual mode.',
|
|
@@ -6,7 +6,7 @@ const EditFormUtils = {
|
|
|
6
6
|
},
|
|
7
7
|
unifyComponents(objValue, srcValue) {
|
|
8
8
|
if (objValue.key && srcValue.key) {
|
|
9
|
-
if (objValue.skipMerge || srcValue.skipMerge) {
|
|
9
|
+
if ((objValue.skipMerge || srcValue.skipMerge) && !objValue.ignore) {
|
|
10
10
|
return false;
|
|
11
11
|
}
|
|
12
12
|
if (objValue.key === srcValue.key) {
|
|
@@ -8,7 +8,6 @@ declare const _default: ({
|
|
|
8
8
|
customConditional: ({ data }: {
|
|
9
9
|
data: any;
|
|
10
10
|
}) => boolean;
|
|
11
|
-
defaultValue?: undefined;
|
|
12
11
|
placeholder?: undefined;
|
|
13
12
|
validate?: undefined;
|
|
14
13
|
} | {
|
|
@@ -16,7 +15,6 @@ declare const _default: ({
|
|
|
16
15
|
type: string;
|
|
17
16
|
input: boolean;
|
|
18
17
|
key: string;
|
|
19
|
-
defaultValue: string;
|
|
20
18
|
label: string;
|
|
21
19
|
placeholder: string;
|
|
22
20
|
tooltip: string;
|
|
@@ -34,7 +32,6 @@ declare const _default: ({
|
|
|
34
32
|
label: string;
|
|
35
33
|
tooltip: string;
|
|
36
34
|
customConditional?: undefined;
|
|
37
|
-
defaultValue?: undefined;
|
|
38
35
|
placeholder?: undefined;
|
|
39
36
|
validate?: undefined;
|
|
40
37
|
} | {
|
|
@@ -48,7 +45,6 @@ declare const _default: ({
|
|
|
48
45
|
customConditional: ({ data }: {
|
|
49
46
|
data: any;
|
|
50
47
|
}) => any;
|
|
51
|
-
defaultValue?: undefined;
|
|
52
48
|
validate?: undefined;
|
|
53
49
|
})[];
|
|
54
50
|
export default _default;
|
|
@@ -13,7 +13,6 @@ export default [
|
|
|
13
13
|
type: 'textfield',
|
|
14
14
|
input: true,
|
|
15
15
|
key: 'switchToManualModeLabel',
|
|
16
|
-
defaultValue: 'Can\'t find address? Switch to manual mode.',
|
|
17
16
|
label: 'Switch To Manual Mode Label',
|
|
18
17
|
placeholder: 'Switch To Manual Mode Label',
|
|
19
18
|
tooltip: 'The label for the checkbox used to switch to manual mode.',
|