From 5d9592e12da4e0923e6e46714edd395185257487 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 21 May 2025 09:11:29 +0800
Subject: [PATCH 1/7] =?UTF-8?q?docs:=20=E6=96=B0=E5=A2=9E=E8=B5=9E?=
 =?UTF-8?q?=E5=8A=A9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 19c8705c..4e916e97 100644
--- a/README.md
+++ b/README.md
@@ -405,3 +405,8 @@ console.log(t('common.confirm'));
     <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747742593880284419/5b56043d_5601833.jpeg" width="24px" >
     <span>沙海 20元</span>
 </div>
+
+<div style="display: flex; gap: 8px;">
+    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747789196227712891/00c37bdf_5601833.jpeg" width="24px" >
+    <span>xxl 50元</span>
+</div>

From 6bae05688eacc9f55b5d1ba5f35b679a51778488 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 21 May 2025 11:01:40 +0800
Subject: [PATCH 2/7] =?UTF-8?q?docs:=20=E6=96=B0=E5=A2=9E=E8=B5=9E?=
 =?UTF-8?q?=E5=8A=A9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 4e916e97..9b669db4 100644
--- a/README.md
+++ b/README.md
@@ -410,3 +410,8 @@ console.log(t('common.confirm'));
     <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747789196227712891/00c37bdf_5601833.jpeg" width="24px" >
     <span>xxl 50元</span>
 </div>
+
+<div style="display: flex; gap: 8px;">
+    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747796468040874363/1faa75ce_5601833.jpeg" width="24px" >
+    <span>莫离支🤴 10元</span>
+</div>

From 8c2a0b5886edfcbc6bc1a670bbdf31e501126d68 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Wed, 21 May 2025 22:01:53 +0800
Subject: [PATCH 3/7] fix: update scroll-x property to use dynamic calculation
 based on column size

---
 docs/template/index-tree.vue.vm | 3 ++-
 docs/template/index.vue.vm      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/template/index-tree.vue.vm b/docs/template/index-tree.vue.vm
index 0ab2b7b7..0ad06679 100644
--- a/docs/template/index-tree.vue.vm
+++ b/docs/template/index-tree.vue.vm
@@ -1,3 +1,4 @@
+#set($scrollX = $columns.size() * 120 + 242)
 <script setup lang="tsx">
 import { NDivider } from 'naive-ui';
 import { jsonClone } from '@sa/utils';
