@zhenliang/sheet 0.1.98 → 0.1.99-beta.1

package/dist/core/reducers/sideEffectReducer.js

@@ -239,6 +239,7 @@ export var sideEffectReducer = {
             }
             return _context.abrupt("return");
           case 9:
+            // 获取表格的 col 总数
             changes = changeInfo.changes, extChanges = changeInfo.extChanges;
             legalChanges = changes.filter(function (_ref5) {
               var row = _ref5.row,

package/dist/core/table/useRowSelection.d.ts

@@ -1,5 +1,5 @@
 import { SheetTableType } from "../..";
 export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
-export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "showRemark" | "rowSelection"> & {
+export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "showRemark" | "rowSelection" | "dataSource" | "rowKey"> & {
     checked: boolean[];
 }) => any[][];

package/dist/core/util.js

@@ -113,7 +113,7 @@ export function clipboardDataToString() {
   });
 }
 export function formatDataToCell(_ref2) {
-  var _start$row3, _end$row3;
+  var _data$, _start$row3, _end$row3;
   var start = _ref2.start,
     editing = _ref2.editing,
     end = _ref2.end,
@@ -124,14 +124,20 @@ export function formatDataToCell(_ref2) {
     freePaste = _ref2$freePaste === void 0 ? false : _ref2$freePaste;
   if (editing || !data) return;
   var cells = flatRowColIndex(start, end);
+  var cols = (_data$ = data[0]) !== null && _data$ !== void 0 ? _data$ : [];
+  // 获取数组中 editable 为 true 的最后一个元素 的 下标
+  var lastCanEditColIndex = -1;
+  for (var i = 0; i < cols.length; i++) {
+    if (cols[i].editable) {
+      lastCanEditColIndex = i;
+    }
+  }
   if (!cells.length) return;
   var rowCount = cells[cells.length - 1].row - cells[0].row + 1;
-  if (!cells.length) return;
   var isMultiCells = cells.length > 1;
   var isSinglePaste = pasteData.length === 1 && pasteData[0].length === 1;
 
-  // todo 超出行的处理
-  // const isExRow = (cells[cells.length - 1].row as number) > (data?.length || 0);
+  // todo 超出列的处理
 
   var groupMap = groupConfigToGroupMap(groupConfig);
   var actualRowCount = range((_start$row3 = start === null || start === void 0 ? void 0 : start.row) !== null && _start$row3 !== void 0 ? _start$row3 : 0, ((_end$row3 = end === null || end === void 0 ? void 0 : end.row) !== null && _end$row3 !== void 0 ? _end$row3 : 0) + 1).reduce(function (left, index) {
@@ -170,7 +176,9 @@ export function formatDataToCell(_ref2) {
     var extChanges = [];
     var hasStartAndNotOpen = false;
     pasteData.forEach(function (rowData, i) {
-      rowData.forEach(function (cell, j) {
+      rowData.filter(function (cell, j) {
+        return col + j <= lastCanEditColIndex;
+      }).forEach(function (cell, j) {
         if (row + i >= data.length) {
           var _pasteData$i$j;
           extChanges.push({

package/dist/example/antComponent.js

@@ -14,9 +14,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Button, Modal } from 'antd';
+import { Modal } from 'antd';
 import { cloneDeep, random, range } from 'lodash';
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import { getCascaderEditor, getDateEditor, getNumberEditor, getSelectEditor } from "../core/editor";
 import Table from "../core/table";
 import { getSelectorViewer } from "../core/viewer";
@@ -47,15 +47,6 @@ var SelectorOptions = [{
   value: '3',
   label: '333333'
 }];
-var getTypeViewer = function getTypeViewer(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;
-  };
-  return TypeViewer;
-};
 var cascaderOptions = [{
   value: 'zhejiang',
   label: 'Zhejiang',
@@ -216,12 +207,8 @@ var App = function App() {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var _useState3 = useState(SelectorOptions),
-    _useState4 = _slicedToArray(_useState3, 2),
-    options = _useState4[0],
-    setOptions = _useState4[1];
   var sheetInstance = useRef(null);
-  var handleChange = useCallback(function (changes, extChange) {
+  var handleChange = useCallback(function (changes) {
     var newState = cloneDeep(state);
     changes.forEach(function (change) {
       var row = change.row,
@@ -256,31 +243,12 @@ var App = function App() {
     }))));
     setTimeout(function () {
       var _sheetInstance$curren2, _sheetInstance$curren3;
-      console.log('select', newState.length + count - 1);
+      // console.log('select', newState.length + count - 1);
       (_sheetInstance$curren2 = sheetInstance.current) === null || _sheetInstance$curren2 === void 0 || _sheetInstance$curren2.selectRow(newState.length + count - 1);
-      console.log('zoomTO', newState.length + count - 1);
+      // console.log('zoomTO', newState.length + count - 1);
       (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 || _sheetInstance$curren3.zoomTo(newState.length + count - 1);
     }, 100);
   }, [state]);
-  var handleOptionsAdd = useCallback(function () {
-    setOptions([].concat(_toConsumableArray(options), [{
-      label: String("newSelect".concat(random(false))),
-      value: String(random(true))
-    }]));
-  }, [options]);
-  var antColumns = useMemo(function () {
-    var newColumns = [].concat(columns);
-    newColumns[4] = _objectSpread(_objectSpread({}, columns[4]), {}, {
-      render: getTypeViewer(options),
-      editor: getSelectEditor(options, 'value', /*#__PURE__*/_jsx(Button, {
-        id: "antColumnAdd",
-        type: "link",
-        onClick: handleOptionsAdd,
-        children: "\u65B0\u589E"
-      }))
-    });
-    return newColumns;
-  }, [options]);
   return /*#__PURE__*/_jsx(Table, {
     freePaste: true,
     draggable: true,

package/package.json

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