From 2597cd247963b9664b345b71542dd0bb9ff9b5e6 Mon Sep 17 00:00:00 2001
From: Cmen <1176967590@qq.com>
Date: Sat, 19 Mar 2022 15:31:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=BF=87=E5=A4=9A=E6=97=B6=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E4=BD=8D=E7=BD=AE=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?#2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/editor/Catalog/index.tsx    | 42 ++++++++++++++++--------------
 src/editor/Catalog/style.less   |  4 +++
 src/editor/index.less           | 46 +++++++++++++++++++++++++++++++++
 src/store/reducers/map/index.ts |  1 -
 4 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/src/editor/Catalog/index.tsx b/src/editor/Catalog/index.tsx
index 101bc2b..0be61b7 100644
--- a/src/editor/Catalog/index.tsx
+++ b/src/editor/Catalog/index.tsx
@@ -63,26 +63,28 @@ const Catalog = () => {
   });
 
   return (
-    <Collapse
-      defaultActiveKey={["1", "2", "3", "4", "5"]}
-      expandIconPosition="right"
-    >
-      <Panel header="矩形" key={1}>
-        <OverlayList overlays={rectangles} />
-      </Panel>
-      <Panel header="多边形" key={2}>
-        <OverlayList overlays={polygons} />
-      </Panel>
-      <Panel header="多段线" key={3}>
-        <OverlayList overlays={polylines} />
-      </Panel>
-      <Panel header="圆形" key={4}>
-        <OverlayList overlays={circles} />
-      </Panel>
-      <Panel header="标记点" key={5}>
-        <OverlayList overlays={points} />
-      </Panel>
-    </Collapse>
+    <div className="catalog-wrapper">
+      <Collapse
+        defaultActiveKey={["1", "2", "3", "4", "5"]}
+        expandIconPosition="right"
+      >
+        <Panel header="矩形" key={1}>
+          <OverlayList overlays={rectangles} />
+        </Panel>
+        <Panel header="多边形" key={2}>
+          <OverlayList overlays={polygons} />
+        </Panel>
+        <Panel header="多段线" key={3}>
+          <OverlayList overlays={polylines} />
+        </Panel>
+        <Panel header="圆形" key={4}>
+          <OverlayList overlays={circles} />
+        </Panel>
+        <Panel header="标记点" key={5}>
+          <OverlayList overlays={points} />
+        </Panel>
+      </Collapse>
+    </div>
   );
 };
 
diff --git a/src/editor/Catalog/style.less b/src/editor/Catalog/style.less
index e16906b..78078fb 100644
--- a/src/editor/Catalog/style.less
+++ b/src/editor/Catalog/style.less
@@ -17,3 +17,7 @@
 .overlay-item-selected {
   background-color: #e5e6e7;
 }
+.catalog-wrapper{
+  height: 100%;
+  overflow-y: scroll;
+}
\ No newline at end of file
diff --git a/src/editor/index.less b/src/editor/index.less
index 8dd9e9a..2787774 100644
--- a/src/editor/index.less
+++ b/src/editor/index.less
@@ -19,3 +19,49 @@
 #mapStage {
   height: 100%;
 }
+
+// ----------------------------- scroll thumb ---------------------
+body {
+  user-select: none;
+  /*---滚动条大小--*/
+  /*---滚动条默认显示样式--*/
+  /*---鼠标点击滚动条显示样式--*/
+  /*---滚动框背景样式--*/
+  /* 滚动条的滑轨背景颜色 */
+  /* 滑块颜色 */
+  /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
+}
+body ::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+  background: white;
+  border-left: 1px solid #e8e8e8;
+}
+body #node-editor-graph-root input {
+  color: #2b2b2b;
+}
+body ::-webkit-scrollbar-thumb {
+  border-width: 1px;
+  border-style: solid;
+  border-color: #e4e4e4;
+  border-radius: 6px;
+  background: #c9c9c9;
+}
+body ::-webkit-scrollbar-thumb:hover {
+  background-color: #c6c6c6;
+}
+body ::-webkit-scrollbar-track-piece {
+  border-radius: 0;
+}
+body ::-webkit-scrollbar-track {
+  background-color: #e4e4e4;
+}
+body ::-webkit-scrollbar-thumb {
+  background-color: rgba(0, 0, 0, 0.2);
+}
+body ::-webkit-scrollbar-corner {
+  background-color: #eee;
+}
+/* stylelint-disable no-duplicate-selectors */
+/* stylelint-disable */
+/* stylelint-disable declaration-bang-space-before,no-duplicate-selectors,string-no-newline */
diff --git a/src/store/reducers/map/index.ts b/src/store/reducers/map/index.ts
index c04c190..1c23b0e 100644
--- a/src/store/reducers/map/index.ts
+++ b/src/store/reducers/map/index.ts
@@ -34,7 +34,6 @@ export function finishEditOverlay(state = initState, payload: any) {
     const { overlays } = draft.map;
     const existed = overlays.find((overlay) => overlay.id === id);
     if (existed) {
-      console.log(overlay);
       overlays[overlays.indexOf(existed)] = {
         ...existed,
         ...overlay,