@jiaozhiye/qm-design-react 1.9.20 → 1.9.22

package/lib/scrollbar/src/scrollbar.d.ts

@@ -10,6 +10,7 @@ type IProps = {
     wrapClassName?: string;
     wrapStyle?: CSSProperties;
     barWidth?: number;
+    showTopScrollbar?: boolean;
     always?: boolean;
     minSize?: number;
     native?: boolean;

package/lib/scrollbar/src/thumb.d.ts

@@ -7,6 +7,7 @@ export type IThumbOption = {
 type IProps = {
     thumb: IThumbOption;
     direction?: 'horizontal' | 'vertical';
+    className?: string;
     barSize?: number;
     always?: boolean;
     onDrag?: (value: boolean) => void;

package/lib/scrollbar/style/index.less

@@ -40,6 +40,10 @@
     &.is-horizontal {
       height: 6px;
       left: 2px;
+      &.top {
+        top: 2px;
+        bottom: auto;
+      }
       & > div {
         height: 100%;
       }

package/lib/style/index.css

@@ -27516,6 +27516,10 @@ table {
   height: 6px;
   left: 2px;
 }
+.qm-scrollbar__bar.is-horizontal.top {
+  top: 2px;
+  bottom: auto;
+}
 .qm-scrollbar__bar.is-horizontal > div {
   height: 100%;
 }
@@ -28546,7 +28550,7 @@ table {
  * @Author: 焦质晔
  * @Date: 2021-07-23 19:05:57
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2022-03-16 19:06:00
+ * @Last Modified time: 2024-07-23 09:28:50
  */
 /*
  * @Author: 焦质晔
@@ -29196,7 +29200,7 @@ table {
  * @Author: 焦质晔
  * @Date: 2021-07-23 19:05:57
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-07-02 09:33:48
+ * @Last Modified time: 2024-07-24 10:41:26
  */
 .qm-table--wrapper {
   box-sizing: border-box;
@@ -29266,22 +29270,6 @@ table {
   overflow-y: auto;
   overflow-x: auto;
 }
-.qm-table--merge-cell {
-  position: absolute;
-  display: none;
-  border: 2px solid #1890ff;
-  border-radius: 2px;
-  background-color: rgba(255, 255, 255, 0.3);
-  z-index: 9;
-}
-.qm-table--merge-cell .btn {
-  position: absolute;
-  right: -54px;
-  bottom: 0;
-}
-.qm-table--merge-cell .cancel {
-  bottom: 30px;
-}
 .qm-table.c--resize {
   cursor: col-resize;
 }
@@ -29462,8 +29450,13 @@ table {
 .qm-table:not(.is--border) .body--column {
   border-bottom: 1px solid #e8e8e8;
 }
-.qm-table.is--merge-cell .qm-table--body-wrapper > table > tbody {
-  pointer-events: none;
+.qm-table.is--area-select .qm-table--body-wrapper > div {
+  position: relative;
+}
+.qm-table.is--area-select .qm-table--body-wrapper table td {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
 }
 .qm-table .body--x-space {
   height: 0;
@@ -29788,6 +29781,30 @@ table {
 .qm-table--footer-wrapper .qm-table--footer .footer--row:last-of-type .footer--column {
   border-bottom: 0;
 }
+/*
+ * @Author: 焦质晔
+ * @Date: 2024-07-23 09:27:27
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-07-24 13:32:48
+ */
+.qm-table--area-select {
+  position: static;
+  height: 0;
+  font-size: 0;
+}
+.qm-table--area-select .checked-area {
+  border: 1px solid #40a9ff;
+  background-color: rgba(186, 231, 255, 0.35);
+  position: absolute;
+  z-index: 2;
+  pointer-events: none;
+}
+.qm-table--area-select .active-area {
+  border: 2px solid #40a9ff;
+  position: absolute;
+  z-index: 2;
+  pointer-events: none;
+}
 /*
  * @Author: 焦质晔
  * @Date: 2020-03-26 11:45:02