🎨 搜索自定义属性改为搜索全部属性 Fix https://github.com/siyuan-note/siyuan/issues/7367

This commit is contained in:
Liang Ding 2023-02-15 14:35:44 +08:00
parent d1f493e2d2
commit fe0f2fb7e0
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 19 additions and 14 deletions

View file

@ -1,4 +1,5 @@
{ {
"allAttrs": "All attribute names and attribute values",
"chooseSyncDirection": "Choose sync direction", "chooseSyncDirection": "Choose sync direction",
"uploadData2Cloud": "⬆️ Upload data to cloud", "uploadData2Cloud": "⬆️ Upload data to cloud",
"uploadData2CloudTip": "Overwrite cloud data based on local data", "uploadData2CloudTip": "Overwrite cloud data based on local data",

View file

@ -1,4 +1,5 @@
{ {
"allAttrs": "Todos los nombres de atributos y valores de atributos",
"chooseSyncDirection": "Elegir dirección de sincronización", "chooseSyncDirection": "Elegir dirección de sincronización",
"uploadData2Cloud": "⬆️ Subir datos a la nube", "uploadData2Cloud": "⬆️ Subir datos a la nube",
"uploadData2CloudTip": "Sobrescribir datos en la nube basados en datos locales", "uploadData2CloudTip": "Sobrescribir datos en la nube basados en datos locales",

View file

@ -1,4 +1,5 @@
{ {
"allAttrs": "Tous les noms d'attributs et les valeurs d'attributs",
"chooseSyncDirection": "Choisir la direction de synchronisation", "chooseSyncDirection": "Choisir la direction de synchronisation",
"uploadData2Cloud": "⬆️ Télécharger des données dans le cloud", "uploadData2Cloud": "⬆️ Télécharger des données dans le cloud",
"uploadData2CloudTip": "Écraser les données cloud basées sur les données locales", "uploadData2CloudTip": "Écraser les données cloud basées sur les données locales",

View file

@ -1,4 +1,5 @@
{ {
"allAttrs": "所有屬性名和屬性值",
"chooseSyncDirection": "選擇同步方向", "chooseSyncDirection": "選擇同步方向",
"uploadData2Cloud": "⬆️ 將數據上傳到雲端", "uploadData2Cloud": "⬆️ 將數據上傳到雲端",
"uploadData2CloudTip": "以本地數據為準覆蓋雲端數據", "uploadData2CloudTip": "以本地數據為準覆蓋雲端數據",

View file

@ -1,4 +1,5 @@
{ {
"allAttrs": "所有属性名和属性值",
"chooseSyncDirection": "选择同步方向", "chooseSyncDirection": "选择同步方向",
"uploadData2Cloud": "⬆️ 将数据上传到云端", "uploadData2Cloud": "⬆️ 将数据上传到云端",
"uploadData2CloudTip": "以本地数据为准覆盖云端数据", "uploadData2CloudTip": "以本地数据为准覆盖云端数据",

View file

@ -148,10 +148,10 @@ export const query = {
</label> </label>
<label class="fn__flex"> <label class="fn__flex">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.custom} ${window.siyuan.languages.allAttrs}
</div> </div>
<span class="fn__space"></span> <span class="fn__space"></span>
<input class="b3-switch" id="custom" type="checkbox"${window.siyuan.config.search.custom ? " checked" : ""}/> <input class="b3-switch" id="ial" type="checkbox"${window.siyuan.config.search.ial ? " checked" : ""}/>
</label> </label>
</div> </div>
</div> </div>
@ -272,7 +272,7 @@ export const query = {
name: (query.element.querySelector("#name") as HTMLInputElement).checked, name: (query.element.querySelector("#name") as HTMLInputElement).checked,
alias: (query.element.querySelector("#alias") as HTMLInputElement).checked, alias: (query.element.querySelector("#alias") as HTMLInputElement).checked,
memo: (query.element.querySelector("#memo") 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), limit: parseInt((query.element.querySelector("#limit") as HTMLInputElement).value),
caseSensitive: (query.element.querySelector("#caseSensitive") as HTMLInputElement).checked, caseSensitive: (query.element.querySelector("#caseSensitive") as HTMLInputElement).checked,
backlinkMentionName: (query.element.querySelector("#backlinkMentionName") as HTMLInputElement).checked, backlinkMentionName: (query.element.querySelector("#backlinkMentionName") as HTMLInputElement).checked,

View file

@ -466,7 +466,7 @@ declare interface IConfig {
name: boolean name: boolean
alias: boolean alias: boolean
memo: boolean memo: boolean
custom: boolean ial: boolean
limit: number limit: number
caseSensitive: boolean caseSensitive: boolean
backlinkMentionName: boolean backlinkMentionName: boolean

View file

@ -41,10 +41,10 @@ type Search struct {
Limit int `json:"limit"` Limit int `json:"limit"`
CaseSensitive bool `json:"caseSensitive"` CaseSensitive bool `json:"caseSensitive"`
Name bool `json:"name"` Name bool `json:"name"`
Alias bool `json:"alias"` Alias bool `json:"alias"`
Memo bool `json:"memo"` Memo bool `json:"memo"`
Custom bool `json:"custom"` IAL bool `json:"ial"`
BacklinkMentionName bool `json:"backlinkMentionName"` BacklinkMentionName bool `json:"backlinkMentionName"`
BacklinkMentionAlias bool `json:"backlinkMentionAlias"` BacklinkMentionAlias bool `json:"backlinkMentionAlias"`
@ -77,10 +77,10 @@ func NewSearch() *Search {
Limit: 64, Limit: 64,
CaseSensitive: true, CaseSensitive: true,
Name: true, Name: true,
Alias: true, Alias: true,
Memo: true, Memo: true,
Custom: false, IAL: false,
BacklinkMentionName: true, BacklinkMentionName: true,
BacklinkMentionAlias: false, BacklinkMentionAlias: false,

View file

@ -866,7 +866,7 @@ func fieldRegexp(regexp string) string {
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("'") buf.WriteString("'")
} }
if Conf.Search.Custom { if Conf.Search.IAL {
buf.WriteString(" OR ial REGEXP '") buf.WriteString(" OR ial REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("'") buf.WriteString("'")
@ -889,7 +889,7 @@ func columnFilter() string {
if Conf.Search.Memo { if Conf.Search.Memo {
buf.WriteString(" memo") buf.WriteString(" memo")
} }
if Conf.Search.Custom { if Conf.Search.IAL {
buf.WriteString(" ial") buf.WriteString(" ial")
} }
buf.WriteString(" tag}") buf.WriteString(" tag}")