@zhenliang/sheet 0.0.8 → 0.1.0

package/dist/core/sheet/useVirtualList.js

@@ -6,15 +6,16 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { isEqual, throttle } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
-import { getRowHeight } from "../util";
+import { getRowHeight, rowToActualRow } from "../util";
 var extra = 20;
 // 虚拟列表
 export var useVirtualList = function useVirtualList(elementRef) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var virtualized = arguments.length > 2 ? arguments[2] : undefined;
+  var groupConfig = arguments.length > 2 ? arguments[2] : undefined;
+  var virtualized = arguments.length > 3 ? arguments[3] : undefined;
   var _useState = useState({
       virtualStart: 0,
-      virtualEnd: data.length - 1,
+      virtualEnd: virtualized ? Math.min(data.length - 1, 2 * extra) : data.length - 1,
       paddingTop: 0,
       paddingBottom: 0
     }),
@@ -26,24 +27,34 @@ export var useVirtualList = function useVirtualList(elementRef) {
     paddingTop = state.paddingTop,
     paddingBottom = state.paddingBottom;
   var virtualRef = useRef();
+  var groupConfigRef = useRef(groupConfig);
+  useEffect(function () {
+    groupConfigRef.current = groupConfig;
+  }, [groupConfig]);
   useEffect(function () {
     if (!elementRef.current) return;
 
     //  当前位定高的表格，所以可以直接获取第一行的高度
-
     var rowHeight = getRowHeight(elementRef.current);
+    var itemHeight = rowHeight || 30;
     var handleScroll = throttle(function () {
       var _ref = elementRef.current,
         scrollTop = _ref.scrollTop,
         clientHeight = _ref.clientHeight;
-      var itemHeight = rowHeight || 30;
       var start = Math.floor(scrollTop / itemHeight) - extra;
       var end = Math.ceil((scrollTop + clientHeight) / itemHeight) + extra;
+
+      // todo 加入分组之后的 虚拟列表计算
+      var actualStart = groupConfigRef.current ? rowToActualRow(start, groupConfigRef.current) : start;
+      var actualEnd = groupConfigRef.current ? rowToActualRow(end, groupConfigRef.current) : end;
+
+      // const minStart = start - (actualStart - start)
+      var maxEnd = end - (actualEnd - end);
       var updateVirtualConfig = {
-        virtualStart: start,
-        virtualEnd: end,
-        paddingTop: start * itemHeight,
-        paddingBottom: (data.length - end) * itemHeight
+        virtualStart: actualStart,
+        virtualEnd: maxEnd,
+        paddingTop: actualStart * itemHeight,
+        paddingBottom: (data.length - maxEnd) * itemHeight
       };
       if (isEqual(updateVirtualConfig, virtualRef.current)) {
         return;
@@ -51,20 +62,14 @@ export var useVirtualList = function useVirtualList(elementRef) {
       setState(updateVirtualConfig);
       virtualRef.current = updateVirtualConfig;
     }, 50);
+    // data.length change 的时候用 handleScroll 重设 virtual params
+    handleScroll();
     elementRef.current.addEventListener('scroll', handleScroll);
     return function () {
       var _elementRef$current;
       (_elementRef$current = elementRef.current) === null || _elementRef$current === void 0 ? void 0 : _elementRef$current.removeEventListener('scroll', handleScroll);
     };
-  }, [elementRef.current]);
-  useEffect(function () {
-    setState({
-      virtualStart: 0,
-      virtualEnd: Math.min(data.length - 1, 2 * extra),
-      paddingTop: 0,
-      paddingBottom: 0
-    });
-  }, [data]);
+  }, [elementRef.current, data.length]);
   if (!virtualized) {
     return {
       virtualStart: 0,
@@ -79,5 +84,4 @@ export var useVirtualList = function useVirtualList(elementRef) {
     paddingTop: Math.max(0, paddingTop),
     paddingBottom: data.length - 1 <= virtualEnd ? 0 : paddingBottom
   };
-};
-//# sourceMappingURL=useVirtualList.js.map
+};

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

@@ -1,4 +1,3 @@
-/// <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

@@ -9,7 +9,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 { useSetState } from "../../../hooks";
+import { useSetState, useWidth } from "../../../hooks";
 import { classNames } from "../../util";
 import { CheckViewer } from "../../viewer/checkViewer";
 import { GroupViewer } from "../../viewer/groupViewer";
@@ -24,15 +24,20 @@ export var DraggableShell = function DraggableShell(_ref) {
     showSelect = _ref.showSelect,
     controlProps = _ref.controlProps,
     _ref$controlWidth = _ref.controlWidth,
-    controlWidth = _ref$controlWidth === void 0 ? 25 : _ref$controlWidth;
+    controlWidth = _ref$controlWidth === void 0 ? 30 : _ref$controlWidth;
   var TableShell = function TableShell(_ref2) {
     var children = _ref2.children;
     var headRef = useRef(null);
     var downRef = useRef(null);
     var _useSetState = useSetState({}),
       _useSetState2 = _slicedToArray(_useSetState, 2),
-      widths = _useSetState2[0],
-      setWidth = _useSetState2[1];
+      _widths = _useSetState2[0],
+      _setWidth = _useSetState2[1];
+    var _useWidth = useWidth(),
+      contextWidths = _useWidth.widths,
+      contextSetWidth = _useWidth.onChange;
+    var setWidth = contextSetWidth || _setWidth;
+    var widths = contextWidths || _widths;
     var hasControl = showGroup || showSelect;
     var thItems = useMemo(function () {
       var ths = [];
@@ -61,9 +66,10 @@ export var DraggableShell = function DraggableShell(_ref) {
         }, "-1"));
       }
       columns.forEach(function (item, index) {
-        var _item$dataIndex, _ref3;
-        ths.push( /*#__PURE__*/_jsx("th", {
-          className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed)),
+        var _item$titleConfig, _item$titleConfig2, _item$titleConfig3, _item$dataIndex, _ref3;
+        ((_item$titleConfig = item.titleConfig) === null || _item$titleConfig === void 0 ? void 0 : _item$titleConfig.colSpan) !== 0 && ths.push( /*#__PURE__*/_jsx("th", {
+          className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed), (_item$titleConfig2 = item.titleConfig) === null || _item$titleConfig2 === void 0 ? void 0 : _item$titleConfig2.className),
+          colSpan: (_item$titleConfig3 = item.titleConfig) === null || _item$titleConfig3 === void 0 ? void 0 : _item$titleConfig3.colSpan,
           style: {
             textAlign: (_ref3 = item.align) !== null && _ref3 !== void 0 ? _ref3 : 'unset',
             left: item.fixed === 'left' ? 0 : 'unset',
@@ -91,7 +97,10 @@ export var DraggableShell = function DraggableShell(_ref) {
             if (downRef.current === undefined) downRef.current = target;
             //调整宽度
           },
-          children: item.title
+          children: /*#__PURE__*/_jsx("span", {
+            className: "value-viewer",
+            children: item.title
+          })
         }, (_item$dataIndex = item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : index));
       });
       return ths;
@@ -137,10 +146,10 @@ export var DraggableShell = function DraggableShell(_ref) {
             var cellList = [].slice.call((_headRef$current = headRef.current) === null || _headRef$current === void 0 ? void 0 : _headRef$current.cells);
             var changeIndex = cellList.indexOf(downRef.current);
             //调整该列中的每个Cell
-            var _widths = _defineProperty({
+            var _widths2 = _defineProperty({
               length: columns.length
-            }, hasControl ? changeIndex - 1 : changeIndex, "".concat(newWidth, "px"));
-            setWidth(_widths);
+            }, hasControl ? changeIndex - 1 : changeIndex, newWidth);
+            setWidth(_widths2);
           }
         }
       };
@@ -179,5 +188,4 @@ export var DraggableShell = function DraggableShell(_ref) {
     });
   };
   return TableShell;
