@zhenliang/sheet 0.1.35 → 0.1.37

package/dist/core/editor/numberEditor/index.js

@@ -10,7 +10,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { formatPrecision } from "../../../standardUtils";
 import { InputNumber as AntInputNumber } from 'antd';
 import 'antd/es/input-number/style/index.css';
-import { isNil } from 'lodash';
+import { isNil, isNumber } from 'lodash';
 import { useCallback, useEffect, useRef } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -43,13 +43,18 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
     var value = props.value,
       onChange = props.onChange;
     var inputNumberRef = useRef(null);
+    var _ref = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
+      precision = _ref.precision,
+      inputArgs = _objectWithoutProperties(_ref, _excluded);
+    var max = inputArgs.max,
+      min = inputArgs.min;
+    var handleChange = useCallback(function (value) {
+      onChange(!isNil(value) ? value : null);
+    }, [onChange]);
     useEffect(function () {
       var _inputNumberRef$curre2;
       inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
     }, []);
-    var _ref = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
-      precision = _ref.precision,
-      inputArgs = _objectWithoutProperties(_ref, _excluded);
     var baseFormatter = useCallback(function (value) {
       if (!value) {
         return '';
@@ -72,9 +77,6 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
      * 重新声明，后面有需求可以改一下
      */
     var valueParser = baseFormatter;
-    var handleChange = useCallback(function (value) {
-      onChange && onChange(!isNil(value) ? value : null);
-    }, [onChange]);
     return /*#__PURE__*/_jsx(AntInputNumber, _objectSpread(_objectSpread({
       ref: inputNumberRef
     }, inputArgs), {}, {
@@ -86,7 +88,18 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
         return e.stopPropagation();
       },
       value: value,
-      onChange: handleChange
+      onChange: handleChange,
+      onInput: function onInput(value) {
+        // 将截断最大最小放到 input 事件中
+        if (!isNumber(+value)) {
+          return;
+        }
+        if (max && +value > max) {
+          handleChange(max);
+        } else if (min && +value < min) {
+          handleChange(min);
+        }
+      }
     }));
   };
   NumberEditor.formatter = function (value) {

package/dist/core/sheet/index.js

@@ -57,7 +57,9 @@ var Sheet = function Sheet(props) {
     showBackEdit = props.showBackEdit,
     backEditStyle = props.backEditStyle,
     _props$boldScroll = props.boldScroll,
-    boldScroll = _props$boldScroll === void 0 ? true : _props$boldScroll;
+    boldScroll = _props$boldScroll === void 0 ? true : _props$boldScroll,
+    _props$hideColBar = props.hideColBar,
+    hideColBar = _props$hideColBar === void 0 ? true : _props$hideColBar;
   var sheetWrapperRef = useRef(null);
   var contextMenuRef = useRef(null);
   var eventBus = useEventBus();
@@ -238,7 +240,8 @@ var Sheet = function Sheet(props) {
         ref: sheetWrapperRef,
         tabIndex: 0,
         className: classNames('harvest harvest-sheet-container', className, cls({
-          tableWarpScroll: hasHorizontalScrollbar && boldScroll
+          tableWarpScroll: hasHorizontalScrollbar && boldScroll,
+          hideColBar: hideColBar
         })),
         style: {
           maxHeight: (_scroll$y = scroll === null || scroll === void 0 ? void 0 : scroll.y) !== null && _scroll$y !== void 0 ? _scroll$y : memoHeight,

package/dist/core/sheet/index.less

@@ -1,5 +1,11 @@
 @import './var.less';
 
+.hideColBar {
+  &::-webkit-scrollbar {
+    width: 0;
+  }
+}
+
 .tableWarpScroll {
   &::-webkit-scrollbar {
     display: none;

package/dist/core/util.js

@@ -97,7 +97,7 @@ export function stringToClipboardData(str, count) {
   });
 }
 export var defaultParsePaste = function defaultParsePaste(str) {
-  return str.trim().split(/\r\n|\n|\r/).map(function (row) {
+  return str.trimEnd().split(/\r\n|\n|\r/).map(function (row) {
     return row.split('\t');
   });
 };

package/dist/example/group.js

@@ -1,3 +1,7 @@
+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); }
@@ -43,10 +47,12 @@ var data = [{
   address: 'New York No. 1 Lake Park',
   children: [{
     id: 11,
-    key: '1-1'
+    key: '1-1',
+    parentId: 1
   }, {
     id: 12,
-    key: '1-2'
+    key: '1-2',
+    parentId: 1
   }]
 }, {
   key: 2,
@@ -56,10 +62,12 @@ var data = [{
   address: 'London No. 1 Lake Park',
   children: [{
     id: 21,
-    key: '2-1'
+    key: '2-1',
+    parentId: 2
   }, {
     id: 22,
-    key: '2-2'
+    key: '2-2',
+    parentId: 2
   }]
 }, {
   key: 3,
@@ -75,10 +83,12 @@ var data = [{
   address: 'Sidney No. 1 Lake Park',
   children: [{
     id: 41,
-    key: '4-1'
+    key: '4-1',
+    parentId: 4
   }, {
     id: 42,
-    key: '4-2'
+    key: '4-2',
+    parentId: 4
   }]
 }];
 var App = function App() {
@@ -86,14 +96,27 @@ var App = function App() {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var handleChange = useCallback(function (changes, extChange) {
+  var handleChange = useCallback(function (changes) {
     // console.log(extChange);
     var newState = cloneDeep(state);
+    var flatNewState = newState.reduce(function (left, right) {
+      return [].concat(_toConsumableArray(left), [right], _toConsumableArray(right.children || []));
+    }, []);
     changes.forEach(function (change) {
-      var row = change.row,
-        key = change.key,
-        value = change.value;
-      newState[row][key] = value;
+      var key = change.key,
+        value = change.value,
+        id = change.id;
+      var changedItem = flatNewState.find(function (item) {
+        return item.id === id;
+      });
+      var parentIndex = newState.findIndex(function (item) {
+        return item.id === changedItem.parentId;
+      });
+      var childIndex = newState[parentIndex].children.findIndex(function (item) {
+        return item.id === id;
+      });
+      newState[parentIndex].children[childIndex][key] = value;
+      // newState[row][key] = value;
     });
     setState(newState);
   }, [state]);
@@ -116,7 +139,7 @@ var App = function App() {
     //   rowExpandable: (record) => record.name !== 'Not Expandable',
     // }}
     ,
-    dataSource: data,
+    dataSource: state,
     onChange: handleChange
   });
 };

package/dist/type/sheet.d.ts

@@ -115,6 +115,7 @@ export type SheetProps = {
     rowClassName?: string | ((record: Record<string, unknown>, index: number) => string);
     children?: any[];
     boldScroll?: boolean;
+    hideColBar?: boolean;
 };
 export type WidthConfigContext = {
     onChange?: (value: Record<number | string, number>) => void;

package/package.json

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