Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-02 19:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-09-30 22:25:48 +08:00
commit a3c7ed10ed
9 changed files with 99 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -918,7 +918,7 @@ class="b3-list-item b3-list-item--hide-action" data-path="${item.path}">
click: () => {
clickEvent(1);
}
}, {type: "separator"}, {
}, {
icon: window.siyuan.config.fileTree.sort === 4 ? "iconSelect" : undefined,
label: window.siyuan.languages.fileNameNatASC,
click: () => {
@ -966,6 +966,30 @@ 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 === 13 ? "iconSelect" : undefined,
label: window.siyuan.languages.subDocCountASC,
click: () => {
clickEvent(13);
}
}, {
icon: window.siyuan.config.fileTree.sort === 14 ? "iconSelect" : undefined,
label: window.siyuan.languages.subDocCountDESC,
click: () => {
clickEvent(14);
}
}, {type: "separator"}, {
icon: window.siyuan.config.fileTree.sort === 6 ? "iconSelect" : undefined,
label: window.siyuan.languages.customSort,

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

@ -243,9 +243,6 @@ export class MobileFiles extends Model {
clickEvent(1);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
type: "separator"
}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: window.siyuan.config.fileTree.sort === 4 ? "iconSelect" : undefined,
label: window.siyuan.languages.fileNameNatASC,
@ -305,6 +302,34 @@ 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 === 13 ? "iconSelect" : undefined,
label: window.siyuan.languages.subDocCountASC,
click: () => {
clickEvent(13);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: window.siyuan.config.fileTree.sort === 14 ? "iconSelect" : undefined,
label: window.siyuan.languages.subDocCountDESC,
click: () => {
clickEvent(14);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: window.siyuan.config.fileTree.sort === 6 ? "iconSelect" : undefined,
label: window.siyuan.languages.customSort,
@ -526,7 +551,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;