@zhenliang/sheet 0.1.61 → 0.1.63

package/dist/core/sheet/index.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 // import ReduxLogger from 'redux-logger';
 import ReduxThunk from 'redux-thunk';
 import DefaultRow from "./DefaultRow";
@@ -31,7 +31,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var Sheet = function Sheet(props) {
-  var _visibleData$length, _scroll$y, _scroll$x, _sheetWrapperRef$curr5;
+  var _visibleData$length, _scroll$y, _scroll$x;
   var _props$sheetInstance = props.sheetInstance,
     sheetInstance = _props$sheetInstance === void 0 ? {
       current: null
@@ -56,7 +56,8 @@ var Sheet = function Sheet(props) {
     rowClassName = props.rowClassName,
     scroll = props.scroll,
     children = props.children,
-    showBackEdit = props.showBackEdit,
+    _props$showBackEdit = props.showBackEdit,
+    showBackEdit = _props$showBackEdit === void 0 ? true : _props$showBackEdit,
     backEditStyle = props.backEditStyle,
     _props$boldScroll = props.boldScroll,
     boldScroll = _props$boldScroll === void 0 ? true : _props$boldScroll,
@@ -64,12 +65,7 @@ var Sheet = function Sheet(props) {
     hideColBar = _props$hideColBar === void 0 ? true : _props$hideColBar,
     _props$showQuickLocat = props.showQuickLocationBtn,
     showQuickLocationBtn = _props$showQuickLocat === void 0 ? false : _props$showQuickLocat,
-    ControlContainer = props.ControlContainer,
-    handleAdd = props.handleAdd;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    mouseOnTable = _useState2[0],
-    setMouseOnTable = _useState2[1];
+    ControlContainer = props.ControlContainer;
   var sheetWrapperRef = useRef(null);
   var contextMenuRef = useRef(null);
   var eventBus = useEventBus();
@@ -269,20 +265,6 @@ var Sheet = function Sheet(props) {
     return null;
   }, [isEmptyData, emptyRenderer]);
   var hasHorizontalScrollbar = sheetWrapperRef.current && sheetWrapperRef.current.scrollWidth > sheetWrapperRef.current.clientWidth;
-  // 解决滚动条出现
-  var offSetBottom = useMemo(function () {
-    var height = 0;
-    if (handleAdd) {
-      height += 32;
-    }
-    if (showBackEdit || showQuickLocationBtn) {
-      height += 24;
-    }
-    if (height > 0 && hasHorizontalScrollbar && boldScroll && mouseOnTable) {
-      height -= 30;
-    }
-    return height;
-  }, [handleAdd, showBackEdit, showQuickLocationBtn, hasHorizontalScrollbar, boldScroll, mouseOnTable]);
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
     children: /*#__PURE__*/_jsxs(_Fragment, {
@@ -298,12 +280,6 @@ var Sheet = function Sheet(props) {
             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%'
           },
-          onMouseOver: function onMouseOver() {
-            return setMouseOnTable(true);
-          },
-          onMouseLeave: function onMouseLeave() {
-            return setMouseOnTable(false);
-          },
           children: [/*#__PURE__*/_jsxs(SheetShell, {
             className: classNames('harvest-sheet', className),
             children: [/*#__PURE__*/_jsx(VirtualizeStart, {
@@ -321,16 +297,8 @@ var Sheet = function Sheet(props) {
             contextMenu: ContextMenu,
             onContextMenu: onContextMenu
           }), EmptyElement]
-        }), /*#__PURE__*/_jsx("div", {
-          style: {
-            height: offSetBottom
-          }
         }), /*#__PURE__*/_jsxs("div", {
           className: "harvest-sheet-control",
-          style: {
-            top: (_sheetWrapperRef$curr5 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr5 === void 0 ? void 0 : _sheetWrapperRef$curr5.clientHeight,
-            width: '100%'
-          },
           children: [/*#__PURE__*/_jsx(Control, {
             showBackEdit: showBackEdit,
             startRowVisible: startRowVisible,

package/dist/core/sheet/index.less

@@ -292,19 +292,18 @@ span.harvest-sheet-container:focus {
 }
 
 .harvest-sheet-control {
-  position: absolute;
-  z-index: 3;
-  left: 0;
+  display: flex;
+  flex-direction: row-reverse;
 }
 
 .harvest-sheet-control .control {
-  margin: 4px 1px 4px 0;
   display: flex;
   align-items: center;
   flex-direction: row;
   justify-content: flex-end;
-  border-radius: 2px;
   height: 24px;
+  margin-left: 5px;
+  margin-top: 4px;
   .control-item {
     margin-right: 4px;
     &:last-child {

package/package.json

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