Skip to content

Commit 569dc19

Browse files
AUTOMATIC1111AUTOMATIC1111
authored
Merge pull request #14588 from Sj-Si/feature/extra-networks-tree-view
Feature: Extra Networks Tree View
2 parents 8a6a4ad + 26e1cd7 commit 569dc19

15 files changed

+1316
-340
lines changed

‎extensions-builtin/Lora/ui_extra_networks_lora.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@ def create_item(self, name, index=None, enable_filter=True):
2424

2525
alias = lora_on_disk.get_alias()
2626

27+
search_terms = [self.search_terms_from_path(lora_on_disk.filename)]
28+
if lora_on_disk.hash:
29+
search_terms.append(lora_on_disk.hash)
2730
item = {
2831
"name": name,
2932
"filename": lora_on_disk.filename,
3033
"shorthash": lora_on_disk.shorthash,
3134
"preview": self.find_preview(path),
3235
"description": self.find_description(path),
33-
"search_term": self.search_terms_from_path(lora_on_disk.filename) + " " + (lora_on_disk.hash or ""),
36+
"search_terms": search_terms,
3437
"local_preview": f"{path}.{shared.opts.samples_format}",
3538
"metadata": lora_on_disk.metadata,
3639
"sort_keys": {'default': index, **self.get_sort_keys(lora_on_disk.filename)},

‎html/extra-networks-card.html

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
<div class='card' style={style} onclick={card_clicked} data-name="{name}" {sort_keys}>
1+
<div class="card" style="{style}" onclick="{card_clicked}" data-name="{name}" {sort_keys}>
22
{background_image}
3-
<div class="button-row">
4-
{metadata_button}
5-
{edit_button}
6-
</div>
7-
<div class='actions'>
8-
<div class='additional'>
9-
<span style="display:none" class='search_term{search_only}'>{search_term}</span>
10-
</div>
11-
<span class='name'>{name}</span>
12-
<span class='description'>{description}</span>
3+
<div class="button-row">{copy_path_button}{metadata_button}{edit_button}</div>
4+
<div class="actions">
5+
<div class="additional">{search_terms}</div>
6+
<span class="name">{name}</span>
7+
<span class="description">{description}</span>
138
</div>
149
</div>

‎html/extra-networks-copy-path-button.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="copy-path-button card-button"
2+
title="Copy path to clipboard"
3+
onclick="extraNetworksCopyCardPath(event, '{filename}')"
4+
data-clipboard-text="{filename}">
5+
</div>

‎html/extra-networks-edit-item-button.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<div class="edit-button card-button"
2+
title="Edit metadata"
3+
onclick="extraNetworksEditUserMetadata(event, '{tabname}', '{extra_networks_tabname}', '{name}')">
4+
</div>

‎html/extra-networks-metadata-button.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<div class="metadata-button card-button"
2+
title="Show internal metadata"
3+
onclick="extraNetworksRequestMetadata(event, '{extra_networks_tabname}', '{name}')">
4+
</div>

‎html/extra-networks-pane.html

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<div id='{tabname}_{extra_networks_tabname}_pane' class='extra-network-pane'>
2+
<div class="extra-network-control">
3+
<div class="extra-network-control--search">
4+
<input
5+
id="{tabname}_{extra_networks_tabname}_extra_search"
6+
class="extra-network-control--search-text"
7+
type="search"
8+
placeholder="Filter files"
9+
>
10+
</div>
11+
<div
12+
id="{tabname}_{extra_networks_tabname}_extra_sort"
13+
class="extra-network-control--sort"
14+
data-sortmode="{data_sortmode}"
15+
data-sortkey="{data_sortkey}"
16+
title="Sort by path"
17+
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');"
18+
>
19+
<i class="extra-network-control--sort-icon"></i>
20+
</div>
21+
<div
22+
id="{tabname}_{extra_networks_tabname}_extra_sort_dir"
23+
class="extra-network-control--sort-dir"
24+
data-sortdir="{data_sortdir}"
25+
title="Sort ascending"
26+
onclick="extraNetworksControlSortDirOnClick(event, '{tabname}', '{extra_networks_tabname}');"
27+
>
28+
<i class="extra-network-control--sort-dir-icon"></i>
29+
</div>
30+
<div
31+
id="{tabname}_{extra_networks_tabname}_extra_tree_view"
32+
class="extra-network-control--tree-view {tree_view_btn_extra_class}"
33+
title="Enable Tree View"
34+
onclick="extraNetworksControlTreeViewOnClick(event, '{tabname}', '{extra_networks_tabname}');"
35+
>
36+
<i class="extra-network-control--tree-view-icon"></i>
37+
</div>
38+
<div
39+
id="{tabname}_{extra_networks_tabname}_extra_refresh"
40+
class="extra-network-control--refresh"
41+
title="Refresh page"
42+
onclick="extraNetworksControlRefreshOnClick(event, '{tabname}', '{extra_networks_tabname}');"
43+
>
44+
<i class="extra-network-control--refresh-icon"></i>
45+
</div>
46+
</div>
47+
<div class="extra-network-pane-content">
48+
<div id='{tabname}_{extra_networks_tabname}_tree' class='extra-network-tree {tree_view_div_extra_class}'>
49+
{tree_html}
50+
</div>
51+
<div id='{tabname}_{extra_networks_tabname}_cards' class='extra-network-cards'>
52+
{items_html}
53+
</div>
54+
</div>
55+
</div>

‎html/extra-networks-tree-button.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<span data-filterable-item-text hidden>{search_terms}</span>
2+
<div class="tree-list-content {subclass}"
3+
type="button"
4+
onclick="extraNetworksTreeOnClick(event, '{tabname}', '{extra_networks_tabname}');{onclick_extra}"
5+
data-path="{data_path}"
6+
data-hash="{data_hash}"
7+
>
8+
<span class='tree-list-item-action tree-list-item-action--leading'>
9+
{action_list_item_action_leading}
10+
</span>
11+
<span class="tree-list-item-visual tree-list-item-visual--leading">
12+
{action_list_item_visual_leading}
13+
</span>
14+
<span class="tree-list-item-label tree-list-item-label--truncate">
15+
{action_list_item_label}
16+
</span>
17+
<span class="tree-list-item-visual tree-list-item-visual--trailing">
18+
{action_list_item_visual_trailing}
19+
</span>
20+
<span class="tree-list-item-action tree-list-item-action--trailing">
21+
{action_list_item_action_trailing}
22+
</span>
23+
</div>

0 commit comments

Comments
 (0)