@zhenliang/sheet 0.1.8 → 0.1.10

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,7 +4,7 @@ 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;
@@ -15,6 +15,7 @@ var getCascaderEditor = function getCascaderEditor(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 +23,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 +34,7 @@ var getCascaderEditor = function getCascaderEditor(options) {
       // onBlur={handleBlur}
       // onKeyDown={handleKeyDown}
       ,
-      options: options
+      options: customOptions
     });
   };
   CascaderEditor.formatter = function (value) {

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

@@ -84,20 +84,21 @@ export var getNumberEditor = function getNumberEditor(extraProps) {
     return result;
   };
   NumberEditor.parser = function (value) {
-    var _extraProps$precision;
-    if (isNil(value) || isNaN(value)) {
+    var _String2, _extraProps$precision;
+    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
+    if (isNil(result) || isNaN(result)) {
       return null;
     }
-    return Number(formatPrecision(value, (_extraProps$precision = extraProps === null || extraProps === void 0 ? void 0 : extraProps.precision) !== null && _extraProps$precision !== void 0 ? _extraProps$precision : 0));
+    return Number(formatPrecision(result, (_extraProps$precision = extraProps === null || extraProps === void 0 ? void 0 : extraProps.precision) !== null && _extraProps$precision !== void 0 ? _extraProps$precision : 0));
   };
   NumberEditor.checker = function (value) {
-    var _String2;
-    if (!value) {
+    var _String3;
+    if (isNil(value)) {
       return true;
     }
     // parse number with thousands separator
-    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
-    if (isNaN(result) || isNaN(value)) {
+    var result = parseFloat((_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/,/g, ''));
+    if (isNaN(result)) {
       return false;
     }
     return true;

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

@@ -14,7 +14,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { head, isNil, last, pick } from 'lodash';
-import { clipboardDataToString, defaultValueRenderer, flatRowCol, flatRowColIndex, formatDataToCell, getRowColConfig, groupConfigToGroupMap, stringToClipboardData } from "../util";
+import { clipboardDataToString, flatRowCol, flatRowColIndex, formatDataToCell, getRowColConfig, groupConfigToGroupMap, stringToClipboardData } from "../util";
 export var sideEffectReducer = {
   init: function init(dispatch, getState) {
     var _getState = getState(),
@@ -137,7 +137,6 @@ export var sideEffectReducer = {
     var cellIndex = flatRowColIndex(start, end);
     var groupMap = groupConfigToGroupMap(groupConfig);
     var copyData = cellIndex.reduce(function (left, _ref3) {
-      var _data$row$col$dataEdi, _data$row$col$dataEdi2, _data$row$col$dataEdi3;
       var _ref3$row = _ref3.row,
         row = _ref3$row === void 0 ? 0 : _ref3$row,
         _ref3$col = _ref3.col,
@@ -156,7 +155,22 @@ export var sideEffectReducer = {
       }
 
       // 复制到剪贴板的时候执行 formatter
-      var currentValue = "".concat(value).concat(currentRow === row ? '\t' : '\n', " ").concat((_data$row$col$dataEdi = data[row][col].dataEditor) !== null && _data$row$col$dataEdi !== void 0 && _data$row$col$dataEdi.formatter ? (_data$row$col$dataEdi2 = data[row][col].dataEditor) === null || _data$row$col$dataEdi2 === void 0 ? void 0 : (_data$row$col$dataEdi3 = _data$row$col$dataEdi2.formatter) === null || _data$row$col$dataEdi3 === void 0 ? void 0 : _data$row$col$dataEdi3.call(_data$row$col$dataEdi2, data[row][col].value) : defaultValueRenderer(data[row][col]));
+      var _data$row$col = data[row][col],
+        dataValue = _data$row$col.value,
+        dataEditor = _data$row$col.dataEditor;
+      var _ref4 = dataEditor || {},
+        dataFormatter = _ref4.formatter;
+      var formattedValue = dataFormatter ? dataFormatter(dataValue) : dataValue;
+      if (isNil(dataValue)) {
+        formattedValue = ' ';
+      }
+      if (currentRow === -1) {
+        return {
+          currentRow: row,
+          value: formattedValue
+        };
+      }
+      var currentValue = "".concat(value).concat(currentRow === row ? '\t' : '\n', " ").concat(formattedValue);
       return {
         currentRow: row,
         value: currentValue
@@ -165,7 +179,7 @@ export var sideEffectReducer = {
       currentRow: -1,
       value: ''
     });
-    var text = copyData.value.trimStart();
+    var text = copyData.value;
     stringToClipboardData(text, cellIndex.length);
   },
   paste: function paste(dispatch, getState) {
@@ -198,43 +212,43 @@ export var sideEffectReducer = {
             return _context.abrupt("return");
           case 9:
             changes = changeInfo.changes, extChanges = changeInfo.extChanges;
-            legalChanges = changes.filter(function (_ref4) {
-              var row = _ref4.row,
-                col = _ref4.col,
-                value = _ref4.value;
+            legalChanges = changes.filter(function (_ref5) {
+              var row = _ref5.row,
+                col = _ref5.col,
+                value = _ref5.value;
               var editor = data[row][col].dataEditor;
               if (editor && editor.checker) {
                 return editor.checker(value, data[row][col].record);
               }
               return true;
-            }).map(function (_ref5) {
-              var _data$row$col, _editor$parser;
-              var row = _ref5.row,
-                col = _ref5.col,
-                value = _ref5.value;
+            }).map(function (_ref6) {
+              var _data$row$col2, _editor$parser;
+              var row = _ref6.row,
+                col = _ref6.col,
+                value = _ref6.value;
               var editor = data[row][col].dataEditor;
               return {
                 row: row,
                 col: col,
-                id: (_data$row$col = data[row][col]) === null || _data$row$col === void 0 ? void 0 : _data$row$col.id,
+                id: (_data$row$col2 = data[row][col]) === null || _data$row$col2 === void 0 ? void 0 : _data$row$col2.id,
                 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
               };
             });
             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 (_ref6) {
-              var value = _ref6.value,
-                col = _ref6.col;
+            legalExtChanges = extChanges === null || extChanges === void 0 ? void 0 : extChanges.filter(function (_ref7) {
+              var value = _ref7.value,
+                col = _ref7.col;
               var editor = data[0][col].dataEditor;
               if (editor && editor.checker) {
                 return editor.checker(value);
               }
               return true;
-            }).map(function (_ref7) {
+            }).map(function (_ref8) {
               var _editor$parser2;
-              var row = _ref7.row,
-                col = _ref7.col,
-                value = _ref7.value;
+              var row = _ref8.row,
+                col = _ref8.col,
+                value = _ref8.value;
               var editor = data[0][col].dataEditor;
               if (lastRow !== row) {
                 lastRow = row;

package/dist/core/sheet/Cell.js

@@ -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/table/index.js

@@ -55,10 +55,12 @@ var Table = function Table(_ref) {
     widths = _useSetState2[0],
     setWidth = _useSetState2[1];
   var sheetInstance = sheetRef || _sheetInstance;
-  var hasChildren = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
+  var dataHasChildren = dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
     var _item$children;
     return (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
-  })) || !!groupConfig;
+  });
+  var configWithChildren = !!groupConfig && !!dataSource.length;
+  var hasChildren = dataHasChildren || configWithChildren;
   var hasControl = hasChildren || !!rowSelection;
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),

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.8",
+  "version": "0.1.10",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",