ztxkui 3.8.13 → 3.8.15

package/dist/DemoCom/PrintContainerDemo.js

@@ -26,11 +26,12 @@ import axios from 'axios';
 import water from '../assets/img/water.png';
 import { createDownloadUrl } from 'ztxkutils/dist/fileOperation';
 import './print.scss';
+import { token } from '../constants';
 function request(options) {
     return axios({
         baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000',
         url: options.url,
-        headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNDY4MDM1MzUxNjI1Mjg1NjM0LDE1NDIwNzYzMDg1NzgwMjU0NzQiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxLDE0NjcwMTU5NzU0ODQ3NjAwNjYsMTQ2ODAzNDQzNzE1Nzk2MTcyOSwxNDgwODI5MzM3OTM5MTMyNDE3IiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjoiIiwiZXhwIjoxNjY2MTQzMTg5LCJvcmdfbmFtZSI6bnVsbCwianRpIjoiNzlhZjczN2YtMTgyMi00ZWU0LTljNmQtZThkNjhjYzQxNTg0IiwibWVtYmVyX2lkIjoiMSIsImNvbXBhbnlfaWQiOiIiLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbImFkbWluIiwidXNlciIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvcix1c2VyLGFkbWluLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTQxMjk1MzgwNDMzMzU1NTcxNCIsIm9yZ19pZCI6IiIsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjoiIn0.u0Q6shXH7jdznAjGcEwW-xpbzKoAhLz2ZSbdYic5QjE' }, options.headers),
+        headers: __assign({ 'Zmdms-Auth': "bearer " + token }, options.headers),
         method: options.method,
         data: options.data,
         params: options.params,
@@ -98,7 +99,7 @@ var PrintContainerDemo = function () {
     }, []);
     return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1414852847035002881", flowId: "scm_print_tdtd", fileId: "1551733945007517697", 
         // keywordList={keywordList}
-        imgWaterBg: water, showPrintMessage: true, showAddSeal: true, apiUrl: "http://192.168.0.83:8000", fileBaseUrl: "http://192.168.0.83:88" },
+        imgWaterBg: water, isSetPosition: false, showPrintMessage: true, showAddSeal: true, apiUrl: "http://192.168.0.83:8000", fileBaseUrl: "http://192.168.0.83:88" },
         React.createElement("div", { className: "html2canvas-container-page simple-print", "data-title": "\u6D4B\u8BD5\u6807\u98981" },
             React.createElement("div", { className: "print-header" },
                 React.createElement("img", { src: base64Img, alt: "" }),

package/dist/TableDemo/EditableTable.js

@@ -79,6 +79,7 @@ var EditableTable = function () {
         setTimeout(function () {
             setTableConfig({
                 test1: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
+                test111: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
                 test2: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
             });
         }, 5000);
@@ -114,6 +115,29 @@ var EditableTable = function () {
                 return record.test1 !== preRecord.test1;
             },
         },
+        {
+            title: '测试111',
+            width: 100,
+            dataIndex: 'test111',
+            key: 'test111',
+            editable: true,
+            validate: {},
+            shouldCellUpdate: function (record, preRecord) {
+                if (firstRender) {
+                    setFirstRender(false);
+                    return true;
+                }
+                if (lengthChange) {
+                    setLengthChange(false);
+                    return true;
+                }
+                if (moveChange) {
+                    setMoveChange(false);
+                    return true;
+                }
+                return record.test111 !== preRecord.test111;
+            },
+        },
         {
             title: '测试2',
             width: 150,
@@ -187,62 +211,62 @@ var EditableTable = function () {
                     } }));
             },
         },
