@zhenliang/sheet 0.1.79 → 0.1.81-beta

package/dist/core/sheet/useMouseEvent.js

@@ -1,6 +1,6 @@
 import { useMouse } from "../..";
 import { useCallback, useEffect, useRef } from 'react';
-import { extractDataRowAndCol, findParentTd, isSearchElement } from "../util";
+import { extractDataRowAndCol, findParentTd, isSiblingControl } from "../util";
 var rowCount = 10; //每秒10行
 var colCount = 5; //每秒5列
 
@@ -268,9 +268,9 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
   var loseFocus = useCallback(function (e) {
     var _elementRef$current10, _elementRef$current11;
     // todo 加一个root node
-    var isSearch = isSearchElement((_elementRef$current10 = elementRef.current) === null || _elementRef$current10 === void 0 ? void 0 : _elementRef$current10.parentElement, e.target);
+    var isSibling = isSiblingControl((_elementRef$current10 = elementRef.current) === null || _elementRef$current10 === void 0 ? void 0 : _elementRef$current10.parentElement, e.target);
     var isTableAControl = (_elementRef$current11 = elementRef.current) === null || _elementRef$current11 === void 0 || (_elementRef$current11 = _elementRef$current11.parentElement) === null || _elementRef$current11 === void 0 ? void 0 : _elementRef$current11.contains(e.target);
-    if (!(isTableAControl || isSearch)) {
+    if (!(isTableAControl || isSibling)) {
       dispatch({
         type: 'loseFocus'
       });

package/dist/core/table/events.js

@@ -52,15 +52,17 @@ export var GroupEvent = function GroupEvent(props) {
         if (index >= 0) {
           var groupOpen = _toConsumableArray(rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.groupOpen);
           groupOpen[index] = !(rowGroupConfig !== null && rowGroupConfig !== void 0 && rowGroupConfig.groupOpen[index]);
-          onGroupChange && onGroupChange(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
+          var after = _objectSpread(_objectSpread({}, rowGroupConfig), {}, {
             groupOpen: groupOpen
-          }));
+          });
+          onGroupChange && onGroupChange(after);
           sheetInstance === null || sheetInstance === void 0 || sheetInstance.pushToHistory({
             type: 'Custom',
             changes: [],
             extraInfo: {
               extraType: 'group',
-              groupConfig: rowGroupConfig
+              groupConfig: rowGroupConfig,
+              recoverGroupConfig: after
             }
           });
         }
@@ -71,16 +73,18 @@ export var GroupEvent = function GroupEvent(props) {
         if (!(rowGroupConfig !== null && rowGroupConfig !== void 0 && rowGroupConfig.groupOpen.some(function (item) {
           return item !== value;
         }))) return;
-        onGroupChange && onGroupChange(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
+        var after = _objectSpread(_objectSpread({}, rowGroupConfig), {}, {
           groupOpen: Array(rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.groupOpen.length).fill(value),
           defaultOpen: !groups.length ? value : undefined
-        }));
+        });
+        onGroupChange && onGroupChange(after);
         sheetInstance === null || sheetInstance === void 0 || sheetInstance.pushToHistory({
           type: 'Custom',
           changes: [],
           extraInfo: {
             extraType: 'group',
-            groupConfig: rowGroupConfig
+            groupConfig: rowGroupConfig,
+            recoverGroupConfig: after
           }
         });
       }

package/dist/core/table/index.js

@@ -172,7 +172,20 @@ var Table = function Table(_ref) {
         setGroupConfig(_groupConfig);
       }
     }
