zmdms-webui 0.0.145 → 0.0.147

package/dist/es/applayout/index.css

@@ -1 +1 @@
-.zmdms-container{background-color:#e9ecf3}.zmdms-container .zmdms-sider{background-color:#5b76f6;background-repeat:no-repeat;background-size:100% auto;background-size:cover;z-index:102}.zmdms-container .zmdms-content{background-color:#e9ecf3}.zmdms-container .zmdms-content--header{align-items:center;background:#fff;display:flex;height:48px;justify-content:space-between;line-height:48px;padding:0 0 0 10px}.zmdms-container .zmdms-content--header .ant-tabs{flex:1;margin-top:8px;width:calc(100% - 350px)}.zmdms-container .zmdms-content--header .ant-tabs .ant-tabs-tab a{color:#768696;display:inline-block;padding:0 5px 0 10px}.zmdms-container .zmdms-content--header .ant-tabs .ant-tabs-nav{margin-bottom:0}.zmdms-container .zmdms-content--content{height:calc(100vh - 48px);position:relative}.zmdms-container .zmdms-content--header-info{color:#000000a6;display:flex;height:48px;max-width:350px}.zmdms-container .zmdms-content--header-info .full-screen{cursor:pointer;text-align:center;width:36px}.zmdms-container .zmdms-content--header-info .user-operation{align-items:center;cursor:pointer;display:flex;padding:0 12px}.zmdms-container .zmdms-content--header-info .user-operation:hover{background-color:#f7f7f7}.zmdms-container .zmdms-content--header-info .user-operation>span:last-child{color:#000000a6;display:inline-block;margin-left:8px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:70px}.zmdms-menu{display:flex;flex-direction:column;height:100vh}.zmdms-menu .zmdms-logo{align-items:center;display:block;display:flex;height:48px;padding:9px 0 5px}.zmdms-menu .zmdms-logo>img{display:block;margin:0 auto;width:78px}.zmdms-menu .zmdms-menu--main{background:#0000;border-right:none;flex:1;overflow-x:hidden;overflow-y:auto}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu,.zmdms-menu .zmdms-menu--main>.ant-menu-submenu.ant-menu-submenu-open>.ant-menu-submenu-title{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title{align-items:center;background-color:#5b76f5;color:#ffffffa6;display:flex;font-size:13px;height:36px;line-height:36px;margin:0;padding:0}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title .ant-menu-submenu-arrow{color:#ffffffa6;right:6px}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title .ant-menu-title-content{flex:none;width:88%}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title:hover,.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub.ant-menu-inline{background:#0000}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item{align-items:center;color:#ffffffa6;display:flex;font-size:13px;height:36px;line-height:36px;margin:0}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item a{color:inherit}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item:active{background:#0000}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item:hover{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item:not(:last-child){margin-bottom:0}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item.ant-menu-item-selected{background:#5b76f5;color:#fff;width:100%}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item.ant-menu-item-selected:after{border-right:none}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar{height:4px;width:6px}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar-track{background:#fff0;border-radius:4px}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar-thumb{background:#5b76f6;border-radius:4px}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar-thumb:hover{background:#5b76f6}.zmdms-menu .zmdms-menu--main>.ant-menu-item{align-items:center;color:#ffffffa6;display:flex;font-size:13px;height:36px;line-height:36px;margin:0}.zmdms-menu .zmdms-menu--main>.ant-menu-item a{color:inherit}.zmdms-menu .zmdms-menu--main>.ant-menu-item:active{background:#0000}.zmdms-menu .zmdms-menu--main>.ant-menu-item:hover{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-item:not(:last-child){margin-bottom:0}.zmdms-menu .zmdms-menu--main>.ant-menu-item.ant-menu-item-selected{background:#5b76f6;color:#fff;width:100%}.zmdms-menu .zmdms-menu--main>.ant-menu-item.ant-menu-item-selected:after{border-right:none}.zmdms-menu--sub{padding:0}.zmdms-menu--sub .ant-drawer-content{background:#0000;background-position:100%;background-repeat:no-repeat;background-size:cover;overflow:hidden}.zmdms-menu--sub .ant-drawer-content .ant-menu{background:#0000;color:#fff}.zmdms-menu--sub.ant-drawer-left>.ant-drawer-content-wrapper{left:-1px}.zmdms-menu--sub .ant-drawer-header{border-bottom:none;padding:0}.zmdms-menu--sub .ant-drawer-header .ant-drawer-header-title{align-items:center;color:#fff;display:flex;height:48px;justify-content:center}.zmdms-menu--sub .ant-drawer-header .ant-drawer-header-title .ant-drawer-title{align-items:center;color:#fff;display:flex;font-size:14px;justify-content:center}.zmdms-menu--sub .ant-drawer-header .ant-drawer-header-title .ant-drawer-title img{width:118px}.zmdms-menu--sub .ant-drawer-body{-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);background:#5b76f566;font-size:13px;overflow-x:hidden;padding:0}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar{height:4px;width:6px}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar-track{background:#fff0;border-radius:4px}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar-thumb{background:#5b76f6;border-radius:4px}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar-thumb:hover{background:#5b76f6}.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu.ant-menu-submenu-inline{border-bottom:1px solid #8d9eff47;padding-bottom:0}.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline{background:#0000;padding:0 10px}.zmdms-menu--sub .ant-drawer-body .ant-menu-item,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item{align-items:center;border-radius:4px;color:#fff;display:flex;font-size:13px;height:30px;line-height:30px;margin:0}.zmdms-menu--sub .ant-drawer-body .ant-menu-item:not(:last-child),.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item:not(:last-child){margin-bottom:0}.zmdms-menu--sub .ant-drawer-body .ant-menu-item a,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item a{color:#fff}.zmdms-menu--sub .ant-drawer-body .ant-menu-item:active,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item:active{background:#0000}.zmdms-menu--sub .ant-drawer-body .ant-menu-item:last-child,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item:last-child{margin-bottom:10px}.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title{color:#fff;font-size:13px;font-weight:700;height:30px;line-height:30px}.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title .ant-menu-submenu-arrow,.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title:hover,.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title .ant-menu-submenu-arrow,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title:hover,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title:hover .ant-menu-submenu-arrow{color:#fff}.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title:active,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title:active{background:#0000}.zmdms-menu--sub .ant-drawer-body .ant-menu-item-selected{background-color:#5b76f5!important;color:#fff}.zmdms-menu--sub .ant-drawer-body .ant-menu-item-selected:after{border-right:none}.zmdms-menu--sub .ant-drawer-footer{align-items:center;-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);background:#5b76f566;border-top:1px solid #5670ea;display:flex;height:40px;justify-content:center;line-height:40px;padding:3px 10px}.zmdms-menu--sub .ant-drawer-footer .zt-btn-link{color:#fff}.logout-spin{background-color:#ffffffb3;bottom:0;left:0;padding-top:100px;position:fixed;right:0;top:0;z-index:1000}
+.zmdms-container{background-color:#e9ecf3}.zmdms-container .zmdms-sider{background-color:#5b76f6;background-repeat:no-repeat;background-size:100% auto;background-size:cover;z-index:102}.zmdms-container .zmdms-content{background-color:#e9ecf3}.zmdms-container .zmdms-content--header{align-items:center;background:#fff;display:flex;height:48px;justify-content:space-between;line-height:48px;padding:0 0 0 10px}.zmdms-container .zmdms-content--header .ant-tabs{flex:1;margin-top:8px;width:calc(100% - 350px)}.zmdms-container .zmdms-content--header .ant-tabs .ant-tabs-tab a{color:#768696;display:inline-block;padding:0 5px 0 10px}.zmdms-container .zmdms-content--header .ant-tabs .ant-tabs-nav{margin-bottom:0}.zmdms-container .zmdms-content--content{height:calc(100vh - 48px);position:relative}.zmdms-container .zmdms-content--header-info{color:#000000a6;display:flex;height:48px;max-width:350px}.zmdms-container .zmdms-content--header-info .full-screen{cursor:pointer;text-align:center;width:36px}.zmdms-container .zmdms-content--header-info .user-operation{align-items:center;cursor:pointer;display:flex;padding:0 12px}.zmdms-container .zmdms-content--header-info .user-operation:hover{background-color:#f7f7f7}.zmdms-container .zmdms-content--header-info .user-operation>span:last-child{color:#000000a6;display:inline-block;margin-left:8px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:70px}.zmdms-menu{display:flex;flex-direction:column;height:100vh}.zmdms-menu .zmdms-logo{align-items:center;display:block;display:flex;height:48px;padding:9px 0 5px}.zmdms-menu .zmdms-logo>img{display:block;margin:0 auto;width:78px}.zmdms-menu .zmdms-menu--main{background:#0000;border-right:none;flex:1;overflow-x:hidden;overflow-y:auto}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu,.zmdms-menu .zmdms-menu--main>.ant-menu-submenu.ant-menu-submenu-open>.ant-menu-submenu-title{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title{align-items:center;background-color:#5b76f5;color:#ffffffa6;display:flex;font-size:13px;height:36px;line-height:36px;margin:0;padding:0}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title .ant-menu-submenu-arrow{color:#ffffffa6;right:6px}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title .ant-menu-title-content{flex:none;width:88%}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title:hover,.zmdms-menu .zmdms-menu--main>.ant-menu-submenu>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub.ant-menu-inline{background:#0000}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item{align-items:center;color:#ffffffa6;display:flex;font-size:13px;height:36px;line-height:36px;margin:0}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item a{color:inherit}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item:active{background:#0000}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item:hover{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item:not(:last-child){margin-bottom:0}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item.ant-menu-item-selected{background:#5b76f5;color:#fff;width:100%}.zmdms-menu .zmdms-menu--main>.ant-menu-submenu .ant-menu-sub>.ant-menu-item.ant-menu-item-selected:after{border-right:none}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar{height:4px;width:6px}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar-track{background:#fff0;border-radius:4px}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar-thumb{background:#5b76f6;border-radius:4px}.zmdms-menu .zmdms-menu--main::-webkit-scrollbar-thumb:hover{background:#5b76f6}.zmdms-menu .zmdms-menu--main>.ant-menu-item{align-items:center;color:#ffffffa6;display:flex;font-size:13px;height:36px;line-height:36px;margin:0}.zmdms-menu .zmdms-menu--main>.ant-menu-item a{color:inherit}.zmdms-menu .zmdms-menu--main>.ant-menu-item:active{background:#0000}.zmdms-menu .zmdms-menu--main>.ant-menu-item:hover{color:#fff}.zmdms-menu .zmdms-menu--main>.ant-menu-item:not(:last-child){margin-bottom:0}.zmdms-menu .zmdms-menu--main>.ant-menu-item.ant-menu-item-selected{background:#5b76f6;color:#fff;width:100%}.zmdms-menu .zmdms-menu--main>.ant-menu-item.ant-menu-item-selected:after{border-right:none}.zmdms-menu--sub{padding:0}.zmdms-menu--sub .ant-drawer-content{background:#0000;background-position:100%;background-repeat:no-repeat;background-size:cover;overflow:hidden}.zmdms-menu--sub .ant-drawer-content .ant-menu{background:#0000;color:#fff}.zmdms-menu--sub.ant-drawer-left>.ant-drawer-content-wrapper{left:-1px}.zmdms-menu--sub .ant-drawer-header{background:#0000;border-bottom:none;padding:0}.zmdms-menu--sub .ant-drawer-header .ant-drawer-header-title{align-items:center;color:#fff;display:flex;height:48px;justify-content:center}.zmdms-menu--sub .ant-drawer-header .ant-drawer-header-title .ant-drawer-title{align-items:center;color:#fff;display:flex;font-size:14px;justify-content:center}.zmdms-menu--sub .ant-drawer-header .ant-drawer-header-title .ant-drawer-title img{width:118px}.zmdms-menu--sub .ant-drawer-body{-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);background:#5b76f566;font-size:13px;overflow-x:hidden;padding:0}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar{height:4px;width:6px}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar-track{background:#fff0;border-radius:4px}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar-thumb{background:#5b76f6;border-radius:4px}.zmdms-menu--sub .ant-drawer-body::-webkit-scrollbar-thumb:hover{background:#5b76f6}.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu.ant-menu-submenu-inline{border-bottom:1px solid #8d9eff47;padding-bottom:0}.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline{background:#0000;padding:0 10px}.zmdms-menu--sub .ant-drawer-body .ant-menu-item,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item{align-items:center;border-radius:4px;color:#fff;display:flex;font-size:13px;height:30px;line-height:30px;margin:0}.zmdms-menu--sub .ant-drawer-body .ant-menu-item:not(:last-child),.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item:not(:last-child){margin-bottom:0}.zmdms-menu--sub .ant-drawer-body .ant-menu-item a,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item a{color:#fff}.zmdms-menu--sub .ant-drawer-body .ant-menu-item:active,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item:active{background:#0000}.zmdms-menu--sub .ant-drawer-body .ant-menu-item:last-child,.zmdms-menu--sub .ant-drawer-body .ant-menu-sub.ant-menu-inline>.ant-menu-item:last-child{margin-bottom:10px}.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title{color:#fff;font-size:13px;font-weight:700;height:30px;line-height:30px}.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title .ant-menu-submenu-arrow,.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title:hover,.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title .ant-menu-submenu-arrow,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title:hover,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title:hover .ant-menu-submenu-arrow{color:#fff}.zmdms-menu--sub .ant-drawer-body .ant-menu-inline>.ant-menu-submenu>.ant-menu-submenu-title:active,.zmdms-menu--sub .ant-drawer-body .ant-menu-submenu-title:active{background:#0000}.zmdms-menu--sub .ant-drawer-body .ant-menu-item-selected{background-color:#5b76f5!important;color:#fff}.zmdms-menu--sub .ant-drawer-body .ant-menu-item-selected:after{border-right:none}.zmdms-menu--sub .ant-drawer-footer{align-items:center;-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);background:#5b76f566;border-top:1px solid #5670ea;display:flex;height:40px;justify-content:center;line-height:40px;padding:3px 10px}.zmdms-menu--sub .ant-drawer-footer .zt-btn-link{color:#fff}.logout-spin{background-color:#ffffffb3;bottom:0;left:0;padding-top:100px;position:fixed;right:0;top:0;z-index:1000}

package/dist/es/print/components/ExportPdfBtn.js

@@ -1,41 +1,40 @@
 import { __awaiter, __generator, __assign } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { memo, useCallback } from 'react';
-import { htmlToPdf } from '../utils.js';
+import { htmlToPdf } from 'zmdms-utils';
 import ButtonCom from '../../button/button.js';
 
 var ExportPdfBtn = function (_a) {
-    var config = _a.config, waterRef = _a.waterRef, setSpinning = _a.setSpinning, clickExportHandle = _a.clickExportHandle, beforeExportHandle = _a.beforeExportHandle, afterExportHandle = _a.afterExportHandle;
+    var config = _a.config, getWaterVisibleFn = _a.getWaterVisibleFn, setSpinning = _a.setSpinning, clickExportHandle = _a.clickExportHandle, beforeExportHandle = _a.beforeExportHandle, afterExportHandle = _a.afterExportHandle;
     var onExport = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var isWater, res, err_1;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var currentIsWater, isWater, err_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     setSpinning && setSpinning(true);
-                    _b.label = 1;
+                    _a.label = 1;
                 case 1:
-                    _b.trys.push([1, 5, , 6]);
+                    _a.trys.push([1, 5, , 6]);
                     if (!clickExportHandle) return [3 /*break*/, 3];
                     return [4 /*yield*/, clickExportHandle()];
                 case 2:
-                    _b.sent();
-                    _b.label = 3;
+                    _a.sent();
+                    _a.label = 3;
                 case 3:
                     beforeExportHandle && beforeExportHandle();
-                    isWater = ((_a = waterRef.current) === null || _a === void 0 ? void 0 : _a.getIsWater()) || true;
+                    currentIsWater = getWaterVisibleFn();
+                    isWater = currentIsWater == null ? true : currentIsWater;
                     return [4 /*yield*/, htmlToPdf({
                             pageDom: ".ztxk-print--page",
                             waterConfig: isWater ? config : undefined,
                             isDownload: true,
                         })];
                 case 4:
-                    res = _b.sent();
-                    console.log(res);
+                    _a.sent();
                     setSpinning && setSpinning(false);
                     return [3 /*break*/, 6];
                 case 5:
-                    err_1 = _b.sent();
+                    err_1 = _a.sent();
                     setSpinning && setSpinning(false);
                     console.log("导出执行出错", err_1);
                     return [3 /*break*/, 6];
@@ -45,7 +44,7 @@ var ExportPdfBtn = function (_a) {
             }
         });
     }); }, [
-        waterRef,
+        getWaterVisibleFn,
         config,
         setSpinning,
         clickExportHandle,

package/dist/es/print/components/WaterBtn.js

@@ -1,26 +1,12 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { memo, forwardRef, useImperativeHandle } from 'react';
-import useToggleWater from '../useToggleWater.js';
-import { useMount } from 'ahooks';
+import { memo } from 'react';
 import ButtonCom from '../../button/button.js';
 
-var WaterBtn = function (_a, ref) {
-    var config = _a.config;
-    // 水印相关方法
-    var _b = useToggleWater(config), toggleWater = _b.toggleWater, isWater = _b.isWater;
-    useMount(function () {
-        toggleWater();
-    });
-    useImperativeHandle(ref, function () {
-        return {
-            getIsWater: function () {
-                return isWater;
-            },
-        };
-    });
-    return (jsx(ButtonCom, __assign({ type: "primary", className: "ph__item", onClick: toggleWater }, { children: isWater ? "移除水印" : "添加水印" })));
+var WaterBtn = function (_a) {
+    var setWaterVisible = _a.setWaterVisible, waterVisible = _a.waterVisible;
+    return (jsx(ButtonCom, __assign({ type: "primary", className: "ph__item", onClick: function () { return setWaterVisible === null || setWaterVisible === void 0 ? void 0 : setWaterVisible(!waterVisible); } }, { children: waterVisible ? "移除水印" : "添加水印" })));
 };
-var WaterBtn$1 = memo(forwardRef(WaterBtn));
+var WaterBtn$1 = memo(WaterBtn);
 
 export { WaterBtn$1 as default };

package/dist/es/print/index.css

@@ -1 +1 @@
-.ztxk-print .ztxk-print--header{background-color:#fff;padding:10px;position:sticky;top:0;z-index:100}.ztxk-print .ztxk-print--header .ph__item,.ztxk-print .ztxk-print--header button{margin-left:10px}.ztxk-print .ztxk-print--header .ph__item:first-child,.ztxk-print .ztxk-print--header button:first-child{margin-left:0}.ztxk-print .ztxk-print--content{font-family:microsoft-yahei;min-height:500px;width:100%}.ztxk-print .ztxk-print--content .ztxk-print--main{margin:auto;width:1000px}.ztxk-print .ztxk-print--page-break__before{display:block;page-break-before:always}.ztxk-print .ztxk-print--page__pagination{margin:10px 0;text-align:center}.ztxk-print .ztxk-print--page-break__after{display:block;page-break-after:always}@media print{.non-printable{display:none}.non-printable,body *{visibility:hidden}.ztxk-print--content,.ztxk-print--content *{visibility:visible}footer.ztxk-print--page__pagination{bottom:0;position:fixed;width:100%}}
+.ztxk-print .ztxk-print--header{background-color:#fff;padding:10px;position:sticky;top:0;z-index:100}.ztxk-print .ztxk-print--header .ph__item,.ztxk-print .ztxk-print--header button{margin-left:10px}.ztxk-print .ztxk-print--header .ph__item:first-child,.ztxk-print .ztxk-print--header button:first-child{margin-left:0}.ztxk-print .ztxk-print--content{font-family:microsoft-yahei;min-height:500px;width:100%}.ztxk-print .ztxk-print--content .ztxk-print--main{margin:auto;width:1000px}.ztxk-print .ztxk-print--content .ztxk-print--main .ztxk-print--page{min-height:200px}.ztxk-print .ztxk-print--page-break__before{display:block;page-break-before:always}.ztxk-print .ztxk-print--page__pagination{margin:10px 0;text-align:center}.ztxk-print .ztxk-print--page-break__after{display:block;page-break-after:always}.ztxk-print .ztxk-print--page-break__after:last-child{display:none;page-break-after:auto}@media print{.non-printable{display:none}.non-printable,body *{visibility:hidden}.ztxk-print--content,.ztxk-print--content *{visibility:visible}footer.ztxk-print--page__pagination{bottom:0;position:fixed;width:100%}}

package/dist/es/print/interface.d.ts

@@ -18,6 +18,7 @@ interface IPrintProps {
     afterExportHandle?: () => void;
     /** 是否显示添加水印按钮 */
     isWaterBtn?: boolean;
+    defaultWaterVisible?: boolean;
     /** 水印相关配置 */
     waterConfig?: IWaterConfig;
     /** 是否显示导出pdf按钮 */

package/dist/es/print/print-header.js

@@ -1,26 +1,28 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { memo, useRef } from 'react';
+import { memo } from 'react';
 import classNames from '../node_modules/classnames/index.js';
 import { NON_PRINTABLE } from './print.js';
 import useCreateWater from './useCreateWater.js';
 import WaterBtn from './components/WaterBtn.js';
 import PrintBtn from './components/PrintBtn.js';
 import ExportPdfBtn from './components/ExportPdfBtn.js';
+import { useMemoizedFn } from 'ahooks';
 import ButtonCom from '../button/button.js';
 
 var PrintHeader = function (props) {
     var _a;
-    var isPrintBtn = props.isPrintBtn, clickPrintHandle = props.clickPrintHandle, beforePrintHandle = props.beforePrintHandle, afterPrintHandle = props.afterPrintHandle, isWaterBtn = props.isWaterBtn, waterConfig = props.waterConfig, isExportPdfBtn = props.isExportPdfBtn, clickExportHandle = props.clickExportHandle, beforeExportHandle = props.beforeExportHandle, afterExportHandle = props.afterExportHandle, headerClassName = props.headerClassName, setSpinning = props.setSpinning;
+    var isPrintBtn = props.isPrintBtn, clickPrintHandle = props.clickPrintHandle, beforePrintHandle = props.beforePrintHandle, afterPrintHandle = props.afterPrintHandle, waterVisible = props.waterVisible, setWaterVisible = props.setWaterVisible, isWaterBtn = props.isWaterBtn, waterConfig = props.waterConfig, isExportPdfBtn = props.isExportPdfBtn, clickExportHandle = props.clickExportHandle, beforeExportHandle = props.beforeExportHandle, afterExportHandle = props.afterExportHandle, headerClassName = props.headerClassName, setSpinning = props.setSpinning;
     // 主容器类名
     var classes = classNames("ztxk-print--header", headerClassName, (_a = {},
         _a[NON_PRINTABLE] = true,
         _a));
     // 生成水印图片
     var config = useCreateWater(waterConfig).config;
-    // 水印相关逻辑获取
-    var waterRef = useRef();
-    return (jsxs("div", __assign({ className: classes }, { children: [isWaterBtn && jsx(WaterBtn, { config: config, ref: waterRef }), isPrintBtn && (jsx(PrintBtn, { clickPrintHandle: clickPrintHandle, beforePrintHandle: beforePrintHandle, afterPrintHandle: afterPrintHandle })), isExportPdfBtn && (jsx(ExportPdfBtn, { config: config, waterRef: waterRef, setSpinning: setSpinning, clickExportHandle: clickExportHandle, beforeExportHandle: beforeExportHandle, afterExportHandle: afterExportHandle })), jsx(ButtonCom, __assign({ type: "primary", className: "ph__item", onClick: function () {
+    var getWaterVisibleFn = useMemoizedFn(function () {
+        return waterVisible;
+    });
+    return (jsxs("div", __assign({ className: classes }, { children: [isWaterBtn && (jsx(WaterBtn, { waterVisible: waterVisible, setWaterVisible: setWaterVisible })), isPrintBtn && (jsx(PrintBtn, { clickPrintHandle: clickPrintHandle, beforePrintHandle: beforePrintHandle, afterPrintHandle: afterPrintHandle })), isExportPdfBtn && (jsx(ExportPdfBtn, { config: config, getWaterVisibleFn: getWaterVisibleFn, setSpinning: setSpinning, clickExportHandle: clickExportHandle, beforeExportHandle: beforeExportHandle, afterExportHandle: afterExportHandle })), jsx(ButtonCom, __assign({ type: "primary", className: "ph__item", onClick: function () {
                     window.close();
                 } }, { children: "\u5173\u95ED" }))] })));
 };

package/dist/es/print/print.js

@@ -9,7 +9,8 @@ import { Spin } from 'antd';
 
 var NON_PRINTABLE = "non-printable";
 var Print = function (props, ref) {
-    var className = props.className, children = props.children, _a = props.spinning, outSpinning = _a === void 0 ? false : _a, headerProps = __rest(props, ["className", "children", "spinning"]);
+    var className = props.className, children = props.children, _a = props.spinning, outSpinning = _a === void 0 ? false : _a, _b = props.defaultWaterVisible, defaultWaterVisible = _b === void 0 ? true : _b, headerProps = __rest(props, ["className", "children", "spinning", "defaultWaterVisible"]);
+    var _c = useState(defaultWaterVisible), waterVisible = _c[0], setWaterVisible = _c[1];
     // 设置默认值
     // if (headerProps.isWaterBtn == null) {
     //   headerProps.isWaterBtn = true;
@@ -25,8 +26,8 @@ var Print = function (props, ref) {
     var classes = classNames("ztxk-print", className, {
         "ztxk-print--water": headerProps.isWaterBtn,
     });
-    var _b = useState(false), spinning = _b[0], setSpinning = _b[1];
-    return (jsx(Spin, __assign({ spinning: spinning || outSpinning }, { children: jsxs("div", __assign({ className: classes }, { children: [jsx(PrintHeader, __assign({ setSpinning: setSpinning }, headerProps)), jsx(WatermarkCom, __assign({ className: "ztxk-print--content" }, waterConfig, { children: jsx("div", __assign({ className: "ztxk-print--main" }, { children: children })) }))] })) })));
+    var _d = useState(false), spinning = _d[0], setSpinning = _d[1];
+    return (jsx(Spin, __assign({ spinning: spinning || outSpinning }, { children: jsxs("div", __assign({ className: classes }, { children: [jsx(PrintHeader, __assign({ setSpinning: setSpinning, waterVisible: waterVisible, setWaterVisible: setWaterVisible }, headerProps)), jsx(WatermarkCom, __assign({ className: "ztxk-print--content", visible: waterVisible }, waterConfig, { children: jsx("div", __assign({ className: "ztxk-print--main" }, { children: children })) }))] })) })));
 };
 var PrintCom = memo(forwardRef(Print));
 PrintCom.displayName = "ZTXK_WEBUI_Print";

package/dist/es/select/hooks.js

@@ -84,9 +84,15 @@ function useRenderChildren(props) {
                             disabledValues.includes(value)) {
                             disabled = true;
                         }
+                        console.log(title);
+                        var resultTitle = Array.isArray(joinTitle)
+                            ? joinTitle === null || joinTitle === void 0 ? void 0 : joinTitle.join(joinStr)
+                            : "";
                         return (jsxs(MemoSelect.Option
                         // key={`${key}${index}`}
-                        , __assign({ value: value, title: title, disabled: disabled }, { children: [Array.isArray(joinTitle) ? joinTitle === null || joinTitle === void 0 ? void 0 : joinTitle.join(joinStr) : "", Array.isArray(linefeedTitle) && linefeedTitle.length > 0 ? (jsx("div", __assign({ className: "ztxk-select--feed-item" }, { children: linefeedTitle === null || linefeedTitle === void 0 ? void 0 : linefeedTitle.join(lineFeedStr) }))) : ("")] }), key));
+                        , __assign({ value: value, 
+                            // 原本传入需要显示的title
+                            oldTitle: title, title: resultTitle, disabled: disabled }, { children: [resultTitle, Array.isArray(linefeedTitle) && linefeedTitle.length > 0 ? (jsx("div", __assign({ className: "ztxk-select--feed-item" }, { children: linefeedTitle === null || linefeedTitle === void 0 ? void 0 : linefeedTitle.join(lineFeedStr) }))) : ("")] }), key));
                     })] }));
         }
         return null;

package/dist/es/select/select.js

@@ -115,7 +115,9 @@ var Select = function (props, ref) {
         var text = textContent(option === null || option === void 0 ? void 0 : option.children);
         return (text === null || text === void 0 ? void 0 : text.toLowerCase().indexOf(input.toLowerCase().trim())) >= 0;
     };
-    return (jsx(Select$1, __assign({ defaultValue: showAll ? "" : undefined, showArrow: true, allowClear: true, dropdownMatchSelectWidth: dropdownMatchSelectWidth, onChange: onChangeHandle, showSearch: true, onSearch: onDebounceSearchHandle, filterOption: isRemoteSearch ? false : filterOptionHandle, dropdownRender: dropdownRender
+    return (jsx(Select$1, __assign({ defaultValue: showAll ? "" : undefined, showArrow: true, allowClear: true, dropdownMatchSelectWidth: dropdownMatchSelectWidth, onChange: onChangeHandle, showSearch: true, onSearch: onDebounceSearchHandle, filterOption: isRemoteSearch ? false : filterOptionHandle, 
+        // 显示问题
+        optionLabelProp: list ? "oldTitle" : undefined, dropdownRender: dropdownRender
             ? dropdownRender
             : dropdownButton
                 ? dropdownButtonHandle

package/dist/es/watermark/index.css

@@ -0,0 +1 @@
+.ztxk-watermark.ztxk-watermark--hidden>.ztxk-watermark--div{display:none}

package/dist/es/watermark/watermark.js

@@ -17,13 +17,15 @@ var reRendering = function (mutation, isWatermarkEle) {
 };
 // TODO: 通过方法设置水印隐藏 （有没有必要做）
 var Watermark = function (props) {
-    var children = props.children, className = props.className; props.visible; var waterConfigProps = __rest(props, ["children", "className", "visible"]);
+    var children = props.children, className = props.className, _a = props.visible, visible = _a === void 0 ? true : _a, waterConfigProps = __rest(props, ["children", "className", "visible"]);
     // 主容器类名
-    var classes = classNames("ztxk-watermark", className, {});
+    var classes = classNames("ztxk-watermark", className, {
+        "ztxk-watermark--hidden": !visible,
+    });
     var waterDomRef = useRef();
     var waterDomChildHandleRef = useRef();
     useMutationObserver(function (mutationsList) {
-        console.log("触发父级");
+        console.log("触发父级", mutationsList);
         mutationsList.forEach(function (mutation) {
             if (reRendering(mutation, function (node) {
                 return node === waterDomChildHandleRef.current.getWaterDomRef();