diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/views/applications/edit.vue | 8 | ||||
| -rw-r--r-- | src/views/applications/mergeConflict.vue | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/views/applications/edit.vue b/src/views/applications/edit.vue index 954bb30..fc53af9 100644 --- a/src/views/applications/edit.vue +++ b/src/views/applications/edit.vue @@ -568,14 +568,14 @@ const deleteFile = (data) => { // 每个文件内容合法允许提交 const validator = computed(() => { - const valid = fileList.value.every((item) => { + const valid = modifiedList.value.every((item) => { let flag = true; try { - if (item.name == 'meta.json') { + if (item.name == 'meta.json' && item.content) { const data = JSON.parse(item.content); const validate = ajv.compile(basicSchema); flag = validate(data); - } else if (item.name == 'signature.json') { + } else if (item.name == 'signature.json' && item.content) { const data = JSON.parse(item.content); const validate = ajv.compile(signatureSchema); flag = validate(data); @@ -1328,6 +1328,8 @@ watch( } .editor-problems-pop { width: unset !important; + max-height: 500px; + overflow-y: auto; .editor-problems-list { .editor-problems-title { font-family: NotoSans-Bold; diff --git a/src/views/applications/mergeConflict.vue b/src/views/applications/mergeConflict.vue index b839715..07e0336 100644 --- a/src/views/applications/mergeConflict.vue +++ b/src/views/applications/mergeConflict.vue @@ -186,11 +186,11 @@ const validator = computed(() => { const name = arr[arr.length - 1]; let flag = true; try { - if (name == 'meta.json') { + if (name == 'meta.json' && item.content) { const data = JSON.parse(item.content); const validate = ajv.compile(basicSchema); flag = validate(data); - } else if (name == 'signature.json') { + } else if (name == 'signature.json' && item.content) { const data = JSON.parse(item.content); const validate = ajv.compile(signatureSchema); flag = validate(data); |