Skip to content

Commit 1725f20

Browse files
lljj-xlljj-x
committed
build(lib): build lib
1 parent 2cd65bb commit 1725f20

16 files changed

+212
-120
lines changed

‎packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.js‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @license @lljj/vue-json-schema-form (c) 2020-2021 Liu.Jun License: Apache-2.0 */
1+
/** @license @lljj/vue-json-schema-form (c) 2020-2022 Liu.Jun License: Apache-2.0 */
22
import Vue from 'vue';
33

44
function _typeof(obj) {
@@ -9214,6 +9214,7 @@ function mergeDefaultsWithFormData(defaults, formData) {
92149214
function computeDefaults(_schema, parentDefaults, rootSchema) {
92159215
var rawFormData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
92169216
var includeUndefinedValues = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
9217+
var haveAllFields = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
92179218
var schema = isObject(_schema) ? _schema : {};
92189219
var formData = isObject(rawFormData) ? rawFormData : {}; // allOf 处理合并数据
92199220

@@ -9234,7 +9235,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
92349235
} else if ('$ref' in schema) {
92359236
// Use referenced schema defaults for this node.
92369237
var refSchema = findSchemaDefinition(schema.$ref, rootSchema);
9237-
return computeDefaults(refSchema, defaults, rootSchema, formData, includeUndefinedValues);
9238+
return computeDefaults(refSchema, defaults, rootSchema, formData, includeUndefinedValues, haveAllFields);
92389239
} else if (
92399240
/* ('dependencies' in schema) {
92409241
const resolvedSchema = resolveDependencies(schema, rootSchema, formData);
@@ -9243,15 +9244,16 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
92439244
defaults,
92449245
rootSchema,
92459246
formData,
9246-
includeUndefinedValues
9247+
includeUndefinedValues,
9248+
haveAllFields
92479249
);
92489250
} else if */
92499251
isFixedItems(schema)) {
92509252
defaults = schema.items.map(function (itemSchema, idx) {
9251-
return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
9253+
return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues, haveAllFields);
92529254
});
92539255
} else if ('oneOf' in schema) {
9254-
var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
9256+
var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema, haveAllFields)], rootSchema, formData);
92559257
schema = mergeObjects(schema, matchSchema);
92569258
delete schema.oneOf; // if (schema.properties && matchSchema.properties) {
92579259
// // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9262,7 +9264,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
92629264
// schema = matchSchema;
92639265
// }
92649266
} else if ('anyOf' in schema) {
9265-
var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
9267+
var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema, haveAllFields)], rootSchema, formData);
92669268

