@zhenliang/sheet 0.1.9 → 0.1.12

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

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../../type";
 import 'antd/es/cascader/style/index.css';
 import './index.less';
-declare const getCascaderEditor: (options: SheetType.OptionsType[]) => SheetType.CellEditor;
+declare const getCascaderEditor: (options: SheetType.OptionsType[], getCustomOptions?: ((props: SheetType.CellEditorProps) => SheetType.OptionsType[]) | undefined) => SheetType.CellEditor;
 export default getCascaderEditor;

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

@@ -4,17 +4,19 @@ import { useMemo } from 'react';
 import { optionsToValuesFromLabelOrValue, valuesTransferToLabel } from "../../util";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var getCascaderEditor = function getCascaderEditor(options) {
+var getCascaderEditor = function getCascaderEditor(options, getCustomOptions) {
   var CascaderEditor = function CascaderEditor(props) {
     var value = props.value,
       onConfirm = props.onConfirm;
     var val = useMemo(function () {
       var res = optionsToValuesFromLabelOrValue(options, value);
+      console.log('cascader-editor', options, res, value);
       return res;
     }, [value, options]);
     var handleChange = function handleChange(opt) {
       onConfirm(opt ? opt[opt.length - 1] : null);
     };
+    var customOptions = getCustomOptions ? getCustomOptions(props) : options;
     return /*#__PURE__*/_jsx(Cascader, {
       autoFocus: true,
       open: true,
@@ -22,7 +24,8 @@ var getCascaderEditor = function getCascaderEditor(options) {
       onMouseDown: function onMouseDown(event) {
         event.stopPropagation();
       },
-      value: val
+      value: val,
+      allowClear: true
       // allowClear={false}
       ,
       displayRender: function displayRender(label) {
@@ -32,7 +35,7 @@ var getCascaderEditor = function getCascaderEditor(options) {
       // onBlur={handleBlur}
       // onKeyDown={handleKeyDown}
       ,
-      options: options
+      options: customOptions
     });
   };
   CascaderEditor.formatter = function (value) {

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

@@ -3,6 +3,7 @@
   background: transparent !important;
   width:100%;
   height: 38px;
+  height: 100%;
   font-size: 12px;
   box-shadow: none !important;
   text-align: inherit !important;

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

@@ -2,5 +2,5 @@ import type { SheetType } from "../../../type";
 import { SelectProps } from 'antd';
 import 'antd/es/select/style/index.css';
 import './index.less';
-export declare const getSelectEditor: (options: SheetType.Options[], valueKey?: string, extra?: React.ReactNode, selectProps?: Partial<SelectProps>) => SheetType.CellEditor;
+export declare const getSelectEditor: (options: SheetType.Options[], valueKey?: string, extra?: React.ReactNode, selectProps?: Partial<SelectProps>, getCustomOptions?: ((props: SheetType.CellEditorProps) => SheetType.Options[]) | undefined) => SheetType.CellEditor;
 export default getSelectEditor;

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

@@ -24,6 +24,7 @@ export var getSelectEditor = function getSelectEditor(options) {
   var valueKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'value';
   var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : /*#__PURE__*/_jsx(_Fragment, {});
   var selectProps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var getCustomOptions = arguments.length > 4 ? arguments[4] : undefined;
   var SelectEditor = function SelectEditor(props) {
     var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -49,6 +50,7 @@ export var getSelectEditor = function getSelectEditor(options) {
         children: [menu, extra]
       });
     };
+    var customOptions = getCustomOptions ? getCustomOptions(props) : options;
     return /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({}, selectProps), {}, {
       autoFocus: true,
       className: "select-editor",
@@ -60,7 +62,7 @@ export var getSelectEditor = function getSelectEditor(options) {
       value: SelectEditor.formatter ? SelectEditor.formatter(value) : value,
       onChange: handleChange,
       onKeyDown: handleKeyDown,
-      options: options,
+      options: customOptions,
       popupClassName: 'excelTablePopupClassName',
       dropdownRender: dropdown
     }));

package/dist/core/reducers/sideEffectReducer.js

@@ -213,12 +213,10 @@ export var sideEffectReducer = {
           case 9:
             changes = changeInfo.changes, extChanges = changeInfo.extChanges;
             legalChanges = changes.filter(function (_ref5) {
-              var _editor$checker;
               var row = _ref5.row,
                 col = _ref5.col,
                 value = _ref5.value;
               var editor = data[row][col].dataEditor;
-              console.log('number-checker', editor === null || editor === void 0 ? void 0 : editor.checker, editor === null || editor === void 0 ? void 0 : (_editor$checker = editor.checker) === null || _editor$checker === void 0 ? void 0 : _editor$checker.call(editor, value));
               if (editor && editor.checker) {
                 return editor.checker(value, data[row][col].record);
               }
@@ -236,7 +234,6 @@ export var sideEffectReducer = {
                 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
               };
             });
-            console.log('number', changes, legalChanges);
             lastRow = extChanges === null || extChanges === void 0 ? void 0 : (_extChanges$ = extChanges[0]) === null || _extChanges$ === void 0 ? void 0 : _extChanges$.row;
             lastIndex = 1;
             legalExtChanges = extChanges === null || extChanges === void 0 ? void 0 : extChanges.filter(function (_ref7) {
@@ -286,7 +283,7 @@ export var sideEffectReducer = {
               }
             });
             cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : []);
-          case 19:
+          case 18:
           case "end":
             return _context.stop();
         }

package/dist/core/reducers/stateReducer.js

@@ -116,7 +116,7 @@ export var stateReducer = {
     });
     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;
+      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), {}, {

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) : 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) : eventInfo.value);
       }
       setEventState(eventInfo);
     };
