Update version to 1.11.0

Author: agile.zhou

src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj

@@ -3,11 +3,11 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-		<AssemblyVersion>1.10.0</AssemblyVersion>
-		<Version>1.10.0</Version>
-		<PackageVersion>1.10.0</PackageVersion>
+		<AssemblyVersion>1.11.0</AssemblyVersion>
+		<Version>1.11.0</Version>
+		<PackageVersion>1.11.0</PackageVersion>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<FileVersion>1.10.0</FileVersion>
+		<FileVersion>1.11.0</FileVersion>
 		<Authors>kklldog</Authors>
 		<Company>kklldog</Company>
 	</PropertyGroup>

src/AgileConfig.Server.UI/react-ui-antd/src/locales/en-US/pages.ts

@@ -225,7 +225,14 @@ export default {
   'pages.configs.rollback_warning': 'Note: This operation will clear all current pending configuration items',
   'pages.configs.sync_failed': 'Sync failed',
   'pages.configs.sync_from_to': 'Sync configurations from current {env} environment to:',
-
+  'pages.configs.version.status.add': 'Add',
+  'pages.configs.version.status.edit': 'Edit',
+  'pages.configs.version.status.delete': 'Delete',
+  'pages.configs.version.status.committed': 'Committed',
+  'pages.configs.version.editStatus': 'Change',
+  'pages.configs.version.rolling_back': 'Rolling Back',
+  'pages.configs.version.rollback_success': 'Rollback Success',
+  'pages.configs.version.rollback_fail': 'Rollback Failed',
   'pages.configs.confirm_publish_current': 'Are you sure to publish current',
   'pages.configs.confirm_publish_wait_items': 'wait publish config items?',
   'pages.configs.confirm_cancel_edit': 'Are you sure to cancel edit config',
@@ -293,6 +300,15 @@ export default {
   'pages.role.load_failed': 'Failed to load roles',
   'pages.role.permissions.load_failed': 'Failed to load permissions',
   'pages.role.permissions.all': 'All',
+  'pages.role.permissionGroup.APP': 'App',
+  'pages.role.permissionGroup.CONFIG': 'Config',
+  'pages.role.permissionGroup.NODE': 'Node',
+  'pages.role.permissionGroup.CLIENT': 'Client',
+  'pages.role.permissionGroup.USER': 'User',
+  'pages.role.permissionGroup.ROLE': 'Role',
+  'pages.role.permissionGroup.SERVICE': 'Service',
+  'pages.role.permissionGroup.LOG': 'Log',
+  'pages.role.permissionGroup.OTHER': 'Other',
   'pages.role.permissions.APP_ADD': 'Add App',
   'pages.role.permissions.APP_EDIT': 'Edit App',
   'pages.role.permissions.APP_DELETE': 'Delete App',

src/AgileConfig.Server.UI/react-ui-antd/src/locales/zh-CN/pages.ts

@@ -245,6 +245,14 @@ export default {
 
   'pages.config.waitpublish_at_least_one':'请至少选中一个待上线配置项',
   'pages.config.online_at_least_one':'请至少选中一个已上线配置项',
+  'pages.configs.version.status.add': '新建',
+  'pages.configs.version.status.edit': '编辑',
+  'pages.configs.version.status.delete': '删除',
+  'pages.configs.version.status.committed': '已提交',
+  'pages.configs.version.editStatus': '变更',
+  'pages.configs.version.rolling_back': '正在回滚',
+  'pages.configs.version.rollback_success': '回滚成功',
+  'pages.configs.version.rollback_fail': '回滚失败',
 
   // User management
   'pages.user.table.cols.username': '用户名',
@@ -267,7 +275,7 @@ export default {
   'pages.user.status.deleted': '已删除',
   'pages.user.confirm_reset': '确定重置用户',
   'pages.user.confirm_delete': '确定删除用户',
-    'pages.user.reset_password_default': '的密码为默认密码【123456】?',
+  'pages.user.reset_password_default': '的密码为默认密码【123456】?',
   'pages.role.table.cols.name': '名称',
   'pages.role.table.cols.description': '描述',
   'pages.role.table.cols.system': '系统角色',
@@ -291,6 +299,15 @@ export default {
   'pages.role.load_failed': '加载角色失败',
   'pages.role.permissions.load_failed': '加载权限列表失败',
   'pages.role.permissions.all': '所有权限',
+  'pages.role.permissionGroup.APP': '应用',
+  'pages.role.permissionGroup.CONFIG': '配置',
+  'pages.role.permissionGroup.NODE': '节点',
+  'pages.role.permissionGroup.CLIENT': '客户端',
+  'pages.role.permissionGroup.USER': '用户',
+  'pages.role.permissionGroup.ROLE': '角色',
+  'pages.role.permissionGroup.SERVICE': '服务',
+  'pages.role.permissionGroup.LOG': '日志',
+  'pages.role.permissionGroup.OTHER': '其他',
   'pages.role.permissions.APP_ADD': '应用新增',
   'pages.role.permissions.APP_EDIT': '应用编辑',
   'pages.role.permissions.APP_DELETE': '应用删除',

src/AgileConfig.Server.UI/react-ui-antd/src/pages/Role/index.tsx

@@ -3,7 +3,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import { Button, message, Modal, Space, Tag } from 'antd';
 import { ModalForm, ProFormSelect, ProFormText } from '@ant-design/pro-form';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useIntl } from 'umi';
 import type { RoleFormValues, RoleItem } from './data';
 import { createRole, deleteRole, fetchSupportedRolePermissions, queryRoles, updateRole } from '@/services/role';
@@ -23,6 +23,13 @@ const RolePage: React.FC = () => {
     loadPermissions();
   }, []);
 
+  const permissionGroupLabel = (prefix: string) => {
+    return intl.formatMessage({
+      id: `pages.role.permissionGroup.${prefix}`,
+      defaultMessage: prefix,
+    });
+  };
+
   const loadPermissions = async () => {
     try {
       const response = await fetchSupportedRolePermissions();
@@ -36,10 +43,31 @@ const RolePage: React.FC = () => {
     }
   };
 
-  const permissionOptions = supportedPermissions.map((item) => ({
-    value: item,
-    label: intl.formatMessage({ id: `pages.role.permissions.${item}`, defaultMessage: item }),
-  }));
+  const groupedPermissionOptions = useMemo(() => {
+    const groupMap: Record<
+      string,
+      {
+        label: string;
+        options: { value: string; label: string }[];
+      }
+    > = {};
+
+    supportedPermissions.forEach((item) => {
+      const prefix = item.split('_')[0] || 'OTHER';
+      if (!groupMap[prefix]) {
+        groupMap[prefix] = {
+          label: permissionGroupLabel(prefix),
+          options: [],
+        };
+      }
+      groupMap[prefix].options.push({
+        value: item,
+        label: intl.formatMessage({ id: `pages.role.permissions.${item}`, defaultMessage: item }),
+      });
+    });
+
+    return Object.values(groupMap);
+  }, [intl, supportedPermissions]);
 
   const handleCreate = async (values: RoleFormValues) => {
     const hide = message.loading(intl.formatMessage({ id: 'saving', defaultMessage: 'Saving...' }));
@@ -227,7 +255,7 @@ const RolePage: React.FC = () => {
           name="functions"
           label={intl.formatMessage({ id: 'pages.role.form.functions', defaultMessage: 'Permissions' })}
           mode="multiple"
-          options={permissionOptions}
+          options={groupedPermissionOptions}
         />
       </ModalForm>
 
@@ -268,7 +296,7 @@ const RolePage: React.FC = () => {
             name="functions"
             label={intl.formatMessage({ id: 'pages.role.form.functions', defaultMessage: 'Permissions' })}
             mode="multiple"
-            options={permissionOptions}
+            options={groupedPermissionOptions}
           />
         </ModalForm>
       )}