@zhenliang/sheet 0.1.32 → 0.1.34

package/dist/core/editor/numberEditor/index.js

@@ -73,7 +73,7 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
      */
     var valueParser = baseFormatter;
     var handleChange = useCallback(function (value) {
-      onChange && onChange(value ? value : null);
+      onChange && onChange(!isNil(value) ? value : null);
     }, [onChange]);
     return /*#__PURE__*/_jsx(AntInputNumber, _objectSpread(_objectSpread({
       ref: inputNumberRef

package/dist/core/sheet/index.js

@@ -58,7 +58,6 @@ var Sheet = function Sheet(props) {
     backEditStyle = props.backEditStyle,
     _props$boldScroll = props.boldScroll,
     boldScroll = _props$boldScroll === void 0 ? true : _props$boldScroll;
-  var scrollWarpRef = useRef(null);
   var sheetWrapperRef = useRef(null);
   var contextMenuRef = useRef(null);
   var eventBus = useEventBus();
@@ -231,46 +230,37 @@ var Sheet = function Sheet(props) {
     }
     return null;
   }, [isEmptyData, emptyRenderer]);
-  var hasHorizontalScrollbar = scrollWarpRef.current && scrollWarpRef.current.scrollWidth > scrollWarpRef.current.clientWidth;
+  var hasHorizontalScrollbar = sheetWrapperRef.current && sheetWrapperRef.current.scrollWidth > sheetWrapperRef.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, cls({
+          tableWarpScroll: hasHorizontalScrollbar && boldScroll
+        })),
         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,9 +1,5 @@
 @import './var.less';
 
-.sheet-pd10 {
-  height: 0;
-}
-
 .tableWarpScroll {
   &::-webkit-scrollbar {
     display: none;
@@ -12,14 +8,16 @@
   &:hover {
     margin-bottom: 10px;
 
-    .sheet-pd10 {
-      height: 10px;
-    }
-
     &::-webkit-scrollbar {
       display: block;
+      height: 20px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      border-top: 10px solid #fff;
       height: 10px;
     }
+  
   }
   
 }
@@ -28,6 +26,7 @@
   display: block;
   position:  relative ;
   // scroll-behavior:smooth;
+  overflow: auto;
 }
 
 .harvest-sheet-container .header{
@@ -40,7 +39,7 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
 }
 
 .harvest-sheet-container .harvest-sheet {
-  width: 100%;
+  width: calc(100% - 1px);
   border-collapse: collapse;
   table-layout: fixed;
   

package/package.json

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