@zhenliang/sheet 0.1.1 → 0.1.3

package/dist/core/editor/numberEditor/index.d.ts

@@ -3,4 +3,4 @@ import { InputNumberProps } from 'antd';
 import 'antd/es/input-number/style/index.css';
 import './index.less';
 export declare const NumberEditor: SheetType.CellEditor;
-export declare const getNumberEditor: (extraProps?: Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'>) => SheetType.CellEditor;
+export declare const getNumberEditor: (extraProps?: Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'>>) => SheetType.CellEditor;

package/dist/core/reducers/stateReducer.js

@@ -106,14 +106,18 @@ export var stateReducer = {
     });
   },
   selectRow: function selectRow(state, payload) {
-    var _state$data4, _state$data4$, _state$data5, _state$data5$, _state$data6, _state$data6$;
+    var _state$data4, _state$data4$, _state$data$0$length, _state$data5, _state$data5$, _state$data6, _state$data6$;
     var startCol = ((_state$data4 = state.data) === null || _state$data4 === void 0 ? void 0 : (_state$data4$ = _state$data4[0]) === null || _state$data4$ === void 0 ? void 0 : _state$data4$.findIndex(function (item) {
       return !item.fixed;
     })) || 0;
-    var endCol = (((_state$data5 = state.data) === null || _state$data5 === void 0 ? void 0 : (_state$data5$ = _state$data5[0]) === null || _state$data5$ === void 0 ? void 0 : _state$data5$.findIndex(function (item) {
+    var endCol = ((_state$data$0$length = (_state$data5 = state.data) === null || _state$data5 === void 0 ? void 0 : (_state$data5$ = _state$data5[0]) === null || _state$data5$ === void 0 ? void 0 : _state$data5$.length) !== null && _state$data$0$length !== void 0 ? _state$data$0$length : 0) - 1;
+    var lastFixed = (_state$data6 = state.data) === null || _state$data6 === void 0 ? void 0 : (_state$data6$ = _state$data6[0]) === null || _state$data6$ === void 0 ? void 0 : _state$data6$.find(function (item) {
       return item.fixed === SheetType.CellAlign.right;
-    })) || ((_state$data6 = state.data) === null || _state$data6 === void 0 ? void 0 : (_state$data6$ = _state$data6[0]) === null || _state$data6$ === void 0 ? void 0 : _state$data6$.length) || 0) - 1;
-    // const endCol = (state.data?.[0].length || 0) - 1;
+    });
+    if (lastFixed) {
+      var _state$data$0$indexOf, _state$data7;
+      endCol = (_state$data$0$indexOf = (_state$data7 = state.data) === null || _state$data7 === void 0 ? void 0 : _state$data7[0].indexOf(lastFixed)) !== null && _state$data$0$indexOf !== void 0 ? _state$data$0$indexOf : 0 - 1;
+    }
     if (startCol >= 0 && endCol >= 0) {
       return _objectSpread(_objectSpread({}, state), {}, {
         start: {
@@ -130,7 +134,7 @@ export var stateReducer = {
         }
       });
     }
-    return {};
+    return state;
   },
   clearSelect: function clearSelect(state) {
     var start = state.start,

package/dist/core/sheet/index.js

@@ -202,7 +202,7 @@ var Sheet = function Sheet(props) {
             paddingBottom: paddingTop,
             display: 'block'
           }
-        }), rowElements, /*#__PURE__*/_jsx("tr", {
+        }), rowElements, virtualized && paddingBottom > 0 && /*#__PURE__*/_jsx("tr", {
           style: {
             height: 0,
             paddingBottom: paddingBottom,

package/dist/core/sheet/index.less

@@ -27,13 +27,21 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
   tr{
     height:var(--row-height);
 
-    th{
+    th.cell-title{
       line-height: var(--row-height);
+      border-bottom: 1px solid transparent;
     }
 
     td{
       line-height: var(--row-height);
     }
+    
+    &:last-of-type{
+      .td{
+      border-bottom: 1px solid transparent;
+      }
+
+    }
   }
 
 } 
@@ -239,6 +247,7 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
   display: block;
   font-size: var(--cell-font-size);
   line-height:var(--cell-inner-height) ;
+  height:var(--cell-inner-height) ; 
   padding:0
 }
 

package/dist/core/table/useGroupConfig.js

@@ -4,6 +4,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 { flatten } from 'lodash';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { dataSourceToRowConfig } from "./util";
 export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig, hasChildren) {
@@ -15,13 +16,12 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
   var childrenLength = useMemo(function () {
     if (!(dataSource !== null && dataSource !== void 0 && dataSource.length)) return 0;
     var data = dataSource;
-    var childrenCount = data.filter(function (item) {
+    var childrenCount = flatten(data.filter(function (item) {
       var _item$children;
       return !!((_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length);
-    }).reduce(function (count, _ref) {
-      var children = _ref.children;
-      return count + (children === null || children === void 0 ? void 0 : children.length) ? children.length : 0;
-    }, 0);
+    }).map(function (item) {
+      return item.children;
+    })).length;
     return childrenCount;
   }, [dataSource]);
   useEffect(function () {
@@ -29,9 +29,9 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
     console.log('groupConfigEffect', dataSource.length);
     var rowConfig = dataSourceToRowConfig(dataSource, tableGroupConfig === null || tableGroupConfig === void 0 ? void 0 : tableGroupConfig.defaultOpen);
     if (groupConfigRef.current) {
-      groupConfigRef.current.groups.forEach(function (_ref2, index) {
+      groupConfigRef.current.groups.forEach(function (_ref, index) {
         var _groupConfigRef$curre;
-        var groupName = _ref2.groupName;
+        var groupName = _ref.groupName;
         var rowIndex = rowConfig.groups.findIndex(function (item) {
           return item.groupName === groupName;
         });
@@ -42,6 +42,7 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
     console.log('groupConfigEffect', rowConfig.groups, rowConfig.groupOpen);
     groupConfigRef.current = rowConfig;
   }, [dataSource.length, childrenLength, hasChildren]);
+  console.log('groupConfigEffect', dataSource.length, childrenLength);
   var handleGroupChange = useCallback(function (value) {
     setGroupConfig(value);
     groupConfigRef.current = value;

package/dist/type/sheetTable.d.ts

@@ -80,6 +80,8 @@ export declare type TableProps = {
     backEditStyle?: Partial<CSSStyleDeclaration>;
     rowSelection?: TableRowSelection;
     groupConfig?: TableGroupConfig;
+    menuRenderer?: React.FC<SheetType.MenuRenderProps>;
+    onContextMenu?: (event: any) => void;
     onChange: (changes: TableChange[], extChanges?: TableChange[]) => void;
     handleAdd?: () => void;
     eventHandler?: Record<'reverse' | 'btn-click' | 'cell-edit' | 'cell-switch' | string, undefined | EventHandler>;

package/package.json

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