@@ -115,7 +115,7 @@ var Cell = function Cell(props) {
     if (valueRef.current === value) {
       return;
     }
-    if (cell !== null && cell !== void 0 && (_cell$dataEditor5 = cell.dataEditor) !== null && _cell$dataEditor5 !== void 0 && _cell$dataEditor5.checker && !((_cell$dataEditor6 = cell.dataEditor) !== null && _cell$dataEditor6 !== void 0 && (_cell$dataEditor6$che = _cell$dataEditor6.checker) !== null && _cell$dataEditor6$che !== void 0 && _cell$dataEditor6$che.call(_cell$dataEditor6, value, cell.record))) {
+    if (value !== null && cell !== null && cell !== void 0 && (_cell$dataEditor5 = cell.dataEditor) !== null && _cell$dataEditor5 !== void 0 && _cell$dataEditor5.checker && !((_cell$dataEditor6 = cell.dataEditor) !== null && _cell$dataEditor6 !== void 0 && (_cell$dataEditor6$che = _cell$dataEditor6.checker) !== null && _cell$dataEditor6$che !== void 0 && _cell$dataEditor6$che.call(_cell$dataEditor6, value, cell.record))) {
       setValue(valueRef.current);
       return;
     }

package/dist/core/sheet/index.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 ReduxLogger from 'redux-logger';
+// import ReduxLogger from 'redux-logger';
 import ReduxThunk from 'redux-thunk';
 import DefaultRow from "./DefaultRow";
 import DefaultShell from "./DefaultShell";
@@ -43,6 +43,7 @@ var Sheet = function Sheet(props) {
     ContextMenu = props.menuRenderer,
     _props$virtualized = props.virtualized,
     virtualized = _props$virtualized === void 0 ? false : _props$virtualized,
+    sticky = props.sticky,
     className = props.className,
     data = props.data,
     _props$freePaste = props.freePaste,
@@ -66,7 +67,9 @@ var Sheet = function Sheet(props) {
       lastFocus: [],
       groupConfig: groupConfig,
       eventBus: eventBus
-    }, [ReduxThunk, ReduxLogger]),
+    },
+    // [ReduxThunk, ReduxLogger],
+    [ReduxThunk]),
     _useMiddlewareReducer2 = _slicedToArray(_useMiddlewareReducer, 2),
     state = _useMiddlewareReducer2[0],
     dispatch = _useMiddlewareReducer2[1];

package/dist/core/sheet/index.less

