Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-27 03:48:48 +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 2025-10-09 11:55:39 +08:00
commit 8c5a8dbf40
6 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/assets/scss/protyle/_wysiwyg.scss
View file

@ -604,10 +604,16 @@
&--attr .protyle-attr {
opacity: 1;
& > div:not(.protyle-attr--memo):not(.protyle-attr--refcount) {
cursor: pointer;
@include mixin.text-clamp(1);
max-width: 25vw;
& > div {
&.protyle-attr--memo {
cursor: pointer;
}
&:not(.protyle-attr--memo):not(.protyle-attr--refcount) {
cursor: pointer;
@include mixin.text-clamp(1);
max-width: 25vw;
}
}
}

2
app/src/mobile/menu/search.ts
View file

@ -717,7 +717,7 @@ export const popSearch = (app: App, searchConfig?: any) => {
<svg class="svg--mid"><use xlink:href="#iconSearch"></use></svg>
<svg class="svg--smaller"><use xlink:href="#iconDown"></use></svg>
</span>
<input id="toolbarSearch" placeholder="${window.siyuan.languages.showRecentUpdatedBlocks}" class="toolbar__title fn__block">
<input id="toolbarSearch" placeholder="${window.siyuan.languages.showRecentUpdatedBlocks}" class="toolbar__title fn__block" autocomplete="off" spellcheck="false">
<svg id="toolbarSearchNew" class="toolbar__icon"><use xlink:href="#iconFile"></use></svg>
</div>`,
html: `<div class="fn__flex-column" style="height: 100%">

2
app/src/protyle/header/Title.ts
View file

@ -381,7 +381,7 @@ export class Title {
nodeAttrHTML += `<div class="protyle-attr--alias"><svg><use xlink:href="#iconA"></use></svg>${Lute.EscapeHTMLStr(response.data.ial.alias)}</div>`;
}
if (response.data.ial.memo) {
nodeAttrHTML += `<div class="protyle-attr--memo b3-tooltips b3-tooltips__sw" aria-label="${Lute.EscapeHTMLStr(response.data.ial.memo)}"><svg><use xlink:href="#iconM"></use></svg></div>`;
nodeAttrHTML += `<div class="protyle-attr--memo ariaLabel" aria-label="${Lute.EscapeHTMLStr(response.data.ial.memo)}" data-position="north"><svg><use xlink:href="#iconM"></use></svg></div>`;
}
if (response.data.ial["custom-avs"]) {
let avTitle = "";

2
app/src/protyle/wysiwyg/transaction.ts
View file

@ -540,7 +540,7 @@ export const onTransaction = (protyle: IProtyle, operation: IOperation, isUndo:
} else if (key === "alias") {
aliasHTML = `<div class="protyle-attr--alias"><svg><use xlink:href="#iconA"></use></svg>${escapeHTML}</div>`;
} else if (key === "memo") {
memoHTML = `<div class="protyle-attr--memo b3-tooltips b3-tooltips__sw" aria-label="${escapeHTML}"><svg><use xlink:href="#iconM"></use></svg></div>`;
memoHTML = `<div class="protyle-attr--memo ariaLabel" aria-label="${escapeHTML}" data-position="north"><svg><use xlink:href="#iconM"></use></svg></div>`;
} else if (key === "custom-avs" && data.new["av-names"]) {
avHTML = `<div class="protyle-attr--av"><svg><use xlink:href="#iconDatabase"></use></svg>${data.new["av-names"]}</div>`;
}

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

@ -135,7 +135,7 @@ export const genSearch = (app: App, config: Config.IUILayoutTabSearchConfig, ele
<svg data-menu="true" class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg>
<svg class="search__arrowdown"><use xlink:href="#iconDown"></use></svg>
</span>
<input id="searchInput" class="b3-text-field b3-text-field--text" placeholder="${window.siyuan.languages.showRecentUpdatedBlocks}">
<input id="searchInput" class="b3-text-field b3-text-field--text" placeholder="${window.siyuan.languages.showRecentUpdatedBlocks}" autocomplete="off" spellcheck="false">
</div>
<div class="block__icons">
<span id="searchFilter" aria-label="${window.siyuan.languages.searchType}" class="block__icon ariaLabel" data-position="9south">

20
kernel/av/value.go
View file

@ -534,34 +534,34 @@ func formatNumber(content float64, format NumberFormat) string {
case NumberFormatPercent:
s := fmt.Sprintf("%.2f", content*100)
return strings.TrimRight(strings.TrimRight(s, "0"), ".") + "%"
case NumberFormatUSD:
case NumberFormatUSD, "usDollar":
p := message.NewPrinter(language.English)
return p.Sprintf("$%.2f", content)
case NumberFormatCNY:
case NumberFormatCNY, "yuan":
p := message.NewPrinter(language.Chinese)
return p.Sprintf("CN¥%.2f", content)
case NumberFormatEUR:
case NumberFormatEUR, "euro":
p := message.NewPrinter(language.German)
return p.Sprintf("€%.2f", content)
case NumberFormatGBP:
case NumberFormatGBP, "pound":
p := message.NewPrinter(language.English)
return p.Sprintf("£%.2f", content)
case NumberFormatJPY:
case NumberFormatJPY, "yen":
p := message.NewPrinter(language.Japanese)
return p.Sprintf("¥%.0f", content)
case NumberFormatRUB:
case NumberFormatRUB, "ruble":
p := message.NewPrinter(language.Russian)
return p.Sprintf("₽%.2f", content)
case NumberFormatINR:
case NumberFormatINR, "rupee":
p := message.NewPrinter(language.Hindi)
return p.Sprintf("₹%.2f", content)
case NumberFormatKRW:
case NumberFormatKRW, "won":
p := message.NewPrinter(language.Korean)
return p.Sprintf("₩%.0f", content)
case NumberFormatCAD:
case NumberFormatCAD, "canadianDollar":
p := message.NewPrinter(language.English)
return p.Sprintf("CA$%.2f", content)
case NumberFormatCHF:
case NumberFormatCHF, "franc":
p := message.NewPrinter(language.French)
return p.Sprintf("CHF%.2f", content)
case NumberFormatTHB: