merge bugfix

src/components/Common/GraphBase/index.jsx

@@ -44,6 +44,7 @@ function GraphBase(props) {
     selectWidth,
     legend,
   } = props;
+  const descSmall = props.descSmall || false;
   const iconSrc = useIcon(icon);
   const colors = useMemo(() => ["#ffd160", "#2760ff", "#15e8f5"], []);
   const [showChart, setShowChart] = useState(true);
@@ -72,9 +73,9 @@ function GraphBase(props) {
           <span
             style={{
               color: "#fff",
-              fontSize: "14px",
+              fontSize: "calc(14px * var(--scale))",
               lineHeight: 1,
-              paddingLeft: "12px",
+              paddingLeft: "calc(12px * var(--scale))",
             }}
           >
             - 无 -
@@ -105,7 +106,7 @@ function GraphBase(props) {
       <div className={cls.graphBaseTitle}>
         <img src={iconSrc} alt="#" />
         <h2>{title}</h2>
-        {desc && <div className={cls.graphBaseDesc}>{desc}</div>}
+        {desc && <div className={`${cls.graphBaseDesc} ${descSmall ? cls.graphBaseDescSmall : ''}`}>{desc}</div>}
       </div>
       <div className={cls.graphBaseContent}>
         {switchOptions && (

src/components/Common/GraphBase/index.module.css

@@ -93,6 +93,11 @@
 	color: #76fff9;
 }
 
+.graphBaseDescSmall {
+	font-size: 16px;
+	color: #76fff9;
+}
+
 .graphBaseSwitch {
 	position: absolute;
 	top: 30px;

src/components/Common/GraphBase/selector.style.overwrite.css

@@ -9,6 +9,7 @@
 
 .xc-date-selector-menu .ant-select-item-option-content {
     text-align: center;
+    font-size: calc(14px * var(--scale));
  }
 
 .xc-date-selector-menu .ant-select-item-option-selected {
@@ -20,10 +21,16 @@
     background-color: #02457E !important;
     color: #fff !important;
 }
+
+.xc-date-selector-menu .ant-select-item-option {
+    /* padding: 5px 8px; */
+    padding: .3em .35em;
+    min-height: unset;
+}
 /* 
 .ant-select-selector::after {
     content: '\25BC' !important;
-    visibility: visible !important; 
+    visibility: visible !important; L
     position: absolute;
     top: 2px;
     right: 22px;