0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 支持按文档大小排序 Fix https://github.com/siyuan-note/siyuan/issues/6029

Browse source
This commit is contained in:
Liang Ding 2022-09-30 21:52:01 +08:00
parent 76ef70ae68
commit 24250bb359
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/langs/en_US.json
View file

@ -426,6 +426,8 @@
"refCountDESC": "Ref Count DESC",
"createdASC": "Created Time ASC",
"createdDESC": "Created Time DESC",
"docSizeASC": "Document Size ASC",
"docSizeDESC": "Document Size DESC",
"sort": "Sort",
"enterFullscreen": "Enter Full Screen",
"exitFullscreen": "Exit Full Screen",

2
app/appearance/langs/es_ES.json
View file

@ -426,6 +426,8 @@
"refCountDESC": "Número de referencia DESC",
"createdASC": "Tiempo de Creación ASC",
"createdDESC": "Tiempo de creación DESC",
"docSizeASC": "Tamaño del Documento Ascendente",
"docSizeDESC": "Tamaño del Documento Descendente",
"sort": "Ordenar",
"enterFullscreen": "Entrar en pantalla completa",
"exitFullscreen": "Salir de pantalla completa",

2
app/appearance/langs/fr_FR.json
View file

@ -426,6 +426,8 @@
"refCountDESC": "Comte Rec décroissant",
"createdASC": "Temps créé croissant",
"createdDESC": "Temps créé décroissant",
"docSizeASC": "Taille du document croissante",
"docSizeDESC": "Taille du document décroissante",
"sort": "Tri",
"enterFullscreen": "plein écran",
"exitFullscreen": "Quitter le plein écran",

2
app/appearance/langs/zh_CHT.json
View file

@ -426,6 +426,8 @@
"refCountDESC": "引用數降冪",
"createdASC": "創建時間昇冪",
"createdDESC": "創建時間降冪",
"docSizeASC": "文檔大小升序",
"docSizeDESC": "文檔大小降序",
"sort": "排序",
"enterFullscreen": "進入全螢幕",
"exitFullscreen": "退出全螢幕",

2
app/appearance/langs/zh_CN.json
View file

@ -426,6 +426,8 @@
"refCountDESC": "引用数降序",
"createdASC": "创建时间升序",
"createdDESC": "创建时间降序",
"docSizeASC": "文档大小升序",
"docSizeDESC": "文档大小降序",
"sort": "排序",
"enterFullscreen": "进入全屏幕",
"exitFullscreen": "退出全屏幕",

12
app/src/layout/dock/Files.ts
View file

@ -966,6 +966,18 @@ class="b3-list-item b3-list-item--hide-action" data-path="${item.path}">
click: () => {
clickEvent(8);
}
}, {type: "separator"}, {
icon: window.siyuan.config.fileTree.sort === 11 ? "iconSelect" : undefined,
label: window.siyuan.languages.docSizeASC,
click: () => {
clickEvent(11);
}
}, {
icon: window.siyuan.config.fileTree.sort === 12 ? "iconSelect" : undefined,
label: window.siyuan.languages.docSizeDESC,
click: () => {
clickEvent(12);
}
}, {type: "separator"}, {
icon: window.siyuan.config.fileTree.sort === 6 ? "iconSelect" : undefined,
label: window.siyuan.languages.customSort,

16
app/src/mobile/util/MobileFiles.ts
View file

@ -305,6 +305,20 @@ export class MobileFiles extends Model {
clickEvent(8);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: window.siyuan.config.fileTree.sort === 11 ? "iconSelect" : undefined,
label: window.siyuan.languages.docSizeASC,
click: () => {
clickEvent(11);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: window.siyuan.config.fileTree.sort === 12 ? "iconSelect" : undefined,
label: window.siyuan.languages.docSizeDESC,
click: () => {
clickEvent(12);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: window.siyuan.config.fileTree.sort === 6 ? "iconSelect" : undefined,
label: window.siyuan.languages.customSort,
@ -526,7 +540,7 @@ export class MobileFiles extends Model {
if (liElement) {
liElement.remove();
}
setNoteBook((notebooks: INotebook[])=> {
setNoteBook((notebooks: INotebook[]) => {
const html = this.genNotebook(data.data.box);
if (this.element.childElementCount === 0) {
this.element.innerHTML = html;

4
kernel/model/file.go
View file

@ -361,6 +361,10 @@ func ListDocTree(boxID, path string, sortMode int) (ret []*File, totals int, err
sort.Slice(docs, func(i, j int) bool { return docs[i].CTime < docs[j].CTime })
case util.SortModeCreatedDESC:
sort.Slice(docs, func(i, j int) bool { return docs[i].CTime > docs[j].CTime })
case util.SortModeSizeASC:
sort.Slice(docs, func(i, j int) bool { return docs[i].Size < docs[j].Size })
case util.SortModeSizeDESC:
sort.Slice(docs, func(i, j int) bool { return docs[i].Size > docs[j].Size })
}
if util.SortModeCustom != sortMode {

6
kernel/util/sort.go
View file

@ -39,13 +39,13 @@ func PinYinCompare(str1, str2 string) bool {
return true
}
//UTF82GBK : transform UTF8 rune into GBK byte array
// UTF82GBK : transform UTF8 rune into GBK byte array
func UTF82GBK(src string) ([]byte, error) {
GB18030 := simplifiedchinese.All[0]
return io.ReadAll(transform.NewReader(bytes.NewReader([]byte(src)), GB18030.NewEncoder()))
}
//GBK2UTF8 : transform GBK byte array into UTF8 string
// GBK2UTF8 : transform GBK byte array into UTF8 string
func GBK2UTF8(src []byte) (string, error) {
GB18030 := simplifiedchinese.All[0]
bytes, err := io.ReadAll(transform.NewReader(bytes.NewReader(src), GB18030.NewDecoder()))
@ -64,4 +64,6 @@ const (
SortModeRefCountDESC // 8：引用数降序
SortModeCreatedASC // 9：文件创建时间升序
SortModeCreatedDESC // 10：文件创建时间降序
SortModeSizeASC // 11：文件大小升序
SortModeSizeDESC // 12：文件大小降序
)