@zhenliang/sheet 0.1.7-3.beta.7 → 0.1.7-3.beta.9

package/dist/core/sheet/Remark.js

@@ -5,7 +5,7 @@ export var Remark = /*#__PURE__*/forwardRef(function (props, ref) {
     children = props.children,
     position = props.position;
   var transform = useMemo(function () {
-    var rightOverflow = document.body.clientWidth - position.left < 200;
+    var rightOverflow = document.body.clientWidth - position.left < 400;
     var bottomOverflow = document.body.clientHeight - position.top < 400;
     if (rightOverflow && bottomOverflow) {
       return "translate(-100%, -100%)";

package/dist/core/table/index.js

@@ -17,7 +17,7 @@ import { Sheet, useSetState } from "../..";
 import { GroupContext } from "../../hooks/useGroupConfig";
 import { WidthContext } from "../../hooks/useWidthConfig";
 import { ConfigProvider, Empty } from 'antd';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
 import { TableShell } from "../shell/tableShell";
@@ -57,7 +57,7 @@ var Table = function Table(_ref) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     widths = _useSetState2[0],
     setWidth = _useSetState2[1];
-  var sheetInstance = sheetRef || _sheetInstance;
+  var sheetInstance = _sheetInstance;
   var dataHasChildren = dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
     var _item$children;
     return (item === null || item === void 0 || (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
@@ -66,6 +66,36 @@ var Table = function Table(_ref) {
   var hasChildren = dataHasChildren || configWithChildren;
   var hasControl = hasChildren || !!rowSelection;
   var offset = hasControl ? 2 : 1;
+  useImperativeHandle(sheetRef, function () {
+    return new Proxy({}, {
+      get: function get(target, property) {
+        var _sheetInstance$curren3;
+        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 = data.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({
+              start: {
+                row: toRow,
+                col: toCol
+              },
+              end: {
+                row: toRow,
+                col: toCol
+              }
+            });
+          };
+        }
+        return (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 ? void 0 : _sheetInstance$curren3[property];
+      }
+    });
+  }, [columns, data]);
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),
     checkedRow = _useRowSelection2[0],
@@ -230,7 +260,7 @@ var Table = function Table(_ref) {
     if (!menuRenderer) {
       if (showRemark) {
         return function (props) {
-          var _data$row3;
+          var _data$row3, _target$record, _target$record$includ;
           var cell = props.cell;
           var _ref5 = cell !== null && cell !== void 0 ? cell : {},
             _ref5$col = _ref5.col,
@@ -238,7 +268,8 @@ var Table = function Table(_ref) {
             _ref5$row = _ref5.row,
             row = _ref5$row === void 0 ? -1 : _ref5$row;
           var target = data === null || data === void 0 || (_data$row3 = data[row]) === null || _data$row3 === void 0 ? void 0 : _data$row3[col + 1];
-          if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+          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) {
             return /*#__PURE__*/_jsx("div", {
               className: "harvest-menu",
               style: _objectSpread({}, props.position),
@@ -251,7 +282,7 @@ var Table = function Table(_ref) {
       return undefined;
     } else {
       return function (props) {
-        var _data$row4;
+        var _data$row4, _target$record2, _target$record2$inclu;
         var cell = props.cell;
         var _ref6 = cell !== null && cell !== void 0 ? cell : {},
           _ref6$col = _ref6.col,
@@ -260,7 +291,8 @@ var Table = function Table(_ref) {
           row = _ref6$row === void 0 ? -1 : _ref6$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;
-        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+        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);
+        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
           return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
             target: target,
             children: remarkMenu

package/dist/type/sheetTable.d.ts

@@ -62,6 +62,9 @@ export type RemarkProps = {
     id?: string | number;
     close: () => void;
 };
+export type TableInstance = {
+    goToByTable?: (id: number, columnKey: string) => void;
+} & SheetType.SheetInstance;
 export type TableProps = {
     /**
      * @description 表格类名
@@ -72,7 +75,7 @@ export type TableProps = {
      * @description sheet的一些定义方法可执行
      * @default "object"
      */
-    sheetInstance?: React.MutableRefObject<SheetType.SheetInstance | null>;
+    sheetInstance?: React.MutableRefObject<SheetType.SheetInstance & TableInstance | null>;
     columns: ColumnProps[];
     virtualized?: boolean;
     dataSource: Record<string, unknown>[];

package/package.json

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