-};
-//# sourceMappingURL=index.js.map
+};

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

@@ -1,4 +1,3 @@
-/// <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/shell/tableShell.js

@@ -13,7 +13,7 @@ export var TableShell = function TableShell(_ref) {
     showSelect = _ref.showSelect,
     controlProps = _ref.controlProps,
     _ref$controlWidth = _ref.controlWidth,
-    controlWidth = _ref$controlWidth === void 0 ? 25 : _ref$controlWidth;
+    controlWidth = _ref$controlWidth === void 0 ? 30 : _ref$controlWidth;
   var TableShell = function TableShell(_ref2) {
     var children = _ref2.children;
     var thItems = useMemo(function () {
@@ -43,15 +43,19 @@ export var TableShell = function TableShell(_ref) {
         }, "-1"));
       }
       columns.forEach(function (item, index) {
-        var _ref3;
-        ths.push( /*#__PURE__*/_jsx("th", {
+        var _item$titleConfig, _item$titleConfig2, _ref3;
+        ((_item$titleConfig = item.titleConfig) === null || _item$titleConfig === void 0 ? void 0 : _item$titleConfig.colSpan) !== 0 && ths.push( /*#__PURE__*/_jsx("th", {
           className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed)),
+          colSpan: (_item$titleConfig2 = item.titleConfig) === null || _item$titleConfig2 === void 0 ? void 0 : _item$titleConfig2.colSpan,
           style: {
             textAlign: (_ref3 = item.align) !== null && _ref3 !== void 0 ? _ref3 : 'unset',
             left: item.fixed === 'left' ? 0 : 'unset',
             right: item.fixed === 'right' ? 0 : 'unset'
           },
-          children: item.title
+          children: /*#__PURE__*/_jsx("span", {
+            className: "value-viewer",
+            children: item.title
+          })
         }, item.dataIndex || index));
       });
       return ths;
@@ -102,5 +106,4 @@ export var TableShell = function TableShell(_ref) {
     });
   };
   return TableShell;
