ztxkui 3.9.0 → 3.9.1

package/dist/DemoCom/PrintContainerDemo.js

@@ -101,7 +101,7 @@ var PrintContainerDemo = function () {
         // keywordList={keywordList}
         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("div", { className: "print-header set-box" },
                 React.createElement("img", { src: base64Img, alt: "" }),
                 React.createElement("h3", { className: "print-title" }, "\u63D0\u8D27\u53551"),
                 React.createElement("div", { className: "right-info" },
@@ -223,7 +223,7 @@ var PrintContainerDemo = function () {
                                 React.createElement("span", null, "\u6253\u5370\u4EBA\uFF1A"),
                                 React.createElement("span", null, "chenyx"))))))),
         React.createElement("div", { className: "html2canvas-container-page simple-print" },
-            React.createElement("div", { className: "print-header" },
+            React.createElement("div", { className: "print-header set-box" },
                 React.createElement("img", { src: base64Img, alt: "" }),
                 React.createElement("h3", { className: "print-title" }, "\u63D0\u8D27\u53552"),
                 React.createElement("div", { className: "right-info" },

package/dist/components/PrintContainer/PrintModal.js

@@ -13,13 +13,19 @@ var __assign = (this && this.__assign) || function () {
  * @author 陈亚雄
  * @description 内容边距调整
  */
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 // redux
 // ztxkui公共组件
 import { Modal, Slider } from '../../index';
+// 路由配置
+// store
+// 自定义组件
+// 其他文件
+import { setMinusPosition, reductionMinusPostion } from './handle';
 var PrintModal = function (_a) {
     var loading = _a.loading, onChange = _a.onChange, visible = _a.visible, onCancel = _a.onCancel, value = _a.value, setValue = _a.setValue;
     var _b = useState({ __html: '' }), vhtml = _b[0], setVhtml = _b[1];
+    var divDomRef = useRef(null);
     // const [topPadding, setTopPadding] = useState(0);
     // const [leftPadding, setLeftPadding] = useState(0);
     useEffect(function () {
@@ -40,17 +46,33 @@ var PrintModal = function (_a) {
     return (React.createElement(Modal, { title: "\u8FB9\u8DDD\u8C03\u6574", visible: visible, loading: false, width: "90%", onCancel: onCancel, onOk: onSure },
         React.createElement("div", null,
             "\u4E0A\u8FB9\u8DDD\uFF1A",
-            React.createElement(Slider, { min: 0, max: 200, step: 0.01, value: (value === null || value === void 0 ? void 0 : value.top) || 0, onChange: function (value) {
+            React.createElement(Slider, { min: -180, max: 200, step: 0.01, value: (value === null || value === void 0 ? void 0 : value.top) || 0, onChange: function (value) {
+                    if (value < 0) {
+                        setMinusPosition(divDomRef.current, {
+                            top: value,
+                        });
+                    }
+                    else {
+                        reductionMinusPostion(divDomRef.current, 'top');
+                    }
                     setValue(function (preValue) { return (__assign(__assign({}, (preValue || {})), { top: value })); });
                 } })),
         React.createElement("div", null,
             "\u5DE6\u8FB9\u8DDD\uFF1A",
-            React.createElement(Slider, { min: 0, max: 200, step: 0.01, value: (value === null || value === void 0 ? void 0 : value.left) || 0, onChange: function (value) {
+            React.createElement(Slider, { min: -180, max: 200, step: 0.01, value: (value === null || value === void 0 ? void 0 : value.left) || 0, onChange: function (value) {
+                    if (value < 0) {
+                        setMinusPosition(divDomRef.current, {
+                            left: value,
+                        });
+                    }
+                    else {
+                        reductionMinusPostion(divDomRef.current, 'left');
+                    }
                     setValue(function (preValue) { return (__assign(__assign({}, (preValue || {})), { left: value })); });
                 } })),
-        React.createElement("div", { className: "print-modal--container", style: {
-                paddingTop: ((value === null || value === void 0 ? void 0 : value.top) || 0) + "px",
-                paddingLeft: ((value === null || value === void 0 ? void 0 : value.left) || 0) + "px",
+        React.createElement("div", { className: "print-modal--container", ref: divDomRef, style: {
+                paddingTop: ((value === null || value === void 0 ? void 0 : value.top) < 0 ? 0 : (value === null || value === void 0 ? void 0 : value.top) || 0) + "px",
+                paddingLeft: ((value === null || value === void 0 ? void 0 : value.left) < 0 ? 0 : (value === null || value === void 0 ? void 0 : value.left) || 0) + "px",
             }, dangerouslySetInnerHTML: vhtml })));
 };
 export default PrintModal;

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

@@ -52,3 +52,7 @@ export declare function setPositionDeviation(value: any): {
     top: number;
     left: number;
 };
+export declare function setMinusPosition(dom: any, style: any): void;
+export declare function initMinusPosition(dom: any): void;
+export declare function reductionMinusPostion(dom: any, type?: any): void;
+export declare function useInitSetPostion(): void;

package/dist/components/PrintContainer/handle.js

@@ -39,6 +39,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
  * @description 一些工具方法
  */
 import jsPDF from 'jspdf';
+import { useEffect } from 'react';
 import { plus } from 'ztxkutils/dist/tools';
 /**
  * 图片转base64
@@ -282,10 +283,27 @@ export function getPositionLocal(localKey) {
  * @description 设置标签位置
  */
 export function setPositionDom(value) {
+    var _a;
     var printDom = document.querySelectorAll('.html2canvas-container-page');
     for (var i = 0; i < printDom.length; i++) {
         var item = printDom[i];
-        item.setAttribute('style', "padding-top: " + ((value === null || value === void 0 ? void 0 : value.top) || 0) + "px; padding-left: " + ((value === null || value === void 0 ? void 0 : value.left) || 0) + "px");
+        item.setAttribute('style', "padding-top: " + ((value === null || value === void 0 ? void 0 : value.top) < 0 ? 0 : (value === null || value === void 0 ? void 0 : value.top) || 0) + "px; padding-left: " + ((value === null || value === void 0 ? void 0 : value.left) < 0 ? 0 : (value === null || value === void 0 ? void 0 : value.left) || 0) + "px");
+        var childResultStyle = {};
+        var childrenDom = item.querySelectorAll('.set-box');
+        if ((value === null || value === void 0 ? void 0 : value.top) < 0) {
+            var initTop = (_a = childrenDom[0]) === null || _a === void 0 ? void 0 : _a.dataset.top;
+            console.log(initTop);
+            childResultStyle.top = value === null || value === void 0 ? void 0 : value.top;
+        }
+        if ((value === null || value === void 0 ? void 0 : value.left) < 0) {
+            childResultStyle.left = value === null || value === void 0 ? void 0 : value.left;
+        }
+        if (childResultStyle.top || childResultStyle.left) {
+            setMinusPosition(item, childResultStyle);
+        }
+        else {
+            reductionMinusPostion(item);
+        }
     }
 }
 /**
@@ -294,7 +312,81 @@ export function setPositionDom(value) {
  */
 export function setPositionDeviation(value) {
     return {
-        top: plus((value === null || value === void 0 ? void 0 : value.top) || 0, 25.03),
-        left: plus((value === null || value === void 0 ? void 0 : value.left) || 0, 39.39),
+        top: (value === null || value === void 0 ? void 0 : value.top) < 0 ? 0 : plus((value === null || value === void 0 ? void 0 : value.top) || 0, 25.03),
+        left: (value === null || value === void 0 ? void 0 : value.left) < 0 ? 0 : plus((value === null || value === void 0 ? void 0 : value.left) || 0, 39.39),
     };
 }
+export function setMinusPosition(dom, style) {
+    var _a, _b;
+    try {
+        var childrenDom = dom.querySelectorAll('.set-box');
+        if (childrenDom) {
+            var top_1 = childrenDom[0].dataset.top
+                ? parseInt(childrenDom[0].dataset.top)
+                : 0;
+            var left = childrenDom[0].dataset.left
+                ? parseInt(childrenDom[0].dataset.left)
+                : 0;
+            var resultTop = top_1;
+            var resultLeft = left;
+            if (style.top) {
+                resultTop += style.top;
+            }
+            if (style.left) {
+                resultLeft += style.left;
+            }
+            (_b = (_a = childrenDom[0]) === null || _a === void 0 ? void 0 : _a.setAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'style', "top: " + resultTop + "px; left: " + resultLeft + "px");
+        }
+    }
+    catch (err) {
+        console.log(err);
+    }
+}
+export function initMinusPosition(dom) {
+    try {
+        var childrenDom = dom.querySelectorAll('.set-box');
+        if (childrenDom && childrenDom[0]) {
+            var style = getComputedStyle(childrenDom[0]) || {};
+            if (!childrenDom[0].dataset.top) {
+                var initTop = style.top || 0;
+                childrenDom[0].dataset.top = initTop;
+            }
+            if (!childrenDom[0].dataset.left) {
+                var initLeft = style.left || 0;
+                childrenDom[0].dataset.left = initLeft;
+            }
+        }
+    }
+    catch (err) {
+        console.log(err);
+    }
+}
+export function reductionMinusPostion(dom, type) {
+    var _a, _b, _c, _d, _e, _f;
+    try {
+        var childrenDom = dom.querySelectorAll('.set-box');
+        if (childrenDom) {
+            if (type === 'top') {
+                (_b = (_a = childrenDom[0]) === null || _a === void 0 ? void 0 : _a.setAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'style', "top: " + childrenDom[0].dataset.top + "; ");
+            }
+            else if (type === 'left') {
+                (_d = (_c = childrenDom[0]) === null || _c === void 0 ? void 0 : _c.setAttribute) === null || _d === void 0 ? void 0 : _d.call(_c, 'style', "left: " + childrenDom[0].dataset.left + "; ");
+            }
+            else {
+                (_f = (_e = childrenDom[0]) === null || _e === void 0 ? void 0 : _e.setAttribute) === null || _f === void 0 ? void 0 : _f.call(_e, 'style', "top: " + childrenDom[0].dataset.top + "; left: " + childrenDom[0].dataset.left);
+            }
+        }
+    }
+    catch (err) {
+        console.log(err);
+    }
+}
+export function useInitSetPostion() {
+    useEffect(function () {
+        var printDom = document.querySelectorAll('.html2canvas-container-page');
+        for (var i = 0; i < printDom.length; i++) {
+            var item = printDom[i];
+            initMinusPosition(item);
+        }
+    }, []);
+}

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

@@ -65,7 +65,7 @@ import PrintModal from './PrintModal';
 // 其他文件
 import { printCurrentDom, htmlToPdfNoCanvas, htmlToPdf, addWaterHandle, removeWaterHandle, } from 'ztxkutils/dist/print';
 import { createDownloadUrlNoBase, createDownloadUrl, } from 'ztxkutils/dist/fileOperation';
-import { dataURLtoFile, setPositionLocal, getPositionLocal, setPositionDom, setPositionDeviation, } from './handle';
+import { dataURLtoFile, setPositionLocal, getPositionLocal, setPositionDom, setPositionDeviation, useInitSetPostion, } from './handle';
 import { createTask } from './lodop';
 import { useNeedLodop } from './utils';
 var fontTTF = {
@@ -117,6 +117,7 @@ var PrintContainer = function (_a) {
         left: 0,
     }), value = _v[0], setValue = _v[1];
     useNeedLodop();
+    useInitSetPostion();
     useEffect(function () {
         var v = getPositionLocal(localKey);
         setValue(v);

package/package.json

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