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

🎨 https://github.com/siyuan-note/siyuan/issues/12910

Browse source
This commit is contained in:
Vanessa 2024-10-28 12:10:36 +08:00
parent 90a89f886d
commit e10d247480
15 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -833,7 +833,7 @@
"customSort": "Benutzerdefinierte Sortierung",
"collapse": "Einklappen",
"blockEmbed": "Block einbetten",
"rowTip": "Klicken Sie <span class='ft__on-surface'>Menü öffnen</span><br> Ziehen <span class='ft__on-surface'>Sortieren</span>",
"rowTip": "Klicken Sie <span class='ft__on-surface'>Menü öffnen</span><br> Ziehen <span class='ft__on-surface'>Sortieren</span><br>⇧Klicken <span class='ft__on-surface'>Attribut aktualisieren</span>",
"gutterTip": "Klicken/⌘/ <span class='ft__on-surface'>Menü öffnen</span><br>⌘Klick/⌥→ <span class='ft__on-surface'>Fokussieren</span><br>⌥Klick/⌘↑ <span class='ft__on-surface'>Einklappen/Erweitern</span><br>⇧Klick/⌥⌘A <span class='ft__on-surface'>Attribut aktualisieren</span><br>Ziehen <span class='ft__on-surface'>Position verschieben</span><br>⌃Ziehen <span class='ft__on-surface'>Wiederholen</span><br>⌥Ziehen <span class='ft__on-surface'>Blockreferenz erzeugen</span><br>⇧Ziehen <span class='ft__on-surface'>Eingebetteten Block erzeugen</span>",
"gutterTip2": "Klicken <span class='ft__on-surface'>Menü öffnen</span><br>⇧Klicken <span class='ft__on-surface'>Attribut aktualisieren</span>",
"linkDistance": "Link-Distanz",

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

@ -833,7 +833,7 @@
"customSort": "Custom Sorting",
"collapse": "Collapse",
"blockEmbed": "Embed Block",
"rowTip": "Click <span class='ft__on-surface'>Open Menu</span><br>Drag <span class='ft__on-surface'>Sort</span>",
"rowTip": "Click <span class='ft__on-surface'>Open Menu</span><br>Drag <span class='ft__on-surface'>Sort</span><br>⇧Click <span class='ft__on-surface'>Update attribute</span>",
"gutterTip": "Click/⌘/ <span class='ft__on-surface'>Open Menu</span><br>⌘Click/⌥→ <span class='ft__on-surface'>Focus</span><br>⌥Click/⌘↑ <span class='ft__on-surface'>Collapse/Expand</span><br>⇧Click/⌥⌘A <span class='ft__on-surface'>Update attribute</span><br>Drag <span class='ft__on-surface'>Move position</span><br>⌃Drag <span class='ft__on-surface'>Repeat</span><br>⌥Drag <span class='ft__on-surface'>Generate block reference</span><br>⇧Drag <span class='ft__on-surface'>Generate embedded block</span>",
"gutterTip2": "Click <span class='ft__on-surface'>Open Menu</span><br>⇧Click <span class='ft__on-surface'>Update attribute</span>",
"linkDistance": "Link distance",

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

@ -833,7 +833,7 @@
"customSort": "Clasificación personalizada",
"collapse": "Colapsar",
"blockEmbed": "Integrar Bloque",
"rowTip": "Haga clic en <span class='ft__on-surface'>Abrir menú</span><br>Arrastre <span class='ft__on-surface'>Ordenar</span>",
"rowTip": "Haga clic en <span class='ft__on-surface'>Abrir menú</span><br>Arrastre <span class='ft__on-surface'>Ordenar</span><br>⇧Haga clic en <span class='ft__on-surface'>Actualizar atributo</span>",
"gutterTip": "Haga clic/⌘/ <span class='ft__on-surface'>Abrir menú</span><br>⌘Haga clic/⌥→ <span class='ft__on-surface'>Enfoque</span><br>⌥Hacer clic/⌘↑ <span class='ft__on-surface'>Contraer/Expandir</span><br>⇧Hacer clic/⌥⌘A <span class='ft__on-surface'>Actualizar atributo</span><br>Arrastrar <span class='ft__on-surface'>Mover posición</span><br>⌃Arrastrar <span class='ft__on-surface'>Repetir</span><br>⌥Arrastra <span class='ft__on-surface'>Generar referencia a bloque</span><br>⇧Arrastrar <span class='ft__on-surface'>Generar bloque incrustado</span>",
"gutterTip2": "Haga clic en <span class='ft__on-surface'>Abrir menú</span><br>⇧Haga clic en <span class='ft__on-surface'>Actualizar atributo</span>",
"linkDistance": "Distancia de enlace",

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

