chore(projects): 更换图标

# Conflicts:
#	README.en_US.md
#	README.md

.vscode/settings.json

@@ -4,7 +4,18 @@
     "source.organizeImports": "never"
   },
   "editor.formatOnSave": false,
-  "eslint.validate": ["html", "css", "scss", "json", "jsonc"],
+  "eslint.validate": [
+    "html",
+    "css",
+    "scss",
+    "json",
+    "jsonc",
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "vue"
+  ],
   "i18n-ally.displayLanguage": "zh-cn",
   "i18n-ally.enabledParsers": ["ts"],
   "i18n-ally.enabledFrameworks": ["vue"],

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)
+
+###    🐞 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 修复

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 的现代化前端特性，为开发者提供了完整的企业管理解决方案。

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",
@@ -41,18 +41,21 @@
   "scripts": {
     "build": "vite build --mode prod",
     "build:dev": "vite build --mode dev",
+    "build:tauri": "pnpm tauri build",
     "build:test": "vite build --mode test",
     "cleanup": "sa cleanup",
     "commit": "sa git-commit",
     "commit:zh": "sa git-commit -l=zh-cn",
     "dev": "vite --mode dev",
     "dev:prod": "vite --mode prod",
+    "dev:tauri": "pnpm tauri dev",
     "dev:test": "vite --mode test",
     "gen-route": "sa gen-route",
     "lint": "eslint . --fix",
     "prepare": "simple-git-hooks",
     "preview": "vite preview",
     "release": "sa release",
+    "tauri-icon": "pnpm tauri icon ./public/logo.png",
     "typecheck": "vue-tsc --noEmit --skipLibCheck",
     "update-pkg": "sa update-pkg"
   },
@@ -65,6 +68,7 @@
     "@sa/materials": "workspace:*",
     "@sa/tinymce": "workspace:*",
     "@sa/utils": "workspace:*",
+    "@tauri-apps/api": "2.5.0",
     "@types/streamsaver": "^2.0.5",
     "@vueuse/core": "13.5.0",
     "clipboard": "2.0.11",
@@ -92,6 +96,7 @@
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.7.1",
+    "@tauri-apps/cli": "2.5.0",
     "@types/node": "24.0.13",
     "@types/nprogress": "0.2.3",
     "@unocss/eslint-config": "66.3.3",

pnpm-lock.yaml

@@ -32,6 +32,9 @@ importers:
       '@sa/utils':
         specifier: workspace:*
         version: link:packages/utils
+      '@tauri-apps/api':
+        specifier: 2.5.0
+        version: 2.5.0
       '@types/streamsaver':
         specifier: ^2.0.5
         version: 2.0.5
