@zhenliang/sheet 0.1.13 → 0.1.15

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

@@ -1,5 +1,6 @@
 import { Cascader } from 'antd';
 import 'antd/es/cascader/style/index.css';
+import { isNil } from 'lodash';
 import { useMemo } from 'react';
 import { optionsToValuesFromLabelOrValue, valuesTransferToLabel } from "../../util";
 import "./index.less";
@@ -25,16 +26,11 @@ var getCascaderEditor = function getCascaderEditor(options, getCustomOptions) {
         event.stopPropagation();
       },
       value: val,
-      allowClear: true
-      // allowClear={false}
-      ,
+      allowClear: true,
       displayRender: function displayRender(label) {
         return label[label.length - 1];
       },
-      onChange: handleChange
-      // onBlur={handleBlur}
-      // onKeyDown={handleKeyDown}
-      ,
+      onChange: handleChange,
       options: customOptions
     });
   };
@@ -47,6 +43,9 @@ var getCascaderEditor = function getCascaderEditor(options, getCustomOptions) {
     return res.length ? res[res.length - 1] : null;
   };
   CascaderEditor.checker = function (value) {
+    if (isNil(value)) {
+      return true;
+    }
     var res = optionsToValuesFromLabelOrValue(options, value);
     return !!res.length;
   };

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

@@ -21,8 +21,8 @@
     }
   }
 
-}
+  .ant-cascader-menu {
+    font-size: 12px;
+  }
 
-.ant-cascader-menu {
-  font-size: 12px;
-}
+}

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

@@ -6,6 +6,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { DatePicker } from 'antd';
 import 'antd/es/date-picker/style/index.css';
+import { isNil } from 'lodash';
 import moment from 'moment';
 import { useEffect, useMemo, useRef } from 'react';
 import "./index.less";
@@ -39,6 +40,9 @@ export var getDateEditor = function getDateEditor(dateProps) {
     }, dateProps));
   };
   DateEditor.checker = function (value) {
+    if (isNil(value)) {
+      return true;
+    }
     var reg = /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])$/;
     return reg.test(value);
   };

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

@@ -2,5 +2,7 @@ import type { SheetType } from "../../../type";
 import { InputNumberProps } from 'antd';
 import 'antd/es/input-number/style/index.css';
 import './index.less';
+declare type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'>>;
 export declare const NumberEditor: SheetType.CellEditor;
-export declare const getNumberEditor: (extraProps?: Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'>>) => SheetType.CellEditor;
+export declare const getNumberEditor: (extraProps?: inputProps, getExtraProps?: ((props: SheetType.CellEditorProps) => inputProps) | undefined) => SheetType.CellEditor;
+export {};

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

@@ -34,7 +34,7 @@ export var NumberEditor = function NumberEditor(props) {
     onChange: onChange
   });
 };
