iglooform 2.5.41 → 2.5.43
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/es/input/amount.js +0 -1
- package/es/utils/form-utils.js +5 -9
- package/lib/input/amount.js +0 -1
- package/lib/utils/form-utils.js +5 -9
- package/package.json +1 -1
- package/yarn-error.log +0 -13769
package/es/input/amount.js
CHANGED
|
@@ -86,7 +86,6 @@ Amount.formItemPropsHandler = function (_ref2) {
|
|
|
86
86
|
return {
|
|
87
87
|
getValueFromEvent: function getValueFromEvent(e) {
|
|
88
88
|
var value = e.target.value;
|
|
89
|
-
console.log('======', separator, decimalSeparator);
|
|
90
89
|
var str = value.replaceAll(separator, '').replaceAll(/[^0-9\.,]/g, '');
|
|
91
90
|
|
|
92
91
|
if (str.endsWith(decimalSeparator) || str.includes(decimalSeparator) && str.endsWith('0')) {
|
package/es/utils/form-utils.js
CHANGED
|
@@ -103,11 +103,7 @@ export var testAssert = function testAssert(form, assert) {
|
|
|
103
103
|
return true;
|
|
104
104
|
};
|
|
105
105
|
|
|
106
|
-
var calcRequired = function calcRequired() {
|
|
107
|
-
var required = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
|
108
|
-
var form = arguments.length > 1 ? arguments[1] : undefined;
|
|
109
|
-
var requiredAsserts = arguments.length > 2 ? arguments[2] : undefined;
|
|
110
|
-
|
|
106
|
+
var calcRequired = function calcRequired(required, form, requiredAsserts) {
|
|
111
107
|
if (Array.isArray(requiredAsserts)) {
|
|
112
108
|
return requiredAsserts.every(function (assert) {
|
|
113
109
|
return form && testAssert(form, assert);
|
|
@@ -120,7 +116,8 @@ var calcRequired = function calcRequired() {
|
|
|
120
116
|
export var calcFormItemProps = function calcFormItemProps(config, extraProps, form, parentName) {
|
|
121
117
|
var type = config.type,
|
|
122
118
|
nameProp = config.name,
|
|
123
|
-
required = config.required,
|
|
119
|
+
_config$required = config.required,
|
|
120
|
+
required = _config$required === void 0 ? true : _config$required,
|
|
124
121
|
requiredAsserts = config.requiredAsserts,
|
|
125
122
|
_config$showOptional = config.showOptional,
|
|
126
123
|
showOptional = _config$showOptional === void 0 ? false : _config$showOptional,
|
|
@@ -184,14 +181,13 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
|
|
|
184
181
|
extraValueFormater = _extraProps$valueForm === void 0 ? function (value) {
|
|
185
182
|
return value;
|
|
186
183
|
} : _extraProps$valueForm,
|
|
187
|
-
|
|
188
|
-
extraRequired = _extraProps$required === void 0 ? true : _extraProps$required,
|
|
184
|
+
extraRequired = extraProps.required,
|
|
189
185
|
_extraProps$requiredM = extraProps.requiredMark,
|
|
190
186
|
requiredMark = _extraProps$requiredM === void 0 ? false : _extraProps$requiredM,
|
|
191
187
|
className = extraProps.className,
|
|
192
188
|
extraRest = _objectWithoutProperties(extraProps, _excluded2);
|
|
193
189
|
|
|
194
|
-
var rules = calcRequired(required
|
|
190
|
+
var rules = calcRequired(required !== null && required !== void 0 ? required : extraRequired, form, requiredAsserts) ? [{
|
|
195
191
|
required: type !== 'Declaration',
|
|
196
192
|
message: requiredMessage || extraRequiredMessage
|
|
197
193
|
}].concat(_toConsumableArray(propsRules)) : _toConsumableArray(propsRules);
|
package/lib/input/amount.js
CHANGED
|
@@ -102,7 +102,6 @@ Amount.formItemPropsHandler = function (_ref2) {
|
|
|
102
102
|
return {
|
|
103
103
|
getValueFromEvent: function getValueFromEvent(e) {
|
|
104
104
|
var value = e.target.value;
|
|
105
|
-
console.log('======', separator, decimalSeparator);
|
|
106
105
|
var str = value.replaceAll(separator, '').replaceAll(/[^0-9\.,]/g, '');
|
|
107
106
|
|
|
108
107
|
if (str.endsWith(decimalSeparator) || str.includes(decimalSeparator) && str.endsWith('0')) {
|
package/lib/utils/form-utils.js
CHANGED
|
@@ -122,11 +122,7 @@ var testAssert = function testAssert(form, assert) {
|
|
|
122
122
|
|
|
123
123
|
exports.testAssert = testAssert;
|
|
124
124
|
|
|
125
|
-
var calcRequired = function calcRequired() {
|
|
126
|
-
var required = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
|
127
|
-
var form = arguments.length > 1 ? arguments[1] : undefined;
|
|
128
|
-
var requiredAsserts = arguments.length > 2 ? arguments[2] : undefined;
|
|
129
|
-
|
|
125
|
+
var calcRequired = function calcRequired(required, form, requiredAsserts) {
|
|
130
126
|
if (Array.isArray(requiredAsserts)) {
|
|
131
127
|
return requiredAsserts.every(function (assert) {
|
|
132
128
|
return form && testAssert(form, assert);
|
|
@@ -139,7 +135,8 @@ var calcRequired = function calcRequired() {
|
|
|
139
135
|
var calcFormItemProps = function calcFormItemProps(config, extraProps, form, parentName) {
|
|
140
136
|
var type = config.type,
|
|
141
137
|
nameProp = config.name,
|
|
142
|
-
required = config.required,
|
|
138
|
+
_config$required = config.required,
|
|
139
|
+
required = _config$required === void 0 ? true : _config$required,
|
|
143
140
|
requiredAsserts = config.requiredAsserts,
|
|
144
141
|
_config$showOptional = config.showOptional,
|
|
145
142
|
showOptional = _config$showOptional === void 0 ? false : _config$showOptional,
|
|
@@ -203,14 +200,13 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
|
|
|
203
200
|
extraValueFormater = _extraProps$valueForm === void 0 ? function (value) {
|
|
204
201
|
return value;
|
|
205
202
|
} : _extraProps$valueForm,
|
|
206
|
-
|
|
207
|
-
extraRequired = _extraProps$required === void 0 ? true : _extraProps$required,
|
|
203
|
+
extraRequired = extraProps.required,
|
|
208
204
|
_extraProps$requiredM = extraProps.requiredMark,
|
|
209
205
|
requiredMark = _extraProps$requiredM === void 0 ? false : _extraProps$requiredM,
|
|
210
206
|
className = extraProps.className,
|
|
211
207
|
extraRest = _objectWithoutProperties(extraProps, _excluded2);
|
|
212
208
|
|
|
213
|
-
var rules = calcRequired(required
|
|
209
|
+
var rules = calcRequired(required !== null && required !== void 0 ? required : extraRequired, form, requiredAsserts) ? [{
|
|
214
210
|
required: type !== 'Declaration',
|
|
215
211
|
message: requiredMessage || extraRequiredMessage
|
|
216
212
|
}].concat(_toConsumableArray(propsRules)) : _toConsumableArray(propsRules);
|