@zat-design/sisyphus-react 3.11.5-beta.4 → 3.11.5-beta.6

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -9,7 +9,7 @@ import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useCallback, useState, useRef } from 'react';
+import React, { useCallback, useState, useRef, useEffect } from 'react';
 import { useScroll } from 'ahooks';
 import { isArray } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -46,13 +46,37 @@ var ProDrawer = function ProDrawer(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     toggleLoading = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    initialSnapshot = _useState4[0],
+    setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
+  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  useEffect(function () {
+    if (visible) {
+      // 延迟到下一个事件循环，确保 Drawer 已经渲染
+      var timeoutId = setTimeout(function () {
+        if (ref.current) {
+          setInitialSnapshot(ref.current.innerHTML); // 捕获 DOM 快照
+        }
+      }, 100); // 使用 setTimeout 让 DOM 渲染完成后再执行
+      return function () {
+        return clearTimeout(timeoutId);
+      }; // 清理定时器
+    }
+  }, [visible]); // 当 visible 变化时执行
+  // 快照对比
+  var compareSnapshots = function compareSnapshots() {
+    if (!ref.current) return false;
+    return ref.current.innerHTML !== initialSnapshot;
+  };
   var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (isView || !isConfirmClose) {
+          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比不一致，则直接关闭
+          if (isView || !isConfirmClose || !compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _Modal.confirm(_objectSpread({
@@ -74,7 +98,7 @@ var ProDrawer = function ProDrawer(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [onCancel, modalRef.current]);
+  })), [onCancel, modalRef.current, ref.current]);
   var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/es/ProTable/utils/index.d.ts

@@ -30,8 +30,8 @@ export declare const isListResult: (data: {
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
 /** 移除对象中的 null , undefined, '' 的key */
-export declare const removeEmptyKeys: (obj: any) => {
-    [k: string]: unknown;
+export declare const removeEmptyKeys: (obj?: Record<string, any>) => {
+    [k: string]: any;
 };
 export declare const getPadding: (el: HTMLElement) => {
     pLeft: number;

package/es/ProTable/utils/index.js

@@ -75,6 +75,7 @@ export var getRowKey = function getRowKey(rowKey, record) {
 };
 /** 移除对象中的 null , undefined, '' 的key */
 export var removeEmptyKeys = function removeEmptyKeys(obj) {
+  if (!obj) return {};
   // 使用 Object.entries() 将对象转换为键值对数组
   var entries = Object.entries(obj);
   // 过滤掉值为 null, undefined, 或 '' 的键值对

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -49,13 +49,37 @@ var ProDrawer = function ProDrawer(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     loading = _useState2[0],
     toggleLoading = _useState2[1];
+  var _useState3 = (0, _react.useState)(''),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    initialSnapshot = _useState4[0],
+    setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
+  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  (0, _react.useEffect)(function () {
+    if (visible) {
+      // 延迟到下一个事件循环，确保 Drawer 已经渲染
+      var timeoutId = setTimeout(function () {
+        if (ref.current) {
+          setInitialSnapshot(ref.current.innerHTML); // 捕获 DOM 快照
+        }
+      }, 100); // 使用 setTimeout 让 DOM 渲染完成后再执行
+      return function () {
+        return clearTimeout(timeoutId);
+      }; // 清理定时器
+    }
+  }, [visible]); // 当 visible 变化时执行
+  // 快照对比
+  var compareSnapshots = function compareSnapshots() {
+    if (!ref.current) return false;
+    return ref.current.innerHTML !== initialSnapshot;
+  };
   var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (isView || !isConfirmClose) {
+          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比不一致，则直接关闭
+          if (isView || !isConfirmClose || !compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _antd.Modal.confirm((0, _objectSpread2.default)({
@@ -77,7 +101,7 @@ var ProDrawer = function ProDrawer(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [onCancel, modalRef.current]);
+  })), [onCancel, modalRef.current, ref.current]);
   var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {

package/lib/ProTable/utils/index.d.ts

@@ -30,8 +30,8 @@ export declare const isListResult: (data: {
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
 /** 移除对象中的 null , undefined, '' 的key */
-export declare const removeEmptyKeys: (obj: any) => {
-    [k: string]: unknown;
+export declare const removeEmptyKeys: (obj?: Record<string, any>) => {
+    [k: string]: any;
 };
 export declare const getPadding: (el: HTMLElement) => {
     pLeft: number;

package/lib/ProTable/utils/index.js

@@ -82,6 +82,7 @@ var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
 };
 /** 移除对象中的 null , undefined, '' 的key */
 var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
+  if (!obj) return {};
   // 使用 Object.entries() 将对象转换为键值对数组
   var entries = Object.entries(obj);
   // 过滤掉值为 null, undefined, 或 '' 的键值对

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.5-beta.4",
+  "version": "3.11.5-beta.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",