Physton/sd-webui-prompt-all-in-one
1
0
Fork 0
mirror of https://github.com/Physton/sd-webui-prompt-all-in-one.git synced 2026-04-30 11:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#195 Blacklist Function Update

Browse Source 
黑名单功能更新
This commit is contained in:
Physton
2023-08-29 15:24:24 +08:00
parent 76beb67d6f
commit 34e4fb3036
7 changed files with 103 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
i18n.json
View File

@@ -162,7 +162,8 @@
"show_keyword_extend_panel": "显示关键词扩展面板",
"none": "无",
"add_blacklist": "添加到黑名单",
"confirm_add_blacklist": "是否将关键词“{0}”加入黑名单？"
"confirm_add_blacklist": "是否将关键词“{0}”加入黑名单？",
"cancel_confirm_add_blacklist": "从关键词列表扩展面板中加入黑名单时，取消《确认提示窗口》。"
}
},
{
@@ -326,7 +327,8 @@
"show_keyword_extend_panel": "顯示關鍵詞擴展面板",
"none": "無",
"add_blacklist": "加入黑名單",
"confirm_add_blacklist": "是否將關鍵詞“{0}”加入黑名單？"
"confirm_add_blacklist": "是否將關鍵詞“{0}”加入黑名單？",
"cancel_confirm_add_blacklist": "從關鍵詞列表擴展面板中加入黑名單時，取消《確認提示窗口》。"
}
},
{
@@ -490,7 +492,8 @@
"show_keyword_extend_panel": "顯示關鍵字擴展面板",
"none": "無",
"add_blacklist": "加入黑名單",
"confirm_add_blacklist": "是否將關鍵詞“{0}”加入黑名單？"
"confirm_add_blacklist": "是否將關鍵詞“{0}”加入黑名單？",
"cancel_confirm_add_blacklist": "從關鍵詞列表擴展面板中加入黑名單時，取消《確認提示視窗》。"
}
},
{
@@ -654,7 +657,8 @@
"show_keyword_extend_panel": "Show Keyword Extend Panel",
"none": "None",
"add_blacklist": "Add to blacklist",
"confirm_add_blacklist": "Do you want to add the keyword \"{0}\" to the blacklist?"
"confirm_add_blacklist": "Do you want to add the keyword \"{0}\" to the blacklist?",
"cancel_confirm_add_blacklist": "Cancel the confirmation dialog when adding to the blacklist from the keyword list expansion panel."
}
},
{
@@ -829,7 +833,8 @@
"show_keyword_extend_panel": "عرض لوحة تمديد الكلمة الرئيسية",
"none": "لا شيء",
"add_blacklist": "إضافة إلى القائمة السوداء",
"confirm_add_blacklist": "هل ترغب في إضافة الكلمة الرئيسية \"{0}\" إلى القائمة السوداء؟"
"confirm_add_blacklist": "هل ترغب في إضافة الكلمة الرئيسية \"{0}\" إلى القائمة السوداء؟",
"cancel_confirm_add_blacklist": "إلغاء نافذة التأكيد عند إضافة إلى القائمة السوداء من لوحة توسيع قائمة الكلمات الرئيسية."
}
},
{
@@ -1092,7 +1097,8 @@
"show_keyword_extend_panel": "Afficher le panneau d'extension du mot-clé",
"none": "Aucun",
"add_blacklist": "Ajouter à la liste noire",
"confirm_add_blacklist": "Voulez-vous ajouter le mot-clé \"{0}\" à la liste noire ?"
"confirm_add_blacklist": "Voulez-vous ajouter le mot-clé \"{0}\" à la liste noire ?",
"cancel_confirm_add_blacklist": "Annuler la fenêtre de confirmation lors de l'ajout à la liste noire depuis le panneau d'extension de la liste de mots-clés."
}
},
{
@@ -1270,7 +1276,8 @@
"show_keyword_extend_panel": "Schlüsselwort-Erweiterungs-Panel anzeigen",
"none": "Keine",
"add_blacklist": "Zur schwarzen Liste hinzufügen",
"confirm_add_blacklist": "Möchten Sie das Schlüsselwort \"{0}\" zur schwarzen Liste hinzufügen?"
"confirm_add_blacklist": "Möchten Sie das Schlüsselwort \"{0}\" zur schwarzen Liste hinzufügen?",
"cancel_confirm_add_blacklist": "Die Bestätigungsmeldung beim Hinzufügen zur Blacklist aus der Schlüsselwortliste-Erweiterungsleiste abbrechen."
}
},
{
@@ -1498,7 +1505,8 @@
"show_keyword_extend_panel": "Mostra pannello estensione parola chiave",
"none": "Nessuno",
"add_blacklist": "Aggiungi alla lista nera",
"confirm_add_blacklist": "Vuoi aggiungere la parola chiave \"{0}\" alla lista nera?"
"confirm_add_blacklist": "Vuoi aggiungere la parola chiave \"{0}\" alla lista nera?",
"cancel_confirm_add_blacklist": "Annulla la finestra di conferma durante l'aggiunta alla lista nera dalla barra di espansione dell'elenco delle parole chiave."
}
},
{
@@ -1661,7 +1669,8 @@
"show_keyword_extend_panel": "キーワード拡張パネルの表示",
"none": "なし",
"add_blacklist": "ブラックリストに追加",
"confirm_add_blacklist": "キーワード「{0}」をブラックリストに追加しますか？"
"confirm_add_blacklist": "キーワード「{0}」をブラックリストに追加しますか？",
"cancel_confirm_add_blacklist": "キーワードリスト拡張パネルからブラックリストに追加する際の確認ダイアログをキャンセルします。"
}
},
{
@@ -1849,7 +1858,8 @@
"show_keyword_extend_panel": "키워드 확장 패널 표시",
"none": "없음",
"add_blacklist": "블랙리스트에 추가",
"confirm_add_blacklist": "키워드 \"{0}\"를 블랙리스트에 추가하시겠습니까?"
"confirm_add_blacklist": "키워드 \"{0}\"를 블랙리스트에 추가하시겠습니까?",
"cancel_confirm_add_blacklist": "키워드 목록 확장 패널에서 블랙리스트에 추가할 때 확인 대화 상자를 취소합니다."
}
},
{
@@ -2127,7 +2137,8 @@
"show_keyword_extend_panel": "Mostrar painel de extensão de palavra-chave",
"none": "Nenhum",
"add_blacklist": "Adicionar à lista negra",
"confirm_add_blacklist": "Deseja adicionar a palavra-chave \"{0}\" à lista negra?"
"confirm_add_blacklist": "Deseja adicionar a palavra-chave \"{0}\" à lista negra?",
"cancel_confirm_add_blacklist": "Cancelar a janela de confirmação ao adicionar à lista negra a partir do painel de expansão da lista de palavras-chave."
}
},
{
@@ -2305,7 +2316,8 @@
"show_keyword_extend_panel": "Показать панель расширения ключевого слова",
"none": "Нет",
"add_blacklist": "Добавить в черный список",
"confirm_add_blacklist": "Хотите добавить ключевое слово \"{0}\" в черный список?"
"confirm_add_blacklist": "Хотите добавить ключевое слово \"{0}\" в черный список?",
"cancel_confirm_add_blacklist": "Отменить окно подтверждения при добавлении в черный список из панели расширения списка ключевых слов."
}
},
{
@@ -2498,7 +2510,8 @@
"show_keyword_extend_panel": "Mostrar panel de extensión de palabra clave",
"none": "Ninguno",
"add_blacklist": "Agregar a la lista negra",
"confirm_add_blacklist": "¿Deseas agregar la palabra clave \"{0}\" a la lista negra?"
"confirm_add_blacklist": "¿Deseas agregar la palabra clave \"{0}\" a la lista negra?",
"cancel_confirm_add_blacklist": "Cancelar el cuadro de diálogo de confirmación al agregar a la lista negra desde el panel de expansión de la lista de palabras clave."
}
},
{

76
javascript/main.entry.js
View File

File diff suppressed because one or more lines are too long

2
javascript/main.entry.js.map
View File

File diff suppressed because one or more lines are too long

11
src/src/App.vue
View File

@@ -54,6 +54,7 @@
@update:hide-group-tags="onUpdateHideGroupTags(item.id, $event)"
:group-tags-translate-cache="groupTagsTranslateCache"
:blacklist="blacklist"
:cancel-blacklist-confirm="cancelBlacklistConfirm"
@update:blacklist="onUpdateBlacklist"
:hotkey="hotkey"
></physton-prompt>
@@ -313,6 +314,7 @@ export default {
},
blacklist: {},
cancelBlacklistConfirm: false,
hotkey: {
click: 'edit', // edit, disable, extend
@@ -577,7 +579,7 @@ export default {
},
init() {
this.loadExtraNetworks()
let dataListsKeys = ['languageCode', 'autoTranslate', 'autoTranslateToEnglish', 'autoTranslateToLocal', 'autoRemoveSpace', 'autoRemoveLastComma', 'autoKeepWeightZero', 'autoKeepWeightOne', 'autoBreakBeforeWrap', 'autoBreakAfterWrap', /*'hideDefaultInput', */'translateApi', 'enableTooltip', 'tagCompleteFile', 'onlyCsvOnAuto', 'extensionSelect.minimalist', 'groupTagsColor', 'groupTagsTranslate', 'blacklist', 'hotkey']
let dataListsKeys = ['languageCode', 'autoTranslate', 'autoTranslateToEnglish', 'autoTranslateToLocal', 'autoRemoveSpace', 'autoRemoveLastComma', 'autoKeepWeightZero', 'autoKeepWeightOne', 'autoBreakBeforeWrap', 'autoBreakAfterWrap', /*'hideDefaultInput', */'translateApi', 'enableTooltip', 'tagCompleteFile', 'onlyCsvOnAuto', 'extensionSelect.minimalist', 'groupTagsColor', 'groupTagsTranslate', 'blacklist', 'cancelBlacklistConfirm', 'hotkey']
this.prompts.forEach(item => {
dataListsKeys.push(item.hideDefaultInputKey)
dataListsKeys.push(item.hidePanelKey)
@@ -710,6 +712,10 @@ export default {
this.blacklist = this._handleBlacklist(data.blacklist)
}
if (data.cancelBlacklistConfirm !== null) {
this.cancelBlacklistConfirm = data.cancelBlacklistConfirm
}
if (data.hotkey !== null) {
this.hotkey = data.hotkey
}
@@ -1046,8 +1052,9 @@ export default {
blacklist.embedding = blacklist.embedding?.slice().map(item => item.toLowerCase())
return blacklist
},
onUpdateBlacklist(data) {
onUpdateBlacklist(data, cancelBlacklistConfirm) {
this.blacklist = this._handleBlacklist(data)
this.cancelBlacklistConfirm = cancelBlacklistConfirm
},
onUpdateHotkey(data) {
this.hotkey = data

30
src/src/components/blacklist.vue
View File

@@ -26,6 +26,15 @@
<textarea class="group-content" :placeholder="getLang('one_keyword_per_line')" v-model="textarea.embedding"></textarea>
</div>
<div class="blacklist-wrap"></div>
<div class="blacklist-group">
<div class="group-title">
<label>
<input type="checkbox" v-model="cancelBlacklistConfirm">
{{ getLang('cancel_confirm_add_blacklist') }}
</label>
</div>
</div>
<div class="blacklist-wrap"></div>
<div class="setting-btns">
<div class="blacklist-save hover-scale-120" @click="onSaveClick">{{ getLang('save') }}</div>
<div class="blacklist-close hover-scale-120" @click="onCloseClick">{{ getLang('close') }}</div>
@@ -55,6 +64,7 @@ export default {
lycoris: [],
embedding: [],
},
cancelBlacklistConfirm: false,
textarea: {
prompt: '',
negative_prompt: '',
@@ -85,13 +95,16 @@ export default {
lycoris: '',
embedding: '',
}
this.gradioAPI.getData('blacklist').then(res => {
if (res) {
this.data.prompt = res.prompt || []
this.data.negative_prompt = res.negative_prompt || []
this.data.lora = res.lora || []
this.data.lycoris = res.lycoris || []
this.data.embedding = res.embedding || []
this.gradioAPI.getDatas(['blacklist', 'cancelBlacklistConfirm']).then(res => {
if (res.blacklist) {
this.data.prompt = res.blacklist.prompt || []
this.data.negative_prompt = res.blacklist.negative_prompt || []
this.data.lora = res.blacklist.lora || []
this.data.lycoris = res.blacklist.lycoris || []
this.data.embedding = res.blacklist.embedding || []
}
if (res.cancelBlacklistConfirm) {
this.cancelBlacklistConfirm = res.cancelBlacklistConfirm
}
this.textarea.prompt = this.data.prompt.join('\n')
this.textarea.negative_prompt = this.data.negative_prompt.join('\n')
@@ -113,8 +126,9 @@ export default {
this.data.lycoris = this.textarea.lycoris.split(/\s*\n\s*/).filter(item => item?.trim().length)
this.data.embedding = this.textarea.embedding.split(/\s*\n\s*/).filter(item => item?.trim().length)
this.gradioAPI.setData('blacklist', this.data)
this.gradioAPI.setData('cancelBlacklistConfirm', this.cancelBlacklistConfirm)
this.close()
this.$emit('update:blacklist', this.data)
this.$emit('update:blacklist', this.data, this.cancelBlacklistConfirm)
},
},
}

4
src/src/components/phystonPrompt.vue
View File

@@ -688,6 +688,10 @@ export default {
type: Object,
default: () => ({}),
},
cancelBlacklistConfirm: {
type: Boolean,
default: false,
},
hotkey: {
type: Object,
default: () => ({}),

4
src/src/mixins/phystonPrompt/tagMixin.js
View File

@@ -507,7 +507,9 @@ export default {
let tag = this.tags.find(tag => tag.id === id)
if (!tag) return
let title = this.getLang('confirm_add_blacklist').replace('{0}', tag.value) + "\n" + this.getLang('blacklist_desc')
if (!confirm(title)) return
if (!this.cancelBlacklistConfirm) {
if (!confirm(title)) return
}
let blacklist = JSON.parse(JSON.stringify(this.blacklist))
if (tag.isLora) {