@zhenliang/sheet 0.1.8 → 0.1.9

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

@@ -84,20 +84,21 @@ export var getNumberEditor = function getNumberEditor(extraProps) {
     return result;
   };
   NumberEditor.parser = function (value) {
-    var _extraProps$precision;
-    if (isNil(value) || isNaN(value)) {
+    var _String2, _extraProps$precision;
+    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
+    if (isNil(result) || isNaN(result)) {
       return null;
     }
-    return Number(formatPrecision(value, (_extraProps$precision = extraProps === null || extraProps === void 0 ? void 0 : extraProps.precision) !== null && _extraProps$precision !== void 0 ? _extraProps$precision : 0));
+    return Number(formatPrecision(result, (_extraProps$precision = extraProps === null || extraProps === void 0 ? void 0 : extraProps.precision) !== null && _extraProps$precision !== void 0 ? _extraProps$precision : 0));
   };
   NumberEditor.checker = function (value) {
-    var _String2;
-    if (!value) {
+    var _String3;
+    if (isNil(value)) {
       return true;
     }
     // parse number with thousands separator
-    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
-    if (isNaN(result) || isNaN(value)) {
+    var result = parseFloat((_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/,/g, ''));
+    if (isNaN(result)) {
       return false;
     }
     return true;

package/dist/core/reducers/sideEffectReducer.js

@@ -14,7 +14,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { head, isNil, last, pick } from 'lodash';
-import { clipboardDataToString, defaultValueRenderer, flatRowCol, flatRowColIndex, formatDataToCell, getRowColConfig, groupConfigToGroupMap, stringToClipboardData } from "../util";
+import { clipboardDataToString, flatRowCol, flatRowColIndex, formatDataToCell, getRowColConfig, groupConfigToGroupMap, stringToClipboardData } from "../util";
 export var sideEffectReducer = {
   init: function init(dispatch, getState) {
     var _getState = getState(),
@@ -137,7 +137,6 @@ export var sideEffectReducer = {
     var cellIndex = flatRowColIndex(start, end);
     var groupMap = groupConfigToGroupMap(groupConfig);
     var copyData = cellIndex.reduce(function (left, _ref3) {
-      var _data$row$col$dataEdi, _data$row$col$dataEdi2, _data$row$col$dataEdi3;
       var _ref3$row = _ref3.row,
         row = _ref3$row === void 0 ? 0 : _ref3$row,
         _ref3$col = _ref3.col,
@@ -156,7 +155,22 @@ export var sideEffectReducer = {
       }
 
       // 复制到剪贴板的时候执行 formatter
-      var currentValue = "".concat(value).concat(currentRow === row ? '\t' : '\n', " ").concat((_data$row$col$dataEdi = data[row][col].dataEditor) !== null && _data$row$col$dataEdi !== void 0 && _data$row$col$dataEdi.formatter ? (_data$row$col$dataEdi2 = data[row][col].dataEditor) === null || _data$row$col$dataEdi2 === void 0 ? void 0 : (_data$row$col$dataEdi3 = _data$row$col$dataEdi2.formatter) === null || _data$row$col$dataEdi3 === void 0 ? void 0 : _data$row$col$dataEdi3.call(_data$row$col$dataEdi2, data[row][col].value) : defaultValueRenderer(data[row][col]));
+      var _data$row$col = data[row][col],
+        dataValue = _data$row$col.value,
+        dataEditor = _data$row$col.dataEditor;
+      var _ref4 = dataEditor || {},
+        dataFormatter = _ref4.formatter;
+      var formattedValue = dataFormatter ? dataFormatter(dataValue) : dataValue;
+      if (isNil(dataValue)) {
+        formattedValue = ' ';
+      }
+      if (currentRow === -1) {
+        return {
+          currentRow: row,
+          value: formattedValue
+        };
+      }
+      var currentValue = "".concat(value).concat(currentRow === row ? '\t' : '\n', " ").concat(formattedValue);
       return {
         currentRow: row,
         value: currentValue
@@ -165,7 +179,7 @@ export var sideEffectReducer = {
       currentRow: -1,
       value: ''
     });
-    var text = copyData.value.trimStart();
+    var text = copyData.value;
     stringToClipboardData(text, cellIndex.length);
   },
   paste: function paste(dispatch, getState) {
@@ -198,43 +212,46 @@ export var sideEffectReducer = {
             return _context.abrupt("return");
           case 9:
             changes = changeInfo.changes, extChanges = changeInfo.extChanges;
-            legalChanges = changes.filter(function (_ref4) {
-              var row = _ref4.row,
-                col = _ref4.col,
-                value = _ref4.value;
+            legalChanges = changes.filter(function (_ref5) {
+              var _editor$checker;
+              var row = _ref5.row,
+                col = _ref5.col,
+                value = _ref5.value;
               var editor = data[row][col].dataEditor;
+              console.log('number-checker', editor === null || editor === void 0 ? void 0 : editor.checker, editor === null || editor === void 0 ? void 0 : (_editor$checker = editor.checker) === null || _editor$checker === void 0 ? void 0 : _editor$checker.call(editor, value));
               if (editor && editor.checker) {
                 return editor.checker(value, data[row][col].record);
               }
               return true;
-            }).map(function (_ref5) {
-              var _data$row$col, _editor$parser;
-              var row = _ref5.row,
-                col = _ref5.col,
-                value = _ref5.value;
+            }).map(function (_ref6) {
+              var _data$row$col2, _editor$parser;
+              var row = _ref6.row,
+                col = _ref6.col,
+                value = _ref6.value;
               var editor = data[row][col].dataEditor;
               return {
                 row: row,
                 col: col,
-                id: (_data$row$col = data[row][col]) === null || _data$row$col === void 0 ? void 0 : _data$row$col.id,
+                id: (_data$row$col2 = data[row][col]) === null || _data$row$col2 === void 0 ? void 0 : _data$row$col2.id,
                 value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 ? void 0 : (_editor$parser = editor.parser) === null || _editor$parser === void 0 ? void 0 : _editor$parser.call(editor, value) : value
               };
             });
+            console.log('number', changes, legalChanges);
             lastRow = extChanges === null || extChanges === void 0 ? void 0 : (_extChanges$ = extChanges[0]) === null || _extChanges$ === void 0 ? void 0 : _extChanges$.row;
             lastIndex = 1;
-            legalExtChanges = extChanges === null || extChanges === void 0 ? void 0 : extChanges.filter(function (_ref6) {
-              var value = _ref6.value,
-                col = _ref6.col;
+            legalExtChanges = extChanges === null || extChanges === void 0 ? void 0 : extChanges.filter(function (_ref7) {
+              var value = _ref7.value,
+                col = _ref7.col;
               var editor = data[0][col].dataEditor;
               if (editor && editor.checker) {
                 return editor.checker(value);
               }
               return true;
-            }).map(function (_ref7) {
+            }).map(function (_ref8) {
               var _editor$parser2;
-              var row = _ref7.row,
-                col = _ref7.col,
-                value = _ref7.value;
+              var row = _ref8.row,
+                col = _ref8.col,
+                value = _ref8.value;
               var editor = data[0][col].dataEditor;
               if (lastRow !== row) {
                 lastRow = row;
@@ -269,7 +286,7 @@ export var sideEffectReducer = {
               }
             });
             cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : []);
-          case 18:
+          case 19:
           case "end":
             return _context.stop();
         }

package/dist/core/shell/draggableShell/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { SheetType } from "../../../type";
 import './index.less';
 export declare const DraggableShell: ({ columns, className, showGroup, showSelect, controlProps, controlWidth, }: SheetType.SheetShell) => import("react").FC<{

package/dist/core/shell/tableShell.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { SheetType } from "../../type";
 import './draggableShell/index.less';
 export declare const TableShell: ({ columns, className, showGroup, showSelect, controlProps, controlWidth, }: SheetType.SheetShell) => import("react").FC<{

package/dist/core/table/index.js

@@ -55,10 +55,12 @@ var Table = function Table(_ref) {
     widths = _useSetState2[0],
     setWidth = _useSetState2[1];
   var sheetInstance = sheetRef || _sheetInstance;
-  var hasChildren = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
+  var dataHasChildren = dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
     var _item$children;
     return (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
-  })) || !!groupConfig;
+  });
+  var configWithChildren = !!groupConfig && !!dataSource.length;
+  var hasChildren = dataHasChildren || configWithChildren;
   var hasControl = hasChildren || !!rowSelection;
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),

package/dist/hooks/useEventBus.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import EventEmitter from 'events';
 declare const useEventBus: () => EventEmitter;
 export { useEventBus };

package/package.json

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