Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-24 02:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

💄 https://github.com/siyuan-note/siyuan/issues/7017

Browse source
This commit is contained in:
Vanessa 2023-01-09 16:08:06 +08:00
parent 56c8858c18
commit a4f6808156
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/assets/scss/base.scss
View file

@ -251,6 +251,12 @@ progressLoading: 400
} }
} }
} }
&__text {
max-width: 96px;
overflow: hidden;
text-overflow: ellipsis;
}
} }
.status { .status {

14
app/src/menus/workspace.ts
View file

@ -4,7 +4,7 @@ import {dialog} from "@electron/remote";
import {ipcRenderer} from "electron"; import {ipcRenderer} from "electron";
/// #endif /// #endif
import {openHistory} from "../history/history"; import {openHistory} from "../history/history";
import {getOpenNotebookCount} from "../util/pathName"; import {getOpenNotebookCount, originalPath} from "../util/pathName";
import {mountHelp, newDailyNote} from "../util/mount"; import {mountHelp, newDailyNote} from "../util/mount";
import {fetchPost} from "../util/fetch"; import {fetchPost} from "../util/fetch";
import {Constants} from "../constants"; import {Constants} from "../constants";
@ -38,6 +38,7 @@ export const workspaceMenu = (rect: DOMRect) => {
if (!item.closed) { if (!item.closed) {
submenu.push({ submenu.push({
label: item.name, label: item.name,
accelerator: window.siyuan.storage[Constants.LOCAL_DAILYNOTEID] === item.id ? window.siyuan.config.keymap.general.dailyNote.custom : "",
click: () => { click: () => {
fetchPost("/api/filetree/createDailyNote", { fetchPost("/api/filetree/createDailyNote", {
notebook: item.id, notebook: item.id,
@ -52,7 +53,6 @@ export const workspaceMenu = (rect: DOMRect) => {
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.dailyNote, label: window.siyuan.languages.dailyNote,
icon: "iconCalendar", icon: "iconCalendar",
accelerator: window.siyuan.config.keymap.general.dailyNote.custom,
type: "submenu", type: "submenu",
submenu submenu
}).element); }).element);
@ -75,7 +75,7 @@ export const workspaceMenu = (rect: DOMRect) => {
}).element); }).element);
/// #if !BROWSER /// #if !BROWSER
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.openBy + "...", label: window.siyuan.languages.openWorkspace,
click: async () => { click: async () => {
const localPath = await dialog.showOpenDialog({ const localPath = await dialog.showOpenDialog({
defaultPath: window.siyuan.config.system.homeDir, defaultPath: window.siyuan.config.system.homeDir,
@ -97,7 +97,9 @@ export const workspaceMenu = (rect: DOMRect) => {
return; return;
} }
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
label: item.path, label: `<div class="b3-tooltips b3-tooltips__e" aria-label="${item.path}">
<div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
</div>`,
click: () => { click: () => {
openWorkspace(item.path); openWorkspace(item.path);
} }
@ -110,7 +112,9 @@ export const workspaceMenu = (rect: DOMRect) => {
}).element); }).element);
response.data.forEach((item: IWorkspace) => { response.data.forEach((item: IWorkspace) => {
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
label: item.path, label: `<div class="b3-tooltips b3-tooltips__e" aria-label="${item.path}">
<div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
</div>`,
click: () => { click: () => {
openWorkspace(item.path); openWorkspace(item.path);
} }

2
app/src/util/onGetConfig.ts
View file

@ -182,7 +182,7 @@ export const onGetConfig = (isStart: boolean) => {
const initBar = () => { const initBar = () => {
document.querySelector(".toolbar").innerHTML = ` document.querySelector(".toolbar").innerHTML = `
<div id="barWorkspace" class="toolbar__item"> <div id="barWorkspace" class="toolbar__item">
${originalPath().basename(window.siyuan.config.system.workspaceDir)} <span class="toolbar__text">${originalPath().basename(window.siyuan.config.system.workspaceDir)}</span>
<svg class="toolbar__svg"><use xlink:href="#iconDown"></use></svg> <svg class="toolbar__svg"><use xlink:href="#iconDown"></use></svg>
</div> </div>
<div id="barSync" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.config.sync.stat || (window.siyuan.languages.syncNow + " " + updateHotkeyTip(window.siyuan.config.keymap.general.syncNow.custom))}"> <div id="barSync" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.config.sync.stat || (window.siyuan.languages.syncNow + " " + updateHotkeyTip(window.siyuan.config.keymap.general.syncNow.custom))}">