From ea386b4b134b066632dce2ee67f46150e1d27e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Fri, 28 Oct 2022 22:16:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E8=B0=83=E6=95=B4=20Windows=20?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F=E6=89=93=E5=8C=85=E9=80=89?= =?UTF-8?q?=E9=A1=B9=20(#6391)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :bug: fix #5857 * :art: #5990 桌面端 `SiYuan` 可执行程序支持使用参数连接非本机内核服务 * :art: style * :art: style * :art: style * 🎨 改进伺服代码片段 `/snippets/` #6356 * :art: 调整 win 安装包打包选项 --- app/electron-builder.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/electron-builder.yml b/app/electron-builder.yml index 3b239e68b..011c01a70 100644 --- a/app/electron-builder.yml +++ b/app/electron-builder.yml @@ -27,11 +27,11 @@ win: target: - target: "nsis" nsis: - oneClick: true + oneClick: false perMachine: false allowToChangeInstallationDirectory: false allowElevation: true - deleteAppDataOnUninstall: false + deleteAppDataOnUninstall: true createDesktopShortcut: true createStartMenuShortcut: true shortcutName: "SiYuan" From 9b3da0274034780108566f01c85d29245df0d31b Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 28 Oct 2022 22:28:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20Android/iOS=20=E7=AB=AF=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E7=B4=A2=E5=BC=95=E5=92=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=B4=A2=E5=BC=95=E7=8A=B6=E6=80=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20Fix=20https://github.com/siyuan-note/siyuan/issues/?= =?UTF-8?q?6392?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/index.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kernel/model/index.go b/kernel/model/index.go index 6d52e5c9d..3c0de1a54 100644 --- a/kernel/model/index.go +++ b/kernel/model/index.go @@ -257,11 +257,21 @@ func isLegacyDynamicBlockRef(blockRef *ast.Node) bool { func init() { eventbus.Subscribe(eventbus.EvtSQLInsertBlocks, func(context map[string]interface{}, blockCount int, hash string) { + if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container { + // Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392 + return + } + msg := fmt.Sprintf(Conf.Language(89), blockCount, hash) util.SetBootDetails(msg) util.ContextPushMsg(context, msg) }) eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) { + if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container { + // Android/iOS 端不显示数据索引和搜索索引状态提示 https://github.com/siyuan-note/siyuan/issues/6392 + return + } + msg := fmt.Sprintf(Conf.Language(90), blockCount, hash) util.SetBootDetails(msg) util.ContextPushMsg(context, msg)