92679269
schema = mergeObjects(schema, _matchSchema);
92689270
delete schema.anyOf; // if (schema.properties && matchSchema.properties) {
@@ -9290,7 +9292,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
92909292
return Object.keys(schema.properties || {}).reduce(function (acc, key) {
92919293
// Compute the defaults for this node, with the parent defaults we might
92929294
// have from a previous run: defaults[key].
9293-
var computedDefault = computeDefaults(schema.properties[key], (defaults || {})[key], rootSchema, (formData || {})[key], includeUndefinedValues);
9295+
var computedDefault = computeDefaults(schema.properties[key], (defaults || {})[key], rootSchema, (formData || {})[key], includeUndefinedValues, haveAllFields);
92949296

92959297
if (includeUndefinedValues || computedDefault !== undefined) {
92969298
acc[key] = computedDefault;
@@ -9303,14 +9305,14 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
93039305
// Inject defaults into existing array defaults
93049306
if (Array.isArray(defaults)) {
93059307
defaults = defaults.map(function (item, idx) {
9306-
return computeDefaults(schema.items[idx] || schema.additionalItems || {}, item, rootSchema, {}, includeUndefinedValues);
9308+
return computeDefaults(schema.items[idx] || schema.additionalItems || {}, item, rootSchema, {}, includeUndefinedValues, haveAllFields);
93079309
});
93089310
} // Deeply inject defaults into already existing form data
93099311

93109312

93119313
if (Array.isArray(rawFormData)) {
93129314
defaults = rawFormData.map(function (item, idx) {
9313-
return computeDefaults(schema.items, (defaults || {})[idx], rootSchema, item, {}, includeUndefinedValues);
9315+
return computeDefaults(schema.items, (defaults || {})[idx], rootSchema, item, {}, includeUndefinedValues, haveAllFields);
93149316
});
93159317
}
93169318

@@ -9322,7 +9324,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
93229324
var defaultEntries = defaults || []; // populate the array with the defaults
93239325

93249326
var fillerSchema = Array.isArray(schema.items) ? schema.additionalItems : schema.items;
9325-
var fillerEntries = fillObj(new Array(schema.minItems - defaultsLength), computeDefaults(fillerSchema, fillerSchema.defaults, rootSchema, {}, includeUndefinedValues));
9327+
var fillerEntries = fillObj(new Array(schema.minItems - defaultsLength), computeDefaults(fillerSchema, fillerSchema.defaults, rootSchema, {}, includeUndefinedValues, haveAllFields));
93269328
return defaultEntries.concat(fillerEntries);
93279329
}
93289330
} else {
@@ -9341,13 +9343,14 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
93419343
function getDefaultFormState(_schema, formData) {
93429344
var rootSchema = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
93439345
var includeUndefinedValues = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
9346+
var haveAllFields = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
93449347

93459348
if (!isObject(_schema)) {
93469349
throw new Error("Invalid schema: ".concat(_schema));
93479350
}
93489351

93499352
var schema = retrieveSchema(_schema, rootSchema, formData);
9350-
var defaults = computeDefaults(schema, _schema.default, rootSchema, formData, includeUndefinedValues);
9353+
var defaults = computeDefaults(schema, _schema.default, rootSchema, formData, includeUndefinedValues, haveAllFields);
93519354

93529355
if (typeof formData === 'undefined') {
93539356
// No form data? Use schema defaults.
@@ -9427,6 +9430,10 @@ var vueProps = {
94279430
type: Boolean,
94289431
default: false
94299432
},
9433+
strictMode: {
9434+
type: Boolean,
9435+
default: false
9436+
},
94309437
schema: {
94319438
type: Object,
94329439
default: function _default() {
@@ -11698,7 +11705,7 @@ function createForm() {
1169811705
};
1169911706
},
1170011707
data: function data() {
11701-
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema); // 保持v-model双向数据及时性
11708+
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema, this.$props.strictMode); // 保持v-model双向数据及时性
1170211709

1170311710
this.emitFormDataChange(formData, this.value);
1170411711
return {
@@ -11747,7 +11754,7 @@ function createForm() {
1174711754
// 避免用于双向绑定v-model 可能导致的循环调用
1174811755
willReceiveProps: function willReceiveProps(newVal, oldVal) {
1174911756
if (!deepEquals(newVal, oldVal)) {
11750-
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema);
11757+
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema, this.$props.strictMode);
1175111758

1175211759
if (!deepEquals(this.formData, formData)) {
1175311760
this.formData = formData;
@@ -11827,6 +11834,11 @@ function createForm() {
1182711834
formInlineFooter: inlineFooter,
1182811835
formInline: inline
1182911836
}, _defineProperty(_class, "genFromComponent_".concat(this.schema.id, "Form"), !!this.schema.id), _defineProperty(_class, "layoutColumn", !inline), _defineProperty(_class, "layoutColumn-".concat(layoutColumn), !inline), _class),
11837+
nativeOn: {
11838+
submit: function submit(e) {
11839+
e.preventDefault();
11840+
}
11841+
},
1183011842
ref: 'genEditForm',
1183111843
props: _objectSpread2({
1183211844
model: self.formData

‎packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.umd.js‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @license @lljj/vue-json-schema-form (c) 2020-2021 Liu.Jun License: Apache-2.0 */
1+
/** @license @lljj/vue-json-schema-form (c) 2020-2022 Liu.Jun License: Apache-2.0 */
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
44
typeof define === 'function' && define.amd ? define(['exports', 'vue'], factory) :
@@ -9222,6 +9222,7 @@
92229222
function computeDefaults(_schema, parentDefaults, rootSchema) {
92239223
var rawFormData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
92249224
var includeUndefinedValues = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
9225+
var haveAllFields = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
92259226
var schema = isObject(_schema) ? _schema : {};
92269227
var formData = isObject(rawFormData) ? rawFormData : {}; // allOf 处理合并数据
92279228

@@ -9242,7 +9243,7 @@
92429243
} else if ('$ref' in schema) {
92439244
// Use referenced schema defaults for this node.
92449245
var refSchema = findSchemaDefinition(schema.$ref, rootSchema);
9245-
return computeDefaults(refSchema, defaults, rootSchema, formData, includeUndefinedValues);
9246+
return computeDefaults(refSchema, defaults, rootSchema, formData, includeUndefinedValues, haveAllFields);
92469247
} else if (
92479248
/* ('dependencies' in schema) {
92489249
const resolvedSchema = resolveDependencies(schema, rootSchema, formData);
@@ -9251,15 +9252,16 @@
92519252
defaults,
92529253
rootSchema,
92539254
formData,
9254-
includeUndefinedValues
9255+
includeUndefinedValues,
9256+
haveAllFields
92559257
);
92569258
} else if */
92579259
isFixedItems(schema)) {
92589260
defaults = schema.items.map(function (itemSchema, idx) {
9259-
return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
9261+
return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues, haveAllFields);
92609262
});
92619263
} else if ('oneOf' in schema) {
9262-
var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
9264+
var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema, haveAllFields)], rootSchema, formData);
92639265
schema = mergeObjects(schema, matchSchema);
92649266
delete schema.oneOf; // if (schema.properties && matchSchema.properties) {
92659267
// // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9270,7 +9272,7 @@
92709272
// schema = matchSchema;
92719273
// }
92729274
} else if ('anyOf' in schema) {
9273-
var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
9275+
var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema, haveAllFields)], rootSchema, formData);
92749276

92759277
schema = mergeObjects(schema, _matchSchema);
92769278
delete schema.anyOf; // if (schema.properties && matchSchema.properties) {
@@ -9298,7 +9300,7 @@
92989300
return Object.keys(schema.properties || {}).reduce(function (acc, key) {
92999301
// Compute the defaults for this node, with the parent defaults we might
93009302
// have from a previous run: defaults[key].
9301-
var computedDefault = computeDefaults(schema.properties[key], (defaults || {})[key], rootSchema, (formData || {})[key], includeUndefinedValues);
9303+
var computedDefault = computeDefaults(schema.properties[key], (defaults || {})[key], rootSchema, (formData || {})[key], includeUndefinedValues, haveAllFields);
93029304

93039305
if (includeUndefinedValues || computedDefault !== undefined) {
93049306
acc[key] = computedDefault;
@@ -9311,14 +9313,14 @@
93119313
// Inject defaults into existing array defaults
93129314
if (Array.isArray(defaults)) {
93139315
defaults = defaults.map(function (item, idx) {
9314-
return computeDefaults(schema.items[idx] || schema.additionalItems || {}, item, rootSchema, {}, includeUndefinedValues);
9316+
return computeDefaults(schema.items[idx] || schema.additionalItems || {}, item, rootSchema, {}, includeUndefinedValues, haveAllFields);
93159317
});
93169318
} // Deeply inject defaults into already existing form data
93179319

93189320

93199321
if (Array.isArray(rawFormData)) {
93209322
defaults = rawFormData.map(function (item, idx) {
9321-
return computeDefaults(schema.items, (defaults || {})[idx], rootSchema, item, {}, includeUndefinedValues);
9323+
return computeDefaults(schema.items, (defaults || {})[idx], rootSchema, item, {}, includeUndefinedValues, haveAllFields);
93229324
});
93239325
}
93249326

@@ -9330,7 +9332,7 @@
93309332
var defaultEntries = defaults || []; // populate the array with the defaults
93319333

93329334
var fillerSchema = Array.isArray(schema.items) ? schema.additionalItems : schema.items;
9333-
var fillerEntries = fillObj(new Array(schema.minItems - defaultsLength), computeDefaults(fillerSchema, fillerSchema.defaults, rootSchema, {}, includeUndefinedValues));
9335+
var fillerEntries = fillObj(new Array(schema.minItems - defaultsLength), computeDefaults(fillerSchema, fillerSchema.defaults, rootSchema, {}, includeUndefinedValues, haveAllFields));
93349336
return defaultEntries.concat(fillerEntries);
93359337
}
93369338
} else {
@@ -9349,13 +9351,14 @@
93499351
function getDefaultFormState(_schema, formData) {
93509352
var rootSchema = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
93519353
var includeUndefinedValues = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
9354+
var haveAllFields = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
93529355

93539356
if (!isObject(_schema)) {
93549357
throw new Error("Invalid schema: ".concat(_schema));
93559358
}
93569359

93579360
var schema = retrieveSchema(_schema, rootSchema, formData);
9358-
var defaults = computeDefaults(schema, _schema.default, rootSchema, formData, includeUndefinedValues);
9361+
var defaults = computeDefaults(schema, _schema.default, rootSchema, formData, includeUndefinedValues, haveAllFields);
93599362

93609363
if (typeof formData === 'undefined') {
93619364
// No form data? Use schema defaults.
@@ -9435,6 +9438,10 @@
94359438
type: Boolean,
94369439
default: false
94379440
},
9441+
strictMode: {
9442+
type: Boolean,
9443+
default: false
9444+
},
94389445
schema: {
94399446
type: Object,
94409447
default: function _default() {
@@ -11706,7 +11713,7 @@
1170611713
};
1170711714
},
1170811715
data: function data() {
11709-
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema); // 保持v-model双向数据及时性
11716+
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema, this.$props.strictMode); // 保持v-model双向数据及时性
1171011717

1171111718
this.emitFormDataChange(formData, this.value);
1171211719
return {
@@ -11755,7 +11762,7 @@
1175511762
// 避免用于双向绑定v-model 可能导致的循环调用
1175611763
willReceiveProps: function willReceiveProps(newVal, oldVal) {
1175711764
if (!deepEquals(newVal, oldVal)) {
11758-
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema);
11765+
var formData = getDefaultFormState(this.$props.schema, this.$props.value, this.$props.schema, this.$props.strictMode);
1175911766

1176011767
if (!deepEquals(this.formData, formData)) {
1176111768
this.formData = formData;
@@ -11835,6 +11842,11 @@
1183511842
formInlineFooter: inlineFooter,
1183611843
formInline: inline
1183711844
}, _defineProperty(_class, "genFromComponent_".concat(this.schema.id, "Form"), !!this.schema.id), _defineProperty(_class, "layoutColumn", !inline), _defineProperty(_class, "layoutColumn-".concat(layoutColumn), !inline), _class),
11845+
nativeOn: {
11846+
submit: function submit(e) {
11847+
e.preventDefault();
11848+
}
11849+
},
1183811850
ref: 'genEditForm',
1183911851
props: _objectSpread2({
1184011852
model: self.formData

0 commit comments

Comments
 (0)