diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java index 8125946d3..0534da9de 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; import com.github._1c_syntax.bsl.types.ConfigurationSource; import com.github._1c_syntax.bsl.types.MdoReference; @@ -42,6 +43,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; /** * Внешняя обработка @@ -95,4 +97,29 @@ public class ExternalDataProcessor implements ExternalSource { List children = LazyLoader.computeChildren(this); @Getter(lazy = true) List plainChildren = LazyLoader.computePlainChildren(this); + + /** + * Ссылка на форму по умолчанию + */ + @Default + MdoReference defaultForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму + */ + @Default + MdoReference auxiliaryForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.DEFAULT_FORM, getDefaultForm()), + Map.entry(DefaultFormKind.AUX_FORM, getAuxiliaryForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java index 8689bf0a1..b76d1ad5b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; import com.github._1c_syntax.bsl.types.ConfigurationSource; import com.github._1c_syntax.bsl.types.MdoReference; @@ -42,6 +43,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; /** * Внешний отчет @@ -101,6 +103,48 @@ public class ExternalReport implements ExternalSource { @Getter(lazy = true) List plainChildren = LazyLoader.computePlainChildren(this); + /** + * Ссылка на форму по умолчанию + */ + @Default + MdoReference defaultForm = MdoReference.EMPTY; + + /** + * Ссылка на форму настроек по умолчанию + */ + @Default + MdoReference defaultSettingsForm = MdoReference.EMPTY; + + /** + * Ссылка на форму варианта по умолчанию + */ + @Default + MdoReference defaultVariantForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму + */ + @Default + MdoReference auxiliaryForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму настроек + */ + @Default + MdoReference auxiliarySettingsForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму варианта + */ + @Default + MdoReference auxiliaryVariantForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + private static ExternalReport createEmptyExternalReport() { var emptyString = "empty"; @@ -110,4 +154,15 @@ private static ExternalReport createEmptyExternalReport() { .uuid(emptyString) .build(); } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.DEFAULT_FORM, getDefaultForm()), + Map.entry(DefaultFormKind.SETTINGS_FORM, getDefaultSettingsForm()), + Map.entry(DefaultFormKind.VARIANT_FORM, getDefaultVariantForm()), + Map.entry(DefaultFormKind.AUX_FORM, getAuxiliaryForm()), + Map.entry(DefaultFormKind.AUX_SETTINGS_FORM, getAuxiliarySettingsForm()), + Map.entry(DefaultFormKind.AUX_VARIANT_FORM, getAuxiliaryVariantForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java index 43ade7dc7..3b85fc08b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java @@ -1,112 +1,139 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.Dimension; -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.Resource; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class AccountingRegister implements Register, AccessRightsOwner { - - /* - * Register - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - @Singular - List resources; - @Singular - List dimensions; - @Getter(lazy = true) - List allAttributes = LazyLoader.computeAllAttributes(this); - - @Singular - List forms; - - @Singular - List templates; - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - - /* - * Свое - */ - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return AccumulationRegister.possibleRights(); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.Dimension; +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.Resource; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class AccountingRegister implements Register, AccessRightsOwner { + + /* + * Register + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + @Singular + List resources; + @Singular + List dimensions; + @Getter(lazy = true) + List allAttributes = LazyLoader.computeAllAttributes(this); + + @Singular + List forms; + + @Singular + List templates; + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return AccumulationRegister.possibleRights(); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java index 80900b7aa..d18de1be4 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java @@ -1,126 +1,151 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.Dimension; -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.Resource; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class AccumulationRegister implements Register, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * Register - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - @Singular - List resources; - @Singular - List dimensions; - @Getter(lazy = true) - List allAttributes = LazyLoader.computeAllAttributes(this); - - @Singular - List forms; - - @Singular - List templates; - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - - /* - * Свое - */ - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.VIEW, - RoleRight.EDIT, - RoleRight.TOTALS_CONTROL - ); - } -} - - +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.Dimension; +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.Resource; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class AccumulationRegister implements Register, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * Register + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + @Singular + List resources; + @Singular + List dimensions; + @Getter(lazy = true) + List allAttributes = LazyLoader.computeAllAttributes(this); + + @Singular + List forms; + + @Singular + List templates; + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.VIEW, + RoleRight.EDIT, + RoleRight.TOTALS_CONTROL + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java index 12a78d00c..5b8ef7d11 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java @@ -1,152 +1,207 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class BusinessProcess implements ReferenceObject, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * ReferenceObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - @Singular - List forms; - - @Singular - List templates; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * Свое - */ - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Ссылка на задачу - */ - @Default - MdoReference task = MdoReference.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.INSERT, - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.DELETE, - RoleRight.VIEW, - RoleRight.EDIT, - RoleRight.INPUT_BY_STRING, - RoleRight.INTERACTIVE_DELETE, - RoleRight.INTERACTIVE_INSERT, - RoleRight.INTERACTIVE_SET_DELETION_MARK, - RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, - RoleRight.INTERACTIVE_DELETE_MARKED, - RoleRight.START, - RoleRight.INTERACTIVE_START, - RoleRight.INTERACTIVE_ACTIVATE, - RoleRight.READ_DATA_HISTORY, - RoleRight.VIEW_DATA_HISTORY, - RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY, - RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY_SETTINGS, - RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, - RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, - RoleRight.SWITCH_TO_DATA_HISTORY_VERSION - ); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class BusinessProcess implements ReferenceObject, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * ReferenceObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + @Singular + List forms; + + @Singular + List templates; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Ссылка на задачу + */ + @Default + MdoReference task = MdoReference.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.INSERT, + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.DELETE, + RoleRight.VIEW, + RoleRight.EDIT, + RoleRight.INPUT_BY_STRING, + RoleRight.INTERACTIVE_DELETE, + RoleRight.INTERACTIVE_INSERT, + RoleRight.INTERACTIVE_SET_DELETION_MARK, + RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, + RoleRight.INTERACTIVE_DELETE_MARKED, + RoleRight.START, + RoleRight.INTERACTIVE_START, + RoleRight.INTERACTIVE_ACTIVATE, + RoleRight.READ_DATA_HISTORY, + RoleRight.VIEW_DATA_HISTORY, + RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY, + RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY_SETTINGS, + RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, + RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, + RoleRight.SWITCH_TO_DATA_HISTORY_VERSION + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java index 8966a8316..2fcdcbf52 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java @@ -1,127 +1,154 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.Dimension; -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.Recalculation; -import com.github._1c_syntax.bsl.mdo.children.Resource; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class CalculationRegister implements Register, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * Register - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - @Singular - List resources; - @Singular - List dimensions; - @Getter(lazy = true) - List allAttributes = LazyLoader.computeAllAttributes(this); - - @Singular - List forms; - - @Singular - List templates; - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - - /* - * Свое - */ - - @Singular - List recalculations; - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.VIEW, - RoleRight.EDIT - ); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.Dimension; +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.Recalculation; +import com.github._1c_syntax.bsl.mdo.children.Resource; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class CalculationRegister implements Register, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * Register + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + @Singular + List resources; + @Singular + List dimensions; + @Getter(lazy = true) + List allAttributes = LazyLoader.computeAllAttributes(this); + + @Singular + List forms; + + @Singular + List templates; + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + @Singular + List recalculations; + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.VIEW, + RoleRight.EDIT + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java index 59cfe12e9..1008a2b7c 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java @@ -1,179 +1,262 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; -import com.github._1c_syntax.bsl.mdo.support.CodeSeries; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class Catalog implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * ReferenceObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - @Singular - List forms; - - @Singular - List templates; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * Свое - */ - - /** - * Предопределенные значения - */ - @Singular - List predefinedValues; - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Список владельцев - */ - @Singular("addOwners") - List owners; - - /** - * Проверять уникальность кода справочника. - * Определяет, нужно ли проверять уникальность кода справочника. - * Если значение равно false, то код справочника должен быть уникальным в пределах области, - * определяемой свойством {@link #codeSeries}. - */ - @Default - boolean checkUnique = false; - - /** - * Серия кодов справочника. - * Определяет область действия уникальности кода справочника. - * Значение по умолчанию: {@link CodeSeries#WHOLE_CATALOG}. - * Для формата EDT: если поле отсутствует, автоматически устанавливается значение WHOLE_CATALOG. - */ - @Default - CodeSeries codeSeries = CodeSeries.WHOLE_CATALOG; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.INSERT, - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.DELETE, - RoleRight.VIEW, - RoleRight.EDIT, - RoleRight.INPUT_BY_STRING, - RoleRight.INTERACTIVE_DELETE, - RoleRight.INTERACTIVE_INSERT, - RoleRight.INTERACTIVE_SET_DELETION_MARK, - RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, - RoleRight.INTERACTIVE_DELETE_MARKED, - RoleRight.INTERACTIVE_DELETE_PREDEFINED_DATA, - RoleRight.INTERACTIVE_SET_DELETION_MARK_PREDEFINED_DATA, - RoleRight.INTERACTIVE_CLEAR_DELETION_MARK_PREDEFINED_DATA, - RoleRight.INTERACTIVE_DELETE_MARKED_PREDEFINED_DATA, - RoleRight.READ_DATA_HISTORY, - RoleRight.VIEW_DATA_HISTORY, - RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY, - RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY_SETTINGS, - RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, - RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, - RoleRight.SWITCH_TO_DATA_HISTORY_VERSION - ); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; +import com.github._1c_syntax.bsl.mdo.support.CodeSeries; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class Catalog implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * ReferenceObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + @Singular + List forms; + + @Singular + List templates; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на форму группы по умолчанию + */ + @Default + MdoReference defaultFolderForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора группы по умолчанию + */ + @Default + MdoReference defaultFolderChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму группы + */ + @Default + MdoReference auxiliaryFolderForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора группы + */ + @Default + MdoReference auxiliaryFolderChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Предопределенные значения + */ + @Singular + List predefinedValues; + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Список владельцев + */ + @Singular("addOwners") + List owners; + + /** + * Проверять уникальность кода справочника. + * Определяет, нужно ли проверять уникальность кода справочника. + * Если значение равно false, то код справочника должен быть уникальным в пределах области, + * определяемой свойством {@link #codeSeries}. + */ + @Default + boolean checkUnique = false; + + /** + * Серия кодов справочника. + * Определяет область действия уникальности кода справочника. + * Значение по умолчанию: {@link CodeSeries#WHOLE_CATALOG}. + * Для формата EDT: если поле отсутствует, автоматически устанавливается значение WHOLE_CATALOG. + */ + @Default + CodeSeries codeSeries = CodeSeries.WHOLE_CATALOG; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.INSERT, + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.DELETE, + RoleRight.VIEW, + RoleRight.EDIT, + RoleRight.INPUT_BY_STRING, + RoleRight.INTERACTIVE_DELETE, + RoleRight.INTERACTIVE_INSERT, + RoleRight.INTERACTIVE_SET_DELETION_MARK, + RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, + RoleRight.INTERACTIVE_DELETE_MARKED, + RoleRight.INTERACTIVE_DELETE_PREDEFINED_DATA, + RoleRight.INTERACTIVE_SET_DELETION_MARK_PREDEFINED_DATA, + RoleRight.INTERACTIVE_CLEAR_DELETION_MARK_PREDEFINED_DATA, + RoleRight.INTERACTIVE_DELETE_MARKED_PREDEFINED_DATA, + RoleRight.READ_DATA_HISTORY, + RoleRight.VIEW_DATA_HISTORY, + RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY, + RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY_SETTINGS, + RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, + RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, + RoleRight.SWITCH_TO_DATA_HISTORY_VERSION + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.FOLDER_FORM, getDefaultFolderForm()), + Map.entry(DefaultFormKind.FOLDER_CHOICE_FORM, getDefaultFolderChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()), + Map.entry(DefaultFormKind.AUX_FOLDER_FORM, getAuxiliaryFolderForm()), + Map.entry(DefaultFormKind.AUX_FOLDER_CHOICE_FORM, getAuxiliaryFolderChoiceForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java index 822d6c3b8..aa3a2fedf 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; import com.github._1c_syntax.bsl.mdo.support.CodeSeries; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -44,6 +45,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -106,6 +108,48 @@ public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner, Pred * Свое */ + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Предопределенные значения */ @@ -154,4 +198,15 @@ public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner, Pred public static List possibleRights() { return Catalog.possibleRights(); } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java index a035036ab..7fc668592 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java @@ -25,6 +25,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -41,6 +42,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -101,6 +103,48 @@ public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwn * Свое */ + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Предопределенные значения */ @@ -120,4 +164,14 @@ public static List possibleRights() { return Catalog.possibleRights(); } + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java index 3c3132dc4..f46cd858b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java @@ -1,157 +1,240 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; -import com.github._1c_syntax.bsl.mdo.support.CodeSeries; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import com.github._1c_syntax.bsl.types.ValueTypeDescription; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class ChartOfCharacteristicTypes - implements ReferenceObject, AccessRightsOwner, ValueTypeOwner, PredefinedDataOwner { - - /* - * ReferenceObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - @Singular - List forms; - - @Singular - List templates; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * ValueTypeOwner - */ - - @Default - @Getter(AccessLevel.NONE) - ValueTypeDescription type = ValueTypeDescription.EMPTY; - - /* - * Свое - */ - - /** - * Предопределенные значения - */ - @Singular - List predefinedValues; - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Проверять уникальность кода плана видов характеристик. - * Определяет, нужно ли проверять уникальность кода плана видов характеристик. - * Если значение равно true, то код плана видов характеристик должен быть уникальным в пределах области, - * определяемой свойством {@link #codeSeries}. Если false, проверка уникальности не выполняется. - */ - @Default - boolean checkUnique = false; - - /** - * Серия кодов плана видов характеристик. - * Определяет область действия уникальности кода плана видов характеристик. - * Значение по умолчанию: {@link CodeSeries#WHOLE_CATALOG}. - * Для формата EDT: если поле отсутствует, автоматически устанавливается значение WHOLE_CATALOG. - */ - @Default - CodeSeries codeSeries = CodeSeries.WHOLE_CATALOG; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return Catalog.possibleRights(); - } - - @Override - public ValueTypeDescription getValueType() { - return type; - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; +import com.github._1c_syntax.bsl.mdo.support.CodeSeries; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import com.github._1c_syntax.bsl.types.ValueTypeDescription; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class ChartOfCharacteristicTypes + implements ReferenceObject, AccessRightsOwner, ValueTypeOwner, PredefinedDataOwner { + + /* + * ReferenceObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + @Singular + List forms; + + @Singular + List templates; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * ValueTypeOwner + */ + + @Default + @Getter(AccessLevel.NONE) + ValueTypeDescription type = ValueTypeDescription.EMPTY; + + /* + * Свое + */ + + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на форму группы по умолчанию + */ + @Default + MdoReference defaultFolderForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора группы по умолчанию + */ + @Default + MdoReference defaultFolderChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму группы + */ + @Default + MdoReference auxiliaryFolderForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора группы + */ + @Default + MdoReference auxiliaryFolderChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Предопределенные значения + */ + @Singular + List predefinedValues; + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Проверять уникальность кода плана видов характеристик. + * Определяет, нужно ли проверять уникальность кода плана видов характеристик. + * Если значение равно true, то код плана видов характеристик должен быть уникальным в пределах области, + * определяемой свойством {@link #codeSeries}. Если false, проверка уникальности не выполняется. + */ + @Default + boolean checkUnique = false; + + /** + * Серия кодов плана видов характеристик. + * Определяет область действия уникальности кода плана видов характеристик. + * Значение по умолчанию: {@link CodeSeries#WHOLE_CATALOG}. + * Для формата EDT: если поле отсутствует, автоматически устанавливается значение WHOLE_CATALOG. + */ + @Default + CodeSeries codeSeries = CodeSeries.WHOLE_CATALOG; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return Catalog.possibleRights(); + } + + @Override + public ValueTypeDescription getValueType() { + return type; + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.FOLDER_FORM, getDefaultFolderForm()), + Map.entry(DefaultFormKind.FOLDER_CHOICE_FORM, getDefaultFolderChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()), + Map.entry(DefaultFormKind.AUX_FOLDER_FORM, getAuxiliaryFolderForm()), + Map.entry(DefaultFormKind.AUX_FOLDER_CHOICE_FORM, getAuxiliaryFolderChoiceForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java index ac29b0132..ac2c5eb98 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java @@ -1,147 +1,174 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class DataProcessor implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, TabularSectionOwner, - FormOwner, TemplateOwner, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = List.of(RoleRight.EDIT, RoleRight.USE, RoleRight.VIEW); - - /* - * MDObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * ModuleOwner - */ - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - /* - * CommandOwner - */ - - @Singular - List commands; - - /* - * AttributeOwner - */ - - @Singular - List attributes; - - /* - * TabularSectionOwner - */ - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - /* - * FormOwner - */ - - @Singular - List forms; - - /* - * TemplateOwner - */ - - @Singular - List templates; - - /* - * Свое - */ - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - @Override - public List getAllAttributes() { - return getAttributes(); - } - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class DataProcessor implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, TabularSectionOwner, + FormOwner, TemplateOwner, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = List.of(RoleRight.EDIT, RoleRight.USE, RoleRight.VIEW); + + /* + * MDObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * ModuleOwner + */ + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + /* + * CommandOwner + */ + + @Singular + List commands; + + /* + * AttributeOwner + */ + + @Singular + List attributes; + + /* + * TabularSectionOwner + */ + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + /* + * FormOwner + */ + + @Singular + List forms; + + /* + * TemplateOwner + */ + + @Singular + List templates; + + /* + * Свое + */ + + /** + * Ссылка на форму по умолчанию + */ + @Default + MdoReference defaultForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму + */ + @Default + MdoReference auxiliaryForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + @Override + public List getAllAttributes() { + return getAttributes(); + } + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.DEFAULT_FORM, getDefaultForm()), + Map.entry(DefaultFormKind.AUX_FORM, getAuxiliaryForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java index 7225aaba4..093c116bb 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java @@ -1,155 +1,210 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class Document implements ReferenceObject, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * ReferenceObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - @Singular - List forms; - - @Singular - List templates; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * Свое - */ - - /** - * Список связанных регистров (где документ является регистратором) - */ - @Singular("addRegisterRecords") - List registerRecords; - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.INSERT, - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.DELETE, - RoleRight.VIEW, - RoleRight.EDIT, - RoleRight.INPUT_BY_STRING, - RoleRight.POSTING, - RoleRight.UNDO_POSTING, - RoleRight.INTERACTIVE_DELETE, - RoleRight.INTERACTIVE_INSERT, - RoleRight.INTERACTIVE_SET_DELETION_MARK, - RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, - RoleRight.INTERACTIVE_DELETE_MARKED, - RoleRight.INTERACTIVE_POSTING, - RoleRight.INTERACTIVE_POSTING_REGULAR, - RoleRight.INTERACTIVE_UNDO_POSTING, - RoleRight.INTERACTIVE_CHANGE_OF_POSTED, - RoleRight.READ_DATA_HISTORY, - RoleRight.VIEW_DATA_HISTORY, - RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY, - RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY_SETTINGS, - RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, - RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, - RoleRight.SWITCH_TO_DATA_HISTORY_VERSION - ); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class Document implements ReferenceObject, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * ReferenceObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + @Singular + List forms; + + @Singular + List templates; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Список связанных регистров (где документ является регистратором) + */ + @Singular("addRegisterRecords") + List registerRecords; + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.INSERT, + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.DELETE, + RoleRight.VIEW, + RoleRight.EDIT, + RoleRight.INPUT_BY_STRING, + RoleRight.POSTING, + RoleRight.UNDO_POSTING, + RoleRight.INTERACTIVE_DELETE, + RoleRight.INTERACTIVE_INSERT, + RoleRight.INTERACTIVE_SET_DELETION_MARK, + RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, + RoleRight.INTERACTIVE_DELETE_MARKED, + RoleRight.INTERACTIVE_POSTING, + RoleRight.INTERACTIVE_POSTING_REGULAR, + RoleRight.INTERACTIVE_UNDO_POSTING, + RoleRight.INTERACTIVE_CHANGE_OF_POSTED, + RoleRight.READ_DATA_HISTORY, + RoleRight.VIEW_DATA_HISTORY, + RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY, + RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY_SETTINGS, + RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, + RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, + RoleRight.SWITCH_TO_DATA_HISTORY_VERSION + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java index 3ddacadff..efbbfc427 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java @@ -25,6 +25,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -41,6 +42,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -114,6 +116,24 @@ public class DocumentJournal implements MDObject, ModuleOwner, CommandOwner, Att * Свое */ + /** + * Ссылка на форму по умолчанию + */ + @Default + MdoReference defaultForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму + */ + @Default + MdoReference auxiliaryForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Ссылки на документы */ @@ -137,4 +157,11 @@ public List getAllAttributes() { public static List possibleRights() { return POSSIBLE_RIGHTS; } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.DEFAULT_FORM, getDefaultForm()), + Map.entry(DefaultFormKind.AUX_FORM, getAuxiliaryForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java index 790f70fc8..57f9da8ec 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java @@ -1,129 +1,170 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.EnumValue; -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class Enum implements MDObject, ModuleOwner, CommandOwner, FormOwner, TemplateOwner, AttributeOwner { - - /* - * MDObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - - /* - * ModuleOwner - */ - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - /* - * CommandOwner - */ - - @Singular - List commands; - - /* - * FormOwner - */ - - @Singular - List forms; - - /* - * TemplateOwner - */ - - @Singular - List templates; - - /* - * AttributeOwner - */ - - @Singular - List attributes; - - /* - * Свое - */ - - /** - * Элементы перечисления - */ - @Singular - List enumValues; - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - @Override - public List getAllAttributes() { - return getAttributes(); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.EnumValue; +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class Enum implements MDObject, ModuleOwner, CommandOwner, FormOwner, TemplateOwner, AttributeOwner { + + /* + * MDObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + + /* + * ModuleOwner + */ + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + /* + * CommandOwner + */ + + @Singular + List commands; + + /* + * FormOwner + */ + + @Singular + List forms; + + /* + * TemplateOwner + */ + + @Singular + List templates; + + /* + * AttributeOwner + */ + + @Singular + List attributes; + + /* + * Свое + */ + + /** + * Элементы перечисления + */ + @Singular + List enumValues; + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + @Override + public List getAllAttributes() { + return getAttributes(); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java index bda17702c..98326f3e6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java @@ -26,6 +26,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; import com.github._1c_syntax.bsl.mdo.support.AutoRecordType; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -42,6 +43,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -104,6 +106,48 @@ public class ExchangePlan implements ReferenceObject, AccessRightsOwner, Predefi * Свое */ + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Предопределенные значения */ @@ -190,6 +234,17 @@ private static List computePossibleRights() { ); } + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } + @Value @Builder public static class RecordContent { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java index 61ac7e632..2f99815a7 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java @@ -23,6 +23,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -39,6 +40,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -97,6 +99,24 @@ public class FilterCriterion implements MDObject, ModuleOwner, CommandOwner, For * Свое */ + /** + * Ссылка на форму по умолчанию + */ + @Default + MdoReference defaultForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму + */ + @Default + MdoReference auxiliaryForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Состав критерия */ @@ -115,4 +135,11 @@ public class FilterCriterion implements MDObject, ModuleOwner, CommandOwner, For public static List possibleRights() { return POSSIBLE_RIGHTS; } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.DEFAULT_FORM, getDefaultForm()), + Map.entry(DefaultFormKind.AUX_FORM, getAuxiliaryForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/FormOwner.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/FormOwner.java index b7ff57f44..da38ce103 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/FormOwner.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/FormOwner.java @@ -22,8 +22,12 @@ package com.github._1c_syntax.bsl.mdo; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.types.MdoReference; import java.util.List; +import java.util.Map; +import java.util.Optional; /** * Расширение - Владелец дочерних форм @@ -33,4 +37,49 @@ public interface FormOwner extends ChildrenOwner { * Список форм объекта */ List getForms(); + + /** + * Соответствие типов форм по умолчанию и ссылок на соответствующие формы. + *

+ * Каждая реализация предоставляет свой набор в зависимости от того, + * какие виды форм применимы для данного объекта метаданных. + * + * @return соответствие видов форм по умолчанию + */ + Map getDefaultFormMap(); + + /** + * Возвращает ссылку на форму по умолчанию по типу. + * + * @param kind Тип формы по умолчанию + * @return Ссылка на форму или {@link MdoReference#EMPTY}, если её нет либо тип неприменим + */ + default MdoReference getDefaultFormLink(DefaultFormKind kind) { + return getDefaultFormMap().getOrDefault(kind, MdoReference.EMPTY); + } + + /** + * Возвращает форму по умолчанию по типу. + * Ищет форму в {@link #getForms()} по ссылке, полученной из {@link #getDefaultFormLink}. + * + * @param kind Тип формы по умолчанию + * @return Форма или {@link Optional#empty()}, если ссылка не указана или форма не найдена в списке + */ + default Optional getDefaultForm(DefaultFormKind kind) { + MdoReference link = getDefaultFormLink(kind); + if (link.isEmpty()) return Optional.empty(); + return getFormByLink(link); + } + + /** + * Поиск формы по произвольной ссылке. + * + * @param reference Ссылка на форму + * @return Форма или {@link Optional#empty()}, если форма с указанной ссылкой не найдена + */ + default Optional getFormByLink(MdoReference reference) { + return getForms().stream() + .filter(f -> f.getMdoReference().equals(reference)) + .findFirst(); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java index 93ce24cf2..6bb0176b0 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java @@ -1,134 +1,175 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.Dimension; -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.Resource; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class InformationRegister implements Register, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * Register - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - @Singular - List resources; - @Singular - List dimensions; - @Getter(lazy = true) - List allAttributes = LazyLoader.computeAllAttributes(this); - - @Singular - List forms; - - @Singular - List templates; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - - /* - * Свое - */ - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.VIEW, - RoleRight.EDIT, - RoleRight.TOTALS_CONTROL, - RoleRight.READ_DATA_HISTORY, - RoleRight.VIEW_DATA_HISTORY, - RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY, - RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY_SETTINGS, - RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, - RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, - RoleRight.SWITCH_TO_DATA_HISTORY_VERSION - ); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.Dimension; +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.Resource; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class InformationRegister implements Register, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * Register + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + @Singular + List resources; + @Singular + List dimensions; + @Getter(lazy = true) + List allAttributes = LazyLoader.computeAllAttributes(this); + + @Singular + List forms; + + @Singular + List templates; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + + /* + * Свое + */ + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму записи по умолчанию + */ + @Default + MdoReference defaultRecordForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму записи + */ + @Default + MdoReference auxiliaryRecordForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.VIEW, + RoleRight.EDIT, + RoleRight.TOTALS_CONTROL, + RoleRight.READ_DATA_HISTORY, + RoleRight.VIEW_DATA_HISTORY, + RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY, + RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY_SETTINGS, + RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, + RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, + RoleRight.SWITCH_TO_DATA_HISTORY_VERSION + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.RECORD_FORM, getDefaultRecordForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.AUX_RECORD_FORM, getAuxiliaryRecordForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java index 1019d1161..f9ff3a533 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java @@ -1,147 +1,195 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class Report implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, TabularSectionOwner, - FormOwner, TemplateOwner, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = List.of(RoleRight.EDIT, RoleRight.USE, RoleRight.VIEW); - - /* - * MDObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * ModuleOwner - */ - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - /* - * CommandOwner - */ - - @Singular - List commands; - - /* - * AttributeOwner - */ - - @Singular - List attributes; - - /* - * TabularSectionOwner - */ - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - /* - * FormOwner - */ - - @Singular - List forms; - - /* - * TemplateOwner - */ - - @Singular - List templates; - - /* - * Свое - */ - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - @Override - public List getAllAttributes() { - return getAttributes(); - } - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class Report implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, TabularSectionOwner, + FormOwner, TemplateOwner, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = List.of(RoleRight.EDIT, RoleRight.USE, RoleRight.VIEW); + + /* + * MDObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * ModuleOwner + */ + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + /* + * CommandOwner + */ + + @Singular + List commands; + + /* + * AttributeOwner + */ + + @Singular + List attributes; + + /* + * TabularSectionOwner + */ + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + /* + * FormOwner + */ + + @Singular + List forms; + + /* + * TemplateOwner + */ + + @Singular + List templates; + + /* + * Свое + */ + + /** + * Ссылка на форму по умолчанию + */ + @Default + MdoReference defaultForm = MdoReference.EMPTY; + + /** + * Ссылка на форму настроек по умолчанию + */ + @Default + MdoReference defaultSettingsForm = MdoReference.EMPTY; + + /** + * Ссылка на форму варианта по умолчанию + */ + @Default + MdoReference defaultVariantForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму + */ + @Default + MdoReference auxiliaryForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму настроек + */ + @Default + MdoReference auxiliarySettingsForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + @Override + public List getAllAttributes() { + return getAttributes(); + } + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.DEFAULT_FORM, getDefaultForm()), + Map.entry(DefaultFormKind.SETTINGS_FORM, getDefaultSettingsForm()), + Map.entry(DefaultFormKind.VARIANT_FORM, getDefaultVariantForm()), + Map.entry(DefaultFormKind.AUX_FORM, getAuxiliaryForm()), + Map.entry(DefaultFormKind.AUX_SETTINGS_FORM, getAuxiliarySettingsForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java index 7755ffbd0..0dc87670e 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java @@ -23,6 +23,7 @@ import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; import com.github._1c_syntax.bsl.support.SupportVariant; @@ -38,6 +39,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -89,4 +91,47 @@ public class SettingsStorage implements MDObject, ModuleOwner, FormOwner, Templa @Singular List templates; + + /* + * Свое + */ + + /** + * Ссылка на форму сохранения по умолчанию + */ + @Default + MdoReference defaultSaveForm = MdoReference.EMPTY; + + /** + * Ссылка на форму загрузки по умолчанию + */ + @Default + MdoReference defaultLoadForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму сохранения + */ + @Default + MdoReference auxiliarySaveForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму загрузки + */ + @Default + MdoReference auxiliaryLoadForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.SAVE_FORM, getDefaultSaveForm()), + Map.entry(DefaultFormKind.LOAD_FORM, getDefaultLoadForm()), + Map.entry(DefaultFormKind.AUX_SAVE_FORM, getAuxiliarySaveForm()), + Map.entry(DefaultFormKind.AUX_LOAD_FORM, getAuxiliaryLoadForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java index d037feae4..80e69ecd8 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java @@ -1,153 +1,208 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ -package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; -import com.github._1c_syntax.bsl.mdo.children.ObjectForm; -import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; -import com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute; -import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; -import com.github._1c_syntax.bsl.mdo.support.RoleRight; -import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; -import com.github._1c_syntax.bsl.support.SupportVariant; -import com.github._1c_syntax.bsl.types.MdoReference; -import com.github._1c_syntax.bsl.types.MultiLanguageString; -import lombok.Builder; -import lombok.Builder.Default; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Singular; -import lombok.ToString; -import lombok.Value; - -import java.util.Collections; -import java.util.List; - -@Value -@Builder(toBuilder = true) -@ToString(of = {"name", "uuid"}) -@EqualsAndHashCode(of = {"name", "uuid"}) -public class Task implements ReferenceObject, AccessRightsOwner { - - private static final List POSSIBLE_RIGHTS = computePossibleRights(); - - /* - * ReferenceObject - */ - - @Default - String uuid = ""; - @Default - String name = ""; - @Default - MdoReference mdoReference = MdoReference.EMPTY; - @Default - ObjectBelonging objectBelonging = ObjectBelonging.OWN; - @Default - String comment = ""; - @Default - MultiLanguageString synonym = MultiLanguageString.EMPTY; - @Default - SupportVariant supportVariant = SupportVariant.NONE; - - @Default - List modules = Collections.emptyList(); - @Getter(lazy = true) - List allModules = LazyLoader.computeAllModules(this); - - @Singular - List commands; - - @Singular - List attributes; - - @Singular - List tabularSections; - - @Getter(lazy = true) - List storageFields = LazyLoader.computeStorageFields(this); - @Getter(lazy = true) - List plainStorageFields = LazyLoader.computePlainStorageFields(this); - - @Singular - List forms; - - @Singular - List templates; - - @Getter(lazy = true) - List children = LazyLoader.computeChildren(this); - @Getter(lazy = true) - List plainChildren = LazyLoader.computePlainChildren(this); - - /* - * Свое - */ - - /** - * Реквизиты адресации - */ - @Singular - List addressingAttributes; - - /** - * Пояснение - */ - @Default - MultiLanguageString explanation = MultiLanguageString.EMPTY; - - /** - * Возвращает перечень возможных прав доступа - */ - public static List possibleRights() { - return POSSIBLE_RIGHTS; - } - - private static List computePossibleRights() { - return List.of( - RoleRight.INSERT, - RoleRight.READ, - RoleRight.UPDATE, - RoleRight.DELETE, - RoleRight.VIEW, - RoleRight.EDIT, - RoleRight.INPUT_BY_STRING, - RoleRight.INTERACTIVE_DELETE, - RoleRight.INTERACTIVE_INSERT, - RoleRight.INTERACTIVE_SET_DELETION_MARK, - RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, - RoleRight.INTERACTIVE_DELETE_MARKED, - RoleRight.INTERACTIVE_ACTIVATE, - RoleRight.EXECUTE, - RoleRight.INTERACTIVE_EXECUTE, - RoleRight.READ_DATA_HISTORY, - RoleRight.VIEW_DATA_HISTORY, - RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY, - RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, - RoleRight.UPDATE_DATA_HISTORY_SETTINGS, - RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, - RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, - RoleRight.SWITCH_TO_DATA_HISTORY_VERSION - ); - } -} +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo; + +import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate; +import com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; +import com.github._1c_syntax.bsl.mdo.support.RoleRight; +import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.MultiLanguageString; +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Singular; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Value +@Builder(toBuilder = true) +@ToString(of = {"name", "uuid"}) +@EqualsAndHashCode(of = {"name", "uuid"}) +public class Task implements ReferenceObject, AccessRightsOwner { + + private static final List POSSIBLE_RIGHTS = computePossibleRights(); + + /* + * ReferenceObject + */ + + @Default + String uuid = ""; + @Default + String name = ""; + @Default + MdoReference mdoReference = MdoReference.EMPTY; + @Default + ObjectBelonging objectBelonging = ObjectBelonging.OWN; + @Default + String comment = ""; + @Default + MultiLanguageString synonym = MultiLanguageString.EMPTY; + @Default + SupportVariant supportVariant = SupportVariant.NONE; + + @Default + List modules = Collections.emptyList(); + @Getter(lazy = true) + List allModules = LazyLoader.computeAllModules(this); + + @Singular + List commands; + + @Singular + List attributes; + + @Singular + List tabularSections; + + @Getter(lazy = true) + List storageFields = LazyLoader.computeStorageFields(this); + @Getter(lazy = true) + List plainStorageFields = LazyLoader.computePlainStorageFields(this); + + @Singular + List forms; + + @Singular + List templates; + + @Getter(lazy = true) + List children = LazyLoader.computeChildren(this); + @Getter(lazy = true) + List plainChildren = LazyLoader.computePlainChildren(this); + + /* + * Свое + */ + + /** + * Реквизиты адресации + */ + @Singular + List addressingAttributes; + + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму объекта + */ + @Default + MdoReference auxiliaryObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму списка + */ + @Default + MdoReference auxiliaryListForm = MdoReference.EMPTY; + + /** + * Ссылка на дополнительную форму выбора + */ + @Default + MdoReference auxiliaryChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + + /** + * Пояснение + */ + @Default + MultiLanguageString explanation = MultiLanguageString.EMPTY; + + /** + * Возвращает перечень возможных прав доступа + */ + public static List possibleRights() { + return POSSIBLE_RIGHTS; + } + + private static List computePossibleRights() { + return List.of( + RoleRight.INSERT, + RoleRight.READ, + RoleRight.UPDATE, + RoleRight.DELETE, + RoleRight.VIEW, + RoleRight.EDIT, + RoleRight.INPUT_BY_STRING, + RoleRight.INTERACTIVE_DELETE, + RoleRight.INTERACTIVE_INSERT, + RoleRight.INTERACTIVE_SET_DELETION_MARK, + RoleRight.INTERACTIVE_CLEAR_DELETION_MARK, + RoleRight.INTERACTIVE_DELETE_MARKED, + RoleRight.INTERACTIVE_ACTIVATE, + RoleRight.EXECUTE, + RoleRight.INTERACTIVE_EXECUTE, + RoleRight.READ_DATA_HISTORY, + RoleRight.VIEW_DATA_HISTORY, + RoleRight.READ_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY, + RoleRight.UPDATE_DATA_HISTORY_OF_MISSING_DATA, + RoleRight.UPDATE_DATA_HISTORY_SETTINGS, + RoleRight.UPDATE_DATA_HISTORY_VERSION_COMMENT, + RoleRight.EDIT_DATA_HISTORY_VERSION_COMMENT, + RoleRight.SWITCH_TO_DATA_HISTORY_VERSION + ); + } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()), + Map.entry(DefaultFormKind.AUX_OBJECT_FORM, getAuxiliaryObjectForm()), + Map.entry(DefaultFormKind.AUX_LIST_FORM, getAuxiliaryListForm()), + Map.entry(DefaultFormKind.AUX_CHOICE_FORM, getAuxiliaryChoiceForm()) + ); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java index 1d2ae8e50..0934d131f 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java @@ -32,6 +32,7 @@ import com.github._1c_syntax.bsl.mdo.ModuleOwner; import com.github._1c_syntax.bsl.mdo.TemplateOwner; import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -48,6 +49,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -142,6 +144,24 @@ public class ExternalDataSourceCube implements MDChild, ModuleOwner, CommandOwne * Свое */ + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму записи по умолчанию + */ + @Default + MdoReference defaultRecordForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Режим управления блокировкой */ @@ -161,4 +181,11 @@ private static List computePossibleRights() { RoleRight.VIEW ); } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.RECORD_FORM, getDefaultRecordForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java index bb6f7e796..5d9510be6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java @@ -32,6 +32,7 @@ import com.github._1c_syntax.bsl.mdo.ModuleOwner; import com.github._1c_syntax.bsl.mdo.TemplateOwner; import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -48,6 +49,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -126,6 +128,30 @@ public class ExternalDataSourceCubeDimensionTable implements MDChild, ModuleOwne * Свое */ + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Режим управления блокировкой */ @@ -157,4 +183,12 @@ private static List computePossibleRights() { RoleRight.INTERACTIVE_INSERT ); } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java index bb7d8ae80..a57f735da 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java @@ -32,6 +32,7 @@ import com.github._1c_syntax.bsl.mdo.ModuleOwner; import com.github._1c_syntax.bsl.mdo.TemplateOwner; import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; import com.github._1c_syntax.bsl.mdo.support.RoleRight; import com.github._1c_syntax.bsl.mdo.utils.LazyLoader; @@ -48,6 +49,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; @Value @Builder(toBuilder = true) @@ -126,6 +128,36 @@ public class ExternalDataSourceTable implements MDChild, ModuleOwner, CommandOwn * Свое */ + /** + * Ссылка на форму объекта по умолчанию + */ + @Default + MdoReference defaultObjectForm = MdoReference.EMPTY; + + /** + * Ссылка на форму списка по умолчанию + */ + @Default + MdoReference defaultListForm = MdoReference.EMPTY; + + /** + * Ссылка на форму записи по умолчанию + */ + @Default + MdoReference defaultRecordForm = MdoReference.EMPTY; + + /** + * Ссылка на форму выбора по умолчанию + */ + @Default + MdoReference defaultChoiceForm = MdoReference.EMPTY; + + /** + * Возможные формы по умолчанию + */ + @Getter(lazy = true) + Map defaultFormMap = createDefaultFormMap(); + /** * Режим управления блокировкой */ @@ -157,4 +189,13 @@ private static List computePossibleRights() { RoleRight.INTERACTIVE_INSERT ); } + + private Map createDefaultFormMap() { + return Map.ofEntries( + Map.entry(DefaultFormKind.OBJECT_FORM, getDefaultObjectForm()), + Map.entry(DefaultFormKind.RECORD_FORM, getDefaultRecordForm()), + Map.entry(DefaultFormKind.LIST_FORM, getDefaultListForm()), + Map.entry(DefaultFormKind.CHOICE_FORM, getDefaultChoiceForm()) + ); + } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/DefaultFormKind.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/DefaultFormKind.java new file mode 100644 index 000000000..72ba1c4fc --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/DefaultFormKind.java @@ -0,0 +1,83 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdo.support; + +import com.github._1c_syntax.bsl.types.EnumWithName; +import com.github._1c_syntax.bsl.types.MultiName; +import lombok.Getter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.util.Locale; +import java.util.Map; + +/** + * Типы форм по умолчанию + */ +@ToString(of = "fullName") +public enum DefaultFormKind implements EnumWithName { + OBJECT_FORM("ObjectForm", "ФормаОбъекта"), + LIST_FORM("ListForm", "ФормаСписка"), + CHOICE_FORM("ChoiceForm", "ФормаВыбора"), + FOLDER_FORM("FolderForm", "ФормаГруппы"), + FOLDER_CHOICE_FORM("FolderChoiceForm", "ФормаВыбораГруппы"), + RECORD_FORM("RecordForm", "ФормаЗаписи"), + DEFAULT_FORM("Form", "Форма"), + SETTINGS_FORM("SettingsForm", "ФормаНастройки"), + VARIANT_FORM("VariantForm", "ФормаВарианта"), + SAVE_FORM("SaveForm", "ФормаЗаписи"), + LOAD_FORM("LoadForm", "ФормаОткрытия"), + REPORT_FORM("ReportForm", "ФормаОтчета"), + REPORT_VARIANT_FORM("ReportVariantForm", "ФормаВариантаОтчета"), + REPORT_SETTINGS_FORM("ReportSettingsForm", "ФормаНастроекОтчета"), + DYNAMIC_LIST_SETTINGS_FORM("DynamicListSettingsForm", "ФормаНастроекДинамическогоСписка"), + SEARCH_FORM("SearchForm", "ФормаПоиска"), + AUX_OBJECT_FORM("AuxiliaryObjectForm", "ДополнительнаяФормаОбъекта"), + AUX_FOLDER_FORM("AuxiliaryFolderForm", "ДополнительнаяФормаГруппы"), + AUX_LIST_FORM("AuxiliaryListForm", "ДополнительнаяФормаСписка"), + AUX_CHOICE_FORM("AuxiliaryChoiceForm", "ДополнительнаяФормаВыбора"), + AUX_FOLDER_CHOICE_FORM("AuxiliaryFolderChoiceForm", "ДополнительнаяФормаВыбораГруппы"), + AUX_RECORD_FORM("AuxiliaryRecordForm", "ДополнительнаяФормаЗаписи"), + AUX_FORM("AuxiliaryForm", "ДополнительнаяФорма"), + AUX_SETTINGS_FORM("AuxiliarySettingsForm", "ДополнительнаяФормаНастройки"), + AUX_VARIANT_FORM("AuxiliaryVariantForm", "ДополнительнаяФормаВарианта"), + AUX_REPORT_FORM("AuxiliaryReportForm", "ДополнительнаяФормаОтчета"), + AUX_REPORT_VARIANT_FORM("AuxiliaryReportVariantForm", "ДополнительнаяФормаВариантаОтчета"), + AUX_REPORT_SETTINGS_FORM("AuxiliaryReportSettingsForm", "ДополнительнаяФормаНастроекОтчета"), + AUX_DYNAMIC_LIST_SETTINGS_FORM("AuxiliaryDynamicListSettingsForm", "ДополнительнаяФормаНастроекДинамическогоСписка"), + AUX_SAVE_FORM("AuxiliarySaveForm", "ДополнительнаяФормаЗаписи"), + AUX_LOAD_FORM("AuxiliaryLoadForm", "ДополнительнаяФормаОткрытия"); + + private static final Map KEYS = EnumWithName.computeKeys(values()); + + @Getter + @Accessors(fluent = true) + private final MultiName fullName; + + DefaultFormKind(String nameEn, String nameRu) { + this.fullName = MultiName.create(nameEn, nameRu); + } + + public static DefaultFormKind valueByName(String string) { + return KEYS.getOrDefault(string.toLowerCase(Locale.ROOT), null); + } +} diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java index f675a2912..093a1aeb8 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java @@ -1,54 +1,68 @@ -/* - * This file is a part of MDClasses. - * - * Copyright (c) 2019 - 2026 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * MDClasses is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * MDClasses 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with MDClasses. - */ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2026 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ package com.github._1c_syntax.bsl.mdo; - -import com.github._1c_syntax.bsl.test_utils.MDTestUtils; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.aggregator.ArgumentsAccessor; -import org.junit.jupiter.params.provider.CsvSource; - -import static org.assertj.core.api.Assertions.assertThat; - -class AccountingRegisterTest { - @ParameterizedTest - @CsvSource( - { - "true, mdclasses, AccountingRegisters.РегистрБухгалтерии1", - "false, mdclasses, AccountingRegisters.РегистрБухгалтерии1" - } - ) - void test(ArgumentsAccessor argumentsAccessor) { - var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); - - var accountingRegister = (AccountingRegister) mdo; - - assertThat(accountingRegister.getSynonym().isEmpty()).isFalse(); - assertThat(accountingRegister.getSynonym().get("ru")).isEqualTo("Регистр бухгалтерии"); - assertThat(accountingRegister.getSynonym().get("en")).isEqualTo("Accounting register"); - assertThat(accountingRegister.getSynonym().get("by")).isEmpty(); - - assertThat(accountingRegister.getDescription()).isEqualTo("Регистр бухгалтерии"); - assertThat(accountingRegister.getDescription("ru")).isEqualTo("Регистр бухгалтерии"); - assertThat(accountingRegister.getDescription("en")).isEqualTo("Accounting register"); - assertThat(accountingRegister.getDescription("by")).isNotEmpty().isNotEqualTo("РегистрБухгалтерии1"); - } -} + +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; +import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.aggregator.ArgumentsAccessor; +import org.junit.jupiter.params.provider.CsvSource; + +import static org.assertj.core.api.Assertions.assertThat; + +class AccountingRegisterTest { + @ParameterizedTest + @CsvSource( + { + "true, mdclasses, AccountingRegisters.РегистрБухгалтерии1", + "false, mdclasses, AccountingRegisters.РегистрБухгалтерии1" + } + ) + void test(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + + var accountingRegister = (AccountingRegister) mdo; + + assertThat(accountingRegister.getSynonym().isEmpty()).isFalse(); + assertThat(accountingRegister.getSynonym().get("ru")).isEqualTo("Регистр бухгалтерии"); + assertThat(accountingRegister.getSynonym().get("en")).isEqualTo("Accounting register"); + assertThat(accountingRegister.getSynonym().get("by")).isEmpty(); + + assertThat(accountingRegister.getDescription()).isEqualTo("Регистр бухгалтерии"); + assertThat(accountingRegister.getDescription("ru")).isEqualTo("Регистр бухгалтерии"); + assertThat(accountingRegister.getDescription("en")).isEqualTo("Accounting register"); + assertThat(accountingRegister.getDescription("by")).isNotEmpty().isNotEqualTo("РегистрБухгалтерии1"); + + assertThat(accountingRegister.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + assertThat(accountingRegister.getDefaultForm(DefaultFormKind.AUX_LIST_FORM)).isEmpty(); + + // FormOwner + assertThat(accountingRegister.getDefaultFormMap()).hasSize(2); + + assertThat(accountingRegister.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(accountingRegister.getDefaultFormLink(DefaultFormKind.AUX_LIST_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(accountingRegister.getFormByLink(MdoReference.create("AccountingRegister.Unknown.Form.Unknown"))).isEmpty(); + } +} diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java index c37281f32..6fa1d44be 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java @@ -21,13 +21,15 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; -import static com.github._1c_syntax.bsl.test_utils.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; class AccumulationRegisterTest { @ParameterizedTest @@ -50,5 +52,17 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(accumulationRegister.getResources()).hasSize(1); assertThat(accumulationRegister.getDimensions()).hasSize(1); assertThat(accumulationRegister.getChildren()).hasSize(7); + + assertThat(accumulationRegister.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + assertThat(accumulationRegister.getDefaultForm(DefaultFormKind.AUX_LIST_FORM)).isEmpty(); + + // FormOwner + assertThat(accumulationRegister.getDefaultFormMap()).hasSize(2); + + assertThat(accumulationRegister.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(accumulationRegister.getDefaultFormLink(DefaultFormKind.AUX_LIST_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(accumulationRegister.getFormByLink(MdoReference.create("AccumulationRegister.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/BusinessProcessTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/BusinessProcessTest.java index 076cee246..2efb4ea00 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/BusinessProcessTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/BusinessProcessTest.java @@ -21,7 +21,9 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; @@ -49,6 +51,19 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(businessProcess.getDescription()).isEqualTo("БизнесПроцесс1"); assertThat(businessProcess.getDescription("ru")).isEqualTo("БизнесПроцесс1"); assertThat(businessProcess.getDescription("en")).isEqualTo("БизнесПроцесс1"); + + // FormOwner + assertThat(businessProcess.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре + assertThat(businessProcess.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(businessProcess.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(businessProcess.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(businessProcess.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(businessProcess.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(businessProcess.getFormByLink(MdoReference.create("BusinessProcess.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest @@ -75,5 +90,23 @@ void testSSL_3_1(ArgumentsAccessor argumentsAccessor) { assertThat(businessProcess.getDescription("en")).isEqualTo("Задание"); assertThat(businessProcess.getDescription("")).isEqualTo("Задание"); assertThat(businessProcess.getDescription("пыщь")).isEqualTo("Задание"); + + // FormOwner + assertThat(businessProcess.getDefaultFormMap()).hasSize(6); + + // Для форм, которые есть в фикстуре + var formLink = businessProcess.getDefaultFormLink(DefaultFormKind.OBJECT_FORM); + assertThat(formLink).isEqualTo(businessProcess.getDefaultFormMap().get(DefaultFormKind.OBJECT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + assertThat(businessProcess.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isPresent(); + assertThat(businessProcess.getFormByLink(formLink)).isPresent(); + + // Для форм, которых нет в фикстуре + assertThat(businessProcess.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(businessProcess.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(businessProcess.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(businessProcess.getFormByLink(MdoReference.create("BusinessProcess.Unknown.Form.Unknown"))).isEmpty(); } } diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/CalculationRegisterTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/CalculationRegisterTest.java index 8885d4fc4..c008d7434 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/CalculationRegisterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/CalculationRegisterTest.java @@ -23,8 +23,10 @@ import com.github._1c_syntax.bsl.mdo.children.RecalculationDimension; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; import com.github._1c_syntax.bsl.types.MDOType; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; @@ -59,6 +61,17 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(calculationRegister.getModules().stream().filter(Module::isProtected)).isEmpty(); assertThat(calculationRegister.getAllModules().stream().filter(Module::isProtected)).hasSize(1); + + // FormOwner + assertThat(calculationRegister.getDefaultFormMap()).hasSize(2); + + assertThat(calculationRegister.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(calculationRegister.getDefaultFormLink(DefaultFormKind.AUX_LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(calculationRegister.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + assertThat(calculationRegister.getDefaultForm(DefaultFormKind.AUX_LIST_FORM)).isEmpty(); + + // getFormByLink с несуществующей ссылкой + assertThat(calculationRegister.getFormByLink(MdoReference.create("CalculationRegister.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java index 4bc7d3a21..f6e2cccc4 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java @@ -27,6 +27,7 @@ import com.github._1c_syntax.bsl.mdo.children.PredefinedValue; import com.github._1c_syntax.bsl.mdo.children.StandardAttribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; import com.github._1c_syntax.bsl.types.MdoReference; import com.github._1c_syntax.bsl.types.ValueTypes; @@ -64,7 +65,7 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(catalog.getPlainChildren()).hasSize(22); assertThat(catalog.getPredefinedValues()).hasSize(1); - var predefinedValue = catalog.getPredefinedValues().get(0); + var predefinedValue = catalog.getPredefinedValues().getFirst(); assertThat(predefinedValue.getName()).isEqualTo("ПредопределенныйЭлемент"); assertThat(predefinedValue.getUuid()).isEqualTo("79adb5f1-7224-4404-98a7-d7ed155f6232"); assertThat(predefinedValue.getCode()).isEqualTo("000000001"); @@ -101,6 +102,33 @@ void test(ArgumentsAccessor argumentsAccessor) { .noneMatch(ObjectForm.class::isInstance) ; + // FormOwner + assertThat(catalog.getDefaultFormMap()).hasSize(10); + + // Для форм, которые есть в фикстуре + var formLink = catalog.getDefaultFormLink(DefaultFormKind.OBJECT_FORM); + assertThat(formLink) + .isEqualTo(catalog.getDefaultFormMap().get(DefaultFormKind.OBJECT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = catalog.getDefaultForm(DefaultFormKind.OBJECT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("ФормаЭлемента"); + + var formByLink = catalog.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("ФормаЭлемента"); + + // Для форм, которых нет в фикстуре (пустые) + assertThat(catalog.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(catalog.getDefaultForm(DefaultFormKind.FOLDER_FORM)).isEmpty(); + + // Недоступный тип формы + assertThat(catalog.getDefaultForm(DefaultFormKind.AUX_DYNAMIC_LIST_SETTINGS_FORM)).isEmpty(); + + // getFormByLink с несуществующей ссылкой + assertThat(catalog.getFormByLink(MdoReference.create("Catalog.Unknown.Form.Unknown"))).isEmpty(); + // var formData = catalog.getForms().stream().filter(form -> form.getName().equals("ФормаСписка")) // .findFirst().get().getData(); // checkExtInfo(formData); diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccountsTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccountsTest.java index b27549d74..a4de3dd44 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccountsTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccountsTest.java @@ -23,7 +23,9 @@ import com.github._1c_syntax.bsl.mdo.support.AttributeKind; import com.github._1c_syntax.bsl.mdo.support.CodeSeries; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; @@ -49,6 +51,19 @@ void test(ArgumentsAccessor argumentsAccessor) { .allMatch(attribute -> attribute.getKind() == AttributeKind.STANDARD); assertThat(chartOfAccounts.getAccountingFlags()).hasSize(1); assertThat(chartOfAccounts.getExtDimensionAccountingFlags()).hasSize(1); + + // FormOwner + assertThat(chartOfAccounts.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре + assertThat(chartOfAccounts.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chartOfAccounts.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(chartOfAccounts.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chartOfAccounts.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(chartOfAccounts.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(chartOfAccounts.getFormByLink(MdoReference.create("ChartOfAccounts.Unknown.Form.Unknown"))).isEmpty(); } /** @@ -76,5 +91,18 @@ void testCheckUniqueTrue(ArgumentsAccessor argumentsAccessor) { assertThat(chartOfAccounts.getCodeSeries()) .as("Поле codeSeries должно быть WHOLE_CATALOG для плана счетов ПланСчетов1") .isEqualTo(CodeSeries.WHOLE_CATALOG); + + // FormOwner + assertThat(chartOfAccounts.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре + assertThat(chartOfAccounts.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chartOfAccounts.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(chartOfAccounts.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chartOfAccounts.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(chartOfAccounts.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(chartOfAccounts.getFormByLink(MdoReference.create("ChartOfAccounts.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypesTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypesTest.java index ca509a680..9c8ec0960 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypesTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypesTest.java @@ -21,11 +21,16 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; +import static org.assertj.core.api.Assertions.assertThat; + class ChartOfCalculationTypesTest { @ParameterizedTest @CsvSource( @@ -36,5 +41,20 @@ class ChartOfCalculationTypesTest { ) void test(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(ChartOfCalculationTypes.class); + var cct = (ChartOfCalculationTypes) mdo; + + // FormOwner + assertThat(cct.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре + assertThat(cct.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(cct.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(cct.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(cct.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(cct.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(cct.getFormByLink(MdoReference.create("ChartOfCalculationTypes.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypesTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypesTest.java index 8b0460d91..ff1634a38 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypesTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypesTest.java @@ -23,6 +23,7 @@ import com.github._1c_syntax.bsl.mdclasses.MDCReadSettings; import com.github._1c_syntax.bsl.mdo.support.CodeSeries; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.reader.MDOReader; import com.github._1c_syntax.bsl.types.MdoReference; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; @@ -39,15 +40,54 @@ class ChartOfCharacteristicTypesTest { @CsvSource( { "true, mdclasses, ChartsOfCharacteristicTypes.ПланВидовХарактеристик1, _edt", - "false, mdclasses, ChartsOfCharacteristicTypes.ПланВидовХарактеристик1", - "true, ssl_3_1, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения, _edt", - "false, ssl_3_1, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения", - "true, ssl_3_2, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения, _edt", - "false, ssl_3_2, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения" + "false, mdclasses, ChartsOfCharacteristicTypes.ПланВидовХарактеристик1" } ) void test(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(ChartOfCharacteristicTypes.class); + var cct = (ChartOfCharacteristicTypes) mdo; + assertThat(cct.getDefaultFormMap()).hasSize(10); + + // Для форм, которых нет в фикстуре + assertThat(cct.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(cct.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(cct.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(cct.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(cct.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(cct.getFormByLink(MdoReference.create("ChartOfCharacteristicTypes.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource({ + "true, ssl_3_1, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения, _edt", + "false, ssl_3_1, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения", + "true, ssl_3_2, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения, _edt", + "false, ssl_3_2, ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения" + }) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(ChartOfCharacteristicTypes.class); + var cct = (ChartOfCharacteristicTypes) mdo; + assertThat(cct.getDefaultFormMap()).hasSize(10); + + // Для форм, которые есть в фикстуре + var formLink = cct.getDefaultFormLink(DefaultFormKind.OBJECT_FORM); + assertThat(formLink).isEqualTo(cct.getDefaultFormMap().get(DefaultFormKind.OBJECT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + assertThat(cct.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isPresent(); + assertThat(cct.getFormByLink(formLink)).isPresent(); + + // Для форм, которых нет в фикстуре + assertThat(cct.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(cct.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(cct.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(cct.getDefaultForm(DefaultFormKind.FOLDER_FORM)).isEmpty(); + + // getFormByLink с несуществующей ссылкой + assertThat(cct.getFormByLink(MdoReference.create("ChartOfCharacteristicTypes.Unknown.Form.Unknown"))).isEmpty(); } /** @@ -75,6 +115,18 @@ void testCheckUniqueTrue(ArgumentsAccessor argumentsAccessor) { assertThat(chartOfCharacteristicTypes.getCodeSeries()) .as("Поле codeSeries должно быть WHOLE_CATALOG для плана видов характеристик ПланВидовХарактеристик1") .isEqualTo(CodeSeries.WHOLE_CATALOG); + + // FormOwner + assertThat(chartOfCharacteristicTypes.getDefaultFormMap()).hasSize(10); + // Для форм, которых нет в фикстуре + assertThat(chartOfCharacteristicTypes.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chartOfCharacteristicTypes.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(chartOfCharacteristicTypes.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chartOfCharacteristicTypes.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(chartOfCharacteristicTypes.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(chartOfCharacteristicTypes.getFormByLink(MdoReference.create("ChartOfCharacteristicTypes.Unknown.Form.Unknown"))).isEmpty(); } /** @@ -102,5 +154,21 @@ void testPredefined(String configurationPath) { .isEqualTo(MdoReference.create( "ChartOfCharacteristicTypes.РазделыДатЗапретаИзменения.Predefined.УдалитьОбработкаПерсональныхДанных")); assertThat(chart.getChildren()).contains(predefinedValue); + + // FormOwner + assertThat(chart.getDefaultFormMap()).hasSize(10); + // Для форм, которые есть в фикстуре + var formLink = chart.getDefaultFormLink(DefaultFormKind.OBJECT_FORM); + assertThat(formLink).isEqualTo(chart.getDefaultFormMap().get(DefaultFormKind.OBJECT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + assertThat(chart.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isPresent(); + assertThat(chart.getFormByLink(formLink)).isPresent(); + // Для форм, которых нет в фикстуре + assertThat(chart.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chart.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(chart.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(chart.getDefaultForm(DefaultFormKind.FOLDER_FORM)).isEmpty(); + // getFormByLink с несуществующей ссылкой + assertThat(chart.getFormByLink(MdoReference.create("ChartOfCharacteristicTypes.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/DataProcessorTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/DataProcessorTest.java index 5763eaab8..c8a99e2b0 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/DataProcessorTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/DataProcessorTest.java @@ -21,7 +21,10 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.children.ObjectForm; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; @@ -46,75 +49,93 @@ void test(ArgumentsAccessor argumentsAccessor) { var formData = dataProcessor.getForms().stream() .filter(form -> form.getName().equals("ЖурналРегистрации")).findFirst().get().getData(); -// checkFormData(formData); -// assertThat(formData.getChildren()).hasSize(3); + // FormOwner + assertThat(dataProcessor.getDefaultFormMap()).hasSize(2); + + var formLink = dataProcessor.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM); + assertThat(formLink) + .isEqualTo(dataProcessor.getDefaultFormMap().get(DefaultFormKind.DEFAULT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = dataProcessor.getDefaultForm(DefaultFormKind.DEFAULT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("Форма"); + + var formByLink = dataProcessor.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("Форма"); + + assertThat(dataProcessor.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(dataProcessor.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(dataProcessor.getFormByLink(MdoReference.create("DataProcessor.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest @CsvSource( { "true, ssl_3_1, DataProcessors.ЗагрузкаКурсовВалют, _edt", - "false, ssl_3_1, DataProcessors.ЗагрузкаКурсовВалют", - "true, ssl_3_2, DataProcessors.ЗагрузкаКурсовВалют, _edt", - "false, ssl_3_2, DataProcessors.ЗагрузкаКурсовВалют" + "false, ssl_3_1, DataProcessors.ЗагрузкаКурсовВалют" } ) void testSSL(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(DataProcessor.class); + var dataProcessor = (DataProcessor) mdo; + + // FormOwner + assertThat(dataProcessor.getDefaultFormMap()).hasSize(2); + + var formLink = dataProcessor.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM); + assertThat(formLink) + .isEqualTo(dataProcessor.getDefaultFormMap().get(DefaultFormKind.DEFAULT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = dataProcessor.getDefaultForm(DefaultFormKind.DEFAULT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("Форма"); + + var formByLink = dataProcessor.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("Форма"); + + assertThat(dataProcessor.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(dataProcessor.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(dataProcessor.getFormByLink(MdoReference.create("DataProcessor.Unknown.Form.Unknown"))).isEmpty(); } - // -// private void checkFormData(FormDataOLD formData) { -// assertThat(formData.getPlainChildren()) -// .hasSize(136) -// .anyMatch(formItem -> formItem.getName().equals("ГруппаОтбора") && formItem.getId() == 103); -// -// var item = formData.getPlainChildren().stream() -// .filter(formItem -> formItem.getName().equals("Критичность")).findAny().get(); -// -// assertThat(item.getDataPath()).isNotNull(); -// assertThat(item.getDataPath().getSegment()).isEqualTo("Критичность"); -// assertThat(item.getHandlers()) -// .hasSizeGreaterThan(0) -// .anyMatch(handler -> handler.getName().equals("КритичностьПриИзменении") && handler.getEvent().equals("OnChange")); -// -// var findEmptyType = formData.getPlainChildren().stream() -// .anyMatch(formItem -> formItem.getType().isEmpty()); -// assertThat(findEmptyType).isFalse(); -// -// assertThat(formData.getChildren()) -// .hasSize(3) -// .anyMatch(formItem -> formItem.getName().equals("ГруппаОтбора") -// && formItem.getId() == 103 -// && formItem.getChildren().size() == 4); -// -// assertThat(formData.getHandlers()) -// .hasSize(3) -// .anyMatch(handler -> handler.getEvent().equals("ChoiceProcessing") -// && handler.getName().equals("ОбработкаВыбора")); -// -// assertThat(formData.getAttributes()).hasSize(12) -// .anyMatch(attribute -> attribute.getName().equals("Объект") && attribute.getId() == 1 && attribute.isMain()) -// .anyMatch(attribute -> attribute.getName().equals("Журнал") && attribute.getId() == 4 && !attribute.isMain()); -// -// FormAttribute attribute = formData.getAttributes().stream() -// .filter(formAttribute -> formAttribute.getName().equals("Журнал")).findAny().get(); -// -// assertThat(attribute.getChildren()).hasSize(26) -// .anyMatch(formAttribute -> formAttribute.getName().equals("ВспомогательныйIPПорт")); -// -// attribute = formData.getAttributes().stream() -// .filter(formAttribute -> formAttribute.getName().equals("Объект")) -// .findAny().get(); -// -// assertThat(attribute.getValueTypes()).hasSize(1); -// assertThat(attribute.getValueTypes().get(0)).isEqualTo("DataProcessorObject.ЖурналРегистрации"); -// -// assertThat(formData.getCommands()).hasSize(8) -// .anyMatch(formCommand -> formCommand.getName().equals("ВыгрузитьЖурналДляПередачиВТехподдержку") -// && formCommand.getAction().equals("ВыгрузитьЖурналДляПередачиВТехподдержку")); -// -// } + @ParameterizedTest + @CsvSource( + { + "true, ssl_3_2, DataProcessors.ЗагрузкаКурсовВалют, _edt", + "false, ssl_3_2, DataProcessors.ЗагрузкаКурсовВалют" + } + ) + void testSSL32(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(DataProcessor.class); + var dataProcessor = (DataProcessor) mdo; + + // FormOwner + assertThat(dataProcessor.getDefaultFormMap()).hasSize(2); + + var formLink = dataProcessor.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM); + assertThat(formLink) + .isEqualTo(dataProcessor.getDefaultFormMap().get(DefaultFormKind.DEFAULT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + var form = dataProcessor.getDefaultForm(DefaultFormKind.DEFAULT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("Форма"); + var formByLink = dataProcessor.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("Форма"); + + assertThat(dataProcessor.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(dataProcessor.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(dataProcessor.getFormByLink(MdoReference.create("DataProcessor.Unknown.Form.Unknown"))).isEmpty(); + } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentJournalTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentJournalTest.java index 66eef4578..d8e26957e 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentJournalTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentJournalTest.java @@ -21,25 +21,103 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; +import static org.assertj.core.api.Assertions.assertThat; + class DocumentJournalTest { @ParameterizedTest @CsvSource( { "true, mdclasses, DocumentJournals.ЖурналДокументов1, _edt", - "false, mdclasses, DocumentJournals.ЖурналДокументов1", + "false, mdclasses, DocumentJournals.ЖурналДокументов1" + } + ) + void test(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(DocumentJournal.class); + var documentJournal = (DocumentJournal) mdo; + + // FormOwner + assertThat(documentJournal.getDefaultFormMap()).hasSize(2); + + assertThat(documentJournal.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(documentJournal.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(documentJournal.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(documentJournal.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(documentJournal.getFormByLink(MdoReference.create("DocumentJournal.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { "true, ssl_3_1, DocumentJournals.Взаимодействия, _edt", - "false, ssl_3_1, DocumentJournals.Взаимодействия", + "false, ssl_3_1, DocumentJournals.Взаимодействия" + } + ) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(DocumentJournal.class); + var documentJournal = (DocumentJournal) mdo; + + // FormOwner + assertThat(documentJournal.getDefaultFormMap()).hasSize(2); + + var formLink = documentJournal.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM); + assertThat(formLink).isEqualTo(documentJournal.getDefaultFormMap().get(DefaultFormKind.DEFAULT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = documentJournal.getDefaultForm(DefaultFormKind.DEFAULT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("ФормаСписка"); + + var formByLink = documentJournal.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("ФормаСписка"); + + assertThat(documentJournal.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(documentJournal.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(documentJournal.getFormByLink(MdoReference.create("DocumentJournal.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { "true, ssl_3_2, DocumentJournals.Взаимодействия, _edt", "false, ssl_3_2, DocumentJournals.Взаимодействия" } ) - void test(ArgumentsAccessor argumentsAccessor) { + void testSSL32(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(DocumentJournal.class); + var documentJournal = (DocumentJournal) mdo; + + // FormOwner + assertThat(documentJournal.getDefaultFormMap()).hasSize(2); + + var formLink = documentJournal.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM); + assertThat(formLink).isEqualTo(documentJournal.getDefaultFormMap().get(DefaultFormKind.DEFAULT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = documentJournal.getDefaultForm(DefaultFormKind.DEFAULT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("ФормаСписка"); + + var formByLink = documentJournal.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("ФормаСписка"); + + assertThat(documentJournal.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(documentJournal.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(documentJournal.getFormByLink(MdoReference.create("DocumentJournal.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentTest.java index a8d339b69..06ef13959 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/DocumentTest.java @@ -22,7 +22,9 @@ package com.github._1c_syntax.bsl.mdo; import com.github._1c_syntax.bsl.mdo.storage.form.FormElementType; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; @@ -41,6 +43,25 @@ class DocumentTest { ) void testSSL(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + var doc = (Document) mdo; + + // FormOwner + assertThat(doc.getDefaultFormMap()).hasSize(6); + + // Для форм, которые есть в фикстуре + var formLink = doc.getDefaultFormLink(DefaultFormKind.OBJECT_FORM); + assertThat(formLink).isEqualTo(doc.getDefaultFormMap().get(DefaultFormKind.OBJECT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + assertThat(doc.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isPresent(); + assertThat(doc.getFormByLink(formLink)).isPresent(); + + // Для форм, которых нет в фикстуре + assertThat(doc.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(doc.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(doc.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(doc.getFormByLink(MdoReference.create("Document.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest @@ -78,5 +99,25 @@ void test(ArgumentsAccessor argumentsAccessor) { .anyMatch(item -> item.getId() == 35) .anyMatch(item -> item.getType().equals(FormElementType.INPUT_FIELD)) .anyMatch(item -> item.getDataPath().startsWith("~")); + + assertThat(doc.getDefaultFormMap()).hasSize(6); + + // Для форм, которые есть в фикстуре + var formLink = doc.getDefaultFormLink(DefaultFormKind.OBJECT_FORM); + assertThat(formLink).isEqualTo(doc.getDefaultFormMap().get(DefaultFormKind.OBJECT_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = doc.getDefaultForm(DefaultFormKind.OBJECT_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("ФормаДокумента"); + + var formByLink = doc.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("ФормаДокумента"); + + // Для форм, которых нет в фикстуре + assertThat(doc.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(doc.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(doc.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); } } diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/EnumTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/EnumTest.java index 1eb9cc73a..e0daf0388 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/EnumTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/EnumTest.java @@ -21,6 +21,7 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; import com.github._1c_syntax.bsl.types.MdoReference; import com.github._1c_syntax.bsl.types.ScriptVariant; @@ -35,11 +36,7 @@ class EnumTest { @CsvSource( { "true, mdclasses, Enums.Перечисление1, _edt", - "false, mdclasses, Enums.Перечисление1", - "true, ssl_3_1, Enums.СтатусыОбработчиковОбновления, _edt", - "false, ssl_3_1, Enums.СтатусыОбработчиковОбновления", - "true, ssl_3_2, Enums.СтатусыОбработчиковОбновления, _edt", - "false, ssl_3_2, Enums.СтатусыОбработчиковОбновления" + "false, mdclasses, Enums.Перечисление1" } ) void test(ArgumentsAccessor argumentsAccessor) { @@ -55,5 +52,69 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(mdo.getMdoRef(ScriptVariant.RUSSIAN)).isEqualTo(mdoRefStringRu); assertThat(mdo.getMdoRef()).isEqualTo(mdo.getMdoRef(ScriptVariant.ENGLISH)); + + // FormOwner + assertThat(mdo).isInstanceOf(Enum.class); + var anEnum = (Enum) mdo; + assertThat(anEnum.getDefaultFormMap()).hasSize(4); + + assertThat(anEnum.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(anEnum.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + assertThat(anEnum.getDefaultForm(DefaultFormKind.CHOICE_FORM)).isEmpty(); + assertThat(anEnum.getDefaultFormLink(DefaultFormKind.AUX_LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(anEnum.getDefaultForm(DefaultFormKind.AUX_LIST_FORM)).isEmpty(); + assertThat(anEnum.getDefaultForm(DefaultFormKind.AUX_CHOICE_FORM)).isEmpty(); + + assertThat(anEnum.getFormByLink(MdoReference.create("Enum.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { + "true, ssl_3_1, Enums.СтатусыОбработчиковОбновления, _edt", + "false, ssl_3_1, Enums.СтатусыОбработчиковОбновления" + } + ) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(Enum.class); + var anEnum = (Enum) mdo; + + // FormOwner + assertThat(anEnum.getDefaultFormMap()).hasSize(4); + + assertThat(anEnum.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(anEnum.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + assertThat(anEnum.getDefaultForm(DefaultFormKind.CHOICE_FORM)).isEmpty(); + assertThat(anEnum.getDefaultFormLink(DefaultFormKind.AUX_LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(anEnum.getDefaultForm(DefaultFormKind.AUX_LIST_FORM)).isEmpty(); + assertThat(anEnum.getDefaultForm(DefaultFormKind.AUX_CHOICE_FORM)).isEmpty(); + + assertThat(anEnum.getFormByLink(MdoReference.create("Enum.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { + "true, ssl_3_2, Enums.СтатусыОбработчиковОбновления, _edt", + "false, ssl_3_2, Enums.СтатусыОбработчиковОбновления" + } + ) + void testSSL32(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(Enum.class); + var anEnum = (Enum) mdo; + + // FormOwner + assertThat(anEnum.getDefaultFormMap()).hasSize(4); + + assertThat(anEnum.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(anEnum.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + assertThat(anEnum.getDefaultForm(DefaultFormKind.CHOICE_FORM)).isEmpty(); + assertThat(anEnum.getDefaultFormLink(DefaultFormKind.AUX_LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(anEnum.getDefaultForm(DefaultFormKind.AUX_LIST_FORM)).isEmpty(); + assertThat(anEnum.getDefaultForm(DefaultFormKind.AUX_CHOICE_FORM)).isEmpty(); + + assertThat(anEnum.getFormByLink(MdoReference.create("Enum.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/ExchangePlanTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/ExchangePlanTest.java index eb92b8537..62feaccb9 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/ExchangePlanTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/ExchangePlanTest.java @@ -22,6 +22,7 @@ package com.github._1c_syntax.bsl.mdo; import com.github._1c_syntax.bsl.mdo.support.AutoRecordType; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; @@ -54,6 +55,19 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(exchangePlan.autoRecord(mdo1)).isEqualTo(AutoRecordType.ALLOW); assertThat(exchangePlan.autoRecord(mdo2)).isEqualTo(AutoRecordType.DENY); assertThat(exchangePlan.autoRecord(mdo3)).isEqualTo(AutoRecordType.DENY); + + // FormOwner + assertThat(exchangePlan.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре (все формы пустые) + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(exchangePlan.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(exchangePlan.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(exchangePlan.getFormByLink(MdoReference.create("ExchangePlan.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest @@ -81,6 +95,19 @@ void testSSL_3_1(ArgumentsAccessor argumentsAccessor) { assertThat(exchangePlan.isDistributedInfoBase()).isFalse(); assertThat(exchangePlan.isIncludeConfigurationExtensions()).isFalse(); assertThat(exchangePlan.getContent()).hasSize(414); + + // FormOwner + assertThat(exchangePlan.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре (все формы пустые) + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(exchangePlan.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(exchangePlan.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(exchangePlan.getFormByLink(MdoReference.create("ExchangePlan.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest @@ -108,5 +135,18 @@ void testSSL_3_2(ArgumentsAccessor argumentsAccessor) { assertThat(exchangePlan.isDistributedInfoBase()).isFalse(); assertThat(exchangePlan.isIncludeConfigurationExtensions()).isFalse(); assertThat(exchangePlan.getContent()).hasSize(408); + + // FormOwner + assertThat(exchangePlan.getDefaultFormMap()).hasSize(6); + + // Для форм, которых нет в фикстуре (все формы пустые) + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(exchangePlan.getDefaultForm(DefaultFormKind.OBJECT_FORM)).isEmpty(); + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.AUX_OBJECT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(exchangePlan.getDefaultForm(DefaultFormKind.AUX_OBJECT_FORM)).isEmpty(); + assertThat(exchangePlan.getDefaultFormLink(DefaultFormKind.FOLDER_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(exchangePlan.getFormByLink(MdoReference.create("ExchangePlan.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/FilterCriterionTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/FilterCriterionTest.java index 268e99062..6de185fb4 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/FilterCriterionTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/FilterCriterionTest.java @@ -21,24 +21,82 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; +import static org.assertj.core.api.Assertions.assertThat; + class FilterCriterionTest { @ParameterizedTest @CsvSource( { "true, mdclasses, FilterCriteria.КритерийОтбора1, _edt", - "false, mdclasses, FilterCriteria.КритерийОтбора1", + "false, mdclasses, FilterCriteria.КритерийОтбора1" + } + ) + void test(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(FilterCriterion.class); + var filterCriterion = (FilterCriterion) mdo; + + // FormOwner + assertThat(filterCriterion.getDefaultFormMap()).hasSize(2); + + assertThat(filterCriterion.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(filterCriterion.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(filterCriterion.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(filterCriterion.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(filterCriterion.getFormByLink(MdoReference.create("FilterCriterion.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { "true, ssl_3_1, FilterCriteria.СвязанныеДокументы, _edt", - "false, ssl_3_1, FilterCriteria.СвязанныеДокументы", + "false, ssl_3_1, FilterCriteria.СвязанныеДокументы" + } + ) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(FilterCriterion.class); + var filterCriterion = (FilterCriterion) mdo; + + // FormOwner + assertThat(filterCriterion.getDefaultFormMap()).hasSize(2); + + assertThat(filterCriterion.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(filterCriterion.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(filterCriterion.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(filterCriterion.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(filterCriterion.getFormByLink(MdoReference.create("FilterCriterion.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { "true, ssl_3_2, FilterCriteria.СвязанныеДокументы, _edt", "false, ssl_3_2, FilterCriteria.СвязанныеДокументы" } ) - void test(ArgumentsAccessor argumentsAccessor) { + void testSSL32(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(FilterCriterion.class); + var filterCriterion = (FilterCriterion) mdo; + + // FormOwner + assertThat(filterCriterion.getDefaultFormMap()).hasSize(2); + + assertThat(filterCriterion.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(filterCriterion.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(filterCriterion.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(filterCriterion.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + + assertThat(filterCriterion.getFormByLink(MdoReference.create("FilterCriterion.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/InformationRegisterTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/InformationRegisterTest.java index c0cc78ff5..cb31e0616 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/InformationRegisterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/InformationRegisterTest.java @@ -21,28 +21,97 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; +import static org.assertj.core.api.Assertions.assertThat; + class InformationRegisterTest { @ParameterizedTest @CsvSource( { "true, mdclasses, InformationRegisters.РегистрСведений1, _edt", - "false, mdclasses, InformationRegisters.РегистрСведений1", - "true, ssl_3_1, InformationRegisters.ЭлектронныеПодписи, _edt", - "false, ssl_3_1, InformationRegisters.ЭлектронныеПодписи", - "true, ssl_3_1, InformationRegisters.СклоненияПредставленийОбъектов, _edt", - "false, ssl_3_1, InformationRegisters.СклоненияПредставленийОбъектов", - "true, ssl_3_2, InformationRegisters.ЭлектронныеПодписи, _edt", - "false, ssl_3_2, InformationRegisters.ЭлектронныеПодписи", - "true, ssl_3_2, InformationRegisters.СклоненияПредставленийОбъектов, _edt", - "false, ssl_3_2, InformationRegisters.СклоненияПредставленийОбъектов" + "false, mdclasses, InformationRegisters.РегистрСведений1" } ) void test(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(InformationRegister.class); + var ir = (InformationRegister) mdo; + + // FormOwner + assertThat(ir.getDefaultFormMap()).hasSize(4); + + // Для форм, которых нет в фикстуре + assertThat(ir.getDefaultFormLink(DefaultFormKind.RECORD_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(ir.getDefaultForm(DefaultFormKind.RECORD_FORM)).isEmpty(); + assertThat(ir.getDefaultFormLink(DefaultFormKind.AUX_RECORD_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(ir.getDefaultForm(DefaultFormKind.AUX_RECORD_FORM)).isEmpty(); + assertThat(ir.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(ir.getFormByLink(MdoReference.create("InformationRegister.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource({ + "true, ssl_3_1, InformationRegisters.ЭлектронныеПодписи, _edt", + "false, ssl_3_1, InformationRegisters.ЭлектронныеПодписи", + "true, ssl_3_2, InformationRegisters.ЭлектронныеПодписи, _edt", + "false, ssl_3_2, InformationRegisters.ЭлектронныеПодписи" + }) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(InformationRegister.class); + var ir = (InformationRegister) mdo; + + // FormOwner + assertThat(ir.getDefaultFormMap()).hasSize(4); + + // Для форм, которых нет в фикстуре + assertThat(ir.getDefaultFormLink(DefaultFormKind.RECORD_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(ir.getDefaultForm(DefaultFormKind.RECORD_FORM)).isEmpty(); + assertThat(ir.getDefaultFormLink(DefaultFormKind.AUX_RECORD_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(ir.getDefaultForm(DefaultFormKind.AUX_RECORD_FORM)).isEmpty(); + assertThat(ir.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + + // getFormByLink с несуществующей ссылкой + assertThat(ir.getFormByLink(MdoReference.create("InformationRegister.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource({ + "true, ssl_3_1, InformationRegisters.СклоненияПредставленийОбъектов, _edt", + "false, ssl_3_1, InformationRegisters.СклоненияПредставленийОбъектов", + "true, ssl_3_2, InformationRegisters.СклоненияПредставленийОбъектов, _edt", + "false, ssl_3_2, InformationRegisters.СклоненияПредставленийОбъектов" + }) + void testСклонения(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(InformationRegister.class); + var ir = (InformationRegister) mdo; + + // FormOwner + assertThat(ir.getDefaultFormMap()).hasSize(4); + + // Для форм, которые есть в фикстуре + var formLink = ir.getDefaultFormLink(DefaultFormKind.RECORD_FORM); + assertThat(formLink).isEqualTo(ir.getDefaultFormMap().get(DefaultFormKind.RECORD_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + assertThat(ir.getDefaultForm(DefaultFormKind.RECORD_FORM)).isPresent(); + assertThat(ir.getFormByLink(formLink)).isPresent(); + + // Для форм, которых нет в фикстуре + assertThat(ir.getDefaultFormLink(DefaultFormKind.AUX_RECORD_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(ir.getDefaultForm(DefaultFormKind.AUX_RECORD_FORM)).isEmpty(); + assertThat(ir.getDefaultFormLink(DefaultFormKind.LIST_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(ir.getDefaultForm(DefaultFormKind.LIST_FORM)).isEmpty(); + + // getFormByLink с несуществующей ссылкой + assertThat(ir.getFormByLink(MdoReference.create("InformationRegister.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/ReportTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/ReportTest.java index c9dbba24f..037734340 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/ReportTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/ReportTest.java @@ -23,7 +23,9 @@ import com.github._1c_syntax.bsl.mdo.storage.DataCompositionSchema; import com.github._1c_syntax.bsl.mdo.support.DataSetType; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; @@ -50,19 +52,71 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(templateData).isInstanceOf(DataCompositionSchema.class); checkDataCompositionSchema((DataCompositionSchema) templateData); + + // FormOwner + assertThat(report.getDefaultFormMap()).hasSize(5); + + assertThat(report.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(report.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.SETTINGS_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.VARIANT_FORM)).isEmpty(); + assertThat(report.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(report.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.AUX_SETTINGS_FORM)).isEmpty(); + + assertThat(report.getFormByLink(MdoReference.create("Report.Unknown.Form.Unknown"))).isEmpty(); } @ParameterizedTest @CsvSource( { "true, ssl_3_1, Reports.АнализВерсийОбъектов, _edt", - "false, ssl_3_1, Reports.АнализВерсийОбъектов", + "false, ssl_3_1, Reports.АнализВерсийОбъектов" + } + ) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(Report.class); + var report = (Report) mdo; + + // FormOwner + assertThat(report.getDefaultFormMap()).hasSize(5); + + assertThat(report.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(report.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.SETTINGS_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.VARIANT_FORM)).isEmpty(); + assertThat(report.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(report.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.AUX_SETTINGS_FORM)).isEmpty(); + + assertThat(report.getFormByLink(MdoReference.create("Report.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { "true, ssl_3_2, Reports.АнализВерсийОбъектов, _edt", "false, ssl_3_2, Reports.АнализВерсийОбъектов" } ) - void testSSL(ArgumentsAccessor argumentsAccessor) { + void testSSL32(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(Report.class); + var report = (Report) mdo; + + // FormOwner + assertThat(report.getDefaultFormMap()).hasSize(5); + + assertThat(report.getDefaultFormLink(DefaultFormKind.DEFAULT_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(report.getDefaultForm(DefaultFormKind.DEFAULT_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.SETTINGS_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.VARIANT_FORM)).isEmpty(); + assertThat(report.getDefaultFormLink(DefaultFormKind.AUX_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(report.getDefaultForm(DefaultFormKind.AUX_FORM)).isEmpty(); + assertThat(report.getDefaultForm(DefaultFormKind.AUX_SETTINGS_FORM)).isEmpty(); + + assertThat(report.getFormByLink(MdoReference.create("Report.Unknown.Form.Unknown"))).isEmpty(); } private void checkDataCompositionSchema(DataCompositionSchema dataCompositionSchema) { diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/SettingsStorageTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/SettingsStorageTest.java index 2d58882cc..1aba14e17 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/SettingsStorageTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/SettingsStorageTest.java @@ -21,23 +21,84 @@ */ package com.github._1c_syntax.bsl.mdo; +import com.github._1c_syntax.bsl.mdo.support.DefaultFormKind; import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.types.MdoReference; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.aggregator.ArgumentsAccessor; import org.junit.jupiter.params.provider.CsvSource; +import static org.assertj.core.api.Assertions.assertThat; + class SettingsStorageTest { @ParameterizedTest @CsvSource( { "true, ssl_3_1, SettingsStorages.ХранилищеВариантовОтчетов, _edt", - "false, ssl_3_1, SettingsStorages.ХранилищеВариантовОтчетов", + "false, ssl_3_1, SettingsStorages.ХранилищеВариантовОтчетов" + } + ) + void testSSL(ArgumentsAccessor argumentsAccessor) { + var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(SettingsStorage.class); + var settingsStorage = (SettingsStorage) mdo; + + // FormOwner + assertThat(settingsStorage.getDefaultFormMap()).hasSize(4); + + var formLink = settingsStorage.getDefaultFormLink(DefaultFormKind.SAVE_FORM); + assertThat(formLink) + .isEqualTo(settingsStorage.getDefaultFormMap().get(DefaultFormKind.SAVE_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = settingsStorage.getDefaultForm(DefaultFormKind.SAVE_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("СохранениеВариантаОтчета"); + + var formByLink = settingsStorage.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("СохранениеВариантаОтчета"); + + assertThat(settingsStorage.getDefaultFormLink(DefaultFormKind.AUX_SAVE_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(settingsStorage.getDefaultForm(DefaultFormKind.AUX_SAVE_FORM)).isEmpty(); + assertThat(settingsStorage.getDefaultForm(DefaultFormKind.AUX_LOAD_FORM)).isEmpty(); + + assertThat(settingsStorage.getFormByLink(MdoReference.create("SettingsStorage.Unknown.Form.Unknown"))).isEmpty(); + } + + @ParameterizedTest + @CsvSource( + { "true, ssl_3_2, SettingsStorages.ХранилищеВариантовОтчетов, _edt", "false, ssl_3_2, SettingsStorages.ХранилищеВариантовОтчетов" } ) - void test(ArgumentsAccessor argumentsAccessor) { + void testSSL32(ArgumentsAccessor argumentsAccessor) { var mdo = MDTestUtils.getMDWithSimpleTest(argumentsAccessor); + assertThat(mdo).isInstanceOf(SettingsStorage.class); + var settingsStorage = (SettingsStorage) mdo; + + // FormOwner + assertThat(settingsStorage.getDefaultFormMap()).hasSize(4); + + var formLink = settingsStorage.getDefaultFormLink(DefaultFormKind.SAVE_FORM); + assertThat(formLink) + .isEqualTo(settingsStorage.getDefaultFormMap().get(DefaultFormKind.SAVE_FORM)); + assertThat(formLink.isEmpty()).isFalse(); + + var form = settingsStorage.getDefaultForm(DefaultFormKind.SAVE_FORM); + assertThat(form).isPresent(); + assertThat(form.get().getName()).isEqualTo("СохранениеВариантаОтчета"); + + var formByLink = settingsStorage.getFormByLink(formLink); + assertThat(formByLink).isPresent(); + assertThat(formByLink.get().getName()).isEqualTo("СохранениеВариантаОтчета"); + + assertThat(settingsStorage.getDefaultFormLink(DefaultFormKind.AUX_SAVE_FORM)).isEqualTo(MdoReference.EMPTY); + assertThat(settingsStorage.getDefaultForm(DefaultFormKind.AUX_SAVE_FORM)).isEmpty(); + assertThat(settingsStorage.getDefaultForm(DefaultFormKind.AUX_LOAD_FORM)).isEmpty(); + + assertThat(settingsStorage.getFormByLink(MdoReference.create("SettingsStorage.Unknown.Form.Unknown"))).isEmpty(); } } \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java b/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java index 7d2ea9986..9ccec5bc3 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java +++ b/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java @@ -103,6 +103,7 @@ public String createJson(Object obj) { xstream.omitField(clazz, "modulesByMDORef"); xstream.omitField(clazz, "modulesByObject"); xstream.omitField(clazz, "modulesByURI"); + xstream.omitField(clazz, "defaultFormMap"); } if (CommonModule.class.isAssignableFrom(clazz)) { xstream.omitField(clazz, "modules"); diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" index 679b81b80..a83ca5487 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" @@ -52,14 +52,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -77,9 +70,33 @@ "fillFromFillingValue": false } ], + "auxiliaryForm": { + "type": "FORM", + "mdoRef": "ExternalDataProcessor.ТестоваяВнешняяОбработка.Form.ОбычнаяФорма", + "mdoRefRu": "ВнешняяОбработка.ТестоваяВнешняяОбработка.Форма.ОбычнаяФорма" + }, + "auxiliarySettingsForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/auxiliarySettingsForm" + }, "commands": [], "comment": "", "configurationSource": "DESIGNER", + "defaultForm": { + "type": "FORM", + "mdoRef": "ExternalDataProcessor.ТестоваяВнешняяОбработка.Form.Форма", + "mdoRefRu": "ВнешняяОбработка.ТестоваяВнешняяОбработка.Форма.Форма" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/auxiliarySettingsForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/auxiliarySettingsForm" + }, "description": "Тестовая внешняя обработка", "forms": [ [ diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" index 8c4907528..a2d5559de 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" @@ -52,14 +52,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -77,9 +70,33 @@ "fillFromFillingValue": false } ], + "auxiliaryForm": { + "type": "FORM", + "mdoRef": "ExternalDataProcessor.ТестоваяВнешняяОбработка.Form.ОбычнаяФорма", + "mdoRefRu": "ВнешняяОбработка.ТестоваяВнешняяОбработка.Форма.ОбычнаяФорма" + }, + "auxiliarySettingsForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/auxiliarySettingsForm" + }, "commands": [], "comment": "", "configurationSource": "EDT", + "defaultForm": { + "type": "FORM", + "mdoRef": "ExternalDataProcessor.ТестоваяВнешняяОбработка.Form.Форма", + "mdoRefRu": "ВнешняяОбработка.ТестоваяВнешняяОбработка.Форма.Форма" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/auxiliarySettingsForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/auxiliarySettingsForm" + }, "description": "Тестовая внешняя обработка", "forms": [ [ diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" index 29c42f64d..12dd181e5 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" @@ -52,14 +52,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -77,9 +70,39 @@ "fillFromFillingValue": false } ], + "auxiliaryForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаОтчета1", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаОтчета1" + }, + "auxiliarySettingsForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаНастроек1", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаНастроек1" + }, + "auxiliaryVariantForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "configurationSource": "DESIGNER", + "defaultForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаОтчета", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаОтчета" + }, + "defaultSettingsForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаНастроек", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаНастроек" + }, + "defaultVariantForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаВарианта", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаВарианта" + }, "description": "Тестовый внешний отчет", "forms": [ [ diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" index dbcf88a3b..549bc61e5 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" @@ -52,14 +52,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -77,9 +70,39 @@ "fillFromFillingValue": false } ], + "auxiliaryForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаОтчета1", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаОтчета1" + }, + "auxiliarySettingsForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаНастроек1", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаНастроек1" + }, + "auxiliaryVariantForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "configurationSource": "EDT", + "defaultForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаОтчета", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаОтчета" + }, + "defaultSettingsForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаНастроек", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаНастроек" + }, + "defaultVariantForm": { + "type": "FORM", + "mdoRef": "ExternalReport.ТестовыйВнешнийОтчет.Form.ФормаВарианта", + "mdoRefRu": "ВнешнийОтчет.ТестовыйВнешнийОтчет.Форма.ФормаВарианта" + }, "description": "Тестовый внешний отчет", "forms": [ [ diff --git "a/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" "b/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" index 6c1a7fddf..b95f36030 100644 --- "a/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" +++ "b/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -150,14 +149,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -344,8 +336,16 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccountingRegister/auxiliaryListForm" + }, "description": "Регистр бухгалтерии", "dimensions": [ { @@ -387,14 +387,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -470,14 +463,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" "b/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" index a222220ca..5d69fdd77 100644 --- "a/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" +++ "b/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" @@ -91,14 +91,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -156,8 +149,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -255,8 +247,16 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccumulationRegister/auxiliaryListForm" + }, "description": "Регистр накопления", "dimensions": [ { @@ -298,14 +298,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -381,14 +374,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" index 02c75afb4..2b1d4a05c 100644 --- "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" +++ "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" @@ -144,14 +144,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -208,8 +201,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -358,8 +350,28 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "description": "БизнесПроцесс1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" diff --git "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" index ba6d4e306..80d8f2011 100644 --- "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" @@ -144,14 +144,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -208,8 +201,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -358,8 +350,28 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "description": "БизнесПроцесс1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" diff --git "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" index 312dd6c61..2c58a02a1 100644 --- "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" @@ -38,14 +38,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -336,8 +329,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -507,8 +499,16 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.CalculationRegister/auxiliaryListForm" + }, "description": "РегистрРасчета1", "dimensions": [ { @@ -550,14 +550,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -675,14 +668,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" index 632c6956a..3b92aa647 100644 --- "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" @@ -38,14 +38,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -336,8 +329,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -507,8 +499,16 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.CalculationRegister/auxiliaryListForm" + }, "description": "РегистрРасчета1", "dimensions": [ { @@ -550,14 +550,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -675,14 +668,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" index 07c2f2f2b..0d4332aff 100644 --- "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" +++ "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" @@ -42,14 +42,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -106,14 +99,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -218,14 +204,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -479,8 +458,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -537,8 +515,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -600,6 +577,23 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WHOLE_CATALOG", "commands": [ @@ -634,6 +628,27 @@ } ], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + }, "description": "Справочник1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/synonym" @@ -644,9 +659,7 @@ "uuid": "175b035e-ee35-4fdf-a8b4-c30ce49dee61", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", - "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -670,7 +683,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Forms/ФормаЭлемента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "supportVariant": "NONE", "isProtected": false @@ -823,9 +836,7 @@ "uuid": "1feb8a5b-989e-440d-afe3-9472183c335c", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", - "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -849,7 +860,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "supportVariant": "NONE", "isProtected": false @@ -950,9 +961,7 @@ "uuid": "3b3346ea-1b32-4a2c-b3a6-1a9651659f0c", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", - "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -976,7 +985,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Forms/ФормаВыбора/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "supportVariant": "NONE", "isProtected": false @@ -1157,15 +1166,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin" + "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl" ] ] ], @@ -1380,8 +1389,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" index 1dbde7053..6c99d3295 100644 --- "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" @@ -42,14 +42,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -106,14 +99,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -218,14 +204,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -479,8 +458,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -537,8 +515,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -600,6 +577,23 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WHOLE_CATALOG", "commands": [ @@ -634,6 +628,27 @@ } ], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + }, "description": "Справочник1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/synonym" @@ -644,9 +659,7 @@ "uuid": "175b035e-ee35-4fdf-a8b4-c30ce49dee61", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", - "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -670,7 +683,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/Forms/ФормаЭлемента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "supportVariant": "NONE", "isProtected": false @@ -823,9 +836,7 @@ "uuid": "1feb8a5b-989e-440d-afe3-9472183c335c", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", - "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -849,7 +860,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "supportVariant": "NONE", "isProtected": false @@ -950,9 +961,7 @@ "uuid": "3b3346ea-1b32-4a2c-b3a6-1a9651659f0c", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", - "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -976,7 +985,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/Forms/ФормаВыбора/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "supportVariant": "NONE", "isProtected": false @@ -1157,15 +1166,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl" ] ] ], @@ -1380,8 +1389,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" index 4598c82d6..17cc912b9 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" @@ -182,8 +182,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -241,8 +240,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -371,14 +369,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -436,8 +427,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -535,10 +525,30 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, "description": "ПланСчетов1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" index d5458c1a9..05f3017a3 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" @@ -182,8 +182,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -241,8 +240,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -371,14 +369,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -436,8 +427,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -535,10 +525,30 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/auxiliaryChoiceForm" + }, "description": "ПланСчетов1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCalculationTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCalculationTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" index 6f196f105..77c0b09ab 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCalculationTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCalculationTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" @@ -145,8 +145,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -275,14 +274,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -339,8 +331,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -364,8 +355,28 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes/auxiliaryChoiceForm" + }, "description": "ПланВидовРасчета1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCalculationTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" index 1e1d535c0..5586d8862 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" @@ -145,8 +145,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -311,14 +310,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -376,8 +368,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -434,14 +425,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -465,10 +449,42 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "description": "ПланВидовХарактеристик1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -480,15 +496,15 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" index d3f4ffdb5..3367aea14 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" @@ -145,8 +145,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -311,14 +310,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -376,8 +368,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -434,14 +425,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -465,10 +449,42 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "description": "ПланВидовХарактеристик1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -480,15 +496,15 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/mdclasses/CommonAttributes.\320\236\320\261\321\211\320\270\320\271\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\2021.json" "b/src/test/resources/fixtures/mdclasses/CommonAttributes.\320\236\320\261\321\211\320\270\320\271\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\2021.json" index 44fd464f4..4baa9cb46 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonAttributes.\320\236\320\261\321\211\320\270\320\271\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonAttributes.\320\236\320\261\321\211\320\270\320\271\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\2021.json" @@ -82,14 +82,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git a/src/test/resources/fixtures/mdclasses/Configuration.json b/src/test/resources/fixtures/mdclasses/Configuration.json index 642893e8a..79421ad46 100644 --- a/src/test/resources/fixtures/mdclasses/Configuration.json +++ b/src/test/resources/fixtures/mdclasses/Configuration.json @@ -117,8 +117,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -165,14 +164,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -184,6 +176,14 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -280,6 +280,12 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -321,6 +327,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" }, @@ -411,6 +435,12 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "recalculations": [ { "uuid": "16b54095-8711-4ef1-a38b-93d12f6f6e93", @@ -566,6 +596,42 @@ } } ], + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + }, + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [ { "uuid": "79adb5f1-7224-4404-98a7-d7ed155f6232", @@ -626,6 +692,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "accountingFlags": [ { @@ -740,6 +824,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -777,6 +879,36 @@ "type": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/type" }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -826,15 +958,13 @@ "indexing": "DONT_INDEX", "dataSeparation": "DONT_USE", "dataSeparationValue": { - "type": "UNKNOWN", - "mdoRef": "", - "mdoRefRu": "" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "dataSeparationUse": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "conditionalSeparation": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "usersSeparation": "DONT_USE", "authenticationSeparation": "DONT_USE", @@ -1005,6 +1135,14 @@ [] ], "templates": [], + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.Обработка1.Form.Форма", + "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -1105,6 +1243,12 @@ ], "forms": [], "templates": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "registeredDocuments": [ { "type": "DOCUMENT", @@ -1195,6 +1339,30 @@ [] ], "templates": [], + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаДокумента", + "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаСписка", + "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + }, + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаВыбора", + "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "registerRecords": [ [ 4 @@ -1256,6 +1424,18 @@ ], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" } } ], @@ -1330,6 +1510,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "distributedInfoBase": false, "includeConfigurationExtensions": false, @@ -1485,6 +1683,18 @@ } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "dataLockControlMode": "MANAGED" } ], @@ -1515,6 +1725,12 @@ ], "commands": [], "forms": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "content": [ [ 2 @@ -1674,13 +1890,13 @@ ] ], [ - "ManagedApplicationModule", + "ExternalConnectionModule", [ 1 ] ], [ - "ExternalConnectionModule", + "ManagedApplicationModule", [ 1 ] @@ -1755,6 +1971,21 @@ ], [] ], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -1928,7 +2159,19 @@ 1 ], "forms": [], - "templates": [] + "templates": [], + "defaultSaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + } } ], "styleItems": [ @@ -2062,10 +2305,28 @@ "extendedEdit": false, "fillFromFillingValue": false, "choiceForm": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } diff --git a/src/test/resources/fixtures/mdclasses/Configuration_edt.json b/src/test/resources/fixtures/mdclasses/Configuration_edt.json index 2b64aa343..be16e6cc7 100644 --- a/src/test/resources/fixtures/mdclasses/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses/Configuration_edt.json @@ -117,8 +117,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -165,14 +164,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -184,6 +176,14 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -280,6 +280,12 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -321,6 +327,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" }, @@ -411,6 +435,12 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "recalculations": [ { "uuid": "16b54095-8711-4ef1-a38b-93d12f6f6e93", @@ -566,6 +596,42 @@ } } ], + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + }, + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [ { "uuid": "79adb5f1-7224-4404-98a7-d7ed155f6232", @@ -626,6 +692,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "accountingFlags": [ { @@ -740,6 +824,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -777,6 +879,36 @@ "type": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/type" }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -826,15 +958,13 @@ "indexing": "DONT_INDEX", "dataSeparation": "DONT_USE", "dataSeparationValue": { - "type": "UNKNOWN", - "mdoRef": "", - "mdoRefRu": "" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "dataSeparationUse": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "conditionalSeparation": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "usersSeparation": "DONT_USE", "authenticationSeparation": "DONT_USE", @@ -1005,6 +1135,14 @@ [] ], "templates": [], + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.Обработка1.Form.Форма", + "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -1105,6 +1243,12 @@ ], "forms": [], "templates": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "registeredDocuments": [ { "type": "DOCUMENT", @@ -1195,6 +1339,30 @@ [] ], "templates": [], + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаДокумента", + "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаСписка", + "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + }, + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаВыбора", + "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "registerRecords": [ [ 4 @@ -1256,6 +1424,18 @@ ], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" } } ], @@ -1330,6 +1510,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "distributedInfoBase": false, "includeConfigurationExtensions": false, @@ -1485,6 +1683,18 @@ } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "dataLockControlMode": "MANAGED" } ], @@ -1515,6 +1725,12 @@ ], "commands": [], "forms": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "content": [ [ 2 @@ -1669,13 +1885,13 @@ ] ], [ - "ManagedApplicationModule", + "ExternalConnectionModule", [ 1 ] ], [ - "ExternalConnectionModule", + "ManagedApplicationModule", [ 1 ] @@ -1750,6 +1966,21 @@ ], [] ], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -1923,7 +2154,19 @@ 1 ], "forms": [], - "templates": [] + "templates": [], + "defaultSaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + } } ], "styleItems": [ @@ -2030,10 +2273,28 @@ "extendedEdit": false, "fillFromFillingValue": false, "choiceForm": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } diff --git "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" index 8c431b1ad..f98fc0417 100644 --- "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" @@ -90,14 +90,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" index d93e6fe36..152a8e18a 100644 --- "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" @@ -90,14 +90,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.json" "b/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.json" index f7a831f69..f88aa05f8 100644 --- "a/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.json" @@ -1,7 +1,17 @@ {"com.github._1c_syntax.bsl.mdo.DataProcessor": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.Обработка1.Form.Форма", + "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + }, "description": "Обработка1", "explanation": { "content": [] @@ -12,9 +22,7 @@ "uuid": "5a32de80-b66f-4d6d-be8b-a117f5f71480", "name": "Форма", "mdoReference": { - "type": "FORM", - "mdoRef": "DataProcessor.Обработка1.Form.Форма", - "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -38,7 +46,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/DataProcessors/Обработка1/Forms/Форма/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "supportVariant": "NONE", "isProtected": false @@ -157,14 +165,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -194,14 +195,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -1071,8 +1065,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] diff --git "a/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601_edt.json" index f968dff11..f6a3e573e 100644 --- "a/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/DataProcessors.\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601_edt.json" @@ -1,7 +1,17 @@ {"com.github._1c_syntax.bsl.mdo.DataProcessor": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.Обработка1.Form.Форма", + "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + }, "description": "Обработка1", "explanation": { "content": [] @@ -12,9 +22,7 @@ "uuid": "5a32de80-b66f-4d6d-be8b-a117f5f71480", "name": "Форма", "mdoReference": { - "type": "FORM", - "mdoRef": "DataProcessor.Обработка1.Form.Форма", - "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -38,7 +46,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/DataProcessors/Обработка1/Forms/Форма/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "supportVariant": "NONE", "isProtected": false @@ -157,14 +165,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -194,14 +195,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -1071,8 +1065,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] diff --git "a/src/test/resources/fixtures/mdclasses/DefinedTypes.\320\236\320\277\321\200\320\265\320\264\320\265\320\273\321\217\320\265\320\274\321\213\320\271\320\242\320\270\320\2771.json" "b/src/test/resources/fixtures/mdclasses/DefinedTypes.\320\236\320\277\321\200\320\265\320\264\320\265\320\273\321\217\320\265\320\274\321\213\320\271\320\242\320\270\320\2771.json" index 09a2d2132..388aa3ac3 100644 --- "a/src/test/resources/fixtures/mdclasses/DefinedTypes.\320\236\320\277\321\200\320\265\320\264\320\265\320\273\321\217\320\265\320\274\321\213\320\271\320\242\320\270\320\2771.json" +++ "b/src/test/resources/fixtures/mdclasses/DefinedTypes.\320\236\320\277\321\200\320\265\320\264\320\265\320\273\321\217\320\265\320\274\321\213\320\271\320\242\320\270\320\2771.json" @@ -33,14 +33,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" index 524839ef1..74551497b 100644 --- "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" +++ "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.DocumentJournal": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "columns": [ { "uuid": "b52d063e-5d2c-498b-a333-4957277f47e3", @@ -43,6 +48,9 @@ ], "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/auxiliaryForm" + }, "description": "ЖурналДокументов1", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" index 5ee998f8d..d5674617d 100644 --- "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.DocumentJournal": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "columns": [ { "uuid": "b52d063e-5d2c-498b-a333-4957277f47e3", @@ -43,6 +48,9 @@ ], "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/auxiliaryForm" + }, "description": "ЖурналДокументов1", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" index 072c18bac..5325eeceb 100644 --- "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" @@ -42,14 +42,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -106,14 +99,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -168,14 +154,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -334,8 +313,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -427,14 +405,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -458,6 +429,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, "commands": [ [ { @@ -533,6 +515,21 @@ [] ], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаВыбора", + "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаСписка", + "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаДокумента", + "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + }, "description": "Документ1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/synonym" @@ -543,9 +540,7 @@ "uuid": "875c9efc-f2ae-4773-bac2-3556424557c3", "name": "ФормаДокумента", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Документ1.Form.ФормаДокумента", - "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -569,7 +564,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Forms/ФормаДокумента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "supportVariant": "NONE", "isProtected": false @@ -731,9 +726,7 @@ "uuid": "c7c49315-4318-459c-9a6b-8b293ef3e772", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Документ1.Form.ФормаСписка", - "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -757,7 +750,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "supportVariant": "NONE", "isProtected": false @@ -928,9 +921,7 @@ "uuid": "9b76b5be-bacf-4d63-b745-4024668740d2", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Документ1.Form.ФормаВыбора", - "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -954,7 +945,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Forms/ФормаВыбора/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultChoiceForm" }, "supportVariant": "NONE", "isProtected": false @@ -1109,15 +1100,15 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl" ] ] ], @@ -1351,8 +1342,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" index a6f5333f7..8d0009fa8 100644 --- "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" @@ -43,25 +43,11 @@ "int": 2, "com.github._1c_syntax.bsl.types.qualifiers.BinaryDataQualifiers": { "length": 16, - "allowedLength": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДвоичныхДанных (16, Фиксированная)", - "nameEn": "BinaryDataQualifiers (16, Fixed)" - } - } + "allowedLength": 1 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -118,14 +104,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -180,14 +159,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -346,8 +318,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -439,14 +410,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -470,6 +434,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, "commands": [ [ { @@ -545,6 +520,21 @@ [] ], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаВыбора", + "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаСписка", + "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаДокумента", + "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + }, "description": "Документ1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/synonym" @@ -555,9 +545,7 @@ "uuid": "875c9efc-f2ae-4773-bac2-3556424557c3", "name": "ФормаДокумента", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Документ1.Form.ФормаДокумента", - "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -581,7 +569,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/Forms/ФормаДокумента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "supportVariant": "NONE", "isProtected": false @@ -743,9 +731,7 @@ "uuid": "c7c49315-4318-459c-9a6b-8b293ef3e772", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Документ1.Form.ФормаСписка", - "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -769,7 +755,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "supportVariant": "NONE", "isProtected": false @@ -940,9 +926,7 @@ "uuid": "9b76b5be-bacf-4d63-b745-4024668740d2", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Документ1.Form.ФормаВыбора", - "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -966,7 +950,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/Forms/ФормаВыбора/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultChoiceForm" }, "supportVariant": "NONE", "isProtected": false @@ -1121,15 +1105,15 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl" ] ] ], @@ -1363,8 +1347,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" index 32ac4afb0..13a44c305 100644 --- "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" +++ "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" @@ -100,8 +100,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -125,8 +124,22 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "description": "Перечисление1", "enumValues": [ { diff --git "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" index b8a1d424a..c6887d99e 100644 --- "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" @@ -100,8 +100,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -125,8 +124,22 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "description": "Перечисление1", "enumValues": [ { diff --git "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" index afc11c8c9..eeadb96bc 100644 --- "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" @@ -182,8 +182,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -276,8 +275,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -335,8 +333,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -392,14 +389,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -423,6 +413,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "commands": [], "comment": "", "content": [ @@ -446,6 +447,15 @@ ], [] ], + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "description": "ПланОбмена1", "distributedInfoBase": false, "explanation": { diff --git "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" index be2d5cdd8..445eff910 100644 --- "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" @@ -182,8 +182,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -276,8 +275,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -335,8 +333,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -392,14 +389,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -423,6 +413,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "commands": [], "comment": "", "content": [ @@ -446,6 +447,15 @@ ], [] ], + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "description": "ПланОбмена1", "distributedInfoBase": false, "explanation": { diff --git "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" index 0af2008da..1190970fb 100644 --- "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" +++ "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" @@ -185,8 +185,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 4294967295, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -382,8 +381,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 15, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -474,8 +472,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -531,14 +528,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -744,6 +734,20 @@ } } ], + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/defaultObjectForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/defaultObjectForm" + }, "dataLockControlMode": "MANAGED" } ], diff --git "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" index 82615e7a5..018d85e8a 100644 --- "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" @@ -185,8 +185,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 4294967295, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -382,8 +381,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 15, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -474,8 +472,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -531,14 +528,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -744,6 +734,20 @@ } } ], + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/defaultObjectForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/defaultObjectForm" + }, "dataLockControlMode": "MANAGED" } ], diff --git "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" index 8cddc5318..dcc432877 100644 --- "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.FilterCriterion": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "content": [ @@ -16,6 +21,9 @@ ], [] ], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/auxiliaryForm" + }, "description": "КритерийОтбора1", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" index c5cc5e205..e72ec9046 100644 --- "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.FilterCriterion": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "content": [ @@ -16,6 +21,9 @@ ], [] ], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/auxiliaryForm" + }, "description": "КритерийОтбора1", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" index eba6dc9fc..d2b6a66fe 100644 --- "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" @@ -91,14 +91,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -156,8 +149,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -219,8 +211,22 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "description": "РегистрСведений1", "dimensions": [ { @@ -262,14 +268,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" index 922f1485e..bf79d5b4c 100644 --- "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" @@ -91,14 +91,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -156,8 +149,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -219,8 +211,22 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "description": "РегистрСведений1", "dimensions": [ { @@ -262,14 +268,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" index fdb1c4ff0..5e79daf9c 100644 --- "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" @@ -1,7 +1,24 @@ {"com.github._1c_syntax.bsl.mdo.Report": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "description": "Отчет1", "explanation": { "content": [] @@ -15,15 +32,15 @@ "mdoType": "REPORT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" index 6f198ff89..3700f3680 100644 --- "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" @@ -1,7 +1,24 @@ {"com.github._1c_syntax.bsl.mdo.Report": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "description": "Отчет1", "explanation": { "content": [] @@ -15,15 +32,15 @@ "mdoType": "REPORT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" "b/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" index 66f0307b9..bfb56ad51 100644 --- "a/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" @@ -52,14 +52,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -229,8 +222,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -322,14 +314,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -386,8 +371,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 9, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -485,8 +469,26 @@ ], [] ], + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, "description": "Задача1", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" diff --git a/src/test/resources/fixtures/mdclasses_3_18/Configuration.json b/src/test/resources/fixtures/mdclasses_3_18/Configuration.json index 24ce20098..e741ad1c7 100644 --- a/src/test/resources/fixtures/mdclasses_3_18/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_3_18/Configuration.json @@ -81,18 +81,43 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] }, + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/bots/com.github._1c_syntax.bsl.mdo.Bot/synonym" @@ -204,6 +229,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "predefinedValues": [], "distributedInfoBase": false, "includeConfigurationExtensions": false, @@ -275,6 +318,18 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/bots/com.github._1c_syntax.bsl.mdo.Bot/synonym" } diff --git a/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json index 92d63a95f..27fa52619 100644 --- a/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json @@ -81,18 +81,43 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] }, + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/bots/com.github._1c_syntax.bsl.mdo.Bot/synonym" @@ -204,6 +229,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "predefinedValues": [], "distributedInfoBase": false, "includeConfigurationExtensions": false, @@ -275,6 +318,18 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/bots/com.github._1c_syntax.bsl.mdo.Bot/synonym" } diff --git a/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json index b48da597c..c712e3852 100644 --- a/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json @@ -117,8 +117,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -165,14 +164,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -184,6 +176,14 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -280,6 +280,12 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -321,6 +327,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" }, @@ -411,6 +435,12 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "recalculations": [ { "uuid": "16b54095-8711-4ef1-a38b-93d12f6f6e93", @@ -566,6 +596,42 @@ } } ], + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаЭлемента" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаСписка", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаСписка" + }, + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.Справочник1.Form.ФормаВыбора", + "mdoRefRu": "Справочник.Справочник1.Форма.ФормаВыбора" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [ { "uuid": "79adb5f1-7224-4404-98a7-d7ed155f6232", @@ -626,6 +692,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "accountingFlags": [ { @@ -740,6 +824,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -777,6 +879,36 @@ "type": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/type" }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -826,15 +958,13 @@ "indexing": "DONT_INDEX", "dataSeparation": "DONT_USE", "dataSeparationValue": { - "type": "UNKNOWN", - "mdoRef": "", - "mdoRefRu": "" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "dataSeparationUse": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "conditionalSeparation": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" }, "usersSeparation": "DONT_USE", "authenticationSeparation": "DONT_USE", @@ -1005,6 +1135,14 @@ [] ], "templates": [], + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.Обработка1.Form.Форма", + "mdoRefRu": "Обработка.Обработка1.Форма.Форма" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -1105,6 +1243,12 @@ ], "forms": [], "templates": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "registeredDocuments": [ { "type": "DOCUMENT", @@ -1195,6 +1339,30 @@ [] ], "templates": [], + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаДокумента", + "mdoRefRu": "Документ.Документ1.Форма.ФормаДокумента" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаСписка", + "mdoRefRu": "Документ.Документ1.Форма.ФормаСписка" + }, + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Document.Документ1.Form.ФормаВыбора", + "mdoRefRu": "Документ.Документ1.Форма.ФормаВыбора" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "registerRecords": [ [ 4 @@ -1256,6 +1424,18 @@ ], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" } } ], @@ -1330,6 +1510,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "predefinedValues": [], "distributedInfoBase": false, "includeConfigurationExtensions": false, @@ -1485,6 +1683,18 @@ } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "dataLockControlMode": "MANAGED" } ], @@ -1515,6 +1725,12 @@ ], "commands": [], "forms": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "content": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" @@ -1664,13 +1880,13 @@ ] ], [ - "ManagedApplicationModule", + "ExternalConnectionModule", [ 1 ] ], [ - "ExternalConnectionModule", + "ManagedApplicationModule", [ 1 ] @@ -1745,6 +1961,21 @@ ], [] ], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } @@ -1917,7 +2148,19 @@ 1 ], "forms": [], - "templates": [] + "templates": [], + "defaultSaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + } } ], "styleItems": [ @@ -2055,10 +2298,28 @@ "extendedEdit": false, "fillFromFillingValue": false, "choiceForm": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/commonAttributes/com.github._1c_syntax.bsl.mdo.CommonAttribute/dataSeparationValue" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/defaultListForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" } diff --git "a/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" "b/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" index 4f59f53cb..6ad552ecf 100644 --- "a/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" @@ -42,14 +42,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -101,14 +94,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -399,8 +385,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -570,8 +555,16 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.CalculationRegister/auxiliaryListForm" + }, "description": "РегистрРасчета1", "dimensions": [ { @@ -783,14 +776,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" index 4f59f53cb..6ad552ecf 100644 --- "a/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses_3_25/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" @@ -42,14 +42,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -101,14 +94,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -399,8 +385,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -570,8 +555,16 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.CalculationRegister/auxiliaryListForm" + }, "description": "РегистрРасчета1", "dimensions": [ { @@ -783,14 +776,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051.json" "b/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051.json" index 5715a29f7..291f36c08 100644 --- "a/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051.json" +++ "b/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051.json" @@ -146,14 +146,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -416,6 +409,17 @@ } ], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "defaultListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, "dataLockControlMode": "AUTOMATIC" } ], @@ -569,6 +573,12 @@ } ], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, "dataLockControlMode": "AUTOMATIC" } ], @@ -857,6 +867,18 @@ } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, "dataLockControlMode": "AUTOMATIC" } ], diff --git "a/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051_edt.json" "b/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051_edt.json" index 5715a29f7..291f36c08 100644 --- "a/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051_edt.json" +++ "b/src/test/resources/fixtures/mdclasses_3_27/ExternalDataSources.\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\230\321\201\321\202\320\276\321\207\320\275\320\270\320\272\320\224\320\260\320\275\320\275\321\213\321\2051_edt.json" @@ -146,14 +146,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -416,6 +409,17 @@ } ], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "defaultListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, "dataLockControlMode": "AUTOMATIC" } ], @@ -569,6 +573,12 @@ } ], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, "dataLockControlMode": "AUTOMATIC" } ], @@ -857,6 +867,18 @@ } } ], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/cubes/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube/dimensionTables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCubeDimensionTable/defaultListForm" + }, "dataLockControlMode": "AUTOMATIC" } ], diff --git a/src/test/resources/fixtures/mdclasses_5_1/Configuration.json b/src/test/resources/fixtures/mdclasses_5_1/Configuration.json index b857bf88f..3625dccc5 100644 --- a/src/test/resources/fixtures/mdclasses_5_1/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_5_1/Configuration.json @@ -81,18 +81,43 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] }, + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "predefinedValues": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/bots/com.github._1c_syntax.bsl.mdo.Bot/synonym" @@ -204,6 +229,24 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "predefinedValues": [], "distributedInfoBase": false, "includeConfigurationExtensions": false, @@ -275,6 +318,18 @@ ], "forms": [], "templates": [], + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/chartsOfCharacteristicTypes/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/bots/com.github._1c_syntax.bsl.mdo.Bot/synonym" } diff --git a/src/test/resources/fixtures/mdclasses_ext/Configuration.json b/src/test/resources/fixtures/mdclasses_ext/Configuration.json index 50671dc36..2c51baf02 100644 --- a/src/test/resources/fixtures/mdclasses_ext/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_ext/Configuration.json @@ -44,13 +44,31 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/synonym" }, "task": { - "type": "UNKNOWN", - "mdoRef": "", - "mdoRefRu": "" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" } } ], @@ -125,14 +143,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -142,13 +153,13 @@ "indexing": "DONT_INDEX", "dataSeparation": "SEPARATE", "dataSeparationValue": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "dataSeparationUse": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "conditionalSeparation": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "usersSeparation": "SEPARATE", "authenticationSeparation": "SEPARATE", @@ -254,6 +265,12 @@ "columns": [], "forms": [], "templates": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, "registeredDocuments": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/synonym" @@ -554,7 +571,19 @@ "supportVariant": "NONE", "modules": [], "forms": [], - "templates": [] + "templates": [], + "defaultSaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + } } ], "styleItems": [ @@ -617,6 +646,24 @@ "forms": [], "templates": [], "addressingAttributes": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/synonym" } diff --git a/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json index 413ee6ec0..62a80c19c 100644 --- a/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json @@ -44,13 +44,31 @@ "tabularSections": [], "forms": [], "templates": [], + "defaultObjectForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/synonym" }, "task": { - "type": "UNKNOWN", - "mdoRef": "", - "mdoRefRu": "" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" } } ], @@ -125,14 +143,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -142,13 +153,13 @@ "indexing": "DONT_INDEX", "dataSeparation": "DONT_USE", "dataSeparationValue": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "dataSeparationUse": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "conditionalSeparation": { - "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task" + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "usersSeparation": "DONT_USE", "authenticationSeparation": "DONT_USE", @@ -296,6 +307,12 @@ } ], "templates": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/documentJournals/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + }, + "auxiliaryForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, "registeredDocuments": [], "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/synonym" @@ -596,7 +613,19 @@ "supportVariant": "NONE", "modules": [], "forms": [], - "templates": [] + "templates": [], + "defaultSaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryLoadForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + } } ], "styleItems": [ @@ -659,6 +688,24 @@ "forms": [], "templates": [], "addressingAttributes": [], + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" + }, "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/synonym" } diff --git "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" index 323bc4086..88fa8e0cd 100644 --- "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" @@ -280,14 +280,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -344,8 +337,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -757,8 +749,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 250, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -872,8 +863,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1095,14 +1085,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1370,8 +1353,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1855,8 +1837,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + }, "description": "Задание", "explanation": { "content": [ @@ -3238,9 +3244,7 @@ "uuid": "b58942ca-1367-4e1d-b5b4-7d973d0fecd8", "name": "ФормаБизнесПроцесса", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -3264,7 +3268,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Forms/ФормаБизнесПроцесса/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3862,9 +3866,7 @@ "uuid": "1a7c7427-bead-4655-9dd6-df6e722663c5", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -3888,7 +3890,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4446,15 +4448,15 @@ "mdoType": "BUSINESS_PROCESS", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" index 3e36d0e85..324843126 100644 --- "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" @@ -280,14 +280,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -344,8 +337,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -757,8 +749,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 250, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -872,8 +863,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1095,14 +1085,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1370,8 +1353,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1855,8 +1837,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + }, "description": "Задание", "explanation": { "content": [ @@ -3217,9 +3223,7 @@ "uuid": "b58942ca-1367-4e1d-b5b4-7d973d0fecd8", "name": "ФормаБизнесПроцесса", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -3243,7 +3247,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/Forms/ФормаБизнесПроцесса/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3824,9 +3828,7 @@ "uuid": "1a7c7427-bead-4655-9dd6-df6e722663c5", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -3850,7 +3852,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4408,15 +4410,15 @@ "mdoType": "BUSINESS_PROCESS", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" index 995ae534f..8fbe2dd81 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -392,8 +385,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -450,8 +442,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -600,14 +591,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -767,14 +751,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -888,8 +865,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1048,14 +1024,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1458,14 +1427,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -1531,10 +1493,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WITHIN_OWNER_SUBORDINATION", "commands": [], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "description": "Версии файлов", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1545,9 +1543,7 @@ "uuid": "b2e656c1-f4ff-4d95-b066-4ee11ce4dea8", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -1571,7 +1567,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2011,9 +2007,7 @@ "uuid": "2d86d1fc-5367-47b8-804e-7f9c5fc8f3b1", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -2037,7 +2031,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Forms/ФормаВыбора/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2688,15 +2682,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ManagerModule.bsl" ] ] ], @@ -2941,8 +2935,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 260, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3090,8 +3083,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 28, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" index d1732d73e..6d65e7311 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -392,8 +385,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -450,8 +442,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -600,14 +591,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -767,14 +751,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -888,8 +865,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1048,14 +1024,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1458,14 +1427,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -1531,10 +1493,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WITHIN_OWNER_SUBORDINATION", "commands": [], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "description": "Версии файлов", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1545,9 +1543,7 @@ "uuid": "b2e656c1-f4ff-4d95-b066-4ee11ce4dea8", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -1571,7 +1567,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2011,9 +2007,7 @@ "uuid": "2d86d1fc-5367-47b8-804e-7f9c5fc8f3b1", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -2037,7 +2031,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/Forms/ФормаВыбора/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2688,15 +2682,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ManagerModule.bsl" ] ] ], @@ -2941,8 +2935,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 260, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3090,8 +3083,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 28, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" index ce02ff5e8..232eee827 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -377,8 +370,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -810,14 +802,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -872,6 +857,23 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [ @@ -917,6 +919,25 @@ } ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + }, "description": "Заметки", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -927,9 +948,7 @@ "uuid": "d35c51b0-4cb7-4f9c-8aac-6a25a1b49adf", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -953,7 +972,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Forms/ФормаЭлемента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2010,9 +2029,7 @@ "uuid": "e1b2ccf9-5a8f-4008-86f3-d2c7cf5581d1", "name": "ФормаГруппы", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "objectBelonging": "OWN", "comment": "", @@ -2036,7 +2053,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Forms/ФормаГруппы/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[5]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2140,15 +2157,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" index 94fb394fc..3a4d76a5d 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -377,8 +370,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -810,14 +802,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -872,6 +857,23 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [ @@ -917,6 +919,25 @@ } ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + }, "description": "Заметки", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -927,9 +948,7 @@ "uuid": "d35c51b0-4cb7-4f9c-8aac-6a25a1b49adf", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -953,7 +972,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/Forms/ФормаЭлемента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1994,9 +2013,7 @@ "uuid": "e1b2ccf9-5a8f-4008-86f3-d2c7cf5581d1", "name": "ФормаГруппы", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "objectBelonging": "OWN", "comment": "", @@ -2020,7 +2037,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/Forms/ФормаГруппы/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[5]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2115,15 +2132,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" index f72b80cfe..413998dd9 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -129,37 +122,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 1024, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (1024, Переменная)", - "nameEn": "StringQualifiers (1024, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 17, "scale": 5, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (17.5)", - "nameEn": "NumberQualifiers (17.5)" - } - } + "nonNegative": false } } ] @@ -216,8 +188,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -275,8 +246,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 0, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -837,8 +807,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 75, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1365,8 +1334,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1480,8 +1448,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 2, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1920,10 +1887,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + }, "description": "Дополнительные реквизиты и сведения", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1934,9 +1937,7 @@ "uuid": "f82d5bd6-4c74-4c23-978c-565aae3d752a", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -1960,7 +1961,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаЭлемента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4414,9 +4415,7 @@ "uuid": "7fba41a5-4faa-412b-b367-b30ced0314c0", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -4440,7 +4439,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -5609,8 +5608,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -6004,15 +6002,15 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ManagerModule.bsl" ] ] ], @@ -6156,8 +6154,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -6228,8 +6225,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6323,8 +6319,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 99, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6391,8 +6386,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6451,37 +6445,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -6617,14 +6590,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" index ef096287f..bb2de466f 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -129,37 +122,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 1024, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (1024, Переменная)", - "nameEn": "StringQualifiers (1024, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 17, "scale": 5, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (17.5)", - "nameEn": "NumberQualifiers (17.5)" - } - } + "nonNegative": false } } ] @@ -216,8 +188,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -275,8 +246,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 0, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -837,8 +807,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 75, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1365,8 +1334,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1480,8 +1448,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 2, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1920,10 +1887,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + }, "description": "Дополнительные реквизиты и сведения", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1934,9 +1937,7 @@ "uuid": "f82d5bd6-4c74-4c23-978c-565aae3d752a", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -1960,7 +1961,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаЭлемента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4390,9 +4391,7 @@ "uuid": "7fba41a5-4faa-412b-b367-b30ced0314c0", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -4416,7 +4415,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -5585,8 +5584,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5980,15 +5978,15 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ManagerModule.bsl" ] ] ], @@ -6132,8 +6130,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -6204,8 +6201,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6299,8 +6295,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 99, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6367,8 +6362,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6427,37 +6421,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -6593,14 +6566,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" "b/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" index e4cc9e7a6..fb0941286 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" @@ -234,8 +234,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 7, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" index 765a19477..cf6050858 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" @@ -221,8 +221,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -253,14 +252,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" index 4b278f2c9..39fc9aeb6 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" @@ -221,8 +221,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -253,14 +252,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" "b/src/test/resources/fixtures/ssl_3_1/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" index ebd318216..778f266f2 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" @@ -69,14 +69,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" index bbf801849..4c1d98aa1 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" @@ -52,14 +52,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -125,8 +118,18 @@ ], [] ], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", + "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + }, "description": "Загрузка курсов валют", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/format" @@ -137,9 +140,7 @@ "uuid": "6fcd2a3a-4d66-40e3-bde0-5c274b43783f", "name": "Форма", "mdoReference": { - "type": "FORM", - "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", - "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -163,7 +164,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Forms/Форма/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -831,14 +832,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1253,8 +1247,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1464,8 +1457,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 2, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1696,15 +1688,15 @@ "mdoType": "DATA_PROCESSOR", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ManagerModule.bsl" ] ] ], @@ -1824,8 +1816,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1896,8 +1887,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 3, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -2063,8 +2053,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 4, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2132,8 +2121,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2246,14 +2234,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 } } ] @@ -2320,14 +2301,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" index 461b51a8d..4e7f3fd43 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" @@ -52,14 +52,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -125,8 +118,18 @@ ], [] ], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", + "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + }, "description": "Загрузка курсов валют", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/format" @@ -137,9 +140,7 @@ "uuid": "6fcd2a3a-4d66-40e3-bde0-5c274b43783f", "name": "Форма", "mdoReference": { - "type": "FORM", - "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", - "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -163,7 +164,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/Forms/Форма/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -831,14 +832,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1253,8 +1247,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1464,8 +1457,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 2, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1696,15 +1688,15 @@ "mdoType": "DATA_PROCESSOR", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ManagerModule.bsl" ] ] ], @@ -1824,8 +1816,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1896,8 +1887,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 3, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -2063,8 +2053,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 4, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2132,8 +2121,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2246,14 +2234,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 } } ] @@ -2320,14 +2301,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" index a174c636b..014249fe8 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.DocumentJournal": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "columns": [ [ { @@ -1343,6 +1348,11 @@ [] ], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", + "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + }, "description": "Взаимодействия", "explanation": { "content": [] @@ -1353,9 +1363,7 @@ "uuid": "27089e8e-2c75-431c-b808-5d4dcba3cdca", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", - "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -1379,7 +1387,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3783,8 +3791,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3853,8 +3860,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 30, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3896,14 +3902,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -4072,8 +4071,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4104,8 +4102,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4497,14 +4494,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -5604,8 +5594,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5635,14 +5624,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -6132,8 +6114,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" index e1ca9a65e..ea5272ff3 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.DocumentJournal": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "columns": [ [ { @@ -1343,6 +1348,11 @@ [] ], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", + "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + }, "description": "Взаимодействия", "explanation": { "content": [] @@ -1353,9 +1363,7 @@ "uuid": "27089e8e-2c75-431c-b808-5d4dcba3cdca", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", - "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -1379,7 +1387,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3783,8 +3791,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3853,8 +3860,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 30, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3896,14 +3902,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -4072,8 +4071,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4104,8 +4102,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4497,14 +4494,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -5604,8 +5594,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5635,14 +5624,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -6132,8 +6114,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" index 682c2c695..de9288926 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" @@ -180,14 +180,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -244,8 +237,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -496,14 +488,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -570,14 +555,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -786,8 +764,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаСписка", + "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаДокумента", + "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + }, "description": "Анкета", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -798,9 +800,7 @@ "uuid": "f829e2a9-5bdb-4171-8b32-8d10d5968813", "name": "ФормаДокумента", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаДокумента", - "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -824,7 +824,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Forms/ФормаДокумента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1969,8 +1969,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2011,8 +2010,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 200, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -2059,9 +2057,7 @@ "uuid": "647ba8f8-57f7-4c19-af59-525517c1e392", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаСписка", - "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -2085,7 +2081,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2298,15 +2294,15 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ManagerModule.bsl" ] ] ], @@ -2457,8 +2453,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" index 1f60748aa..70d9a2c18 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" @@ -180,14 +180,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -244,8 +237,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -496,14 +488,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -570,14 +555,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -786,8 +764,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаСписка", + "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаДокумента", + "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + }, "description": "Анкета", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -798,9 +800,7 @@ "uuid": "f829e2a9-5bdb-4171-8b32-8d10d5968813", "name": "ФормаДокумента", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаДокумента", - "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -824,7 +824,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/Forms/ФормаДокумента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1953,8 +1953,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1995,8 +1994,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 200, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -2043,9 +2041,7 @@ "uuid": "647ba8f8-57f7-4c19-af59-525517c1e392", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаСписка", - "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -2069,7 +2065,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2282,15 +2278,15 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl" ] ] ], @@ -2441,8 +2437,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" index 29bfadae2..9bb5af1d0 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" @@ -40,8 +40,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -125,8 +124,22 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "description": "Статусы обработчиков обновления", "enumValues": [ [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" index 5a9f52fe3..0dd1198bf 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" @@ -40,8 +40,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -125,8 +124,22 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "description": "Статусы обработчиков обновления", "enumValues": [ [ diff --git "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" index c06180a1d..150196bf2 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" @@ -38,14 +38,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -163,8 +156,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -339,8 +331,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -398,8 +389,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -471,14 +461,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -544,6 +527,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "commands": [], "comment": "", "content": [ @@ -3863,6 +3857,15 @@ ], [] ], + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "description": "Обновление информационной базы", "distributedInfoBase": false, "explanation": { @@ -3876,15 +3879,15 @@ "mdoType": "EXCHANGE_PLAN", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" index 1571da9a3..563f60ec8 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" @@ -38,14 +38,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -163,8 +156,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -339,8 +331,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -398,8 +389,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -471,14 +461,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -544,6 +527,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "commands": [], "comment": "", "content": [ @@ -3863,6 +3857,15 @@ ], [] ], + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "description": "Обновление информационной базы", "distributedInfoBase": false, "explanation": { @@ -3876,15 +3879,15 @@ "mdoType": "EXCHANGE_PLAN", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" "b/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" index 9a27ccae1..b5bfb1751 100644 --- "a/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" @@ -1,7 +1,15 @@ {"com.github._1c_syntax.bsl.mdo.FilterCriterion": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "content": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/auxiliaryForm" + }, "description": "Связанные документы", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" "b/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" index 9a27ccae1..b5bfb1751 100644 --- "a/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" @@ -1,7 +1,15 @@ {"com.github._1c_syntax.bsl.mdo.FilterCriterion": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "content": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/auxiliaryForm" + }, "description": "Связанные документы", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" index 3fd29e20c..d70a10390 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -219,8 +211,24 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "type": "FORM", + "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", + "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + }, "description": "Склонения представлений объектов", "dimensions": [ [ @@ -274,8 +282,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -350,9 +357,7 @@ "uuid": "823f925c-b71f-42b1-a71e-0aab823f59c6", "name": "ФормаЗаписи", "mdoReference": { - "type": "FORM", - "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", - "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "objectBelonging": "OWN", "comment": "", @@ -376,7 +381,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/InformationRegisters/СклоненияПредставлени_Объектов/Forms/ФормаЗаписи/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -603,14 +608,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" index f90413973..8fabc5444 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -219,8 +211,24 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "type": "FORM", + "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", + "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + }, "description": "Склонения представлений объектов", "dimensions": [ [ @@ -274,8 +282,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -350,9 +357,7 @@ "uuid": "823f925c-b71f-42b1-a71e-0aab823f59c6", "name": "ФормаЗаписи", "mdoReference": { - "type": "FORM", - "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", - "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "objectBelonging": "OWN", "comment": "", @@ -376,7 +381,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/InformationRegisters/СклоненияПредставлени_Объектов/Forms/ФормаЗаписи/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -603,14 +608,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" index 7b08020e3..66579483a 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -460,14 +452,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -688,8 +673,22 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "description": "Электронные подписи", "dimensions": [ [ @@ -799,8 +798,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1289,8 +1287,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 28, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" index 7ebd5dc7c..86dd26691 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -460,14 +452,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -688,8 +673,22 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "description": "Электронные подписи", "dimensions": [ [ @@ -799,8 +798,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1289,8 +1287,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 28, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" index fec4e4653..7ed027526 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" @@ -1,7 +1,24 @@ {"com.github._1c_syntax.bsl.mdo.Report": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "description": "Анализ версий объектов", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" index c56b32488..132812377 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" @@ -1,7 +1,24 @@ {"com.github._1c_syntax.bsl.mdo.Report": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "description": "Анализ версий объектов", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" index 6ba74d193..f3077189c 100644 --- "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" @@ -1,5 +1,23 @@ {"com.github._1c_syntax.bsl.mdo.SettingsStorage": { + "auxiliaryLoadForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/auxiliaryLoadForm" + }, "comment": "", + "defaultLoadForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + }, + "defaultSaveForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + }, "description": "Хранилище вариантов отчетов", "forms": [ [ @@ -426,14 +444,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -470,9 +481,7 @@ "uuid": "57964dd6-4b0b-4590-bc44-de744cc423af", "name": "ВыборВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "objectBelonging": "OWN", "comment": "", @@ -496,7 +505,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ВыборВариантаОтчета/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2000,14 +2009,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -4119,8 +4121,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4152,8 +4153,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -4255,8 +4255,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -4722,14 +4721,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -4794,9 +4786,7 @@ "uuid": "364cbfe2-bc44-4387-aa7e-6b4aa086c9e9", "name": "СохранениеВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "objectBelonging": "OWN", "comment": "", @@ -4820,7 +4810,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчета/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[9]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -7099,14 +7089,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" index 4d24340c7..fb244992f 100644 --- "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" @@ -1,5 +1,23 @@ {"com.github._1c_syntax.bsl.mdo.SettingsStorage": { + "auxiliaryLoadForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/auxiliaryLoadForm" + }, "comment": "", + "defaultLoadForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + }, + "defaultSaveForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + }, "description": "Хранилище вариантов отчетов", "forms": [ [ @@ -426,14 +444,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -470,9 +481,7 @@ "uuid": "57964dd6-4b0b-4590-bc44-de744cc423af", "name": "ВыборВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "objectBelonging": "OWN", "comment": "", @@ -496,7 +505,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ВыборВариантаОтчета/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2000,14 +2009,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -4119,8 +4121,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4152,8 +4153,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -4255,8 +4255,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -4722,14 +4721,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -4794,9 +4786,7 @@ "uuid": "364cbfe2-bc44-4387-aa7e-6b4aa086c9e9", "name": "СохранениеВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "objectBelonging": "OWN", "comment": "", @@ -4820,7 +4810,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчета/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[9]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -7099,14 +7089,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" index 3e604b393..42fb776f9 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" @@ -432,8 +432,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -663,14 +662,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -727,8 +719,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 1, - "description": {} + "allowedLength": 1 } } ] @@ -1098,14 +1089,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1220,8 +1204,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1488,6 +1471,15 @@ ], [] ], + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, "commands": [ [ { @@ -1654,6 +1646,19 @@ [] ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + }, "description": "Задача", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" @@ -4520,8 +4525,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -4636,9 +4640,7 @@ "uuid": "a9957f43-8b6f-4d98-a2d8-77b78047494c", "name": "ФормаЗадачи", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "Форма выполнения задачи по умолчанию", @@ -4662,7 +4664,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Forms/ФормаЗадачи/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[7]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -5205,9 +5207,7 @@ "uuid": "e470e15d-1b06-43cb-a9f9-ba489e2f596f", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -5231,7 +5231,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[8]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -5920,8 +5920,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5963,8 +5962,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -6015,15 +6013,15 @@ "mdoType": "TASK", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" index 9e8a8f02e..e848fcfdf 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" @@ -432,8 +432,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -663,14 +662,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -727,8 +719,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1098,14 +1089,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1220,8 +1204,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1488,6 +1471,15 @@ ], [] ], + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, "commands": [ [ { @@ -1654,6 +1646,19 @@ [] ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + }, "description": "Задача", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" @@ -4520,8 +4525,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -4636,9 +4640,7 @@ "uuid": "a9957f43-8b6f-4d98-a2d8-77b78047494c", "name": "ФормаЗадачи", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "Форма выполнения задачи по умолчанию", @@ -4662,7 +4664,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/Forms/ФормаЗадачи/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[7]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -5189,9 +5191,7 @@ "uuid": "e470e15d-1b06-43cb-a9f9-ba489e2f596f", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -5215,7 +5215,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[8]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -5904,8 +5904,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5947,8 +5946,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5999,15 +5997,15 @@ "mdoType": "TASK", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" "b/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" index 21f1ee8b1..e723c48e3 100644 --- "a/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" @@ -280,14 +280,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -344,8 +337,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -757,8 +749,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 250, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -872,8 +863,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1095,14 +1085,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1370,8 +1353,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1855,8 +1837,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + }, "description": "Задание", "explanation": { "content": [ @@ -2978,9 +2984,7 @@ "uuid": "b58942ca-1367-4e1d-b5b4-7d973d0fecd8", "name": "ФормаБизнесПроцесса", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -3004,7 +3008,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/BusinessProcesses/Задание/Forms/ФормаБизнесПроцесса/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3552,9 +3556,7 @@ "uuid": "1a7c7427-bead-4655-9dd6-df6e722663c5", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -3578,7 +3580,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/BusinessProcesses/Задание/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3968,15 +3970,15 @@ "mdoType": "BUSINESS_PROCESS", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/BusinessProcesses/Задание/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/BusinessProcesses/Задание/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/BusinessProcesses/Задание/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/BusinessProcesses/Задание/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" "b/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" index f9f1545d3..b9722378f 100644 --- "a/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" @@ -280,14 +280,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -344,8 +337,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -757,8 +749,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 250, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -872,8 +863,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1095,14 +1085,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1370,8 +1353,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1855,8 +1837,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", + "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + }, "description": "Задание", "explanation": { "content": [ @@ -2957,9 +2963,7 @@ "uuid": "b58942ca-1367-4e1d-b5b4-7d973d0fecd8", "name": "ФормаБизнесПроцесса", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаБизнесПроцесса", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаБизнесПроцесса" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -2983,7 +2987,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/BusinessProcesses/Задание/Forms/ФормаБизнесПроцесса/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3514,9 +3518,7 @@ "uuid": "1a7c7427-bead-4655-9dd6-df6e722663c5", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "BusinessProcess.Задание.Form.ФормаСписка", - "mdoRefRu": "БизнесПроцесс.Задание.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -3540,7 +3542,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/BusinessProcesses/Задание/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3930,15 +3932,15 @@ "mdoType": "BUSINESS_PROCESS", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/BusinessProcesses/Задание/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/BusinessProcesses/Задание/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/BusinessProcesses/Задание/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/BusinessProcesses/Задание/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" index bb79716b1..972ab0eff 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -392,8 +385,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -450,8 +442,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -600,14 +591,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -767,14 +751,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -888,8 +865,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1048,14 +1024,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1458,14 +1427,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -1531,10 +1493,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WITHIN_OWNER_SUBORDINATION", "commands": [], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "description": "Версии файлов", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1545,9 +1543,7 @@ "uuid": "b2e656c1-f4ff-4d95-b066-4ee11ce4dea8", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -1571,7 +1567,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/ВерсииФа_лов/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1829,9 +1825,7 @@ "uuid": "2d86d1fc-5367-47b8-804e-7f9c5fc8f3b1", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -1855,7 +1849,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/ВерсииФа_лов/Forms/ФормаВыбора/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2288,15 +2282,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/ВерсииФа_лов/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/ВерсииФа_лов/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/ВерсииФа_лов/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/ВерсииФа_лов/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" index 2cbcacc27..4b7160ec4 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -392,8 +385,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -450,8 +442,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -600,14 +591,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -767,14 +751,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -888,8 +865,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1048,14 +1024,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1458,14 +1427,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -1531,10 +1493,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": true, "codeSeries": "WITHIN_OWNER_SUBORDINATION", "commands": [], "comment": "", + "defaultChoiceForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", + "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "description": "Версии файлов", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1545,9 +1543,7 @@ "uuid": "b2e656c1-f4ff-4d95-b066-4ee11ce4dea8", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаСписка", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -1571,7 +1567,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/ВерсииФа_лов/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1829,9 +1825,7 @@ "uuid": "2d86d1fc-5367-47b8-804e-7f9c5fc8f3b1", "name": "ФормаВыбора", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.ВерсииФайлов.Form.ФормаВыбора", - "mdoRefRu": "Справочник.ВерсииФайлов.Форма.ФормаВыбора" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "objectBelonging": "OWN", "comment": "", @@ -1855,7 +1849,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/ВерсииФа_лов/Forms/ФормаВыбора/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultChoiceForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2288,15 +2282,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/ВерсииФа_лов/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/ВерсииФа_лов/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/ВерсииФа_лов/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/ВерсииФа_лов/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" index 4a6b30f3a..d0192b1af 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -377,8 +370,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -810,14 +802,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -872,6 +857,23 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [ @@ -917,6 +919,25 @@ } ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + }, "description": "Заметки", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -927,9 +948,7 @@ "uuid": "d35c51b0-4cb7-4f9c-8aac-6a25a1b49adf", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -953,7 +972,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/Заметки/Forms/ФормаЭлемента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1957,9 +1976,7 @@ "uuid": "e1b2ccf9-5a8f-4008-86f3-d2c7cf5581d1", "name": "ФормаГруппы", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "objectBelonging": "OWN", "comment": "", @@ -1983,7 +2000,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/Заметки/Forms/ФормаГруппы/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[5]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2087,15 +2104,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/Заметки/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/Заметки/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/Заметки/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Catalogs/Заметки/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" index 2241a677a..2aceeae44 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -377,8 +370,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -810,14 +802,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -872,6 +857,23 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [ @@ -917,6 +919,25 @@ } ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", + "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + }, "description": "Заметки", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -927,9 +948,7 @@ "uuid": "d35c51b0-4cb7-4f9c-8aac-6a25a1b49adf", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаЭлемента", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -953,7 +972,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/Заметки/Forms/ФормаЭлемента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1941,9 +1960,7 @@ "uuid": "e1b2ccf9-5a8f-4008-86f3-d2c7cf5581d1", "name": "ФормаГруппы", "mdoReference": { - "type": "FORM", - "mdoRef": "Catalog.Заметки.Form.ФормаГруппы", - "mdoRefRu": "Справочник.Заметки.Форма.ФормаГруппы" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "objectBelonging": "OWN", "comment": "", @@ -1967,7 +1984,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/Заметки/Forms/ФормаГруппы/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[5]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/defaultFolderForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2062,15 +2079,15 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/Заметки/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/Заметки/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/Заметки/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Catalogs/Заметки/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" index becc75a77..a88f40fcb 100644 --- "a/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -129,37 +122,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 1024, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (1024, Переменная)", - "nameEn": "StringQualifiers (1024, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 17, "scale": 5, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (17.5)", - "nameEn": "NumberQualifiers (17.5)" - } - } + "nonNegative": false } } ] @@ -216,8 +188,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -275,8 +246,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 0, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -837,8 +807,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 75, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1365,8 +1334,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1480,8 +1448,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 2, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1920,10 +1887,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + }, "description": "Дополнительные реквизиты и сведения", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1934,9 +1937,7 @@ "uuid": "f82d5bd6-4c74-4c23-978c-565aae3d752a", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -1960,7 +1961,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаЭлемента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3745,9 +3746,7 @@ "uuid": "7fba41a5-4faa-412b-b367-b30ced0314c0", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -3771,7 +3770,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4757,8 +4756,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5152,15 +5150,15 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ManagerModule.bsl" ] ] ], @@ -5304,8 +5302,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -5376,8 +5373,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5471,8 +5467,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 99, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5539,8 +5534,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5599,37 +5593,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -5765,14 +5738,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" index 3f49f67d5..19e205010 100644 --- "a/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" @@ -39,14 +39,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -129,37 +122,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 1024, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (1024, Переменная)", - "nameEn": "StringQualifiers (1024, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 17, "scale": 5, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (17.5)", - "nameEn": "NumberQualifiers (17.5)" - } - } + "nonNegative": false } } ] @@ -216,8 +188,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -275,8 +246,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 0, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -837,8 +807,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 75, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1365,8 +1334,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1480,8 +1448,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 2, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1920,10 +1887,46 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, "checkUnique": false, "codeSeries": "WHOLE_CATALOG", "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultFolderForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", + "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + }, "description": "Дополнительные реквизиты и сведения", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -1934,9 +1937,7 @@ "uuid": "f82d5bd6-4c74-4c23-978c-565aae3d752a", "name": "ФормаЭлемента", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаЭлемента", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаЭлемента" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -1960,7 +1961,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаЭлемента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -3721,9 +3722,7 @@ "uuid": "7fba41a5-4faa-412b-b367-b30ced0314c0", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "ChartOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.Form.ФормаСписка", - "mdoRefRu": "ПланВидовХарактеристик.ДополнительныеРеквизитыИСведения.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -3747,7 +3746,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4733,8 +4732,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5128,15 +5126,15 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ManagerModule.bsl" ] ] ], @@ -5280,8 +5278,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -5352,8 +5349,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5447,8 +5443,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 99, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5515,8 +5510,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5575,37 +5569,16 @@ }, "int": 3, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 }, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 }, "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -5741,14 +5714,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" "b/src/test/resources/fixtures/ssl_3_2/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" index e4cc9e7a6..fb0941286 100644 --- "a/src/test/resources/fixtures/ssl_3_2/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_2/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" @@ -234,8 +234,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 7, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" "b/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" index 67c098bc0..6b114343e 100644 --- "a/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" +++ "b/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" @@ -224,8 +224,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -256,14 +255,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" "b/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" index 6816cc313..fa414f45a 100644 --- "a/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" @@ -224,8 +224,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -256,14 +255,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" "b/src/test/resources/fixtures/ssl_3_2/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" index ebd318216..778f266f2 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Constants.\320\227\320\260\320\263\320\276\320\273\320\276\320\262\320\276\320\272\320\241\320\270\321\201\321\202\320\265\320\274\321\213.json" @@ -69,14 +69,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" "b/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" index 47f325cb8..a3fd9f6bc 100644 --- "a/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" +++ "b/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" @@ -52,14 +52,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -125,8 +118,18 @@ ], [] ], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", + "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + }, "description": "Загрузка курсов валют", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/format" @@ -137,9 +140,7 @@ "uuid": "6fcd2a3a-4d66-40e3-bde0-5c274b43783f", "name": "Форма", "mdoReference": { - "type": "FORM", - "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", - "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -163,7 +164,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Forms/Форма/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -723,14 +724,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1149,8 +1143,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1360,8 +1353,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 2, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1592,15 +1584,15 @@ "mdoType": "DATA_PROCESSOR", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ManagerModule.bsl" ] ] ], @@ -1720,8 +1712,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1792,8 +1783,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 3, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1959,8 +1949,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 4, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2028,8 +2017,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2142,14 +2130,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 } } ] @@ -2216,14 +2197,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" "b/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" index 319762761..224f02f3b 100644 --- "a/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" @@ -52,14 +52,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -125,8 +118,18 @@ ], [] ], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", + "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + }, "description": "Загрузка курсов валют", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/format" @@ -137,9 +140,7 @@ "uuid": "6fcd2a3a-4d66-40e3-bde0-5c274b43783f", "name": "Форма", "mdoReference": { - "type": "FORM", - "mdoRef": "DataProcessor.ЗагрузкаКурсовВалют.Form.Форма", - "mdoRefRu": "Обработка.ЗагрузкаКурсовВалют.Форма.Форма" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -163,7 +164,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/Forms/Форма/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -723,14 +724,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1149,8 +1143,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1360,8 +1353,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 2, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1592,15 +1584,15 @@ "mdoType": "DATA_PROCESSOR", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ManagerModule.bsl" ] ] ], @@ -1720,8 +1712,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -1792,8 +1783,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 3, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1959,8 +1949,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 4, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2028,8 +2017,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -2142,14 +2130,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 50, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (50, Переменная)", - "nameEn": "StringQualifiers (50, Variable)" - } - } + "allowedLength": 0 } } ] @@ -2216,14 +2197,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" index 2c1349607..ea50394e1 100644 --- "a/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.DocumentJournal": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "columns": [ [ { @@ -1343,6 +1348,11 @@ [] ], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", + "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + }, "description": "Взаимодействия", "explanation": { "content": [] @@ -1353,9 +1363,7 @@ "uuid": "27089e8e-2c75-431c-b808-5d4dcba3cdca", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", - "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -1379,7 +1387,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2974,8 +2982,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3044,8 +3051,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 30, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3087,14 +3093,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -3252,8 +3251,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3284,8 +3282,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3678,14 +3675,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -4685,8 +4675,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4716,14 +4705,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -5188,8 +5170,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" index 84f08e4c0..b0c659dcb 100644 --- "a/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" @@ -1,4 +1,9 @@ {"com.github._1c_syntax.bsl.mdo.DocumentJournal": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "columns": [ [ { @@ -1343,6 +1348,11 @@ [] ], "comment": "", + "defaultForm": { + "type": "FORM", + "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", + "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + }, "description": "Взаимодействия", "explanation": { "content": [] @@ -1353,9 +1363,7 @@ "uuid": "27089e8e-2c75-431c-b808-5d4dcba3cdca", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "DocumentJournal.Взаимодействия.Form.ФормаСписка", - "mdoRefRu": "ЖурналДокументов.Взаимодействия.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "objectBelonging": "OWN", "comment": "", @@ -1379,7 +1387,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/defaultForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2974,8 +2982,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3044,8 +3051,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 30, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3087,14 +3093,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -3252,8 +3251,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3284,8 +3282,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3678,14 +3675,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -4685,8 +4675,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -4716,14 +4705,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -5188,8 +5170,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" "b/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" index 6d381445a..2d531fb66 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" @@ -180,14 +180,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -244,8 +237,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -496,14 +488,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -570,14 +555,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -786,8 +764,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаСписка", + "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаДокумента", + "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + }, "description": "Анкета", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -798,9 +800,7 @@ "uuid": "f829e2a9-5bdb-4171-8b32-8d10d5968813", "name": "ФормаДокумента", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаДокумента", - "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -824,7 +824,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Documents/Анкета/Forms/ФормаДокумента/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1756,8 +1756,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1798,8 +1797,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 200, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1846,9 +1844,7 @@ "uuid": "647ba8f8-57f7-4c19-af59-525517c1e392", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаСписка", - "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -1872,7 +1868,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Documents/Анкета/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2085,15 +2081,15 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Documents/Анкета/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Documents/Анкета/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Documents/Анкета/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Documents/Анкета/Ext/ManagerModule.bsl" ] ] ], @@ -2233,8 +2229,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" "b/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" index 53f9dc60b..4034fa252 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" @@ -180,14 +180,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -244,8 +237,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 11, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -496,14 +488,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 10, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (10, Переменная)", - "nameEn": "StringQualifiers (10, Variable)" - } - } + "allowedLength": 0 } } ] @@ -570,14 +555,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -786,8 +764,32 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/auxiliaryChoiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаСписка", + "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Document.Анкета.Form.ФормаДокумента", + "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + }, "description": "Анкета", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.StandardAttribute/synonym" @@ -798,9 +800,7 @@ "uuid": "f829e2a9-5bdb-4171-8b32-8d10d5968813", "name": "ФормаДокумента", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаДокумента", - "mdoRefRu": "Документ.Анкета.Форма.ФормаДокумента" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "", @@ -824,7 +824,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Documents/Анкета/Forms/ФормаДокумента/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1740,8 +1740,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1782,8 +1781,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 200, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1830,9 +1828,7 @@ "uuid": "647ba8f8-57f7-4c19-af59-525517c1e392", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Document.Анкета.Form.ФормаСписка", - "mdoRefRu": "Документ.Анкета.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -1856,7 +1852,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Documents/Анкета/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Document/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -2069,15 +2065,15 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Documents/Анкета/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Documents/Анкета/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Documents/Анкета/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Documents/Анкета/ManagerModule.bsl" ] ] ], @@ -2217,8 +2213,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" index 59a302dc8..0d20df17d 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" @@ -40,8 +40,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -125,8 +124,22 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "description": "Статусы обработчиков обновления", "enumValues": [ [ diff --git "a/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" index 650cb0cc0..160b18819 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" @@ -40,8 +40,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -125,8 +124,22 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "commands": [], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Enum/auxiliaryChoiceForm" + }, "description": "Статусы обработчиков обновления", "enumValues": [ [ diff --git "a/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" "b/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" index 41c23328b..f92e6e954 100644 --- "a/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" @@ -38,14 +38,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -163,8 +156,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -339,8 +331,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -398,8 +389,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -471,14 +461,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -544,6 +527,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "commands": [], "comment": "", "content": [ @@ -3815,6 +3809,15 @@ ], [] ], + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "description": "Обновление информационной базы", "distributedInfoBase": false, "explanation": { @@ -3828,15 +3831,15 @@ "mdoType": "EXCHANGE_PLAN", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" "b/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" index b4d3b0a2c..5eebff767 100644 --- "a/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" @@ -38,14 +38,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -163,8 +156,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -339,8 +331,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 25, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -398,8 +389,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 9, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -471,14 +461,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -544,6 +527,17 @@ ], [] ], + "auxiliaryChoiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "commands": [], "comment": "", "content": [ @@ -3815,6 +3809,15 @@ ], [] ], + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, + "defaultObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/auxiliaryChoiceForm" + }, "description": "Обновление информационной базы", "distributedInfoBase": false, "explanation": { @@ -3828,15 +3831,15 @@ "mdoType": "EXCHANGE_PLAN", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" "b/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" index 9a27ccae1..b5bfb1751 100644 --- "a/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213.json" @@ -1,7 +1,15 @@ {"com.github._1c_syntax.bsl.mdo.FilterCriterion": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "content": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/auxiliaryForm" + }, "description": "Связанные документы", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" "b/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" index 9a27ccae1..b5bfb1751 100644 --- "a/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/FilterCriteria.\320\241\320\262\321\217\320\267\320\260\320\275\320\275\321\213\320\265\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\321\213_edt.json" @@ -1,7 +1,15 @@ {"com.github._1c_syntax.bsl.mdo.FilterCriterion": { + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, "commands": [], "comment": "", "content": [], + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/auxiliaryForm" + }, "description": "Связанные документы", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" index 22828da96..954cbab98 100644 --- "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -219,8 +211,24 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "type": "FORM", + "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", + "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + }, "description": "Склонения представлений объектов", "dimensions": [ [ @@ -274,8 +282,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -350,9 +357,7 @@ "uuid": "823f925c-b71f-42b1-a71e-0aab823f59c6", "name": "ФормаЗаписи", "mdoReference": { - "type": "FORM", - "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", - "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "objectBelonging": "OWN", "comment": "", @@ -376,7 +381,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/InformationRegisters/СклоненияПредставлени_Объектов/Forms/ФормаЗаписи/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -603,14 +608,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" index c4a8e14a1..d2d31f9ae 100644 --- "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\241\320\272\320\273\320\276\320\275\320\265\320\275\320\270\321\217\320\237\321\200\320\265\320\264\321\201\321\202\320\260\320\262\320\273\320\265\320\275\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -219,8 +211,24 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "type": "FORM", + "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", + "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + }, "description": "Склонения представлений объектов", "dimensions": [ [ @@ -274,8 +282,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 40, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -350,9 +357,7 @@ "uuid": "823f925c-b71f-42b1-a71e-0aab823f59c6", "name": "ФормаЗаписи", "mdoReference": { - "type": "FORM", - "mdoRef": "InformationRegister.СклоненияПредставленийОбъектов.Form.ФормаЗаписи", - "mdoRefRu": "РегистрСведений.СклоненияПредставленийОбъектов.Форма.ФормаЗаписи" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "objectBelonging": "OWN", "comment": "", @@ -376,7 +381,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/InformationRegisters/СклоненияПредставлени_Объектов/Forms/ФормаЗаписи/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/forms/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/defaultRecordForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -603,14 +608,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" index 80b2846f1..37f75db2a 100644 --- "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -460,14 +452,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -688,8 +673,22 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "description": "Электронные подписи", "dimensions": [ [ @@ -799,8 +798,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1289,8 +1287,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 28, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" index d5366953c..5fb81ddcc 100644 --- "a/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" @@ -93,8 +93,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -188,14 +187,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -460,14 +452,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -688,8 +673,22 @@ ], [] ], + "auxiliaryListForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliaryRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "commands": [], "comment": "", + "defaultListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, + "defaultRecordForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/auxiliaryListForm" + }, "description": "Электронные подписи", "dimensions": [ [ @@ -799,8 +798,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -1289,8 +1287,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 28, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" index 43b23d5da..aef56b422 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262.json" @@ -1,7 +1,24 @@ {"com.github._1c_syntax.bsl.mdo.Report": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "description": "Анализ версий объектов", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" index 6c8471597..0842b424c 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Reports.\320\220\320\275\320\260\320\273\320\270\320\267\320\222\320\265\321\200\321\201\320\270\320\271\320\236\320\261\321\212\320\265\320\272\321\202\320\276\320\262_edt.json" @@ -1,7 +1,24 @@ {"com.github._1c_syntax.bsl.mdo.Report": { "attributes": [], + "auxiliaryForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "commands": [], "comment": "", + "defaultForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultSettingsForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, + "defaultVariantForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Report/auxiliaryForm" + }, "description": "Анализ версий объектов", "explanation": { "content": [] diff --git "a/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" index 4c4a0f5f2..72f490206 100644 --- "a/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" @@ -1,5 +1,23 @@ {"com.github._1c_syntax.bsl.mdo.SettingsStorage": { + "auxiliaryLoadForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/auxiliaryLoadForm" + }, "comment": "", + "defaultLoadForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + }, + "defaultSaveForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + }, "description": "Хранилище вариантов отчетов", "forms": [ [ @@ -302,14 +320,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -346,9 +357,7 @@ "uuid": "57964dd6-4b0b-4590-bc44-de744cc423af", "name": "ВыборВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "objectBelonging": "OWN", "comment": "", @@ -372,7 +381,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ВыборВариантаОтчета/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1736,14 +1745,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -3569,8 +3571,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3602,8 +3603,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -3705,8 +3705,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -4079,14 +4078,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -4151,9 +4143,7 @@ "uuid": "364cbfe2-bc44-4387-aa7e-6b4aa086c9e9", "name": "СохранениеВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "objectBelonging": "OWN", "comment": "", @@ -4177,7 +4167,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчета/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[9]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -6084,8 +6074,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" index 46016454b..2b26d68f0 100644 --- "a/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" @@ -1,5 +1,23 @@ {"com.github._1c_syntax.bsl.mdo.SettingsStorage": { + "auxiliaryLoadForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "auxiliarySaveForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/auxiliaryLoadForm" + }, "comment": "", + "defaultLoadForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + }, + "defaultSaveForm": { + "type": "FORM", + "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", + "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + }, "description": "Хранилище вариантов отчетов", "forms": [ [ @@ -302,14 +320,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -346,9 +357,7 @@ "uuid": "57964dd6-4b0b-4590-bc44-de744cc423af", "name": "ВыборВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.ВыборВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.ВыборВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "objectBelonging": "OWN", "comment": "", @@ -372,7 +381,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ВыборВариантаОтчета/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultLoadForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -1736,14 +1745,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 1, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (Дата)", - "nameEn": "DateQualifiers (Date)" - } - } + "dateFractions": 1 } } ] @@ -3569,8 +3571,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -3602,8 +3603,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 5, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -3705,8 +3705,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -4079,14 +4078,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 10, "scale": 0, - "nonNegative": false, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыЧисла (10.0)", - "nameEn": "NumberQualifiers (10.0)" - } - } + "nonNegative": false } } ] @@ -4151,9 +4143,7 @@ "uuid": "364cbfe2-bc44-4387-aa7e-6b4aa086c9e9", "name": "СохранениеВариантаОтчета", "mdoReference": { - "type": "FORM", - "mdoRef": "SettingsStorage.ХранилищеВариантовОтчетов.Form.СохранениеВариантаОтчета", - "mdoRefRu": "ХранилищеНастроек.ХранилищеВариантовОтчетов.Форма.СохранениеВариантаОтчета" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "objectBelonging": "OWN", "comment": "", @@ -4177,7 +4167,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчета/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[9]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/defaultSaveForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -6084,8 +6074,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 20, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] diff --git "a/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" "b/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" index 22abf7f59..b7d6c8e62 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" @@ -432,8 +432,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -663,14 +662,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -727,8 +719,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 1, - "description": {} + "allowedLength": 1 } } ] @@ -1098,14 +1089,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1220,8 +1204,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1488,6 +1471,15 @@ ], [] ], + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, "commands": [ [ { @@ -1654,6 +1646,19 @@ [] ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + }, "description": "Задача", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" @@ -3914,8 +3919,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -4030,9 +4034,7 @@ "uuid": "a9957f43-8b6f-4d98-a2d8-77b78047494c", "name": "ФормаЗадачи", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "Форма выполнения задачи по умолчанию", @@ -4056,7 +4058,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Tasks/ЗадачаИсполнителя/Forms/ФормаЗадачи/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[7]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4494,9 +4496,7 @@ "uuid": "e470e15d-1b06-43cb-a9f9-ba489e2f596f", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -4520,7 +4520,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/designer/ssl_3_2/src/cf/Tasks/ЗадачаИсполнителя/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[8]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4977,8 +4977,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5020,8 +5019,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5072,15 +5070,15 @@ "mdoType": "TASK", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/designer/ssl_3_2/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_2/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" ] ] ], diff --git "a/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" index 6edb770e4..db23cc775 100644 --- "a/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_2/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" @@ -432,8 +432,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 150, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -663,14 +662,7 @@ }, "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.DateQualifiers": { - "dateFractions": 2, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыДаты (ДатаВремя)", - "nameEn": "DateQualifiers (DateTime)" - } - } + "dateFractions": 2 } } ] @@ -727,8 +719,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 14, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1098,14 +1089,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 0, - "allowedLength": 0, - "description": { - "value": { - "@class": "com.github._1c_syntax.bsl.types.MultiName", - "nameRu": "КвалификаторыСтроки (0, Переменная)", - "nameEn": "StringQualifiers (0, Variable)" - } - } + "allowedLength": 0 } } ] @@ -1220,8 +1204,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 500, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -1488,6 +1471,15 @@ ], [] ], + "auxiliaryChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryListForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "auxiliaryObjectForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, "commands": [ [ { @@ -1654,6 +1646,19 @@ [] ], "comment": "", + "defaultChoiceForm": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/choiceForm" + }, + "defaultListForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + }, + "defaultObjectForm": { + "type": "FORM", + "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", + "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + }, "description": "Задача", "explanation": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" @@ -3914,8 +3919,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": false, - "description": {} + "nonNegative": false } } ] @@ -4030,9 +4034,7 @@ "uuid": "a9957f43-8b6f-4d98-a2d8-77b78047494c", "name": "ФормаЗадачи", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаЗадачи", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаЗадачи" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "objectBelonging": "OWN", "comment": "Форма выполнения задачи по умолчанию", @@ -4056,7 +4058,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Tasks/ЗадачаИсполнителя/Forms/ФормаЗадачи/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[7]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultObjectForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4478,9 +4480,7 @@ "uuid": "e470e15d-1b06-43cb-a9f9-ba489e2f596f", "name": "ФормаСписка", "mdoReference": { - "type": "FORM", - "mdoRef": "Task.ЗадачаИсполнителя.Form.ФормаСписка", - "mdoRefRu": "Задача.ЗадачаИсполнителя.Форма.ФормаСписка" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "objectBelonging": "OWN", "comment": "", @@ -4504,7 +4504,7 @@ "moduleType": "FormModule", "uri": "src/test/resources/ext/edt/ssl_3_2/configuration/src/Tasks/ЗадачаИсполнителя/Forms/ФормаСписка/Module.bsl", "owner": { - "@reference": "/com.github._1c_syntax.bsl.mdo.Task/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[8]/mdoReference" + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/defaultListForm" }, "supportVariant": "NOT_EDITABLE", "isProtected": false @@ -4961,8 +4961,7 @@ "com.github._1c_syntax.bsl.types.qualifiers.NumberQualifiers": { "precision": 1, "scale": 0, - "nonNegative": true, - "description": {} + "nonNegative": true } } ] @@ -5004,8 +5003,7 @@ "int": 1, "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": { "length": 100, - "allowedLength": 0, - "description": {} + "allowedLength": 0 } } ] @@ -5056,15 +5054,15 @@ "mdoType": "TASK", "moduleTypes": [ [ - "ManagerModule", + "ObjectModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" ] ], [ - "ObjectModule", + "ManagerModule", [ - "src/test/resources/ext/edt/ssl_3_2/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_2/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" ] ] ],