From 98e3a4a34c3e07172986e939573305fa501765e4 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Tue, 1 Apr 2025 20:36:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20modalLoading/drawerLoading=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=B0=83=E7=94=A8=E5=86=85=E9=83=A8=E7=9A=84lock/unlo?=
 =?UTF-8?q?ck=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                           |  1 +
 .../@core/ui-kit/popup-ui/src/drawer/drawer-api.ts     | 10 +++++-----
 packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts  | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 165a1b8b..ea542506 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - 文件上传/图片上传**不再支持**url用法 强制使用ossId
 - TableSwitch组件重构
 - 管理员租户切换不再返回首页 直接刷新当前页(除特殊页面外会回到首页)
+- modalLoading/drawerLoading改为调用内部的lock/unlock方法
 
 **BUG FIX**
 
diff --git a/packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts b/packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts
index 996730ea..a40f8ba4 100644
--- a/packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts
+++ b/packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts
@@ -101,12 +101,12 @@ export class DrawerApi {
     }
   }
 
+  /**
+   * 为了兼容之前的代码 >=1.3.0调整为调用内部的lock/unlock方法
+   * @param loading 是否loading
+   */
   drawerLoading(loading: boolean) {
-    this.store.setState((prev) => ({
-      ...prev,
-      confirmLoading: loading,
-      loading,
-    }));
+    this.setState({ submitting: loading });
   }
 
   getData<T extends object = Record<string, any>>() {
diff --git a/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts b/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts
index c690f250..4b19a39c 100644
--- a/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts
+++ b/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts
@@ -123,12 +123,12 @@ export class ModalApi {
     return this.setState({ submitting: isLocked });
   }
 
+  /**
+   * 为了兼容之前的代码 >=1.3.0调整为调用内部的lock/unlock方法
+   * @param loading 是否loading
+   */
   modalLoading(loading: boolean) {
-    this.store.setState((prev) => ({
-      ...prev,
-      confirmLoading: loading,
-      loading,
-    }));
+    this.setState({ submitting: loading });
   }
 
   /**