-};
-//# sourceMappingURL=tableShell.js.map
+};

package/dist/core/table/events.d.ts

@@ -0,0 +1,15 @@
+import { SheetTableType, SheetType } from "../../type";
+import { FC } from 'react';
+export declare const SelectionEvent: FC<{
+    hasChildren: boolean;
+    rowSelection?: SheetTableType.TableRowSelection;
+    onChange: (value: unknown) => void;
+}>;
+export declare const GroupEvent: FC<{
+    hasChildren: boolean;
+    rowGroupConfig: SheetType.RowGroupConfig;
+    data: SheetType.Cell[][];
+    sheetInstance: SheetType.SheetInstance | null;
+    onGroupChange: (value: SheetType.RowGroupConfig) => void;
+    onGridChange: (value: SheetType.Cell[][]) => void;
+}>;

package/dist/core/table/events.js

@@ -0,0 +1,94 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
+import { SheetEvent } from "../sheet/Event";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export var SelectionEvent = function SelectionEvent(props) {
+  var hasChildren = props.hasChildren,
+    rowSelection = props.rowSelection,
+    onChange = props.onChange;
+  if (hasChildren || !rowSelection) return null;
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(SheetEvent, {
+      name: "row-select",
+      handler: onChange
+    }, "row-select"), /*#__PURE__*/_jsx(SheetEvent, {
+      name: "row-select-title",
+      handler: onChange
+    }, "row-select-title"), ","]
+  });
+};
+export var GroupEvent = function GroupEvent(props) {
+  var hasChildren = props.hasChildren,
+    rowGroupConfig = props.rowGroupConfig,
+    data = props.data,
+    sheetInstance = props.sheetInstance,
+    onGroupChange = props.onGroupChange,
+    onGridChange = props.onGridChange;
+  if (!hasChildren) return null;
+  var _ref = rowGroupConfig || {},
+    groups = _ref.groups;
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(SheetEvent, {
+      name: "group-open",
+      handler: function handler(e) {
+        var _ref2 = e,
+          row = _ref2.row;
+        var index = groups.findIndex(function (item) {
+          return item.groupStart === row;
+        });
+        if (index >= 0) {
+          var groupOpen = _toConsumableArray(rowGroupConfig.groupOpen);
+          groupOpen[index] = !rowGroupConfig.groupOpen[index];
+          onGroupChange && onGroupChange(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
+            groupOpen: groupOpen
+          }));
+          var newGrid = _toConsumableArray(data);
+          newGrid[row] = _toConsumableArray(newGrid[row]);
+          newGrid[row][0] = _objectSpread(_objectSpread({}, newGrid[row][0]), {}, {
+            record: {
+              open: !!groupOpen[index]
+            }
+          });
+          onGridChange && onGridChange(newGrid);
+          sheetInstance === null || sheetInstance === void 0 ? void 0 : sheetInstance.pushToHistory({
+            type: 'Custom',
+            changes: [],
+            extraInfo: {
+              extraType: 'group',
+              groupConfig: rowGroupConfig,
+              data: data
+            }
+          });
+        }
+      }
+    }, "group-open"), /*#__PURE__*/_jsx(SheetEvent, {
+      name: "group-open-title",
+      handler: function handler(value) {
+        onGroupChange && onGroupChange(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
+          groupOpen: Array(rowGroupConfig.groupOpen.length).fill(value)
+        }));
+        sheetInstance === null || sheetInstance === void 0 ? void 0 : sheetInstance.pushToHistory({
+          type: 'Custom',
+          changes: [],
+          extraInfo: {
+            extraType: 'group',
+            groupConfig: rowGroupConfig,
+            data: data
+          }
+        });
+      }
+    }, "group-open-title")]
+  });
+};