@zhenliang/sheet 0.1.63 → 0.1.65-beta

package/dist/core/reducers/sideEffectReducer.js

@@ -232,6 +232,10 @@ export var sideEffectReducer = {
                 col = _ref5.col,
                 value = _ref5.value;
               var editor = data[row][col].dataEditor;
+              var notEditable = data[row][col].readonly || !data[row][col].editable;
+              if (notEditable) {
+                return false;
+              }
               if (editor && editor.checker) {
                 return editor.checker(value, data[row][col].record);
               }

package/dist/core/sheet/index.less

@@ -89,28 +89,20 @@ span.harvest-sheet-container:focus {
     z-index: 3;
   }
 
-  &::before {
-    position: absolute;
-    top: -1px;
-    left: 0;
-    width: 100%;
-    border-color: var(--cell-border-color);
-    border-top: 1px solid var(--cell-border-color);
-    content: '';
-  }
 
   &.fixed-left::after {
     position: absolute;
+    z-index: 3;
     top: 0;
     bottom: -1px;
-    right: -1px;
+    right: 0;
     width: 30px;
-    border-left: 1px solid var(--cell-border-color);
+    // border-left: 1px solid var(--cell-border-color);
     content: '';
     pointer-events: none;
     transform: translate(100%);
     transition: box-shadow 0.3s;
-    box-shadow: var(--cell-fixed-box-shadow-left);
+    // box-shadow: var(--cell-fixed-box-shadow-left);
   }
 
   &.fixed-right {

package/dist/core/sheet/useContextMenu.js

@@ -57,7 +57,10 @@ export var useContextMenu = function useContextMenu(dispatch, elementRef) {
         top: top,
         left: left
       },
-      cellPosition: currentPos
+      cellPosition: {
+        row: currentPos.row,
+        col: currentPos.col - 1
+      }
     });
   };
   useEffect(function () {

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

@@ -40,8 +40,11 @@ export var DraggableShell = function DraggableShell(_ref) {
     var setWidth = contextSetWidth || _setWidth;
     var widths = contextWidths || _widths;
     var hasControl = showGroup || showSelect;
+    var offset = 1 + (hasControl ? 1 : 0);
     var thItems = useMemo(function () {
-      var ths = [];
+      var ths = [/*#__PURE__*/_jsx("th", {
+        className: "cell cell-title read-only sheet-control sheet-row-cursor"
+      }, -2)];
       if (hasControl) {
         var _controlProps$group, _controlProps$check, _controlProps$check2, _controlProps$check3;
         ths.push( /*#__PURE__*/_jsxs("th", {
@@ -77,7 +80,7 @@ export var DraggableShell = function DraggableShell(_ref) {
             if (e.nativeEvent.offsetX <= target.offsetWidth - 8) {
               var _item$titleConfig4;
               eventBus.emit('col-select', {
-                col: hasControl ? index + 1 : index,
+                col: index + offset,
                 colSpan: (_item$titleConfig4 = item.titleConfig) === null || _item$titleConfig4 === void 0 ? void 0 : _item$titleConfig4.colSpan
               });
             }
@@ -123,9 +126,15 @@ export var DraggableShell = function DraggableShell(_ref) {
         }, (_item$dataIndex = item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : index));
       });
       return ths;
-    }, [columns]);
+    }, [columns, offset]);
     var colItems = useMemo(function () {
-      var cols = [];
+      var cols = [/*#__PURE__*/_jsx("col", {
+        className: classNames('sheet-control sheet-row-cursor'),
+        style: {
+          width: 0,
+          border: 'none'
+        }
+      }, "sheet-row-cursor")];
       if (hasControl) {
         cols.push( /*#__PURE__*/_jsx("col", {
           className: classNames('sheet-control'),
@@ -170,7 +179,7 @@ export var DraggableShell = function DraggableShell(_ref) {
             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 actualIndex = changeIndex - offset;
             var isDoubleSpan = (((_columns$actualIndex = columns[actualIndex]) === null || _columns$actualIndex === void 0 || (_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', '');
@@ -188,7 +197,7 @@ export var DraggableShell = function DraggableShell(_ref) {
         document.removeEventListener('mouseup', handleMouseUp);
         document.removeEventListener('mousemove', handleMouseMove);
       };
-    }, [hasControl]);
+    }, [hasControl, offset]);
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("table", {
         className: classNames('header', 'harvest-sheet', className),

package/dist/core/table/index.js

@@ -21,10 +21,10 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
 import { TableShell } from "../shell/tableShell";
+import { AddButton } from "./addButton";
 import { GroupEvent, SelectionEvent } from "./events";
 import { formatGroupData, useGroupConfig } from "./useGroupConfig";
 import { formatSelectionData, useRowSelection } from "./useRowSelection";
-import { AddButton } from "./addButton";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Table = function Table(_ref) {
@@ -57,6 +57,7 @@ var Table = function Table(_ref) {
   var configWithChildren = !!groupConfig && !!dataSource.length;
   var hasChildren = dataHasChildren || configWithChildren;
   var hasControl = hasChildren || !!rowSelection;
+  var offset = hasControl ? 2 : 1;
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),
     checkedRow = _useRowSelection2[0],
@@ -98,7 +99,7 @@ var Table = function Table(_ref) {
         col: item.col,
         row: item.row,
         id: item.id,
-        key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
+        key: columns[item.col - offset].dataIndex,
         value: item.value
       };
     }), extChange === null || extChange === void 0 ? void 0 : extChange.map(function (item) {
@@ -106,7 +107,7 @@ var Table = function Table(_ref) {
         col: item.col,
         row: item.row,
         id: item.id,
-        key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
+        key: columns[item.col - offset].dataIndex,
         value: item.value
       };
     }));

package/dist/core/table/useGroupConfig.js

@@ -123,6 +123,18 @@ export var formatGroupData = function formatGroupData(param) {
           rowId = itemRow[rowKey];
         }
       }
+      dataRow.push({
+        id: rowId,
+        row: currentIndex,
+        col: -2,
+        editable: false,
+        readonly: true,
+        fixed: 'left',
+        valueViewer: function valueViewer() {
+          return null;
+        },
+        className: 'sheet-control sheet-row-cursor'
+      });
       dataRow.push({
         id: rowId,
         row: currentIndex,
@@ -130,7 +142,7 @@ export var formatGroupData = function formatGroupData(param) {
         editable: !((columns === null || columns === void 0 ? void 0 : columns[0].editable) instanceof Function) ? columns === null || columns === void 0 || (_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.editable : columns === null || columns === void 0 || (_columns$2 = columns[0]) === null || _columns$2 === void 0 ? void 0 : _columns$2.editable('', itemRow, currentIndex),
         readonly: !((columns === null || columns === void 0 ? void 0 : columns[0].readonly) instanceof Function) ? columns === null || columns === void 0 || (_columns$3 = columns[0]) === null || _columns$3 === void 0 ? void 0 : _columns$3.readonly : columns === null || columns === void 0 || (_columns$4 = columns[0]) === null || _columns$4 === void 0 ? void 0 : _columns$4.readonly('', itemRow, currentIndex),
         align: 'center',
-        fixed: 'unset',
+        // fixed: 'unset',
         valueViewer: GroupViewer,
         className: 'sheet-control'
       });

package/dist/core/table/useRowSelection.d.ts

@@ -2,7 +2,18 @@ import { SheetTableType, SheetType } from "../..";
 export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
 export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "rowSelection"> & {
     checked: boolean[];
-}) => {
+}) => ({
+    id: string;
+    row: number;
+    col: number;
+    editable: boolean;
+    readonly: boolean;
+    fixed: string;
+    valueViewer: () => null;
+    className: string;
+    align?: undefined;
+    value?: undefined;
+} | {
     id: string;
     row: number;
     col: number;
@@ -11,4 +22,6 @@ export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps
     value: string;
     valueViewer: SheetType.CellViewer;
     className: string;
-}[][];
+    editable?: undefined;
+    fixed?: undefined;
+})[][];

package/dist/core/table/useRowSelection.js

@@ -39,6 +39,18 @@ export var formatSelectionData = function formatSelectionData(param) {
       }
     }
     var rows = [];
+    rows.push({
+      id: rowId,
+      row: row,
+      col: -2,
+      editable: false,
+      readonly: true,
+      fixed: 'left',
+      valueViewer: function valueViewer() {
+        return null;
+      },
+      className: 'sheet-control sheet-row-cursor'
+    });
     if (rowSelection) {
       rows.push({
         id: rowId,

package/dist/core/util.js

@@ -463,10 +463,10 @@ export var stripRowIndex = function stripRowIndex(data) {
     endIndex: 0
   };
   var rowData = data[0];
-  var startIndex = 0,
+  var startIndex = 1,
     endIndex = rowData.length - 1;
-  if (rowData[0].fixed && !rowData[0].editable) {
-    startIndex = 1;
+  if (!rowData[1].editable) {
+    startIndex = 2;
   }
   if (rowData[rowData.length - 1].fixed && !rowData[rowData.length - 1].editable) {
     endIndex = rowData.length - 2;

package/package.json

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