ztxkui 3.5.6 → 3.5.9

package/dist/DemoCom/PrintContainerDemo.js

@@ -17,6 +17,7 @@ import React, { useEffect, useState } from 'react';
 // redux
 // ztxkui公共组件
 import { PrintContainer } from '../index';
+// import Table, { ColumnsType } from 'components/Table';
 // 路由配置
 // store
 // 自定义组件
@@ -44,41 +45,66 @@ var dataSource1 = new Array(10).fill('1').map(function (item, index) { return ({
     id: "" + index,
 }); });
 var PrintContainerDemo = function () {
-    var _a = useState([]), dataSource = _a[0], setDataSource = _a[1];
+    // const [dataSource, setDataSource] = useState([]);
+    var _a = useState([]), setDataSource = _a[1];
     var _b = useState(true), loading = _b[0], setLoading = _b[1];
-    var columns = [
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test1',
-            key: 'test1',
-        },
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test2',
-            key: 'test2',
-        },
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test3',
-            key: 'test3',
-        },
-        {
-            title: '测试一',
-            width: 100,
-            dataIndex: 'test4',
-            key: 'test4',
-        },
-    ];
+    // const columns: ColumnsType<any> = [
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test1',
+    //     key: 'test1',
+    //   },
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test2',
+    //     key: 'test2',
+    //   },
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test3',
+    //     key: 'test3',
+    //   },
+    //   {
+    //     title: '测试一',
+    //     width: 100,
+    //     dataIndex: 'test4',
+    //     key: 'test4',
+    //   },
+    // ];
     useEffect(function () {
         setTimeout(function () {
             setLoading(false);
             setDataSource(dataSource1);
         }, 1000);
     }, []);
-    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1527122794329313281", flowId: "scm_print_thd", fileId: "1551837561144905730", keywordList: keywordList, imgWaterBg: water },
+    return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1527122794329313281", flowId: "scm_print_thd", fileId: "1551837561144905730", keywordList: keywordList, imgWaterBg: water, showPrintMessage: true, 
+        // onPrintBeforeCallback={() => {
+        //   setLoading(true);
+        //   return new Promise((resolve, reject) => {
+        //     setTimeout(() => {
+        //       setLoading(false);
+        //       // 这样子会导致不会执行
+        //       // reject(false);
+        //       // 这样子会执行
+        //       resolve(true);
+        //     }, 2000);
+        //   });
+        // }}
+        onPrintCallback: function () {
+            setLoading(true);
+            return new Promise(function (resolve, reject) {
+                setTimeout(function () {
+                    setLoading(false);
+                    // 这样子不会执行
+                    // reject(false);
+                    // 这样子会执行
+                    resolve(true);
+                }, 0);
+            });
+        } },
         React.createElement("div", null,
             React.createElement("div", { className: "html2canvas-container-page simple-print" },
                 React.createElement("div", { className: "print-header" },

package/dist/TableDemo/EditableTable.js

@@ -129,7 +129,7 @@ var EditableTable = function () {
                         return Promise.reject({
                             errorFields: [
                                 {
-                                    errors: "\u91C7\u8D2D\u57FA\u672C\u6570\u636E-\u660E\u7EC6\u8868 \u7B2C" + index + "\u884C \u91C7\u8D2D\u4ED8\u6B3E\u6761\u4EF62 \u5FC5\u586B\uFF01",
+                                    errors: "\u6D4B\u8BD5-\u660E\u7EC6\u8868 \u7B2C" + index + "\u884C \u6D4B\u8BD52 \u4E0D\u80FD\u5C0F\u4E8E102\uFF01",
                                 },
                             ],
                         });
@@ -331,6 +331,6 @@ var EditableTable = function () {
             // tableValidate
             tableHandleRef: tableHandleRef, tableName: "\u6211\u662F\u4E00\u4E2A\u8868\u683C", 
             // 显隐配置
-            configInfo: tableConfig })));
+            configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011" })));
 };
 export default EditableTable;

package/dist/UploadDemo.js

@@ -210,9 +210,7 @@ function UploadDemo() {
                 showPreviewIcon: true,
                 showDownloadIcon: true,
                 showRemoveIcon: true,
-            }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList1, maxCount: 1, callback: uploadCallbackFn, onChange: function () {
-                console.log(1111);
-            }, onDeleteCallback: function (index, file) {
+            }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList1, maxCount: 1, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
                 console.log(index, file);
             }, authToken: token }),
         React.createElement("button", { onClick: checkHandle }, "\u68C0\u67E5"),

