Browse Source

ExtensionPropertyLookupConfiguration added.

pull/6135/head
Ilkay Ilknur 6 years ago
parent
commit
476ae4bd11
  1. 4
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/IBasicObjectExtensionPropertyInfo.cs
  2. 8
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfiguration.cs
  3. 9
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyLookupConfiguration.cs
  4. 1
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs
  5. 4
      framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs

4
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/IBasicObjectExtensionPropertyInfo.cs

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using JetBrains.Annotations; using JetBrains.Annotations;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.ObjectExtending.Modularity;
namespace Volo.Abp.ObjectExtending namespace Volo.Abp.ObjectExtending
{ {
@ -34,5 +35,8 @@ namespace Volo.Abp.ObjectExtending
/// </summary> /// </summary>
[CanBeNull] [CanBeNull]
public Func<object> DefaultValueFactory { get; set; } public Func<object> DefaultValueFactory { get; set; }
[NotNull]
public ExtensionPropertyLookupConfiguration LookupConfiguration { get; set; }
} }
} }

8
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfiguration.cs

@ -28,7 +28,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
[NotNull] [NotNull]
public Dictionary<string, object> Configuration { get; } public Dictionary<string, object> Configuration { get; }
/// <summary> /// <summary>
/// Single point to enable/disable this property for the clients (UI and API). /// Single point to enable/disable this property for the clients (UI and API).
/// If this is false, the configuration made in the <see cref="UI"/> and the <see cref="Api"/> /// If this is false, the configuration made in the <see cref="UI"/> and the <see cref="Api"/>
@ -42,7 +42,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
[NotNull] [NotNull]
public ExtensionPropertyUiConfiguration UI { get; } public ExtensionPropertyUiConfiguration UI { get; }
[NotNull] [NotNull]
public ExtensionPropertyApiConfiguration Api { get; } public ExtensionPropertyApiConfiguration Api { get; }
@ -59,6 +59,9 @@ namespace Volo.Abp.ObjectExtending.Modularity
[CanBeNull] [CanBeNull]
public Func<object> DefaultValueFactory { get; set; } public Func<object> DefaultValueFactory { get; set; }
[NotNull]
public ExtensionPropertyLookupConfiguration LookupConfiguration { get; set; }
public ExtensionPropertyConfiguration( public ExtensionPropertyConfiguration(
[NotNull] EntityExtensionConfiguration entityExtensionConfiguration, [NotNull] EntityExtensionConfiguration entityExtensionConfiguration,
[NotNull] Type type, [NotNull] Type type,
@ -78,6 +81,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
Attributes.AddRange(ExtensionPropertyHelper.GetDefaultAttributes(Type)); Attributes.AddRange(ExtensionPropertyHelper.GetDefaultAttributes(Type));
DefaultValue = TypeHelper.GetDefaultValue(Type); DefaultValue = TypeHelper.GetDefaultValue(Type);
LookupConfiguration = new ExtensionPropertyLookupConfiguration();
} }
public object GetDefaultValue() public object GetDefaultValue()

9
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyLookupConfiguration.cs

@ -0,0 +1,9 @@
namespace Volo.Abp.ObjectExtending.Modularity
{
public class ExtensionPropertyLookupConfiguration
{
public string ApiUrl { get; set; }
public string DisplayPropertyName { get; set; } = "text";
public string ValuePropertyName { get; set; } = "id";
}
}

1
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs

@ -155,6 +155,7 @@ namespace Volo.Abp.ObjectExtending.Modularity
property.Validators.AddRange(propertyConfig.Validators); property.Validators.AddRange(propertyConfig.Validators);
property.DefaultValue = propertyConfig.DefaultValue; property.DefaultValue = propertyConfig.DefaultValue;
property.DefaultValueFactory = propertyConfig.DefaultValueFactory; property.DefaultValueFactory = propertyConfig.DefaultValueFactory;
property.LookupConfiguration = propertyConfig.LookupConfiguration;
} }
); );
} }

4
framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using JetBrains.Annotations; using JetBrains.Annotations;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.ObjectExtending.Modularity;
using Volo.Abp.Reflection; using Volo.Abp.Reflection;
namespace Volo.Abp.ObjectExtending namespace Volo.Abp.ObjectExtending
@ -57,6 +58,9 @@ namespace Volo.Abp.ObjectExtending
[CanBeNull] [CanBeNull]
public Func<object> DefaultValueFactory { get; set; } public Func<object> DefaultValueFactory { get; set; }
[NotNull]
public ExtensionPropertyLookupConfiguration LookupConfiguration { get; set; }
public ObjectExtensionPropertyInfo( public ObjectExtensionPropertyInfo(
[NotNull] ObjectExtensionInfo objectExtension, [NotNull] ObjectExtensionInfo objectExtension,
[NotNull] Type type, [NotNull] Type type,

Loading…
Cancel
Save