Feature/update version

package.json

@@ -12,22 +12,24 @@
   "dependencies": {
     "@ant-design/icons": "^5.5.1",
     "@ant-design/pro-list": "^2.6.2",
-    "antd": "^5.22.2",
+    "antd": "^6.1.4",
     "axios": "^1.7.8",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.13",
     "immer": "^10.0.3",
     "jsencrypt": "^3.3.2",
     "lodash-es": "^4.17.21",
+    "moment": "^2.30.1",
     "qs": "^6.13.1",
-    "react-admin-kit": "^0.5.10",
+    "react-admin-kit": "^1.0.4",
     "react-gov-ui": "^1.4.0",
     "umi": "^4.4.5"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5",
     "@testing-library/react": "^14",
     "@types/jest": "^29",
+    "@types/moment": "^2.13.0",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
     "@types/testing-library__jest-dom": "^5.14.5",

src/apis/index.ts

@@ -1,2 +1,3 @@
 export * from './common'
 export * from './system'
+

src/layouts/index.tsx

@@ -79,8 +79,12 @@ export default function Layout() {
       <SettingProvider
         proTableSetting={{
           size: tableSize,
-          confirmModalType: 'modal',
+          delConfirmType: 'modal',
+          pagination: { pageSize: 10 },
           options: { density: false, reload: true, fullScreen: true },
+          scroll: {
+            x: 'max-content',
+          },
         }}
         formUploadSetting={{
           action: '/api/accessory/upload',
@@ -115,9 +119,9 @@ export default function Layout() {
           },
         }}
         modalFormSetting={{
-          modalProps: {
-            maskClosable: false,
-          },
+          centered: true,
+
+          maskClosable: false,
         }}
       >
         <Helmet>

src/pages/system/role/index.tsx

@@ -252,6 +252,7 @@ class Role extends Component<any, any> {
             })}
           />
           <ModalForm
+            key={formData.id || 'new'}
             columns={getRoleColumns()}
             // modal参数
             title={formType === 'new' ? '新增角色' : '编辑角色'}

src/pages/system/user/index.tsx

@@ -9,7 +9,6 @@ import { hasPermission } from '@/utils'
 
 function User() {
   const [syncUsersLoading, setSyncUsersLoading] = useState(false)
-
   const actionRef = useRef<ActionRefType>()
   const innerRef = useRef<InnerRefType>()
 
@@ -38,6 +37,11 @@ function User() {
         delFunction={(ids) => delUser(ids[0])}
         delPermission={() => hasPermission('user:del')}
         options={false}
+
+
+        style={{
+          minWidth: '100%', // 确保表格占据最小宽度
+        }}
         toolbar={{
           title: [
             !1 && (