Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +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 2023-07-05 00:51:23 +08:00
commit e17a9d1ee4
8 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,6 @@
{
"asc": "Ascending",
"desc": "Descending",
"hideCol": "Hide column",
"hideAll": "Hide all",
"showAll": "Show all",

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

@ -1,4 +1,6 @@
{
"asc": "Ascendente",
"desc": "Descendente",
"hideCol": "Ocultar columna",
"hideAll": "Ocultar todo",
"showAll": "Mostrar todo",

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

@ -1,4 +1,6 @@
{
"asc": "Ascendant",
"desc": "Descendant",
"hideCol": "Masquer la colonne",
"hideAll": "Masquer tout",
"showAll": "Afficher tout",

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

@ -1,4 +1,6 @@
{
"asc": "升序",
"desc": "降序",
"hideCol": "隱藏列",
"hideAll": "隱藏全部",
"showAll": "顯示全部",

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

@ -1,4 +1,6 @@
{
"asc": "升序",
"desc": "降序",
"hideCol": "隐藏列",
"hideAll": "隐藏全部",
"showAll": "显示全部",

4
app/src/protyle/render/av/cell.ts
View file

@ -126,7 +126,7 @@ export const showHeaderCellMenu = (protyle: IProtyle, blockElement: HTMLElement,
menu.addSeparator();
menu.addItem({
icon: "iconUp",
label: window.siyuan.languages.fileNameNatASC,
label: window.siyuan.languages.asc,
click() {
fetchPost("/api/av/renderAttributeView", {id: avId}, (response) => {
transaction(protyle, [{
@ -150,7 +150,7 @@ export const showHeaderCellMenu = (protyle: IProtyle, blockElement: HTMLElement,
});
menu.addItem({
icon: "iconDown",
label: window.siyuan.languages.fileNameNatDESC,
label: window.siyuan.languages.desc,
click() {
fetchPost("/api/av/renderAttributeView", {id: avId}, (response) => {
transaction(protyle, [{

4
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -300,8 +300,8 @@ const getSortsHTML = (data: IAV) => {
</select>
<span class="fn__space"></span>
<select class="b3-select" style="width: 106px;margin: 4px 0">
<option value="ASC" ${item.order === "ASC" ? "selected" : ""}>${window.siyuan.languages.fileNameNatASC}</option>
<option value="DESC" ${item.order === "DESC" ? "selected" : ""}>${window.siyuan.languages.fileNameNatDESC}</option>
<option value="ASC" ${item.order === "ASC" ? "selected" : ""}>${window.siyuan.languages.asc}</option>
<option value="DESC" ${item.order === "DESC" ? "selected" : ""}>${window.siyuan.languages.desc}</option>
</select>
<svg class="b3-menu__action" data-type="removeSort"><use xlink:href="#iconTrashcan"></use></svg>
</button>`;

3
kernel/util/misc.go
View file

@ -37,9 +37,10 @@ func InsertElem[T any](ret []T, index int, value T) []T {
}
func EscapeHTML(s string) string {
if strings.Contains(s, "&amp;") {
if strings.Contains(s, "&amp;") || strings.Contains(s, "&quot;") || strings.Contains(s, "&lt;") || strings.Contains(s, "&gt;") || strings.Contains(s, "&#39;") || strings.Contains(s, "&apos;") {
return s
}
if strings.ContainsAny(s, "<>\"'") {
return html.EscapeString(s)
}