1c/bsl_console
1
0
Fork 0
mirror of https://github.com/salexdv/bsl_console.git synced 2024-11-24 08:33:29 +02:00
Code Issues Releases Activity

Работа над подсказками для полей таблиц в запросе (простая подсказка, когда выборка идет из справочника)

Browse Source
This commit is contained in:
salexdv 2020-12-15 23:44:00 +03:00
parent 4af58e4b0b
commit 28429c4a35
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bslMetadata.js
View File

@ -3,6 +3,8 @@ define([], function () {
"catalogs":{
"name":"Справочники",
"name_en":"Catalogs",
"query_name":"Справочник",
"query_name_en":"Catalog",
"items":{
"Товары":{
"properties":{

26
src/bsl_helper.js
View File

@ -36,6 +36,7 @@ class bslHelper {
this.lastRawExpression = this.getLastRawExpression();
this.nameField = engLang ? 'name_en': 'name';
this.queryNameField = engLang ? 'query_name_en' : 'query_name';
}
@ -1626,6 +1627,29 @@ class bslHelper {
let sourceArray = sourceDefinition.split('.');
if (1 < sourceArray.length) {
metadataExists = true;
let metadataType = sourceArray[0].toLowerCase();
let metadataName = sourceArray[1].toLowerCase();
for (const [key, value] of Object.entries(bslMetadata)) {
if (value.hasOwnProperty(this.queryNameField) && value[this.queryNameField].toLowerCase() == metadataType) {
for (const [ikey, ivalue] of Object.entries(value.items)) {
if (ikey.toLowerCase() == metadataName) {
this.fillSuggestionsForMetadataItem(suggestions, ivalue);
}
}
}
}
}
return metadataExists;
@ -1655,7 +1679,7 @@ class bslHelper {
sourceDefinition = sourceDefinition.replace(/(из|левое|правое|внутреннее|внешнее|полное|from|left|right|inner|outer|full)?\s?(соединение|join)?/gi, '').trim();
if (!this.getQueryFieldsCompletitionForMetadata(suggestions, sourceDefinition)) {
}
}