✨ 数据字典类型添加编辑和删除

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<PagedResultDto<PagingDataDictionaryDetailOutput>> 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);

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

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<DataDictionaryDto> FindByIdAsync(
             Guid id,
             CancellationToken cancellationToken = default)

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<Startup>();
-                    webBuilder.UseUrls("http://localhost:44315");
                 })
                 .UseSerilog((context, loggerConfiguration) =>
                 {

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"
       }
     }
   }

docker-compose.yaml

@@ -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      

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();
 }
-

vben271/src/views/admin/dictionary/AbpDictionary.vue

@@ -65,10 +65,10 @@
           />
         </template>
       </BasicTable>
-      <CreateAbpDictionaryType @reloadType="reloadType" @register="registerCreateType" />
+      <CreateAbpDictionaryType @register="registerCreateType" @reload="reloadType" />
       <CreateAbpDictionary @register="registerCreateModal" @reload="reload" />
       <EditAbpDictionary @register="registerEditModal" @reload="reload" />
-      <EditAbpDictionaryType @register="registerEditTypeModal" @reload="reload" />
+      <EditAbpDictionaryType @register="registerEditTypeModal" @reload="reloadType" />
     </PageWrapper>
   </div>
 </template>

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);
         }

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);
         }