diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts index 6497ee3f7..dffcbfca4 100644 --- a/app/src/mobile/util/initFramework.ts +++ b/app/src/mobile/util/initFramework.ts @@ -128,7 +128,7 @@ export const initFramework = () => { closePanel(); }); initEditorName(); - if (window.siyuan.config.newbie) { + if (window.siyuan.config.openHelp) { mountHelp(); } const transactionTipElement = document.getElementById("transactionTip"); diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index a4776a015..b8baeb851 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -413,7 +413,7 @@ declare interface IConfig { api: { token: string } - newbie: boolean + openHelp: boolean system: { networkProxy: { host: string diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index db7b34fcb..921244ab2 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -176,7 +176,7 @@ export const onGetConfig = (isStart: boolean) => { resizeDrag(); }, 200); }); - if (window.siyuan.config.newbie) { + if (window.siyuan.config.openHelp) { mountHelp(); } addGA(); diff --git a/kernel/model/conf.go b/kernel/model/conf.go index eae65a00e..3aee764c8 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -70,7 +70,7 @@ type AppConf struct { Stat *conf.Stat `json:"stat"` // 统计 Api *conf.API `json:"api"` // API Repo *conf.Repo `json:"repo"` // 数据仓库 - Newbie bool `json:"newbie"` // 是否是安装后第一次启动 + OpenHelp bool `json:"openHelp"` // 启动后是否需要打开用户指南 } func InitConf() { @@ -211,7 +211,9 @@ func InitConf() { } if nil == Conf.System { Conf.System = conf.NewSystem() + Conf.OpenHelp = true } else { + Conf.OpenHelp = Conf.System.KernelVersion != util.Ver Conf.System.KernelVersion = util.Ver Conf.System.IsInsider = util.IsInsider } @@ -237,7 +239,6 @@ func InitConf() { } Conf.System.OS = runtime.GOOS Conf.System.OSPlatform, _ = util.GetOSPlatform() - Conf.Newbie = util.IsNewbie if "" != Conf.UserData { Conf.User = loadUserFromConf() diff --git a/kernel/model/mount.go b/kernel/model/mount.go index 06b419bfb..40eb6a6e3 100644 --- a/kernel/model/mount.go +++ b/kernel/model/mount.go @@ -162,8 +162,8 @@ func Mount(boxID string) (alreadyMount bool, err error) { box.SaveConf(boxConf) } - if Conf.Newbie { - Conf.Newbie = false + if Conf.OpenHelp { + Conf.OpenHelp = false Conf.Save() } diff --git a/kernel/util/working.go b/kernel/util/working.go index 5a45fa5b4..00a1c3112 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -180,15 +180,12 @@ var ( SnippetsPath string // 数据目录下的 snippets/ 路径 UIProcessIDs = sync.Map{} // UI 进程 ID - - IsNewbie bool // 是否是第一次安装 ) func initWorkspaceDir(workspaceArg string) { userHomeConfDir := filepath.Join(HomeDir, ".config", "siyuan") workspaceConf := filepath.Join(userHomeConfDir, "workspace.json") if !gulu.File.IsExist(workspaceConf) { - IsNewbie = ContainerStd == Container // 只有桌面端需要设置新手标识,前端自动挂载帮助文档 if err := os.MkdirAll(userHomeConfDir, 0755); nil != err && !os.IsExist(err) { log.Printf("create user home conf folder [%s] failed: %s", userHomeConfDir, err) os.Exit(ExitCodeCreateConfDirErr)