Merge branch 'dev' into v2.0

# Conflicts: # package.json # packages/scripts/package.json # pnpm-lock.yaml # src/views/system/user/modules/user-operate-drawer.vue
2025-09-24 07:49:47 +08:00 · 2025-09-01 15:18:26 +08:00
parent 2504498eb5 e230b0da81
commit 6dcc8c349a
10 changed files with 1128 additions and 636 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,44 @@
 # 更新日志

+## [v1.1.3](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.2...v1.1.3) (2025-08-16)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
+
+- **hooks**:
+  - 非安全环境下不使用流式下载 &nbsp;-&nbsp; by @m-xlsea [<samp>(f8983)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f8983557)
+  - 修复oss下载时未转码问题 &nbsp;-&nbsp; by **AN** [<samp>(2d31d)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/2d31d7dc)
+- **project**:
+  - 关闭多租户功能后仍然遍历租户列表导致控制台报错的问题 &nbsp;-&nbsp; by **wang_rui** [<samp>(b96c4)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/b96c46ba)
+  - 关闭多租户功能后仍然遍历租户列表导致控制台报错的问题 Merge pull request !25 from littleghost2016/dev &nbsp;-&nbsp; by **不寻俗** [<samp>(90276)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/9027632b)
+- **projects**:
+  - 修复一级菜单隐藏失效问题 &nbsp;-&nbsp; by **AN** [<samp>(8fcc7)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8fcc70d7)
+  - 修复日期搜索条件清除问题 &nbsp;-&nbsp; by **AN** [<samp>(52318)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/52318c10)
+  - 修复登录过期事件监听未被重置 &nbsp;-&nbsp; by @m-xlsea [<samp>(71037)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/71037439)
+  - 修复用户新增时角色下拉包含超级管理员问题 &nbsp;-&nbsp; by **AN** [<samp>(a15b6)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a15b683b)
+  - 修复用户导入功能无法更新问题 &nbsp;-&nbsp; by **AN** [<samp>(4e983)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4e9839bd)
+  - Fix the icon size in the image preview toolbar &nbsp;-&nbsp; by @m-xlsea [<samp>(4539f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4539fe01)
+  - 修复新增用户未查询角色列表问题 &nbsp;-&nbsp; by **AN** [<samp>(d6ae8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d6ae85d2)
+- **readme**:
+  - update GitHub stars and forks links for gitee &nbsp;-&nbsp; by @soybeanjs [<samp>(923eb)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/923eb98a)
+
+### &nbsp;&nbsp;&nbsp;💅 重构
+
+- **menu**:
+  - 菜单管理中隐藏的菜单显示灰色 &nbsp;-&nbsp; by **NicholasLD** [<samp>(adca2)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/adca2e26)
+  - 菜单管理中隐藏的菜单显示灰色 Merge pull request !24 from NicholasLD/N/A &nbsp;-&nbsp; by **不寻俗** [<samp>(4eb77)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4eb77eac)
+- **projects**:
+  - 菜单列表新增禁用菜单样式 &nbsp;-&nbsp; by @m-xlsea [<samp>(e5383)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e538355f)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **other**: update the ESLint validation configuration to support more file types. &nbsp;-&nbsp; by **Azir-11** [<samp>(8d7f9)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8d7f91dc)
+- **readme**: remove DartNode sponsorship badge from README files &nbsp;-&nbsp; by @soybeanjs [<samp>(33ade)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/33ade539)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[![Azir-11](https://github.com/NicholasLD.png?size=48)](https://github.com/NicholasLD)&nbsp;&nbsp;
+[wang_rui](mailto:wrr1996@163.com)
+
 ## [v1.1.2](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.1...v1.1.2) (2025-07-24)

 ### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
--- a/README.md
+++ b/README.md
@ -22,7 +22,7 @@

 # 📢 重要通知

-1.1.2 版本已经正式发布，工作流版本迎来首个版本（请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议：
+1.1.3 版本已经正式发布（工作流版本请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议：
 - 在生产环境使用前进行充分测试
 - 关注项目更新，及时获取最新版本
 - 积极反馈问题，帮助我们快速迭代
@ -40,6 +40,11 @@

 <p style="font-weight: bold; font-size: 24px;">后端需要替换代码生成模板与菜单 SQL，详细请看 <a href="#代码生成与菜单更新">代码生成与菜单更新</a></p>

+# 💎 友情链接
+
+- [Snail Job Pro](https://pro.snailjob.opensnail.com/home) - 灵活，可靠和快速的分布式任务重试和分布式任务调度平台
+- [AiZuDa - 爱组搭（飞龙工作流企业版）](https://naiveui.aizuda.com) - 像搭积木一样进行低代码甚至零代码快速构建应用
+
 ## 📋 项目概述

 RuoYi-Plus-Soybean 是一个现代化的企业级多租户管理系统，它结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。
--- a/build/config/proxy.ts
+++ b/build/config/proxy.ts
@ -1,4 +1,4 @@
-import type { HttpProxy, ProxyOptions } from 'vite';
+import type { ProxyOptions } from 'vite';
 import { bgRed, bgYellow, green, lightBlue } from 'kolorist';
 import { consola } from 'consola';
 import { createServiceConfig } from '../../src/utils/service';
@ -34,7 +34,7 @@ function createProxyItem(item: App.Service.ServiceConfigItem, enableLog: boolean
    target: item.baseURL,
    changeOrigin: true,
    ws: item.ws,
-    configure: (_proxy: HttpProxy.Server, options: ProxyOptions) => {
+    configure: (_proxy, options) => {
      _proxy.on('proxyReq', (_proxyReq, req, _res) => {
        if (!enableLog) return;

--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "ruoyi-vue-plus",
  "type": "module",
-  "version": "1.1.2",
+  "version": "1.1.3",
  "description": "结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。",
  "author": {
    "name": "xlsea",
@ -66,11 +66,11 @@
    "@sa/tinymce": "workspace:*",
    "@sa/utils": "workspace:*",
    "@types/streamsaver": "^2.0.5",
-    "@vueuse/core": "13.5.0",
+    "@vueuse/core": "13.8.0",
    "clipboard": "2.0.11",
-    "dayjs": "1.11.13",
+    "dayjs": "1.11.14",
    "defu": "6.1.4",
-    "echarts": "5.6.0",
+    "echarts": "6.0.0",
    "highlight.js": "^11.11.1",
    "jsencrypt": "^3.3.2",
    "json5": "2.2.3",
@ -80,46 +80,47 @@
    "pinia": "3.0.3",
    "streamsaver": "^2.0.6",
    "tailwind-merge": "3.3.1",
-    "vue": "3.5.17",
+    "vue": "3.5.20",
    "vue-advanced-cropper": "^2.8.9",
    "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "11.1.10",
-    "vue-router": "4.5.1"
+    "vue-i18n": "11.1.11",
+    "vue-router": "4.5.1",
+    "xlsx": "0.18.5"
  },
  "devDependencies": {
    "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.359",
+    "@iconify/json": "2.2.378",
    "@sa/scripts": "workspace:*",
    "@sa/uno-preset": "workspace:*",
    "@soybeanjs/eslint-config": "1.7.1",
-    "@types/node": "24.0.15",
+    "@types/node": "24.3.0",
    "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "66.3.3",
-    "@unocss/preset-icons": "66.3.3",
-    "@unocss/preset-uno": "66.3.3",
-    "@unocss/transformer-directives": "66.3.3",
-    "@unocss/transformer-variant-group": "66.3.3",
-    "@unocss/vite": "66.3.3",
-    "@vitejs/plugin-vue": "6.0.0",
-    "@vitejs/plugin-vue-jsx": "5.0.1",
+    "@unocss/eslint-config": "66.4.2",
+    "@unocss/preset-icons": "66.4.2",
+    "@unocss/preset-uno": "66.4.2",
+    "@unocss/transformer-directives": "66.4.2",
+    "@unocss/transformer-variant-group": "66.4.2",
+    "@unocss/vite": "66.4.2",
+    "@vitejs/plugin-vue": "6.0.1",
+    "@vitejs/plugin-vue-jsx": "5.1.0",
    "consola": "3.4.2",
-    "eslint": "9.31.0",
-    "eslint-plugin-vue": "10.3.0",
+    "eslint": "9.34.0",
+    "eslint-plugin-vue": "10.4.0",
    "kolorist": "1.8.0",
-    "sass": "1.89.2",
-    "simple-git-hooks": "2.13.0",
-    "tsx": "4.20.3",
-    "typescript": "5.8.3",
-    "unplugin-icons": "22.1.0",
-    "unplugin-vue-components": "28.8.0",
-    "vite": "7.0.5",
+    "sass": "1.91.0",
+    "simple-git-hooks": "2.13.1",
+    "tsx": "4.20.5",
+    "typescript": "5.9.2",
+    "unplugin-icons": "22.2.0",
+    "unplugin-vue-components": "29.0.0",
+    "vite": "7.1.3",
    "vite-plugin-monaco-editor": "^1.1.0",
    "vite-plugin-progress": "0.0.7",
    "vite-plugin-static-copy": "^3.1.0",
    "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.7.7",
+    "vite-plugin-vue-devtools": "8.0.1",
    "vue-eslint-parser": "10.2.0",
-    "vue-tsc": "3.0.3"
+    "vue-tsc": "3.0.6"
  },
  "simple-git-hooks": {
    "commit-msg": "pnpm sa git-commit-verify",
--- a/packages/axios/package.json
+++ b/packages/axios/package.json
@ -11,7 +11,7 @@
  },
  "dependencies": {
    "@sa/utils": "workspace:*",
-    "axios": "1.10.0",
+    "axios": "1.11.0",
    "axios-retry": "4.5.0",
    "qs": "6.14.0"
  },
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@ -14,14 +14,14 @@
  },
  "devDependencies": {
    "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "10.2.0",
-    "c12": "3.1.0",
+    "bumpp": "10.2.3",
+    "c12": "3.2.0",
    "cac": "6.7.14",
    "consola": "3.4.2",
    "enquirer": "2.4.1",
    "execa": "9.6.0",
    "kolorist": "1.8.0",
-    "npm-check-updates": "18.0.1",
+    "npm-check-updates": "18.0.3",
    "rimraf": "6.0.1"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/components/custom/dict-tag.vue
+++ b/src/components/custom/dict-tag.vue
@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue';
 import type { TagProps } from 'naive-ui';
+import { jsonClone } from '@sa/utils';
 import { useDict } from '@/hooks/business/dict';
 import { isNotNull } from '@/utils/common';
 import { $t } from '@/locales';
@ -28,7 +29,7 @@ const { transformDictData } = useDict(props.dictCode, props.immediate);

 const dictTagData = computed<Api.System.DictData[]>(() => {
  if (props.dictData) {
-    const dictData = props.dictData;
+    const dictData = jsonClone(props.dictData);
    if (dictData.dictLabel?.startsWith(`dict.${dictData.dictType}.`)) {
      dictData.dictLabel = $t(dictData.dictLabel as App.I18n.I18nKey);
    }
--- a/src/hooks/business/download.ts
+++ b/src/hooks/business/download.ts
@ -113,6 +113,10 @@ export function useDownload() {

      const response = await fetch(fullUrl, requestOptions);

+      if (response.status !== 200) {
+        throw new Error(errorCodeRecord.default);
+      }
+
      await handleResponse(response);

      const rawHeader = response.headers.get('Download-Filename');
--- a/src/utils/export.ts
+++ b/src/utils/export.ts
@ -0,0 +1,67 @@
+import { utils, writeFile } from 'xlsx';
+import { isNotNull } from '@/utils/common';
+import { $t } from '@/locales';
+
+export interface ExportExcelProps<T> {
+  columns: NaiveUI.TableColumn<T>[];
+  data: T[];
+  filename: string;
+  ignoreKeys?: (keyof T | (string & {}))[];
+  dicts?: Record<keyof T, string>;
+}
+
+export function exportExcel<T>({
+  columns,
+  data,
+  filename,
+  dicts,
+  ignoreKeys = ['index', 'operate']
+}: ExportExcelProps<T>) {
+  const exportColumns = columns.filter(col => isTableColumnHasKey(col) && !ignoreKeys?.includes(col.key));
+
+  const excelList = data.map(item => exportColumns.map(col => getTableValue(col, item, dicts)));
+
+  const titleList = exportColumns.map(col => (isTableColumnHasTitle(col) && col.title) || null);
+
+  excelList.unshift(titleList);
+
+  const workBook = utils.book_new();
+
+  const workSheet = utils.aoa_to_sheet(excelList);
+
+  workSheet['!cols'] = exportColumns.map(item => ({
+    width: Math.round(Number(item.width) / 10 || 20)
+  }));
+
+  utils.book_append_sheet(workBook, workSheet, filename);
+
+  writeFile(workBook, `${filename}.xlsx`);
+}
+
+function getTableValue<T>(col: NaiveUI.TableColumn<T>, item: T, dicts?: Record<keyof T, string>) {
+  if (!isTableColumnHasKey(col)) {
+    return null;
+  }
+
+  const { key } = col;
+
+  if (key === 'operate') {
+    return null;
+  }
+
+  if (isNotNull(dicts?.[key as keyof T]) && isNotNull(item[key as keyof T])) {
+    return $t(item[key as keyof T] as App.I18n.I18nKey);
+  }
+
+  return item[key as keyof T];
+}
+
+function isTableColumnHasKey<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> {
+  return Boolean((column as NaiveUI.TableColumnWithKey<T>).key);
+}
+
+function isTableColumnHasTitle<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> & {
+  title: string;
+} {
+  return Boolean((column as NaiveUI.TableColumnWithKey<T>).title);
+}