@ -833,7 +833,7 @@
"customSort": "Tri personnalisé",
"collapse": "Collapse",
"blockEmbed": "incorporer le bloc",
"rowTip": "Cliquez sur <span class='ft__on-surface'>Ouvrir le menu</span><br>Faites glisser <span class='ft__on-surface'>Tri</span>",
"rowTip": "Cliquez sur <span class='ft__on-surface'>Ouvrir le menu</span><br>Faites glisser <span class='ft__on-surface'>Tri</span><br>⇧Cliquez sur <span class='ft__on-surface'>Mettre à jour l'attribut</span>",
"gutterTip": "Cliquez/⌘/ <span class='ft__on-surface'>Ouvrir le menu</span><br>⌘Cliquez/⌥→ <span class='ft__on-surface'>Se concentrer</span><br>⌥Cliquez/⌘↑ <span class='ft__on-surface'>Réduire/Développer</span><br>⇧Cliquez/⌥⌘A <span class='ft__on-surface'>Mettre à jour l'attribut</span><br>Faites glisser <span class='ft__on-surface'>Déplacer la position</span><br>⌃Faites glisser <span class='ft__on-surface'>Répétez</span><br>⌥Faites glisser <span class='ft__on-surface'>Générer une référence de bloc</span><br>⇧Faites glisser <span class='ft__on-surface'>Générer un bloc intégré</span>",
"gutterTip2": "Cliquez sur <span class='ft__on-surface'>Ouvrir le menu</span><br>⇧Cliquez sur <span class='ft__on-surface'>Mettre à jour l'attribut</span>",
"linkDistance": "Distance du lien",

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

@ -833,7 +833,7 @@
"customSort": "מיון מותאם אישית",
"collapse": "התרסק",
"blockEmbed": "הטבעה בלוק",
"rowTip": "לחץ <span class='ft__on-surface'>פתח תפריט</span><br>גרור <span class='ft__on-surface'>מיון</span>",
"rowTip": "לחץ על <span class='ft__on-surface'>פתח תפריט</span><br>גרור את <span class='ft__on-surface'>מיין</span><br>⇧לחץ על <span class='ft__on-surface'>עדכן מאפיין</span>",
"gutterTip": "לחץ/⌘/<span class='ft__on-surface'>פתח תפריט</span><br>⌘לחץ/⌥→ <span class='ft__on-surface'>מקד</span><br>⌥לחץ/⌘↑ <span class='ft__on-surface'>התרסק/הרחב</span><br>⇧לחץ/⌥⌘A <span class='ft__on-surface'>עדכן מאפיין</span><br>גרור <span class='ft__on-surface'>שנה מקום</span><br>⌃גרור <span class='ft__on-surface'>חזור</span><br>⌥גרור <span class='ft__on-surface'>צור הפניה לבלוק</span><br>⇧גרור <span class='ft__on-surface'>צור בלוק מוטמע</span>",
"gutterTip2": "לחץ <span class='ft__on-surface'>פתח תפריט</span><br>⇧לחץ <span class='ft__on-surface'>עדכן מאפיין</span>",
"linkDistance": "מרחק קישור",

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

@ -833,7 +833,7 @@
"customSort": "Ordinamento personalizzato",
"collapse": "Comprimi",
"blockEmbed": "Incorpora Blocco",
"rowTip": "Clicca <span class='ft__on-surface'>Apri Menu</span><br>Trascina <span class='ft__on-surface'>Ordina</span>",
"rowTip": "Clicca <span class='ft__on-surface'>Apri Menu</span><br>Trascina <span class='ft__on-surface'>Ordina</span><br>⇧Clicca <span class='ft__on-surface'>Aggiorna attributo</span>",
"gutterTip": "Clicca/⌘/ <span class='ft__on-surface'>Apri Menu</span><br>⌘Clicca/⌥→ <span class='ft__on-surface'>Metti a fuoco</span><br>⌥Clicca/⌘↑ <span class='ft__on-surface'>Comprimi/Espandi</span><br>⇧Clicca/⌥⌘A <span class='ft__on-surface'>Aggiorna attributo</span><br>Trascina <span class='ft__on-surface'>Sposta posizione</span><br>⌃Trascina <span class='ft__on-surface'>Ripeti</span><br>⌥Trascina <span class='ft__on-surface'>Genera riferimento blocco</span><br>⇧Trascina <span class='ft__on-surface'>Genera blocco incorporato</span>",
"gutterTip2": "Clicca <span class='ft__on-surface'>Apri Menu</span><br>⇧Clicca <span class='ft__on-surface'>Aggiorna attributo</span>",
"linkDistance": "Distanza del collegamento",

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

