@zhenliang/sheet 0.1.16 → 0.1.18

package/dist/core/reducers/sideEffectReducer.js

@@ -157,10 +157,11 @@ export var sideEffectReducer = {
       // 复制到剪贴板的时候执行 formatter
       var _data$row$col = data[row][col],
         dataValue = _data$row$col.value,
-        dataEditor = _data$row$col.dataEditor;
+        dataEditor = _data$row$col.dataEditor,
+        record = _data$row$col.record;
       var _ref4 = dataEditor || {},
         dataFormatter = _ref4.formatter;
-      var formattedValue = dataFormatter ? dataFormatter(dataValue) : dataValue;
+      var formattedValue = dataFormatter ? dataFormatter(dataValue, record) : dataValue;
       if (isNil(dataValue)) {
         formattedValue = ' ';
       }
@@ -231,7 +232,7 @@ export var sideEffectReducer = {
                 row: row,
                 col: col,
                 id: (_data$row$col2 = data[row][col]) === null || _data$row$col2 === void 0 ? void 0 : _data$row$col2.id,
-                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 ? void 0 : (_editor$parser = editor.parser) === null || _editor$parser === void 0 ? void 0 : _editor$parser.call(editor, value) : value
+                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 ? void 0 : (_editor$parser = editor.parser) === null || _editor$parser === void 0 ? void 0 : _editor$parser.call(editor, value, data[row][col].record) : value
               };
             });
             lastRow = extChanges === null || extChanges === void 0 ? void 0 : (_extChanges$ = extChanges[0]) === null || _extChanges$ === void 0 ? void 0 : _extChanges$.row;

package/dist/core/sheet/Cell.js

@@ -70,7 +70,7 @@ var Cell = function Cell(props) {
       } else if (eventInfo.value && eventInfo.editing) {
         var _cell$dataEditor, _cell$dataEditor2, _cell$dataEditor2$par;
         // 单元格直接键盘编辑，设置为输入值
-        setValue((_cell$dataEditor = cell.dataEditor) !== null && _cell$dataEditor !== void 0 && _cell$dataEditor.parser ? cell === null || cell === void 0 ? void 0 : (_cell$dataEditor2 = cell.dataEditor) === null || _cell$dataEditor2 === void 0 ? void 0 : (_cell$dataEditor2$par = _cell$dataEditor2.parser) === null || _cell$dataEditor2$par === void 0 ? void 0 : _cell$dataEditor2$par.call(_cell$dataEditor2, eventInfo.value) : eventInfo.value);
+        setValue((_cell$dataEditor = cell.dataEditor) !== null && _cell$dataEditor !== void 0 && _cell$dataEditor.parser ? cell === null || cell === void 0 ? void 0 : (_cell$dataEditor2 = cell.dataEditor) === null || _cell$dataEditor2 === void 0 ? void 0 : (_cell$dataEditor2$par = _cell$dataEditor2.parser) === null || _cell$dataEditor2$par === void 0 ? void 0 : _cell$dataEditor2$par.call(_cell$dataEditor2, eventInfo.value, cell.record) : eventInfo.value);
       }
       setEventState(eventInfo);
     };

package/dist/core/sheet/index.js

