ztxkui 10.0.59 → 10.0.61

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

@@ -85,6 +85,7 @@ export interface IProps {
     aboutExportAddWater?: boolean;
     buttonRender?: any;
     isPhone?: boolean;
+    isNeedSeal?: boolean;
 }
 declare const PrintContainer: React.FC<IProps>;
 export default PrintContainer;

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

@@ -83,9 +83,9 @@ var EXPORT_PDF_PAGEFORMAT = [595.28, 841.89]; // [632.28, 841.89]
 var EXPORT_PDF_PAGEFORMATL = [841.89, 595.28]; // [595.28, 641.89]
 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, isSetPosition = _a.isSetPosition, // 默认不需要偏移
-    showAddSeal = _a.showAddSeal, apiUrl = _a.apiUrl, defaultAddWater = _a.defaultAddWater, fileBaseUrl = _a.fileBaseUrl, ecPrintFn = _a.ecPrintFn, ecPrintCreatePdfHandleAfter = _a.ecPrintCreatePdfHandleAfter, clickCreatePdfHandlePre = _a.clickCreatePdfHandlePre, clickCreatePdfHandleNext = _a.clickCreatePdfHandleNext, handleRef = _a.handleRef, showAboutExport = _a.showAboutExport, isAboutExportSeal = _a.isAboutExportSeal, onAboutExportBeforeCallback = _a.onAboutExportBeforeCallback, showAboutExportMessage = _a.showAboutExportMessage, onAboutExportCallback = _a.onAboutExportCallback, aboutExportZipName = _a.aboutExportZipName, aboutExportAddWater = _a.aboutExportAddWater, buttonRender = _a.buttonRender, isPhone = _a.isPhone, showWaterBtn = _a.showWaterBtn;
+    showAddSeal = _a.showAddSeal, apiUrl = _a.apiUrl, defaultAddWater = _a.defaultAddWater, fileBaseUrl = _a.fileBaseUrl, ecPrintFn = _a.ecPrintFn, ecPrintCreatePdfHandleAfter = _a.ecPrintCreatePdfHandleAfter, clickCreatePdfHandlePre = _a.clickCreatePdfHandlePre, clickCreatePdfHandleNext = _a.clickCreatePdfHandleNext, handleRef = _a.handleRef, showAboutExport = _a.showAboutExport, isAboutExportSeal = _a.isAboutExportSeal, onAboutExportBeforeCallback = _a.onAboutExportBeforeCallback, showAboutExportMessage = _a.showAboutExportMessage, onAboutExportCallback = _a.onAboutExportCallback, aboutExportZipName = _a.aboutExportZipName, aboutExportAddWater = _a.aboutExportAddWater, buttonRender = _a.buttonRender, isPhone = _a.isPhone, showWaterBtn = _a.showWaterBtn, isNeedSeal = _a.isNeedSeal;
     var printContainer = React.useContext(ZtxkContext).printContainer;
-    if (!printContainer.print) {
+    if (!(printContainer === null || printContainer === void 0 ? void 0 : printContainer.print)) {
         showHandSeal = false;
         showAutoSeal = false;
     }
@@ -111,7 +111,11 @@ var PrintContainer = function (_a) {
             console.log(err);
         }
     }, [isPhone]);
-    var _q = useGetSealList(request, { deptId: deptId, flowId: flowId }, { sealIdList: sealIdList, isFetch: showAutoSeal || showHandSeal }), loadSealPromise = _q.loadSealPromise, _sealIdList = _q._sealIdList, autoSealList = _q.autoSealList, sealFileIdList = _q.sealFileIdList, isAutoSeal = _q.isAutoSeal;
+    var _q = useGetSealList(request, { deptId: deptId, flowId: flowId }, 
+    // 这里是否发请求获取印章列表信息逻辑做下改动。
+    // 之前只要有自动盖章按钮、手动盖章按钮的时候才发送请求获取印章信息
+    // 这里多添加一个条件 如果添加盖章按钮时，也获取印章信息
+    { sealIdList: sealIdList, isFetch: showAutoSeal || showHandSeal || isNeedSeal }), loadSealPromise = _q.loadSealPromise, _sealIdList = _q._sealIdList, autoSealList = _q.autoSealList, sealFileIdList = _q.sealFileIdList, isAutoSeal = _q.isAutoSeal;
     var _r = useAddSealImg(loadSealPromise, sealFileIdList, apiUrl, onMouseDown), showSeal = _r.showSeal, onAddSeal = _r.onAddSeal, removeSealHandle = _r.removeSealHandle;
     var fontLoadHandle = useFont(showHandSeal || showAutoSeal || showAboutExport).fontLoadHandle;
     // 关联导出

package/dist/components/Table/table.js

@@ -136,12 +136,6 @@ function Table(props) {
     // 内部分页相关配置
     var _k = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _k.paginationConfig, currentPage = _k.currentPage, setCurrent = _k.setCurrent, pageSize = _k.pageSize;
     var rowSelectionDataSource = useRef({});
-    var myScroll = useMemo(function () {
-        if (scroll) {
-            return isFlex ? __assign(__assign({}, scroll), { y: scroll.y || 200 }) : scroll;
-        }
-        return isFlex ? __assign(__assign({}, _scroll), { y: 200 }) : _scroll;
-    }, [scroll, isFlex]);
     var expandableDataSource = useMemo(function () {
         var _a, _b, _c, _d;
         var data = [];
@@ -711,6 +705,19 @@ function Table(props) {
     var isVirtialInit = useRef(true);
     var _o = useState(), virtual = _o[0], setVirtual = _o[1];
     var _p = useState(), virtualY = _p[0], setVirtialY = _p[1];
+    var myScroll = useMemo(function () {
+        var myScroll = {};
+        if (scroll) {
+            myScroll = isFlex ? __assign(__assign({}, scroll), { y: scroll.y || 200 }) : scroll;
+        }
+        else {
+            myScroll = isFlex ? __assign(__assign({}, _scroll), { y: 200 }) : _scroll;
+        }
+        if (virtual) {
+            myScroll.y = myScroll.y || 200;
+        }
+        return myScroll;
+    }, [scroll, isFlex, virtual]);
     useEffect(function () {
         if (onEditableSave)
             return;

package/package.json

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