From 4b36210154ceefffca8c7062bb0486050f45605b Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Wed, 17 Jan 2024 15:01:56 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8CTree=E6=8E=A7=E4=BB=B6=E6=96=87=E6=9C=AC=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OffPeakShareRecords/ShareParkMgm/loadable.jsx        |  4 ++--
 src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx    |  1 +
 src/pages/SystemMgm/AreaManage/index.scss                | 16 ++++++++++++++--
 src/pages/SystemMgm/AreaManage/loadable.jsx              |  5 ++++-
 src/pages/SystemMgm/OrgnizationMgm/index.scss            | 10 +++++++++-
 src/pages/SystemMgm/OrgnizationMgm/loadable.jsx          | 12 +++++++++++-
 6 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx
index 63572e1..2d767de 100644
--- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx
+++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx
@@ -74,7 +74,7 @@ function ShareParkMgm() {
       type: "SearchSelect",
       label: "车场名称",
       placeholder: "请输入车场名称",
-      name: "parkName",
+      name: "parkId",
       options: [{label: '全部', value: ""}, ...parkList]
     },
     {
@@ -153,7 +153,7 @@ function ShareParkMgm() {
   //搜索参数初始化
   const initFormData = {
     merchantName: "0",
-    parkName: "",
+    parkId: "",
     createPerson: ""
   };
   //搜索的结果
diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
index 4dfc26e..5061818 100644
--- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
+++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
@@ -36,6 +36,7 @@ function ModalAreaAdd(props) {
       }
       onOk(formData={...formData,id: editForm.id, ...latlngObj}, editStatus, )
       form.resetFields()
+      handleCancel()
     }).catch((err) => {
       console.log(err)
     })
diff --git a/src/pages/SystemMgm/AreaManage/index.scss b/src/pages/SystemMgm/AreaManage/index.scss
index a35db63..3519c21 100644
--- a/src/pages/SystemMgm/AreaManage/index.scss
+++ b/src/pages/SystemMgm/AreaManage/index.scss
@@ -6,11 +6,21 @@ $color-primary : var(--color-primary);
 
 .area-container {
   padding: 13px 20px;
+  .ant-tree-list {
+    overflow: hidden;
+  }
   .ant-tree {
-    width: 250px;
+    width: 300px;
+    .ant-tree-list-holder {
+      overflow: hidden;
+    }
     .ant-tree-title {
       .label-text {
+        // display: inline-block;
         margin-right: 20px;
+        text-wrap: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
       }
       .label-icon {
         margin-right: 5px;
@@ -45,7 +55,9 @@ $color-primary : var(--color-primary);
   padding: 4px 0 !important;
   width: 100%;
   .ant-tree-node-content-wrapper {
-    width: 100%;
+    width: unset !important;
+    flex: 1;
+    min-width: 0;
   }
   .dropdown-tree {
     display: none;
diff --git a/src/pages/SystemMgm/AreaManage/loadable.jsx b/src/pages/SystemMgm/AreaManage/loadable.jsx
index d56c848..82c1d41 100644
--- a/src/pages/SystemMgm/AreaManage/loadable.jsx
+++ b/src/pages/SystemMgm/AreaManage/loadable.jsx
@@ -160,9 +160,12 @@ function AreaManage() {
             setModalAreaVisible(true)
         }
     }
+
     const treeTitleRender = ({ name, children, level, pid, id, virtually_code, lng, lat, code, type }) => {
         return <>
-            <span className='label-text'>{name}</span>
+            <span className='label-text' title={name}>
+                {name}
+            </span>
             <div className="dropdown-tree">
                 <Dropdown
                     menu={{
diff --git a/src/pages/SystemMgm/OrgnizationMgm/index.scss b/src/pages/SystemMgm/OrgnizationMgm/index.scss
index 91921a0..7bc2d21 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/index.scss
+++ b/src/pages/SystemMgm/OrgnizationMgm/index.scss
@@ -11,10 +11,16 @@ $color-primary : var(--color-primary);
     .org-tree-container {
         width: 250px;
         margin-right: 20px;
+        .ant-tree-list {
+          overflow: hidden;
+        }
         .ant-tree {
             .ant-tree-title {
               .label-text {
                 margin-right: 20px;
+                text-wrap: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
               }
               .label-icon {
                 margin-right: 5px;
@@ -103,7 +109,9 @@ $color-primary : var(--color-primary);
   padding: 4px 0 !important;
   width: 100%;
   .ant-tree-node-content-wrapper {
-    width: 100%;
+    width: unset !important;
+    flex: 1;
+    min-width: 0;
   }
   .dropdown-tree {
     display: none;
diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
index 69bc6ba..1e88444 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
+++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
@@ -413,6 +413,14 @@ function OrgnizationMgm() {
         setEditStatus(true)
     }
 
+    const handleTreeText = (text) => {
+        if (text.length > 16) {
+            return text?.substring(0, 16) + '...'
+        } else {
+            return text
+        }
+    }
+
     const tabRender = useMemo(() => {
         return [
             {
@@ -533,7 +541,9 @@ function OrgnizationMgm() {
 
     const treeTitleRender = ({ name, children, level, pid, id, virtually_code, lng_lat, code }) => {
         return <>
-            <span className='label-text'>{name}</span>
+            <span className='label-text'>
+                { name + 'kajsndkjand阿里山扩大你' }
+            </span>
             <div className="dropdown-tree">
                 <Dropdown
                     menu={{