@zhenliang/sheet 0.1.30 → 0.1.32

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

@@ -50,7 +50,7 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
     var _ref = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
       precision = _ref.precision,
       inputArgs = _objectWithoutProperties(_ref, _excluded);
-    var valueFormatter = useCallback(function (value) {
+    var baseFormatter = useCallback(function (value) {
       if (!value) {
         return '';
       }
@@ -63,10 +63,15 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
       }
       return String(value);
     }, []);
+    // 去掉多余的0
+    var valueFormatter = useCallback(function (value) {
+      var baseValue = baseFormatter(value);
+      return baseValue ? "".concat(parseFloat(baseValue)) : '';
+    }, []);
     /**
      * 重新声明，后面有需求可以改一下
      */
-    var valueParser = valueFormatter;
+    var valueParser = baseFormatter;
     var handleChange = useCallback(function (value) {
       onChange && onChange(value ? value : null);
     }, [onChange]);

package/dist/core/sheet/index.js

@@ -6,6 +6,7 @@ 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";
@@ -54,7 +55,10 @@ var Sheet = function Sheet(props) {
     scroll = props.scroll,
     children = props.children,
     showBackEdit = props.showBackEdit,
-    backEditStyle = props.backEditStyle;
+    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();
@@ -227,34 +231,46 @@ 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__*/_jsxs("span", {
-        ref: sheetWrapperRef,
-        tabIndex: 0,
-        className: classNames('harvest harvest-sheet-container', className),
+      children: [/*#__PURE__*/_jsx("div", {
+        ref: scrollWarpRef,
         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 : '100%'
+          overflow: 'auto'
         },
-        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
+        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'
           })]
-        }, "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,7 +1,30 @@
 @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;
@@ -46,10 +69,7 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
 .harvest-sheet-container .harvest-sheet .cell {
   height: 17px;
   font-size: var(--cell-font-size);
-  padding-left:var(--cell-padding-horizontal);
-  padding-right:var(--cell-padding-horizontal);
-  padding-top:var(--cell-padding-vertical);
-  padding-bottom:var(--cell-padding-vertical);
+  padding:var(--cell-padding-vertical) var(--cell-padding-horizontal) var(--cell-padding-vertical) var(--cell-padding-horizontal);
   border: 1px solid var(--cell-border-color);
   background-color: var(--cell-background-color);
   cursor: cell;

package/dist/core/table/useGroupConfig.js

@@ -131,6 +131,8 @@ export var formatGroupData = function formatGroupData(param) {
           dataEditor: colInfo.editor ? colInfo.editor : undefined,
           row: currentIndex,
           className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, itemRow, currentIndex),
+          dataIndex: colInfo.dataIndex,
+          key: colInfo.key,
           col: col
         });
       });

package/dist/core/table/useRowSelection.js

@@ -66,7 +66,9 @@ export var formatSelectionData = function formatSelectionData(param) {
         dataEditor: colInfo.editor ? colInfo.editor : undefined,
         className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, item, row),
         row: row,
-        col: col
+        col: col,
+        dataIndex: colInfo.dataIndex,
+        key: colInfo.key
       });
     });
     return rows;

package/dist/core/viewer/switchViewer/index.js

@@ -5,17 +5,23 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export var SwitchViewer = function SwitchViewer(props) {
   var value = props.value,
     row = props.row,
-    record = props.record;
+    record = props.record,
+    cell = props.cell;
+  var _ref = cell !== null && cell !== void 0 ? cell : {},
+    key = _ref.key,
+    readonly = _ref.readonly;
   var eventBus = useSheetEvent();
   var handleChange = useCallback(function () {
     if (!eventBus) return;
     eventBus.emit('cell-switch', {
       row: row,
       record: record,
-      value: !value
+      value: !value,
+      key: key
     });
   }, [eventBus, row, record, value]);
   return /*#__PURE__*/_jsx(Switch, {
+    disabled: readonly,
     checked: value,
     onChange: handleChange
   });

package/dist/type/sheet.d.ts

@@ -114,6 +114,7 @@ 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,4 +87,5 @@ 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.30",
+  "version": "0.1.32",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",