ztxkui 4.2.23-521 → 4.2.23-523

package/dist/UI/Table/EditTable.js

@@ -61,7 +61,7 @@ import i18next from 'ztxkutils/dist/i18next';
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { data2, data3 } from './data';
 import ProEditTable from 'components/ProTable';
-import { Button, message, EnhanceSelect, InputNumber, Modal, } from '../../index.build';
+import { Button, message, EnhanceSelect, InputNumber, Modal, Input, } from '../../index.build';
 import { InputNumber as AntInputNumber } from 'antd';
 import { toThousand, exactRound } from 'ztxkutils/dist/tools';
 var number_precision = 0;
@@ -86,11 +86,19 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列1'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test1',
             key: 'test1',
-            showCopy: true,
-            isFilter: true,
+            render: function (text, record, index) {
+                return (React.createElement(Input, { value: text, onPaste: function (e) {
+                        var _a;
+                        (_a = tableHandleRef.current) === null || _a === void 0 ? void 0 : _a.onPasteHandle(e, {
+                            index: index,
+                            dataIndex: 'test1',
+                            record: record,
+                        });
+                    } }));
+            },
         },
         {
             title: i18next.t('测试列2'),
@@ -194,6 +202,7 @@ function useColumns(tableHandleRef) {
                 placeholder: i18next.t('输入'),
                 precision: 3,
             },
+            disableExeclCopy: true,
             shouldCellUpdate: function (record, preRecord) {
                 return record.test42 !== preRecord.test42;
             },

package/dist/components/ProTable/index.js

@@ -78,6 +78,8 @@ function ProEditTable(props) {
         onEditableSaveHandle: onEditableSaveHandle,
         scrollTo: innerTableHandleRef.current.scrollTo,
         setCustomSortHandle: innerTableHandleRef.current.setCustomSortHandle,
+        setTableScroll: innerTableHandleRef.current.setTableScroll,
+        onPasteHandle: innerTableHandleRef.current.onPasteHandle,
     }); });
     return (React.createElement(Table, __assign({ rowKey: rowKey, dataSource: dataSource, columns: tableColumns, hideAddIcon: !showAddIcon, hideDelIcon: !showDelIcon, onAddAndDelHandle: needAddAndDel ? onAddAndDelHandle : undefined, onMoveRow: isMove ? onMoveRowHandle : undefined, onEditableSave: isEdit ? onEditableSaveHandle : undefined, tableHandleRef: innerTableHandleRef, onTableChange: isPaste ? onBatchPasteHandle : undefined, rowSelection: isChoice ? rowSelection : undefined, onChange: onNativeChange }, restProps)));
 }

package/dist/components/Table/hooks/useColumns.js