@@ -207,7 +208,7 @@ function handleExport() {
         size="small"
         :indent="32"
         :flex-height="!appStore.isMobile"
-        :scroll-x="962"
+        :scroll-x="$scrollX"
         :loading="loading"
         remote
         :row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end"
diff --git a/docs/template/index.vue.vm b/docs/template/index.vue.vm
index 4a4d0052..a8b7cb5e 100644
--- a/docs/template/index.vue.vm
+++ b/docs/template/index.vue.vm
@@ -1,3 +1,4 @@
+#set($scrollX = $columns.size() * 120 + 242)
 <script setup lang="tsx">
 import { NDivider } from 'naive-ui';
 import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${businessName}';
@@ -170,7 +171,7 @@ function handleExport() {
         :data="data"
         size="small"
         :flex-height="!appStore.isMobile"
-        :scroll-x="962"
+        :scroll-x="$scrollX"
         :loading="loading"
         remote
         :row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end"

From 59c66ffae806e26b9aeed8299450e871563c626a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=AD=E5=A5=87?= <wangzhongqi95@gmail.com>
Date: Thu, 22 May 2025 15:38:12 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=97=A0=E6=B3=95=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/api/system/user.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/service/api/system/user.ts b/src/service/api/system/user.ts
index ba9b942a..e7c03d86 100644
--- a/src/service/api/system/user.ts
+++ b/src/service/api/system/user.ts
@@ -80,6 +80,9 @@ export function fetchResetUserPassword(userId: CommonType.IdType, password: stri
   return request<boolean>({
     url: '/system/user/resetPwd',
     method: 'put',
+    headers: {
+      isEncrypt: true
+    },
     data: { userId, password }
   });
 }

From 730731ddac875dfb99e5d370662d54c5d4c7ae4f Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Thu, 22 May 2025 15:50:08 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E6=97=A0=E6=9D=83=E9=99=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=9D=99=E6=80=81=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BABug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 1b2ee7a4..50b8fdd1 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -132,7 +132,8 @@ const dynamicConstantRoutes: ElegantRoute[] = [
       title: 'system',
       i18nKey: 'route.system',
       localIcon: 'menu-system',
-      order: 1
+      order: 1,
+      hideInMenu: true
     },
     children: [
       {

From 8a8e5d12acab50a41ef2d626be558835dd453371 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 22 May 2025 19:04:49 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E9=85=8D=E7=BD=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=94=B1=E5=90=8E=E7=AB=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/sql/sys_menu.sql            |  4 ++++
 src/router/routes/index.ts       | 26 --------------------------
 src/store/modules/route/index.ts |  5 +++++
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/docs/sql/sys_menu.sql b/docs/sql/sys_menu.sql
index c1608184..a04de6d6 100644
--- a/docs/sql/sys_menu.sql
+++ b/docs/sql/sys_menu.sql
@@ -26,9 +26,13 @@ UPDATE `sys_menu` SET `icon` = 'carbon:operations-record' WHERE `menu_id` = 500;
 UPDATE `sys_menu` SET `icon` = 'tabler:login-2' WHERE `menu_id` = 501;
 UPDATE `sys_menu` SET `icon` = 'gg:debug' WHERE `menu_id` = 1500;
 UPDATE `sys_menu` SET `icon` = 'gg:debug' WHERE `menu_id` = 1506;
+UPDATE `sys_menu` SET `path` = 'oss/config', `component` = 'system/oss-config/index', `icon` = 'hugeicons:configuration-01' WHERE `menu_id` = 133;
 
 -- IFrame 类型
 UPDATE `sys_menu` SET `component` = 'FrameView', `query_param` = 'https://ruoyi.xlsea.cn/admin/', `is_frame` = 2, `icon` = 'bx:bxl-spring-boot' WHERE `menu_id` = 117;
 UPDATE `sys_menu` SET `component` = 'FrameView', `query_param` = 'https://preview.snailjob.opensnail.com/', `is_frame` = 2, `icon` = 'gridicons:scheduled' WHERE `menu_id` = 120;
 -- 外链类型
 UPDATE `sys_menu` SET `path` = 'https://gitee.com/xlsea/ruoyi-plus-soybean', `component` = 'FrameView', `icon` = 'local-icon-gitee' WHERE `menu_id` = 4;
+
+-- plus-ui 需要禁用的页面
+UPDATE `sys_menu` SET `status` = '1' WHERE `menu_id` IN ( '116', '130', '131', '132', '11700', '11701' );
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 50b8fdd1..4cbcd1bf 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -123,32 +123,6 @@ const dynamicConstantRoutes: ElegantRoute[] = [
       icon: 'material-symbols:account-circle-full',
       hideInMenu: true
     }
-  },
-  {
-    name: 'system',
-    path: '/system',
-    component: 'layout.base',
-    meta: {
-      title: 'system',
-      i18nKey: 'route.system',
-      localIcon: 'menu-system',
-      order: 1,
-      hideInMenu: true
-    },
-    children: [
-      {
-        name: 'system_oss-config',
-        path: '/system/oss-config',
-        component: 'view.system_oss-config',
-        meta: {
-          title: 'system_oss-config',
-          i18nKey: 'route.system_oss-config',
-          constant: true,
-          hideInMenu: true,
-          icon: 'hugeicons:configuration-01'
-        }
-      }
-    ]
   }
 ];
 
diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index 7ac474b6..b65ccd21 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -100,6 +100,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
     authRoutes.value = Array.from(authRoutesMap.values());
   }
 
+  // eslint-disable-next-line complexity
   function parseRouter(route: ElegantConstRoute, parent?: ElegantConstRoute) {
     route.meta = route.meta ? route.meta : { title: route.name };
     const isLayout = route.component === 'Layout';
@@ -129,6 +130,10 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
 
     // @ts-expect-error no hidden field
     route.meta.hideInMenu = route.hidden;
+    if (route.meta.hideInMenu) {
+      // @ts-expect-error parent.name is activeMenu type
+      route.meta.activeMenu = parent ? parent.name : null;
+    }
     // 是否需要keepAlive
     route.meta.keepAlive = !route.meta.noCache;
 

From 62b8327d0715cbcdafc97a40085eee3daaa9d275 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 22 May 2025 19:13:00 +0800
Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20=E9=9A=90=E8=97=8F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=BF=80=E6=B4=BB=E9=83=A8=E5=88=86=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/route/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index b65ccd21..6edff7ea 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -130,9 +130,9 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
 
     // @ts-expect-error no hidden field
     route.meta.hideInMenu = route.hidden;
-    if (route.meta.hideInMenu) {
+    if (route.meta.hideInMenu && parent) {
       // @ts-expect-error parent.name is activeMenu type
-      route.meta.activeMenu = parent ? parent.name : null;
+      route.meta.activeMenu = parent.name;
     }
     // 是否需要keepAlive
     route.meta.keepAlive = !route.meta.noCache;