@zhenliang/sheet 0.1.47 → 0.1.49

package/dist/assets/arrow-mac-down.svg

@@ -0,0 +1,19 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g filter="url(#filter0_d_932_2301)">
+        <path d="M10 5.5V12.5H6L12 18.5L18 12.5H14V5.5H10Z" fill="white" />
+        <path d="M13.0002 6.5V13.5H15.5902L12.0002 17.09L8.41016 13.5H11.0002V6.5H13.0002Z" fill="black" />
+    </g>
+    <defs>
+        <filter id="filter0_d_932_2301" x="4.2" y="4.7" width="15.6" height="16.6" filterUnits="userSpaceOnUse"
+            color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+                result="hardAlpha" />
+            <feOffset dy="1" />
+            <feGaussianBlur stdDeviation="0.9" />
+            <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0" />
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2301" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2301" result="shape" />
+        </filter>
+    </defs>
+</svg>

package/dist/assets/arrow-mac-right.svg

@@ -0,0 +1,17 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_932_2297)">
+<path d="M12.5 18L18.5 12L12.5 6V10H5.5V14H12.5V18Z" fill="white"/>
+<path d="M6.5 11H13.5V8.40997L17.09 12L13.5 15.59V13H6.5V11Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_932_2297" x="3.7" y="5.2" width="16.6" height="15.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.9"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2297"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2297" result="shape"/>
+</filter>
+</defs>
+</svg>

package/dist/assets/arrow-windows-down.svg

@@ -0,0 +1,17 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_932_2293)">
+<path d="M10 5.5V12.5H6L12 18.5L18 12.5H14V5.5H10Z" fill="black"/>
+<path d="M13.0002 6.5V13.5H15.5902L12.0002 17.09L8.41016 13.5H11.0002V6.5H13.0002Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_932_2293" x="4.2" y="4.7" width="15.6" height="16.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.9"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2293"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2293" result="shape"/>
+</filter>
+</defs>
+</svg>

package/dist/assets/arrow-windows-right.svg

@@ -0,0 +1,17 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_932_2289)">
+<path d="M12.5 18L18.5 12L12.5 6V10H5.5V14H12.5V18Z" fill="black"/>
+<path d="M6.5 11H13.5V8.40997L17.09 12L13.5 15.59V13H6.5V11Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_932_2289" x="3.7" y="5.2" width="16.6" height="15.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.9"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2289"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2289" result="shape"/>
+</filter>
+</defs>
+</svg>

