ztxkui 4.2.23-330 → 4.2.23-331

package/dist/UI/Table/DefaultTable.js

@@ -180,7 +180,7 @@ function useColumns() {
 }
 export default function DefaultTable() {
     var columns = useColumns().columns;
-    var _a = useState(data1.slice(0, 20)), data = _a[0], setData = _a[1];
+    var _a = useState(data1), data = _a[0], setData = _a[1];
     var _b = useState(1), key = _b[0], setKey = _b[1];
     var handleRef = useRef({});
     var _c = useRememberCheckData(handleRef), checkedData = _c.checkedData, setCheckedData = _c.setCheckedData, selections = _c.selections, changeCheckedDataHandle = _c.changeCheckedDataHandle;

package/dist/UI/Table/data.js

@@ -1,4 +1,4 @@
-export var data1 = new Array(50).fill(1).map(function (item, index) {
+export var data1 = new Array(500).fill(1).map(function (item, index) {
     return {
         id: "id-" + index,
         test1: index % 2 === 0 ? null : 10,

package/dist/components/PrintBox/demoComponents/index.js

@@ -106,7 +106,10 @@ var Demo = function () {
                         case 0:
                             _f.trys.push([0, 3, , 4]);
                             return [4 /*yield*/, ((_b = (_a = printRef.current) === null || _a === void 0 ? void 0 : _a.innerExportCanvasPdfHandler) === null || _b === void 0 ? void 0 : _b.call(_a, {
-                                    isDownload: false,
+                                    isDownload: true,
+                                    pdfConfig: {
+                                        orientation: 'p',
+                                    },
                                 }))];
                         case 1:
                             pdfObj = _f.sent();

package/dist/components/PrintBox/hooks/useCreatePdf.d.ts

@@ -1,5 +1,6 @@
 import { ICanvasPdfProps } from '../interface';
 import { IHtmlToPdfConfig } from '../pdf/htmlToPdf';
+import { IPdfConfig } from '../pdf/pdf';
 /**
  * html生成canvas生成PDF
  */
@@ -35,7 +36,9 @@ interface ICreateCanvasPdfOption extends ICreatePdfOption {
     insertFooter?: IHtmlToPdfConfig['insertFooter'];
     /** 页脚距离上边的距离 */
     footerTopMargin?: IHtmlToPdfConfig['footerTopMargin'];
+    pdfConfig?: IPdfConfig;
 }
 interface ICreateHtmlPdfOption extends ICreatePdfOption {
+    pdfConfig?: IPdfConfig;
 }
 export {};

package/dist/components/PrintBox/hooks/useCreatePdf.js

@@ -75,11 +75,11 @@ export default function useCreatePdf(props) {
         isAutoDownload: isAutoSeal,
     }).getFontHandler;
     var createCanvasPdfHandler = useMemoizedFn(function (option) { return __awaiter(_this, void 0, void 0, function () {
-        var _a, isDownload, isWater, pdfOptions, result, result_1, err_1;
+        var _a, isDownload, isWater, pdfConfig, pdfOptions, result, result_1, err_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _a = option || {}, isDownload = _a.isDownload, isWater = _a.isWater, pdfOptions = __rest(_a, ["isDownload", "isWater"]);
+                    _a = option || {}, isDownload = _a.isDownload, isWater = _a.isWater, pdfConfig = _a.pdfConfig, pdfOptions = __rest(_a, ["isDownload", "isWater", "pdfConfig"]);
                     return [4 /*yield*/, canExecuteClickHandle('导出PDF操作不能继续，请联系管理员!', 'canvasPdf')];
                 case 1:
                     result = _b.sent();
@@ -91,9 +91,7 @@ export default function useCreatePdf(props) {
                     _b.trys.push([2, 6, , 7]);
                     return [4 /*yield*/, htmlToPdf(__assign({ pageDom: pageDom, waterConfig: isWater ? waterConfig : undefined, 
                             // isDownload: isCanvasPdfDownload ? true : false,
-                            isDownload: isDownload, pdfConfig: {
-                                orientation: 'l',
-                            }, useCanvas: true }, pdfOptions))];
+                            isDownload: isDownload, pdfConfig: __assign({ orientation: 'l' }, pdfConfig), useCanvas: true }, pdfOptions))];
                 case 3:
                     result_1 = _b.sent();
                     if (!onExecuteClick) return [3 /*break*/, 5];
@@ -114,11 +112,11 @@ export default function useCreatePdf(props) {
         });
     }); });
     var createHtmlPdfHandler = useMemoizedFn(function (option) { return __awaiter(_this, void 0, void 0, function () {
-        var _a, isDownload, isWater, result, result_2, err_2;
+        var _a, isDownload, isWater, pdfConfig, result, result_2, err_2;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _a = option || {}, isDownload = _a.isDownload, isWater = _a.isWater;
+                    _a = option || {}, isDownload = _a.isDownload, isWater = _a.isWater, pdfConfig = _a.pdfConfig;
                     return [4 /*yield*/, canExecuteClickHandle('生成PDF操作不能继续，请联系管理员!', 'domPdf')];
                 case 1:
                     result = _b.sent();
@@ -133,9 +131,7 @@ export default function useCreatePdf(props) {
                             waterConfig: isWater ? waterConfig : undefined,
                             // isDownload: isCanvasPdfDownload ? true : false,
                             isDownload: isDownload,
-                            pdfConfig: {
-                                orientation: 'l',
-                            },
+                            pdfConfig: __assign({ orientation: 'l' }, pdfConfig),
                             useCanvas: false,
                             fileBinary: fontTTF,
                         })];

package/dist/components/PrintBox/interface.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { IHtmlToPdfConfig } from './pdf/htmlToPdf';
+import { IPdfConfig } from './pdf/pdf';
 export interface IPrintBoxProps extends ICommonProps, IBrowserPrintProps, ICanvasPdfProps {
     children: React.ReactNode;
 }
@@ -78,6 +79,7 @@ export interface ICanvasPdfProps extends ICommonProps {
     insertFooter?: IHtmlToPdfConfig['insertFooter'];
     /** 页脚距离上边的距离 */
     footerTopMargin?: IHtmlToPdfConfig['footerTopMargin'];
+    pdfConfig?: IPdfConfig;
 }
 export interface IPrintBoxRef {
     /** 创建canvasPdf方法 */

package/dist/components/PrintBox/pdf/water.js

@@ -89,6 +89,7 @@ function getTextWidth(text, fontOption) {
     div.style.visibility = 'hidden'; // 隐藏该元素，不影响页面显示
     div.style.overflow = 'hidden'; // 防止滚动条出现
     div.style.color = (font === null || font === void 0 ? void 0 : font.color) || 'rgba(0, 0, 0, 0)';
+    div.style.padding = '0 5px';
     div.style.fontSize = (font === null || font === void 0 ? void 0 : font.fontSize) || 14;
     div.style.fontWeight = (font === null || font === void 0 ? void 0 : font.fontWeight) || 'normal';
     div.style.fontStyle = (font === null || font === void 0 ? void 0 : font.fontStyle) || 'normal';

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

@@ -3,9 +3,12 @@ import { domFind } from '../utils/dom';
 import { plus } from 'number-precision';
 import { copyValueHandle } from '../../utils/index';
 export default function useSelectSubtotal(tableRef, props) {
-    var onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave;
+    var onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, dataSource = props.dataSource;
     var tipRef = useRef();
+    var rowResultRef = useRef();
+    // 数据发送变更时，动态计算单元格位置信息
     useEffect(function () {
+        console.time('触发计算');
         if (onMoveRow || onEditableSave) {
             return;
         }
@@ -15,15 +18,6 @@ export default function useSelectSubtotal(tableRef, props) {
         }
         var tbody = domFind(tableContent, '.ant-table-tbody');
         var container = tbody.parentNode;
-        var $tip = tipRef.current;
-        var isDragging = false;
-        var startCell = null; // 开始选中的项
-        var lastEndCell = null; // 最终选中的项
-        var textArr = []; // 选中的文本
-        var textPositionArr = []; // 包含位置信息
-        if (!container) {
-            return;
-        }
         // 找到每个单元格实际对应的坐标
         var cellPosition = function () {
             var rowsLen = container.rows.length;
@@ -82,7 +76,30 @@ export default function useSelectSubtotal(tableRef, props) {
             }
             return rowResult;
         };
-        var rowResult = cellPosition();
+        rowResultRef.current = cellPosition();
+        console.timeEnd('触发计算');
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [dataSource]);
+    useEffect(function () {
+        if (onMoveRow || onEditableSave) {
+            return;
+        }
+        var tableContent = domFind(tableRef.current, '.ant-table-content');
+        if (!tableContent) {
+            tableContent = domFind(tableRef.current, '.ant-table-container');
+        }
+        var tbody = domFind(tableContent, '.ant-table-tbody');
+        var container = tbody.parentNode;
+        var $tip = tipRef.current;
+        var isDragging = false;
+        var startCell = null; // 开始选中的项
+        var lastEndCell = null; // 最终选中的项
+        var textArr = []; // 选中的文本
+        var textPositionArr = []; // 包含位置信息
+        if (!container) {
+            return;
+        }
+        var rowResult = rowResultRef.current;
         var mousedownHandler = function (e) {
             if (e.target.tagName === 'TD') {
                 isDragging = true;
@@ -143,7 +160,7 @@ export default function useSelectSubtotal(tableRef, props) {
         };
         container.addEventListener('mousemove', mousemoveHandler);
         var selectCells = function (start, end, isCtrl) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             if (!isCtrl) {
                 clearSelections(); // 清除之前的选择
             }
@@ -153,13 +170,13 @@ export default function useSelectSubtotal(tableRef, props) {
             var startCol = start.cellIndex;
             var endRow = end.parentNode.rowIndex;
             var endCol = end.cellIndex;
-            var startCell = rowResult[startRow - 1].find(function (item) {
+            var startCell = (_b = (_a = rowResult[startRow - 1]) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) {
                 return item.td === start;
             });
             if (startCell) {
                 startCol = startCell.cellIndex;
             }
-            var endCell = rowResult[endRow - 1].find(function (item) {
+            var endCell = (_d = (_c = rowResult[endRow - 1]) === null || _c === void 0 ? void 0 : _c.find) === null || _d === void 0 ? void 0 : _d.call(_c, function (item) {
                 return item.td === end;
             });
             if (endCell) {
@@ -179,13 +196,13 @@ export default function useSelectSubtotal(tableRef, props) {
                 var positionArr = [];
                 for (var j = initCell; j <= lenCell; j++) {
                     // const $td = container.rows[i]?.cells[j];
-                    var $td = (_a = rowResult[i - 1][j]) === null || _a === void 0 ? void 0 : _a.td;
+                    var $td = (_e = rowResult[i - 1][j]) === null || _e === void 0 ? void 0 : _e.td;
                     if ($td && !$td.classList.contains('move-selected')) {
                         var innerText = $td.innerText;
                         textArr.push(innerText);
                         positionArr.push(innerText);
                     }
-                    (_b = $td === null || $td === void 0 ? void 0 : $td.classList) === null || _b === void 0 ? void 0 : _b.add('move-selected');
+                    (_f = $td === null || $td === void 0 ? void 0 : $td.classList) === null || _f === void 0 ? void 0 : _f.add('move-selected');
                 }
                 if (positionArr.length > 0) {
                     textPositionArr.push(positionArr);

package/dist/components/Table/table.js

@@ -985,7 +985,11 @@ function Table(props) {
         tableResizableTitle,
         vComponents,
     ]);
-    var tipRef = useSelectSubtotal(tableRef, { onMoveRow: onMoveRow, onEditableSave: onEditableSave }).tipRef;
+    var tipRef = useSelectSubtotal(tableRef, {
+        onMoveRow: onMoveRow,
+        onEditableSave: onEditableSave,
+        dataSource: sortDataSource ? sortDataSource : expandableDataSource,
+    }).tipRef;
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: isFlex ? 'zt-table-flex' : '', style: isFlex
                 ? { position: 'relative', overflow: 'hidden', flex: 1 }

package/package.json

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