diff --git a/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap b/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap index 353865c40..ddfad2d24 100644 --- a/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap +++ b/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap @@ -176,7 +176,61 @@ exports[`base/UserCenter should hidden action when user is not admin 1`] = ` >
+ > +
+ +
+
+ + + + - + + +
+ + + + +
+ 7002002 +
+ + + +
+ +
+
+ + + +
+
- - - - - -
- - - @@ -1175,7 +1636,61 @@ exports[`base/UserCenter should render user list when it first entered the user >
+ > +
+ +
+
+ @@ -1217,6 +1733,12 @@ exports[`base/UserCenter should render user list when it first entered the user class="ant-table-thead" > + + ID + + +
+ 11132422 +
+ + + +
+ + +
+ @@ -1419,6 +2021,86 @@ exports[`base/UserCenter should render user list when it first entered the user class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795520" > + +
+ 1647895752866795520 +
+ + + +
+ + +
+ @@ -1522,6 +2204,86 @@ exports[`base/UserCenter should render user list when it first entered the user class="ant-table-row ant-table-row-level-0" data-row-key="700200" > + +
+ 700200 +
+ + + +
+ + +
+ @@ -1696,6 +2458,86 @@ exports[`base/UserCenter should render user list when it first entered the user class="ant-table-row ant-table-row-level-0" data-row-key="7002001" > + +
+ 7002001 +
+ + + +
+ + +
+ @@ -1758,62 +2600,142 @@ exports[`base/UserCenter should render user list when it first entered the user style="padding-bottom: 4px;" > + 全局浏览 + +
+ + + + - + + +
+
+
+ +
+
+ +
+
+
+ + + + +
+ 7002002 +
+ + + +
+ +
- - - - - - - -
-
-
- -
- + +
-
+
- - @@ -2326,7 +3248,61 @@ exports[`base/UserCenter switch to operate permission list 1`] = ` >
+ > +
+ +
+
+ @@ -2368,6 +3345,12 @@ exports[`base/UserCenter switch to operate permission list 1`] = ` class="ant-table-thead" > + + ID + + +
+ 11132422 +
+ + + +
+ + +
+ @@ -2551,25 +3614,105 @@ exports[`base/UserCenter switch to operate permission list 1`] = `
+ +
+ + + + + + +
+ 1647895752866795520 +
+ + + +
+ +
+ - - @@ -2673,6 +3816,86 @@ exports[`base/UserCenter switch to operate permission list 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="700200" > + +
+ 700200 +
+ + + +
+ + +
+ @@ -2847,6 +4070,86 @@ exports[`base/UserCenter switch to operate permission list 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="7002001" > + +
+ 7002001 +
+ + + +
+ + +
+ @@ -2932,39 +4235,119 @@ exports[`base/UserCenter switch to operate permission list 1`] = `
-
+ +
+
+ +
+
+ + + + + +
+ 7002002 +
+ + + +
+ +
+ ... +
- + +
- + - - @@ -3781,7 +5164,61 @@ exports[`base/UserCenter switch to role list 1`] = ` >
+ > +
+ +
+
+ @@ -3823,6 +5261,12 @@ exports[`base/UserCenter switch to role list 1`] = ` class="ant-table-thead" > + + ID + + +
+ 11132422 +
+ + + +
+ + +
+ @@ -4012,19 +5536,99 @@ exports[`base/UserCenter switch to role list 1`] = ` class="ant-btn ant-btn-default ant-btn-sm ant-btn-dangerous actiontech-table-actions-button basic-button-wrapper css-1vnelmv" type="button" > - - 删 除 - - + + 删 除 + + +
+ + + + + + +
+ 1647895752866795520 +
+ + + +
+ +
+ - - @@ -4128,6 +5732,86 @@ exports[`base/UserCenter switch to role list 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="700200" > + +
+ 700200 +
+ + + +
+ + +
+ @@ -4302,6 +5986,86 @@ exports[`base/UserCenter switch to role list 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="7002001" > + +
+ 7002001 +
+ + + +
+ + +
+ @@ -4420,6 +6184,86 @@ exports[`base/UserCenter switch to role list 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="7002002" > + +
+ 7002002 +
+ + + +
+ + +
+ diff --git a/packages/base/src/page/UserCenter/components/UserList/List.tsx b/packages/base/src/page/UserCenter/components/UserList/List.tsx index af5ac534b..81bd7d6fe 100644 --- a/packages/base/src/page/UserCenter/components/UserList/List.tsx +++ b/packages/base/src/page/UserCenter/components/UserList/List.tsx @@ -7,7 +7,8 @@ import { ActiontechTable, useTableRequestError, useTableRequestParams, - TableToolbar + TableToolbar, + ColumnsSettingProps } from '@actiontech/dms-kit/es/components/ActiontechTable'; import { ResponseCode } from '@actiontech/dms-kit'; import { IListUser } from '@actiontech/shared/lib/api/base/service/common'; @@ -105,6 +106,14 @@ const UserList: React.FC<{ activePage: UserCenterListEnum }> = ({ ); }, [parse2TableActionPermissions, onEditUser, onDeleteUser, username]); + const tableSetting = useMemo( + () => ({ + tableName: 'user_list', + username: username + }), + [username] + ); + useEffect(() => { const { unsubscribe } = EventEmitter.subscribe( EmitterKey.DMS_Refresh_User_Center_List, @@ -124,9 +133,11 @@ const UserList: React.FC<{ activePage: UserCenterListEnum }> = ({ refreshBySearchKeyword(); } }} + setting={tableSetting} />
+ > +
+ +
+
+ @@ -111,6 +166,12 @@ exports[`base/UserCenter/UserList render user table 1`] = ` class="ant-table-thead" > + + ID + + +
+ 11132422 +
+ + + +
+ + +
+ @@ -313,6 +454,86 @@ exports[`base/UserCenter/UserList render user table 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795520" > + +
+ 1647895752866795520 +
+ + + +
+ + +
+ @@ -416,6 +637,86 @@ exports[`base/UserCenter/UserList render user table 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="700200" > + +
+ 700200 +
+ + + +
+ + +
+ @@ -590,6 +891,86 @@ exports[`base/UserCenter/UserList render user table 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="7002001" > + +
+ 7002001 +
+ + + +
+ + +
+ @@ -708,6 +1089,86 @@ exports[`base/UserCenter/UserList render user table 1`] = ` class="ant-table-row ant-table-row-level-0" data-row-key="7002002" > + +
+ 7002002 +
+ + + +
+ + +
+ @@ -1052,41 +1513,96 @@ exports[`base/UserCenter/UserList should disabled action when current role is no >
-
-
-
-
-
-
- - - - - - - - - - + + + +
+ 表格设置 +
+
+ + + +
+ + + + + + +
+
+
+
+
+
+
+ + + + + + + + + + @@ -1094,6 +1610,12 @@ exports[`base/UserCenter/UserList should disabled action when current role is no class="ant-table-thead" > + + @@ -1925,6 +2902,12 @@ exports[`base/UserCenter/UserList should hidden action column when is not admin class="ant-table-thead" > + + @@ -2908,6 +4346,12 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-thead" > + + + + - - + + + - - + + + - - + @@ -5526,6 +8625,12 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-thead" > + + + + - - + + + - - + + + - - + @@ -8144,6 +12904,12 @@ exports[`base/UserCenter/UserList should render empty tips when request not succ class="ant-table-thead" > +
+ ID + + +
+ 11132422 +
+ + + +
+ + +
+ 		@@ -1266,6 +1868,86 @@ exports[`base/UserCenter/UserList should disabled action when current role is no class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795520" > + +
+ 1647895752866795520 +
+ + + +
+ + +
+ 		@@ -1339,6 +2021,86 @@ exports[`base/UserCenter/UserList should disabled action when current role is no class="ant-table-row ant-table-row-level-0" data-row-key="700200" > + +
+ 700200 +
+ + + +
+ + +
+ 		@@ -1482,6 +2244,86 @@ exports[`base/UserCenter/UserList should disabled action when current role is no class="ant-table-row ant-table-row-level-0" data-row-key="7002001" > + +
+ 7002001 +
+ + + +
+ + +
+ 		@@ -1570,6 +2412,86 @@ exports[`base/UserCenter/UserList should disabled action when current role is no class="ant-table-row ant-table-row-level-0" data-row-key="7002002" > + +
+ 7002002 +
+ + + +
+ + +
+ 		@@ -1877,14 +2799,68 @@ exports[`base/UserCenter/UserList should hidden action column when is not admin -
-
-
+
+
+
+ +
+
+
+ ID + +
+ 11132422 +
+ + + +
+ + +
+ 		@@ -2127,6 +3190,86 @@ exports[`base/UserCenter/UserList should hidden action column when is not admin class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795520" > + +
+ 1647895752866795520 +
+ + + +
+ + +
+ 		@@ -2230,6 +3373,86 @@ exports[`base/UserCenter/UserList should hidden action column when is not admin class="ant-table-row ant-table-row-level-0" data-row-key="700200" > + +
+ 700200 +
+ + + +
+ + +
+ 		@@ -2404,6 +3627,86 @@ exports[`base/UserCenter/UserList should hidden action column when is not admin class="ant-table-row ant-table-row-level-0" data-row-key="7002001" > + +
+ 7002001 +
+ + + +
+ + +
+ 		@@ -2522,6 +3825,86 @@ exports[`base/UserCenter/UserList should hidden action column when is not admin class="ant-table-row ant-table-row-level-0" data-row-key="7002002" > + +
+ 7002002 +
+ + + +
+ + +
+ 		@@ -2860,14 +4243,68 @@ exports[`base/UserCenter/UserList should refresh user table when change current -
-
-
+
+
+
+ +
+
+
+ ID + + +
+ 164789575286679550 +
+ + + +
+ + +
+ 		@@ -3080,6 +4604,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679551" > + +
+ 164789575286679551 +
+ + + +
+ + +
+ 		@@ -3194,6 +4798,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679552" > + +
+ 164789575286679552 +
+ + + +
+ + +
+ 		@@ -3308,6 +4992,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679553" > + +
+ 164789575286679553 +
+ + + +
+ + +
+ 		@@ -3422,6 +5186,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679554" > + +
+ 164789575286679554 +
+ + + +
+ + +
+ 		@@ -3523,19 +5367,99 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-btn ant-btn-default ant-btn-sm ant-btn-dangerous actiontech-table-actions-button basic-button-wrapper css-1vnelmv" type="button" > - - 删 除 - - + + 删 除 + + + + + +
+
+ 164789575286679555 +
+ + + +
+ +
+
@@ -3650,6 +5574,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679556" > + +
+ 164789575286679556 +
+ + + +
+ + +
+ 		@@ -3764,6 +5768,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679557" > + +
+ 164789575286679557 +
+ + + +
+ + +
+ 		@@ -3878,6 +5962,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679558" > + +
+ 164789575286679558 +
+ + + +
+ + +
+ 		@@ -3992,6 +6156,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="164789575286679559" > + +
+ 164789575286679559 +
+ + + +
+ + +
+ 		@@ -4106,6 +6350,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795510" > + +
+ 1647895752866795510 +
+ + + +
+ + +
+ 		@@ -4187,39 +6511,119 @@ exports[`base/UserCenter/UserList should refresh user table when change current
-
+ +
+
+ +
+
+ +
+
+ 1647895752866795511 +
+ + + +
+ +
+ ... +
- + +
- +
@@ -4334,6 +6738,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795512" > + +
+ 1647895752866795512 +
+ + + +
+ + +
+ 		@@ -4448,6 +6932,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795513" > + +
+ 1647895752866795513 +
+ + + +
+ + +
+ 		@@ -4562,6 +7126,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795514" > + +
+ 1647895752866795514 +
+ + + +
+ + +
+ 		@@ -4676,6 +7320,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795515" > + +
+ 1647895752866795515 +
+ + + +
+ + +
+ 		@@ -4790,6 +7514,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795516" > + +
+ 1647895752866795516 +
+ + + +
+ + +
+ 		@@ -4896,14 +7700,94 @@ exports[`base/UserCenter/UserList should refresh user table when change current - + + +
+
+ 1647895752866795517 +
+ + + +
+ +
@@ -5018,6 +7902,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795518" > + +
+ 1647895752866795518 +
+ + + +
+ + +
+ 		@@ -5132,6 +8096,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795519" > + +
+ 1647895752866795519 +
+ + + +
+ + +
+ 		@@ -5484,7 +8528,61 @@ exports[`base/UserCenter/UserList should refresh user table when change current >
+ > +
+ +
+
+ ID + + +
+ 1647895752866795520 +
+ + + +
+ + +
+ 		@@ -5698,6 +8883,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795521" > + +
+ 1647895752866795521 +
+ + + +
+ + +
+ 		@@ -5783,35 +9048,115 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-space-item" style="margin-right: 8px;" > - - + + +
+ +
+ + +
+
+ 1647895752866795522 +
+ + + +
+ +
+
@@ -5926,6 +9271,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795523" > + +
+ 1647895752866795523 +
+ + + +
+ + +
+ 		@@ -6040,6 +9465,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795524" > + +
+ 1647895752866795524 +
+ + + +
+ + +
+ 		@@ -6154,6 +9659,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795525" > + +
+ 1647895752866795525 +
+ + + +
+ + +
+ 		@@ -6268,6 +9853,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795526" > + +
+ 1647895752866795526 +
+ + + +
+ + +
+ 		@@ -6382,6 +10047,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795527" > + +
+ 1647895752866795527 +
+ + + +
+ + +
+ 		@@ -6483,19 +10228,99 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-btn ant-btn-default ant-btn-sm ant-btn-dangerous actiontech-table-actions-button basic-button-wrapper css-1vnelmv" type="button" > - - 删 除 - - + + 删 除 + + + + + +
+
+ 1647895752866795528 +
+ + + +
+ +
+
@@ -6610,6 +10435,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795529" > + +
+ 1647895752866795529 +
+ + + +
+ + +
+ 		@@ -6724,6 +10629,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795530" > + +
+ 1647895752866795530 +
+ + + +
+ + +
+ 		@@ -6838,6 +10823,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795531" > + +
+ 1647895752866795531 +
+ + + +
+ + +
+ 		@@ -6952,6 +11017,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795532" > + +
+ 1647895752866795532 +
+ + + +
+ + +
+ 		@@ -7066,6 +11211,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795533" > + +
+ 1647895752866795533 +
+ + + +
+ + +
+ 		@@ -7151,35 +11376,115 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-space-item" style="margin-right: 8px;" > - - + + +
+ +
+ + +
+
+ 1647895752866795534 +
+ + + +
+ +
+
@@ -7294,6 +11599,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795535" > + +
+ 1647895752866795535 +
+ + + +
+ + +
+ 		@@ -7408,6 +11793,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795536" > + +
+ 1647895752866795536 +
+ + + +
+ + +
+ 		@@ -7522,6 +11987,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795537" > + +
+ 1647895752866795537 +
+ + + +
+ + +
+ 		@@ -7636,6 +12181,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795538" > + +
+ 1647895752866795538 +
+ + + +
+ + +
+ 		@@ -7750,6 +12375,86 @@ exports[`base/UserCenter/UserList should refresh user table when change current class="ant-table-row ant-table-row-level-0" data-row-key="1647895752866795539" > + +
+ 1647895752866795539 +
+ + + +
+ + +
+ 		@@ -8102,7 +12807,61 @@ exports[`base/UserCenter/UserList should render empty tips when request not succ >
+ > +
+ +
+
+ ID +
ActiontechTableColumn = () => [ +export const UserListColumns: () => ActiontechTableColumn = () => [ + { + dataIndex: 'uid', + title: 'ID', + className: 'ellipsis-column-width', + render: (uid) => { + return ; + } + }, { dataIndex: 'name', title: () => t('common.username')