0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-10-29 21:58:22 +08:00
commit 6121bec214
9 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/appearance/boot/index.html
View file

@ -100,7 +100,7 @@
return new Promise(resolve => setTimeout(resolve, ms))
}
const redirect = () => {
const uri = 'http://localhost:' + location.port
const uri = 'http://127.0.0.1:' + location.port
if (navigator.userAgent.match(/Android/i))
document.location = uri
else
@ -113,7 +113,7 @@
let progressing = false
while (!progressing) {
try {
const progressResult = await fetch('http://localhost:' + location.port + '/api/system/bootProgress')
const progressResult = await fetch('http://127.0.0.1:' + location.port + '/api/system/bootProgress')
const progressData = await progressResult.json()
document.getElementById('progress').style.width = progressData.data.progress + '%'
document.getElementById('details').textContent = progressData.data.details

2
app/electron/main.js
View file

@ -43,7 +43,7 @@ let siyuanOpenURL
let firstOpen = false
let resetWindowStateOnRestart = false
let kernelPort = "6806"
const localhost = "localhost"
const localhost = "127.0.0.1"
require('@electron/remote/main').initialize()
if (!app.requestSingleInstanceLock()) {

2
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy
View file

@ -75,7 +75,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "localhost"
"TextMarkTextContent": "127.0.0.1"
},
{
"Type": "NodeText",

2
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy
View file

@ -76,7 +76,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "localhost"
"TextMarkTextContent": "127.0.0.1"
},
{
"Type": "NodeText",

2
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122523-rl8356a.sy
View file

@ -75,7 +75,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "localhost"
"TextMarkTextContent": "127.0.0.1"
},
{
"Type": "NodeText",

2
app/src/config/about.ts
View file

@ -55,7 +55,7 @@ export const about = {
<span class="b3-label__text"><code class="fn__code">${window.siyuan.config.localIPs.join("</code> <code class='fn__code'>")}</code></span>
</div>
<div class="fn__space"></div>
<button data-type="open" data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "localhost"}:${location.port}" class="b3-button b3-button--outline fn__size200 fn__flex-center">
<button data-type="open" data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:${location.port}" class="b3-button b3-button--outline fn__size200 fn__flex-center">
<svg><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.about4}
</button>
</label>

4
app/src/mobile/util/menu.ts
View file

@ -177,7 +177,7 @@ ${accountHTML}
closePanel();
if (!window.siyuan.config.localIPs || window.siyuan.config.localIPs.length === 0 ||
(window.siyuan.config.localIPs.length === 1 && window.siyuan.config.localIPs[0] === "")) {
window.siyuan.config.localIPs = ["localhost"];
window.siyuan.config.localIPs = ["127.0.0.1"];
}
modelElement.style.top = "0";
modelElement.querySelector(".toolbar__icon").innerHTML = '<use xlink:href="#iconInfo"></use>';
@ -193,7 +193,7 @@ ${accountHTML}
<div class="b3-label">
${window.siyuan.languages.about2}
<div class="fn__hr"></div>
<input class="b3-text-field fn__block" readonly value="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "localhost"}:${location.port}">
<input class="b3-text-field fn__block" readonly value="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:${location.port}">
<div class="b3-label__text">${window.siyuan.languages.about3.replace("${port}", location.port)}</div>
<div class="fn__hr"></div>
<span class="b3-label__text"><code class="fn__code">${window.siyuan.config.localIPs.join("</code> <code class='fn__code'>")}</code></span>

3
kernel/model/transaction.go
View file

@ -1170,9 +1170,6 @@ func updateRefText(refNode *ast.Node, changedDefNodes map[string]*ast.Node) (cha
if nil == defNode {
return ast.WalkSkipChildren
}
if ast.NodeDocument != defNode.Type && defNode.IsContainerBlock() {
defNode = treenode.FirstLeafBlock(defNode)
}
refText := getNodeRefText(defNode)
treenode.SetDynamicBlockRefText(n, refText)

2
kernel/util/working.go
View file

@ -290,7 +290,7 @@ const (
ContainerAndroid = "android" // Android 端
ContainerIOS = "ios" // iOS 端
LocalHost = "localhost" // 本地域名，由操作系统自动解析到 127.0.0.1
LocalHost = "127.0.0.1" // 伺服地址
FixedPort = "6806" // 固定端口
)