Исправил API создания паттерна

This commit is contained in:
saber-nyan 2020-03-09 17:17:32 +03:00
parent 757f750547
commit 28dec5a8fb
No known key found for this signature in database
GPG Key ID: 7B069E9C295E6B4A
2 changed files with 19 additions and 10 deletions

View File

@ -10,10 +10,10 @@
<b-dropdown-item-button v-for="pattern in this.$store.state.patterns"
:key="pattern.id" @click.stop.prevent="openPattern(pattern.id)">
<strong :style="`color: ${pattern.color};`">{{ pattern.name }}</strong>:
<code>{{ pattern.regex ? `/${pattern.value}/` : `'${pattern.value}'` }}</code>;
<code>{{ getSearchTypeValue(pattern.searchType, pattern.value) }}</code>;
search
<template v-if="pattern.type === 'BOTH'">anywhere</template>
<template v-else-if="pattern.type === 'INPUT'">in request</template>
<template v-if="pattern.directionType === 'BOTH'">anywhere</template>
<template v-else-if="pattern.directionType === 'INPUT'">in request</template>
<template v-else>in response</template>
<div class="float-right" style="margin-left: 2em;">
<button type="button" class="btn btn-outline-danger btn-block btn-sm"
@ -36,6 +36,11 @@
this.updatePatterns();
},
methods: {
getSearchTypeValue(searchType, value) {
if (searchType === 'REGEX') return `/${value}/`;
else if (searchType === 'SUBSTRING') return `'${value}'`;
else return `0x${value}`;
},
showAddService() {
this.$bvModal.show('addPatternModal');
},

View File

@ -32,10 +32,14 @@
<b-form-group
label-cols-sm="4"
label-cols-lg="3"
label="Регулярное выражение?"
description="Искать регулярное выражение в Java-формате вместо подстроки?"
label-for="pattern-regex">
<b-form-checkbox id="pattern-regex" required v-model="newPattern.regex"/>
label="Способ поиска"
description="Каким способом искать указанное выражение?"
label-for="pattern-searchType">
<b-form-select id="pattern-searchType" required v-model="newPattern.searchType">
<option value="REGEX" selected>Регулярное выражение</option>
<option value="SUBSTRING">Подстрока</option>
<option value="SUBBYTES">В байтах (WIP)</option>
</b-form-select>
</b-form-group>
<b-form-group
label-cols-sm="4"
@ -43,7 +47,7 @@
label="Тип поиска"
description="В каких пакетах искать паттерн"
label-for="pattern-type">
<b-form-select id="pattern-type" required v-model="newPattern.type">
<b-form-select id="pattern-type" required v-model="newPattern.directionType">
<option value="INPUT">Запрос</option>
<option value="OUTPUT">Ответ</option>
<option value="BOTH" selected>Везде</option>
@ -62,8 +66,8 @@
name: String(),
value: String(),
color: String(),
regex: Boolean(),
type: String(),
searchType: String(),
directionType: String(),
},
};
},