@zhenliang/sheet 0.1.28 → 0.1.30

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

@@ -63,7 +63,7 @@ export var getSelectEditor = function getSelectEditor(options) {
       onChange: handleChange,
       onKeyDown: handleKeyDown,
       options: customOptions,
-      popupClassName: 'excelTablePopupClassName',
+      popupClassName: "select-editor-dropdown",
       dropdownRender: dropdown
     }));
   };

package/dist/core/editor/selectEditor/index.less

@@ -46,3 +46,7 @@
     font-size: 12px !important;
   }
 }
+
+.select-editor-dropdown{
+  min-width: 80px !important;
+}

package/dist/core/reducers/keyboardReducer.js

@@ -17,7 +17,8 @@ export var keyboardReducer = {
       data = _state$data === void 0 ? [] : _state$data;
     var newRow = (((_state$start = state.start) === null || _state$start === void 0 ? void 0 : _state$start.row) || 0) + row;
     if (groupConfig) {
-      newRow = getNextVisibleRow(newRow, data.length, groupConfigToGroupMap(groupConfig), row < 0 ? -1 : 1);
+      var _data;
+      newRow = getNextVisibleRow(newRow, (data === null || data === void 0 || (_data = data[data.length - 1]) === null || _data === void 0 ? void 0 : _data[0].row) || data.length, groupConfigToGroupMap(groupConfig), row < 0 ? -1 : 1);
     }
     var currentPos = {
       row: newRow,

package/dist/core/sheet/index.js

@@ -86,7 +86,7 @@ var Sheet = function Sheet(props) {
             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 actual = rowToActualRow((_ref = row) !== null && _ref !== void 0 ? _ref : start === null || start === void 0 ? void 0 : start.row, groupConfig, data.length);
           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;

package/dist/core/sheet/useSelectVisible.js

@@ -20,6 +20,7 @@ export var useSelectVisible = function useSelectVisible(sheetWrapper, start) {
     var handleScroll = throttle(function () {
       var _sheetWrapper$current, _sheetWrapper$current2;
       if (!start) {
+        setStartVisible(true);
         return;
       }
       var startCell = (_sheetWrapper$current = sheetWrapper.current) === null || _sheetWrapper$current === void 0 ? void 0 : _sheetWrapper$current.querySelector("td.cell[data-row='".concat(start.row, "']"));

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

@@ -147,14 +147,18 @@ export var DraggableShell = function DraggableShell(_ref) {
           var _downRef$current$oldW, _downRef$current$oldX;
           downRef.current.style.cursor = 'default';
           if (((_downRef$current$oldW = downRef.current.oldWidth) !== null && _downRef$current$oldW !== void 0 ? _downRef$current$oldW : 0) + (e.x - ((_downRef$current$oldX = downRef.current.oldX) !== null && _downRef$current$oldX !== void 0 ? _downRef$current$oldX : 0)) > 0) {
-            var _downRef$current$oldW2, _downRef$current$oldX2, _headRef$current;
+            var _downRef$current$oldW2, _downRef$current$oldX2, _headRef$current, _columns$actualIndex$;
             var newWidth = Math.max(Number(((_downRef$current$oldW2 = downRef.current.oldWidth) !== null && _downRef$current$oldW2 !== void 0 ? _downRef$current$oldW2 : 0) + (e.x - ((_downRef$current$oldX2 = downRef.current.oldX) !== null && _downRef$current$oldX2 !== void 0 ? _downRef$current$oldX2 : 0))), 50);
             var cellList = [].slice.call((_headRef$current = headRef.current) === null || _headRef$current === void 0 ? void 0 : _headRef$current.cells);
             var changeIndex = cellList.indexOf(downRef.current);
+            var actualIndex = hasControl ? changeIndex - 1 : changeIndex;
+            var isDoubleSpan = (((_columns$actualIndex$ = columns[actualIndex].titleConfig) === null || _columns$actualIndex$ === void 0 ? void 0 : _columns$actualIndex$.colSpan) || 0) > 1;
+            var nextColumn = columns[actualIndex + 1] || {};
+            var nextWidth = +String(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.width).replace('px', '');
             //调整该列中的每个Cell
             var _widths2 = _defineProperty({
               length: columns.length
-            }, hasControl ? changeIndex - 1 : changeIndex, newWidth);
+            }, actualIndex, isDoubleSpan ? newWidth - nextWidth : newWidth);
             setWidth(_widths2);
           }
         }
@@ -177,6 +181,9 @@ export var DraggableShell = function DraggableShell(_ref) {
         children: [/*#__PURE__*/_jsx("colgroup", {
           children: colItems
         }), /*#__PURE__*/_jsx("thead", {
+          style: {
+            pointerEvents: 'all'
+          },
           children: /*#__PURE__*/_jsx("tr", {
             ref: headRef,
             children: thItems

package/dist/core/table/index.js

@@ -16,7 +16,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { Sheet, useSetState } from "../..";
 import { GroupContext } from "../../hooks/useGroupConfig";
 import { WidthContext } from "../../hooks/useWidthConfig";
-import { Button } from 'antd';
+import { Button, ConfigProvider, Empty } from 'antd';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
@@ -157,48 +157,55 @@ var Table = function Table(_ref) {
       }
     });
   }, [columns.length, draggable, headSelection, hasChildren]);
-  return /*#__PURE__*/_jsx(WidthContext.Provider, {
-    value: {
-      widths: widths,
-      onChange: setWidth
+  return /*#__PURE__*/_jsx(ConfigProvider, {
+    renderEmpty: function renderEmpty() {
+      return /*#__PURE__*/_jsx(Empty, {
+        image: Empty.PRESENTED_IMAGE_SIMPLE
+      });
     },
-    children: /*#__PURE__*/_jsx(GroupContext.Provider, {
+    children: /*#__PURE__*/_jsx(WidthContext.Provider, {
       value: {
-        config: rowGroupConfig,
-        onChange: setGroupConfig
+        widths: widths,
+        onChange: setWidth
       },
-      children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
-        sheetInstance: sheetInstance,
-        sheetRenderer: WrappedTableShell,
-        data: data,
-        onCellsChanged: handleChanges,
-        children: [/*#__PURE__*/_jsx(SelectionEvent, {
-          hasChildren: hasChildren,
-          rowSelection: rowSelection,
-          onChange: handleRowSelect
-        }), /*#__PURE__*/_jsx(GroupEvent, {
-          hasChildren: hasChildren,
+      children: /*#__PURE__*/_jsx(GroupContext.Provider, {
+        value: {
+          config: rowGroupConfig,
+          onChange: setGroupConfig
+        },
+        children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
+          sheetInstance: sheetInstance,
+          sheetRenderer: WrappedTableShell,
           data: data,
-          sheetInstance: sheetInstance.current,
-          onGridChange: setData
-        }), /*#__PURE__*/_jsx(SheetEvent, {
-          name: "reverse",
-          handler: handleReverse
-        }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
-          return /*#__PURE__*/_jsx(SheetEvent, {
-            name: key,
-            handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
-          }, key);
-        }), handleAdd ? /*#__PURE__*/_jsx(Button, {
-          type: "dashed",
-          style: {
-            width: '100%',
-            height: 32
-          },
-          onClick: handleAdd,
-          children: "+ \u6DFB\u52A0"
-        }) : null]
-      }))
+          onCellsChanged: handleChanges,
+          children: [/*#__PURE__*/_jsx(SelectionEvent, {
+            hasChildren: hasChildren,
+            rowSelection: rowSelection,
+            onChange: handleRowSelect
+          }), /*#__PURE__*/_jsx(GroupEvent, {
+            hasChildren: hasChildren,
+            data: data,
+            sheetInstance: sheetInstance.current,
+            onGridChange: setData
+          }), /*#__PURE__*/_jsx(SheetEvent, {
+            name: "reverse",
+            handler: handleReverse
+          }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
+            return /*#__PURE__*/_jsx(SheetEvent, {
+              name: key,
+              handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
+            }, key);
+          }), handleAdd ? /*#__PURE__*/_jsx(Button, {
+            type: "dashed",
+            style: {
+              width: '100%',
+              height: 32
+            },
+            onClick: handleAdd,
+            children: "+ \u6DFB\u52A0"
+          }) : null]
+        }))
+      })
     })
   });
 };

package/dist/core/util.js

@@ -97,7 +97,7 @@ export function stringToClipboardData(str, count) {
   });
 }
 export var defaultParsePaste = function defaultParsePaste(str) {
-  return str.split(/\r\n|\n|\r/).map(function (row) {
+  return str.trim().split(/\r\n|\n|\r/).map(function (row) {
     return row.split('\t');
   });
 };
@@ -189,7 +189,7 @@ export function formatDataToCell(_ref2) {
       });
     });
     if (hasStartAndNotOpen) {
-      console.error('有折叠单元格，不可粘贴');
+      message.error('有折叠单元格，不可粘贴');
       return {
         changes: [],
         extChanges: []
@@ -355,7 +355,7 @@ export var changeGroupConfig = function changeGroupConfig(rowGroupConfig, change
   });
 };
 export var rowToActualRow = function rowToActualRow(row, groupConfig) {
-  var max = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 10000;
+  var max = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 100000;
   var groupMap = groupConfigToGroupMap(groupConfig);
   if (!groupMap.size || row < 0) return row;
   var openCount = 0;

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

@@ -33,7 +33,8 @@ export var GroupViewer = function GroupViewer(props) {
     var currentOpen = record !== null && record !== void 0 && record.isHeader ? allOpen : isOpen;
     return /*#__PURE__*/_jsx("span", {
       style: {
-        cursor: 'pointer'
+        cursor: 'pointer',
+        pointerEvents: 'all'
       },
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();

package/package.json

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