@zhenliang/sheet 0.1.6 → 0.1.8

package/dist/core/editor/cascaderEditor/index.less

@@ -21,4 +21,8 @@
     }
   }
 
+}
+
+.ant-cascader-menu {
+  font-size: 12px;
 }

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

@@ -92,6 +92,9 @@ export var getNumberEditor = function getNumberEditor(extraProps) {
   };
   NumberEditor.checker = function (value) {
     var _String2;
+    if (!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)) {

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

@@ -4,10 +4,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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); }
+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; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable eqeqeq */
 
 import { Select } from 'antd';
 import 'antd/es/select/style/index.css';
+import { useState } from 'react';
 import { isNil } from 'lodash';
 import "./index.less";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -18,6 +25,10 @@ export var getSelectEditor = function getSelectEditor(options) {
   var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : /*#__PURE__*/_jsx(_Fragment, {});
   var selectProps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var SelectEditor = function SelectEditor(props) {
+    var _useState = useState(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      isOpen = _useState2[0],
+      setIsOpen = _useState2[1];
     var value = props.value,
       onConfirm = props.onConfirm;
     var handleChange = function handleChange(opt) {
@@ -31,16 +42,18 @@ export var getSelectEditor = function getSelectEditor(options) {
       }
     };
     var dropdown = function dropdown(menu) {
-      return /*#__PURE__*/_jsxs(_Fragment, {
+      return /*#__PURE__*/_jsxs("div", {
+        onClick: function onClick() {
+          setIsOpen(false);
+        },
         children: [menu, extra]
       });
     };
     return /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({}, selectProps), {}, {
       autoFocus: true,
       className: "select-editor",
-      defaultOpen: true,
       allowClear: true,
-      open: true,
+      open: isOpen,
       onMouseDown: function onMouseDown(e) {
         e.stopPropagation();
       },

package/dist/core/editor/selectEditor/index.less

@@ -36,6 +36,8 @@
     box-shadow: inset 0 -100px 0 rgba(33,133,208,15%);
   }
 
+}
 
-
+.ant-select-item {
+  font-size: 12px !important;
 }

package/dist/core/reducers/sideEffectReducer.js

@@ -166,7 +166,7 @@ export var sideEffectReducer = {
       value: ''
     });
     var text = copyData.value.trimStart();
-    stringToClipboardData(text);
+    stringToClipboardData(text, cellIndex.length);
   },
   paste: function paste(dispatch, getState) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

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

@@ -1,3 +1,4 @@
+/// <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/draggableShell/index.js

@@ -88,7 +88,7 @@ export var DraggableShell = function DraggableShell(_ref) {
           },
           onMouseMove: function onMouseMove(e) {
             var target = e.target;
-            if (e.nativeEvent.offsetX > target.offsetWidth - 10) {
+            if (e.nativeEvent.offsetX > target.offsetWidth - 8) {
               target.style.cursor = 'col-resize';
             } else {
               target.style.cursor = 'default';

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

@@ -1,3 +1,4 @@
+/// <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

@@ -232,7 +232,6 @@ var Table = function Table(_ref) {
     return !value;
   }));
   var headSelection = !!rowSelection;
-  console.log('shell-render', rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.defaultOpen, headGroupOpen);
   var WrappedTableShell = useMemo(function () {
     console.log('shell-render', '损耗性能大');
     if (draggable) {

package/dist/core/table/useGroupConfig.js

@@ -26,7 +26,6 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
   }, [dataSource]);
   useEffect(function () {
     if (!hasChildren) return;
-    console.log('groupConfigEffect', dataSource.length);
     var rowConfig = dataSourceToRowConfig(dataSource, tableGroupConfig === null || tableGroupConfig === void 0 ? void 0 : tableGroupConfig.defaultOpen);
     if (groupConfigRef.current) {
       groupConfigRef.current.groups.forEach(function (_ref, index) {
@@ -39,10 +38,8 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
       });
     }
     setGroupConfig(rowConfig);
-    console.log('groupConfigEffect', rowConfig.groups, rowConfig.groupOpen);
     groupConfigRef.current = rowConfig;
   }, [dataSource.length, childrenLength, hasChildren]);
-  console.log('groupConfigEffect', dataSource.length, childrenLength);
   var handleGroupChange = useCallback(function (value) {
     setGroupConfig(value);
     groupConfigRef.current = value;

package/dist/core/util.d.ts

@@ -14,7 +14,7 @@ export declare function flatRowColIndex(start?: SheetType.CellPosition, end?: Sh
 export declare function flatRowCol(start?: SheetType.CellPosition, end?: SheetType.CellPosition): string[];
 export declare function isInputKey(keyCode: number): boolean;
 export declare function classNames(...args: (string | null | undefined)[]): string;
-export declare function stringToClipboardData(str: string): void;
+export declare function stringToClipboardData(str: string, count: number): void;
 export declare const defaultParsePaste: (str: string) => string[][];
 export declare function clipboardDataToString(): Promise<string[][]>;
 export declare function formatDataToCell({ start, editing, end, data, pasteData, groupConfig, freePaste, }: Partial<SheetType.UpdateStateType> & {

package/dist/core/util.js

@@ -14,6 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 /* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
+import { message } from 'antd';
 import { cloneDeep, get, isNil, range } from 'lodash';
 export function findParentTd(el) {
   if (!el) return null;
@@ -85,12 +86,14 @@ export function classNames() {
   }
   return args.filter(Boolean).join(' ');
 }
-export function stringToClipboardData(str) {
+export function stringToClipboardData(str, count) {
   // navigator.clipboard.writeText(str);
   navigator.clipboard.writeText(str).then(function () {
-    console.log('复制成功');
+    // console.log('复制成功');
+    message.success("\u5DF2\u590D\u5236".concat(count, "\u4E2A\u5355\u5143\u683C"));
   }, function () {
-    console.error('复制失败');
+    // console.error('复制失败');
+    message.info("\u590D\u5236\u5931\u8D25");
   });
 }
 export var defaultParsePaste = function defaultParsePaste(str) {
@@ -255,7 +258,6 @@ export var optionsTransferToValue = function optionsTransferToValue(options, val
       }
     } else if (get(options[i], key) === val) {
       values.push(value);
-      console.log('cascader', get(options[i], key), val, value);
       break;
     } else {
       values = [];

package/dist/core/viewer/selectorViewer/index.js

@@ -1,12 +1,16 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable eqeqeq */
 // == string 和 number 类型忽略
 
 export var getSelectorViewer = function getSelectorViewer(options) {
   var TypeViewer = function TypeViewer(props) {
     var _options$find;
-    return ((_options$find = options.find(function (item) {
-      return item.label === props.value || item.value == props.value;
-    })) === null || _options$find === void 0 ? void 0 : _options$find.label) || null;
+    return /*#__PURE__*/_jsx("span", {
+      className: "value-viewer",
+      children: ((_options$find = options.find(function (item) {
+        return item.label === props.value || "".concat(item.value) === "".concat(props.value);
+      })) === null || _options$find === void 0 ? void 0 : _options$find.label) || null
+    });
   };
   return TypeViewer;
 };

package/dist/example/antComponent.js

@@ -19,6 +19,7 @@ import { cloneDeep, random } from 'lodash';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { getCascaderEditor, getDateEditor, getNumberEditor, getSelectEditor } from "../core/editor";
 import Table from "../core/table";
+import { getSelectorViewer } from "../core/viewer";
 import { BtnViewer } from "../core/viewer/btnViewer";
 import { getCascaderViewer } from "../core/viewer/cascaderViewer";
 import { EditViewer } from "../core/viewer/editViewer";
@@ -48,13 +49,14 @@ var SelectorOptions = [{
 }];
 var getTypeViewer = function getTypeViewer(options) {
   var TypeViewer = function TypeViewer(props) {
-    return options.find(function (item) {
+    var _options$find;
+    console.log('getTypeViewer', options);
+    return (_options$find = options.find(function (item) {
       return item.label === props.value || item.value == props.value;
-    }).label;
+    })) === null || _options$find === void 0 ? void 0 : _options$find.label;
   };
   return TypeViewer;
 };
-var TypeSelector = getSelectEditor(SelectorOptions, 'label');
 var cascaderOptions = [{
   value: 'zhejiang',
   label: 'Zhejiang',
@@ -118,7 +120,7 @@ var columns = [{
   title: 'select',
   width: 200,
   dataIndex: 'select',
-  render: getTypeViewer(SelectorOptions),
+  render: getSelectorViewer(SelectorOptions),
   editor: getSelectEditor(SelectorOptions, 'label')
 }, {
   title: 'Column 2',
@@ -257,6 +259,7 @@ var App = function App() {
   }, [options]);
   return /*#__PURE__*/_jsx(Table, {
     freePaste: true,
+    draggable: true,
     sheetInstance: sheetInstance,
     columns: antColumns,
     dataSource: state,

package/dist/example/basic.js

@@ -112,6 +112,7 @@ var App = function App() {
     setData(newData);
   }, [dataSource]);
   return /*#__PURE__*/_jsx(Table, {
+    draggable: true,
     columns: columns,
     dataSource: dataSource,
     onChange: onChange

package/dist/example/ellipsis.js

@@ -55,6 +55,7 @@ var data = [{
 }];
 var App = function App() {
   return /*#__PURE__*/_jsx(Table, {
+    draggable: true,
     columns: columns,
     dataSource: data,
     onChange: function onChange() {}

package/dist/example/fixed.js

@@ -77,6 +77,7 @@ var data = [{
 }];
 var App = function App() {
   return /*#__PURE__*/_jsx(Table, {
+    draggable: true,
     columns: columns,
     dataSource: data,
     scroll: {

package/dist/example/selection.js

@@ -72,6 +72,7 @@ var App = function App() {
   }, [dataSource]);
   var handleRowChange = useCallback(function () {}, []);
   return /*#__PURE__*/_jsx(Table, {
+    draggable: true,
     columns: columns,
     rowKey: "key",
     dataSource: dataSource,

package/dist/hooks/useEventBus.d.ts

@@ -1,3 +1,4 @@
+/// <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.6",
+  "version": "0.1.8",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",