diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaries/DataDictionaryAppService.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaries/DataDictionaryAppService.cs index 13dd8619..b862122a 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaries/DataDictionaryAppService.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaries/DataDictionaryAppService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates; +using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dto; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos; using Lion.AbpPro.DataDictionaryManagement.Permissions; using Lion.AbpPro.Extension.Customs.Dtos; @@ -61,7 +62,7 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries public async Task> GetPagingDetailListAsync( PagingDataDictionaryDetailInput input) { - var entity = await _dataDictionaryRepository.FindByIdAsync(input.DataDictionaryId, true); + var entity = await _dataDictionaryRepository.FindByIdAsync(input.DataDictionaryId); var details = entity.Details .WhereIf(input.Filter.IsNotNullOrWhiteSpace(), e => (e.Code.Contains(input.Filter) || e.DisplayText.Contains(input.Filter))) .OrderBy(e => e.Order) @@ -109,6 +110,8 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries input.Order); } + + [Authorize(DataDictionaryManagementPermissions.DataDictionaryManagement.Delete)] public Task DeleteAsync(DeleteDataDictionaryDetailInput input) { return _dataDictionaryManager.DeleteAsync(input.DataDictionaryId, input.DataDictionayDetailId); diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaryManagementApplicationAutoMapperProfile.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaryManagementApplicationAutoMapperProfile.cs index caf3c45a..87102040 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaryManagementApplicationAutoMapperProfile.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/DataDictionaryManagementApplicationAutoMapperProfile.cs @@ -1,5 +1,6 @@ using AutoMapper; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates; +using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dto; using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos; namespace Lion.AbpPro.DataDictionaryManagement diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs index f4734c4e..6f44c722 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs @@ -22,6 +22,9 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries _cache = cache; } + + + public async Task FindByIdAsync( Guid id, CancellationToken cancellationToken = default) diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Program.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Program.cs index 7d5fc248..053d760b 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Program.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Program.cs @@ -23,7 +23,6 @@ namespace Lion.AbpPro { webBuilder.ConfigureKestrel((context, options) => { options.Limits.MaxRequestBodySize = 1024 * 50; }); webBuilder.UseStartup(); - webBuilder.UseUrls("http://localhost:44315"); }) .UseSerilog((context, loggerConfiguration) => { diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Properties/launchSettings.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Properties/launchSettings.json index 06204a73..eef4b766 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Properties/launchSettings.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Properties/launchSettings.json @@ -5,7 +5,7 @@ "launchBrowser": true, "applicationUrl": "http://localhost:44315", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Production" + "ASPNETCORE_ENVIRONMENT": "Development" } } } diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 69f0e2fd..00000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,63 +0,0 @@ -version: '3' -services: - mysql: - image: mysql:5.7.26 - # network_mode: "host" # 如果需要容器使用宿主机IP(内网IP)，则可以配置此项 - container_name: abp-pro-mysql # 指定容器名称，如果不设置此参数，则由系统自动生成 - restart: always # 设置容器自启模式 - command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci # 设置utf8字符集 - environment: - - TZ=Asia/Shanghai # 设置容器时区与宿主机保持一致 - - MYSQL_ROOT_PASSWORD=1q2w3E* # 设置root密码 - volumes: - - /etc/localtime:/etc/localtime:ro # 设置容器时区与宿主机保持一致 - ports: - - "3307:3306" - networks: - - lionAbpPro - - redis: - image: redis:5.0.4 - container_name: abp-pro-redis - restart: always - command: redis-server # 启动redis命令 - environment: - - TZ=Asia/Shanghai - volumes: - - /etc/localtime:/etc/localtime:ro # 设置容器时区与宿主机保持一致 - ports: - - "6380:6379" - networks: - - lionAbpPro - - rabbitMq: - image: rabbitmq:management - container_name: abp-pro-rabbitMq - restart: always - ports: - - "5673:5672" - - "15673:15672" - environment: - - RABBITMQ_DEFAULT_USER=admin - - RABBITMQ_DEFAULT_PASS=1q2w3E* - networks: - - lionAbpPro - - consul: - image: consul - ports: - - 8300:8300 - - 8301:8301 - - 8301:8301/udp - - 8302:8302 - - 8302:8302/udp - - 8400:8400 - - 8500:8500 - - 53:53/udp - command: agent -server -bind=0.0.0.0 -client=0.0.0.0 -node=consul_Server1 -bootstrap-expect=1 -ui - networks: - - lionAbpPro - -networks: - lionAbpPro: - driver: bridge \ No newline at end of file diff --git a/vben271/src/views/admin/dictionary/AbpDictionary.ts b/vben271/src/views/admin/dictionary/AbpDictionary.ts index 5152625a..5c80ca4f 100644 --- a/vben271/src/views/admin/dictionary/AbpDictionary.ts +++ b/vben271/src/views/admin/dictionary/AbpDictionary.ts @@ -11,7 +11,7 @@ import { } from '/@/services/ServiceProxies'; import { h } from 'vue'; import { Switch } from 'ant-design-vue'; -import { debug } from 'console'; + const { t } = useI18n(); export const tableColumns: BasicColumn[] = [ { @@ -270,6 +270,9 @@ export const editDictionaryTypeFormSchema: FormSchema[] = [ colProps: { span: 22, }, + componentProps: { + disabled: true, + }, }, { field: 'displayText', @@ -408,4 +411,3 @@ export async function deleteDictinaryTypeAsync({ Id, reloadType }) { await _dataDictionaryServiceProxy.deleteDictinaryType(request); reloadType(); } - diff --git a/vben271/src/views/admin/dictionary/AbpDictionary.vue b/vben271/src/views/admin/dictionary/AbpDictionary.vue index 80c0ae48..608e99ca 100644 --- a/vben271/src/views/admin/dictionary/AbpDictionary.vue +++ b/vben271/src/views/admin/dictionary/AbpDictionary.vue @@ -65,10 +65,10 @@ /> - + - + diff --git a/vben271/src/views/admin/dictionary/CreateAbpDictionaryType.vue b/vben271/src/views/admin/dictionary/CreateAbpDictionaryType.vue index 356e4149..5539e1c6 100644 --- a/vben271/src/views/admin/dictionary/CreateAbpDictionaryType.vue +++ b/vben271/src/views/admin/dictionary/CreateAbpDictionaryType.vue @@ -20,7 +20,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'; import { createDictionaryTypeFormSchema, createDictionaryTypeAsync } from './AbpDictionary'; export default defineComponent({ - name: 'EditDictionary', + name: 'CreateAbpDictionaryType', components: { BasicModal, BasicForm, @@ -44,7 +44,7 @@ validate, resetFields, }); - emit('reloadType'); + emit('reload'); } catch (error) { changeOkLoading(false); } diff --git a/vben271/src/views/admin/dictionary/EditAbpDictionaryType.vue b/vben271/src/views/admin/dictionary/EditAbpDictionaryType.vue index f5da95b0..e6526ea7 100644 --- a/vben271/src/views/admin/dictionary/EditAbpDictionaryType.vue +++ b/vben271/src/views/admin/dictionary/EditAbpDictionaryType.vue @@ -47,7 +47,7 @@ try { let request = getFieldsValue(); await editDictionaryTypeAsync({ request, changeOkLoading, validate, closeModal }); - emit('reloadType'); + emit('reload'); } catch (error) { changeOkLoading(false); }