@zhenliang/sheet 0.1.7-3.beta.3 → 0.1.7-3.beta.5

package/dist/core/sheet/index.js

@@ -386,13 +386,6 @@ var Sheet = function Sheet(props) {
             showMenu: menu.showMenu,
             contextMenu: ContextMenu,
             onContextMenu: onContextMenu
-          }), /*#__PURE__*/_jsx(Remark, {
-            showRemark: remarkInfo.show && !menu.showMenu,
-            position: {
-              left: remarkInfo.position.left,
-              top: remarkInfo.position.top
-            },
-            children: remarkElement
           }), EmptyElement]
         }), /*#__PURE__*/_jsxs("div", {
           className: "harvest-sheet-control",
@@ -423,6 +416,13 @@ var Sheet = function Sheet(props) {
             }
           }), children]
         })]
+      }), /*#__PURE__*/_jsx(Remark, {
+        showRemark: remarkInfo.show && !menu.showMenu,
+        position: {
+          left: remarkInfo.position.left,
+          top: remarkInfo.position.top
+        },
+        children: remarkElement
       }), /*#__PURE__*/_jsx(SearchInput, {
         style: props.searchStyle,
         value: state.searchText,

package/dist/core/sheet/index.less

@@ -378,7 +378,7 @@ span.harvest-sheet-container:focus {
     color: #a4a9b2;
   }
 }
-.harvest-sheet-container .harvest-remark-container{
+.harvest-remark-container{
   opacity: 1;
   border:1px solid #E5E5E5;
   border-radius: 2px;

package/dist/core/table/index.js

@@ -209,38 +209,65 @@ var Table = function Table(_ref) {
       return null;
     }
     return remarkRender === null || remarkRender === void 0 ? void 0 : remarkRender(remarkInfo);
-  }, [remarkRender, remarkInfo, showRemark]);
+  }, [remarkRender, remarkInfo, showRemark, data]);
+  var addRemark = useCallback(function (value) {
+    handleAddRemark === null || handleAddRemark === void 0 || handleAddRemark(value);
+    setShowRemark(true);
+  }, [handleAddRemark]);
   var menuRenderer = args.menuRenderer;
   var wrappMenuRenderer = useMemo(function () {
     var remarkMenu = /*#__PURE__*/_jsx("div", {
       className: "harvest-menu-item",
       onClick: function onClick() {
-        return remarkInfo && (handleAddRemark === null || handleAddRemark === void 0 ? void 0 : handleAddRemark(remarkInfo));
+        return addRemark(remarkInfo);
       },
       children: "\u6DFB\u52A0\u8BC4\u8BBA"
-    });
+    }, "remark");
     if (!menuRenderer) {
       if (showRemark) {
         return function (props) {
-          return /*#__PURE__*/_jsx("div", {
-            className: "harvest-menu",
-            style: _objectSpread({}, props.position),
-            children: remarkMenu
-          });
+          var _data$row3;
+          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 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) {
+            return /*#__PURE__*/_jsx("div", {
+              className: "harvest-menu",
+              style: _objectSpread({}, props.position),
+              children: remarkMenu
+            });
+          }
+          return null;
         };
       }
       return undefined;
     } else {
       return function (props) {
+        var _data$row4;
+        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 target = data === null || data === void 0 || (_data$row4 = data[row]) === null || _data$row4 === void 0 ? void 0 : _data$row4[col + 1];
         var MenuFC = menuRenderer;
-        return /*#__PURE__*/_jsxs(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
-          children: [remarkMenu, /*#__PURE__*/_jsx("div", {
-            className: "harvest-menu-divider"
-          })]
+        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+          return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+            target: target,
+            children: remarkMenu
+          }));
+        }
+        return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+          target: target
         }));
       };
     }
