From 17c07839d1ccefc53aa5e01adb38bade1f3732a1 Mon Sep 17 00:00:00 2001
From: LvYan <928416908@qq.com>
Date: Thu, 13 Jun 2024 16:30:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8E=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eiam-console/src/main/console-fe/package.json |  3 ++-
 .../src/pages/account/UserList/UserList.tsx   | 21 ++++++++++++-------
 .../UserList/components/Organization/Tree.tsx |  4 ++--
 .../account/UserList/components/User/User.tsx |  6 +++---
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json
index 5bf71537..bc362716 100644
--- a/eiam-console/src/main/console-fe/package.json
+++ b/eiam-console/src/main/console-fe/package.json
@@ -49,6 +49,7 @@
     "@ant-design/icons": "^5.3.7",
     "@ant-design/maps": "^1.0.8",
     "@ant-design/pro-components": "^2.7.1",
+    "@ant-design/pro-editor": "^1.2.1",
     "ahooks": "^3.7.11",
     "antd": "^5.17.0",
     "antd-img-crop": "^4.21.0",
@@ -56,13 +57,13 @@
     "classnames": "^2.5.1",
     "codemirror": "^5.65.5",
     "content-security-policy-parser": "^0.6.0",
+    "copy-to-clipboard": "^3.3.3",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.11",
     "echarts": "^5.5.0",
     "fetch-jsonp": "^1.3.0",
     "form-render": "^2.4.4",
     "google-libphonenumber": "^3.2.34",
-    "copy-to-clipboard": "^3.3.3",
     "js-base64": "^3.7.7",
     "js-yaml": "^4.1.0",
     "jsencrypt": "^3.3.2",
diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx
index ba45f515..22c9fe82 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx
@@ -15,8 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+import { DraggablePanel } from '@ant-design/pro-editor';
 import { PageContainer } from '@ant-design/pro-components';
-import { Col, Row } from 'antd';
+import { Col, Flex, Row } from 'antd';
 import { useState } from 'react';
 import OrgTree from './components/Organization';
 import UserList from './components/User';
@@ -48,16 +50,19 @@ export const User = () => {
 
   return (
     <PageContainer content={intl.formatMessage({ id: 'pages.account.user_list.desc' })}>
-      <Row gutter={[16, 16]}>
+      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
         {/* 左侧 */}
-        <Col {...leftLayout} style={{ minHeight: '100%', overflow: 'auto' }}>
+        <DraggablePanel
+          placement="left"
+          maxWidth={800}
+          style={{ flex: 1, padding: 0, borderRadius: 12 }}
+        >
           <OrgTree onSelect={treeOnSelect} />
-        </Col>
+        </DraggablePanel>
+        <div style={{ width: 'auto', flex: 1, padding: '0px 6px' }}></div>
         {/* 表格 */}
-        <Col {...rightLayout} style={{ minHeight: '100%', overflow: 'auto' }}>
-          <UserList organization={organization} />
-        </Col>
-      </Row>
+        <UserList organization={organization} />
+      </div>
     </PageContainer>
   );
 };
diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx
index 2a6fa794..28e0a56c 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx
@@ -318,7 +318,7 @@ export const OrganizationTree = (props: {
   return (
     <div className={styles}>
       <Card
-        style={{ height: 'calc(100vh - 200px)', overflow: 'auto' }}
+        style={{ height: 'calc(100vh - 220px)', overflow: 'auto' }}
         bordered={false}
         className={classnames(`${prefixCls}`)}
       >
@@ -420,7 +420,7 @@ export const OrganizationTree = (props: {
                 await getRootOrganizationData();
                 return Promise.resolve(true);
               }
-              return Promise.resolve(false);
+              return Promise.resolvyarne(false);
             }}
             id={currentSelectedNode.id}
             visible={moveNodeVisible}
diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
index 874acced..9a91e3dd 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
@@ -387,7 +387,7 @@ export default (props: UserListProps) => {
   return (
     <>
       {!organization ? (
-        <Card style={{ height: 'calc(100vh - 200px)' }} bordered={false}>
+        <Card style={{ height: 'calc(100vh - 220px)' }} bordered={false}>
           <Skeleton paragraph={{ rows: 10 }} active={true} />
         </Card>
       ) : (
@@ -396,10 +396,10 @@ export default (props: UserListProps) => {
           scroll={{ x: 1200 }}
           params={{ organizationId: organization?.id, inclSubOrganization }}
           style={{
-            height: 'calc(100vh - 200px)',
+            height: 'calc(100vh - 220px)',
             overflow: 'auto',
           }}
-          cardProps={{ style: { minHeight: 'calc(100vh - 200px)' } }}
+          cardProps={{ style: { minHeight: 'calc(100vh - 220px)' } }}
           search={{
             defaultCollapsed: true,
           }}

From 64561a18bffe47c9a8a4c2ab5ee934250445d2f3 Mon Sep 17 00:00:00 2001
From: LvYan <928416908@qq.com>
Date: Thu, 13 Jun 2024 16:44:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/account/UserList/components/Organization/Tree.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx
index 28e0a56c..fb75be27 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx
@@ -420,7 +420,7 @@ export const OrganizationTree = (props: {
                 await getRootOrganizationData();
                 return Promise.resolve(true);
               }
-              return Promise.resolvyarne(false);
+              return Promise.resolve(false);
             }}
             id={currentSelectedNode.id}
             visible={moveNodeVisible}