ztxkui 3.6.11 → 3.6.14

package/dist/TableDemo/EditableTable.js

@@ -193,9 +193,23 @@ var EditableTable = function () {
         },
         {
             title: '测试5',
-            width: 100,
-            dataIndex: 'test5',
-            key: 'test5',
+            // 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',
@@ -351,6 +365,34 @@ var EditableTable = function () {
                             key: 'test2',
                             toFixedNum: 2,
                         },
+                        {
+                            key: 'test5-001',
+                            toFixedNum: 2,
+                        },
+                        {
+                            key: 'test5-002',
+                            toFixedNum: 2,
+                        },
+                    ],
+                },
+                {
+                    type: 'total',
+                    fields: [
+                        {
+                            key: 'test2',
+                            toFixedNum: 2,
+                            value: 0,
+                        },
+                        {
+                            key: 'test5-001',
+                            toFixedNum: 2,
+                            value: 222,
+                        },
+                        {
+                            key: 'test5-002',
+                            toFixedNum: 2,
+                            value: 333322.22,
+                        },
                     ],
                 },
             ] })));

package/dist/TableDemo/data.d.ts

@@ -5,6 +5,8 @@ export declare const dataSource: {
     test3: string;
     test4: string;
     test5: string;
+    'test5-001': number;
+    'test5-002': number;
     test6: string;
     test7: string;
     test8: string;

package/dist/TableDemo/data.js

@@ -6,6 +6,8 @@ export var dataSource = new Array(10).fill(1).map(function (item, index) {
         test3: "test3-" + index,
         test4: "test4-" + index,
         test5: "test5-" + index,
+        'test5-001': index + 10,
+        'test5-002': index + 20,
         test6: "test6-" + index,
         test7: "test7-" + index,
         test8: "test8-" + index,

package/dist/components/PrintContainer/print-container.d.ts

@@ -52,6 +52,10 @@ export interface IProps {
     localKey?: string;
     /** 是否显示导出按钮 */
     showExportBtn?: boolean;
+    /** 是否显示设置文字 */
+    showSetFontBtn?: boolean;
+    /** 设置是否需要偏移 */
+    isSetPosition?: boolean;
 }
 declare const PrintContainer: React.FC<IProps>;
 export default PrintContainer;

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

@@ -94,25 +94,25 @@ 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, isUseXy = _a.isUseXy, localKey = _a.localKey, _j = _a.showExportBtn, showExportBtn = _j === void 0 ? true : _j;
-    var _k = useState(false), showWater = _k[0], setShowWater = _k[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, isUseXy = _a.isUseXy, localKey = _a.localKey, _j = _a.showExportBtn, showExportBtn = _j === void 0 ? true : _j, showSetFontBtn = _a.showSetFontBtn, _k = _a.isSetPosition, isSetPosition = _k === void 0 ? true : _k;
+    var _l = useState(false), showWater = _l[0], setShowWater = _l[1];
     var containerRef = useRef();
     var allDomRef = useRef();
-    var _l = useState(false), spinning = _l[0], setSpinning = _l[1];
+    var _m = useState(false), spinning = _m[0], setSpinning = _m[1];
     // 确认盖章后，会得到一个合同id 这个之后盖章要用
-    var _m = useState(), currentContractId = _m[0], setCurrentContractId = _m[1];
+    var _o = useState(), currentContractId = _o[0], setCurrentContractId = _o[1];
     // 盖章后会得到一个预览地址，这个地址耀保存,同一个合同id，不能重复盖章接口
-    var _o = useState(), currentViewUrl = _o[0], setCurrentViewUrl = _o[1];
+    var _p = useState(), currentViewUrl = _p[0], setCurrentViewUrl = _p[1];
     // 收到盖章-印章列表
-    var _p = useState(), _sealIdList = _p[0], setSealIdList = _p[1];
+    var _q = useState(), _sealIdList = _q[0], setSealIdList = _q[1];
     // 自动盖章-印章列表
-    var _q = useState(), autoSealList = _q[0], setAutoSealList = _q[1];
+    var _r = useState(), autoSealList = _r[0], setAutoSealList = _r[1];
     // 边距调整相关
-    var _r = useState(false), visible = _r[0], setVisible = _r[1];
-    var _s = useState({
+    var _s = useState(false), visible = _s[0], setVisible = _s[1];
+    var _t = useState({
         top: 0,
         left: 0,
-    }), value = _s[0], setValue = _s[1];
+    }), value = _t[0], setValue = _t[1];
     useEffect(function () {
         var v = getPositionLocal(localKey);
         setValue(v);
@@ -487,7 +487,9 @@ var PrintContainer = function (_a) {
     }); };
     function createPdf() {
         setTimeout(function () {
-            setPositionDom(setPositionDeviation(value));
+            if (isSetPosition) {
+                setPositionDom(setPositionDeviation(value));
+            }
             htmlToPdfNoCanvas({
                 dom: containerRef.current,
                 fileBinary: fontTTF,
@@ -562,7 +564,9 @@ var PrintContainer = function (_a) {
     };
     function surePdfLoad() {
         setTimeout(function () {
-            setPositionDom(setPositionDeviation(value));
+            if (isSetPosition) {
+                setPositionDom(setPositionDeviation(value));
+            }
             htmlToPdfNoCanvas({
                 dom: containerRef.current,
                 isShowPage: isAddExportPage,
@@ -719,7 +723,9 @@ var PrintContainer = function (_a) {
     };
     function pdfLoad() {
         setTimeout(function () {
-            setPositionDom(setPositionDeviation(value));
+            if (isSetPosition) {
+                setPositionDom(setPositionDeviation(value));
+            }
             htmlToPdfNoCanvas({
                 dom: containerRef.current,
                 isShowPage: isAddExportPage,
@@ -799,8 +805,8 @@ var PrintContainer = function (_a) {
     return (React.createElement(Spin, { spinning: spinning },
         React.createElement("div", { className: "print-container--header" },
             React.createElement("div", { className: "print-container--header__content" },
-                React.createElement(Button, { type: "primary", onClick: function () { return onFontsizeHandle('add'); } }, "\u653E\u5927\u6587\u5B57"),
-                React.createElement(Button, { type: "primary", onClick: function () { return onFontsizeHandle('reduce'); } }, "\u7F29\u5C0F\u6587\u5B57"),
+                showSetFontBtn && (React.createElement(Button, { type: "primary", onClick: function () { return onFontsizeHandle('add'); } }, "\u653E\u5927\u6587\u5B57")),
+                showSetFontBtn && (React.createElement(Button, { type: "primary", onClick: function () { return onFontsizeHandle('reduce'); } }, "\u7F29\u5C0F\u6587\u5B57")),
                 React.createElement(Button, { type: "primary", onClick: function () { return onAdjustPadding(); } }, "\u8C03\u6574\u8FB9\u8DDD"),
                 React.createElement(Button, { type: "primary", onClick: onWaterHandle }, !showWater ? '添加水印' : '移除水印'),
                 showPrintBtn && (React.createElement(Button, { type: "primary", onClick: onPrintHandle }, "\u6253\u5370")),

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

@@ -44,6 +44,9 @@ export var getTableLayoutFullData = function (columns, tableLayout) {
                 }
                 // 如果没有在原始数据中找到对应的值，那说明这个应该删除，不应该添加进去
             }
+            else if (item.children && !item.fixed) {
+                middleColumns_1.push(__assign({}, item));
+            }
             // 如果没有key 或者dataIndex 则说明该值不应该存在
             // return {
             //   ...item,

package/dist/components/Table/table.js

@@ -369,6 +369,7 @@ function Table(props) {
                     : undefined, summary: summaryConfig
                     ? function (pageData) {
                         var summaryData = getSummaryData(summaryConfig, pageData, newColumns, props.rowSelection ? true : false);
+                        console.log(summaryData);
                         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.js

@@ -14,6 +14,7 @@ import { plus, round } from 'number-precision';
  */
 function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
     if (hasRowSelection === void 0) { hasRowSelection = false; }
+    console.log(columns);
     var _summaryData = [];
     if (Array.isArray(summaryConfig)) {
         summaryConfig.forEach(function (summary) {
@@ -30,23 +31,58 @@ function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
                     // 拿到统计数据
                     var subtotalObj_1 = getSubtotalObj(fields, pageData);
                     // 得到小计行数据
-                    var subtotalResult = columns.map(function (col) {
-                        return col.key || col.dataIndex
-                            ? subtotalObj_1[col.key || col.dataIndex]
-                            : undefined;
+                    // const subtotalResult = columns.map((col: any) =>
+                    //   col.key || col.dataIndex
+                    //     ? subtotalObj[col.key || col.dataIndex]
+                    //     : undefined
+                    // );
+                    // 修改逻辑
+                    var subtotalResult_1 = [];
+                    columns.forEach(function (col) {
+                        if (col.children) {
+                            col.children.forEach(function (col) {
+                                subtotalResult_1.push(col.key || col.dataIndex
+                                    ? subtotalObj_1[col.key || col.dataIndex]
+                                    : undefined);
+                            });
+                        }
+                        else {
+                            subtotalResult_1.push(col.key || col.dataIndex
+                                ? subtotalObj_1[col.key || col.dataIndex]
+                                : undefined);
+                        }
+                    });
+                    // 得到column
+                    // const columnResult = columns.map((col: any) => ({
+                    //   key: col?.key,
+                    //   dataIndex: col?.dataIndex,
+                    // }));
+                    // 修改逻辑
+                    var columnResult_1 = [];
+                    columns.forEach(function (col) {
+                        if (col.children) {
+                            col.children.forEach(function (col) {
+                                columnResult_1.push({
+                                    key: col === null || col === void 0 ? void 0 : col.key,
+                                    dataIndex: col === null || col === void 0 ? void 0 : col.dataIndex,
+                                });
+                            });
+                        }
+                        else {
+                            columnResult_1.push({
+                                key: col === null || col === void 0 ? void 0 : col.key,
+                                dataIndex: col === null || col === void 0 ? void 0 : col.dataIndex,
+                            });
+                        }
                     });
-                    var columnResult = columns.map(function (col) { return ({
-                        key: col === null || col === void 0 ? void 0 : col.key,
-                        dataIndex: col === null || col === void 0 ? void 0 : col.dataIndex,
-                    }); });
                     _summaryData.push({
                         title: title || '小计',
                         titleIndex: 0 + (hasRowSelection ? 1 : 0),
                         key: 'subtotal',
                         list: hasRowSelection
-                            ? __spreadArray([undefined], subtotalResult) : subtotalResult,
+                            ? __spreadArray([undefined], subtotalResult_1) : subtotalResult_1,
                         columnList: hasRowSelection
-                            ? __spreadArray([undefined], columnResult) : columnResult,
+                            ? __spreadArray([undefined], columnResult_1) : columnResult_1,
                         onClickHandle: onClickHandle,
                     });
                     break;
@@ -61,22 +97,57 @@ function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
                         }
                         var totalObj_1 = getTotalObj(fields);
                         // 得到小计行数据
-                        var totalResult = columns.map(function (col) {
-                            return col.key || col.dataIndex
-                                ? totalObj_1[col.key || col.dataIndex]
-                                : undefined;
+                        // const totalResult = columns.map((col: any) =>
+                        //   col.key || col.dataIndex
+                        //     ? totalObj[col.key || col.dataIndex]
+                        //     : undefined
+                        // );
+                        // 修改逻辑
+                        var totalResult_1 = [];
+                        columns.forEach(function (col) {
+                            if (col.children) {
+                                col.children.forEach(function (col) {
+                                    totalResult_1.push(col.key || col.dataIndex
+                                        ? totalObj_1[col.key || col.dataIndex]
+                                        : undefined);
+                                });
+                            }
+                            else {
+                                totalResult_1.push(col.key || col.dataIndex
+                                    ? totalObj_1[col.key || col.dataIndex]
+                                    : undefined);
+                            }
+                        });
+                        // 得到column
+                        // const columnResult = columns.map((col: any) => ({
+                        //   key: col?.key,
+                        //   dataIndex: col?.dataIndex,
+                        // }));
+                        // 修改逻辑
+                        var columnResult_2 = [];
+                        columns.forEach(function (col) {
+                            if (col.children) {
+                                col.children.forEach(function (col) {
+                                    columnResult_2.push({
+                                        key: col === null || col === void 0 ? void 0 : col.key,
+                                        dataIndex: col === null || col === void 0 ? void 0 : col.dataIndex,
+                                    });
+                                });
+                            }
+                            else {
+                                columnResult_2.push({
+                                    key: col === null || col === void 0 ? void 0 : col.key,
+                                    dataIndex: col === null || col === void 0 ? void 0 : col.dataIndex,
+                                });
+                            }
                         });
-                        var columnResult_1 = columns.map(function (col) { return ({
-                            key: col === null || col === void 0 ? void 0 : col.key,
-                            dataIndex: col === null || col === void 0 ? void 0 : col.dataIndex,
-                        }); });
                         _summaryData.push({
                             title: title || '总计',
                             titleIndex: 0 + (hasRowSelection ? 1 : 0),
                             key: 'total',
-                            list: hasRowSelection ? __spreadArray([undefined], totalResult) : totalResult,
+                            list: hasRowSelection ? __spreadArray([undefined], totalResult_1) : totalResult_1,
                             columnList: hasRowSelection
-                                ? __spreadArray([undefined], columnResult_1) : columnResult_1,
+                                ? __spreadArray([undefined], columnResult_2) : columnResult_2,
                             onClickHandle: onClickHandle,
                         });
                     }

package/package.json

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