@ -833,7 +833,7 @@
"customSort": "カスタムソート",
"collapse": "折りたたみ",
"blockEmbed": "埋め込みブロック",
"rowTip": "クリック <span class='ft__on-surface'>メニューを開く</span><br>ドラッグ <span class='ft__on-surface'>並べ替え</span>",
"rowTip": "クリック <span class='ft__on-surface'>メニューを開く</span><br>ドラッグ <span class='ft__on-surface'>並べ替え</span><br>⇧クリック <span class='ft__on-surface'>属性を変更</span>",
"gutterTip": "クリック/⌘/ <span class='ft__on-surface'>ブロックメニューを開く</span><br>⌘クリック/⌥→ <span class='ft__on-surface'>フォーカス</span><br>⌥クリック/⌘↑ <span class='ft__on-surface'>折りたたみ/展開</span><br>⇧クリック/⌥⌘A <span class='ft__on-surface'>属性を変更</span><br>ドラッグ <span class='ft__on-surface'>ブロックを移動</span><br>⌃ドラッグ <span class='ft__on-surface'>ブロックを複製</span><br>⌥ドラッグ <span class='ft__on-surface'>ブロック参照を生成</span><br>⇧ドラッグ <span class='ft__on-surface'>埋め込みブロックを生成</span>",
"gutterTip2": "クリック <span class='ft__on-surface'>メニューを開く</span><br>⇧クリック <span class='ft__on-surface'>属性を変更</span>",
"linkDistance": "リンクの距離",

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

@ -833,7 +833,7 @@
"customSort": "Niestandardowe sortowanie",
"collapse": "Zwiń",
"blockEmbed": "Wstaw blok",
"rowTip": "Kliknij <span class='ft__on-surface'>Otwórz menu</span><br>Przeciągnij <span class='ft__on-surface'>Sortuj</span>",
"rowTip": "Kliknij <span class='ft__on-surface'>Otwórz menu</span><br>Przeciągnij <span class='ft__on-surface'>Sortuj</span><br>⇧Kliknij <span class='ft__on-surface'>Zaktualizuj atrybut</span>",
"gutterTip": "Kliknij/⌘/ <span class='ft__on-surface'>Otwórz menu</span><br>⌘Kliknij/⌥→ <span class='ft__on-surface'>Skupienie</span><br>⌥Kliknij/⌘↑ <span class='ft__on-surface'>Zwiń/Rozwiń</span><br>⇧Kliknij/⌥⌘A <span class='ft__on-surface'>Zaktualizuj atrybut</span><br>Przeciągnij <span class='ft__on-surface'>Przesuń pozycję</span><br>⌃Przeciągnij <span class='ft__on-surface'>Powtórz</span><br>⌥Przeciągnij <span class='ft__on-surface'>Generuj odniesienie do bloku</span><br>⇧Przeciągnij <span class='ft__on-surface'>Generuj wbudowany blok</span>",
"gutterTip2": "Kliknij <span class='ft__on-surface'>Otwórz menu</span><br>⇧Kliknij <span class='ft__on-surface'>Zaktualizuj atrybut</span>",
"linkDistance": "Odległość linku",

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

@ -833,7 +833,7 @@
"customSort": "Индивидуальная сортировка",
"collapse": "Свернуть",
"blockEmbed": "Встраиваемый блок",
"rowTip": "Нажмите <span class='ft__on-surface'>Открыть меню</span><br>Перетащите <span class='ft__on-surface'>Сортировать</span>",
"rowTip": "Нажмите <span class='ft__on-surface'>Открыть меню</span><br>Перетащите <span class='ft__on-surface'>Сортировать</span><br>⇧Клик <span class='ft__on-surface'>Обновить атрибут</span>",
"gutterTip": "Нажмите/⌘/ <span class='ft__on-surface'>Открыть меню</span><br>⌘Клик/⌥→ <span class='ft__on-surface'>Фокус</span><br>⌥Клик/⌘↑ <span class='ft__on-surface'>Свернуть/Развернуть</span><br>⇧Клик/⌥⌘A <span class='ft__on-surface'>Обновить атрибут</span><br>Перетащите <span class='ft__on-surface'>Переместить позицию</span><br>⌃Перетащите <span class='ft__on-surface'>Повторить</span><br>⌥Перетащите <span class='ft__on-surface'>Сгенерировать ссылку блока</span><br>⇧Перетащите <span class='ft__on-surface'>Сгенерировать встроенный блок</span>",
"gutterTip2": "Нажмите <span class='ft__on-surface'>Открыть меню</span><br>⇧Клик <span class='ft__on-surface'>Обновить атрибут</span>",
"linkDistance": "Расстояние ссылки",

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

