@zhenliang/sheet 0.1.7-3.beta.11 → 0.1.7-3.beta.13

package/dist/core/sheet/Remark.js

@@ -8,9 +8,9 @@ export var Remark = /*#__PURE__*/forwardRef(function (props, ref) {
     var rightOverflow = document.body.clientWidth - position.left < 400;
     var bottomOverflow = document.body.clientHeight - position.top < 400;
     if (rightOverflow && bottomOverflow) {
-      return "translate(-100%, -100%)";
+      return "translate(calc(-100% - 4px), calc(-100% - 4px))";
     } else if (rightOverflow && !bottomOverflow) {
-      return "translate(-100%, 40px)";
+      return "translate(calc(-100% - 4px), 44px)";
     } else if (!rightOverflow && bottomOverflow) {
       return "translate(0, calc(40px - 100%))";
     }

package/dist/core/sheet/index.js

@@ -201,6 +201,16 @@ var Sheet = function Sheet(props) {
           }
         });
         return history !== null && history !== void 0 ? history : [];
+      },
+      call: function call(caller) {
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = arguments[_key];
+        }
+        return dispatch(function (d, getState) {
+          var _getState3 = getState(),
+            data = _getState3.data;
+          caller === null || caller === void 0 || caller.apply(void 0, args.concat([data]));
+        });
       }
     };
   }, [state.history]);

package/dist/core/sheet/index.less