@@ -82,14 +82,25 @@ var Sheet = function Sheet(props) {
           var _ref, _sheetWrapperRef$curr;
           var _getState = getState(),
             start = _getState.start,
-            groupConfig = _getState.groupConfig;
+            groupConfig = _getState.groupConfig,
+            data = _getState.data;
           var container = sheetWrapperRef.current;
           if (!start && isNil(row)) return;
           var actual = rowToActualRow((_ref = row) !== null && _ref !== void 0 ? _ref : start === null || start === void 0 ? void 0 : start.row, groupConfig);
           var rowHeight = getRowHeight(container);
           var firstRowCell = container.querySelector("td.cell[data-col='".concat(start === null || start === void 0 ? void 0 : start.col, "']"));
           var colPosition = firstRowCell ? firstRowCell.offsetLeft - firstRowCell.clientWidth : 0;
-          (_sheetWrapperRef$curr = sheetWrapperRef.current) === null || _sheetWrapperRef$curr === void 0 ? void 0 : _sheetWrapperRef$curr.scrollTo(isNumber(row) ? 0 : colPosition, rowHeight * actual);
+          var scrollHeight = (actual - 1) * rowHeight;
+          (_sheetWrapperRef$curr = sheetWrapperRef.current) === null || _sheetWrapperRef$curr === void 0 ? void 0 : _sheetWrapperRef$curr.scrollTo(isNumber(row) ? 0 : colPosition, scrollHeight);
+
+          // to do 最后一行的有bug
+          if (isNil(row) && start.row === data.length - 1) {
+            setTimeout(function () {
+              var _sheetWrapperRef$curr2, _sheetWrapperRef$curr3, _sheetWrapperRef$curr4;
+              console.log(scrollHeight, (_sheetWrapperRef$curr2 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr2 === void 0 ? void 0 : _sheetWrapperRef$curr2.scrollHeight);
+              (_sheetWrapperRef$curr3 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr3 === void 0 ? void 0 : _sheetWrapperRef$curr3.scrollTo(isNumber(row) ? 0 : colPosition, ((_sheetWrapperRef$curr4 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr4 === void 0 ? void 0 : _sheetWrapperRef$curr4.scrollHeight) || scrollHeight);
+            }, 500);
+          }
         });
       },
       pushToHistory: function pushToHistory(config) {
@@ -146,9 +157,9 @@ var Sheet = function Sheet(props) {
   useEffect(function () {
     if (!state.editing && state.start) {
       setTimeout(function () {
-        var _sheetWrapperRef$curr2;
+        var _sheetWrapperRef$curr5;
         // 表格获取焦点 + 接收keyboard event
-        (_sheetWrapperRef$curr2 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr2 === void 0 ? void 0 : _sheetWrapperRef$curr2.focus({
+        (_sheetWrapperRef$curr5 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr5 === void 0 ? void 0 : _sheetWrapperRef$curr5.focus({
           preventScroll: true
         });
       }, 1);
@@ -193,39 +204,41 @@ var Sheet = function Sheet(props) {
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
     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 : '100%'
-      },
-      children: [/*#__PURE__*/_jsxs(SheetShell, {
-        className: classNames('harvest-sheet', className),
-        children: [virtualized && paddingTop > 0 && /*#__PURE__*/_jsx("tr", {
-          style: {
-            height: 0,
-            paddingBottom: paddingTop,
-            display: 'block'
-          }
-        }), rowElements, virtualized && paddingBottom > 0 && /*#__PURE__*/_jsx("tr", {
-          style: {
-            height: 0,
-            paddingBottom: paddingBottom,
-            display: 'block'
-          }
-        })]
-      }, "sheet"), ContextMenu ? /*#__PURE__*/_jsx("div", {
-        ref: contextMenuRef,
+      children: [/*#__PURE__*/_jsxs("span", {
+        ref: sheetWrapperRef,
+        tabIndex: 0,
+        className: classNames('harvest harvest-sheet-container', className),
         style: {
-          display: menu.showMenu ? '' : 'none'
+          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%'
         },
-        children: /*#__PURE__*/_jsx(ContextMenu, {
-          position: menu.position,
-          cell: menu.cellPosition,
-          onContextMenu: onContextMenu
-        })
-      }) : null, /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsxs(SheetShell, {
+          className: classNames('harvest-sheet', className),
+          children: [virtualized && paddingTop > 0 && /*#__PURE__*/_jsx("tr", {
+            style: {
+              height: 0,
+              paddingBottom: paddingTop,
+              display: 'block'
+            }
+          }), rowElements, virtualized && paddingBottom > 0 && /*#__PURE__*/_jsx("tr", {
+            style: {
+              height: 0,
+              paddingBottom: paddingBottom,
+              display: 'block'
+            }
+          })]
+        }, "sheet"), ContextMenu ? /*#__PURE__*/_jsx("div", {
+          ref: contextMenuRef,
+          style: {
+            display: menu.showMenu ? '' : 'none'
+          },
+          children: /*#__PURE__*/_jsx(ContextMenu, {
+            position: menu.position,
+            cell: menu.cellPosition,
+            onContextMenu: onContextMenu
+          })
+        }) : null]
+      }), /*#__PURE__*/_jsxs("div", {
         className: "harvest-sheet-control",
         children: [children, showBackEdit && !startRowVisible ? /*#__PURE__*/_jsxs("div", {
           className: "back-edit",

package/dist/core/sheet/index.less

@@ -57,7 +57,7 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
   background-color: var(--cell-background-color);
   cursor: cell;
   text-align: right;
-  transition: box-shadow 100ms ease-out;
+  // transition: box-shadow 100ms ease-out;
   user-select: none;
   vertical-align: bottom;
   position: relative;
@@ -283,21 +283,25 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
 
 }
 
-.harvest-sheet-container .harvest-sheet-control{
-  position: sticky;
+.harvest-sheet-control{
+  position: relative;
   z-index: 3;
   bottom: 0;
   left: 0;
   background-color: white;
 }
 
-.harvest-sheet-container .harvest-sheet-control .back-edit{
+.harvest-sheet-control .back-edit{
   padding: 5px 8px;
+  margin: 1px;
+  height: 30px;
   display: flex;
   width: 105px;
   cursor: pointer;
   align-items: center;
   justify-content: center;
   position: absolute;
-  z-index: 4,
+  z-index: 4;
+  border:1px solid #D8DFEB;
+  border-radius:2px;
 }

package/dist/core/sheet/useMouseEvent.js

@@ -267,8 +267,8 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     });
   }, []);
   var loseFocus = useCallback(function (e) {
-    var _elementRef$current10;
-    if (!((_elementRef$current10 = elementRef.current) !== null && _elementRef$current10 !== void 0 && _elementRef$current10.contains(e.target))) {
+    var _elementRef$current10, _elementRef$current11;
+    if (!((_elementRef$current10 = elementRef.current) !== null && _elementRef$current10 !== void 0 && (_elementRef$current11 = _elementRef$current10.parentElement) !== null && _elementRef$current11 !== void 0 && _elementRef$current11.contains(e.target))) {
       dispatch({
         type: 'loseFocus'
       });

package/dist/core/sheet/useVirtualList.js

@@ -57,20 +57,11 @@ export var useVirtualList = function useVirtualList(elementRef) {
         setState(newConfig);
         return;
       }
-
-      // todo 加入分组之后的 虚拟列表计算
       var actualStart = rowToCountRow(start, groupConfigRef.current, data.length);
       var actualEnd = rowToCountRow(end, groupConfigRef.current, data.length);
       var maxEnd = rowToActualRow(data.length, groupConfigRef.current);
       var invisibleTop = rowToActualRow(actualStart, groupConfigRef.current);
       var invisibleBottom = maxEnd > end ? maxEnd - end : 0;
-      console.log('visiable-count', start, end, maxEnd);
-      console.log('visible-toactual-count', actualStart, actualEnd);
-      console.log('invisible', invisibleTop, invisibleBottom);
-
-      // const minStart = start - (actualStart - start)
-      // const maxEnd =  end - (actualEnd - end);
-
       var updateVirtualConfig = {
         virtualStart: actualStart,
         virtualEnd: actualEnd,

package/dist/core/shell/draggableShell/index.js

@@ -8,7 +8,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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useEffect, useMemo, useRef } from 'react';
+import { createElement, useEffect, useMemo, useRef } from 'react';
 import { useSetState, useWidth } from "../../../hooks";
 import { classNames } from "../../util";
 import { CheckViewer } from "../../viewer/checkViewer";
@@ -99,7 +99,7 @@ export var DraggableShell = function DraggableShell(_ref) {
           },
           children: /*#__PURE__*/_jsx("span", {
             className: "value-viewer",
-            children: item.title
+            children: typeof item.title === 'function' ? /*#__PURE__*/createElement(item.title) : item.title
           })
         }, (_item$dataIndex = item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : index));
       });

package/dist/hooks/useEventBus.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import EventEmitter from 'events';
 declare const useEventBus: () => EventEmitter;
 export { useEventBus };

package/dist/type/sheetTable.d.ts

@@ -23,7 +23,7 @@ export declare type ColumnProps = {
      */
     width?: string | number;
     dataIndex?: string;
-    title: string | ReactNode | ReactNode[];
+    title: string | ReactNode | ReactNode[] | React.FC;
     titleConfig?: {
         colSpan?: number;
         className?: string;

package/package.json

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