@ -833,7 +833,7 @@
"customSort": "自訂排序",
"collapse": "摺疊",
"blockEmbed": "嵌入塊",
"rowTip": "點擊 <span class='ft__on-surface'>打開菜單</span><br>拖拽 <span class='ft__on-surface'>排序</span>",
"rowTip": "點擊 <span class='ft__on-surface'>打開菜單</span><br>拖拽 <span class='ft__on-surface'>排序</span><br>⇧點擊 <span class='ft__on-surface'>修改屬性</span>",
"gutterTip": "點擊/⌘/ <span class='ft__on-surface'>打開菜單</span><br>⌘點擊 <span class='ft__on-surface'>聚焦</span><br>⌥點擊/⌥→ <span class='ft__on-surface'>折疊/展開</span><br>⇧點擊/⌥⌘A <span class='ft__on-surface'>修改屬性</span><br>拖拽 <span class='ft__on-surface'>移動位置</span><br>⌃拖拽 <span class='ft__on-surface'>重複</span><br>⌥拖拽 <span class='ft__on-surface'>生成塊引用</span><br>⇧拖拽 <span class='ft__on-surface'>生成嵌入塊</span>",
"gutterTip2": "點擊 <span class='ft__on-surface'>打開功能表</span><br>⇧點擊 <span class='ft__on-surface'>修改屬性</span>",
"linkDistance": "連結距離",

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

@ -833,7 +833,7 @@
"customSort": "自定义排序",
"collapse": "折叠",
"blockEmbed": "嵌入块",
"rowTip": "点击 <span class='ft__on-surface'>打开菜单</span><br>拖拽 <span class='ft__on-surface'>排序</span>",
"rowTip": "点击 <span class='ft__on-surface'>打开菜单</span><br>拖拽 <span class='ft__on-surface'>排序</span><br>⇧点击 <span class='ft__on-surface'>修改属性</span>",
"gutterTip": "点击/⌘/ <span class='ft__on-surface'>打开菜单</span><br>⌘点击/⌥→ <span class='ft__on-surface'>聚焦</span><br>⌥点击/⌘↑ <span class='ft__on-surface'>折叠/展开</span><br>⇧点击/⌥⌘A <span class='ft__on-surface'>修改属性</span><br>拖拽 <span class='ft__on-surface'>移动位置</span><br>⌃拖拽 <span class='ft__on-surface'>重复</span><br>⌥拖拽 <span class='ft__on-surface'>生成块引用</span><br>⇧拖拽 <span class='ft__on-surface'>生成嵌入块</span>",
"gutterTip2": "点击 <span class='ft__on-surface'>打开菜单</span><br>⇧点击 <span class='ft__on-surface'>修改属性</span>",
"linkDistance": "链接距离",

1
app/src/assets/scss/business/_av.scss
View file

