From a5ebb858621ade77f9ccc1ae93365c7c827c9fb2 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 4 Dec 2022 00:10:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E6=90=9C=E7=B4=A2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=91=BD=E5=90=8D=E6=9F=A5=E8=AF=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/6589?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/router.go | 1 + kernel/api/storage.go | 18 ++++++++++++++++++ kernel/model/storage.go | 20 ++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/kernel/api/router.go b/kernel/api/router.go index c380dc70f..82bed79e7 100644 --- a/kernel/api/router.go +++ b/kernel/api/router.go @@ -60,6 +60,7 @@ func ServeAPI(ginServer *gin.Engine) { ginServer.Handle("POST", "/api/storage/removeLocalStorageVal", model.CheckAuth, removeLocalStorageVal) ginServer.Handle("POST", "/api/storage/setCriterion", model.CheckAuth, setCriterion) ginServer.Handle("POST", "/api/storage/getCriteria", model.CheckAuth, getCriteria) + ginServer.Handle("POST", "/api/storage/removeCriterion", model.CheckAuth, removeCriterion) ginServer.Handle("POST", "/api/account/login", model.CheckAuth, login) ginServer.Handle("POST", "/api/account/checkActivationcode", model.CheckAuth, checkActivationcode) diff --git a/kernel/api/storage.go b/kernel/api/storage.go index a2384225a..52bc177f0 100644 --- a/kernel/api/storage.go +++ b/kernel/api/storage.go @@ -25,6 +25,24 @@ import ( "github.com/siyuan-note/siyuan/kernel/util" ) +func removeCriterion(c *gin.Context) { + ret := gulu.Ret.NewResult() + defer c.JSON(http.StatusOK, ret) + + arg, ok := util.JsonArg(c, ret) + if !ok { + return + } + + name := arg["name"].(string) + err := model.RemoveCriterion(name) + if nil != err { + ret.Code = -1 + ret.Msg = err.Error() + return + } +} + func setCriterion(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) diff --git a/kernel/model/storage.go b/kernel/model/storage.go index 911fd79ed..f9478b3a4 100644 --- a/kernel/model/storage.go +++ b/kernel/model/storage.go @@ -59,6 +59,26 @@ type CriterionTypes struct { var criteriaLock = sync.Mutex{} +func RemoveCriterion(name string) (err error) { + criteriaLock.Lock() + defer criteriaLock.Unlock() + + criteria, err := getCriteria() + if nil != err { + return + } + + for i, c := range criteria { + if c.Name == name { + criteria = append(criteria[:i], criteria[i+1:]...) + break + } + } + + err = setCriteria(criteria) + return +} + func SetCriterion(criterion *Criterion) (err error) { criteriaLock.Lock() defer criteriaLock.Unlock() From 147b4b2bc5ece3e8cc3b7456146b568c4e080402 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 4 Dec 2022 00:16:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E6=90=9C=E7=B4=A2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=91=BD=E5=90=8D=E6=9F=A5=E8=AF=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/6589?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 4 ++-- app/appearance/langs/es_ES.json | 4 ++-- app/appearance/langs/fr_FR.json | 4 ++-- app/appearance/langs/zh_CHT.json | 4 ++-- app/appearance/langs/zh_CN.json | 4 ++-- app/src/search/util.ts | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 85a7a64e5..c7f42d981 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,6 +1,6 @@ { - "saveSearch": "Save query conditions", - "useSearch": "Use query conditions", + "saveCriterion": "Save named criterion", + "useCriterion": "Use named criterion", "group": "Group", "noGroupBy": "No grouping", "groupByDoc": "Group by document", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 534f492ac..fcedc20cd 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,6 +1,6 @@ { - "saveSearch": "Guardar condiciones de consulta", - "useSearch": "Usar condiciones de consulta", + "saveCriterion": "Guardar criterio nombrado", + "useCriterion": "Usar criterio con nombre", "grupo": "Grupo", "noGroupBy": "Sin agrupar", "groupByDoc": "Agrupar por documento", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 010bd010b..10511d3ce 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,6 +1,6 @@ { - "saveSearch": "Enregistrer les conditions de la requête", - "useSearch": "Utiliser les conditions de requête", + "saveCriterion": "Enregistrer le critère nommé", + "useCriterion": "Utiliser le critère nommé", "groupe": "Groupe", "noGroupBy": "Aucun regroupement", "groupByDoc": "Regrouper par document", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 5786af81c..2b4f46a46 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,6 +1,6 @@ { - "saveSearch": "保存查詢條件", - "useSearch": "使用查詢條件", + "saveCriterion": "保存命名查詢", + "useCriterion": "使用命名查詢", "group": "分組", "noGroupBy": "不分組", "groupByDoc": "按文檔分組", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 9d8782b29..b1c4df33a 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,6 +1,6 @@ { - "saveSearch": "保存查询条件", - "useSearch": "使用查询条件", + "saveCriterion": "保存命名查询", + "useCriterion": "使用命名查询", "group": "分组", "noGroupBy": "不分组", "groupByDoc": "按文档分组", diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 1f202d681..cb06ac16b 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -664,10 +664,10 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element: }).element); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.saveSearch, + label: window.siyuan.languages.saveCriterion, click() { const saveDialog = new Dialog({ - title: window.siyuan.languages.saveSearch, + title: window.siyuan.languages.saveCriterion, content: `
@@ -750,7 +750,7 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element: }); if (searchSubMenu.length > 0) { window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.useSearch, + label: window.siyuan.languages.useCriterion, type: "submenu", submenu: searchSubMenu }).element); From 6fd047a58991304e320e702c37c8691ab4238c72 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 4 Dec 2022 00:17:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E6=90=9C=E7=B4=A2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=91=BD=E5=90=8D=E6=9F=A5=E8=AF=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/6589?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/conf/criterion.go | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 kernel/conf/criterion.go diff --git a/kernel/conf/criterion.go b/kernel/conf/criterion.go deleted file mode 100644 index b7bb65ed2..000000000 --- a/kernel/conf/criterion.go +++ /dev/null @@ -1,17 +0,0 @@ -// SiYuan - Build Your Eternal Digital Garden -// Copyright (c) 2020-present, b3log.org -// -// This program is free software you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -package conf