From fe0f2fb7e0a83429f89a6a0fbccccb7c2cb042db Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 15 Feb 2023 14:35:44 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=90=9C=E7=B4=A2=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BA=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=B1=9E=E6=80=A7=20Fix=20https://github.com?= =?UTF-8?q?/siyuan-note/siyuan/issues/7367?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/config/query.ts | 6 +++--- app/src/types/index.d.ts | 2 +- kernel/conf/search.go | 16 ++++++++-------- kernel/model/search.go | 4 ++-- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 881c7b1de..7faad9d50 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "allAttrs": "All attribute names and attribute values", "chooseSyncDirection": "Choose sync direction", "uploadData2Cloud": "⬆️ Upload data to cloud", "uploadData2CloudTip": "Overwrite cloud data based on local data", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index d48f93140..29dc2964a 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "allAttrs": "Todos los nombres de atributos y valores de atributos", "chooseSyncDirection": "Elegir dirección de sincronización", "uploadData2Cloud": "⬆️ Subir datos a la nube", "uploadData2CloudTip": "Sobrescribir datos en la nube basados ​​en datos locales", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 71222c1d7..304d90ed4 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "allAttrs": "Tous les noms d'attributs et les valeurs d'attributs", "chooseSyncDirection": "Choisir la direction de synchronisation", "uploadData2Cloud": "⬆️ Télécharger des données dans le cloud", "uploadData2CloudTip": "Écraser les données cloud basées sur les données locales", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 3eaac3e05..8e4ff9fef 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "allAttrs": "所有屬性名和屬性值", "chooseSyncDirection": "選擇同步方向", "uploadData2Cloud": "⬆️ 將數據上傳到雲端", "uploadData2CloudTip": "以本地數據為準覆蓋雲端數據", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 75f1221fe..470c2ac2e 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "allAttrs": "所有属性名和属性值", "chooseSyncDirection": "选择同步方向", "uploadData2Cloud": "⬆️ 将数据上传到云端", "uploadData2CloudTip": "以本地数据为准覆盖云端数据", diff --git a/app/src/config/query.ts b/app/src/config/query.ts index 63438d0a7..d275c5d75 100644 --- a/app/src/config/query.ts +++ b/app/src/config/query.ts @@ -148,10 +148,10 @@ export const query = { @@ -272,7 +272,7 @@ export const query = { name: (query.element.querySelector("#name") as HTMLInputElement).checked, alias: (query.element.querySelector("#alias") as HTMLInputElement).checked, memo: (query.element.querySelector("#memo") as HTMLInputElement).checked, - custom: (query.element.querySelector("#custom") as HTMLInputElement).checked, + ial: (query.element.querySelector("#ial") as HTMLInputElement).checked, limit: parseInt((query.element.querySelector("#limit") as HTMLInputElement).value), caseSensitive: (query.element.querySelector("#caseSensitive") as HTMLInputElement).checked, backlinkMentionName: (query.element.querySelector("#backlinkMentionName") as HTMLInputElement).checked, diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index f8e5760fd..96f2ed503 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -466,7 +466,7 @@ declare interface IConfig { name: boolean alias: boolean memo: boolean - custom: boolean + ial: boolean limit: number caseSensitive: boolean backlinkMentionName: boolean diff --git a/kernel/conf/search.go b/kernel/conf/search.go index eecf421f3..f7b772489 100644 --- a/kernel/conf/search.go +++ b/kernel/conf/search.go @@ -41,10 +41,10 @@ type Search struct { Limit int `json:"limit"` CaseSensitive bool `json:"caseSensitive"` - Name bool `json:"name"` - Alias bool `json:"alias"` - Memo bool `json:"memo"` - Custom bool `json:"custom"` + Name bool `json:"name"` + Alias bool `json:"alias"` + Memo bool `json:"memo"` + IAL bool `json:"ial"` BacklinkMentionName bool `json:"backlinkMentionName"` BacklinkMentionAlias bool `json:"backlinkMentionAlias"` @@ -77,10 +77,10 @@ func NewSearch() *Search { Limit: 64, CaseSensitive: true, - Name: true, - Alias: true, - Memo: true, - Custom: false, + Name: true, + Alias: true, + Memo: true, + IAL: false, BacklinkMentionName: true, BacklinkMentionAlias: false, diff --git a/kernel/model/search.go b/kernel/model/search.go index 05cea6608..ed1ff2b7e 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -866,7 +866,7 @@ func fieldRegexp(regexp string) string { buf.WriteString(regexp) buf.WriteString("'") } - if Conf.Search.Custom { + if Conf.Search.IAL { buf.WriteString(" OR ial REGEXP '") buf.WriteString(regexp) buf.WriteString("'") @@ -889,7 +889,7 @@ func columnFilter() string { if Conf.Search.Memo { buf.WriteString(" memo") } - if Conf.Search.Custom { + if Conf.Search.IAL { buf.WriteString(" ial") } buf.WriteString(" tag}")