package/dist/core/reducers/index.d.ts

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../type";
-export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
+export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'selectOneRow' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
 export type reducerAction = (type: Partial<SheetType.UpdateStateType>, payload?: unknown) => Partial<SheetType.UpdateStateType>;
 declare const sheetReducer: (state: Partial<SheetType.UpdateStateType>, action: {
     type: SheetAction;

package/dist/core/reducers/index.js

@@ -11,6 +11,7 @@ var sheetReducer = function sheetReducer(state, action) {
     case 'pushHistory':
     case 'popHistory':
     case 'select':
+    case 'selectOneRow':
     case 'clearSelect':
     case 'clearSelectIfNotSingleRow':
     case 'clearEdit':

package/dist/core/reducers/mouseReducer.js

@@ -77,6 +77,19 @@ export var mouseReducer = {
       col = _ref2.col;
     var data = state.data;
     if (state.mouseDown === false || data !== null && data !== void 0 && data[row][col].fixed) return state;
+    if (state.isIndex && state.start && state.end && (data === null || data === void 0 ? void 0 : data[row][col].dataIndex) === 'index') {
+      var _state$end;
+      return _objectSpread(_objectSpread({}, state), {}, {
+        end: {
+          row: row,
+          col: (_state$end = state.end) === null || _state$end === void 0 ? void 0 : _state$end.col
+        },
+        lastSelected: {
+          start: state.start,
+          end: state.end
+        }
+      });
+    }
     return _objectSpread(_objectSpread({}, state), {}, {
       end: {
         row: row,
@@ -94,8 +107,24 @@ export var mouseReducer = {
       col = _ref3.col;
     var data = state.data;
     if (state.mouseDown === false || data !== null && data !== void 0 && data[row][col].fixed) return state;
+    if (state.isIndex && state.end) {
+      var _state$end2;
+      return _objectSpread(_objectSpread({}, state), {}, {
+        mouseDown: false,
+        isIndex: false,
+        end: {
+          row: row,
+          col: (_state$end2 = state.end) === null || _state$end2 === void 0 ? void 0 : _state$end2.col
+        },
+        lastSelected: {
+          start: state.start,
+          end: state.end
+        }
+      });
+    }
     return _objectSpread(_objectSpread({}, state), {}, {
       mouseDown: false,
+      isIndex: false,
       end: {
         row: row,
         col: col
@@ -135,6 +164,7 @@ export var mouseReducer = {
     }
     return _objectSpread(_objectSpread({}, state), {}, {
       mouseDown: false,
+      isIndex: false,
       editing: {
         row: row,
         col: col
@@ -194,6 +224,8 @@ export var mouseReducer = {
         start: state.start,
         end: state.end
       },
+      mouseDown: true,
+      isIndex: true,
       editing: undefined,
       lastEditing: lastEditing
     });

package/dist/core/reducers/stateReducer.js

@@ -105,7 +105,7 @@ export var stateReducer = {
       }
     });
   },
-  selectRow: function selectRow(state, payload) {
+  selectOneRow: function selectOneRow(state, payload) {
     var _state$data4, _state$data$0$length, _state$data5, _state$data6;
     var startCol = ((_state$data4 = state.data) === null || _state$data4 === void 0 || (_state$data4 = _state$data4[0]) === null || _state$data4 === void 0 ? void 0 : _state$data4.findIndex(function (item) {
       return !item.fixed;

package/dist/core/sheet/index.js

@@ -121,7 +121,7 @@ var Sheet = function Sheet(props) {
           });
         } else {
           dispatch({
-            type: 'selectRow',
+            type: 'selectOneRow',
             payload: row
           });
         }

package/dist/core/sheet/index.less

@@ -200,7 +200,7 @@ span.harvest-sheet-container:focus {
 }
 
 .harvest-sheet-container .harvest-sheet .cell.index {
-  cursor: e-resize;
+  cursor: var(--arrow-right) 12 12, e-resize;
 }
 
 
@@ -210,6 +210,7 @@ span.harvest-sheet-container:focus {
 
 .harvest-sheet-container .harvest-sheet .cell.cell-title {
   background-color: var(--cell-title-background-color);
+  cursor: var(--arrow-down) 12 12, s-resize;
 
   &:hover {
     background-color: var(--cell-title-background-color);

package/dist/core/sheet/useMouseEvent.js

@@ -1,5 +1,5 @@
 import { useMouse } from "../..";
-import { useCallback, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import { extractDataRowAndCol, findParentTd } from "../util";
 var rowCount = 10; //每秒10行
 var colCount = 5; //每秒5列
@@ -283,6 +283,14 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
       payload: currentPos
     });
   }, []);
+  useEffect(function () {
+    if (elementRef.current) {
+      if (navigator.appVersion.indexOf("Mac") !== -1) {
+        elementRef.current.style.setProperty('--arrow-down', 'var(--arrow-mac-down)');
+        elementRef.current.style.setProperty('--arrow-right', 'var(--arrow-mac-right)');
+      }
+    }
+  }, []);
   useMouse({
     mouseDown: mouseDown,
     mouseOver: mouseOver,

package/dist/core/sheet/var.less

@@ -1,41 +1,48 @@
-.harvest{
-  --row-height:40px;
-  --cell-font-size:12px;
-  --cell-title-font-size:12px;
-  --cell-line-height:40px;
-  --cell-inner-height:39px;
-  --cell-padding-vertical:0;
-  --cell-padding-horizontal:5px;
+.harvest {
+  --row-height: 40px;
+  --cell-font-size: 12px;
+  --cell-title-font-size: 12px;
+  --cell-line-height: 40px;
+  --cell-inner-height: 39px;
+  --cell-padding-vertical: 0;
+  --cell-padding-horizontal: 5px;
   --cell-border-color: #DDD;
-  --cell-background-color:white;
-  --cell-title-background-color:#f7f9fc;
-  --cell-read-only-background-color:#f7f9fc;
-  --cell-hover:white;
-  --cell-box-shadow:inset 0 -100px 0 rgba(33, 133, 208, 15%);;
-  --cell-fixed-box-shadow-left:inset 10px 0 8px -8px rgba(5, 5, 5,6%);
-  --cell-fixed-box-shadow-right:inset -10px 0 8px -8px rgba(5, 5, 5,6%);
+  --cell-background-color: white;
+  --cell-title-background-color: #f7f9fc;
+  --cell-read-only-background-color: #f7f9fc;
+  --cell-hover: white;
+  --cell-box-shadow: inset 0 -100px 0 rgba(33, 133, 208, 15%);
+  ;
+  --cell-fixed-box-shadow-left: inset 10px 0 8px -8px rgba(5, 5, 5, 6%);
+  --cell-fixed-box-shadow-right: inset -10px 0 8px -8px rgba(5, 5, 5, 6%);
   --resizer: #2185d0;
-  --color:black;
-  --title-color:#999;
-  --read-color:#999;
+  --color: black;
+  --title-color: #999;
+  --read-color: #999;
+  --arrow-mac-down: url('../../assets/arrow-mac-down.svg');
+  --arrow-mac-right: url('../../assets/arrow-mac-right.svg');
+  --arrow-windows-down: url('../../assets/arrow-windows-down.svg');
+  --arrow-windows-right: url('../../assets/arrow-windows-right.svg');
+  --arrow-down: var(--arrow-windows-down);
+  --arrow-right: var(--arrow-windows-right);
 }
 
-.ali-devops{
-  --row-height:40px;
-  --cell-font-size:14px;
-  --cell-line-height:20px;
-  --cell-padding-vertical:12px;
-  --cell-padding-horizontal:12px;
+.ali-devops {
+  --row-height: 40px;
+  --cell-font-size: 14px;
+  --cell-line-height: 20px;
+  --cell-padding-vertical: 12px;
+  --cell-padding-horizontal: 12px;
   --cell-border-color: #e5e5e5;
-  --cell-background-color:white;
-  --cell-title-background-color:white;
-  --cell-read-only-background-color:white;
-  --cell-fixed-box-shadow:inset -10px 0 8px -8px rgba(5, 5, 5,6%);
-  --cell-hover:#f7f7f7;
-  --cell-fixed-box-shadow-left:inset 10px 0 8px -8px rgba(5, 5, 5,6%);
-  --cell-fixed-box-shadow-right:inset -10px 0 8px -8px rgba(5, 5, 5,6%);
+  --cell-background-color: white;
+  --cell-title-background-color: white;
+  --cell-read-only-background-color: white;
+  --cell-fixed-box-shadow: inset -10px 0 8px -8px rgba(5, 5, 5, 6%);
+  --cell-hover: #f7f7f7;
+  --cell-fixed-box-shadow-left: inset 10px 0 8px -8px rgba(5, 5, 5, 6%);
+  --cell-fixed-box-shadow-right: inset -10px 0 8px -8px rgba(5, 5, 5, 6%);
   --resizer: #1b9aee;
-  --color:#262626;
-  --title-color:#8c8c8c;
-  --read-color:#8c8c8c;
+  --color: #262626;
+  --title-color: #8c8c8c;
+  --read-color: #8c8c8c;
 }

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

@@ -104,7 +104,7 @@ export var DraggableShell = function DraggableShell(_ref) {
             if (e.nativeEvent.offsetX > target.offsetWidth - 8) {
               target.style.cursor = 'col-resize';
             } else {
-              target.style.cursor = item.fixed ? 'default' : 's-resize';
+              target.style.cursor = item.fixed ? 'default' : '';
             }
             //取出暂存的Table Cell
             if (downRef.current === undefined) downRef.current = target;

package/dist/type/sheet.d.ts

@@ -183,6 +183,7 @@ export type UpdateStateType = {
     freePaste?: boolean;
     data: Cell[][];
     mouseDown: boolean;
+    isIndex: boolean;
     lastSelected?: {
         start?: CellPosition;
         end?: CellPosition;

package/package.json

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