-  }, [data, groupConfig]);
+  }, [groupConfig]);
+  var handleRecover = useCallback(function (value) {
+    var _ref4 = value,
+      type = _ref4.type,
+      extraInfo = _ref4.extraInfo;
+    if (type === 'Custom') {
+      var _ref5 = extraInfo,
+        recoverGroupConfig = _ref5.recoverGroupConfig,
+        extraType = _ref5.extraType;
+      if (extraType === 'group') {
+        setGroupConfig(recoverGroupConfig);
+      }
+    }
+  }, [groupConfig]);
   var handleRowSelect = useCallback(function (value) {
     if (!sheetInstance.current) return;
     var currentRow = value;
@@ -225,9 +238,9 @@ var Table = function Table(_ref) {
     setRemarkInfo = _useState6[1];
   var handleCellClick = useCallback(function (cell) {
     var _columns$dataIndex, _data$row, _data$row2;
-    var _ref4 = cell !== null && cell !== void 0 ? cell : {},
-      col = _ref4.col,
-      row = _ref4.row;
+    var _ref6 = cell !== null && cell !== void 0 ? cell : {},
+      col = _ref6.col,
+      row = _ref6.row;
     if (!cell || !(columns !== null && columns !== void 0 && columns.length) || !(data !== null && data !== void 0 && data.length) || !columns[col - offset]) {
       //remove pop
       setShowRemark(false);
@@ -269,11 +282,11 @@ var Table = function Table(_ref) {
         return function (props) {
           var _data$row3, _target$record, _target$record$includ;
           var cell = props.cell;
-          var _ref5 = cell !== null && cell !== void 0 ? cell : {},
-            _ref5$col = _ref5.col,
-            col = _ref5$col === void 0 ? -1 : _ref5$col,
-            _ref5$row = _ref5.row,
-            row = _ref5$row === void 0 ? -1 : _ref5$row;
+          var _ref7 = cell !== null && cell !== void 0 ? cell : {},
+            _ref7$col = _ref7.col,
+            col = _ref7$col === void 0 ? -1 : _ref7$col,
+            _ref7$row = _ref7.row,
+            row = _ref7$row === void 0 ? -1 : _ref7$row;
           var target = data === null || data === void 0 || (_data$row3 = data[row]) === null || _data$row3 === void 0 ? void 0 : _data$row3[col + 1];
           var cellHasRemark = (_target$record = target.record) === null || _target$record === void 0 || (_target$record = _target$record.remarks) === null || _target$record === void 0 || (_target$record$includ = _target$record.includes) === null || _target$record$includ === void 0 ? void 0 : _target$record$includ.call(_target$record, target.dataIndex);
           if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
@@ -291,11 +304,11 @@ var Table = function Table(_ref) {
       return function (props) {
         var _data$row4, _target$record2, _target$record2$inclu;
         var cell = props.cell;
-        var _ref6 = cell !== null && cell !== void 0 ? cell : {},
-          _ref6$col = _ref6.col,
-          col = _ref6$col === void 0 ? -1 : _ref6$col,
-          _ref6$row = _ref6.row,
-          row = _ref6$row === void 0 ? -1 : _ref6$row;
+        var _ref8 = cell !== null && cell !== void 0 ? cell : {},
+          _ref8$col = _ref8.col,
+          col = _ref8$col === void 0 ? -1 : _ref8$col,
+          _ref8$row = _ref8.row,
+          row = _ref8$row === void 0 ? -1 : _ref8$row;
         var target = data === null || data === void 0 || (_data$row4 = data[row]) === null || _data$row4 === void 0 ? void 0 : _data$row4[col + 1];
         var MenuFC = menuRenderer;
         var cellHasRemark = (_target$record2 = target.record) === null || _target$record2 === void 0 || (_target$record2 = _target$record2.remarks) === null || _target$record2 === void 0 || (_target$record2$inclu = _target$record2.includes) === null || _target$record2$inclu === void 0 ? void 0 : _target$record2$inclu.call(_target$record2, target.dataIndex);
@@ -349,7 +362,10 @@ var Table = function Table(_ref) {
           }), /*#__PURE__*/_jsx(SheetEvent, {
             name: "reverse",
             handler: handleReverse
-          }, "_reverse"), /*#__PURE__*/_jsx(RemarkEvent, {
+          }, "_reverse"), /*#__PURE__*/_jsx(SheetEvent, {
+            name: "recover",
+            handler: handleRecover
+          }, "_recover"), /*#__PURE__*/_jsx(RemarkEvent, {
             handler: handleCellClick
           }), Object.keys(eventHandler || {}).map(function (key) {
             return /*#__PURE__*/_jsx(SheetEvent, {

package/dist/core/util.d.ts

@@ -62,6 +62,8 @@ export declare const stripRowIndex: (data: SheetType.Cell[][]) => {
     endIndex: number;
 };
 export declare const ensureFocus: (container?: HTMLElement | null) => void;
+export declare const isSiblingControl: (tableRootNode: HTMLDivElement, target: HTMLElement) => boolean | undefined;
+export declare const isAnotationElement: (tableRootNode: HTMLDivElement, target: HTMLElement) => boolean | undefined;
 export declare const isSearchElement: (tableRootNode: HTMLDivElement, target: HTMLElement) => boolean | undefined;
 export declare const noramlizeSearch: (target: string) => string;
 export declare const searchInclude: (search: string, compare: string) => boolean;

package/dist/core/util.js

@@ -496,9 +496,16 @@ export var ensureFocus = function ensureFocus(container) {
     focusInterval = undefined;
   }, 1000);
 };
-export var isSearchElement = function isSearchElement(tableRootNode, target) {
+export var isSiblingControl = function isSiblingControl(tableRootNode, target) {
+  return isAnotationElement(tableRootNode, target) || isSearchElement(tableRootNode, target);
+};
+export var isAnotationElement = function isAnotationElement(tableRootNode, target) {
   var _tableRootNode$nextSi;
-  return (_tableRootNode$nextSi = tableRootNode.nextSibling) === null || _tableRootNode$nextSi === void 0 || (_tableRootNode$nextSi = _tableRootNode$nextSi.nextSibling) === null || _tableRootNode$nextSi === void 0 ? void 0 : _tableRootNode$nextSi.contains(target);
+  return (_tableRootNode$nextSi = tableRootNode.nextSibling) === null || _tableRootNode$nextSi === void 0 ? void 0 : _tableRootNode$nextSi.contains(target);
+};
+export var isSearchElement = function isSearchElement(tableRootNode, target) {
+  var _tableRootNode$nextSi2;
+  return (_tableRootNode$nextSi2 = tableRootNode.nextSibling) === null || _tableRootNode$nextSi2 === void 0 || (_tableRootNode$nextSi2 = _tableRootNode$nextSi2.nextSibling) === null || _tableRootNode$nextSi2 === void 0 ? void 0 : _tableRootNode$nextSi2.contains(target);
 };
 var punctuationMap = new Map([["，", ","], ["：", ":"], ["；", ";"]]);
 export var noramlizeSearch = function noramlizeSearch(target) {

package/package.json

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