-export var getNumberEditor = function getNumberEditor(extraProps) {
+export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps) {
   var NumberEditor = function NumberEditor(props) {
     var value = props.value,
       onChange = props.onChange;
@@ -43,7 +43,7 @@ export var getNumberEditor = function getNumberEditor(extraProps) {
       var _inputNumberRef$curre2;
       inputNumberRef === null || inputNumberRef === void 0 ? void 0 : (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 ? void 0 : _inputNumberRef$curre2.focus();
     }, []);
-    var _ref = extraProps || {},
+    var _ref = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
       precision = _ref.precision,
       inputArgs = _objectWithoutProperties(_ref, _excluded);
     var valueFormatter = useCallback(function (value) {

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

@@ -14,8 +14,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Select } from 'antd';
 import 'antd/es/select/style/index.css';
-import { useState } from 'react';
 import { isNil } from 'lodash';
+import { useState } from 'react';
 import "./index.less";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -59,7 +59,7 @@ export var getSelectEditor = function getSelectEditor(options) {
       onMouseDown: function onMouseDown(e) {
         e.stopPropagation();
       },
-      value: SelectEditor.formatter ? SelectEditor.formatter(value) : value,
+      value: SelectEditor.parser ? SelectEditor.parser(value) : value,
       onChange: handleChange,
       onKeyDown: handleKeyDown,
       options: customOptions,

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

@@ -1,10 +1,11 @@
-.select-editor,.ant-select-selector {
+.select-editor {
   // select style
   width: 100%;
   line-height: 20px;
   height: 20px;
 
     .ant-select-selector {
+      width: 100%;
       border: none !important;
       background: transparent !important;
       box-shadow: none !important;
@@ -36,8 +37,7 @@
     box-shadow: inset 0 -100px 0 rgba(33,133,208,15%);
   }
 
+  .ant-select-item {
+    font-size: 12px !important;
+  }
 }
-
-.ant-select-item {
-  font-size: 12px !important;
-}

package/dist/core/sheet/index.less

@@ -138,18 +138,22 @@ span.harvest-sheet-container, span.harvest-sheet-container:focus {
 
 .harvest-sheet-container .harvest-sheet .cell.selected-top{
   border-top-color: var(--resizer);
+  border-top-width: 1px;
 }
 
 .harvest-sheet-container .harvest-sheet .cell.selected-left{
   border-left-color: var(--resizer);
-}
+  border-left-width:1px;
+ }
 
 .harvest-sheet-container .harvest-sheet .cell.selected-bottom{
   border-bottom-color: var(--resizer);
+  border-bottom-width:1px;
 }
 
 .harvest-sheet-container .harvest-sheet .cell.selected-right{
   border-right-color: var(--resizer);
+  border-right-width:1px;
 }
 
 

package/dist/core/shell/draggableShell/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { SheetType } from "../../../type";
 import './index.less';
 export declare const DraggableShell: ({ columns, className, showGroup, showSelect, controlProps, controlWidth, }: SheetType.SheetShell) => import("react").FC<{

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

@@ -115,12 +115,18 @@ export var DraggableShell = function DraggableShell(_ref) {
           }
         }, "sheet-control"));
       }
+      var i = 0;
       columns.forEach(function (item, index) {
-        var _item$dataIndex2;
+        var _item$titleConfig4, _item$dataIndex2;
+        var currentWidth = item.width || 'unset';
+        if (((_item$titleConfig4 = item.titleConfig) === null || _item$titleConfig4 === void 0 ? void 0 : _item$titleConfig4.colSpan) !== 0) {
+          currentWidth = widths[i] || item.width || 'unset';
+          i++;
+        }
         cols.push( /*#__PURE__*/_jsx("col", {
           className: classNames('cell'),
           style: {
-            width: widths[index] || item.width || 'unset'
+            width: currentWidth
           }
         }, (_item$dataIndex2 = item.dataIndex) !== null && _item$dataIndex2 !== void 0 ? _item$dataIndex2 : index));
       });

package/dist/core/shell/tableShell.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { SheetType } from "../../type";
 import './draggableShell/index.less';
 export declare const TableShell: ({ columns, className, showGroup, showSelect, controlProps, controlWidth, }: SheetType.SheetShell) => import("react").FC<{

package/dist/core/table/index.js

@@ -122,10 +122,10 @@ var Table = function Table(_ref) {
             id: rowId,
             value: value,
             record: itemRow,
-            readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, itemRow, currentIndex),
+            readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, itemRow, currentIndex, col),
             align: colInfo.align,
             fixed: colInfo.fixed,
-            editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, itemRow, currentIndex),
+            editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, itemRow, currentIndex, col),
             valueViewer: colInfo.render ? colInfo.render : undefined,
             dataEditor: colInfo.editor ? colInfo.editor : undefined,
             row: currentIndex,
@@ -171,7 +171,7 @@ var Table = function Table(_ref) {
           id: rowId,
           value: value,
           record: item,
-          readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, item, row),
+          readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, item, row, col),
           align: colInfo.align,
           fixed: colInfo.fixed,
           editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, item, row),
