From e5912f3f226d125fbf012082f03f024c131e1521 Mon Sep 17 00:00:00 2001 From: Vadim Geraskin Date: Thu, 21 Jul 2022 17:23:16 +0700 Subject: [PATCH] =?UTF-8?q?1071:=20=D0=9B=D0=BE=D0=B6=D0=BD=D0=BE=D0=B5=20?= =?UTF-8?q?=D1=81=D1=80=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8?= =?UTF-8?q?:=20=D0=A3=20=D1=80=D0=B5=D0=BA=D0=B2=D0=B8=D0=B7=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=20"=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B0"=20=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BC=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=20=D0=BF=D1=80=D0=B8=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D0=BA=20"=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=D1=81=D0=B5=D0=B3?= =?UTF-8?q?=D0=B4=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + ...FormListRefUseAlwaysFlagDisabledCheck.java | 7 +- ...ListRefUseAlwaysFlagDisabledCheckTest.java | 169 ++--- .../Attributes/List/ExtInfo/ListSettings.dcss | 17 + .../Forms/TestCustomListForm/Form.form | 598 +++++++++++++++++ .../ExtInfo/ListSettings.dcss" | 17 + .../Forms/TestCustomListFormRu/Form.form | 606 ++++++++++++++++++ .../src/Catalogs/TestCatalog/TestCatalog.mdo | 18 + 8 files changed, 1321 insertions(+), 112 deletions(-) create mode 100644 tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Attributes/List/ExtInfo/ListSettings.dcss create mode 100644 tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Form.form create mode 100644 "tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Attributes/\320\241\320\277\320\270\321\201\320\276\320\272/ExtInfo/ListSettings.dcss" create mode 100644 tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Form.form diff --git a/CHANGELOG.md b/CHANGELOG.md index 839ae1da1..fc2a5435b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ - Ложное срабатывание проверки: statement-type-change для типов общего модуля #994 - Некорректное сообщение об ошибке в строгих типах. Не существует типа "Таблица" #1055 - Ложное сообщение об ошибке о неиспользовании составных типов для стандартных объектов метаданных #1069 +- Ложное срабатывание проверки для динамических списков с произвольным запросом: У реквизита "Ссылка" динамического списка выключен признак "Использовать всегда" #1071 ## 0.2.0 diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormListRefUseAlwaysFlagDisabledCheck.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormListRefUseAlwaysFlagDisabledCheck.java index 7d49a0ab9..829f83eda 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormListRefUseAlwaysFlagDisabledCheck.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormListRefUseAlwaysFlagDisabledCheck.java @@ -44,10 +44,10 @@ public class FormListRefUseAlwaysFlagDisabledCheck extends BasicCheck { private static final String CHECK_ID = "form-list-ref-use-always-flag-disabled"; //$NON-NLS-1$ - private static final List REF_ABSTRACT_DATA_PATH = List.of("Ref", "Список"); //$NON-NLS-1$ //$NON-NLS-2$ + private static final List REF_SEGMENT = List.of("Ref", "Ссылка"); //$NON-NLS-1$ //$NON-NLS-2$ private static final Predicate NAME_CHECK = - name -> name.getName().equals(REF_ABSTRACT_DATA_PATH.get(0)); + name -> name.getName().equals(REF_SEGMENT.get(0)); private static Predicate pathCheck = path -> { EList segments = path.getSegments(); @@ -57,8 +57,7 @@ public class FormListRefUseAlwaysFlagDisabledCheck return false; } - return segments.get(1).equals(REF_ABSTRACT_DATA_PATH.get(0)) - || segments.get(1).equals(REF_ABSTRACT_DATA_PATH.get(1)); + return segments.get(1).equals(REF_SEGMENT.get(0)) || segments.get(1).equals(REF_SEGMENT.get(1)); }; @Override diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUseAlwaysFlagDisabledCheckTest.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUseAlwaysFlagDisabledCheckTest.java index fac388f7d..f89f90ee6 100644 --- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUseAlwaysFlagDisabledCheckTest.java +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUseAlwaysFlagDisabledCheckTest.java @@ -12,12 +12,13 @@ *******************************************************************************/ package com.e1c.v8codestyle.form.check.itests; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.util.List; + import org.eclipse.core.runtime.IProgressMonitor; import org.junit.Test; @@ -46,12 +47,13 @@ public class FormListRefUseAlwaysFlagDisabledCheckTest private static final String CHECK_ID = "form-list-ref-use-always-flag-disabled"; private static final String PROJECT_NAME = "FormListRefUseAlwaysFlagDisabled"; private static final String FQN_FORM_EN = "Catalog.TestCatalog.Form.TestListForm.Form"; + private static final String FQN_FORM_CUSTOM_EN = "Catalog.TestCatalog.Form.TestCustomListForm.Form"; private static final String FQN_FORM_RU = "Catalog.TestCatalog.Form.TestListFormRu.Form"; + private static final String FQN_FORM_CUSTOM_RU = "Catalog.TestCatalog.Form.TestCustomListFormRu.Form"; private static final String FQN_NON_OBJECT = "InformationRegister.TestInformationRegister.Form.TestListForm.Form"; - /** - * Test Use Always flag is disabled for the Reference attribute in dynamic list (En variant). + * Test Use Always flag is disabled for the Reference attribute in dynamic list. * * @throws Exception the exception */ @@ -61,18 +63,20 @@ public void testUseAlwaysDisabledForRef() throws Exception IDtProject dtProject = openProjectAndWaitForValidationFinish(PROJECT_NAME); assertNotNull(dtProject); - IBmObject object = getTopObjectByFqn(FQN_FORM_EN, dtProject); - assertTrue(object instanceof Form); + List.of(FQN_FORM_EN, FQN_FORM_CUSTOM_EN, FQN_FORM_RU, FQN_FORM_CUSTOM_RU).forEach(formFqn -> { + IBmObject object = getTopObjectByFqn(formFqn, dtProject); + assertTrue(object instanceof Form); - Form form = (Form)object; - assertTrue(form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().isEmpty()); + Form form = (Form)object; + assertTrue(form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().isEmpty()); - Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); - assertNotNull(marker); + Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); + assertNotNull(marker); + }); } /** - * Test Use Always flag is enabled for the Reference attribute in dynamic list (En variant). + * Test Use Always flag is enabled for the Reference attribute in dynamic list. * * @throws Exception the exception */ @@ -83,85 +87,31 @@ public void testUseAlwaysEnabledForRef() throws Exception assertNotNull(dtProject); IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change mode") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) - { - Form form = (Form)transaction.getTopObjectByFqn(FQN_FORM_EN); - FormItem item = form.getItems().get(1); - assertTrue(item instanceof Table); - Table table = (Table)item; - AbstractDataPath path = (DataPath)table.getItems().get(0).eContents().get(1); - form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().add(path); - assertFalse(form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().isEmpty()); - return null; - } - }); - waitForDD(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM_EN, dtProject); - assertTrue(object instanceof Form); - - Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); - assertNull(marker); - } - - /** - * Test Use Always flag is disabled for the Reference attribute in dynamic list (Ru variant). - * - * @throws Exception the exception - */ - @Test - public void testUseAlwaysDisabledForRefRu() throws Exception - { - IDtProject dtProject = openProjectAndWaitForValidationFinish(PROJECT_NAME); - assertNotNull(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM_RU, dtProject); - assertTrue(object instanceof Form); - Form form = (Form)object; - assertTrue(form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().isEmpty()); - - Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); - assertNotNull(marker); - } - - /** - * Test Use Always flag is enabled for the Reference attribute in dynamic list (Ru variant). - * - * @throws Exception the exception - */ - @Test - public void testUseAlwaysEnabledForRefRu() throws Exception - { - IDtProject dtProject = openProjectAndWaitForValidationFinish(PROJECT_NAME); - assertNotNull(dtProject); - - IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change mode") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) + List.of(FQN_FORM_EN, FQN_FORM_CUSTOM_EN, FQN_FORM_RU, FQN_FORM_CUSTOM_RU).forEach(formFqn -> { + model.execute(new AbstractBmTask("change mode") { - Form form = (Form)transaction.getTopObjectByFqn(FQN_FORM_RU); - FormItem item = form.getItems().get(1); - assertTrue(item instanceof Table); - Table table = (Table)item; - AbstractDataPath path = (DataPath)table.getItems().get(0).eContents().get(1); - form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().add(path); - assertFalse(form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().isEmpty()); - return null; - } + @Override + public Void execute(IBmTransaction transaction, IProgressMonitor monitor) + { + Form form = (Form)transaction.getTopObjectByFqn(formFqn); + FormItem item = form.getItems().get(1); + assertTrue(item instanceof Table); + Table table = (Table)item; + AbstractDataPath path = (DataPath)table.getItems().get(0).eContents().get(1); + form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().add(path); + assertFalse(form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().isEmpty()); + return null; + } + }); + waitForDD(dtProject); + + IBmObject object = getTopObjectByFqn(formFqn, dtProject); + assertTrue(object instanceof Form); + + Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); + assertNull(marker); }); - waitForDD(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM_RU, dtProject); - assertTrue(object instanceof Form); - - Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); - assertNull(marker); } /** @@ -197,29 +147,32 @@ public void testUseAlwaysEnabledForAttributeWithNonStandardDataPath() throws Exc assertNotNull(dtProject); IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change mode") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) + + List.of(FQN_FORM_RU, FQN_FORM_CUSTOM_RU).forEach(formFqn -> { + model.execute(new AbstractBmTask("change mode") { - Form form = (Form)transaction.getTopObjectByFqn(FQN_FORM_EN); - FormItem item = form.getItems().get(1); - assertTrue(item instanceof Table); - Table table = (Table)item; - AbstractDataPath path = (DataPath)table.getItems().get(0).eContents().get(1); - path.getSegments().add(0, "SomeExtraSegment"); - form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().add(path); - assertEquals("/SomeExtraSegment/List/Ref", - form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().get(0).toString()); - return null; - } + @Override + public Void execute(IBmTransaction transaction, IProgressMonitor monitor) + { + Form form = (Form)transaction.getTopObjectByFqn(formFqn); + FormItem item = form.getItems().get(1); + assertTrue(item instanceof Table); + Table table = (Table)item; + AbstractDataPath path = (DataPath)table.getItems().get(0).eContents().get(1); + path.getSegments().add(0, "SomeExtraSegment"); + form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().add(path); + String fqn = form.getAttributes().get(0).getNotDefaultUseAlwaysAttributes().get(0).toString(); + assertTrue(fqn.equals("/SomeExtraSegment/List/Ref") || fqn.equals("/SomeExtraSegment/Список/Ref")); + return null; + } + }); + waitForDD(dtProject); + + IBmObject object = getTopObjectByFqn(formFqn, dtProject); + assertTrue(object instanceof Form); + + Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); + assertNotNull(marker); }); - waitForDD(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM_EN, dtProject); - assertTrue(object instanceof Form); - - Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); - assertNotNull(marker); } } diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Attributes/List/ExtInfo/ListSettings.dcss b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 000000000..b9ce52977 --- /dev/null +++ b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + 5b8df703-aa76-49b5-9df8-b98ce3915698 + + + Normal + 251d7356-8af3-4d63-8006-801adca5fa31 + + + Normal + 443cbe90-2a6a-4955-9899-78c80f24cc24 + + Normal + 2884db82-c045-4ce4-b91f-ff27564759be + diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Form.form b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Form.form new file mode 100644 index 000000000..f29a687f0 --- /dev/null +++ b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListForm/Form.form @@ -0,0 +1,598 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + Ref + 16 + true + true + + + List.Ref + + true + + RefExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Code + 19 + true + true + + true + + + List.Code + + + CodeExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + CodeContextMenu + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Description + 22 + true + true + + true + + + List.Description + + + DescriptionExtendedTooltip + 24 + true + true + + true + + Label + true + true + + Left + + + + DescriptionContextMenu + 23 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + DeletionMark + 25 + true + true + + true + + + List.DeletionMark + + + DeletionMarkExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + DeletionMarkContextMenu + 26 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Predefined + 28 + true + true + + true + + + List.Predefined + + + PredefinedExtendedTooltip + 30 + true + true + + true + + Label + true + true + + Left + + + + PredefinedContextMenu + 29 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + PredefinedDataName + 31 + true + true + + true + + + List.PredefinedDataName + + + PredefinedDataNameExtendedTooltip + 33 + true + true + + true + + Label + true + true + + Left + + + + PredefinedDataNameContextMenu + 32 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + List + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + +
true
+ + SELECT + TestCatalog.Ref, + TestCatalog.DeletionMark, + TestCatalog.Code, + TestCatalog.Description, + TestCatalog.Predefined, + TestCatalog.PredefinedDataName + FROM + Catalog.TestCatalog + AS + TestCatalog + Catalog.TestCatalog + true + true + true + true + true + + Ref + Ref + + + DeletionMark + DeletionMark + + + Code + Code + + + Description + Description + + + Predefined + Predefined + + + PredefinedDataName + PredefinedDataName + + + + + + + + + diff --git "a/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Attributes/\320\241\320\277\320\270\321\201\320\276\320\272/ExtInfo/ListSettings.dcss" "b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Attributes/\320\241\320\277\320\270\321\201\320\276\320\272/ExtInfo/ListSettings.dcss" new file mode 100644 index 000000000..cd0f132b4 --- /dev/null +++ "b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Attributes/\320\241\320\277\320\270\321\201\320\276\320\272/ExtInfo/ListSettings.dcss" @@ -0,0 +1,17 @@ + + + + Normal + aedbafd4-ee68-4b02-b464-c89d9e5fb5b3 + + + Normal + 88643ec8-04ad-448a-9f47-a8428df49498 + + + Normal + 4fdb9617-54d0-44cb-929a-ed78fbc204cb + + Normal + 6059f7fa-59c7-4902-83c5-d0df8017afec + diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Form.form b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Form.form new file mode 100644 index 000000000..d8c410efa --- /dev/null +++ b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/Forms/TestCustomListFormRu/Form.form @@ -0,0 +1,606 @@ + + + + СписокКомпоновщикНастроекПользовательскиеНастройки + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + false + + СписокКомпоновщикНастроекПользовательскиеНастройкиРасширеннаяПодсказка + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + WeakSeparation + true + true + Auto + Auto + + + + Список + 3 + true + true + + true + + + Список + + true + None + + Ссылка + 16 + true + true + + + Список.Ref + + true + + СсылкаРасширеннаяПодсказка + 18 + true + true + + true + + Label + true + true + + Left + + + + СсылкаКонтекстноеМеню + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Код + 19 + true + true + + true + + + Список.Code + + + КодРасширеннаяПодсказка + 21 + true + true + + true + + Label + true + true + + Left + + + + КодКонтекстноеМеню + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Наименование + 22 + true + true + + true + + + Список.Description + + + НаименованиеРасширеннаяПодсказка + 24 + true + true + + true + + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 23 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + ПометкаУдаления + 25 + true + true + + true + + + Список.DeletionMark + + + ПометкаУдаленияРасширеннаяПодсказка + 27 + true + true + + true + + Label + true + true + + Left + + + + ПометкаУдаленияКонтекстноеМеню + 26 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Предопределенный + 28 + true + true + + true + + + Список.Predefined + + + ПредопределенныйРасширеннаяПодсказка + 30 + true + true + + true + + Label + true + true + + Left + + + + ПредопределенныйКонтекстноеМеню + 29 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + ИмяПредопределенныхДанных + 31 + true + true + + true + + + Список.PredefinedDataName + + + ИмяПредопределенныхДанныхРасширеннаяПодсказка + 33 + true + true + + true + + Label + true + true + + Left + + + + ИмяПредопределенныхДанныхКонтекстноеМеню + 32 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + None + + СписокКоманднаяПанель + 5 + true + true + + true + + Left + + + true + true + + true + + СписокСтрокаПоиска + 7 + + СписокСтрокаПоискаРасширеннаяПодсказка + 9 + true + true + + true + + Label + true + true + + Left + + + + СписокСтрокаПоискаКонтекстноеМеню + 8 + true + true + + true + + true + + СписокСтрокаПоиска + + true + + + + true + true + + true + + СписокСостояниеПросмотра + 10 + + СписокСостояниеПросмотраРасширеннаяПодсказка + 12 + true + true + + true + + Label + true + true + + Left + + + + СписокСостояниеПросмотраКонтекстноеМеню + 11 + true + true + + true + + true + + ViewStatusAddition + СписокСостояниеПросмотра + + true + + + + true + true + + true + + СписокУправлениеПоиском + 13 + + СписокУправлениеПоискомРасширеннаяПодсказка + 15 + true + true + + true + + Label + true + true + + Left + + + + СписокУправлениеПоискомКонтекстноеМеню + 14 + true + true + + true + + true + + SearchControlAddition + Список + + true + + + + СписокРасширеннаяПодсказка + 6 + true + true + + true + + Label + true + true + + Left + + + + СписокКонтекстноеМеню + 4 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + Список.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + СписокКомпоновщикНастроекПользовательскиеНастройки + + + + ФормаКоманднаяПанель + -1 + true + true + + true + + Left + true + + true + true + Vertical + true + true + true + true + true + + Список + 1 + + DynamicList + + + true + + + true + +
true
+ + SELECT + TestCatalog.Ref as Ссылка, + TestCatalog.DeletionMark, + TestCatalog.Code, + TestCatalog.Description, + TestCatalog.Predefined, + TestCatalog.PredefinedDataName + FROM + Catalog.TestCatalog + AS + TestCatalog + Catalog.TestCatalog + true + true + true + true + true + + DeletionMark + DeletionMark + + + Code + Code + + + Description + Description + + + Predefined + Predefined + + + PredefinedDataName + PredefinedDataName + + + Ссылка + Ссылка + + <localValue> + <content> + <key>en</key> + <value>Ссылка</value> + </content> + </localValue> + + + + + + + + + + diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/TestCatalog.mdo b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/TestCatalog.mdo index 5eaef3a11..0e6c4a482 100644 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/TestCatalog.mdo +++ b/tests/com.e1c.v8codestyle.form.itests/workspace/FormListRefUseAlwaysFlagDisabled/src/Catalogs/TestCatalog/TestCatalog.mdo @@ -49,4 +49,22 @@ PersonalComputer MobileDevice + + TestCustomListForm + + en + Test custom list form + + PersonalComputer + MobileDevice + + + TestCustomListFormRu + + en + Test custom list form ru + + PersonalComputer + MobileDevice +