From 42d40221c994caa470478c86605b2b006b7839b8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 六月 2023 14:19:01 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/chart/antv-X6/index.scss | 146 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 143 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/chart/antv-X6/index.scss b/src/menu/components/chart/antv-X6/index.scss
index afcc501..81fff7a 100644
--- a/src/menu/components/chart/antv-X6/index.scss
+++ b/src/menu/components/chart/antv-X6/index.scss
@@ -1,4 +1,4 @@
-.menu-scatter-chart-edit-box {
+.menu-x6-chart-edit-box {
position: relative;
box-sizing: border-box;
background: #ffffff;
@@ -6,6 +6,37 @@
background-repeat: no-repeat;
background-size: cover;
+ .mk-toolbar {
+ width: 100%;
+ height: 40px;
+ border: 1px solid #1890ff;
+
+ .left-tool {
+ float: left;
+ line-height: 40px;
+ .anticon {
+ margin: 0 10px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
+ .right-tool {
+ float: right;
+ line-height: 40px;
+ .anticon {
+ margin: 0 10px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
+ }
+ .x6-graph-scroller::-webkit-scrollbar {
+ display: none;
+ }
+ .x6-cell.x6-edge.x6-edge-selected path:last-child {
+ stroke: #1890ff;
+ }
+
.canvas {
margin: 0px;
letter-spacing: 0px;
@@ -13,11 +44,120 @@
.mk-stencil {
width: 180px;
+ min-width: 180px;
height: 100%;
position: relative;
z-index: 2;
border-right: 1px solid #dfe3e8;
+ transition: all 0.2s;
+
+ .x6-widget-stencil-title {
+ display: none;
+ }
+ .x6-widget-stencil-content {
+ overflow-y: auto;
+ }
+ .x6-widget-stencil-content::-webkit-scrollbar {
+ width: 7px;
+ }
+ .x6-widget-stencil-content::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13);
+ background: rgba(0, 0, 0, 0.13);
+ }
+ .x6-widget-stencil-content::-webkit-scrollbar-track {
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
+ border-radius: 3px;
+ border: 1px solid rgba(0, 0, 0, 0.07);
+ background: rgba(0, 0, 0, 0);
+ }
+ .tool-control {
+ position: absolute;
+ right: -13px;
+ top: 5px;
+ z-index: 3;
+ background: #ffffff;
+ width: 25px;
+ height: 25px;
+ border: 1px solid #d8d8d8;
+ border-radius: 30px;
+ text-align: center;
+ line-height: 25px;
+ cursor: pointer;
+ }
}
+ .mk-stencil.merge {
+ width: 0px;
+ min-width: 0px;
+
+ .tool-control {
+ right: -25px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ .anticon-double-left {
+ transform: rotate(180deg);
+ }
+ }
+ }
+
+ .mk-node-edit {
+ width: 180px;
+ min-width: 180px;
+ height: 100%;
+ position: relative;
+ z-index: 2;
+ border-left: 1px solid #dfe3e8;
+ transition: all 0.2s;
+
+ .header {
+ width: 100%;
+ height: 32px;
+ text-align: center;
+ line-height: 32px;
+ background-color: #f5f5f5!important;
+ overflow-x: hidden;
+ white-space: nowrap;
+ }
+ .empty {
+ width: 100%;
+ text-align: center;
+ padding-top: 20px;
+ overflow-x: hidden;
+ white-space: nowrap;
+ }
+
+ .tool-control {
+ position: absolute;
+ left: -13px;
+ top: 5px;
+ z-index: 3;
+ background: #ffffff;
+ width: 25px;
+ height: 25px;
+ border: 1px solid #d8d8d8;
+ border-radius: 30px;
+ text-align: center;
+ line-height: 25px;
+ cursor: pointer;
+ .anticon-double-left {
+ transform: rotate(180deg);
+ }
+ }
+ }
+ .mk-node-edit.merge {
+ width: 0px;
+ min-width: 0px;
+
+ .tool-control {
+ left: -25px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ .anticon-double-left {
+ transform: rotate(0deg);
+ }
+ }
+ }
+
.mk-container {
width: calc(100% - 180px);
height: 100%;
@@ -29,7 +169,7 @@
background-color: #fff;
}
.x6-widget-stencil-group-title {
- background-color: #fff !important;
+ background-color: #f5f5f5!important;
}
.x6-widget-transform {
margin: -1px 0 0 -1px;
@@ -87,7 +227,7 @@
background: rgba(255, 255, 255, 0.55);
}
}
-.menu-scatter-chart-edit-box:hover {
+.menu-x6-chart-edit-box:hover {
z-index: 1;
box-shadow: 0px 0px 4px #1890ff;
}
--
Gitblit v1.8.0