-  }, [showRemark, showRemarkPop, menuRenderer, remarkInfo]);
+  }, [showRemark, showRemarkPop, menuRenderer, remarkInfo, addRemark, data]);
   return /*#__PURE__*/_jsx(ConfigProvider, {
     renderEmpty: function renderEmpty() {
       return /*#__PURE__*/_jsx(Empty, {

package/dist/core/table/remarkEvent.js

@@ -2,10 +2,6 @@ import { SheetEvent } from "../sheet/Event";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var RemarkEvent = function RemarkEvent(_ref) {
   var handler = _ref.handler;
-  // const handleClick = useCallback((value: SheetType.CellPosition) => {
-  //   if (!value) return;
-  //   console.log(value);
-  // }, []);
   return /*#__PURE__*/_jsx(SheetEvent, {
     name: "cell-select-single",
     handler: handler

package/dist/example/valuationAnalyze.js

@@ -15,14 +15,13 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 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 { getNumberEditor, getSelectEditor, Table } from "./..";
-import { Button, message } from 'antd';
+import { Button, Input } from 'antd';
 import { isNil } from 'lodash';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { SwitchViewer } from "../core/viewer";
 import { SheetType } from "../type";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 var RateValueInput = getNumberEditor({
   addonAfter: '%',
   min: 0,
@@ -435,17 +434,45 @@ export default (function () {
       });
     }, 3);
   }, []);
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentRemark = _useState4[0],
+    setCurrentRemark = _useState4[1];
   var renderRemark = useCallback(function (value) {
-    return /*#__PURE__*/_jsxs(_Fragment, {
+    return /*#__PURE__*/_jsxs("div", {
+      style: {
+        background: 'white'
+      },
       children: [/*#__PURE__*/_jsxs("p", {
         children: [" columns:", value.columnKey]
       }), /*#__PURE__*/_jsxs("p", {
         children: [" id:", value.id]
       }), /*#__PURE__*/_jsx("p", {
         children: " bugs --"
+      }), /*#__PURE__*/_jsx(Input, {
+        onPressEnter: function onPressEnter(e) {
+          setCurrentRemark([{
+            id: value.id,
+            remarks: [value.columnKey]
+          }]);
+        }
       })]
     });
   }, []);
+  var wrapData = useMemo(function () {
+    return state.map(function (d) {
+      var _currentRemark$find;
+      var remarks = currentRemark === null || currentRemark === void 0 || (_currentRemark$find = currentRemark.find(function (r) {
+        return r.id === d.id;
+      })) === null || _currentRemark$find === void 0 ? void 0 : _currentRemark$find.remarks;
+      if (remarks) {
+        return _objectSpread(_objectSpread({}, d), {}, {
+          remarks: remarks
+        });
+      }
+      return d;
+    });
+  }, [state, currentRemark]);
   return /*#__PURE__*/_jsxs("div", {
     style: {
       height: '100vh',
@@ -460,12 +487,10 @@ export default (function () {
       sheetInstance: sheetInstance,
       columns: columns,
       showRemark: true,
-      remarkRender: renderRemark,
-      handleAddRemark: function handleAddRemark(value) {
-        message.info("".concat(value.id, "\uFF1A").concat(value.columnKey));
-        console.log(value.id, value.columnKey);
-      },
-      dataSource: state,
+      remarkRender: renderRemark
+      // handleAddRemark={handleAddRemark}
+      ,
+      dataSource: wrapData,
       onChange: handleChange,
       onContextMenu: function onContextMenu() {},
       menuRenderer: function menuRenderer(props) {

package/dist/type/sheet.d.ts

@@ -93,6 +93,7 @@ export type MenuRenderProps = {
     cell?: CellPosition;
     onContextMenu?: (event: any) => void;
     children?: ReactNode | ReactNode[];
+    target?: any;
 };
 export type SheetInstance = {
     zoomTo: (row?: number) => void;

package/dist/type/sheetTable.d.ts

@@ -56,6 +56,11 @@ export type TableGroupConfig = {
     onChange?: (value: SheetType.RowGroupConfig) => void;
 };
 export type EventHandler = (value: any) => void;
+export type RemarkProps = {
+    cell: SheetType.CellPosition;
+    columnKey: string;
+    id?: string | number;
+};
 export type TableProps = {
     /**
      * @description 表格类名
@@ -83,16 +88,8 @@ export type TableProps = {
     freeze?: boolean;
     showBackEdit?: boolean;
     showRemark?: boolean;
-    remarkRender?: (props: {
-        cell: SheetType.CellPosition;
-        columnKey: string;
-        id?: string | number;
-    }) => ReactNode;
-    handleAddRemark?: (value: {
-        cell: SheetType.CellPosition;
-        columnKey: string;
-        id?: string | number;
-    }) => void;
+    remarkRender?: (props: RemarkProps) => ReactNode;
+    handleAddRemark?: (value: RemarkProps) => void;
     backEditStyle?: Partial<CSSProperties>;
     searchStyle?: Partial<CSSProperties>;
     rowSelection?: TableRowSelection;

package/package.json

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