From f70cb62ecd94780c7b722d5cc9811285984c4185 Mon Sep 17 00:00:00 2001
From: huangxiaomin <1219549841@qq.com>
Date: Wed, 20 Sep 2023 15:09:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8Cant-select-dropdow?=
 =?UTF-8?q?n=20=E6=B2=A1=E6=9C=89=E9=9A=8Fform-item=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/design/index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/design/index.less b/src/design/index.less
index b2c024afd..956c9d852 100644
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -25,6 +25,7 @@ body {
   height: 100%;
   overflow: visible;
   overflow-x: hidden;
+  position: relative;
 
   &.color-weak {
     filter: invert(80%);

From a730afb67c81ad275f2f51a9a456a810d88cfdd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=B0=8F=E6=B0=91?=
 <DesignHhuang@users.noreply.github.com>
Date: Wed, 20 Sep 2023 15:14:17 +0800
Subject: [PATCH 2/4] Update index.less
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

处理 移动滚动条的时候，ant-select-dropdown 没有随form-item移动
---
 src/design/index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/design/index.less b/src/design/index.less
index b2c024afd..956c9d852 100644
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -25,6 +25,7 @@ body {
   height: 100%;
   overflow: visible;
   overflow-x: hidden;
+  position: relative;
 
   &.color-weak {
     filter: invert(80%);

From eb2665059eb5fdcb8299032dc1a49c73f1675156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=B0=8F=E6=B0=91?=
 <DesignHhuang@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:12:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=8B=B1=E6=96=87=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E4=B8=AD=E7=9A=84=E5=8D=95=E8=AF=8D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/en/common.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/lang/en/common.ts b/src/locales/lang/en/common.ts
index f7cdce0b5..c979c139e 100644
--- a/src/locales/lang/en/common.ts
+++ b/src/locales/lang/en/common.ts
@@ -9,8 +9,8 @@ export default {
   searchText: 'Search',
   queryText: 'Search',
 
-  inputText: 'Please enter',
-  chooseText: 'Please choose',
+  inputText: 'Please enter ',
+  chooseText: 'Please choose ',
 
   redo: 'Refresh',
   back: 'Back',

From d46c6daa134de925f0f53fb4b252bbe246689408 Mon Sep 17 00:00:00 2001
From: huangxiaomin <1219549841@qq.com>
Date: Wed, 27 Sep 2023 13:58:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?#3080=20=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=A4=BA=E4=BE=8B=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/web/usePermission.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index 8a82d46a7..b997754fd 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -63,7 +63,7 @@ export function usePermission() {
       return def;
     }
 
-    const permMode = projectSetting.permissionMode;
+    const permMode = appStore.getProjectConfig.permissionMode;
 
     if ([PermissionModeEnum.ROUTE_MAPPING, PermissionModeEnum.ROLE].includes(permMode)) {
       if (!isArray(value)) {