fix(接口场景): 场景参数默认行
This commit is contained in:
parent
157758ea45
commit
2243142491
|
@ -926,12 +926,14 @@
|
||||||
}
|
}
|
||||||
return item;
|
return item;
|
||||||
});
|
});
|
||||||
|
const { lastDataIsDefault } = filterKeyValParams(arr, defaultLineData.value, false);
|
||||||
if (
|
if (
|
||||||
!props.disabledExceptParam &&
|
(arr.length === 1 && !lastDataIsDefault) ||
|
||||||
!props.disabledParamValue &&
|
(hasNoIdItem &&
|
||||||
hasNoIdItem &&
|
!props.disabledExceptParam &&
|
||||||
!filterKeyValParams(arr, defaultLineData.value, !props.selectable).lastDataIsDefault &&
|
!props.disabledParamValue &&
|
||||||
!props.isTreeTable
|
!lastDataIsDefault &&
|
||||||
|
!props.isTreeTable)
|
||||||
) {
|
) {
|
||||||
addTableLine(arr.length - 1, false, true);
|
addTableLine(arr.length - 1, false, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,7 +173,7 @@ export function filterKeyValParams<T>(
|
||||||
const defaultParam = cloneDeep(defaultParamItem);
|
const defaultParam = cloneDeep(defaultParamItem);
|
||||||
if (!lastData || !defaultParam) {
|
if (!lastData || !defaultParam) {
|
||||||
return {
|
return {
|
||||||
lastDataIsDefault: false,
|
lastDataIsDefault: true,
|
||||||
validParams: params,
|
validParams: params,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -234,7 +234,7 @@ export function initFormCreate(customFields: CustomAttributes[], permission: str
|
||||||
currentDefaultValue = item.defaultValue;
|
currentDefaultValue = item.defaultValue;
|
||||||
// 处理多选情况
|
// 处理多选情况
|
||||||
} else if (multipleType.includes(item.type)) {
|
} else if (multipleType.includes(item.type)) {
|
||||||
const tempValue = JSON.parse(item.defaultValue);
|
const tempValue = typeof item.defaultValue === 'string' ? JSON.parse(item.defaultValue) : item.defaultValue;
|
||||||
const optionsIds = optionsValue.map((e: any) => e.value);
|
const optionsIds = optionsValue.map((e: any) => e.value);
|
||||||
currentDefaultValue = (optionsIds || []).filter((e: any) => tempValue.includes(e));
|
currentDefaultValue = (optionsIds || []).filter((e: any) => tempValue.includes(e));
|
||||||
} else if (memberType.includes(item.type)) {
|
} else if (memberType.includes(item.type)) {
|
||||||
|
@ -248,7 +248,7 @@ export function initFormCreate(customFields: CustomAttributes[], permission: str
|
||||||
// @desc 如果默认原本的成员被系统移除则过滤掉该用户不展示
|
// @desc 如果默认原本的成员被系统移除则过滤掉该用户不展示
|
||||||
const optionsIds = optionsValue.map((e: any) => e.value);
|
const optionsIds = optionsValue.map((e: any) => e.value);
|
||||||
if (item.type === 'MULTIPLE_MEMBER') {
|
if (item.type === 'MULTIPLE_MEMBER') {
|
||||||
const tempValue = JSON.parse(item.defaultValue);
|
const tempValue = typeof item.defaultValue === 'string' ? JSON.parse(item.defaultValue) : item.defaultValue;
|
||||||
currentDefaultValue = (optionsIds || []).filter((e: any) => tempValue.includes(e));
|
currentDefaultValue = (optionsIds || []).filter((e: any) => tempValue.includes(e));
|
||||||
} else {
|
} else {
|
||||||
currentDefaultValue = (optionsIds || []).find((e: any) => item.defaultValue === e) || '';
|
currentDefaultValue = (optionsIds || []).find((e: any) => item.defaultValue === e) || '';
|
||||||
|
|
Loading…
Reference in New Issue