test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 测试评审和计划使用模板报错

This commit is contained in:
chenjianxing 2021-04-30 10:52:03 +08:00 committed by jianxing
parent 317f474c9a
commit d2f13b96e6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/common/js/custom_field.js
View File

@ -24,8 +24,7 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
template.customFields.forEach(item => { template.customFields.forEach(item => {
if (item.defaultValue && !item.hasParse) { if (item.defaultValue && !item.hasParse) {
item.defaultValue = JSON.parse(item.defaultValue); setDefaultValue(item, JSON.parse(item.defaultValue));
item.hasParse = true; // 多次调用不执行这部分
} }
// 添加自定义字段必填校验 // 添加自定义字段必填校验
@ -43,7 +42,7 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
for (const key of oldFields.keys()) { for (const key of oldFields.keys()) {
if (item.name === key) { if (item.name === key) {
if (oldFields.get(key)) { if (oldFields.get(key)) {
item.defaultValue = oldFields.get(key); setDefaultValue(item, oldFields.get(key));
} }
} }
} }
@ -54,7 +53,7 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
for (let i = 0; i < data.customFields.length; i++) { for (let i = 0; i < data.customFields.length; i++) {
let customField = data.customFields[i]; let customField = data.customFields[i];
if (customField.id === item.id) { if (customField.id === item.id) {
item.defaultValue = customField.value; setDefaultValue(item, customField.value);
break; break;
} }
} }
@ -63,7 +62,7 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
for (const key in data.customFields) { for (const key in data.customFields) {
if (item.name === key) { if (item.name === key) {
if (data.customFields[key]) { if (data.customFields[key]) {
item.defaultValue = JSON.parse(data.customFields[key]); setDefaultValue(item, JSON.parse(data.customFields[key]));
} }
} }
} }
@ -75,6 +74,11 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
}); });
} }
function setDefaultValue(item, value) {
item.defaultValue = value;
item.hasParse = true; // 多次调用不执行这部分
}
// 将template的属性值设置给customFields // 将template的属性值设置给customFields
export function buildCustomFields(data, param, template) { export function buildCustomFields(data, param, template) {
if (template.customFields) { if (template.customFields) {