@ -3,6 +3,7 @@
box-sizing: border-box;
display: flex;
max-width: 100%;
margin: 4px 0 !important;
&:hover .av__views .block__icon {
opacity: 1;

5
app/src/menus/util.ts
View file

@ -33,7 +33,7 @@ export const exportAsset = (src: string) => {
};
};
export const openEditorTab = (app: App, ids: string[], notebookId?: string, pathString?: string) => {
export const openEditorTab = (app: App, ids: string[], notebookId?: string, pathString?: string, onlyGetMenus = false) => {
/// #if !MOBILE
const openSubmenus: IMenu[] = [{
id: "insertRight",
@ -159,6 +159,9 @@ export const openEditorTab = (app: App, ids: string[], notebookId?: string, path
}
});
/// #endif
if (onlyGetMenus ) {
return openSubmenus;
}
window.siyuan.menus.menu.append(new MenuItem({
id: "openBy",
label: window.siyuan.languages.openBy,

19
app/src/protyle/gutter/index.ts
View file

@ -8,7 +8,7 @@ import {
import {getIconByType} from "../../editor/getIcon";
import {enterBack, iframeMenu, setFold, tableMenu, videoMenu, zoomOut} from "../../menus/protyle";
import {MenuItem} from "../../menus/Menu";
import {copySubMenu, openAttr, openWechatNotify} from "../../menus/commonMenuItem";
import {copySubMenu, openAttr, openFileAttr, openWechatNotify} from "../../menus/commonMenuItem";
import {
copyPlainText,
isInAndroid,
@ -285,6 +285,15 @@ export class Gutter {
}
blockElement.setAttribute("updated", newUpdated);
} else {
if (!protyle.disabled && event.shiftKey) {
const blockId = rowElement.querySelector('[data-dtype="block"] .av__celltext--ref')?.getAttribute("data-id")
if (blockId) {
fetchPost("/api/attr/getBlockAttrs", {id: blockId}, (response) => {
openFileAttr(response.data, "av", protyle);
});
return;
}
}
avContextmenu(protyle, rowElement as HTMLElement, {
x: gutterRect.left,
y: gutterRect.bottom,
@ -2232,7 +2241,13 @@ export class Gutter {
const rowElement = hasClosestByClassName(target, "av__row");
if (rowElement && !rowElement.classList.contains("av__row--header")) {
element = rowElement;
html = `<button data-type="NodeAttributeViewRowMenu" data-node-id="${dataNodeId}" data-row-id="${rowElement.dataset.id}" class="ariaLabel" data-position="right" aria-label="${window.siyuan.languages.rowTip}"><svg><use xlink:href="#iconDrag"></use></svg><span ${protyle.disabled ? "" : 'draggable="true" class="fn__grab"'}></span></button>`;
let iconAriaLabel = isMac() ? window.siyuan.languages.rowTip : window.siyuan.languages.rowTip.replace("⇧", "Shift+");
if (protyle.disabled) {
iconAriaLabel = window.siyuan.languages.rowTip.substring(0, window.siyuan.languages.rowTip.indexOf("<br"))
} else if (rowElement.querySelector('[data-dtype="block"]').getAttribute("data-detached") === "true") {
iconAriaLabel = window.siyuan.languages.rowTip.substring(0, window.siyuan.languages.rowTip.lastIndexOf("<br"))
}
html = `<button data-type="NodeAttributeViewRowMenu" data-node-id="${dataNodeId}" data-row-id="${rowElement.dataset.id}" class="ariaLabel" data-position="right" aria-label="${iconAriaLabel}"><svg><use xlink:href="#iconDrag"></use></svg><span ${protyle.disabled ? "" : 'draggable="true" class="fn__grab"'}></span></button>`;
if (!protyle.disabled) {
html = `<button data-type="NodeAttributeViewRow" data-node-id="${dataNodeId}" data-row-id="${rowElement.dataset.id}" class="ariaLabel" data-position="right" aria-label="${isMac() ? window.siyuan.languages.addBelowAbove : window.siyuan.languages.addBelowAbove.replace("⌥", "Alt+")}"><svg><use xlink:href="#iconAdd"></use></svg></button>${html}`;
}

22
app/src/protyle/render/av/action.ts
View file

@ -2,7 +2,7 @@ import {Menu} from "../../../plugin/Menu";
import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName} from "../../util/hasClosest";
import {transaction} from "../../wysiwyg/transaction";
import {openEditorTab} from "../../../menus/util";
import {copySubMenu} from "../../../menus/commonMenuItem";
import {copySubMenu, openFileAttr} from "../../../menus/commonMenuItem";
import {
addDragFill,
genCellValueByElement,
@ -262,8 +262,26 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi
updateHeader(rowElement);
const keyCellElement = rowElements[0].querySelector(".av__cell[data-block-id]") as HTMLElement;
if (rowElements.length === 1 && keyCellElement.getAttribute("data-detached") !== "true") {
/// #if !MOBILE
const blockId = rowElements[0].getAttribute("data-id");
openEditorTab(protyle.app, [blockId]);
const openSubmenus = openEditorTab(protyle.app, [blockId], undefined, undefined, true);
openSubmenus.push({type: "separator"})
openSubmenus.push({
icon: "iconAttr",
label: window.siyuan.languages.attr,
click: () => {
fetchPost("/api/attr/getBlockAttrs", {id: blockId}, (response) => {
openFileAttr(response.data, "av", protyle);
});
}
})
menu.addItem({
id: "openBy",
label: window.siyuan.languages.openBy,
icon: "iconOpen",
submenu: openSubmenus,
});
/// #endif
menu.addItem({
label: window.siyuan.languages.copy,
icon: "iconCopy",