@jiaozhiye/qm-design-react 1.7.2 → 1.7.4

package/lib/table/src/context/index.d.ts

@@ -65,14 +65,13 @@ export type ITableContext = {
     setSpinning: (value: boolean) => void;
     setFullScreen: (value: boolean) => void;
     setShouldToTop: (value: boolean) => void;
-    setOverlay: (value: boolean) => void;
     doFieldValidate: (rules: IRule[], val: unknown, rowKey: IRowKey, columnKey: string) => void;
     createTableData: (list: IRecord[]) => void;
     createGroupData: (records: IRecord[]) => IRecord[];
     findParentRowKeys: (deriveRowKeys: IDerivedRowKey[], key: IRowKey) => IRowKey[];
     getAllChildRowKeys: (deriveRowKeys: IDerivedRowKey[]) => IRowKey[];
     triggerScrollYEvent: (st: number) => void;
-    scrollBottomDebouncer: (event: React.SyntheticEvent<HTMLDivElement>) => void;
+    scrollBottomDebouncer: (event: React.MouseEvent<HTMLDivElement>) => void;
     resetTableScroll: () => void;
     clearTableSorter: () => void;
     clearTableFilter: () => void;

package/lib/table/src/hooks/useTableCore.d.ts

@@ -75,13 +75,13 @@ declare const useTableCore: <T extends ITableProps>(props: T, extra: IExtra) =>
         removed: IRecord<any>[];
     };
     dataChange: () => void;
-    tableChange: import("lodash").DebouncedFunc<() => void>;
+    tableChange: (...args: any[]) => void;
     toLastPage: () => void;
     toFirstPage: () => void;
     getPageCount: () => number;
     pagerChangeHandle: ({ current, pageSize }: Omit<IPagination, 'total'>) => void;
     triggerScrollYEvent: (st: number) => void;
-    scrollBottomDebouncer: import("lodash").DebouncedFunc<(ev: React.SyntheticEvent<HTMLDivElement>) => void>;
+    scrollBottomDebouncer: (...args: any[]) => void;
     clearTableSorter: () => void;
     clearTableFilter: () => void;
     clearSuperFilters: () => void;

package/lib/table/src/hooks/useTableRef.d.ts

@@ -38,7 +38,6 @@ export type ITableRef = {
     selectionRows: IRecord[];
     recordsMap: Map<IRowKey, IRecord>;
     isHandleChange: boolean;
-    isOverlay: boolean;
     isIE: boolean;
 };
 type IExtra = {
@@ -63,7 +62,6 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     setSelectionRows: (selectKeys: IRecord[]) => void;
     setRecordsMap: (key: IRowKey, value: IRecord) => void;
     setHandleChange: (value: boolean) => void;
-    setOverlay: (value: boolean) => void;
     clearElementStore: () => void;
     clearRecordsMap: () => void;
     uid: string;
@@ -101,7 +99,6 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     selectionRows: IRecord[];
     recordsMap: Map<IRowKey, IRecord>;
     isHandleChange: boolean;
-    isOverlay: boolean;
     isIE: boolean;
     tableRef: React.MutableRefObject<ITableRef>;
 };

package/lib/table/src/table/props.d.ts

@@ -134,6 +134,7 @@ export declare const propTypes: {
     customClass: PropTypes.Requireable<string>;
     showHeader: PropTypes.Requireable<boolean>;
     ellipsis: PropTypes.Requireable<boolean>;
+    nativeScrollBar: PropTypes.Requireable<boolean>;
     rowStyle: PropTypes.Requireable<object>;
     cellStyle: PropTypes.Requireable<object>;
     mergeCells: PropTypes.Requireable<any[]>;

package/lib/table/src/table/types.d.ts

@@ -333,6 +333,7 @@ export type ITableProps = {
     customClass?: string;
     showHeader?: boolean;
     ellipsis?: boolean;
+    nativeScrollBar?: boolean;
     rowStyle?: CSSProperties | ((row: IRecord, rowIndex: number) => CSSProperties);
     cellStyle?: CSSProperties | ((row: IRecord, column: IColumn, rowIndex: number, columnIndex: number) => CSSProperties);
     mergeCells?: IMergeCell[];
@@ -389,7 +390,7 @@ export type ITableProps = {
     onRowDblclick?: (row: IRecord, column: IColumn, event: React.MouseEvent<HTMLTableCellElement>) => void;
     onRowContextmenu?: (row: IRecord, column: IColumn, event: React.MouseEvent<HTMLTableCellElement>) => void;
     onRowEnter?: (row: IRecord, event: KeyboardEvent) => void;
-    onScrollEnd?: (event: React.SyntheticEvent<HTMLDivElement>) => void;
+    onScrollEnd?: (event: React.MouseEvent<HTMLDivElement>) => void;
     onMergeChange?: (cells: IMergeCell[]) => void;
 };
 export type TableRef = {

package/lib/table/style/table.less

@@ -2,7 +2,7 @@
  * @Author: 焦质晔
  * @Date: 2021-07-23 19:05:57
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2022-06-24 14:28:19
+ * @Last Modified time: 2023-06-03 21:46:35
  */
 @import '../../style/common';
 
@@ -68,21 +68,22 @@
   &--body-wrapper {
     overflow-y: auto;
     overflow-x: auto;
-    & > .merge-cell-bar {
+  }
+
+  &--merge-cell {
+    position: absolute;
+    display: none;
+    border: 2px solid @v-primary-color;
+    border-radius: @v-border-radius;
+    background-color: rgba(255, 255, 255, 0.3);
+    z-index: 9;
+    .btn {
       position: absolute;
-      display: none;
-      border: 2px solid @v-primary-color;
-      border-radius: @v-border-radius;
-      background-color: rgba(255, 255, 255, 0.3);
-      z-index: 9;
-      .btn {
-        position: absolute;
-        right: -54px;
-        bottom: 0;
-      }
-      .cancel {
-        bottom: 30px;
-      }
+      right: -54px;
+      bottom: 0;
+    }
+    .cancel {
+      bottom: 30px;
     }
   }
 
@@ -218,13 +219,6 @@
     .cell-fix-right {
       position: sticky;
       z-index: 2;
-      .gutter-overlay {
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: -1px;
-        background-color: @v-table-background-color;
-      }
     }
     .cell-fix-left-last {
       &::after {
@@ -313,6 +307,9 @@
     width: 0;
     float: left;
     visibility: hidden;
+    &::after {
+      content: '.';
+    }
   }
 
   /* 列宽线 */

package/lib/tabs/style/index.less

@@ -2,7 +2,7 @@
  * @Author: 焦质晔
  * @Date: 2021-07-23 19:05:57
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2022-03-16 20:33:11
+ * @Last Modified time: 2023-06-04 10:46:23
  */
 @import '../../style/common';
 
@@ -12,10 +12,10 @@
   .ant-tabs-nav {
     margin-bottom: @--margin-md;
   }
-  &.ant-tabs-top .ant-tabs-tab {
-    padding-left: @--padding-md;
-    padding-right: @--padding-md;
-  }
+  // &.ant-tabs-top .ant-tabs-tab {
+  //   padding-left: @--padding-md;
+  //   padding-right: @--padding-md;
+  // }
   // ------ size ------
   // 40  32  24
   &--lg {
@@ -23,3 +23,10 @@
   &--sm {
   }
 }
+
+// 重置 antd Tabs 样式
+.ant-tabs {
+  &-content:not(&-content-animated) {
+    position: static;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiaozhiye/qm-design-react",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "A Component Library for React",
   "keywords": [
     "React",