@formio/js 5.0.0-dev.5632.8d1873d → 5.0.0-dev.5634.e1468ca
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 +3 -3
- package/dist/formio.form.min.js +1 -1
- package/dist/formio.full.js +4 -4
- package/dist/formio.full.min.js +1 -1
- package/dist/formio.utils.js +1 -1
- package/dist/formio.utils.min.js +1 -1
- package/lib/cjs/WebformBuilder.js +6 -1
- package/lib/cjs/components/_classes/component/Component.js +3 -0
- package/lib/cjs/components/select/Select.js +1 -1
- package/lib/cjs/utils/utils.d.ts +0 -6
- package/lib/cjs/utils/utils.js +4 -15
- package/lib/mjs/WebformBuilder.js +6 -1
- package/lib/mjs/components/_classes/component/Component.js +3 -0
- package/lib/mjs/components/select/Select.js +2 -2
- package/lib/mjs/utils/utils.d.ts +0 -6
- package/lib/mjs/utils/utils.js +2 -12
- package/package.json +1 -1
|
@@ -987,7 +987,12 @@ class WebformBuilder extends Component_1.default {
|
|
|
987
987
|
parent.formioComponent.removeChildComponent(component);
|
|
988
988
|
}
|
|
989
989
|
if (component.input && componentInstance && componentInstance.parent) {
|
|
990
|
-
|
|
990
|
+
if (Array.isArray(parent.formioComponent.component.defaultValue)) {
|
|
991
|
+
parent.formioComponent.component.defaultValue.forEach(v => lodash_1.default.unset(v, componentInstance.key));
|
|
992
|
+
}
|
|
993
|
+
else if (typeof parent.formioComponent.component.defaultValue === 'object') {
|
|
994
|
+
lodash_1.default.unset(parent.formioComponent.component.defaultValue, componentInstance.key);
|
|
995
|
+
}
|
|
991
996
|
}
|
|
992
997
|
const rebuild = parent.formioComponent.rebuild() || Promise.resolve();
|
|
993
998
|
rebuild.then(() => {
|
|
@@ -1850,6 +1850,9 @@ class Component extends Element_1.default {
|
|
|
1850
1850
|
messages = lodash_1.default.uniqBy(messages, message => message.message);
|
|
1851
1851
|
if (this.refs.messageContainer) {
|
|
1852
1852
|
this.setContent(this.refs.messageContainer, messages.map((message) => {
|
|
1853
|
+
if (message.message && typeof message.message === 'string') {
|
|
1854
|
+
message.message = message.message.replaceAll('<', '<').replaceAll('>', '>');
|
|
1855
|
+
}
|
|
1853
1856
|
return this.renderTemplate('message', Object.assign({}, message));
|
|
1854
1857
|
}).join(''));
|
|
1855
1858
|
}
|
|
@@ -1526,7 +1526,7 @@ class SelectComponent extends ListComponent_1.default {
|
|
|
1526
1526
|
const getTemplateValue = (v) => {
|
|
1527
1527
|
const itemTemplate = this.itemTemplate(v);
|
|
1528
1528
|
return options.csv && itemTemplate
|
|
1529
|
-
? (0, utils_1.
|
|
1529
|
+
? (0, utils_1.unescapeHTML)(itemTemplate)
|
|
1530
1530
|
: itemTemplate;
|
|
1531
1531
|
};
|
|
1532
1532
|
if (Array.isArray(value)) {
|
package/lib/cjs/utils/utils.d.ts
CHANGED
|
@@ -107,12 +107,6 @@ export function checkCondition(component: any, row: any, data: any, form: any, i
|
|
|
107
107
|
*/
|
|
108
108
|
export function checkTrigger(component: any, trigger: any, row: any, data: any, form: any, instance: any): mixed;
|
|
109
109
|
export function setActionProperty(component: any, action: any, result: any, row: any, data: any, instance: any): any;
|
|
110
|
-
/**
|
|
111
|
-
* Removes HTML tags from string e.g. <div>Hello World</div> => Hello World
|
|
112
|
-
* @param {string} str
|
|
113
|
-
* @returns {string}
|
|
114
|
-
*/
|
|
115
|
-
export function removeHTML(str: string): string;
|
|
116
110
|
/**
|
|
117
111
|
* Unescape HTML characters like <, >, & and etc.
|
|
118
112
|
* @param str
|
package/lib/cjs/utils/utils.js
CHANGED
|
@@ -30,8 +30,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
30
30
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
31
31
|
};
|
|
32
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
-
exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.
|
|
34
|
-
exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload =
|
|
33
|
+
exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
|
|
34
|
+
exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = void 0;
|
|
35
35
|
const lodash_1 = __importDefault(require("lodash"));
|
|
36
36
|
exports._ = lodash_1.default;
|
|
37
37
|
const fetch_ponyfill_1 = __importDefault(require("fetch-ponyfill"));
|
|
@@ -448,16 +448,6 @@ function setActionProperty(component, action, result, row, data, instance) {
|
|
|
448
448
|
return component;
|
|
449
449
|
}
|
|
450
450
|
exports.setActionProperty = setActionProperty;
|
|
451
|
-
/**
|
|
452
|
-
* Removes HTML tags from string e.g. <div>Hello World</div> => Hello World
|
|
453
|
-
* @param {string} str
|
|
454
|
-
* @returns {string}
|
|
455
|
-
*/
|
|
456
|
-
function removeHTML(str) {
|
|
457
|
-
const doc = new window.DOMParser().parseFromString(str, 'text/html');
|
|
458
|
-
return (doc.body.textContent || '').trim();
|
|
459
|
-
}
|
|
460
|
-
exports.removeHTML = removeHTML;
|
|
461
451
|
/**
|
|
462
452
|
* Unescape HTML characters like <, >, & and etc.
|
|
463
453
|
* @param str
|
|
@@ -467,9 +457,8 @@ function unescapeHTML(str) {
|
|
|
467
457
|
if (typeof window === 'undefined' || !('DOMParser' in window)) {
|
|
468
458
|
return str;
|
|
469
459
|
}
|
|
470
|
-
const
|
|
471
|
-
|
|
472
|
-
return elem.value;
|
|
460
|
+
const doc = new window.DOMParser().parseFromString(str, 'text/html');
|
|
461
|
+
return doc.documentElement.textContent;
|
|
473
462
|
}
|
|
474
463
|
exports.unescapeHTML = unescapeHTML;
|
|
475
464
|
/**
|
|
@@ -971,7 +971,12 @@ export default class WebformBuilder extends Component {
|
|
|
971
971
|
parent.formioComponent.removeChildComponent(component);
|
|
972
972
|
}
|
|
973
973
|
if (component.input && componentInstance && componentInstance.parent) {
|
|
974
|
-
|
|
974
|
+
if (Array.isArray(parent.formioComponent.component.defaultValue)) {
|
|
975
|
+
parent.formioComponent.component.defaultValue.forEach(v => _.unset(v, componentInstance.key));
|
|
976
|
+
}
|
|
977
|
+
else if (typeof parent.formioComponent.component.defaultValue === 'object') {
|
|
978
|
+
_.unset(parent.formioComponent.component.defaultValue, componentInstance.key);
|
|
979
|
+
}
|
|
975
980
|
}
|
|
976
981
|
const rebuild = parent.formioComponent.rebuild() || Promise.resolve();
|
|
977
982
|
rebuild.then(() => {
|
|
@@ -1814,6 +1814,9 @@ export default class Component extends Element {
|
|
|
1814
1814
|
messages = _.uniqBy(messages, message => message.message);
|
|
1815
1815
|
if (this.refs.messageContainer) {
|
|
1816
1816
|
this.setContent(this.refs.messageContainer, messages.map((message) => {
|
|
1817
|
+
if (message.message && typeof message.message === 'string') {
|
|
1818
|
+
message.message = message.message.replaceAll('<', '<').replaceAll('>', '>');
|
|
1819
|
+
}
|
|
1817
1820
|
return this.renderTemplate('message', { ...message });
|
|
1818
1821
|
}).join(''));
|
|
1819
1822
|
}
|
|
@@ -3,7 +3,7 @@ import { Formio } from '../../Formio';
|
|
|
3
3
|
import ListComponent from '../_classes/list/ListComponent';
|
|
4
4
|
import Input from '../_classes/input/Input';
|
|
5
5
|
import Form from '../../Form';
|
|
6
|
-
import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, unescapeHTML, isSelectResourceWithObjectValue
|
|
6
|
+
import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, unescapeHTML, isSelectResourceWithObjectValue } from '../../utils/utils';
|
|
7
7
|
import Choices from '../../utils/ChoicesWrapper';
|
|
8
8
|
export default class SelectComponent extends ListComponent {
|
|
9
9
|
static schema(...extend) {
|
|
@@ -1551,7 +1551,7 @@ export default class SelectComponent extends ListComponent {
|
|
|
1551
1551
|
const getTemplateValue = (v) => {
|
|
1552
1552
|
const itemTemplate = this.itemTemplate(v);
|
|
1553
1553
|
return options.csv && itemTemplate
|
|
1554
|
-
?
|
|
1554
|
+
? unescapeHTML(itemTemplate)
|
|
1555
1555
|
: itemTemplate;
|
|
1556
1556
|
};
|
|
1557
1557
|
if (Array.isArray(value)) {
|
package/lib/mjs/utils/utils.d.ts
CHANGED
|
@@ -107,12 +107,6 @@ export function checkCondition(component: any, row: any, data: any, form: any, i
|
|
|
107
107
|
*/
|
|
108
108
|
export function checkTrigger(component: any, trigger: any, row: any, data: any, form: any, instance: any): mixed;
|
|
109
109
|
export function setActionProperty(component: any, action: any, result: any, row: any, data: any, instance: any): any;
|
|
110
|
-
/**
|
|
111
|
-
* Removes HTML tags from string e.g. <div>Hello World</div> => Hello World
|
|
112
|
-
* @param {string} str
|
|
113
|
-
* @returns {string}
|
|
114
|
-
*/
|
|
115
|
-
export function removeHTML(str: string): string;
|
|
116
110
|
/**
|
|
117
111
|
* Unescape HTML characters like <, >, & and etc.
|
|
118
112
|
* @param str
|
package/lib/mjs/utils/utils.js
CHANGED
|
@@ -395,15 +395,6 @@ export function setActionProperty(component, action, result, row, data, instance
|
|
|
395
395
|
}
|
|
396
396
|
return component;
|
|
397
397
|
}
|
|
398
|
-
/**
|
|
399
|
-
* Removes HTML tags from string e.g. <div>Hello World</div> => Hello World
|
|
400
|
-
* @param {string} str
|
|
401
|
-
* @returns {string}
|
|
402
|
-
*/
|
|
403
|
-
export function removeHTML(str) {
|
|
404
|
-
const doc = new window.DOMParser().parseFromString(str, 'text/html');
|
|
405
|
-
return (doc.body.textContent || '').trim();
|
|
406
|
-
}
|
|
407
398
|
/**
|
|
408
399
|
* Unescape HTML characters like <, >, & and etc.
|
|
409
400
|
* @param str
|
|
@@ -413,9 +404,8 @@ export function unescapeHTML(str) {
|
|
|
413
404
|
if (typeof window === 'undefined' || !('DOMParser' in window)) {
|
|
414
405
|
return str;
|
|
415
406
|
}
|
|
416
|
-
const
|
|
417
|
-
|
|
418
|
-
return elem.value;
|
|
407
|
+
const doc = new window.DOMParser().parseFromString(str, 'text/html');
|
|
408
|
+
return doc.documentElement.textContent;
|
|
419
409
|
}
|
|
420
410
|
/**
|
|
421
411
|
* Make HTML element from string
|