package/dist/components/PrintContainer/lodop.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 创建打印任务
+ * @param {*} taskName  任务名称
+ * @param {*} width 纸张宽度
+ * @param {*} height 纸张高度
+ */
+declare const createTask: ({ taskName, width, height }: {
+    taskName: any;
+    width: any;
+    height: any;
+}) => any;
+export { createTask };

package/dist/components/PrintContainer/lodop.js

@@ -0,0 +1,43 @@
+import { getLodop } from './utils';
+/**
+ * 创建打印任务
+ * @param {*} taskName  任务名称
+ * @param {*} width 纸张宽度
+ * @param {*} height 纸张高度
+ */
+var createTask = function (_a) {
+    var taskName = _a.taskName, width = _a.width, height = _a.height;
+    var config = Object.assign({}, {
+        taskName: taskName,
+        width: width,
+        height: height,
+    });
+    var LODOP = getLodop();
+    // 打印检查安装，必装
+    CheckIsInstall(LODOP);
+    // 任务名称
+    LODOP.PRINT_INIT(config.taskName);
+    // 展示模式
+    LODOP.SET_SHOW_MODE('NP_NO_RESULT', true);
+    // 纸张大小  intOrient,intPageWidth,intPageHeight,strPageName
+    LODOP.SET_PRINT_PAGESIZE(0, width, height, 'Note');
+    return LODOP;
+};
+/**
+ * 打印检查安装，必装
+ */
+var CheckIsInstall = function (LODOP) {
+    try {
+        if (LODOP.VERSION) {
+            if (LODOP.CVERSION) {
+                // alert('当前有WEB打印服务C-Lodop可用!\n C-Lodop版本:' + LODOP.CVERSION + '(内含Lodop' + LODOP.VERSION + ')') } else { alert('本机已成功安装了Lodop控件！\n 版本号:' + LODOP.VERSION)
+                // Vue.prototype.$message('当前有WEB打印服务C-Lodop可用' + LODOP.CVERSION)
+            }
+        }
+    }
+    catch (err) {
+        console.log('安装lodop');
+        window.open('http://www.lodop.net/download.html');
+    }
+};
+export { createTask };

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

@@ -38,8 +38,10 @@ export interface IProps {
     flowId?: string;
     /** 水印图片 */
     imgWaterBg?: string;
+    /** 点击打印前端的回调函数 */
+    onPrintBeforeCallback?: () => Promise<any> | void;
     /** 点击打印的回调函数 */
-    onPrintCallback?: () => void;
+    onPrintCallback?: () => Promise<any> | void;
     /** 是否添加点击打印提示 */
     showPrintMessage?: boolean;
 }

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

@@ -75,7 +75,7 @@ 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, autoSealIdList = _a.autoSealIdList, keywordList = _a.keywordList, _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;
+    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, autoSealIdList = _a.autoSealIdList, keywordList = _a.keywordList, _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;
     var _h = useState(false), showWater = _h[0], setShowWater = _h[1];
     var containerRef = useRef();
     var allDomRef = useRef();
@@ -230,39 +230,89 @@ var PrintContainer = function (_a) {
         }
     };
     // 打印