@@ -390,6 +390,7 @@ span.harvest-sheet-container:focus {
   padding: 0;
   background: rgb(255,255,255);
   box-shadow: 0 4px 8px rgba(216,223,235,.5);
+  transition: top .1s linear,left .1s linear,transform .05s linear;
 }
 .harvest-remark-container::-webkit-scrollbar{
   display: none;

package/dist/core/sheet/useMouseEvent.js

@@ -188,7 +188,9 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     });
   }, []);
   var mouseUp = useCallback(function (e) {
-    e.preventDefault();
+    // input select 问题
+    // e.preventDefault();
+
     resetInterval();
     var currentCell = findParentTd(e.target);
     if (!currentCell || currentCell.classList.contains('fixed')) {
@@ -287,7 +289,7 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
   }, []);
   useEffect(function () {
     if (elementRef.current) {
-      if (navigator.appVersion.indexOf("Mac") !== -1) {
+      if (navigator.appVersion.indexOf('Mac') !== -1) {
         elementRef.current.style.setProperty('--arrow-down', 'var(--arrow-mac-down)');
         elementRef.current.style.setProperty('--arrow-right', 'var(--arrow-mac-right)');
       }

package/dist/core/sheet/useRemarkContainer.js

@@ -62,21 +62,44 @@ export var useRemarkContainer = function useRemarkContainer(elementRef, start, e
   }, [showRemark, editing]);
   useEffect(function () {
     var _elementRef$current, _elementRef$current2;
-    var remarkScroll = throttle(function () {
-      setRemarkInfo({
-        show: false
-      });
-    }, 50);
+    var scrollTimer;
     var remarkScrollEnd = function remarkScrollEnd() {
       var position = calcPosition();
       if (!position) {
         return;
       }
+      // end called
+      if (scrollTimer) {
+        clearTimeout(scrollTimer);
+      }
       setRemarkInfo({
         position: position,
         show: position.visible && showRemark && !editing && position.left > 0 && position.top > 0
       });
     };
+    var remarkScroll = throttle(function () {
+      var _ref = elementRef.current || {},
+        _ref$scrollTop = _ref.scrollTop,
+        scrollTop = _ref$scrollTop === void 0 ? 0 : _ref$scrollTop,
+        _ref$scrollHeight = _ref.scrollHeight,
+        scrollHeight = _ref$scrollHeight === void 0 ? 0 : _ref$scrollHeight,
+        _ref$clientHeight = _ref.clientHeight,
+        clientHeight = _ref$clientHeight === void 0 ? 0 : _ref$clientHeight;
+      // 滚动条抖动导致的
+      if (Math.abs(clientHeight + scrollTop - scrollHeight) <= 1) {
+        return;
+      }
+      setRemarkInfo({
+        show: false
+      });
+      if (scrollTimer) {
+        clearTimeout(scrollTimer);
+      }
+      scrollTimer = setTimeout(function () {
+        remarkScrollEnd();
+        clearTimeout(scrollTimer);
+      }, 100);
+    }, 50);
     (_elementRef$current = elementRef.current) === null || _elementRef$current === void 0 || _elementRef$current.addEventListener('scroll', remarkScroll);
     (_elementRef$current2 = elementRef.current) === null || _elementRef$current2 === void 0 || _elementRef$current2.addEventListener('scrollend', remarkScrollEnd);
     return function () {
@@ -96,13 +119,13 @@ export var useRemarkContainer = function useRemarkContainer(elementRef, start, e
     }
     var io = new IntersectionObserver(function (entries) {
       var ratio = entries[0].intersectionRatio;
-      if (ratio < 0.8) {
+      if (ratio < 0.5) {
         setRemarkInfo({
           show: false
         });
       }
     }, {
-      threshold: 0.8
+      threshold: 0.5
     });
     io.observe(cell);
     return function () {

package/dist/core/table/index.js

@@ -5,10 +5,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -21,7 +17,6 @@ import { Sheet, useSetState } from "../..";
 import { GroupContext } from "../../hooks/useGroupConfig";
 import { WidthContext } from "../../hooks/useWidthConfig";
 import { ConfigProvider, Empty } from 'antd';
-import { flatten } from 'lodash';
 import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
@@ -74,18 +69,15 @@ var Table = function Table(_ref) {
   useImperativeHandle(sheetRef, function () {
     return new Proxy({}, {
       get: function get(target, property) {
-        var _sheetInstance$curren3;
-        var flatDataSource = flatten(dataSource.map(function (item) {
-          return item.children ? [item].concat(_toConsumableArray(item.children)) : [item];
-        }));
+        var _sheetInstance$curren4;
         if (property === 'goToByTable') {
-          return function (id, columnKey) {
-            var _sheetInstance$curren, _sheetInstance$curren2;
-            var toCol = columns.findIndex(function (column) {
-              return column.dataIndex === columnKey;
-            }) + offset;
-            var toRow = flatDataSource.findIndex(function (d) {
-              return String(d === null || d === void 0 ? void 0 : d.id) === String(id);
+          var goToByTable = function goToByTable(id, columnKey, currentData) {
+            var _currentData$, _sheetInstance$curren, _sheetInstance$curren2;
+            var toCol = currentData === null || currentData === void 0 || (_currentData$ = currentData[0]) === null || _currentData$ === void 0 ? void 0 : _currentData$.findIndex(function (d) {
+              return d.dataIndex === columnKey;
+            });
+            var toRow = currentData.findIndex(function (d) {
+              return String(d === null || d === void 0 ? void 0 : d[0].id) === String(id);
             });
             (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 || _sheetInstance$curren.goTo(toRow, toCol);
             (_sheetInstance$curren2 = sheetInstance.current) === null || _sheetInstance$curren2 === void 0 || _sheetInstance$curren2.select({
@@ -99,8 +91,15 @@ var Table = function Table(_ref) {
               }
             });
           };
+          return function () {
+            var _sheetInstance$curren3;
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+            (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 || _sheetInstance$curren3.call.apply(_sheetInstance$curren3, [goToByTable].concat(args));
+          };
         }
-        return (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 ? void 0 : _sheetInstance$curren3[property];
+        return (_sheetInstance$curren4 = sheetInstance.current) === null || _sheetInstance$curren4 === void 0 ? void 0 : _sheetInstance$curren4[property];
       }
     });
   }, [columns, dataSource, offset]);
@@ -240,7 +239,6 @@ var Table = function Table(_ref) {
       columnKey: columnKey,
       id: data === null || data === void 0 || (_data$row = data[row]) === null || _data$row === void 0 || (_data$row = _data$row[col]) === null || _data$row === void 0 || (_data$row = _data$row.record) === null || _data$row === void 0 ? void 0 : _data$row.id
     });
-    console.log(data);
     setShowRemark(!!(data !== null && data !== void 0 && (_data$row2 = data[row]) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2[col]) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2.record) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2.remarks) !== null && _data$row2 !== void 0 && _data$row2.includes(columnKey)));
   }, [offset, columns, data]);
   var remarkElement = useMemo(function () {

package/dist/type/sheet.d.ts

@@ -106,6 +106,7 @@ export type SheetInstance = {
     }) => void;
     popHistory: () => OperateHistory;
     dropHistory: () => OperateHistory[];
+    call: (caller: (...args: any) => void, ...args: any) => void;
 };
 export type SheetProps = {
     sheetInstance?: React.MutableRefObject<SheetInstance | null>;

package/package.json

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