@@ -108,6 +111,9 @@ importers:
       '@soybeanjs/eslint-config':
         specifier: 1.7.1
         version: 1.7.1(@typescript-eslint/utils@8.37.0(eslint@9.31.0(jiti@2.4.2))(typescript@5.8.3))(@unocss/eslint-config@66.3.3(eslint@9.31.0(jiti@2.4.2))(typescript@5.8.3))(eslint-plugin-vue@10.3.0(@typescript-eslint/parser@8.35.1(eslint@9.31.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.31.0(jiti@2.4.2))(vue-eslint-parser@10.2.0(eslint@9.31.0(jiti@2.4.2))))(eslint@9.31.0(jiti@2.4.2))(svelte-eslint-parser@1.3.0)(typescript@5.8.3)(vue-eslint-parser@10.2.0(eslint@9.31.0(jiti@2.4.2)))
+      '@tauri-apps/cli':
+        specifier: 2.5.0
+        version: 2.5.0
       '@types/node':
         specifier: 24.0.13
         version: 24.0.13
@@ -1123,6 +1129,85 @@ packages:
       vue-eslint-parser:
         optional: true
 
+  '@tauri-apps/api@2.5.0':
+    resolution: {integrity: sha512-Ldux4ip+HGAcPUmuLT8EIkk6yafl5vK0P0c0byzAKzxJh7vxelVtdPONjfgTm96PbN24yjZNESY8CKo8qniluA==}
+
+  '@tauri-apps/cli-darwin-arm64@2.5.0':
+    resolution: {integrity: sha512-VuVAeTFq86dfpoBDNYAdtQVLbP0+2EKCHIIhkaxjeoPARR0sLpFHz2zs0PcFU76e+KAaxtEtAJAXGNUc8E1PzQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tauri-apps/cli-darwin-x64@2.5.0':
+    resolution: {integrity: sha512-hUF01sC06cZVa8+I0/VtsHOk9BbO75rd+YdtHJ48xTdcYaQ5QIwL4yZz9OR1AKBTaUYhBam8UX9Pvd5V2/4Dpw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.5.0':
+    resolution: {integrity: sha512-LQKqttsK252LlqYyX8R02MinUsfFcy3+NZiJwHFgi5Y3+ZUIAED9cSxJkyNtuY5KMnR4RlpgWyLv4P6akN1xhg==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tauri-apps/cli-linux-arm64-gnu@2.5.0':
+    resolution: {integrity: sha512-mTQufsPcpdHg5RW0zypazMo4L55EfeE5snTzrPqbLX4yCK2qalN7+rnP8O8GT06xhp6ElSP/Ku1M2MR297SByQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tauri-apps/cli-linux-arm64-musl@2.5.0':
+    resolution: {integrity: sha512-rQO1HhRUQqyEaal5dUVOQruTRda/TD36s9kv1hTxZiFuSq3558lsTjAcUEnMAtBcBkps20sbyTJNMT0AwYIk8Q==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@tauri-apps/cli-linux-riscv64-gnu@2.5.0':
+    resolution: {integrity: sha512-7oS18FN46yDxyw1zX/AxhLAd7T3GrLj3Ai6s8hZKd9qFVzrAn36ESL7d3G05s8wEtsJf26qjXnVF4qleS3dYsA==}
+    engines: {node: '>= 10'}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tauri-apps/cli-linux-x64-gnu@2.5.0':
+    resolution: {integrity: sha512-SG5sFNL7VMmDBdIg3nO3EzNRT306HsiEQ0N90ILe3ZABYAVoPDO/ttpCO37ApLInTzrq/DLN+gOlC/mgZvLw1w==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tauri-apps/cli-linux-x64-musl@2.5.0':
+    resolution: {integrity: sha512-QXDM8zp/6v05PNWju5ELsVwF0VH1n6b5pk2E6W/jFbbiwz80Vs1lACl9pv5kEHkrxBj+aWU/03JzGuIj2g3SkQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@tauri-apps/cli-win32-arm64-msvc@2.5.0':
+    resolution: {integrity: sha512-pFSHFK6b+o9y4Un8w0gGLwVyFTZaC3P0kQ7umRt/BLDkzD5RnQ4vBM7CF8BCU5nkwmEBUCZd7Wt3TWZxe41o6Q==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tauri-apps/cli-win32-ia32-msvc@2.5.0':
+    resolution: {integrity: sha512-EArv1IaRlogdLAQyGlKmEqZqm5RfHCUMhJoedWu7GtdbOMUfSAz6FMX2boE1PtEmNO4An+g188flLeVErrxEKg==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@tauri-apps/cli-win32-x64-msvc@2.5.0':
+    resolution: {integrity: sha512-lj43EFYbnAta8pd9JnUq87o+xRUR0odz+4rixBtTUwUgdRdwQ2V9CzFtsMu6FQKpFQ6mujRK6P1IEwhL6ADRsQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tauri-apps/cli@2.5.0':
+    resolution: {integrity: sha512-rAtHqG0Gh/IWLjN2zTf3nZqYqbo81oMbqop56rGTjrlWk9pTTAjkqOjSL9XQLIMZ3RbeVjveCqqCA0s8RnLdMg==}
+    engines: {node: '>= 10'}
+    hasBin: true
+
   '@tinymce/tinymce-vue@6.2.0':
     resolution: {integrity: sha512-HiXKB+M3mJnWO6/8kY0HsP255+8zLZw5JMqHKVUvsXvzYyHW+splXXwYDYOkCYqf39R5nBqQaK2l2WL9rz3y5w==}
     peerDependencies:
@@ -4936,6 +5021,55 @@ snapshots:
       - eslint-import-resolver-node
       - supports-color
 
+  '@tauri-apps/api@2.5.0': {}
+
+  '@tauri-apps/cli-darwin-arm64@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-darwin-x64@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-linux-arm64-gnu@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-linux-arm64-musl@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-linux-riscv64-gnu@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-linux-x64-gnu@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-linux-x64-musl@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-win32-arm64-msvc@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-win32-ia32-msvc@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli-win32-x64-msvc@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli@2.5.0':
+    optionalDependencies:
+      '@tauri-apps/cli-darwin-arm64': 2.5.0
+      '@tauri-apps/cli-darwin-x64': 2.5.0
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.5.0
+      '@tauri-apps/cli-linux-arm64-gnu': 2.5.0
+      '@tauri-apps/cli-linux-arm64-musl': 2.5.0
+      '@tauri-apps/cli-linux-riscv64-gnu': 2.5.0
+      '@tauri-apps/cli-linux-x64-gnu': 2.5.0
+      '@tauri-apps/cli-linux-x64-musl': 2.5.0
+      '@tauri-apps/cli-win32-arm64-msvc': 2.5.0
+      '@tauri-apps/cli-win32-ia32-msvc': 2.5.0
+      '@tauri-apps/cli-win32-x64-msvc': 2.5.0
+
   '@tinymce/tinymce-vue@6.2.0(tinymce@7.9.1)(vue@3.5.17(typescript@5.8.3))':
     dependencies:
       vue: 3.5.17(typescript@5.8.3)

src-tauri/.gitignore

@@ -0,0 +1,3 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/

src-tauri/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "app"
+version = "0.1.0"
+description = "A Tauri App"
+authors = ["you"]
+license = ""
+repository = ""
+default-run = "app"
+edition = "2021"
+rust-version = "1.60"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+tauri = { version = "2", features = [] }
+
+[features]
+# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
+# If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
+# DO NOT REMOVE!!
+custom-protocol = [ "tauri/custom-protocol" ]

src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+  tauri_build::build()
+}

src-tauri/capabilities/migrated.json

@@ -0,0 +1,7 @@
+{
+  "identifier": "migrated",
+  "description": "permissions that were migrated from v1",
+  "local": true,
+  "windows": ["main"],
+  "permissions": ["core:default"]
+}

src-tauri/gen/schemas/capabilities.json

@@ -0,0 +1,9 @@
+{
+  "migrated": {
+    "identifier": "migrated",
+    "description": "permissions that were migrated from v1",
+    "local": true,
+    "windows": ["main"],
+    "permissions": ["core:default"]
+  }
+}

src-tauri/src/main.rs

@@ -0,0 +1,8 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+  tauri::Builder::default()
+    .run(tauri::generate_context!())
+    .expect("error while running tauri application");
+}

src-tauri/tauri.conf.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+  "build": {
+    "beforeBuildCommand": "npm run build",
+    "beforeDevCommand": "npm run dev",
+    "frontendDist": "../dist",
+    "devUrl": "http://localhost:9527"
+  },
+  "bundle": {
+    "active": true,
+    "category": "DeveloperTool",
+    "copyright": "RuoYi-Plus-Soybean",
+    "targets": "all",
+    "externalBin": [],
+    "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
+    "windows": {
+      "certificateThumbprint": null,
+      "digestAlgorithm": "sha256",
+      "timestampUrl": ""
+    },
+    "longDescription": "",
+    "macOS": {
+      "entitlements": null,
+      "exceptionDomain": "",
+      "frameworks": [],
+      "providerShortName": null,
+      "signingIdentity": null
+    },
+    "resources": [],
+    "shortDescription": "",
+    "linux": {
+      "deb": {
+        "depends": []
+      }
+    }
+  },
+  "productName": "RuoYi-Plus-Soybean",
+  "mainBinaryName": "RuoYi-Plus-Soybean",
+  "version": "1.0.0",
+  "identifier": "org.dromara.admin",
+  "plugins": {},
+  "app": {
+    "windows": [
+      {
+        "fullscreen": false,
+        "height": 768,
+        "resizable": true,
+        "title": "RuoYi-Plus-Soybean",
+        "width": 1366,
+        "useHttpsScheme": true
+      }
+    ],
+    "security": {
+      "csp": null
+    }
+  }
+}

src/components/custom/post-select.vue

@@ -21,27 +21,27 @@ const attrs: SelectProps = useAttrs();
 
 const { loading: postLoading, startLoading: startPostLoading, endLoading: endPostLoading } = useLoading();
 
-/** the enabled role options */
-const roleOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
+/** the enabled post options */
+const postOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
 
 watch(
   () => props.deptId,
   () => {
     if (!props.deptId) {
-      roleOptions.value = [];
+      postOptions.value = [];
       return;
     }
-    getRoleOptions();
+    getPostOptions();
   },
   { immediate: true }
 );
 
-async function getRoleOptions() {
+async function getPostOptions() {
   startPostLoading();
   const { error, data } = await fetchGetPostSelect(props.deptId!);
 
   if (!error) {
-    roleOptions.value = data.map(item => ({
+    postOptions.value = data.map(item => ({
       label: item.postName,
       value: item.postId
     }));
@@ -54,7 +54,7 @@ async function getRoleOptions() {
   <NSelect
     v-model:value="value"
     :loading="postLoading"
-    :options="roleOptions"
+    :options="postOptions"
     v-bind="attrs"
     placeholder="请选择岗位"
   />

src/hooks/business/download.ts

@@ -16,6 +16,12 @@ export function useDownload() {
   const isHttpProxy = import.meta.env.DEV && import.meta.env.VITE_HTTP_PROXY === 'Y';
   const { baseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);
 
+  const isHttps = () => {
+    const protocol = document.location.protocol;
+    const hostname = document.location.hostname;
+    return protocol === 'https' || hostname === 'localhost' || hostname === '127.0.0.1';
+  };
+
   /** 获取通用请求头 */
   const getCommonHeaders = (contentType = 'application/octet-stream') => ({
     Authorization: `Bearer ${localStg.get('token')}`,
@@ -109,9 +115,10 @@ export function useDownload() {
 
       await handleResponse(response);
 
-      const finalFilename = filename || response.headers.get('Download-Filename') || `download-${timestamp}`;
+      const rawHeader = response.headers.get('Download-Filename');
+      const finalFilename = filename || (rawHeader ? decodeURIComponent(rawHeader) : null) || `download-${timestamp}`;
 
-      if (response.body) {
+      if (response.body && isHttps()) {
         const contentLength = Number(response.headers.get('Content-Length'));
         await downloadByStream(response.body, finalFilename, contentLength);
         return;

src/service/request/index.ts

@@ -77,7 +77,7 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       // when the backend response code is in `modalLogoutCodes`, it means the user will be logged out by displaying a modal
       const modalLogoutCodes = import.meta.env.VITE_SERVICE_MODAL_LOGOUT_CODES?.split(',') || [];
       if (modalLogoutCodes.includes(responseCode) && isLogin) {
-        const isExist = request.state.errMsgStack && request.state.errMsgStack.includes(response.data.msg);
+        const isExist = request.state.errMsgStack?.includes(response.data.msg);
         if (isExist) {
           return null;
         }
@@ -85,23 +85,24 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
           logoutAndCleanup();
           return null;
         }
+
         request.state.errMsgStack = [...(request.state.errMsgStack || []), response.data.msg];
-        // prevent the user from refreshing the page
-        window.addEventListener('beforeunload', handleLogout);
 
         window.$dialog?.warning({
           title: '系统提示',
-          content: '登录状态已过期，您可以继续留在该页面，或者重新登录',
+          content: '登录状态已过期，请重新登录',
           positiveText: '重新登录',
-          negativeText: '取消',
           maskClosable: false,
           closeOnEsc: false,
+          onAfterEnter() {
+            // prevent the user from refreshing the page
+            window.addEventListener('beforeunload', handleLogout);
+          },
           onPositiveClick() {
             logoutAndCleanup();
           },
           onClose() {
-            window.removeEventListener('beforeunload', handleLogout);
-            request.state.errMsgStack = request.state.errMsgStack.filter(msg => msg !== response.data.msg);
+            logoutAndCleanup();
           }
         });
         request.cancelAllRequest();

src/store/modules/route/index.ts

@@ -67,6 +67,8 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
       if (authRouteMode.value === 'dynamic') {
         if (route.path === '/' && route.children?.length) {
           const child = route.children[0];
+          // @ts-expect-error no hidden field
+          child.hidden = route.hidden;
           parseRouter(child);
           child.name = Math.random().toString(36).slice(2, 12);
           Object.assign(route, child);
@@ -123,7 +125,6 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
     } else if (!isNotNull(route.meta.icon)) {
       route.meta.icon = defaultIcon;
     }
-
     // @ts-expect-error no hidden field
     route.meta.hideInMenu = route.hidden;
     if (route.meta.hideInMenu && parent) {

src/styles/css/reset.css

@@ -13,6 +13,13 @@
   border-color: var(--un-default-border-color, #e5e7eb); /* 2 */
 }
 
+/*
+* [Naive UI] Fix the icon size in the image preview toolbar
+*/
+.n-image-preview-toolbar .n-base-icon {
+  box-sizing: unset !important;
+}
+
 /*
 1. Use a consistent sensible line-height in all browsers.
 2. Prevent adjustments of font size after orientation changes in iOS.

src/typings/api/system.api.d.ts

@@ -163,6 +163,8 @@ declare namespace Api {
       postIds: string[];
       /** user role ids */
       roleIds: string[];
+      /** roles */
+      roles: Role[];
     };
 
     /** user list */

src/views/_builtin/login/modules/pwd-login.vue

@@ -53,12 +53,14 @@ async function handleFetchTenantList() {
   const { data, error } = await fetchTenantList();
   if (error) return;
   tenantEnabled.value = data.tenantEnabled;
-  tenantOption.value = data.voList.map(tenant => {
-    return {
-      label: tenant.companyName,
-      value: tenant.tenantId
-    };
-  });
+  if (data.tenantEnabled) {
+    tenantOption.value = data.voList.map(tenant => {
+      return {
+        label: tenant.companyName,
+        value: tenant.tenantId
+      };
+    });
+  }
   endTenantLoading();
 }
 

src/views/system/config/modules/config-search.vue

@@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
 const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true });
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
-    model.value.params!.beginTime = value[0];
-    model.value.params!.endTime = value[1];
+  const params = model.value.params!;
+  if (value && value.length === 2) {
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/menu/index.vue

@@ -113,6 +113,24 @@ function renderLabel({ option }: { option: TreeOption }) {
   if (label?.startsWith('route.') || label?.startsWith('menu.')) {
     label = $t(label as App.I18n.I18nKey);
   }
+  // 禁用的菜单显示红色
+  if (option.status === '1') {
+    return (
+      <div class="flex items-center gap-4px text-error-200">
+        {label}
+        <SvgIcon icon="ri:prohibited-line" class="text-16px" />
+      </div>
+    );
+  }
+  // 隐藏的菜单显示灰色
+  if (option.visible === '1') {
+    return (
+      <div class="flex items-center gap-4px text-gray-400">
+        {label}
+        <SvgIcon icon="codex:hidden" class="text-21px" />
+      </div>
+    );
+  }
   return <div>{label}</div>;
 }
 

src/views/system/oss/modules/oss-search.vue

@@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
 const model = defineModel<Api.System.OssSearchParams>('model', { required: true });
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
-    model.value.params!.beginCreateTime = value[0];
-    model.value.params!.endCreateTime = value[1];
+  const params = model.value.params!;
+  if (value && value.length === 2) {
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/role/modules/role-auth-user-drawer.vue

@@ -168,9 +168,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
 const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
-    searchParams.params!.beginTime = value[0];
-    searchParams.params!.endTime = value[1];
+  const params = searchParams.params!;
+  if (value && value.length === 2) {
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/role/modules/role-search.vue

@@ -24,9 +24,12 @@ const model = defineModel<Api.System.RoleSearchParams>('model', { required: true
 const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false);
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
-    model.value.params!.beginTime = `${value[0]} 00:00:00`;
-    model.value.params!.endTime = `${value[1]} 23:59:59`;
+  const params = model.value.params!;
+  if (value && value.length === 2) {
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }
 

src/views/system/user/modules/user-import-modal.vue

@@ -91,6 +91,7 @@ function handleDownloadTemplate() {
 
 watch(visible, () => {
   if (visible.value) {
+    data.value.updateSupport = false;
     fileList.value = [];
     success.value = false;
     message.value = '';
@@ -140,7 +141,7 @@ watch(visible, () => {
       </NUploadDragger>
     </NUpload>
     <div class="flex-center">
-      <NCheckbox v-model="data.updateSupport">{{ $t('common.updateExisting') }}</NCheckbox>
+      <NCheckbox v-model:checked="data.updateSupport">{{ $t('common.updateExisting') }}</NCheckbox>
     </div>
 
     <NAlert v-if="message" :title="$t('common.importResult')" :type="success ? 'success' : 'error'" :bordered="false">

src/views/system/user/modules/user-operate-drawer.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, reactive, watch } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { useLoading } from '@sa/hooks';
 import { fetchCreateUser, fetchGetUserInfo, fetchUpdateUser } from '@/service/api/system';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
@@ -49,6 +49,8 @@ type Model = Api.System.UserOperateParams;
 
 const model: Model = reactive(createDefaultModel());
 
+const roleOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
+
 function createDefaultModel(): Model {
   return {
     deptId: null,
@@ -76,18 +78,23 @@ const rules: Record<RuleKey, App.Global.FormRule[]> = {
   roleIds: [{ ...createRequiredRule('请选择角色'), type: 'array' }]
 };
 
-async function getUserInfo() {
+async function getUserInfo(id: CommonType.IdType = '') {
   startLoading();
-  const { error, data } = await fetchGetUserInfo(props.rowData?.userId);
+  const { error, data } = await fetchGetUserInfo(id);
   if (!error) {
     model.roleIds = data.roleIds;
     model.postIds = data.postIds;
+    roleOptions.value = data.roles.map(role => ({
+      label: role.roleName,
+      value: role.roleId
+    }));
   }
   endLoading();
 }
 
 function handleUpdateModelWhenEdit() {
   if (props.operateType === 'add') {
+    getUserInfo();
     Object.assign(model, createDefaultModel());
     model.deptId = props.deptId;
     return;
@@ -97,7 +104,7 @@ function handleUpdateModelWhenEdit() {
     startDeptLoading();
     Object.assign(model, props.rowData);
     model.password = '';
-    getUserInfo();
+    getUserInfo(props.rowData.userId);
     endDeptLoading();
   }
 }
@@ -209,7 +216,14 @@ watch(visible, () => {
             <PostSelect v-model:value="model.postIds" :dept-id="model.deptId" multiple clearable />
           </NFormItem>
           <NFormItem :label="$t('page.system.user.roleIds')" path="roleIds">
-            <RoleSelect v-model:value="model.roleIds" multiple clearable />
+            <NSelect
+              v-model:value="model.roleIds"
+              :loading="loading"
+              :options="roleOptions"
+              multiple
+              clearable
+              placeholder="请选择角色"
+            />
           </NFormItem>
           <NFormItem :label="$t('page.system.user.status')" path="status">
             <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />

src/views/system/user/modules/user-search.vue

@@ -24,9 +24,12 @@ const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
 const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
 
 function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
-  if (value?.length) {
-    model.value.params!.beginTime = value[0];
-    model.value.params!.endTime = value[1];
+  const params = model.value.params!;
+  if (value && value.length === 2) {
+    [params.beginTime, params.endTime] = value;
+  } else {
+    params.beginTime = undefined;
+    params.endTime = undefined;
   }
 }