-        {
-            title: '测试4',
-            width: 100,
-            dataIndex: 'test4',
-            key: 'test4',
-        },
-        {
-            title: '测试5',
-            // width: 100,
-            // dataIndex: 'test5',
-            // key: 'test5',
-            children: [
-                {
-                    title: '测试5-001',
-                    width: 100,
-                    dataIndex: 'test5-001',
-                    key: 'test5-001',
-                },
-                {
-                    title: '测试5-002',
-                    width: 100,
-                    dataIndex: 'test5-002',
-                    key: 'test5-002',
-                },
-            ],
-        },
-        {
-            title: '测试6',
-            width: 100,
-            dataIndex: 'test6',
-            key: 'test6',
-        },
-        {
-            title: '测试7',
-            width: 100,
-            dataIndex: 'test7',
-            key: 'test7',
-        },
-        {
-            title: '测试8',
-            width: 100,
-            dataIndex: 'test8',
-            key: 'test8',
-        },
-        {
-            title: '测试9',
-            width: 100,
-            dataIndex: 'test9',
-            key: 'test9',
-        },
-        {
-            title: '测试10',
-            width: 100,
-            dataIndex: 'test10',
-            key: 'test10',
-        },
+        // {
+        //   title: '测试4',
+        //   width: 100,
+        //   dataIndex: 'test4',
+        //   key: 'test4',
+        // },
+        // {
+        //   title: '测试5',
+        //   // width: 100,
+        //   // dataIndex: 'test5',
+        //   // key: 'test5',
+        //   children: [
+        //     {
+        //       title: '测试5-001',
+        //       width: 100,
+        //       dataIndex: 'test5-001',
+        //       key: 'test5-001',
+        //     },
+        //     {
+        //       title: '测试5-002',
+        //       width: 100,
+        //       dataIndex: 'test5-002',
+        //       key: 'test5-002',
+        //     },
+        //   ],
+        // },
+        // {
+        //   title: '测试6',
+        //   width: 100,
+        //   dataIndex: 'test6',
+        //   key: 'test6',
+        // },
+        // {
+        //   title: '测试7',
+        //   width: 100,
+        //   dataIndex: 'test7',
+        //   key: 'test7',
+        // },
+        // {
+        //   title: '测试8',
+        //   width: 100,
+        //   dataIndex: 'test8',
+        //   key: 'test8',
+        // },
+        // {
+        //   title: '测试9',
+        //   width: 100,
+        //   dataIndex: 'test9',
+        //   key: 'test9',
+        // },
+        // {
+        //   title: '测试10',
+        //   width: 100,
+        //   dataIndex: 'test10',
+        //   key: 'test10',
+        // },
     ];
     // 初始化渲染，针对配置了editable、editableConfig的列配置
     useEffect(function () {
@@ -300,6 +324,30 @@ var EditableTable = function () {
         setRecords(newDataSource);
         setMoveChange(true);
     }, [setRecords]);
+    // 表格改变
+    var onTableChange = useCallback(function (changeRecords, startIndex) {
+        if (!Array.isArray(changeRecords)) {
+            return;
+        }
+        var endIndex = startIndex + changeRecords.length - 1;
+        var currentRecords = Array.isArray(recordsRef.current)
+            ? recordsRef.current.slice()
+            : [];
+        if (endIndex > currentRecords.length - 1) {
+            endIndex = currentRecords.length - 1;
+        }
+        var currentIndex = 0;
+        console.log(changeRecords, startIndex, endIndex);
+        var newRecords = currentRecords.map(function (record, index) {
+            if (index >= startIndex && index <= endIndex) {
+                var obj = __assign(__assign({}, record), changeRecords[currentIndex]);
+                currentIndex++;
+                return obj;
+            }
+            return record;
+        });
+        setRecords(newRecords);
+    }, []);
     return (React.createElement("div", null,
         React.createElement("div", null,
             "\u53EF\u7F16\u8F91\u8868\u683C\uFF1B\u5982\u679C\u662F\u8F93\u5165\u6846\uFF0C\u53EF\u4F7F\u7528\u8868\u683C\u9ED8\u8BA4\u63D0\u4F9B\u7684\u7F16\u8F91\u6846\uFF1B \u914D\u7F6Eeditable\u4E3Atrue\u5373\u53EF\uFF0C\u8FD8\u53EF\u914D\u7F6EeditableConfig\u914D\u7F6E\u6267\u884C\u7C7B\u578B\u7B49\uFF1B\u5177\u4F53editableConfig\u53EF\u67E5\u770B\u8BE6\u7EC6\u7B7E\u540D",
@@ -315,6 +363,7 @@ var EditableTable = function () {
             React.createElement("p", null, "1.\u7F16\u5199\u9A8C\u8BC1\u89C4\u5219\uFF0C\u5728\u5217\u91CC\u9762\u7F16\u5199\uFF0C\u901A\u8FC7\u4F20\u5165validate\u5C5E\u6027\u914D\u7F6E,\u5177\u4F53\u53EF\u67E5\u770B\u7B7E\u540D \u5982\u679C\u53EA\u662F\u7B80\u5355\u7684\u975E\u7A7A\u9A8C\u8BC1\uFF0C\u90A3\u4E48\u53EF\u4F20\u5165\u4E00\u4E2A\u7A7A\u5BF9\u8C61\u5373\u53EF \u5982\u679C\u662F\u590D\u6742\u9A8C\u8BC1\u53EF\u901A\u8FC7validate\u4F20\u5165\u66F4\u591A\u914D\u7F6E"),
             React.createElement("p", null, "2.\u5982\u679C\u4F20\u5165\u4E86\u81EA\u5B9A\u4E49render\u51FD\u6570\uFF0C\u7EC4\u4EF6\u65E0\u6CD5\u638C\u63E1\u5728\u4F55\u65F6\u6E05\u7A7A\u9519\u8BEF\u4FE1\u606F\uFF0C\u6240\u4EE5\u9700\u8981\u8C03\u7528\u65B9\u4E3B\u52A8\u6E05\u7A7A\u9519\u8BEF\u4FE1\u606F")),
         React.createElement(Button, { onClick: function () {
+                console.log(records);
                 (function () {
                     var _a;
                     return __awaiter(this, void 0, void 0, function () {
@@ -351,15 +400,12 @@ var EditableTable = function () {
             // tableValidate
             tableHandleRef: tableHandleRef, tableName: "\u6211\u662F\u4E00\u4E2A\u8868\u683C", 
             // 显隐配置
-            configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", 
-            // expandable={{
-            //   expandedRowRender: (record) => <p style={{ margin: 0 }}>111</p>,
-            //   rowExpandable: (record) => true,
-            // }}
-            // rowSelection={{
-            //   type: 'checkbox',
-            // }}
-            summaryConfig: [
+            configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", onTableChange: onTableChange, expandable: {
+                expandedRowRender: function (record) { return React.createElement("p", { style: { margin: 0 } }, "111"); },
+                rowExpandable: function (record) { return true; },
+            }, rowSelection: {
+                type: 'checkbox',
+            }, summaryConfig: [
                 {
                     type: 'subtotal',
                     fields: [

package/dist/components/PrintContainer/print-container.js

@@ -93,28 +93,29 @@ function downloadFontTTF(_a) {
     });
 }
 var PrintContainer = function (_a) {
-    var children = _a.children, waterText = _a.waterText, onFonsizeChange = _a.onFonsizeChange, hiddenClassName = _a.hiddenClassName, _b = _a.isAddExportPage, isAddExportPage = _b === void 0 ? false : _b, _c = _a.loading, loading = _c === void 0 ? false : _c, _d = _a.pdfName, pdfName = _d === void 0 ? 'pdf文件' : _d, request = _a.request, sealIdList = _a.sealIdList, _e = _a.showHandSeal, showHandSeal = _e === void 0 ? true : _e, _f = _a.showAutoSeal, showAutoSeal = _f === void 0 ? true : _f, _g = _a.needWatermark, needWatermark = _g === void 0 ? 0 : _g, fileId = _a.fileId, deptId = _a.deptId, flowId = _a.flowId, imgWaterBg = _a.imgWaterBg, onPrintCallback = _a.onPrintCallback, showPrintMessage = _a.showPrintMessage, onPrintBeforeCallback = _a.onPrintBeforeCallback, _h = _a.showPrintBtn, showPrintBtn = _h === void 0 ? true : _h, _j = _a.showPluginPrintBtn, showPluginPrintBtn = _j === void 0 ? true : _j, isUseXy = _a.isUseXy, localKey = _a.localKey, _k = _a.showExportBtn, showExportBtn = _k === void 0 ? true : _k, showSetFontBtn = _a.showSetFontBtn, _l = _a.isSetPosition, isSetPosition = _l === void 0 ? true : _l, showAddSeal = _a.showAddSeal, apiUrl = _a.apiUrl, defaultAddWater = _a.defaultAddWater, fileBaseUrl = _a.fileBaseUrl;
-    var _m = useState(false), showWater = _m[0], setShowWater = _m[1];
-    var _o = useState(false), showSeal = _o[0], setShowSeal = _o[1];
+    var children = _a.children, waterText = _a.waterText, onFonsizeChange = _a.onFonsizeChange, hiddenClassName = _a.hiddenClassName, _b = _a.isAddExportPage, isAddExportPage = _b === void 0 ? false : _b, _c = _a.loading, loading = _c === void 0 ? false : _c, _d = _a.pdfName, pdfName = _d === void 0 ? 'pdf文件' : _d, request = _a.request, sealIdList = _a.sealIdList, _e = _a.showHandSeal, showHandSeal = _e === void 0 ? true : _e, _f = _a.showAutoSeal, showAutoSeal = _f === void 0 ? true : _f, _g = _a.needWatermark, needWatermark = _g === void 0 ? 0 : _g, fileId = _a.fileId, deptId = _a.deptId, flowId = _a.flowId, imgWaterBg = _a.imgWaterBg, onPrintCallback = _a.onPrintCallback, showPrintMessage = _a.showPrintMessage, onPrintBeforeCallback = _a.onPrintBeforeCallback, _h = _a.showPrintBtn, showPrintBtn = _h === void 0 ? true : _h, _j = _a.showPluginPrintBtn, showPluginPrintBtn = _j === void 0 ? true : _j, isUseXy = _a.isUseXy, localKey = _a.localKey, _k = _a.showExportBtn, showExportBtn = _k === void 0 ? true : _k, showSetFontBtn = _a.showSetFontBtn, isSetPosition = _a.isSetPosition, // 默认不需要偏移
+    showAddSeal = _a.showAddSeal, apiUrl = _a.apiUrl, defaultAddWater = _a.defaultAddWater, fileBaseUrl = _a.fileBaseUrl;
+    var _l = useState(false), showWater = _l[0], setShowWater = _l[1];
+    var _m = useState(false), showSeal = _m[0], setShowSeal = _m[1];
     var containerRef = useRef();
     var allDomRef = useRef();
-    var _p = useState(false), spinning = _p[0], setSpinning = _p[1];
+    var _o = useState(false), spinning = _o[0], setSpinning = _o[1];
     // 确认盖章后，会得到一个合同id 这个之后盖章要用
-    var _q = useState(), currentContractId = _q[0], setCurrentContractId = _q[1];
+    var _p = useState(), currentContractId = _p[0], setCurrentContractId = _p[1];
     // 盖章后会得到一个预览地址，这个地址耀保存,同一个合同id，不能重复盖章接口
-    var _r = useState(), currentViewUrl = _r[0], setCurrentViewUrl = _r[1];
+    var _q = useState(), currentViewUrl = _q[0], setCurrentViewUrl = _q[1];
     // 收到盖章-印章列表
-    var _s = useState(), _sealIdList = _s[0], setSealIdList = _s[1];
+    var _r = useState(), _sealIdList = _r[0], setSealIdList = _r[1];
     // 自动盖章-印章列表
-    var _t = useState(), autoSealList = _t[0], setAutoSealList = _t[1];
+    var _s = useState(), autoSealList = _s[0], setAutoSealList = _s[1];
     // 印章id
-    var _u = useState(), sealFileIdList = _u[0], setSealFileIdList = _u[1];
+    var _t = useState(), sealFileIdList = _t[0], setSealFileIdList = _t[1];
     // 边距调整相关
-    var _v = useState(false), visible = _v[0], setVisible = _v[1];
-    var _w = useState({
+    var _u = useState(false), visible = _u[0], setVisible = _u[1];
+    var _v = useState({
         top: 0,
         left: 0,
-    }), value = _w[0], setValue = _w[1];
+    }), value = _v[0], setValue = _v[1];
     useNeedLodop();
     useEffect(function () {
         var v = getPositionLocal(localKey);
@@ -551,8 +552,8 @@ var PrintContainer = function (_a) {
                 pdfOption: {
                     pageFormat: options.pdfOptions.format,
                     // 因为生成的pdf需要打印，所以边距需要去掉
-                    pageMarginX: 0,
-                    pageMarginY: 0,
+                    pageMarginX: isSetPosition ? 0 : 20,
+                    pageMarginY: isSetPosition ? 0 : 10,
                     pageOrient: options.pdfOptions.orientation,
                 },
             })

package/dist/components/Table/hooks/useColumns.d.ts

@@ -27,6 +27,7 @@ interface IProps<RecordType> {
     /** 表格列配置相关信息 */
     configInfo?: IConfigInfo;
     copyByKey?: any;
+    onTableChange?: any;
 }
 export declare const getTableLayoutFullData: (columns: any, tableLayout: any) => any;
 export declare const LOCALSTORAGE_KEY = "ztui_dynamic_table_key";

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

@@ -14,7 +14,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
         to[j] = from[i];
     return to;
 };
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState, useRef } from 'react';
 import Button from '../../Button';
 import { PicRightOutlined } from '@ant-design/icons';
 import TableAddDelColumn from '../table-adddel-column';
@@ -152,8 +152,9 @@ export function setDynamicKey(dynamicStorageKey, value) {
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
 }
 function useColumns(props) {
-    var columns = props.columns, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey;
+    var columns = props.columns, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange;
     var tableLayout = getStorage(showColumnDynamicKey);
+    var newColumnsRef = useRef();
     // 新的columns
     var _a = useState(getTableLayoutFullData(columns, tableLayout)), newColumns = _a[0], setNewColumns = _a[1];
     // 需要动态配置的列
@@ -221,6 +222,8 @@ function useColumns(props) {
                             dataIndex: dataIndex_1,
                             title: title_1,
                             handleSave: onEditableSave,
+                            columns: function () { return newColumnsRef.current; },
+                            onTableChange: onTableChange,
                         });
                     } });
                 // 兼容下拉框滚动行为
@@ -313,6 +316,7 @@ function useColumns(props) {
         }
         setNewColumns(_newColumns);
         setDynamicColumns(_dynamicColumns);
+        newColumnsRef.current = _newColumns;
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         columns,

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

@@ -33,6 +33,8 @@ interface IEditableCellProps {
     dataIndex: string;
     record: any;
     handleSave: (record: any, index: number | undefined, dataIndex: string) => void;
+    columns: any;
+    onTableChange: any;
 }
 declare const TableEnhanceCell: React.FC<IEditableCellProps>;
 export default TableEnhanceCell;

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

@@ -61,7 +61,7 @@ import { EditableContext } from './table-enhance-row';
 import { Form, Input, InputNumber, Select, message } from '../../index';
 import { ERROR_TD_CLASSNAME } from './index';
 var TableEnhanceCell = memo(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, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave"]);
+    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, onTableChange = _a.onTableChange, columns = _a.columns, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "onTableChange", "columns"]);
     var form = useContext(EditableContext);
     var tdRef = useRef();
     useEffect(function () {
@@ -119,13 +119,67 @@ var TableEnhanceCell = memo(function (_a) {
             tdRef.current.classList.remove(ERROR_TD_CLASSNAME);
         }
     }
+    function onPasteHandle(e) {
+        if (!onTableChange) {
+            return;
+        }
+        var text = e.clipboardData.getData('text/plain');
+        // 首先判断是否有换行符
+        if (text) {
+            // 兼容多种换行模式
+            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 newColumns_1 = columns ? columns() : [];
+                var currentColumnIndex_1 = newColumns_1.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;
+                        if (resultItem === '' || resultItem == null) {
+                            return;
+                        }
+                        if (index === 0) {
+                            result[dataIndex] = resultItem;
+                        }
+                        else {
+                            var key = (_a = newColumns_1[currentColumnIndex_1 + index]) === null || _a === void 0 ? void 0 : _a.dataIndex;
+                            if (key) {
+                                result[key] = resultItem;
+                            }
+                        }
+                    });
+                    return result;
+                });
+                onTableChange && onTableChange(resultTextList, index);
+            }
+        }
+    }
     /**
      * @description 生成编辑框
      */
     var createEditableDom = function (editableConfig) {
         if (!editableConfig) {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
-                React.createElement(Input, { autoComplete: "new-password", maxLength: 50, onPressEnter: save, onBlur: save, allowClear: true, onChange: function (e) {
+                React.createElement(Input, { autoComplete: "new-password", maxLength: 50, onPressEnter: save, onBlur: save, allowClear: true, onPaste: onPasteHandle, onChange: function (e) {
                         removeErrorClass();
                         if (!e.target.value) {
                             e.target.focus();
@@ -202,13 +256,13 @@ var TableEnhanceCell = memo(function (_a) {
                     }, onFocus: function (e) {
                         var _a;
                         editableProps.onFocus && ((_a = editableProps.onFocus) === null || _a === void 0 ? void 0 : _a.call(editableProps, e));
-                    }, onChange: function () {
+                    }, onPaste: onPasteHandle, onChange: function () {
                         removeErrorClass();
                     } }))));
         }
         else if (type === 'textArea') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
-                React.createElement(Input.TextArea, __assign({ autoComplete: "new-password", maxLength: 200, autoSize: { maxRows: 3 } }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, onChange: function (e) {
+                React.createElement(Input.TextArea, __assign({ autoComplete: "new-password", maxLength: 200, autoSize: { maxRows: 3 } }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, onPaste: onPasteHandle, onChange: function (e) {
                         removeErrorClass();
                         if (!e.target.value) {
                             e.target.focus();
@@ -217,7 +271,7 @@ var TableEnhanceCell = memo(function (_a) {
         }
         else {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
-                React.createElement(Input, __assign({ autoComplete: "new-password", maxLength: 50 }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, allowClear: true, onChange: function (e) {
+                React.createElement(Input, __assign({ autoComplete: "new-password", maxLength: 50 }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, allowClear: true, onPaste: onPasteHandle, onChange: function (e) {
                         removeErrorClass();
                         if (!e.target.value) {
                             e.target.focus();

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

@@ -44,6 +44,8 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     tableName?: string;
     /** 表格是否flex布局 */
     isFlex?: boolean;
+    /** 表格change */
+    onTableChange?: any;
 }
 /**
  * TodoList

package/dist/components/Table/table.js

@@ -102,7 +102,7 @@ var components = {
  */
 function Table(props) {
     var _this = this;
-    var className = props.className, scroll = props.scroll, _a = props.pagination, pagination = _a === void 0 ? false : _a, _b = props.bordered, bordered = _b === void 0 ? true : _b, columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _c = props.isResizableColumn, isResizableColumn = _c === void 0 ? true : _c, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "delIconText", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex"]);
+    var className = props.className, scroll = props.scroll, _a = props.pagination, pagination = _a === void 0 ? false : _a, _b = props.bordered, bordered = _b === void 0 ? true : _b, columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _c = props.isResizableColumn, isResizableColumn = _c === void 0 ? true : _c, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "delIconText", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange"]);
     // console.log('table render');
     var classes = classNames('zt-table', className, {
         'zt-table--flex': isFlex,
@@ -169,6 +169,12 @@ function Table(props) {
         onEditableSave: onEditableSave,
         configInfo: configInfo,
         copyByKey: copyByKey,
+        onTableChange: onTableChange
+            ? function (resultTextList, startIndex) {
+                clearErrorClass();
+                onTableChange && onTableChange(resultTextList, startIndex);
+            }
+            : undefined,
     }), newColumns = _f.newColumns, dynamicColumns = _f.dynamicColumns, setNewColumns = _f.setNewColumns;
     /**
      * @description 保存列配置
@@ -414,7 +420,10 @@ function Table(props) {
                     }
                     : undefined, summary: summaryConfig
                     ? function (pageData) {
-                        var summaryData = getSummaryData(summaryConfig, pageData, newColumns, props.rowSelection ? true : false);
+                        var summaryData = getSummaryData(summaryConfig, pageData, newColumns, {
+                            hasRowSelection: props.rowSelection ? true : false,
+                            hasExpandable: props.expandable ? true : false,
+                        });
                         return (React.createElement(AntTable.Summary, { fixed: summaryFixed }, summaryData.map(function (summary) {
                             var title = summary.title, key = summary.key, titleIndex = summary.titleIndex, list = summary.list, columnList = summary.columnList, onClickHandle = summary.onClickHandle;
                             return (React.createElement(AntTable.Summary.Row, { key: key }, Array.isArray(list) &&

package/dist/components/Table/utils/getSummaryData.d.ts

@@ -22,5 +22,8 @@ export interface ISummaryConfig {
  * @param hasRowSelection 是否有选择列
  * @returns any[]
  */
-declare function getSummaryData(summaryConfig: ISummaryConfig[] | undefined, pageData: any, columns: any, hasRowSelection?: boolean): ISummaryData[];
+declare function getSummaryData(summaryConfig: ISummaryConfig[] | undefined, pageData: any, columns: any, { hasRowSelection, hasExpandable, }: {
+    hasRowSelection: boolean;
+    hasExpandable: boolean;
+}): ISummaryData[];
 export default getSummaryData;

package/dist/components/Table/utils/getSummaryData.js

@@ -12,8 +12,8 @@ import { plus, round } from 'number-precision';
  * @param hasRowSelection 是否有选择列
  * @returns any[]
  */
-function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
-    if (hasRowSelection === void 0) { hasRowSelection = false; }
+function getSummaryData(summaryConfig, pageData, columns, _a) {
+    var hasRowSelection = _a.hasRowSelection, hasExpandable = _a.hasExpandable;
     var _summaryData = [];
     if (Array.isArray(summaryConfig)) {
         summaryConfig.forEach(function (summary) {
@@ -76,11 +76,13 @@ function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
                     });
                     _summaryData.push({
                         title: title || '小计',
-                        titleIndex: 0 + (hasRowSelection ? 1 : 0),
+                        titleIndex: 0 + (hasRowSelection ? 1 : 0) + (hasExpandable ? 1 : 0),
                         key: 'subtotal',
-                        list: hasRowSelection
+                        list: hasRowSelection && hasExpandable
+                            ? __spreadArray([undefined, undefined], subtotalResult_1) : hasRowSelection || hasExpandable
                             ? __spreadArray([undefined], subtotalResult_1) : subtotalResult_1,
-                        columnList: hasRowSelection
+                        columnList: hasRowSelection && hasExpandable
+                            ? __spreadArray([undefined, undefined], columnResult_1) : hasRowSelection || hasExpandable
                             ? __spreadArray([undefined], columnResult_1) : columnResult_1,
                         onClickHandle: onClickHandle,
                     });
@@ -142,10 +144,13 @@ function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
                         });
                         _summaryData.push({
                             title: title || '总计',
-                            titleIndex: 0 + (hasRowSelection ? 1 : 0),
+                            titleIndex: 0 + (hasRowSelection ? 1 : 0) + (hasExpandable ? 1 : 0),
                             key: 'total',
-                            list: hasRowSelection ? __spreadArray([undefined], totalResult_1) : totalResult_1,
-                            columnList: hasRowSelection
+                            list: hasRowSelection && hasExpandable
+                                ? __spreadArray([undefined, undefined], totalResult_1) : hasRowSelection || hasExpandable
+                                ? __spreadArray([undefined], totalResult_1) : totalResult_1,
+                            columnList: hasRowSelection && hasExpandable
+                                ? __spreadArray([undefined, undefined], columnResult_2) : hasRowSelection || hasExpandable
                                 ? __spreadArray([undefined], columnResult_2) : columnResult_2,
                             onClickHandle: onClickHandle,
                         });

package/dist/constants.d.ts

@@ -0,0 +1 @@
+export declare const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNDY4MDM1MzUxNjI1Mjg1NjM0LDE1NDIwNzYzMDg1NzgwMjU0NzQiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxLDE0NjcwMTU5NzU0ODQ3NjAwNjYsMTQ2ODAzNDQzNzE1Nzk2MTcyOSwxNDgwODI5MzM3OTM5MTMyNDE3IiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjoiIiwiZXhwIjoxNjY2MjI4NDQyLCJvcmdfbmFtZSI6bnVsbCwianRpIjoiMWI3YmFkOWEtZjQ0OS00ODZhLTkyNjctZDU0YWQxMTQ5MzgzIiwibWVtYmVyX2lkIjoiMSIsImNvbXBhbnlfaWQiOiIiLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbImFkbWluIiwidXNlciIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvcix1c2VyLGFkbWluLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTQxMjk1MzgwNDMzMzU1NTcxNCIsIm9yZ19pZCI6IiIsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjoiIn0.FAVrciGMDRE-npF2wFLv30CIs9po2EOCPXbCb65__Ak";

package/dist/constants.js

@@ -0,0 +1 @@
+export var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNDY4MDM1MzUxNjI1Mjg1NjM0LDE1NDIwNzYzMDg1NzgwMjU0NzQiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxLDE0NjcwMTU5NzU0ODQ3NjAwNjYsMTQ2ODAzNDQzNzE1Nzk2MTcyOSwxNDgwODI5MzM3OTM5MTMyNDE3IiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjoiIiwiZXhwIjoxNjY2MjI4NDQyLCJvcmdfbmFtZSI6bnVsbCwianRpIjoiMWI3YmFkOWEtZjQ0OS00ODZhLTkyNjctZDU0YWQxMTQ5MzgzIiwibWVtYmVyX2lkIjoiMSIsImNvbXBhbnlfaWQiOiIiLCJzeXN0ZW1faWQiOm51bGwsImRlcHRfbmFtZSI6bnVsbCwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbixhZG1pbixhZG1pbiIsImF1dGhvcml0aWVzIjpbImFkbWluIiwidXNlciIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvcix1c2VyLGFkbWluLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTQxMjk1MzgwNDMzMzU1NTcxNCIsIm9yZ19pZCI6IiIsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjoiIn0.FAVrciGMDRE-npF2wFLv30CIs9po2EOCPXbCb65__Ak';

package/package.json

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