-    var onPrintHandle = function () {
-        if (showPrintMessage) {
-            var isOkSure_1 = false;
-            Modal.confirm({
-                title: '打印提示',
-                content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
-                okText: '确认',
-                onOk: function () {
-                    isOkSure_1 = true;
-                    onPrintCallback && onPrintCallback();
-                },
-                afterClose: function () {
-                    if (isOkSure_1) {
-                        setTimeout(function () {
-                            printCurrentDom({
-                                hiddenClassNames: __spreadArray([
-                                    '.print-container--header'
-                                ], (hiddenClassName || [])),
-                            });
+    var onPrintHandle = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result, err_1, isOkSure_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    result = true;
+                    if (!onPrintBeforeCallback) return [3 /*break*/, 4];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, onPrintBeforeCallback()];
+                case 2:
+                    result = _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    err_1 = _a.sent();
+                    result = null;
+                    return [3 /*break*/, 4];
+                case 4:
+                    if (!result) {
+                        return [2 /*return*/];
+                    }
+                    if (showPrintMessage) {
+                        isOkSure_1 = false;
+                        Modal.confirm({
+                            title: '打印提示',
+                            content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
+                            okText: '确认',
+                            onOk: function () {
+                                if (onPrintCallback) {
+                                    var result_1 = onPrintCallback();
+                                    if (result_1 instanceof Promise) {
+                                        var startTime_1 = Date.now();
+                                        result_1.then(function (res) {
+                                            if (res) {
+                                                if (Date.now() - startTime_1 > 1000) {
+                                                    isOkSure_1 = true;
+                                                }
+                                                else {
+                                                    setTimeout(function () {
+                                                        printCurrentDom({
+                                                            hiddenClassNames: __spreadArray([
+                                                                '.print-container--header'
+                                                            ], (hiddenClassName || [])),
+                                                        });
+                                                    }, 1000);
+                                                }
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        isOkSure_1 = true;
+                                    }
+                                }
+                                else {
+                                    isOkSure_1 = true;
+                                }
+                            },
+                            afterClose: function () {
+                                if (isOkSure_1) {
+                                    setTimeout(function () {
+                                        printCurrentDom({
+                                            hiddenClassNames: __spreadArray([
+                                                '.print-container--header'
+                                            ], (hiddenClassName || [])),
+                                        });
+                                    });
+                                }
+                            },
                         });
                     }
-                },
-            });
-        }
-        else {
-            onPrintCallback && onPrintCallback();
-            printCurrentDom({
-                hiddenClassNames: __spreadArray([
-                    '.print-container--header'
-                ], (hiddenClassName || [])),
-            });
-        }
-    };
+                    else {
+                        onPrintCallback && onPrintCallback();
+                        printCurrentDom({
+                            hiddenClassNames: __spreadArray([
+                                '.print-container--header'
+                            ], (hiddenClassName || [])),
+                        });
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     // 生成pdf
     var onPdfHandle = function () { return __awaiter(void 0, void 0, void 0, function () {
         var html2canvasDom;

package/dist/components/Table/table.js

@@ -286,6 +286,7 @@ function Table(props) {
                         return [4 /*yield*/, tableValidate(dataSource, mergeColumns, {
                                 getCurrentTable: getCurrentTable,
                                 rowSelection: props.rowSelection,
+                                expandable: props.expandable,
                                 tableName: tableName,
                             })];
                     case 1:

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

@@ -42,11 +42,11 @@ import { ERROR_TD_CLASSNAME } from '../index';
 export function tableValidate(dataSource, mergeColumns, restParams) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     return __awaiter(this, void 0, void 0, function () {
-        var getCurrentTable, rowSelection, tableName, requiredFileds, resultTr, i, item, j, _o, dataIndex, title, validate, index, value, err_1, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd;
+        var getCurrentTable, rowSelection, tableName, expandable, requiredFileds, resultTr, i, item, j, _o, dataIndex, title, validate, index, value, err_1, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd;
         return __generator(this, function (_p) {
             switch (_p.label) {
                 case 0:
-                    getCurrentTable = restParams.getCurrentTable, rowSelection = restParams.rowSelection, tableName = restParams.tableName;
+                    getCurrentTable = restParams.getCurrentTable, rowSelection = restParams.rowSelection, tableName = restParams.tableName, expandable = restParams.expandable;
                     if (!Array.isArray(dataSource) || dataSource.length === 0) {
                         console.info('没有数据，无需验证!');
                         return [2 /*return*/];
@@ -63,7 +63,7 @@ export function tableValidate(dataSource, mergeColumns, restParams) {
                                     dataIndex: column.validate.dataIndex || column.dataIndex,
                                     title: column.validate.title || column.title,
                                     validate: column.validate.validate,
-                                    index: index + (rowSelection ? 1 : 0),
+                                    index: index + (rowSelection ? 1 : 0) + (expandable ? 1 : 0),
                                 });
                             }
                         });

package/dist/components/business/Signatures/components/DetailTable.d.ts

@@ -24,6 +24,7 @@ interface IProps {
     qunjSeal: any;
     /** 查看盖章页面 */
     viewSealPageFn: any;
+    showContranctNum: boolean;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/business/Signatures/components/DetailTable.js

@@ -18,7 +18,7 @@ import { Table, Button } from '../../../../index';
 // 自定义组件
 import AttachOperation from './AttachOperation';
 var DetailTable = function (_a) {
-    var needQj = _a.needQj, needQys = _a.needQys, records = _a.records, qunjSeal = _a.qunjSeal, electronicSeal = _a.electronicSealIdList, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, viewSealPageFn = _a.viewSealPageFn, contractId = _a.contractId, electronicList = _a.electronicList, sealList = _a.sealList, querySealStatus = _a.querySealStatus;
+    var needQj = _a.needQj, needQys = _a.needQys, records = _a.records, qunjSeal = _a.qunjSeal, electronicSeal = _a.electronicSealIdList, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, viewSealPageFn = _a.viewSealPageFn, contractId = _a.contractId, electronicList = _a.electronicList, sealList = _a.sealList, querySealStatus = _a.querySealStatus, showContranctNum = _a.showContranctNum;
     var authToken = token || '';
     /** 下载水印附件 */
     var downFileFn = function (_record) {
@@ -130,12 +130,12 @@ var DetailTable = function (_a) {
                             } },
                             React.createElement("div", { style: __assign({}, (!!(qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode) ? {} : { display: 'none' })) },
                                 React.createElement(Button, { type: "link", size: "small", onClick: querySealStatus }, "\u67E5\u8BE2\u7528\u5370\u72B6\u6001")),
-                            React.createElement("div", null,
+                            showContranctNum && (React.createElement("div", null,
                                 React.createElement("span", { style: {
                                         color: '#888888',
                                     } }, "\u5408\u540C\u4EFD\u6570\uFF1A"),
                                 (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.contranctNum) || '',
-                                " \u4EFD"),
+                                " \u4EFD")),
                             React.createElement("div", null,
                                 React.createElement("span", { style: {
                                         color: '#888888',

package/dist/components/business/Signatures/components/QunjSeal.js

@@ -26,11 +26,11 @@ var QunjSeal = function (_a) {
     var value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, handleRef = _a.handleRef, checked = _a.checked, form = _a.form, setQunjSeal = _a.setQunjSeal;
     useEffect(function () {
         if (value) {
-            var _value = __assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum ? {} : { contranctNum: 1 }));
+            var _value = __assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum || !showContranctNum ? {} : { contranctNum: 1 }));
             form.setFieldsValue(_value);
             setQunjSeal(_value);
         }
-    }, [value, form, setQunjSeal]);
+    }, [value, form, setQunjSeal, showContranctNum]);
     var onSealCheckboxHandle = function (values) {
         form.setFieldsValue({
             values: values,

package/dist/components/business/Signatures/index.js

@@ -107,18 +107,12 @@ var Sinatures = function (_a) {
     var _r = useState(false), loading = _r[0], setLoading = _r[1];
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
+        var _value = __assign(__assign({ isTakeOut: 0 }, (showContranctNum ? { contranctNum: 1 } : {})), { details: [] });
         if (!e.target.checked) {
-            form.setFieldsValue({
-                isTakeOut: 0,
-                contranctNum: 1,
-                details: [],
-            });
-            qunjSealChangeHandle({
-                isTakeOut: 0,
-                contranctNum: 1,
-                details: [],
-            });
+            _value.contranctNum = null;
         }
+        form.setFieldsValue(_value);
+        qunjSealChangeHandle(_value);
         setChecked(e.target.checked);
     };
     /** 查询用印状态 */
@@ -384,7 +378,7 @@ var Sinatures = function (_a) {
                     title: '保存为模版',
                     key: 'templateAttachId',
                     dataIndex: 'templateAttachId',
-                    width: 90,
+                    width: 110,
                     render: function (text, record, index) {
                         return NEED_SAVE_TEMPLATE.includes("" + flowId) ? (React.createElement(Switch, { checked: record.isCustomerReference, disabled: !isEdit, onChange: function (value) {
                                 return onSwitchChangeHandle(value, 'isCustomerReference', index);
@@ -408,12 +402,13 @@ var Sinatures = function (_a) {
             title: '电子印章',
             key: 'needQys',
             dataIndex: 'needQys',
+            width: 610,
             children: [
                 {
                     title: '盖电子印章',
                     key: 'isElectronicSeal',
                     dataIndex: 'isElectronicSeal',
-                    width: 90,
+                    width: 110,
                     render: function (text, record, index) {
                         return (React.createElement(Switch, { checked: text, disabled: !isEdit, onChange: function (value) {
                                 return onSwitchChangeHandle(value, 'isElectronicSeal', index);
@@ -424,7 +419,7 @@ var Sinatures = function (_a) {
                     title: '选择电子印章',
                     key: 'electronicSeal',
                     dataIndex: 'electronicSeal',
-                    width: '20%',
+                    width: 320,
                     render: function (value, row, index) {
                         // 是否有勾选加盖电子印章
                         var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
@@ -440,7 +435,7 @@ var Sinatures = function (_a) {
                     title: '电子印章设置',
                     key: 'setElectronicSeal',
                     dataIndex: 'setElectronicSeal',
-                    width: 150,
+                    width: 180,
                     render: function (value, row, index) {
                         var Comp = function () {
                             return records.length !== 0 ? (React.createElement("div", { style: {
@@ -695,6 +690,7 @@ var Sinatures = function (_a) {
         querySealStatus: querySealStatus,
         needQj: needQj,
         needQys: needQys,
+        showContranctNum: showContranctNum,
     };
     return (React.createElement(React.Fragment, null, isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: 'max-content' } })) : (React.createElement(DetailTable, __assign({}, detail)))));
 };

package/package.json

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