@formio/js 5.0.0 → 5.1.0-rc.2
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.embed.js +1 -1
- package/dist/formio.embed.min.js +1 -1
- package/dist/formio.embed.min.js.LICENSE.txt +1 -1
- package/dist/formio.form.js +127 -116
- package/dist/formio.form.min.js +1 -1
- package/dist/formio.form.min.js.LICENSE.txt +3 -3
- package/dist/formio.full.js +128 -117
- package/dist/formio.full.min.js +1 -1
- package/dist/formio.full.min.js.LICENSE.txt +3 -3
- package/dist/formio.js +3013 -283
- package/dist/formio.min.js +1 -1
- package/dist/formio.min.js.LICENSE.txt +14 -2
- package/dist/formio.utils.js +60 -49
- package/dist/formio.utils.min.js +1 -1
- package/dist/formio.utils.min.js.LICENSE.txt +3 -3
- package/lib/cjs/Webform.d.ts +8 -1
- package/lib/cjs/Webform.js +40 -32
- package/lib/cjs/WebformBuilder.js +4 -12
- package/lib/cjs/Wizard.js +4 -11
- package/lib/cjs/components/Components.d.ts +0 -7
- package/lib/cjs/components/Components.js +1 -33
- package/lib/cjs/components/_classes/component/Component.d.ts +52 -7
- package/lib/cjs/components/_classes/component/Component.js +120 -42
- package/lib/cjs/components/_classes/component/editForm/Component.edit.data.js +2 -2
- package/lib/cjs/components/_classes/componentModal/ComponentModal.d.ts +1 -0
- package/lib/cjs/components/_classes/componentModal/ComponentModal.js +1 -0
- package/lib/cjs/components/_classes/nested/NestedComponent.d.ts +4 -19
- package/lib/cjs/components/_classes/nested/NestedComponent.js +54 -60
- package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.d.ts +2 -1
- package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.js +7 -44
- package/lib/cjs/components/datagrid/DataGrid.d.ts +0 -1
- package/lib/cjs/components/datagrid/DataGrid.js +1 -45
- package/lib/cjs/components/datamap/DataMap.js +2 -3
- package/lib/cjs/components/editgrid/EditGrid.js +8 -11
- package/lib/cjs/components/form/Form.d.ts +8 -3
- package/lib/cjs/components/form/Form.js +31 -29
- package/lib/cjs/components/html/HTML.js +15 -3
- package/lib/cjs/components/selectboxes/SelectBoxes.js +0 -1
- package/lib/cjs/components/signature/Signature.d.ts +0 -1
- package/lib/cjs/components/signature/Signature.js +1 -1
- package/lib/cjs/utils/conditionOperators/DateGreaterThan.js +2 -2
- package/lib/cjs/utils/conditionOperators/IsEmptyValue.d.ts +2 -2
- package/lib/cjs/utils/conditionOperators/IsEmptyValue.js +2 -2
- package/lib/cjs/utils/conditionOperators/IsEqualTo.d.ts +2 -2
- package/lib/cjs/utils/conditionOperators/IsEqualTo.js +2 -2
- package/lib/cjs/utils/formUtils.d.ts +25 -14
- package/lib/cjs/utils/formUtils.js +11 -16
- package/lib/cjs/utils/utils.d.ts +1 -3
- package/lib/cjs/utils/utils.js +19 -35
- package/lib/mjs/Webform.d.ts +8 -1
- package/lib/mjs/Webform.js +37 -31
- package/lib/mjs/WebformBuilder.js +4 -12
- package/lib/mjs/Wizard.js +2 -8
- package/lib/mjs/components/Components.d.ts +0 -7
- package/lib/mjs/components/Components.js +1 -32
- package/lib/mjs/components/_classes/component/Component.d.ts +52 -7
- package/lib/mjs/components/_classes/component/Component.js +130 -43
- package/lib/mjs/components/_classes/component/editForm/Component.edit.data.js +2 -2
- package/lib/mjs/components/_classes/componentModal/ComponentModal.d.ts +1 -0
- package/lib/mjs/components/_classes/componentModal/ComponentModal.js +1 -0
- package/lib/mjs/components/_classes/nested/NestedComponent.d.ts +4 -19
- package/lib/mjs/components/_classes/nested/NestedComponent.js +55 -61
- package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.d.ts +2 -1
- package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.js +8 -43
- package/lib/mjs/components/datagrid/DataGrid.d.ts +0 -1
- package/lib/mjs/components/datagrid/DataGrid.js +1 -45
- package/lib/mjs/components/datamap/DataMap.js +2 -3
- package/lib/mjs/components/editgrid/EditGrid.js +11 -11
- package/lib/mjs/components/form/Form.d.ts +8 -3
- package/lib/mjs/components/form/Form.js +32 -29
- package/lib/mjs/components/html/HTML.js +15 -3
- package/lib/mjs/components/selectboxes/SelectBoxes.js +0 -1
- package/lib/mjs/components/signature/Signature.d.ts +0 -1
- package/lib/mjs/components/signature/Signature.js +1 -1
- package/lib/mjs/utils/conditionOperators/DateGreaterThan.js +2 -2
- package/lib/mjs/utils/conditionOperators/IsEmptyValue.d.ts +2 -2
- package/lib/mjs/utils/conditionOperators/IsEmptyValue.js +2 -2
- package/lib/mjs/utils/conditionOperators/IsEqualTo.d.ts +2 -2
- package/lib/mjs/utils/conditionOperators/IsEqualTo.js +2 -2
- package/lib/mjs/utils/formUtils.d.ts +25 -14
- package/lib/mjs/utils/formUtils.js +2 -12
- package/lib/mjs/utils/utils.d.ts +1 -3
- package/lib/mjs/utils/utils.js +18 -33
- package/package.json +4 -4
@@ -133,15 +133,11 @@ class FormComponent extends Component_1.default {
|
|
133
133
|
this.subFormRevision = undefined;
|
134
134
|
}
|
135
135
|
}
|
136
|
-
getComponent(path
|
137
|
-
|
138
|
-
|
139
|
-
path.shift();
|
140
|
-
}
|
141
|
-
const originalPathStr = `${this.path}.data.${(0, utils_1.getStringFromComponentPath)(path)}`;
|
142
|
-
if (this.subForm) {
|
143
|
-
return this.subForm.getComponent(path, fn, originalPathStr);
|
136
|
+
getComponent(path) {
|
137
|
+
if (!this.subForm) {
|
138
|
+
return null;
|
144
139
|
}
|
140
|
+
return this.subForm.getComponent(path);
|
145
141
|
}
|
146
142
|
/* eslint-disable max-statements */
|
147
143
|
getSubOptions(options = {}) {
|
@@ -209,6 +205,7 @@ class FormComponent extends Component_1.default {
|
|
209
205
|
if (this.options.skipDraftRestore) {
|
210
206
|
options.skipDraftRestore = this.options.skipDraftRestore;
|
211
207
|
}
|
208
|
+
options.parent = this;
|
212
209
|
return options;
|
213
210
|
}
|
214
211
|
/* eslint-enable max-statements */
|
@@ -297,6 +294,7 @@ class FormComponent extends Component_1.default {
|
|
297
294
|
const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
|
298
295
|
const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
|
299
296
|
this.componentModal = new ComponentModal_1.default(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
|
297
|
+
this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
|
300
298
|
this.setOpenModalElement();
|
301
299
|
}
|
302
300
|
this.calculateValue();
|
@@ -395,6 +393,10 @@ class FormComponent extends Component_1.default {
|
|
395
393
|
return (new Form_1.default(form, this.getSubOptions())).ready.then((instance) => {
|
396
394
|
this.subForm = instance;
|
397
395
|
this.subForm.currentForm = this;
|
396
|
+
const componentsMap = this.componentsMap;
|
397
|
+
const formComponentsMap = this.subForm.componentsMap;
|
398
|
+
lodash_1.default.assign(componentsMap, formComponentsMap);
|
399
|
+
this.component.components = this.subForm.components.map((comp) => comp.component);
|
398
400
|
this.subForm.parent = this;
|
399
401
|
this.subForm.parentVisible = this.visible;
|
400
402
|
this.subForm.on('change', () => {
|
@@ -413,6 +415,8 @@ class FormComponent extends Component_1.default {
|
|
413
415
|
this.valueChanged = this.hasSetValue;
|
414
416
|
this.onChange();
|
415
417
|
return this.subForm;
|
418
|
+
}).catch((err) => {
|
419
|
+
console.log(err);
|
416
420
|
});
|
417
421
|
}).then((subForm) => {
|
418
422
|
this.updateSubWizards(subForm);
|
@@ -421,10 +425,11 @@ class FormComponent extends Component_1.default {
|
|
421
425
|
return this.subFormReady;
|
422
426
|
}
|
423
427
|
hideSubmitButton(component) {
|
424
|
-
const isSubmitButton =
|
425
|
-
((component.action === 'submit') || !component.action);
|
428
|
+
const isSubmitButton = component.type === 'button' && (component.action === 'submit' || !component.action);
|
426
429
|
if (isSubmitButton) {
|
427
430
|
component.hidden = true;
|
431
|
+
// clearOnHide no longer clears from the JSON `hidden` flag, so we make the button conditionally hidden to clear its data
|
432
|
+
component.customConditional = 'show = false';
|
428
433
|
}
|
429
434
|
}
|
430
435
|
/**
|
@@ -434,7 +439,7 @@ class FormComponent extends Component_1.default {
|
|
434
439
|
*/
|
435
440
|
loadSubForm(fromAttach) {
|
436
441
|
var _a, _b, _c, _d, _e;
|
437
|
-
if (this.builderMode || this.
|
442
|
+
if (this.builderMode || this.conditionallyHidden || (this.isSubFormLazyLoad() && !fromAttach)) {
|
438
443
|
return Promise.resolve();
|
439
444
|
}
|
440
445
|
if (this.hasLoadedForm && !this.isRevisionChanged &&
|
@@ -469,18 +474,6 @@ class FormComponent extends Component_1.default {
|
|
469
474
|
}
|
470
475
|
return Promise.resolve();
|
471
476
|
}
|
472
|
-
get subFormData() {
|
473
|
-
var _a;
|
474
|
-
return ((_a = this.dataValue) === null || _a === void 0 ? void 0 : _a.data) || {};
|
475
|
-
}
|
476
|
-
checkComponentValidity(data, dirty, row, options, errors = []) {
|
477
|
-
options = options || {};
|
478
|
-
const silentCheck = options.silentCheck || false;
|
479
|
-
if (this.subForm) {
|
480
|
-
return this.subForm.checkValidity(this.subFormData, dirty, null, silentCheck, errors);
|
481
|
-
}
|
482
|
-
return super.checkComponentValidity(data, dirty, row, options, errors);
|
483
|
-
}
|
484
477
|
checkComponentConditions(data, flags, row) {
|
485
478
|
const visible = super.checkComponentConditions(data, flags, row);
|
486
479
|
// Return if already hidden
|
@@ -488,14 +481,14 @@ class FormComponent extends Component_1.default {
|
|
488
481
|
return visible;
|
489
482
|
}
|
490
483
|
if (this.subForm) {
|
491
|
-
return this.subForm.checkConditions(
|
484
|
+
return this.subForm.checkConditions(data, flags, row);
|
492
485
|
}
|
493
486
|
// There are few cases when subForm is not loaded when a change is triggered,
|
494
487
|
// so we need to perform checkConditions after it is ready, or some conditional fields might be hidden in View mode
|
495
488
|
else if (this.subFormReady) {
|
496
489
|
this.subFormReady.then(() => {
|
497
490
|
if (this.subForm) {
|
498
|
-
return this.subForm.checkConditions(
|
491
|
+
return this.subForm.checkConditions(data, flags, row);
|
499
492
|
}
|
500
493
|
});
|
501
494
|
}
|
@@ -503,7 +496,7 @@ class FormComponent extends Component_1.default {
|
|
503
496
|
}
|
504
497
|
calculateValue(data, flags, row) {
|
505
498
|
if (this.subForm) {
|
506
|
-
return this.subForm.calculateValue(
|
499
|
+
return this.subForm.calculateValue(data, flags, row);
|
507
500
|
}
|
508
501
|
return super.calculateValue(data, flags, row);
|
509
502
|
}
|
@@ -518,7 +511,7 @@ class FormComponent extends Component_1.default {
|
|
518
511
|
* @returns {*|boolean} - TRUE if the subform should be submitted, FALSE if it should not.
|
519
512
|
*/
|
520
513
|
get shouldSubmit() {
|
521
|
-
return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && !this.
|
514
|
+
return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && !this.conditionallyHidden;
|
522
515
|
}
|
523
516
|
/**
|
524
517
|
* Returns the data for the subform.
|
@@ -545,7 +538,7 @@ class FormComponent extends Component_1.default {
|
|
545
538
|
}
|
546
539
|
this.subForm.nosubmit = false;
|
547
540
|
this.subForm.submitted = true;
|
548
|
-
return this.subForm.submitForm().then(result => {
|
541
|
+
return this.subForm.submitForm({}, true).then(result => {
|
549
542
|
this.subForm.loading = false;
|
550
543
|
this.subForm.showAllErrors = false;
|
551
544
|
this.dataValue = result.submission;
|
@@ -649,9 +642,18 @@ class FormComponent extends Component_1.default {
|
|
649
642
|
});
|
650
643
|
}
|
651
644
|
else {
|
652
|
-
this.
|
645
|
+
this.onSetSubFormValue(submission, flags);
|
653
646
|
}
|
654
647
|
}
|
648
|
+
/**
|
649
|
+
* Sets the subform value
|
650
|
+
* @param {object|null|undefined} submission - The submission to set.
|
651
|
+
* @param {object|null|undefined} flags - Any flags to apply when setting the submission.
|
652
|
+
* @return {void}
|
653
|
+
*/
|
654
|
+
onSetSubFormValue(submission, flags) {
|
655
|
+
this.subForm.setValue(submission, flags);
|
656
|
+
}
|
655
657
|
isEmpty(value = this.dataValue) {
|
656
658
|
return value === null || lodash_1.default.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value === null || value === void 0 ? void 0 : value.data) && !(value === null || value === void 0 ? void 0 : value._id));
|
657
659
|
}
|
@@ -56,9 +56,21 @@ class HTMLComponent extends Component_1.default {
|
|
56
56
|
}
|
57
57
|
checkRefreshOn(changed) {
|
58
58
|
super.checkRefreshOn(changed);
|
59
|
-
|
60
|
-
|
61
|
-
this.
|
59
|
+
let visible;
|
60
|
+
if (this.hasCondition()) {
|
61
|
+
this._conditionallyHidden = this.checkConditionallyHidden();
|
62
|
+
visible = !this.conditionallyHidden;
|
63
|
+
}
|
64
|
+
else {
|
65
|
+
visible = !this.component.hidden;
|
66
|
+
}
|
67
|
+
const shouldSetContent = !this.builderMode
|
68
|
+
&& this.component.refreshOnChange
|
69
|
+
&& this.element
|
70
|
+
&& !lodash_1.default.isUndefined(changed)
|
71
|
+
&& ((lodash_1.default.isBoolean(changed) && changed) || !lodash_1.default.isEmpty(changed))
|
72
|
+
&& visible;
|
73
|
+
if (shouldSetContent) {
|
62
74
|
this.setContent(this.element, this.renderContent());
|
63
75
|
}
|
64
76
|
}
|
@@ -22,7 +22,6 @@ export default class SignatureComponent extends Input {
|
|
22
22
|
showCanvas(show: any): void;
|
23
23
|
onDisabled(): void;
|
24
24
|
checkSize(force: any, scale: any): void;
|
25
|
-
getModalPreviewTemplate(): any;
|
26
25
|
signaturePad: SignaturePad | null | undefined;
|
27
26
|
observer: any;
|
28
27
|
getValueAsString(value: any): "" | "Yes" | "No";
|
@@ -172,7 +172,7 @@ class SignatureComponent extends Input_1.default {
|
|
172
172
|
return false;
|
173
173
|
}
|
174
174
|
getModalPreviewTemplate() {
|
175
|
-
return this.
|
175
|
+
return this.renderModalPreview({
|
176
176
|
previewText: this.dataValue ?
|
177
177
|
`<img src=${this.dataValue} ${this._referenceAttributeName}='openModal' style="width: 100%;height: 100%;" />` :
|
178
178
|
this.t('Click to Sign')
|
@@ -20,13 +20,13 @@ class DateGeaterThan extends ConditionOperator_1.default {
|
|
20
20
|
}
|
21
21
|
execute(options, functionName = 'isAfter') {
|
22
22
|
var _a;
|
23
|
-
const { value, instance,
|
23
|
+
const { value, instance, path } = options;
|
24
24
|
if (!value) {
|
25
25
|
return false;
|
26
26
|
}
|
27
27
|
let conditionTriggerComponent = null;
|
28
28
|
if ((_a = instance === null || instance === void 0 ? void 0 : instance.root) === null || _a === void 0 ? void 0 : _a.getComponent) {
|
29
|
-
conditionTriggerComponent = instance.root.getComponent(
|
29
|
+
conditionTriggerComponent = instance.root.getComponent(path);
|
30
30
|
}
|
31
31
|
if (conditionTriggerComponent && conditionTriggerComponent.isPartialDay && conditionTriggerComponent.isPartialDay(value)) {
|
32
32
|
return false;
|
@@ -1,8 +1,8 @@
|
|
1
1
|
export default class IsEmptyValue extends ConditionOperator {
|
2
|
-
execute({ value, instance,
|
2
|
+
execute({ value, instance, path }: {
|
3
3
|
value: any;
|
4
4
|
instance: any;
|
5
|
-
|
5
|
+
path: any;
|
6
6
|
}): any;
|
7
7
|
getResult(options: any): any;
|
8
8
|
}
|
@@ -15,11 +15,11 @@ class IsEmptyValue extends ConditionOperator_1.default {
|
|
15
15
|
static get requireValue() {
|
16
16
|
return false;
|
17
17
|
}
|
18
|
-
execute({ value, instance,
|
18
|
+
execute({ value, instance, path }) {
|
19
19
|
var _a;
|
20
20
|
const isEmptyValue = lodash_1.default.isEmpty(lodash_1.default.isNumber(value) ? String(value) : value);
|
21
21
|
if ((_a = instance === null || instance === void 0 ? void 0 : instance.root) === null || _a === void 0 ? void 0 : _a.getComponent) {
|
22
|
-
const conditionTriggerComponent = instance.root.getComponent(
|
22
|
+
const conditionTriggerComponent = instance.root.getComponent(path);
|
23
23
|
return (conditionTriggerComponent === null || conditionTriggerComponent === void 0 ? void 0 : conditionTriggerComponent.isEmpty) ? conditionTriggerComponent.isEmpty() : isEmptyValue;
|
24
24
|
}
|
25
25
|
return isEmptyValue;
|
@@ -1,9 +1,9 @@
|
|
1
1
|
export default class IsEqualTo extends ConditionOperator {
|
2
|
-
execute({ value, comparedValue, instance,
|
2
|
+
execute({ value, comparedValue, instance, path }: {
|
3
3
|
value: any;
|
4
4
|
comparedValue: any;
|
5
5
|
instance: any;
|
6
|
-
|
6
|
+
path: any;
|
7
7
|
}): any;
|
8
8
|
}
|
9
9
|
import ConditionOperator from './ConditionOperator';
|
@@ -13,7 +13,7 @@ class IsEqualTo extends ConditionOperator_1.default {
|
|
13
13
|
static get displayedName() {
|
14
14
|
return 'Is Equal To';
|
15
15
|
}
|
16
|
-
execute({ value, comparedValue, instance,
|
16
|
+
execute({ value, comparedValue, instance, path }) {
|
17
17
|
var _a, _b;
|
18
18
|
if ((value || value === false) && comparedValue && typeof value !== typeof comparedValue && lodash_1.default.isString(comparedValue)) {
|
19
19
|
try {
|
@@ -23,7 +23,7 @@ class IsEqualTo extends ConditionOperator_1.default {
|
|
23
23
|
catch (e) { }
|
24
24
|
}
|
25
25
|
if ((_a = instance === null || instance === void 0 ? void 0 : instance.root) === null || _a === void 0 ? void 0 : _a.getComponent) {
|
26
|
-
const conditionTriggerComponent = instance.root.getComponent(
|
26
|
+
const conditionTriggerComponent = instance.root.getComponent(path);
|
27
27
|
if (conditionTriggerComponent
|
28
28
|
&& (0, utils_1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
|
29
29
|
&& ((_b = conditionTriggerComponent.component) === null || _b === void 0 ? void 0 : _b.template)) {
|
@@ -1,22 +1,33 @@
|
|
1
|
-
/**
|
2
|
-
* Deprecated version of findComponents. Renamed to searchComponents.
|
3
|
-
* @param {import('@formio/core').Component[]} components - The components to find components within.
|
4
|
-
* @param {object} query - The query to use when searching for the components.
|
5
|
-
* @returns {import('@formio/core').Component[]} - The result of the component that is found.
|
6
|
-
*/
|
7
|
-
export function findComponents(components: import('@formio/core').Component[], query: object): import('@formio/core').Component[];
|
8
1
|
export const flattenComponents: typeof Utils.flattenComponents;
|
9
2
|
export const guid: typeof Utils.guid;
|
10
3
|
export const uniqueName: typeof Utils.uniqueName;
|
11
|
-
export const
|
4
|
+
export const MODEL_TYPES_OF_KNOWN_COMPONENTS: {
|
5
|
+
nestedArray: string[];
|
6
|
+
nestedDataArray: string[];
|
7
|
+
dataObject: string[];
|
8
|
+
object: string[];
|
9
|
+
map: string[];
|
10
|
+
content: string[];
|
11
|
+
string: string[];
|
12
|
+
number: string[];
|
13
|
+
boolean: string[];
|
14
|
+
none: string[];
|
15
|
+
any: string[];
|
16
|
+
};
|
12
17
|
export const getModelType: typeof Utils.getModelType;
|
13
|
-
export const
|
14
|
-
export const
|
18
|
+
export const getComponentPath: any;
|
19
|
+
export const setComponentScope: typeof Utils.setComponentScope;
|
20
|
+
export const resetComponentScope: typeof Utils.resetComponentScope;
|
15
21
|
export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
|
16
22
|
export const componentPath: typeof Utils.componentPath;
|
17
|
-
export const
|
18
|
-
export const
|
19
|
-
export const
|
23
|
+
export const getComponentPaths: typeof Utils.getComponentPaths;
|
24
|
+
export const componentMatches: typeof Utils.componentMatches;
|
25
|
+
export const getBestMatch: typeof Utils.getBestMatch;
|
26
|
+
export const getComponentFromPath: typeof Utils.getComponentFromPath;
|
27
|
+
export const getComponentValue: typeof Utils.getComponentValue;
|
28
|
+
export const findComponents: typeof Utils.findComponents;
|
29
|
+
export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => Promise<void>;
|
30
|
+
export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => void;
|
20
31
|
export const getComponentKey: typeof Utils.getComponentKey;
|
21
32
|
export const getContextualRowPath: typeof Utils.getContextualRowPath;
|
22
33
|
export const getContextualRowData: typeof Utils.getContextualRowData;
|
@@ -24,7 +35,7 @@ export const componentInfo: typeof Utils.componentInfo;
|
|
24
35
|
export const eachComponent: typeof Utils.eachComponent;
|
25
36
|
export const eachComponentAsync: typeof Utils.eachComponentAsync;
|
26
37
|
export const getComponentData: typeof Utils.getComponentData;
|
27
|
-
export const getComponentActualValue:
|
38
|
+
export const getComponentActualValue: any;
|
28
39
|
export const isLayoutComponent: typeof Utils.isLayoutComponent;
|
29
40
|
export const matchComponent: typeof Utils.matchComponent;
|
30
41
|
export const getComponent: typeof Utils.getComponent;
|
@@ -1,18 +1,24 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.getItemTemplateKeys = exports.compareSelectResourceWithObjectTypeValues = exports.isSelectResourceWithObjectValue = exports.isComponentDataEmpty = exports.getEmptyValue = exports.findComponent = exports.applyFormChanges = exports.generateFormChange = exports.getStrings = exports.getValue = exports.escapeRegExCharacters = exports.formatAsCurrency = exports.parseFloatExt = exports.hasCondition = exports.removeComponent = exports.searchComponents = exports.getComponent = exports.matchComponent = exports.isLayoutComponent = exports.getComponentActualValue = exports.getComponentData = exports.eachComponentAsync = exports.eachComponent = exports.componentInfo = exports.getContextualRowData = exports.getContextualRowPath = exports.getComponentKey = exports.eachComponentData = exports.eachComponentDataAsync = exports.
|
3
|
+
exports.getItemTemplateKeys = exports.compareSelectResourceWithObjectTypeValues = exports.isSelectResourceWithObjectValue = exports.isComponentDataEmpty = exports.getEmptyValue = exports.findComponent = exports.applyFormChanges = exports.generateFormChange = exports.getStrings = exports.getValue = exports.escapeRegExCharacters = exports.formatAsCurrency = exports.parseFloatExt = exports.hasCondition = exports.removeComponent = exports.searchComponents = exports.getComponent = exports.matchComponent = exports.isLayoutComponent = exports.getComponentActualValue = exports.getComponentData = exports.eachComponentAsync = exports.eachComponent = exports.componentInfo = exports.getContextualRowData = exports.getContextualRowPath = exports.getComponentKey = exports.eachComponentData = exports.eachComponentDataAsync = exports.findComponents = exports.getComponentValue = exports.getComponentFromPath = exports.getBestMatch = exports.componentMatches = exports.getComponentPaths = exports.componentPath = exports.isComponentNestedDataType = exports.resetComponentScope = exports.setComponentScope = exports.getComponentPath = exports.getModelType = exports.MODEL_TYPES_OF_KNOWN_COMPONENTS = exports.uniqueName = exports.guid = exports.flattenComponents = void 0;
|
4
4
|
const core_1 = require("@formio/core");
|
5
|
-
const { flattenComponents, guid, uniqueName,
|
5
|
+
const { flattenComponents, guid, uniqueName, MODEL_TYPES_OF_KNOWN_COMPONENTS, getModelType, getComponentPath, setComponentScope, resetComponentScope, isComponentNestedDataType, componentPath, getComponentPaths, componentMatches, getBestMatch, getComponentFromPath, getComponentValue, findComponents, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys } = core_1.Utils;
|
6
6
|
exports.flattenComponents = flattenComponents;
|
7
7
|
exports.guid = guid;
|
8
8
|
exports.uniqueName = uniqueName;
|
9
|
-
exports.
|
9
|
+
exports.MODEL_TYPES_OF_KNOWN_COMPONENTS = MODEL_TYPES_OF_KNOWN_COMPONENTS;
|
10
10
|
exports.getModelType = getModelType;
|
11
|
-
exports.getComponentAbsolutePath = getComponentAbsolutePath;
|
12
11
|
exports.getComponentPath = getComponentPath;
|
12
|
+
exports.setComponentScope = setComponentScope;
|
13
|
+
exports.resetComponentScope = resetComponentScope;
|
13
14
|
exports.isComponentNestedDataType = isComponentNestedDataType;
|
14
15
|
exports.componentPath = componentPath;
|
15
|
-
exports.
|
16
|
+
exports.getComponentPaths = getComponentPaths;
|
17
|
+
exports.componentMatches = componentMatches;
|
18
|
+
exports.getBestMatch = getBestMatch;
|
19
|
+
exports.getComponentFromPath = getComponentFromPath;
|
20
|
+
exports.getComponentValue = getComponentValue;
|
21
|
+
exports.findComponents = findComponents;
|
16
22
|
exports.eachComponentDataAsync = eachComponentDataAsync;
|
17
23
|
exports.eachComponentData = eachComponentData;
|
18
24
|
exports.getComponentKey = getComponentKey;
|
@@ -42,14 +48,3 @@ exports.isComponentDataEmpty = isComponentDataEmpty;
|
|
42
48
|
exports.isSelectResourceWithObjectValue = isSelectResourceWithObjectValue;
|
43
49
|
exports.compareSelectResourceWithObjectTypeValues = compareSelectResourceWithObjectTypeValues;
|
44
50
|
exports.getItemTemplateKeys = getItemTemplateKeys;
|
45
|
-
/**
|
46
|
-
* Deprecated version of findComponents. Renamed to searchComponents.
|
47
|
-
* @param {import('@formio/core').Component[]} components - The components to find components within.
|
48
|
-
* @param {object} query - The query to use when searching for the components.
|
49
|
-
* @returns {import('@formio/core').Component[]} - The result of the component that is found.
|
50
|
-
*/
|
51
|
-
function findComponents(components, query) {
|
52
|
-
console.warn('formio.js/utils findComponents is deprecated. Use searchComponents instead.');
|
53
|
-
return searchComponents(components, query);
|
54
|
-
}
|
55
|
-
exports.findComponents = findComponents;
|
package/lib/cjs/utils/utils.d.ts
CHANGED
@@ -462,10 +462,9 @@ export function getComponentPathWithoutIndicies(path?: string): string;
|
|
462
462
|
/**
|
463
463
|
* Returns a path to the component which based on its schema
|
464
464
|
* @param {import('@formio/core').Component} component - Component containing link to its parent's schema in the 'parent' property
|
465
|
-
* @param {string} path - Path to the component
|
466
465
|
* @returns {string} - Path to the component
|
467
466
|
*/
|
468
|
-
export function getComponentPath(component: import('@formio/core').Component
|
467
|
+
export function getComponentPath(component: import('@formio/core').Component): string;
|
469
468
|
/**
|
470
469
|
* Returns a parent component of the passed component instance skipping all the Layout components
|
471
470
|
* @param {Component} componentInstance - The component to check for the parent.
|
@@ -515,7 +514,6 @@ export namespace componentValueTypes {
|
|
515
514
|
let any: string;
|
516
515
|
}
|
517
516
|
export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
|
518
|
-
import jsonLogic from 'json-logic-js';
|
519
517
|
import ConditionOperators from './conditionOperators';
|
520
518
|
import { Evaluator } from './Evaluator';
|
521
519
|
export const interpolate: typeof Evaluator.interpolate;
|
package/lib/cjs/utils/utils.js
CHANGED
@@ -51,17 +51,6 @@ json_logic_js_1.default.add_operation('relativeMinDate', (relativeMinDate) => {
|
|
51
51
|
json_logic_js_1.default.add_operation('relativeMaxDate', (relativeMaxDate) => {
|
52
52
|
return (0, moment_timezone_1.default)().add(relativeMaxDate, 'days').toISOString();
|
53
53
|
});
|
54
|
-
/**
|
55
|
-
* Sets the path to the component and parent schema.
|
56
|
-
* @param {import('@formio/core').Component} component - The component to set the path for.
|
57
|
-
*/
|
58
|
-
function setPathToComponentAndPerentSchema(component) {
|
59
|
-
component.path = getComponentPath(component);
|
60
|
-
const dataParent = getDataParentComponent(component);
|
61
|
-
if (dataParent && typeof dataParent === 'object') {
|
62
|
-
dataParent.path = getComponentPath(dataParent);
|
63
|
-
}
|
64
|
-
}
|
65
54
|
/**
|
66
55
|
* Evaluate a method.
|
67
56
|
* @param {Function|string|object} func - The function to evaluate.
|
@@ -262,7 +251,7 @@ function checkSimpleConditional(component, condition, row, data, instance) {
|
|
262
251
|
const value = getComponentActualValue(path, data, row);
|
263
252
|
const ConditionOperator = conditionOperators_1.default[operator];
|
264
253
|
return ConditionOperator
|
265
|
-
? new ConditionOperator().getResult({ value, comparedValue, instance, component,
|
254
|
+
? new ConditionOperator().getResult({ value, comparedValue, instance, component, path })
|
266
255
|
: true;
|
267
256
|
});
|
268
257
|
}
|
@@ -270,7 +259,7 @@ function checkSimpleConditional(component, condition, row, data, instance) {
|
|
270
259
|
const value = getComponentActualValue(conditionComponentPath, data, row);
|
271
260
|
const СonditionOperator = conditionOperators_1.default[operator];
|
272
261
|
return СonditionOperator
|
273
|
-
? new СonditionOperator().getResult({ value, comparedValue, instance, component, conditionComponentPath })
|
262
|
+
? new СonditionOperator().getResult({ value, comparedValue, instance, component, path: conditionComponentPath })
|
274
263
|
: true;
|
275
264
|
}
|
276
265
|
});
|
@@ -295,12 +284,12 @@ exports.checkSimpleConditional = checkSimpleConditional;
|
|
295
284
|
*/
|
296
285
|
function getComponentActualValue(compPath, data, row) {
|
297
286
|
let value = null;
|
298
|
-
if (
|
299
|
-
value = (0, formUtils_1.getValue)({ data: row }, compPath);
|
300
|
-
}
|
301
|
-
if (data && lodash_1.default.isNil(value)) {
|
287
|
+
if (data) {
|
302
288
|
value = (0, formUtils_1.getValue)({ data }, compPath);
|
303
289
|
}
|
290
|
+
if (row && lodash_1.default.isNil(value)) {
|
291
|
+
value = (0, formUtils_1.getValue)({ data: row }, compPath);
|
292
|
+
}
|
304
293
|
// FOR-400 - Fix issue where falsey values were being evaluated as show=true
|
305
294
|
if (lodash_1.default.isNil(value) || (lodash_1.default.isObject(value) && lodash_1.default.isEmpty(value))) {
|
306
295
|
value = '';
|
@@ -367,22 +356,23 @@ exports.checkJsonConditional = checkJsonConditional;
|
|
367
356
|
* @returns {*} - The contextual row data for the component.
|
368
357
|
*/
|
369
358
|
function getRow(component, row, instance, conditional) {
|
370
|
-
var _a;
|
359
|
+
var _a, _b, _c;
|
371
360
|
const condition = conditional || component.conditional;
|
372
361
|
// If no component's instance passed (happens only in 6.x server), calculate its path based on the schema
|
373
362
|
if (!instance) {
|
374
363
|
instance = lodash_1.default.cloneDeep(component);
|
375
|
-
setPathToComponentAndPerentSchema(instance);
|
376
364
|
}
|
377
365
|
const dataParent = getDataParentComponent(instance);
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
366
|
+
if (dataParent) {
|
367
|
+
const parentPath = (_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localDataPath;
|
368
|
+
const isTriggerCondtionComponentPath = condition.when || !condition.conditions
|
369
|
+
? (_b = condition.when) === null || _b === void 0 ? void 0 : _b.startsWith((_c = dataParent.paths) === null || _c === void 0 ? void 0 : _c.localPath)
|
370
|
+
: lodash_1.default.some(condition.conditions, cond => { var _a; return cond.component.startsWith((_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localPath); });
|
371
|
+
if (isTriggerCondtionComponentPath) {
|
372
|
+
const newRow = {};
|
373
|
+
lodash_1.default.set(newRow, parentPath, row);
|
374
|
+
row = newRow;
|
375
|
+
}
|
386
376
|
}
|
387
377
|
return row;
|
388
378
|
}
|
@@ -1566,16 +1556,10 @@ exports.getComponentPathWithoutIndicies = getComponentPathWithoutIndicies;
|
|
1566
1556
|
/**
|
1567
1557
|
* Returns a path to the component which based on its schema
|
1568
1558
|
* @param {import('@formio/core').Component} component - Component containing link to its parent's schema in the 'parent' property
|
1569
|
-
* @param {string} path - Path to the component
|
1570
1559
|
* @returns {string} - Path to the component
|
1571
1560
|
*/
|
1572
|
-
function getComponentPath(component
|
1573
|
-
|
1574
|
-
if (!component || !component.key || ((_a = component === null || component === void 0 ? void 0 : component._form) === null || _a === void 0 ? void 0 : _a.display) === 'wizard') { // unlike the Webform, the Wizard has the key and it is a duplicate of the panel key
|
1575
|
-
return path;
|
1576
|
-
}
|
1577
|
-
path = component.isInputComponent || component.input === true ? `${component.key}${path ? '.' : ''}${path}` : path;
|
1578
|
-
return getComponentPath(component.parent, path);
|
1561
|
+
function getComponentPath(component) {
|
1562
|
+
return component.paths.localDataPath;
|
1579
1563
|
}
|
1580
1564
|
exports.getComponentPath = getComponentPath;
|
1581
1565
|
/**
|
package/lib/mjs/Webform.d.ts
CHANGED
@@ -330,6 +330,13 @@ declare class Webform extends NestedDataComponent {
|
|
330
330
|
* @returns {object} - The submission object.
|
331
331
|
*/
|
332
332
|
get submission(): object;
|
333
|
+
/**
|
334
|
+
* Sets the submission value
|
335
|
+
* @param {object|null|undefined} submission - The submission to set.
|
336
|
+
* @param {object|null|undefined} flags - Any flags to apply when setting the submission.
|
337
|
+
* @return {void}
|
338
|
+
*/
|
339
|
+
onSetSubmission(submission: object | null | undefined, flags?: object | null | undefined): void;
|
333
340
|
/**
|
334
341
|
* Sets a submission and returns the promise when it is ready.
|
335
342
|
* @param {any} submission - The submission to set.
|
@@ -419,7 +426,7 @@ declare class Webform extends NestedDataComponent {
|
|
419
426
|
*/
|
420
427
|
cancel(noconfirm: boolean): boolean;
|
421
428
|
setMetadata(submission: any): void;
|
422
|
-
submitForm(options?: {}): Promise<any>;
|
429
|
+
submitForm(options?: {}, local?: boolean): Promise<any>;
|
423
430
|
setServerErrors(error: any): void;
|
424
431
|
serverErrors: any;
|
425
432
|
executeSubmit(options: any): Promise<object>;
|