@@ -193,6 +193,7 @@ var Table = function Table(_ref) {
   var handleChanges = useCallback(function (changes, extChange) {
     onChange && onChange(changes.map(function (item) {
       return {
+        col: item.col,
         row: item.row,
         id: item.id,
         key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
@@ -200,6 +201,7 @@ var Table = function Table(_ref) {
       };
     }), extChange === null || extChange === void 0 ? void 0 : extChange.map(function (item) {
       return {
+        col: item.col,
         row: item.row,
         id: item.id,
         key: columns[hasControl ? item.col - 1 : item.col].dataIndex,

package/dist/core/table/useGroupConfig.js

@@ -4,7 +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 { flatten, isNil } from 'lodash';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { dataSourceToRowConfig } from "./util";
 export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig, hasChildren) {
@@ -30,14 +30,24 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
     if (groupConfigRef.current) {
       rowConfig.groups.forEach(function (_ref, index) {
         var _groupConfigRef$curre, _groupConfigRef$curre2;
-        var groupName = _ref.groupName;
+        var groupName = _ref.groupName,
+          newGroupStart = _ref.groupStart,
+          newGroupEnd = _ref.groupEnd;
         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;
         })) !== null && _groupConfigRef$curre !== void 0 ? _groupConfigRef$curre : -1;
         if (rowIndex >= 0) {
-          var _groupConfigRef$curre3, _groupConfigRef$curre4, _groupConfigRef$curre5;
-          var hasNewLine = rowConfig.groups[rowIndex].groupEnd !== ((_groupConfigRef$curre3 = groupConfigRef.current) === null || _groupConfigRef$curre3 === void 0 ? void 0 : (_groupConfigRef$curre4 = _groupConfigRef$curre3.groups[index]) === null || _groupConfigRef$curre4 === void 0 ? void 0 : _groupConfigRef$curre4.groupEnd);
-          rowConfig.groupOpen[rowIndex] = hasNewLine ? true : (_groupConfigRef$curre5 = groupConfigRef.current) === null || _groupConfigRef$curre5 === void 0 ? void 0 : _groupConfigRef$curre5.groupOpen[index];
+          var _groupConfigRef$curre3, _groupConfigRef$curre4;
+          var hasNewLine = false;
+          var currentOld = (_groupConfigRef$curre3 = groupConfigRef.current) === null || _groupConfigRef$curre3 === void 0 ? void 0 : _groupConfigRef$curre3.groups[rowIndex];
+          if (currentOld && !isNil(currentOld.groupEnd) && !isNil(currentOld.groupStart)) {
+            var oldLength = currentOld.groupEnd - currentOld.groupStart;
+            var newLength = newGroupEnd - newGroupStart;
+            hasNewLine = newLength > oldLength;
+          } else {
+            hasNewLine = true;
+          }
+          rowConfig.groupOpen[index] = hasNewLine ? true : (_groupConfigRef$curre4 = groupConfigRef.current) === null || _groupConfigRef$curre4 === void 0 ? void 0 : _groupConfigRef$curre4.groupOpen[rowIndex];
         } else {
           // 新子行
           rowConfig.groupOpen[index] = true;
@@ -48,10 +58,8 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
     groupConfigRef.current = rowConfig;
   }, [dataSource.length, childrenLength, hasChildren]);
   var handleGroupChange = useCallback(function (value) {
-    var _groupConfigRef$curre6;
     setGroupConfig(value);
     groupConfigRef.current = value;
-    console.log('handler', childrenLength, (_groupConfigRef$curre6 = groupConfigRef.current) === null || _groupConfigRef$curre6 === void 0 ? void 0 : _groupConfigRef$curre6.groupOpen);
   }, [setGroupConfig]);
   return [groupConfig, handleGroupChange];
 };

package/dist/type/sheetTable.d.ts

@@ -5,7 +5,7 @@ export declare type refAssertion = {
     focus?: () => boolean;
 } & HTMLTableSectionElement;
 export declare type CellFixed = SheetType.CellAlign;
-export declare type RecordRowMap<T> = (value: unknown, record: Record<string, unknown>, index: number) => T;
+export declare type RecordRowMap<T> = (value: unknown, record: Record<string, unknown>, index: number, colIndex?: number) => T;
 export declare type ColumnProps = {
     /**
      * @description 对齐
@@ -38,6 +38,7 @@ export declare type ColumnProps = {
     editor?: SheetType.CellEditor;
 };
 export declare type TableChange = {
+    col?: number;
     row: number;
     id: string;
     key: string;

package/package.json

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