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

app/electron/main.js

@@ -540,11 +540,14 @@ const initKernel = (initData) => {
 
     let cmd = `ui version [${appVer}], booting kernel [${kernelPath} --wd=${appDir}]`
     const cmds = ['--wd', appDir]
+    cmds.push('--resident', 'false')
+    if (isDevEnv) {
+      cmds.push('--mode', 'dev')
+    }
     if (initData) {
       const initDatas = initData.split('-')
       cmds.push('--workspace', initDatas[0])
       cmds.push('--lang', initDatas[1])
-      cmds.push("--resident", "false")
       cmd = `ui version [${appVer}], booting kernel [${kernelPath} --wd=${appDir} --workspace=${initDatas[0]} --lang=${initDatas[1]}]`
     }
     writeLog(cmd)

app/guide/20210808180117-6v0mkxr/.siyuan/conf.json

@@ -1,6 +1,6 @@
 {
   "name": "SiYuan User Guide",
-  "sort": 2,
+  "sort": 3,
   "icon": "1f4d4",
   "closed": false,
   "refCreateSavePath": "",

app/guide/20211226090932-5lcq56f/.siyuan/conf.json

@@ -1,6 +1,6 @@
 {
   "name": "思源筆記用戶指南",
-  "sort": 0,
+  "sort": 2,
   "icon": "1f4d4",
   "closed": false,
   "refCreateSavePath": "",

app/src/config/about.ts

@@ -358,7 +358,7 @@ export const about = {
         });
         const fixedPortElement = about.element.querySelector("#fixedPort") as HTMLInputElement;
         fixedPortElement.addEventListener("change", () => {
-            fetchPost("/api/system/setFixedPort", {networkServe: fixedPortElement.checked}, () => {
+            fetchPost("/api/system/setFixedPort", {fixedPort: fixedPortElement.checked}, () => {
                 exportLayout(false, () => {
                     exitSiYuan();
                 });