@@ -482,7 +482,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         }
         // 如果列需要编辑
         if (_column.editable) {
-            var title_1 = _column.title, editable_1 = _column.editable, editableConfig_1 = _column.editableConfig, dataIndex_1 = _column.dataIndex;
+            var title_1 = _column.title, editable_1 = _column.editable, editableConfig_1 = _column.editableConfig, disableExeclCopy_1 = _column.disableExeclCopy, dataIndex_1 = _column.dataIndex;
             _column = __assign(__assign({}, _column), { onCell: function (record, index) {
                     return ({
                         record: record,
@@ -501,6 +501,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                         // 是否在编辑列配置了过滤项
                         isHasFilterRef: isHasFilterRef,
                         getPrecision: getPrecision,
+                        disableExeclCopy: disableExeclCopy_1,
                     });
                 } });
             // 兼容下拉框滚动行为

package/dist/components/Table/index.d.ts

@@ -64,6 +64,8 @@ export interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, 'r
     render?: (text: any, record: any, index: any, options?: {
         precision?: any;
     }) => any;
+    /** 是否禁用复制execl功能 */
+    disableExeclCopy?: boolean;
 }
 export interface IColumnGroupType<RecordType> extends Omit<IColumnType<RecordType>, ''> {
     children: ColumnsType<RecordType>;

package/dist/components/Table/table-enhance-cell.d.ts

@@ -31,6 +31,10 @@ export interface IEditableConfig {
     precisionHandle?: (record: any) => number;
     [props: string]: any;
 }
+/**
+ * 数据转换 将粘贴过来的数据格式化处理
+ */
+export declare function transformData(data: string, config: any): any;
 interface IEditableCellProps {
     title: React.ReactNode;
     index?: number;

package/dist/components/Table/table-enhance-cell.js

@@ -68,7 +68,7 @@ import { INNER_PARENT_ROW_KEY_NO, INNER_PARENT_ROW_KEY } from './constants';
 /**
  * 数据转换 将粘贴过来的数据格式化处理
  */
-function transformData(data, config) {
+export function transformData(data, config) {
     var newData = data;
     if (!config) {
         return newData;
@@ -89,7 +89,7 @@ function transformData(data, config) {
     return newData;
 }
 var TableEnhanceCell = function (_a) {
-    var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, dataSource = _a.dataSource, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, rowKey = _a.rowKey, expandableChildrenColumnName = _a.expandableChildrenColumnName, isHasFilterRef = _a.isHasFilterRef, getPrecision = _a.getPrecision, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "dataSource", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave", "rowKey", "expandableChildrenColumnName", "isHasFilterRef", "getPrecision"]);
+    var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, dataSource = _a.dataSource, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, rowKey = _a.rowKey, expandableChildrenColumnName = _a.expandableChildrenColumnName, isHasFilterRef = _a.isHasFilterRef, getPrecision = _a.getPrecision, disableExeclCopy = _a.disableExeclCopy, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "dataSource", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave", "rowKey", "expandableChildrenColumnName", "isHasFilterRef", "getPrecision", "disableExeclCopy"]);
     var tdRef = useRef();
     var valueRef = useRef({});
     var _b = useState(), val = _b[0], setVal = _b[1];
@@ -228,7 +228,7 @@ var TableEnhanceCell = function (_a) {
         }
         var text = e.clipboardData.getData('text/plain');
         // 首先判断是否有换行符
-        if (text) {
+        if (text && !disableExeclCopy) {
             var innerIndex = getRealyIndex();
             // 兼容多种换行模式
             var textList = [];

package/dist/components/Table/table.js

@@ -70,7 +70,7 @@ import { ERROR_TD_CLASSNAME } from './';
 import TableDynamic from './table-dynamic';
 // import TableSummary from './table-summary';
 import TableEnhanceRow from './table-enhance-row';
-import TableEnhanceCell from './table-enhance-cell';
+import TableEnhanceCell, { transformData } from './table-enhance-cell';
 import TableResizableTitle from './table-resizable-title';
 import useColumns, { setDynamicKey, getStorage, } from './hooks/useColumns';
 import useSelectSubtotal from './hooks/useSelectSubtotal';
@@ -936,121 +936,183 @@ function Table(props) {
     /**
      * 表格暴露方法给外部使用
      */
-    useImperativeHandle(tableHandleRef, function () { return ({
-        /** 错误提示 */
-        validate: function () { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        clearErrorClass();
-                        return [4 /*yield*/, tableValidate(dataSource, mergeColumns, {
-                                getCurrentTable: getCurrentTable,
-                                rowSelection: props.rowSelection,
-                                expandable: props.expandable,
-                                tableName: tableName,
-                                showInnerPagination: showInnerPagination,
-                                setCurrent: setCurrent,
-                                pageSize: pageSize,
-                                virtualTableKey: virtualTableKey,
-                                rowKey: props.rowKey,
-                                scrollTo: scrollTo,
-                            })];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); },
-        /**自定义错误提示数据 */
-        customizeDataValidate: function (isDataItemValidate) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        clearErrorClass();
-                        return [4 /*yield*/, tableValidate(dataSource, mergeColumns, {
-                                getCurrentTable: getCurrentTable,
-                                rowSelection: props.rowSelection,
-                                expandable: props.expandable,
-                                tableName: tableName,
-                                showInnerPagination: showInnerPagination,
-                                setCurrent: setCurrent,
-                                pageSize: pageSize,
-                                virtualTableKey: virtualTableKey,
-                                rowKey: props.rowKey,
-                                scrollTo: scrollTo,
-                            }, isDataItemValidate)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); },
-        /** 获取当前表格 */
-        getCurrentTable: function () {
-            return getCurrentTable();
-        },
-        /** 移除错误样式 */
-        clearErrorClass: clearErrorClass,
-        /** 暴露内部分页提供给外部的一些方法 */
-        getCurrentPage: function () {
-            return currentPage.current;
-        },
-        /** 对于自定义render 可以通过这个方法 得到真正更改的行数据 */
-        getRealyIndex: function (index) {
+    useImperativeHandle(tableHandleRef, function () {
+        var getRealyIndex = function (index) {
             if (currentPage.current && showInnerPagination) {
                 return ((currentPage.current.page - 1) * currentPage.current.pageSize + index);
             }
             return index;
-        },
-        /** 获取自定义列配置当前配置 */
-        getColumns: function () {
-            var columns = [];
-            mergeColumns.forEach(function (column) {
-                if (column.dataIndex) {
-                    columns.push({
-                        dataIndex: column.dataIndex || column.key,
-                    });
+        };
+        return {
+            /** 错误提示 */
+            validate: function () { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            clearErrorClass();
+                            return [4 /*yield*/, tableValidate(dataSource, mergeColumns, {
+                                    getCurrentTable: getCurrentTable,
+                                    rowSelection: props.rowSelection,
+                                    expandable: props.expandable,
+                                    tableName: tableName,
+                                    showInnerPagination: showInnerPagination,
+                                    setCurrent: setCurrent,
+                                    pageSize: pageSize,
+                                    virtualTableKey: virtualTableKey,
+                                    rowKey: props.rowKey,
+                                    scrollTo: scrollTo,
+                                })];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            }); },
+            /**自定义错误提示数据 */
+            customizeDataValidate: function (isDataItemValidate) { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            clearErrorClass();
+                            return [4 /*yield*/, tableValidate(dataSource, mergeColumns, {
+                                    getCurrentTable: getCurrentTable,
+                                    rowSelection: props.rowSelection,
+                                    expandable: props.expandable,
+                                    tableName: tableName,
+                                    showInnerPagination: showInnerPagination,
+                                    setCurrent: setCurrent,
+                                    pageSize: pageSize,
+                                    virtualTableKey: virtualTableKey,
+                                    rowKey: props.rowKey,
+                                    scrollTo: scrollTo,
+                                }, isDataItemValidate)];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            }); },
+            /** 获取当前表格 */
+            getCurrentTable: function () {
+                return getCurrentTable();
+            },
+            /** 移除错误样式 */
+            clearErrorClass: clearErrorClass,
+            /** 暴露内部分页提供给外部的一些方法 */
+            getCurrentPage: function () {
+                return currentPage.current;
+            },
+            /** 对于自定义render 可以通过这个方法 得到真正更改的行数据 */
+            getRealyIndex: getRealyIndex,
+            /** 获取自定义列配置当前配置 */
+            getColumns: function () {
+                var columns = [];
+                mergeColumns.forEach(function (column) {
+                    if (column.dataIndex) {
+                        columns.push({
+                            dataIndex: column.dataIndex || column.key,
+                        });
+                    }
+                });
+                return columns;
+            },
+            /** 虚拟滚动 滚动到顶部方法 */
+            scrollTo: function (obj) {
+                scrollTo(__assign({ vid: virtualTableKey }, obj));
+            },
+            /** 获取动态列配置信息 */
+            getStorage: function () {
+                var _a;
+                return (getStorage(showColumnDynamicKey) ||
+                    ((_a = newColumns === null || newColumns === void 0 ? void 0 : newColumns.map) === null || _a === void 0 ? void 0 : _a.call(newColumns, function (item) { return ({
+                        dataIndex: item.dataIndex,
+                        key: item.key,
+                        hideColumn: item.hideColumn,
+                        width: item.width,
+                    }); })));
+            },
+            /** 手动清空排序条件 */
+            customSortClearHandle: function () {
+                setSortDataSource(null);
+                setCustomOrder(null);
+            },
+            /** 手动设置排序条件 */
+            setCustomSortHandle: function (customSort) {
+                setCustomOrder(customSort);
+            },
+            /** 获取过滤后的数据 */
+            getFilterRecords: function () {
+                var currentDataSource = currentDataSourceRef.current;
+                if (Array.isArray(currentDataSource)) {
+                    // 复制整列逻辑加上过滤、排序后的逻辑
+                    var filterResultDataSource = getFilterRecords(currentDataSource, filterSearchValuesRef.current);
+                    return filterResultDataSource;
                 }
-            });
-            return columns;
-        },
-        /** 虚拟滚动 滚动到顶部方法 */
-        scrollTo: function (obj) {
-            scrollTo(__assign({ vid: virtualTableKey }, obj));
-        },
-        /** 获取动态列配置信息 */
-        getStorage: function () {
-            var _a;
-            return (getStorage(showColumnDynamicKey) ||
-                ((_a = newColumns === null || newColumns === void 0 ? void 0 : newColumns.map) === null || _a === void 0 ? void 0 : _a.call(newColumns, function (item) { return ({
-                    dataIndex: item.dataIndex,
-                    key: item.key,
-                    hideColumn: item.hideColumn,
-                    width: item.width,
-                }); })));
-        },
-        /** 手动清空排序条件 */
-        customSortClearHandle: function () {
-            setSortDataSource(null);
-            setCustomOrder(null);
-        },
-        /** 手动设置排序条件 */
-        setCustomSortHandle: function (customSort) {
-            setCustomOrder(customSort);
-        },
-        /** 获取过滤后的数据 */
-        getFilterRecords: function () {
-            var currentDataSource = currentDataSourceRef.current;
-            if (Array.isArray(currentDataSource)) {
-                // 复制整列逻辑加上过滤、排序后的逻辑
-                var filterResultDataSource = getFilterRecords(currentDataSource, filterSearchValuesRef.current);
-                return filterResultDataSource;
-            }
-            return currentDataSource;
-        },
-        removeScrollPosition: removeScrollPosition,
-        setTableScroll: setTableScroll,
-    }); });
+                return currentDataSource;
+            },
+            removeScrollPosition: removeScrollPosition,
+            setTableScroll: setTableScroll,
+            onPasteHandle: function (e, _a) {
+                var index = _a.index, dataIndex = _a.dataIndex, record = _a.record;
+                var text = e.clipboardData.getData('text/plain');
+                // 首先判断是否有换行符
+                if (text) {
+                    var innerIndex = getRealyIndex(index);
+                    // 兼容多种换行模式
+                    var textList = [];
+                    if (text.indexOf('\r\n') !== -1) {
+                        textList = text.split('\r\n');
+                    }
+                    else if (text.indexOf('\r') !== -1) {
+                        textList = text.split('\r');
+                    }
+                    else if (text.indexOf('\n') !== -1) {
+                        textList = text.split('\n');
+                    }
+                    if (textList.length > 0) {
+                        var currentColumnIndex_1 = newColumns.findIndex(function (column) { return (column === null || column === void 0 ? void 0 : column.dataIndex) === dataIndex; });
+                        // 去掉最后的空字符
+                        if (textList[textList.length - 1] === '') {
+                            textList.pop();
+                        }
+                        if (textList.length === 1 && textList[0].indexOf('\t') === -1) {
+                            return;
+                        }
+                        e.preventDefault();
+                        // 说明有换行
+                        var resultTextList = textList.map(function (textItem) {
+                            var resultItemList = textItem.split('\t');
+                            var result = {};
+                            resultItemList.forEach(function (resultItem, index) {
+                                var _a;
+                                var config = null;
+                                try {
+                                    config = newColumns[currentColumnIndex_1 + index];
+                                }
+                                catch (err) {
+                                    console.error("table paste error", err);
+                                }
+                                if (resultItem === '' || resultItem == null) {
+                                    return;
+                                }
+                                if (index === 0) {
+                                    result[dataIndex] = transformData(resultItem, config);
+                                }
+                                else {
+                                    var key = (_a = newColumns[currentColumnIndex_1 + index]) === null || _a === void 0 ? void 0 : _a.dataIndex;
+                                    if (typeof key === 'string') {
+                                        result[key] = transformData(resultItem, config);
+                                    }
+                                }
+                            });
+                            return result;
+                        });
+                        onTableChange && onTableChange(resultTextList, innerIndex, record);
+                    }
+                }
+            },
+        };
+    });
     var tableResizableTitle = useMemo(function () {
         return {
             header: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-521",
+  "version": "4.2.23-523",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",