@@ -101,8 +101,7 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
 
   
   &.fixed-right{
-    // transform: translateX(1px);
-
+    transform: translateX(1px);
   }
 
   &.fixed-right::after{

package/dist/core/table/index.js

@@ -235,7 +235,6 @@ var Table = function Table(_ref) {
   }));
   var headSelection = !!rowSelection;
   var WrappedTableShell = useMemo(function () {
-    console.log('shell-render', '损耗性能大');
     if (draggable) {
       return DraggableShell({
         columns: columns,

package/dist/core/table/useGroupConfig.js

@@ -28,21 +28,30 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
     if (!hasChildren) return;
     var rowConfig = dataSourceToRowConfig(dataSource, tableGroupConfig === null || tableGroupConfig === void 0 ? void 0 : tableGroupConfig.defaultOpen);
     if (groupConfigRef.current) {
-      groupConfigRef.current.groups.forEach(function (_ref, index) {
-        var _groupConfigRef$curre;
+      rowConfig.groups.forEach(function (_ref, index) {
+        var _groupConfigRef$curre, _groupConfigRef$curre2;
         var groupName = _ref.groupName;
-        var rowIndex = rowConfig.groups.findIndex(function (item) {
+        var rowIndex = (_groupConfigRef$curre = (_groupConfigRef$curre2 = groupConfigRef.current) === null || _groupConfigRef$curre2 === void 0 ? void 0 : _groupConfigRef$curre2.groups.findIndex(function (item) {
           return item.groupName === groupName;
-        });
-        rowConfig.groupOpen[rowIndex] = ((_groupConfigRef$curre = groupConfigRef.current) === null || _groupConfigRef$curre === void 0 ? void 0 : _groupConfigRef$curre.groupOpen[index]) || rowConfig.groupOpen[rowIndex];
+        })) !== null && _groupConfigRef$curre !== void 0 ? _groupConfigRef$curre : -1;
+        if (rowIndex >= 0) {
+          var _groupConfigRef$curre3, _groupConfigRef$curre4;
+          var hasNewLine = rowConfig.groups[rowIndex].groupEnd !== ((_groupConfigRef$curre3 = groupConfigRef.current) === null || _groupConfigRef$curre3 === void 0 ? void 0 : _groupConfigRef$curre3.groups[index].groupEnd);
+          rowConfig.groupOpen[rowIndex] = hasNewLine ? true : (_groupConfigRef$curre4 = groupConfigRef.current) === null || _groupConfigRef$curre4 === void 0 ? void 0 : _groupConfigRef$curre4.groupOpen[index];
+        } else {
+          // 新子行
+          rowConfig.groupOpen[index] = true;
+        }
       });
     }
     setGroupConfig(rowConfig);
     groupConfigRef.current = rowConfig;
   }, [dataSource.length, childrenLength, hasChildren]);
   var handleGroupChange = useCallback(function (value) {
+    var _groupConfigRef$curre5;
     setGroupConfig(value);
     groupConfigRef.current = value;
+    console.log('handler', childrenLength, (_groupConfigRef$curre5 = groupConfigRef.current) === null || _groupConfigRef$curre5 === void 0 ? void 0 : _groupConfigRef$curre5.groupOpen);
   }, [setGroupConfig]);
   return [groupConfig, handleGroupChange];
 };

package/dist/core/util.d.ts

@@ -31,7 +31,7 @@ export declare const defaultValueRenderer: (cell: SheetType.Cell) => string | nu
 export declare function renderValue(cell: SheetType.Cell): string | number;
 export declare const optionsToValuesFromLabelOrValue: (options: SheetType.OptionsType[], val: string) => string[];
 export declare const optionsTransferToValue: (options: SheetType.OptionsType[], val: string, key?: string) => string[];
-export declare const optionsTransferToValue2: (options?: SheetType.OptionsType[], value?: string, path?: string[]) => string[];
+export declare const optionsTransferToValue2: (options?: SheetType.OptionsType[], value?: string, path?: string[]) => (string | number)[];
 export declare const valuesTransferToLabel: (options?: SheetType.OptionsType[], value?: string) => string | null;
 export declare const groupConfigToGroupMap: (rowGroupConfig?: SheetType.RowGroupConfig) => Map<number, SheetType.RowGroup & {
     isStart: boolean;

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

@@ -20,6 +20,9 @@ export var GroupViewer = function GroupViewer(props) {
   }, [eventBus, row, record === null || record === void 0 ? void 0 : record.open]);
   if (value) {
     return /*#__PURE__*/_jsx("span", {
+      style: {
+        cursor: 'pointer'
+      },
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },

package/dist/type/sheet.d.ts

@@ -96,6 +96,7 @@ export declare type SheetProps = {
     virtualized?: boolean;
     showBackEdit?: boolean;
     backEditStyle?: Partial<CSSStyleDeclaration>;
+    sticky?: boolean;
     groupConfig?: RowGroupConfig;
     onCellsChanged?: CellChangeHandler;
     menuRenderer?: React.FC<MenuRenderProps>;
@@ -185,7 +186,7 @@ export declare type UpdateStateType = {
 };
 export declare type UpdateFocus = (start: CellPosition, end: CellPosition) => void;
 export declare type Options<T = any> = {
-    value: string;
+    value: string | number;
     label: string;
 } & T;
 export declare type OptionsType = Options<{

package/package.json

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