Skip to content

Commit 79e01f9

Browse files
lljj-xlljj-x
committed
build(lib): build lib
1 parent f5c9fab commit 79e01f9

16 files changed

+284
-128
lines changed

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

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8566,16 +8566,12 @@ function getUiOptions(_ref5) {
85668566
spec.isNumberValue = !(schema.type === 'string');
85678567
}
85688568
}
8569-
} // 计算ui配置
8569+
}
85708570

8571+
if (schema.title) spec.title = schema.title;
8572+
if (schema.description) spec.description = schema.description; // 计算ui配置
85718573

8572-
return _objectSpread2(_objectSpread2({
8573-
title: schema.title
8574-
/* || curNodePath.split('.').pop() */
8575-
,
8576-
// 默认使用 schema 的配置
8577-
description: schema.description
8578-
}, spec), getUserUiOptions({
8574+
return _objectSpread2(_objectSpread2({}, spec), getUserUiOptions({
85798575
schema: schema,
85808576
uiSchema: uiSchema,
85818577
curNodePath: curNodePath,
@@ -9075,9 +9071,10 @@ function isValid(schema, data) {
90759071

90769072
function ajvValid(schema, data) {
90779073
return ajv$1.validate(schema, data);
9078-
} // oneOf anyOf 通过formData的值来找到当前匹配项索引
9074+
} // 如果查找不到
9075+
// return -1
90799076

9080-
function getMatchingOption(formData, options, rootSchema) {
9077+
function getMatchingIndex(formData, options, rootSchema) {
90819078
var haveAllFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
90829079

90839080
// eslint-disable-next-line no-plusplus
@@ -9133,9 +9130,31 @@ function getMatchingOption(formData, options, rootSchema) {
91339130
} else if (isValid(options[i], formData)) {
91349131
return i;
91359132
}
9133+
} // 尝试查找const 配置
9134+
9135+
9136+
if (options[0] && options[0].properties) {
9137+
var constProperty = Object.keys(options[0].properties).find(function (k) {
9138+
return options[0].properties[k].const;
9139+
});
9140+
9141+
if (constProperty) {
9142+
// eslint-disable-next-line no-plusplus
9143+
for (var _i = 0; _i < options.length; _i++) {
9144+
if (options[_i].properties && options[_i].properties[constProperty] && options[_i].properties[constProperty].const === formData[constProperty]) {
9145+
return _i;
9146+
}
9147+
}
9148+
}
91369149
}
91379150

9138-
return 0;
9151+
return -1;
9152+
} // oneOf anyOf 通过formData的值来找到当前匹配项索引
9153+
9154+
function getMatchingOption(formData, options, rootSchema) {
9155+
var haveAllFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
9156+
var index = getMatchingIndex(formData, options, rootSchema, haveAllFields);
9157+
return index === -1 ? 0 : index;
91399158
}
91409159

91419160
var validate$2 = /*#__PURE__*/Object.freeze({
@@ -9144,6 +9163,7 @@ var validate$2 = /*#__PURE__*/Object.freeze({
91449163
validateFormDataAndTransformMsg: validateFormDataAndTransformMsg,
91459164
isValid: isValid,
91469165
ajvValid: ajvValid,
9166+
getMatchingIndex: getMatchingIndex,
91479167
getMatchingOption: getMatchingOption
91489168
});
91499169

@@ -10288,7 +10308,7 @@ var Widget = {
1028810308

1028910309
return callback();
1029010310
},
10291-
trigger: 'blur'
10311+
trigger: 'change'
1029210312
}]
1029310313
} : {}),
1029410314
scopedSlots: {
@@ -11302,8 +11322,7 @@ var SelectLinkageField = {
1130211322
},
1130311323
methods: {
1130411324
computedCurSelectIndexByFormData: function computedCurSelectIndexByFormData(formData) {
11305-
var index = getMatchingOption(formData, this.selectList, this.rootSchema, true);
11306-
return index || 0;
11325+
return getMatchingOption(formData, this.selectList, this.rootSchema, true);
1130711326
},
1130811327
// 下拉选项 VNode
1130911328
getSelectBoxVNode: function getSelectBoxVNode() {
@@ -11396,7 +11415,7 @@ var SelectLinkageField = {
1139611415
key = _ref2[0],
1139711416
value = _ref2[1];
1139811417

11399-
if (value !== undefined && (curFormData[key] === undefined || _this2.selectList[newVal].properties[key].const !== undefined)) {
11418+
if (value !== undefined && (curFormData[key] === undefined || _this2.selectList[newVal].properties[key].const !== undefined || isObject(value))) {
1140011419
// 这里没找到一个比较合理的新旧值合并方式
1140111420
//
1140211421
// 1. 如果anyOf里面同名属性中的schema包含了 const 配置，产生了新的值这里做覆盖处理
@@ -11455,7 +11474,7 @@ var SelectLinkageField = {
1145511474
// 取出 oneOf anyOf 同级配置，然后再合并到 当前选中的schema中
1145611475

1145711476
var userUiOptions = filterObject(getUiOptions({
11458-
schema: this.schema,
11477+
schema: {},
1145911478
uiSchema: this.uiSchema,
1146011479
containsSpec: false,
1146111480
curNodePath: curNodePath,
@@ -11464,7 +11483,7 @@ var SelectLinkageField = {
1146411483
return key === _this3.combiningType ? undefined : "ui:".concat(key);
1146511484
});
1146611485
var userErrOptions = filterObject(getUserErrOptions({
11467-
schema: this.schema,
11486+
schema: {},
1146811487
uiSchema: this.uiSchema,
1146911488
errorSchema: this.errorSchema
1147011489
}), function (key) {

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

Lines changed: 1 addition & 1 deletion
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: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8574,16 +8574,12 @@
85748574
spec.isNumberValue = !(schema.type === 'string');
85758575
}
85768576
}
8577-
} // 计算ui配置
8577+
}
85788578

8579+
if (schema.title) spec.title = schema.title;
8580+
if (schema.description) spec.description = schema.description; // 计算ui配置
85798581

8580-
return _objectSpread2(_objectSpread2({
8581-
title: schema.title
8582-
/* || curNodePath.split('.').pop() */
8583-
,
8584-
// 默认使用 schema 的配置
8585-
description: schema.description
8586-
}, spec), getUserUiOptions({
8582+
return _objectSpread2(_objectSpread2({}, spec), getUserUiOptions({
85878583
schema: schema,
85888584
uiSchema: uiSchema,
85898585
curNodePath: curNodePath,
@@ -9083,9 +9079,10 @@
90839079

90849080
function ajvValid(schema, data) {
90859081
return ajv$1.validate(schema, data);
9086-
} // oneOf anyOf 通过formData的值来找到当前匹配项索引
9082+
} // 如果查找不到
9083+
// return -1
90879084

9088-
function getMatchingOption(formData, options, rootSchema) {
9085+
function getMatchingIndex(formData, options, rootSchema) {
90899086
var haveAllFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
90909087

90919088
// eslint-disable-next-line no-plusplus
@@ -9141,9 +9138,31 @@
91419138
} else if (isValid(options[i], formData)) {
91429139
return i;
91439140
}
9141+
} // 尝试查找const 配置
9142+
9143+
9144+
if (options[0] && options[0].properties) {
9145+
var constProperty = Object.keys(options[0].properties).find(function (k) {
9146+
return options[0].properties[k].const;
9147+
});
9148+
9149+
if (constProperty) {
9150+
// eslint-disable-next-line no-plusplus
9151+
for (var _i = 0; _i < options.length; _i++) {
9152+
if (options[_i].properties && options[_i].properties[constProperty] && options[_i].properties[constProperty].const === formData[constProperty]) {
9153+
return _i;
9154+
}
9155+
}
9156+
}
91449157
}
91459158

9146-
return 0;
9159+
return -1;
9160+
} // oneOf anyOf 通过formData的值来找到当前匹配项索引
9161+
9162+
function getMatchingOption(formData, options, rootSchema) {
9163+
var haveAllFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
9164+
var index = getMatchingIndex(formData, options, rootSchema, haveAllFields);
9165+
return index === -1 ? 0 : index;
91479166
}
91489167

91499168
var validate$2 = /*#__PURE__*/Object.freeze({
@@ -9152,6 +9171,7 @@
91529171
validateFormDataAndTransformMsg: validateFormDataAndTransformMsg,
91539172
isValid: isValid,
91549173
ajvValid: ajvValid,
9174+
getMatchingIndex: getMatchingIndex,
91559175
getMatchingOption: getMatchingOption
91569176
});
91579177

@@ -10296,7 +10316,7 @@
1029610316

1029710317
return callback();
1029810318
},
10299-
trigger: 'blur'
10319+
trigger: 'change'
1030010320
}]
1030110321
} : {}),
1030210322
scopedSlots: {
@@ -11310,8 +11330,7 @@
1131011330
},
1131111331
methods: {
1131211332
computedCurSelectIndexByFormData: function computedCurSelectIndexByFormData(formData) {
11313-
var index = getMatchingOption(formData, this.selectList, this.rootSchema, true);
11314-
return index || 0;
11333+
return getMatchingOption(formData, this.selectList, this.rootSchema, true);
1131511334
},
1131611335
// 下拉选项 VNode
1131711336
getSelectBoxVNode: function getSelectBoxVNode() {
@@ -11404,7 +11423,7 @@
1140411423
key = _ref2[0],
1140511424
value = _ref2[1];
1140611425

11407-
if (value !== undefined && (curFormData[key] === undefined || _this2.selectList[newVal].properties[key].const !== undefined)) {
11426+
if (value !== undefined && (curFormData[key] === undefined || _this2.selectList[newVal].properties[key].const !== undefined || isObject(value))) {
1140811427
// 这里没找到一个比较合理的新旧值合并方式
1140911428
//
1141011429
// 1. 如果anyOf里面同名属性中的schema包含了 const 配置，产生了新的值这里做覆盖处理
@@ -11463,7 +11482,7 @@
1146311482
// 取出 oneOf anyOf 同级配置，然后再合并到 当前选中的schema中
1146411483

1146511484
var userUiOptions = filterObject(getUiOptions({
11466-
schema: this.schema,
11485+
schema: {},
1146711486
uiSchema: this.uiSchema,
1146811487
containsSpec: false,
1146911488
curNodePath: curNodePath,
@@ -11472,7 +11491,7 @@
1147211491
return key === _this3.combiningType ? undefined : "ui:".concat(key);
1147311492
});
1147411493
var userErrOptions = filterObject(getUserErrOptions({
11475-
schema: this.schema,
11494+
schema: {},
1147611495
uiSchema: this.uiSchema,
1147711496
errorSchema: this.errorSchema
1147811497
}), function (key) {

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.esm.js‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8566,16 +8566,12 @@ function getUiOptions(_ref5) {
85668566
spec.isNumberValue = !(schema.type === 'string');
85678567
}
85688568
}
8569-
} // 计算ui配置
8569+
}
85708570

8571+
if (schema.title) spec.title = schema.title;
8572+
if (schema.description) spec.description = schema.description; // 计算ui配置
85718573

8572-
return _objectSpread2(_objectSpread2({
8573-
title: schema.title
8574-
/* || curNodePath.split('.').pop() */
8575-
,
8576-
// 默认使用 schema 的配置
8577-
description: schema.description
8578-
}, spec), getUserUiOptions({
8574+
return _objectSpread2(_objectSpread2({}, spec), getUserUiOptions({
85798575
schema: schema,
85808576
uiSchema: uiSchema,
85818577
curNodePath: curNodePath,
@@ -9075,9 +9071,10 @@ function isValid(schema, data) {
90759071

90769072
function ajvValid(schema, data) {
90779073
return ajv$1.validate(schema, data);
9078-
} // oneOf anyOf 通过formData的值来找到当前匹配项索引
9074+
} // 如果查找不到
9075+
// return -1
90799076

9080-
function getMatchingOption(formData, options, rootSchema) {
9077+
function getMatchingIndex(formData, options, rootSchema) {
90819078
var haveAllFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
90829079

90839080
// eslint-disable-next-line no-plusplus
@@ -9133,9 +9130,31 @@ function getMatchingOption(formData, options, rootSchema) {
91339130
} else if (isValid(options[i], formData)) {
91349131
return i;
91359132
}
9133+
} // 尝试查找const 配置
9134+
9135+
9136+
if (options[0] && options[0].properties) {
9137+
var constProperty = Object.keys(options[0].properties).find(function (k) {
9138+
return options[0].properties[k].const;
9139+
});
9140+
9141+
if (constProperty) {
9142+
// eslint-disable-next-line no-plusplus
9143+
for (var _i = 0; _i < options.length; _i++) {
9144+
if (options[_i].properties && options[_i].properties[constProperty] && options[_i].properties[constProperty].const === formData[constProperty]) {
9145+
return _i;
9146+
}
9147+
}
9148+
}
91369149
}
91379150

9138-
return 0;
9151+
return -1;
9152+
} // oneOf anyOf 通过formData的值来找到当前匹配项索引
9153+
9154+
function getMatchingOption(formData, options, rootSchema) {
9155+
var haveAllFields = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
9156+
var index = getMatchingIndex(formData, options, rootSchema, haveAllFields);
9157+
return index === -1 ? 0 : index;
91399158
}
91409159

91419160
var validate$2 = /*#__PURE__*/Object.freeze({
@@ -9144,6 +9163,7 @@ var validate$2 = /*#__PURE__*/Object.freeze({
91449163
validateFormDataAndTransformMsg: validateFormDataAndTransformMsg,
91459164
isValid: isValid,
91469165
ajvValid: ajvValid,
9166+
getMatchingIndex: getMatchingIndex,
91479167
getMatchingOption: getMatchingOption
91489168
});
91499169

@@ -10288,7 +10308,7 @@ var Widget = {
1028810308

1028910309
return callback();
1029010310
},
10291-
trigger: 'blur'
10311+
trigger: 'change'
1029210312
}]
1029310313
} : {}),
1029410314
scopedSlots: {
@@ -11302,8 +11322,7 @@ var SelectLinkageField = {
1130211322
},
1130311323
methods: {
1130411324
computedCurSelectIndexByFormData: function computedCurSelectIndexByFormData(formData) {
11305-
var index = getMatchingOption(formData, this.selectList, this.rootSchema, true);
11306-
return index || 0;
11325+
return getMatchingOption(formData, this.selectList, this.rootSchema, true);
1130711326
},
1130811327
// 下拉选项 VNode
1130911328
getSelectBoxVNode: function getSelectBoxVNode() {
@@ -11396,7 +11415,7 @@ var SelectLinkageField = {
1139611415
key = _ref2[0],
1139711416
value = _ref2[1];
1139811417

11399-
if (value !== undefined && (curFormData[key] === undefined || _this2.selectList[newVal].properties[key].const !== undefined)) {
11418+
if (value !== undefined && (curFormData[key] === undefined || _this2.selectList[newVal].properties[key].const !== undefined || isObject(value))) {
1140011419
// 这里没找到一个比较合理的新旧值合并方式
1140111420
//
1140211421
// 1. 如果anyOf里面同名属性中的schema包含了 const 配置，产生了新的值这里做覆盖处理
@@ -11455,7 +11474,7 @@ var SelectLinkageField = {
1145511474
// 取出 oneOf anyOf 同级配置，然后再合并到 当前选中的schema中
1145611475

1145711476
var userUiOptions = filterObject(getUiOptions({
11458-
schema: this.schema,
11477+
schema: {},
1145911478
uiSchema: this.uiSchema,
1146011479
containsSpec: false,
1146111480
curNodePath: curNodePath,
@@ -11464,7 +11483,7 @@ var SelectLinkageField = {
1146411483
return key === _this3.combiningType ? undefined : "ui:".concat(key);
1146511484
});
1146611485
var userErrOptions = filterObject(getUserErrOptions({
11467-
schema: this.schema,
11486+
schema: {},
1146811487
uiSchema: this.uiSchema,
1146911488
errorSchema: this.errorSchema
1147011489
}), function (key) {

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)