@zhenliang/sheet 0.1.32 → 0.1.33

package/dist/core/sheet/index.js

@@ -6,7 +6,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 // import ReduxLogger from 'redux-logger';
-import cls from 'classnames';
 import ReduxThunk from 'redux-thunk';
 import DefaultRow from "./DefaultRow";
 import DefaultShell from "./DefaultShell";
@@ -55,10 +54,7 @@ var Sheet = function Sheet(props) {
     scroll = props.scroll,
     children = props.children,
     showBackEdit = props.showBackEdit,
-    backEditStyle = props.backEditStyle,
-    _props$boldScroll = props.boldScroll,
-    boldScroll = _props$boldScroll === void 0 ? true : _props$boldScroll;
-  var scrollWarpRef = useRef(null);
+    backEditStyle = props.backEditStyle;
   var sheetWrapperRef = useRef(null);
   var contextMenuRef = useRef(null);
   var eventBus = useEventBus();
@@ -231,46 +227,34 @@ var Sheet = function Sheet(props) {
     }
     return null;
   }, [isEmptyData, emptyRenderer]);
-  var hasHorizontalScrollbar = scrollWarpRef.current && scrollWarpRef.current.scrollWidth > scrollWarpRef.current.clientWidth;
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
     children: /*#__PURE__*/_jsxs("span", {
-      children: [/*#__PURE__*/_jsx("div", {
-        ref: scrollWarpRef,
+      children: [/*#__PURE__*/_jsxs("span", {
+        ref: sheetWrapperRef,
+        tabIndex: 0,
+        className: classNames('harvest harvest-sheet-container', className),
         style: {
-          overflow: 'auto'
+          maxHeight: (_scroll$y = scroll === null || scroll === void 0 ? void 0 : scroll.y) !== null && _scroll$y !== void 0 ? _scroll$y : memoHeight,
+          width: (_scroll$x = scroll === null || scroll === void 0 ? void 0 : scroll.x) !== null && _scroll$x !== void 0 ? _scroll$x : '100%'
         },
-        className: cls({
-          tableWarpScroll: hasHorizontalScrollbar && boldScroll
-        }),
-        children: /*#__PURE__*/_jsxs("span", {
-          ref: sheetWrapperRef,
-          tabIndex: 0,
-          className: classNames('harvest harvest-sheet-container', className),
-          style: {
-            maxHeight: (_scroll$y = scroll === null || scroll === void 0 ? void 0 : scroll.y) !== null && _scroll$y !== void 0 ? _scroll$y : memoHeight,
-            width: (_scroll$x = scroll === null || scroll === void 0 ? void 0 : scroll.x) !== null && _scroll$x !== void 0 ? _scroll$x : 'calc(100% - 1px)'
-          },
-          children: [/*#__PURE__*/_jsxs(SheetShell, {
-            className: classNames('harvest-sheet', className),
-            children: [/*#__PURE__*/_jsx(VirtualizeStart, {
-              virtualized: virtualized,
-              paddingTop: paddingTop
-            }), rowElements, /*#__PURE__*/_jsx(VirtualizeEnd, {
-              virtualized: virtualized,
-              paddingBottom: paddingBottom
-            })]
-          }, "sheet"), /*#__PURE__*/_jsx(Menu, {
-            ref: contextMenuRef,
-            position: menu.position,
-            cell: menu.cellPosition,
-            showMenu: menu.showMenu,
-            contextMenu: ContextMenu,
-            onContextMenu: onContextMenu
-          }), /*#__PURE__*/_jsx("div", {
-            className: 'sheet-pd10'
+        children: [/*#__PURE__*/_jsxs(SheetShell, {
+          className: classNames('harvest-sheet', className),
+          children: [/*#__PURE__*/_jsx(VirtualizeStart, {
+            virtualized: virtualized,
+            paddingTop: paddingTop
+          }), rowElements, /*#__PURE__*/_jsx(VirtualizeEnd, {
+            virtualized: virtualized,
+            paddingBottom: paddingBottom
           })]
-        })
+        }, "sheet"), /*#__PURE__*/_jsx(Menu, {
+          ref: contextMenuRef,
+          position: menu.position,
+          cell: menu.cellPosition,
+          showMenu: menu.showMenu,
+          contextMenu: ContextMenu,
+          onContextMenu: onContextMenu
+        })]
       }), EmptyElement, /*#__PURE__*/_jsxs("div", {
         className: "harvest-sheet-control",
         children: [children, /*#__PURE__*/_jsx(Control, {

package/dist/core/sheet/index.less

@@ -1,30 +1,7 @@
 @import './var.less';
 
-.sheet-pd10 {
-  height: 0;
-}
-
-.tableWarpScroll {
-  &::-webkit-scrollbar {
-    display: none;
-  }
-  
-  &:hover {
-    margin-bottom: 10px;
-
-    .sheet-pd10 {
-      height: 10px;
-    }
-
-    &::-webkit-scrollbar {
-      display: block;
-      height: 10px;
-    }
-  }
-  
-}
-
 .harvest-sheet-container{
+  overflow: auto;
   display: block;
   position:  relative ;
   // scroll-behavior:smooth;
@@ -69,7 +46,10 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
 .harvest-sheet-container .harvest-sheet .cell {
   height: 17px;
   font-size: var(--cell-font-size);
-  padding:var(--cell-padding-vertical) var(--cell-padding-horizontal) var(--cell-padding-vertical) var(--cell-padding-horizontal);
+  padding-left:var(--cell-padding-horizontal);
+  padding-right:var(--cell-padding-horizontal);
+  padding-top:var(--cell-padding-vertical);
+  padding-bottom:var(--cell-padding-vertical);
   border: 1px solid var(--cell-border-color);
   background-color: var(--cell-background-color);
   cursor: cell;

package/dist/type/sheet.d.ts

@@ -114,7 +114,6 @@ export type SheetProps = {
     };
     rowClassName?: string | ((record: Record<string, unknown>, index: number) => string);
     children?: any[];
-    boldScroll?: boolean;
 };
 export type WidthConfigContext = {
     onChange?: (value: Record<number | string, number>) => void;

package/dist/type/sheetTable.d.ts

@@ -87,5 +87,4 @@ export type TableProps = {
     onChange: (changes: TableChange[], extChanges?: TableChange[]) => void;
     handleAdd?: () => void;
     eventHandler?: Record<'reverse' | 'btn-click' | 'cell-edit' | 'cell-switch' | string, undefined | EventHandler>;
-    boldScroll?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",