feat: change some translate

perf: remve chat fa-arrows-alt
perf: Asset selection optimization
2025-11-09 03:14:48 +00:00 · 2025-10-14 15:58:19 +08:00 · 2025-10-14 14:54:26 +08:00 · 2025-10-13 15:58:21 +08:00 · 2025-10-13 11:21:48 +08:00 · 2025-10-11 15:22:12 +08:00
138 changed files with 4482 additions and 1327 deletions
--- a/.prettierignore
+++ b/.prettierignore
@@ -0,0 +1,57 @@
+# Dependencies
+node_modules/
+dist/
+build/
+lina/
+
+# Logs
+*.log
+logs/
+
+# Runtime data
+pids/
+*.pid
+*.seed
+
+# Coverage directory used by tools like istanbul
+coverage/
+
+# Generated files
+*.min.js
+*.min.css
+
+# Package files
+*.tgz
+*.tar.gz
+
+# Lock files
+package-lock.json
+yarn.lock
+
+# Build outputs
+*.map
+
+# Config files that shouldn't be formatted
+.eslintrc.js
+babel.config.js
+jest.config.js
+vue.config.js
+postcss.config.js
+
+# Theme files
+src/styles/fonts/
+public/fonts/
+lina/fonts/
+
+# Assets
+src/assets/
+public/
+
+# Mock data
+mock/
+
+# Test files
+tests/
+
+# Documentation
+*.md
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,11 +0,0 @@
-{
-  "printWidth": 100,
-  "tabWidth": 2,
-  "useTabs": false,
-  "singleQuote": true,
-  "semi": false,
-  "trailingComma": "none",
-  "bracketSpacing": true,
-  "arrowParens": "avoid",
-  "endOfLine": "lf"
-}
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20250805_081024 AS stage-build
+FROM jumpserver/lina-base:20250910_084112 AS stage-build

 ARG VERSION
 ENV VERSION=$VERSION
--- a/PRETTIER.md
+++ b/PRETTIER.md
@@ -0,0 +1,76 @@
+# Prettier 配置说明
+
+本项目已配置 Prettier 代码格式化工具，**仅在保存时自动格式化**，不进行批量格式化，以保持现有代码风格。
+
+## 配置文件
+
+- `.prettierrc` - Prettier 配置文件
+- `.prettierignore` - 忽略格式化的文件列表
+- `.vscode/settings.json` - VSCode 编辑器配置（保存时自动格式化）
+- `.vscode/extensions.json` - 推荐的 VSCode 扩展
+
+## 使用方法
+
+### 1. 安装依赖
+项目已安装以下依赖：
+- `prettier@^2.8.8` - Prettier 核心
+- `eslint-plugin-prettier@^3.1.4` - ESLint 与 Prettier 集成
+- `eslint-config-prettier@^6.15.0` - 禁用与 Prettier 冲突的 ESLint 规则
+
+### 2. 命令行使用
+
+```bash
+# ESLint 检查和修复
+npm run fix
+```
+
+**注意**：本项目配置为仅在保存时自动格式化，不提供批量格式化命令。
+
+### 3. VSCode 编辑器配置
+
+确保安装了推荐的扩展：
+- Prettier - Code formatter (esbenp.prettier-vscode)
+- ESLint (dbaeumer.vscode-eslint)
+- Vetur (octref.vetur)
+
+配置已设置为保存时自动格式化。
+
+### 4. Git 提交钩子
+
+项目使用 `husky` 和 `lint-staged` 在提交时进行代码检查：
+- 提交时运行 ESLint 检查和修复
+- 不进行批量格式化，保持原有代码风格
+
+## Prettier 配置说明
+
+```json
+{
+  "semi": false,              // 不使用分号
+  "singleQuote": true,        // 使用单引号
+  "tabWidth": 0,              // 不使用缩进
+  "useTabs": false,           // 使用空格而不是制表符
+  "trailingComma": "none",    // 不使用尾随逗号
+  "printWidth": 100,          // 行宽 100 字符
+  "bracketSpacing": true,     // 对象括号内有空格
+  "arrowParens": "avoid",     // 箭头函数单参数时不使用括号
+  "endOfLine": "lf",          // 使用 LF 换行符
+  "vueIndentScriptAndStyle": false  // Vue 文件中 script 和 style 标签不缩进
+}
+```
+
+## 常见问题
+
+### Q: 如何临时禁用格式化？
+A: 使用注释：
+```javascript
+// prettier-ignore
+const uglyCode = {
+    a:1,b:2
+}
+```
+
+### Q: 如何添加文件到忽略列表？
+A: 编辑 `.prettierignore` 文件，添加文件或目录路径。
+
+### Q: VSCode 保存时没有自动格式化？
+A: 检查是否安装了 Prettier 扩展，并确认 `.vscode/settings.json` 配置正确。
--- a/package.json
+++ b/package.json
@@ -1,150 +1,156 @@
 {
-    "name": "lina",
-    "version": "v4.0.0",
-    "description": "JumpServer Web UI",
-    "author": "JumpServer Team <support@lxware.hk>",
-    "license": "GPL-3.0-or-later",
-    "scripts": {
-        "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-        "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-        "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
-        "build:prod": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
-        "preview": "node build/index.js --preview",
-        "lint": "eslint --ext .js,.vue src",
-        "fix": "eslint --ext .js,.vue --fix src",
-        "test:unit": "jest --clearCache && vue-cli-service test:unit",
-        "test:ci": "npm run lint && npm run test:unit",
-        "svgo": "svgo -f src/icons/svg --config=src/icas/svgo.yml",
-        "vue-i18n-extract": "vue-i18n-extract",
-        "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'",
-        "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json",
-        "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a",
-        "diff-i18n": "python ./src/i18n/langs/i18n-util.py diff en ja zh_Hant",
-        "apply-i18n": "python ./src/i18n/langs/i18n-util.py apply en ja zh_Hant"
-    },
-    "dependencies": {
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@fontsource/open-sans": "^5.0.24",
-        "@traptitech/markdown-it-katex": "^3.6.0",
-        "@ztree/ztree_v3": "3.5.44",
-        "axios": "0.28.0",
-        "axios-retry": "^3.1.9",
-        "caniuse-lite": "^1.0.30001642",
-        "cron-parser": "^4.0.0",
-        "crypto-js": "^4.1.1",
-        "css-color-function": "^1.3.3",
-        "decimal.js": "^10.4.3",
-        "deepmerge": "^4.2.2",
-        "dompurify": "^3.1.6",
-        "echarts": "4.7.0",
-        "element-ui": "^2.15.14",
-        "elementui-lts": "^2.16.0",
-        "eslint-plugin-html": "^6.0.0",
-        "highlight.js": "^11.9.0",
-        "install": "^0.13.0",
-        "jquery": "^3.6.1",
-        "js-cookie": "2.2.0",
-        "jsencrypt": "^3.2.1",
-        "less": "^3.10.3",
-        "less-loader": "^5.0.0",
-        "lodash": "^4.17.21",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.frompairs": "^4.0.1",
-        "lodash.get": "^4.4.2",
-        "lodash.has": "^4.5.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isempty": "^4.4.0",
-        "lodash.isequal": "^4.5.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.set": "^4.3.2",
-        "lodash.topairs": "^4.3.0",
-        "lodash.values": "^4.3.0",
-        "markdown-it": "^13.0.2",
-        "markdown-it-link-attributes": "^4.0.1",
-        "moment": "^2.29.4",
-        "moment-parseformat": "^4.0.0",
-        "normalize.css": "7.0.0",
-        "npm": "^7.8.0",
-        "nprogress": "0.2.0",
-        "path-to-regexp": "3.3.0",
-        "sortablejs": "^1.15.6",
-        "v-sanitize": "^0.0.13",
-        "vue": "2.6.10",
-        "vue-codemirror": "4.0.6",
-        "vue-cookie": "^1.1.4",
-        "vue-echarts": "^5.0.0-beta.0",
-        "vue-i18n": "^8.15.5",
-        "vue-json-editor": "^1.4.3",
-        "vue-markdown": "^2.2.4",
-        "vue-password-strength-meter": "^1.7.2",
-        "vue-router": "3.0.6",
-        "vue-select": "^3.9.5",
-        "vuejs-logger": "^1.5.4",
-        "vuex": "3.1.0",
-        "watermark-js-plus": "^1.5.8",
-        "xss": "^1.0.14",
-        "xterm": "^4.5.0",
-        "xterm-addon-fit": "^0.3.0",
-        "zxcvbn": "^4.4.2"
-    },
-    "devDependencies": {
-        "@babel/core": "7.18.6",
-        "@babel/register": "7.0.0",
-        "@vue/cli-plugin-babel": "3.6.0",
-        "@vue/cli-plugin-eslint": "^3.9.1",
-        "@vue/cli-plugin-unit-jest": "3.6.3",
-        "@vue/cli-service": "3.6.0",
-        "@vue/test-utils": "1.0.0-beta.29",
-        "autoprefixer": "^9.5.1",
-        "babel-core": "7.0.0-bridge.0",
-        "babel-eslint": "10.0.1",
-        "babel-jest": "23.6.0",
-        "chalk": "2.4.2",
-        "compression-webpack-plugin": "^6.1.1",
-        "connect": "3.6.6",
-        "deasync": "^0.1.29",
-        "eslint": "^5.15.3",
-        "eslint-plugin-spellcheck": "^0.0.20",
-        "eslint-plugin-vue": "5.2.2",
-        "eslint-plugin-vue-i18n": "^0.3.0",
-        "github-markdown-css": "^5.1.0",
-        "html-webpack-plugin": "3.2.0",
-        "husky": "^4.2.3",
-        "less-loader": "^5.0.0",
-        "lint-staged": "^10.1.2",
-        "mockjs": "1.0.1-beta3",
-        "pretty-bytes": "^5.6.0",
-        "runjs": "^4.3.2",
-        "sass": "~1.32.6",
-        "sass-loader": "^7.1.0",
-        "script-ext-html-webpack-plugin": "2.1.3",
-        "script-loader": "0.7.2",
-        "serve-static": "^1.16.0",
-        "strip-ansi": "^7.1.0",
-        "svg-sprite-loader": "4.1.3",
-        "svgo": "1.2.2",
-        "vue-i18n-extract": "^1.1.1",
-        "vue-template-compiler": "2.6.10"
-    },
-    "engines": {
-        "node": ">=8.9",
-        "npm": ">= 3.0.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 4 versions",
-        "ie 11"
-    ],
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
-    "lint-staged": {
-        "src/**/*.{js,vue}": [
-            "eslint --fix"
-        ]
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "name": "lina",
+  "version": "v4.0.0",
+  "description": "JumpServer Web UI",
+  "author": "JumpServer Team <support@lxware.hk>",
+  "license": "GPL-3.0-or-later",
+  "scripts": {
+    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src",
+    "fix": "eslint --ext .js,.vue --fix src",
+    "test:unit": "jest --clearCache && vue-cli-service test:unit",
+    "test:ci": "npm run lint && npm run test:unit",
+    "svgo": "svgo -f src/icons/svg --config=src/icas/svgo.yml",
+    "vue-i18n-extract": "vue-i18n-extract",
+    "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'",
+    "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json",
+    "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a",
+    "diff-i18n": "python ./src/i18n/langs/i18n-util.py diff en ja zh_Hant",
+    "apply-i18n": "python ./src/i18n/langs/i18n-util.py apply en ja zh_Hant"
+  },
+  "dependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+    "@fontsource/open-sans": "^5.0.24",
+    "@kangc/v-md-editor": "^1.7.12",
+    "@traptitech/markdown-it-katex": "^3.6.0",
+    "@ztree/ztree_v3": "3.5.44",
+    "axios": "0.28.0",
+    "axios-retry": "^3.1.9",
+    "babel-loader": "^10.0.0",
+    "cache-loader": "^4.1.0",
+    "caniuse-lite": "^1.0.30001642",
+    "cron-parser": "^4.0.0",
+    "crypto-js": "^4.1.1",
+    "css-color-function": "^1.3.3",
+    "decimal.js": "^10.4.3",
+    "deepmerge": "^4.2.2",
+    "dompurify": "^3.1.6",
+    "echarts": "4.7.0",
+    "element-ui": "^2.15.14",
+    "elementui-lts": "^2.16.0",
+    "eslint-plugin-html": "^6.0.0",
+    "highlight.js": "^11.9.0",
+    "install": "^0.13.0",
+    "jquery": "^3.6.1",
+    "js-cookie": "2.2.0",
+    "jsencrypt": "^3.2.1",
+    "less": "^3.10.3",
+    "less-loader": "^5.0.0",
+    "lodash": "^4.17.21",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.frompairs": "^4.0.1",
+    "lodash.get": "^4.4.2",
+    "lodash.has": "^4.5.2",
+    "lodash.includes": "^4.3.0",
+    "lodash.isempty": "^4.4.0",
+    "lodash.isequal": "^4.5.0",
+    "lodash.isplainobject": "^4.0.6",
+    "lodash.set": "^4.3.2",
+    "lodash.topairs": "^4.3.0",
+    "lodash.values": "^4.3.0",
+    "markdown-it": "^13.0.2",
+    "markdown-it-link-attributes": "^4.0.1",
+    "moment": "^2.29.4",
+    "moment-parseformat": "^4.0.0",
+    "normalize.css": "7.0.0",
+    "npm": "^7.8.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "3.3.0",
+    "sortablejs": "^1.15.6",
+    "v-sanitize": "^0.0.13",
+    "vue": "2.6.10",
+    "vue-codemirror": "4.0.6",
+    "vue-cookie": "^1.1.4",
+    "vue-echarts": "^5.0.0-beta.0",
+    "vue-i18n": "^8.15.5",
+    "vue-json-editor": "^1.4.3",
+    "vue-markdown": "^2.2.4",
+    "vue-password-strength-meter": "^1.7.2",
+    "vue-router": "3.0.6",
+    "vue-select": "^3.9.5",
+    "vuejs-logger": "^1.5.4",
+    "vuex": "3.1.0",
+    "watermark-js-plus": "^1.5.8",
+    "xss": "^1.0.14",
+    "xterm": "^4.5.0",
+    "xterm-addon-fit": "^0.3.0",
+    "zxcvbn": "^4.4.2"
+  },
+  "devDependencies": {
+    "@babel/core": "7.18.6",
+    "@babel/register": "7.0.0",
+    "@vue/cli-plugin-babel": "3.6.0",
+    "@vue/cli-plugin-eslint": "^3.9.1",
+    "@vue/cli-plugin-unit-jest": "3.6.3",
+    "@vue/cli-service": "3.6.0",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "6.26.3",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "23.6.0",
+    "chalk": "2.4.2",
+    "compression-webpack-plugin": "^6.1.1",
+    "connect": "3.6.6",
+    "deasync": "^0.1.29",
+    "eslint": "^5.15.3",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-spellcheck": "^0.0.20",
+    "eslint-plugin-vue": "5.2.2",
+    "eslint-plugin-vue-i18n": "^0.3.0",
+    "github-markdown-css": "^5.1.0",
+    "html-webpack-plugin": "3.2.0",
+    "husky": "^4.2.3",
+    "less-loader": "^5.0.0",
+    "lint-staged": "^10.1.2",
+    "mockjs": "1.0.1-beta3",
+    "prettier": "^3.6.2",
+    "pretty-bytes": "^5.6.0",
+    "runjs": "^4.3.2",
+    "sass": "~1.32.6",
+    "sass-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "2.1.3",
+    "script-loader": "0.7.2",
+    "serve-static": "^1.16.0",
+    "strip-ansi": "^7.1.0",
+    "svg-sprite-loader": "4.1.3",
+    "svgo": "1.2.2",
+    "vue-i18n-extract": "^1.1.1",
+    "vue-template-compiler": "2.6.10",
+    "webpack": "^4.28.4"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 4 versions",
+    "ie 11"
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix"
+    ]
+  }
 }
--- a/src/api/ops.js
+++ b/src/api/ops.js
@@ -61,13 +61,14 @@ export function stopJob(form) {
  })
 }

-export function JobUploadFile(form) {
+export function JobUploadFile(form, config = {}) {
  return request({
    url: '/api/v1/ops/jobs/upload/',
    method: 'post',
    headers: { 'Content-Type': 'multipart/form-data' },
    timeout: 60 * 60 * 1000,
-    data: form
+    data: form,
+    ...config
  })
 }

--- a/src/assets/img/dream_bg.png
+++ b/src/assets/img/dream_bg.png
--- a/src/components/Apps/ChatAi/components/Sidebar/index.vue
+++ b/src/components/Apps/ChatAi/components/Sidebar/index.vue
@@ -13,6 +13,8 @@
 </template>

 <script>
+import { BASE_URL } from '@/utils/common/index'
+
 export default {
  props: {
    active: {
@@ -41,6 +43,16 @@ export default {
    },
    handleExpand() {
      this.$emit('expand-full')
+    },
+    async openWebsite() {
+      let url = `${BASE_URL}/?_=${Date.now()}`
+      if (process.env.NODE_ENV !== 'production') {
+        url = url.replace('9528', '5173')
+      }
+
+      const newUrl = new URL(url)
+      window.open(newUrl.toString(), '_blank')
+      return url
    }
  }
 }
--- a/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue
+++ b/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue
@@ -25,6 +25,7 @@ export default {
  },
  data() {
    const [key, value] = toM2MJsonParams(this.object.assets)
+    const org_id = this.object.org_id || this.$store.getters.currentOrg.id
    return {
      config: {
        headerActions: {
@@ -33,7 +34,7 @@ export default {
          hasExport: false
        },
        tableConfig: {
-          url: `/api/v1/assets/assets/?${key}=${value}`,
+          url: `/api/v1/assets/assets/?${key}=${value}&oid=${org_id}`,
          columns: ['name', 'address', 'platform', 'type', 'is_active'],
          columnsShow: {
            min: ['name', 'address'],
--- a/src/components/Apps/ManyJsonTabs/UserJsonTab.vue
+++ b/src/components/Apps/ManyJsonTabs/UserJsonTab.vue
@@ -25,6 +25,7 @@ export default {
  },
  data() {
    const [key, value] = toM2MJsonParams(this.object.users)
+    const org_id = this.object.org_id || this.$store.getters.currentOrg.id
    return {
      config: {
        headerActions: {
@@ -33,7 +34,7 @@ export default {
          hasExport: false
        },
        tableConfig: {
-          url: `/api/v1/users/users/?${key}=${value}`,
+          url: `/api/v1/users/users/?${key}=${value}&oid=${org_id}`,
          columns: [
            'name', 'username', 'email', 'groups', 'system_roles',
            'org_roles', 'source', 'is_valid'
--- a/src/components/Apps/VariablesHelpTextDialog/index.vue
+++ b/src/components/Apps/VariablesHelpTextDialog/index.vue
@@ -0,0 +1,100 @@
+<template>
+  <Dialog
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="title"
+    :visible.sync="iVisible"
+    class="help-dialog"
+    top="1vh"
+    width="50%"
+  >
+    <p>{{ variablesHelpText }}</p>
+    <table border="1" class="help-table">
+      <tr>
+        <th>{{ $tc('Variable') }}</th>
+        <th>{{ $tc('Description') }}</th>
+        <th>{{ $tc('Example') }}</th>
+      </tr>
+      <tr v-for="(item, index) in variables" :key="index">
+        <td :title="$tc('ClickCopy')" class="item-td text-link" @click="onCopy(item.name)">
+          <label class="item-label">{{ item.name }}</label>
+        </td>
+        <td><span>{{ item.label }}</span></td>
+        <td><span>{{ item.default }}</span></td>
+      </tr>
+    </table>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import { copy } from '@/utils/common/index'
+
+export default {
+  components: {
+    Dialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    variables: {
+      type: Array,
+      default: () => []
+    },
+    variablesHelpText: {
+      type: String,
+      default() {
+        return this.$t('WatermarkVariableHelpText')
+      }
+    }
+  },
+  data() {
+    return {
+      title: this.$t('BuiltinVariable')
+    }
+  },
+  computed: {
+    iVisible: {
+      set(val) {
+        this.$emit('update:visible', val)
+      },
+      get() {
+        return this.visible
+      }
+    }
+  },
+  methods: {
+    onCopy(key) {
+      copy(key)
+    }
+  }
+}
+</script>
+
+<style>
+.help-dialog.dialog .el-dialog__footer {
+  border-top: none;
+  padding: 8px;
+}
+</style>
+
+<style lang="scss" scoped>
+.help-table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 1px solid #dee2e6;
+
+  &::v-deep th, td {
+    height: 40px;
+    padding: 0 8px;
+    text-align: left;
+  }
+
+  &::v-deep .item-td, .item-label {
+    cursor: pointer;
+    color: var(--color-primary);
+  }
+}
+</style>
--- a/src/components/Common/DataActions/index.vue
+++ b/src/components/Common/DataActions/index.vue
@@ -5,7 +5,7 @@
        v-if="action.dropdown"
        v-show="action.dropdown.length > 0"
        :key="action.name"
-        :class="[action.name, {grouped: action.grouped }]"
+        :class="[action.name, { grouped: action.grouped }]"
        :size="action.size"
        :split-button="!!action.split"
        :type="action.type"
@@ -23,7 +23,7 @@
          :class="action.name"
          :size="size"
          class="more-action"
-          v-bind="{...cleanButtonAction(action), icon: ''}"
+          v-bind="{ ...cleanButtonAction(action), icon: '' }"
        >
          <span class="pre-icon">
            <Icon v-if="action.icon" :icon="action.icon" />
@@ -32,13 +32,13 @@
            {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
          </span>
        </el-button>
-        <el-dropdown-menu slot="dropdown" style="overflow: auto;max-height: 60vh">
+        <el-dropdown-menu slot="dropdown" style="overflow: auto; max-height: 60vh">
          <template v-for="option in action.dropdown">
            <div
              v-if="option.group"
-              :key="'group:'+option.name"
+              :key="'group:' + option.name"
              class="dropdown-menu-title"
-              style="width:130px"
+              style="width: 130px"
            >
              {{ option.group }}
            </div>
@@ -54,7 +54,7 @@
                :command="[option, action]"
                :title="option.tip"
                class="dropdown-item"
-                v-bind="{...option, icon: ''}"
+                v-bind="{ ...option, icon: '' }"
              >
                <span v-if="actionsHasIcon(action.dropdown)" class="pre-icon">
                  <Icon v-if="option.icon" :icon="option.icon" />
@@ -69,10 +69,10 @@
      <el-button
        v-else
        :key="action.name"
-        :class="[action.name, {grouped: action.grouped }]"
+        :class="[action.name, { grouped: action.grouped }]"
        :size="size"
        class="action-item"
-        v-bind="{...cleanButtonAction(action), icon: ''}"
+        v-bind="{ ...cleanButtonAction(action), icon: '' }"
        @click="handleClick(action)"
      >
        <el-tooltip :content="action.tip" :disabled="!action.tip" placement="top">
@@ -228,9 +228,9 @@ export default {

 <style lang="scss" scoped>
 $btn-text-color: #ffffff;
-$color-btn-background: #E8F7F4;
-$color-btn-focus-background: #83CBBA;
-$color-divided: #E4E7ED;
+$color-btn-background: #e8f7f4;
+$color-btn-focus-background: #83cbba;
+$color-divided: #e4e7ed;
 $color-drop-menu-title: #909399;
 $color-drop-menu-border: #e4e7ed;

@@ -284,6 +284,8 @@ $color-drop-menu-border: #e4e7ed;

  .el-button {
    padding: 2px 5px;
+    line-height: 1.3;
+    font-size: 13px;

    &:not(.is-plain) {
      color: $btn-text-color;
@@ -319,7 +321,6 @@ $color-drop-menu-border: #e4e7ed;
 // 下拉 options
 .el-dropdown-menu {
  ::v-deep .more-batch-processing {
-
    &:hover {
      background-color: transparent !important;
    }
--- a/src/components/Dashboard/ColumnChart.vue
+++ b/src/components/Dashboard/ColumnChart.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="content">
-    <echarts
+  <div>
+    <Echart
      ref="echarts"
      :options="options"
      :autoresize="true"
@@ -12,9 +12,10 @@
 // eslint-disable-next-line no-unused-vars
 import * as echarts from 'echarts'
 import { mix } from '@/utils/theme/color'
+import Echart from '@/components/Dashboard/Echart.vue'

 export default {
-  components: {},
+  components: { Echart },
  props: {
    datesMetrics: {
      type: Array,
--- a/src/components/Dashboard/Echart.vue
+++ b/src/components/Dashboard/Echart.vue
@@ -0,0 +1,71 @@
+<template>
+  <echarts
+    :options="iOptions"
+    v-bind="$attrs"
+    @finished="onFinished"
+    v-on="$listeners"
+  />
+</template>
+
+<script>
+import 'echarts'
+
+export default {
+  components: {},
+  props: {
+    options: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    const urlParams = new URLSearchParams(window.location.search)
+    const isExport = urlParams.get('export') === 'true'
+    return {
+      isExport: isExport
+    }
+  },
+  computed: {
+    iOptions() {
+      return {
+        ...this.options,
+        animation: !this.isExport
+      }
+    }
+  },
+  created() {
+    if (!window._echarts) {
+      window._echarts = {
+        total: new Set(),
+        finished: new Set()
+      }
+    }
+    // 唯一 id，避免重复计数
+    this._chartId = `chart_${Date.now()}_${Math.random().toString(36).slice(2)}`
+    window._echarts.total.add(this._chartId)
+  },
+  beforeDestroy() {
+    if (window._echarts) {
+      window._echarts.total.delete(this._chartId)
+      window._echarts.finished.delete(this._chartId)
+      // 可选：当没有图表时清理全局对象
+      if (window._echarts.total.size === 0) {
+        delete window._echarts
+        delete window.echartsFinished
+      }
+    }
+  },
+  methods: {
+    onFinished() {
+      if (!window._echarts) return
+      window._echarts.finished.add(this._chartId)
+      if (window._echarts.finished.size === window._echarts.total.size) {
+        window.echartsFinished = true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
--- a/src/components/Dashboard/LineChart.vue
+++ b/src/components/Dashboard/LineChart.vue
@@ -1,20 +1,12 @@
 <template>
  <div>
-    <echarts
+    <Echart
      ref="echarts"
      :options="options"
      :autoresize="true"
      theme="light"
-      :class="{'disabled-when-print': !!dataUrl}"
      @finished="genSnapshot"
    />
-    <img
-      v-if="dataUrl"
-      :src="dataUrl"
-      class="enabled-when-print"
-      style="display: none;width: 100%;"
-      alt="chart snapshot"
-    >
  </div>
 </template>

@@ -22,9 +14,11 @@
 // eslint-disable-next-line no-unused-vars
 import * as echarts from 'echarts'
 import { mix } from '@/utils/theme/color'
+import Echart from '@/components/Dashboard/Echart.vue'

 export default {
  name: 'LoginMetric',
+  components: { Echart },
  props: {
    range: {
      type: String,
@@ -285,14 +279,4 @@ export default {
  width: 100%;
  height: 272px;
 }
-
-@media print {
-  .disabled-when-print {
-    display: none !important;
-  }
-  .enabled-when-print {
-    display: block !important;
-    width: 100% !important;
-  }
-}
 </style>
--- a/src/components/Dashboard/ProgressChart.vue
+++ b/src/components/Dashboard/ProgressChart.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
-    <echarts
+    <Echart
      ref="echarts"
      :options="options"
      :autoresize="true"
@@ -13,8 +13,10 @@
 // eslint-disable-next-line no-unused-vars
 import * as echarts from 'echarts'
 import { mix } from '@/utils/theme/color'
+import Echart from '@/components/Dashboard/Echart.vue'

 export default {
+  components: { Echart },
  props: {
    colors: {
      type: Array,
@@ -35,14 +37,15 @@ export default {
    }
  },
  data() {
-    return {
-    }
+    return {}
  },
  computed: {
    options() {
      const seriesList = []
      const labels = this.data.map(item => item.label)
-      const total = _.sumBy(this.data, function(i) { return i.total })
+      const total = _.sumBy(this.data, function(i) {
+        return i.total
+      })
      for (let i = 0, len = this.data.length; i < len; i++) {
        const current = this.data[i]
        let num = (current.total / total) * 100
@@ -177,8 +180,8 @@ export default {
 </script>

 <style lang="scss" scoped>
-  .echarts {
-    width: 100%;
-    height: 72px;
-  }
+.echarts {
+  width: 100%;
+  height: 72px;
+}
 </style>
--- a/src/components/Dashboard/RealTimeSummary.vue
+++ b/src/components/Dashboard/RealTimeSummary.vue
@@ -38,7 +38,7 @@ export default {
        {
          title: this.$t('OnlineSessions'),
          body: {
-            route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
+            route: { name: `SessionList`, params: { activeMenu: 'OnlineList' } },
            count: this.counter.total_count_online_sessions,
            disabled: !this.$hasPerm('terminal.view_session')
          }
@@ -46,7 +46,7 @@ export default {
        {
          title: this.$t('CurrentConnectionUsers'),
          body: {
-            route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
+            route: { name: `SessionList`, params: { activeMenu: 'OnlineList' } },
            count: this.counter.total_count_online_users,
            disabled: !this.$hasPerm('terminal.view_session')
          }
--- a/src/components/Dashboard/RingChart.vue
+++ b/src/components/Dashboard/RingChart.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
-    <echarts
+    <Echart
      ref="echarts"
      :autoresize="true"
      :options="options"
@@ -13,12 +13,15 @@ import 'echarts/lib/chart/line'
 import 'echarts/lib/component/legend'

 import Decimal from 'decimal.js'
+import Echart from '@/components/Dashboard/Echart.vue'

 export default {
+  components: { Echart },
  props: {
    config: {
      type: Object,
-      default: () => {}
+      default: () => {
+      }
    }
  },
  computed: {
--- a/src/components/Form/AutoDataForm/index.vue
+++ b/src/components/Form/AutoDataForm/index.vue
@@ -5,6 +5,7 @@
      ref="dataForm"
      :fields="totalFields"
      :form="iForm"
+      :server-errors="serverErrors"
      v-bind="$attrs"
      v-on="$listeners"
    >
@@ -65,7 +66,8 @@ export default {
      totalFields: [],
      loading: true,
      groups: [],
-      errors: {}
+      errors: {},
+      serverErrors: {}
    }
  },
  computed: {
@@ -103,6 +105,8 @@ export default {
      this.generateColumns()
      this.$emit('afterGenerateColumns', this.totalFields)
      this.cleanFormValue()
+      // 初始化时清空错误
+      this.serverErrors = {}
      this.loading = false
    },
    generateColumns() {
@@ -139,15 +143,56 @@ export default {
    cleanFormValue() {
      this._cleanFormValue(this.iForm, this.remoteMeta)
    },
-    setFieldError(name, error) {
-      error = error.replace(/[。.]+$/, '')
-      const field = this.totalFields.find((v) => v.prop === name)
-      if (!field) {
-        return
+    _getElFormInstance() {
+      try {
+        return this.$refs?.dataForm?.$refs?.form?.$refs?.elForm || null
+      } catch (e) {
+        return null
      }
-      if (typeof error === 'string') {
-        field.el.errors = error
-        field.attrs.error = error
+    },
+    /**
+     * @description 仅清理 UI 的错误展示,不触发表单内容重建
+     */
+    clearAllFieldErrors() {
+      const elForm = this._getElFormInstance()
+      if (elForm && Array.isArray(elForm.fields)) {
+        elForm.fields.forEach((item) => {
+          item.validateMessage = ''
+          item.validateState = ''
+        })
+      }
+      // 不修改 totalFields/attrs，避免触发 content 重建导致输入丢失
+      this.serverErrors = {}
+    },
+    setFieldError(name, error) {
+      error = (error || '').toString().replace(/[。.]+$/, '')
+      const elForm = this._getElFormInstance()
+      if (elForm && Array.isArray(elForm.fields)) {
+        const item = elForm.fields.find(f => f.prop === name)
+        if (item) {
+          item.validateMessage = error
+          item.validateState = error ? 'error' : ''
+        }
+      }
+      // 不写入 totalFields，避免触发 innerContent 变化导致表单值被覆盖
+      this.$set(this.serverErrors, name, error)
+    },
+    setErrors(errors) {
+      const mapped = {}
+      Object.entries(errors || {}).forEach(([k, v]) => {
+        let msg = v
+        if (Array.isArray(v)) msg = v.join('; ')
+        else if (typeof v === 'object' && v !== null) msg = JSON.stringify(v)
+        mapped[k] = String(msg || '')
+      })
+      this.serverErrors = mapped
+      const elForm = this._getElFormInstance()
+      if (elForm && Array.isArray(elForm.fields)) {
+        elForm.fields.forEach((item) => {
+          const msg = mapped[item.prop] || ''
+          item.validateMessage = msg
+          item.validateState = msg ? 'error' : ''
+        })
      }
    },
    groupHidden(group, i) {
--- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
+++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
@@ -6,6 +6,7 @@
    :prop="prop"
    :rules="_show && Array.isArray(data.rules) ? data.rules : []"
    v-bind="data.attrs"
+    :error="errorText"
  >
    <template v-if="data.label" #label>
      <span :title="data.label">
@@ -152,6 +153,10 @@ export default {
  props: {
    // eslint-disable-next-line vue/require-default-prop
    data: Object,
+    serverErrors: {
+      type: Object,
+      default: () => ({})
+    },
    prop: {
      type: String,
      default() {
@@ -179,7 +184,7 @@ export default {
  computed: {
    // 解构运算符会处理 undefined 的情况
    componentProps: ({ data: { el }, propsInner }) => ({ ...el, ...propsInner }),
-    hasReadonlyContent: ({ data: { type }}) => _includes(['input', 'select'], type),
+    hasReadonlyContent: ({ data: { type } }) => _includes(['input', 'select'], type),
    hiddenStatus: ({ data: { hidden = () => false }, data, value }) => hidden(value, data),
    enableWhenStatus: ({ data: { enableWhen }, value }) => getEnableWhenStatus(enableWhen, value),
    // 是否显示
@@ -189,6 +194,11 @@ export default {
    classes() {
      return 'el-form-item-' + this.data.prop + ' ' + (this.data.attrs?.class || '')
    },
+    errorText() {
+      const fromAttrs = this.data?.attrs?.error
+      const fromServer = this.serverErrors ? this.serverErrors[this.data.prop] : ''
+      return fromAttrs || fromServer || ''
+    },
    listeners() {
      const {
        data: {
--- a/src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue
+++ b/src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue
@@ -6,6 +6,7 @@
        :is="item.type === GROUP ? 'render-form-group' : 'render-form-item'"
        :key="item.id"
        :data="item"
+        :server-errors="serverErrors"
        :disabled="disabled || item.disabled"
        :item-value="value[item.id]"
        :options="options[item.id]"
@@ -47,6 +48,10 @@ export default {
      type: Array,
      required: true
    },
+    serverErrors: {
+      type: Object,
+      default: () => ({})
+    },
    disabled: {
      type: Boolean,
      default: false
--- a/src/components/Form/DataForm/index.vue
+++ b/src/components/Form/DataForm/index.vue
@@ -11,6 +11,7 @@
      :label-width="labelWidth"
      :style="{ '--label-width': labelWidth }"
      v-bind="$attrs"
+      :server-errors="serverErrors"
      v-on="$listeners"
    >
      <!-- slot 透传 -->
@@ -55,7 +56,7 @@

        <el-button
          v-for="button in moreButtons"
-          v-show="!button.hidden"
+          v-show="!iHidden(button)"
          :key="button.title"
          :loading="button.loading"
          size="small"
@@ -121,6 +122,10 @@ export default {
      type: Boolean,
      default: true
    },
+    serverErrors: {
+      type: Object,
+      default: () => ({})
+    },
    fields: {
      type: Array,
      default: () => []
@@ -226,6 +231,9 @@ export default {
    },
    getFormValue() {
      return this.$refs.form.getFormValue()
+    },
+    iHidden(item) {
+      return typeof item.hidden === 'function' ? item.hidden() : item.hidden
    }
  }
 }
--- a/src/components/Form/FormFields/CodeEditor.vue
+++ b/src/components/Form/FormFields/CodeEditor.vue
@@ -14,6 +14,7 @@
              <el-button
                :type="item.el && item.el.type"
                class="start-stop-btn"
+                :disabled="item.disabled"
                size="mini"
                @click="item.callback()"
              >
--- a/src/components/Form/FormFields/NestedObjectSelect2.vue
+++ b/src/components/Form/FormFields/NestedObjectSelect2.vue
@@ -19,7 +19,7 @@ export default {
  props: {
    value: {
      type: [Array, String, Number, Boolean, Object],
-      default: () => ([])
+      default: () => []
    },
    multiple: {
      type: Boolean,
@@ -36,7 +36,7 @@ export default {
  },
  computed: {
    attrsWithoutValue() {
-      const attrs = Object.assign({}, this.$attrs)
+      const attrs = Object.assign({ clearable: this.clearable }, this.$attrs)
      delete attrs.value
      return attrs
    },
@@ -50,6 +50,13 @@ export default {
        const value = this.objectsToValues(this.value)
        return value
      }
+    },
+    clearable() {
+      if (this.$attrs.clearable === undefined) {
+        return this.multiple
+      } else {
+        return this.$attrs.clearable
+      }
    }
  },
  methods: {
@@ -71,8 +78,11 @@ export default {
      value = value.map(v => {
        // uuid v4
        const uuid = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
-        return typeof v === 'object' ? v
-          : this.$attrs?.allowCreate && !uuid.test(v) ? { [this.customLabelKeyName]: v } : { pk: v }
+        return typeof v === 'object'
+          ? v
+          : this.$attrs?.allowCreate && !uuid.test(v)
+            ? { [this.customLabelKeyName]: v }
+            : { pk: v }
      })
      if (!this.multiple) {
        value = value[0]
@@ -87,9 +97,13 @@ export default {
      if (!Array.isArray(val)) {
        val = [val]
      }
-      val = val.map((v) => {
+      val = val.map(v => {
        if (v && typeof v === 'object') {
-          return v.pk || v.id || (this.$attrs?.allowCreate ? (v?.[this.customLabelKeyName] + ':' + v?.value) : '')
+          return (
+            v.pk ||
+            v.id ||
+            (this.$attrs?.allowCreate ? v?.[this.customLabelKeyName] + ':' + v?.value : '')
+          )
        } else {
          return v
        }
@@ -103,6 +117,4 @@ export default {
 }
 </script>

-<style scoped>
-
-</style>
+<style scoped></style>
--- a/src/components/Form/FormFields/TagInput.vue
+++ b/src/components/Form/FormFields/TagInput.vue
@@ -33,6 +33,9 @@
    >
      <i :class="[isCheckShowPassword ? 'fa-eye-slash' : 'fa-eye']" class="fa" />
    </span>
+    <span v-if="filterTags.length > 0" class="clear-icon" @click="handleClearAll">
+      <i class="el-icon-circle-close" :title="$t('Clear')" />
+    </span>
  </div>
 </template>

@@ -140,6 +143,11 @@ export default {
    },
    handleShowPassword() {
      this.isCheckShowPassword = !this.isCheckShowPassword
+    },
+    handleClearAll() {
+      this.filterTags = []
+      this.$emit('change', this.filterTags)
+      this.$emit('input', this.filterTags)
    }
  }
 }
@@ -161,11 +169,12 @@ export default {
  line-height: 30px;

  &:hover {
-    border-color: #C0C4CC;
+    border-color: #c0c4cc;
  }

  & ::v-deep .el-tag {
-    margin-bottom: 1px;
+    margin-bottom: 2px;
+    margin-top: 2px;
    font-family: sans-serif !important;
    margin-left: 5px;
  }
@@ -177,6 +186,7 @@ export default {

 .search-input {
  flex: 1;
+  min-width: 150px;

  & ::v-deep .el-input__inner {
    max-width: 100%;
@@ -204,4 +214,15 @@ export default {
    color: #999999;
  }
 }
+
+.clear-icon {
+  display: inherit;
+  padding-right: 6px;
+  cursor: pointer;
+  color: #c0c4cc;
+
+  &:hover {
+    color: #606164;
+  }
+}
 </style>
--- a/src/components/Form/FormFields/TransferSelect.vue
+++ b/src/components/Form/FormFields/TransferSelect.vue
@@ -68,7 +68,7 @@ export default {
      return { label: item.name, value: item.id }
    })
    const url = vm.url || vm.ajax.url
-    const getPageData = async({ pageIndex, pageSize, keyword }) => {
+    const getPageData = async ({ pageIndex, pageSize, keyword }) => {
      const limit = pageSize
      const offset = (pageIndex - 1) * pageSize
      const params = {
--- a/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue
@@ -5,6 +5,11 @@
      <slot name="no-data" />
    </template>
    <template v-else>
+      <!--
+        过滤 selection 相关事件的透传，避免父组件收到 el-table 原生的“当前页” selection，
+        导致跨页选择（persistSelection）被覆盖，只剩当页数据。
+        选择事件统一走 selectStrategy，在内部维护全量 selected 并向外 emit。
+      -->
      <el-table
        ref="table"
        v-loading="tableLoading"
@@ -12,7 +17,7 @@
        :row-class-name="rowClassName"
        v-bind="tableAttrs"
        @select="selectStrategy.onSelect"
-        v-on="$listeners"
+        v-on="forwardListeners"
        @selection-change="selectStrategy.onSelectionChange"
        @select-all="handleSelectAll($event, canSelect)"
        @sort-change="onSortChange"
@@ -810,6 +815,16 @@ export default {
    selectStrategy() {
      return getSelectStrategy(this)
    },
+    // 过滤会与内部选择策略冲突的事件，避免父组件只拿到当前页 selection
+    forwardListeners() {
+      const listeners = { ...this.$listeners }
+      delete listeners['selection-change']
+      delete listeners['select']
+      delete listeners['select-all']
+      // 外层如需监听 selection 变化，请监听本组件透出的 selection-change，
+      // 该事件来自选择策略，已汇总跨页后的全量 selected
+      return listeners
+    },
    searchLocatedSlotKeys() {
      return getLocatedSlotKeys(this.$slots, 'search:')
    },
@@ -1189,7 +1204,7 @@ export default {
      this.$confirm(this.deleteMessage(data), this.$t('Info'), {
        type: 'warning',
        confirmButtonClass: 'el-button--danger',
-        beforeClose: async(action, instance, done) => {
+        beforeClose: async (action, instance, done) => {
          if (action !== 'confirm') return done()

          instance.confirmButtonLoading = true
--- a/src/components/Table/DataTable/compenents/el-data-table/utils/select-strategy.js
+++ b/src/components/Table/DataTable/compenents/el-data-table/utils/select-strategy.js
@@ -1,14 +1,9 @@
-/**
- * 两种多选策略：Normal 和 PersistSelection
- */
-
 /**
 * 多选策略接口
 */
 class StrategyAbstract {
  constructor(elDataTable) {
    this.elDataTable = elDataTable
-    // 绑定this后可直接在template中使用
    this.onSelectionChange = this.onSelectionChange.bind(this)
    this.onSelect = this.onSelect.bind(this)
    this.onSelectAll = this.onSelectAll.bind(this)
@@ -18,39 +13,22 @@ class StrategyAbstract {
    return this.elDataTable.$refs.table
  }

-  onSelectionChange() {
-  }
-
-  onSelect() {
-  }
-
-  onSelectAll() {
-  }
-
-  toggleRowSelection() {
-  }
-
-  clearSelection() {
-  }
-
-  updateElTableSelection() {
-  }
+  onSelectionChange() {}
+  onSelect() {}
+  onSelectAll() {}
+  toggleRowSelection() {}
+  clearSelection() {}
+  updateElTableSelection() {}
 }

 /**
- * 普通策略。由el-table维护selected
+ * 普通策略。由 el-table 自己维护 selection
 */
 class StrategyNormal extends StrategyAbstract {
-  /**
-   * normal模式下只需要监听selection-change事件
-   */
  onSelectionChange(val) {
    this.elDataTable.selected = val
  }

-  /**
-   * toggleRowSelection和clearSelection的表现与el-table一致
-   */
  toggleRowSelection(...args) {
    return this.elTable.toggleRowSelection(...args)
  }
@@ -61,44 +39,28 @@ class StrategyNormal extends StrategyAbstract {
 }

 /**
- * 跨页保存多选策略。手动维护selected数组
+ * 跨页保存多选策略
 */
 class StrategyPersistSelection extends StrategyAbstract {
-  /**
-   * el-table的selection-change事件不适用于开启跨页保存的情况。
-   * 比如，当开启persistSelection时，发生以下两个场景：
-   * 1. 用户点击翻页
-   * 2. 用户点击行首的切换全选项按钮，清空当前页多选项数据
-   * 其中场景1应该保持selected不变；而场景2只应该从selected移除当前页所有行，保留其他页面的多选状态。
-   * 但el-table的selection-change事件在两个场景中无差别发生，所以这里不处理这个事件
-   */
-
-  /**
-   * 用户切换某一行的多选
-   */
  onSelect(selection, row) {
    const isChosen = selection.indexOf(row) > -1
    this.toggleRowSelection(row, isChosen)
+    // el-table 原生 selection-change 仅包含当前页。为保证跨页勾选有效，
+    // 在内部策略维护完 selected 后，向外部同步“全量已选”。
+    this.elDataTable.$emit('selection-change', this.elDataTable.selected)
  }

-  /**
-   * 用户切换当前页的多选
-   */
  onSelectAll(selection, selectable = () => true) {
    const { id, selected, data } = this.elDataTable
    const selectableRows = data.filter(selectable)
-    // const isSelected = !!selection.length

-    // 创建已选择项的 id 集合，用于快速查找
    const selectedIds = new Set(selected.map(r => r[id]))
    const currentPageIds = new Set(selectableRows.map(row => row[id]))

-    // 前页面的选中状态
    const currentPageSelectedCount = selectableRows.filter(row =>
      selectedIds.has(row[id])
    ).length

-    // 判断是全选还是取消全选
    const shouldSelectAll = currentPageSelectedCount < selectableRows.length

    this.elTable?.clearSelection()
@@ -106,15 +68,11 @@ class StrategyPersistSelection extends StrategyAbstract {
    if (shouldSelectAll) {
      selectableRows.forEach(row => {
        if (!selectedIds.has(row[id])) selected.push(row)
-
        this.elTable.toggleRowSelection(row, true)
-
-        // ! 这里需要触发事件，否则在 el-table 中无法触发 selection-change 事件
        this.elDataTable.$emit('toggle-row-selection', true, row)
      })
    } else {
      const newSelected = []
-
      selected.forEach(row => {
        if (!currentPageIds.has(row[id])) {
          newSelected.push(row)
@@ -122,17 +80,12 @@ class StrategyPersistSelection extends StrategyAbstract {
          this.elDataTable.$emit('toggle-row-selection', false, row)
        }
      })
-
      this.elDataTable.selected = newSelected
    }

    this.elDataTable.$emit('selection-change', this.elDataTable.selected)
  }

-  /**
-   * toggleRowSelection和clearSelection管理elDataTable的selected数组
-   * 记得最后要将状态同步到el-table中
-   */
  toggleRowSelection(row, isSelected) {
    const { id, selected } = this.elDataTable
    const foundIndex = selected.findIndex(r => r[id] === row[id])
@@ -149,26 +102,24 @@ class StrategyPersistSelection extends StrategyAbstract {

    this.elDataTable.$emit('toggle-row-selection', isSelected, row)
    this.updateElTableSelection()
+    // 切换后同步全量 selection（跨页）
+    this.elDataTable.$emit('selection-change', this.elDataTable.selected)
  }

  clearSelection() {
    this.elDataTable.selected = []
    this.updateElTableSelection()
+    // 清空后也同步给外部，保持外层状态一致
+    this.elDataTable.$emit('selection-change', this.elDataTable.selected)
  }

-  /**
-   * 将selected状态同步到el-table中
-   */
  updateElTableSelection() {
    const { data, id, selected } = this.elDataTable
    const selectedIds = new Set(selected.map(r => r[id]))
-
    this.elTable?.clearSelection()

    data.forEach(row => {
      const shouldBeSelected = selectedIds.has(row[id])
-      if (!this.elTable) return
-
      if (shouldBeSelected) {
        this.elTable.toggleRowSelection(row, true)
      }
--- a/src/components/Table/TableFormatters/ActionsFormatter.vue
+++ b/src/components/Table/TableFormatters/ActionsFormatter.vue
@@ -23,7 +23,7 @@ const defaultPerformDelete = function({ row, col }) {

 const defaultUpdateCallback = function({ row, col }) {
  const id = row.id
-  let route = { params: { id: id }}
+  let route = { params: { id: id } }
  const updateRoute = this.colActions.updateRoute

  if (typeof updateRoute === 'object') {
@@ -39,7 +39,7 @@ const defaultUpdateCallback = function({ row, col }) {

 const defaultViewCallback = function({ row, col }) {
  const id = row.id
-  let route = { params: { id: id }}
+  let route = { params: { id: id } }
  const viewRoute = this.colActions.viewRoute

  if (typeof updateRoute === 'object') {
@@ -55,7 +55,7 @@ const defaultViewCallback = function({ row, col }) {

 const defaultCloneCallback = function({ row, col }) {
  const id = row.id
-  let route = { query: { clone_from: id }}
+  let route = { query: { clone_from: id } }
  const cloneRoute = this.colActions.cloneRoute

  if (typeof cloneRoute === 'object') {
@@ -82,7 +82,7 @@ const defaultDeleteCallback = function({ row, col, cellValue, reload }) {
    type: 'warning',
    confirmButtonClass: 'el-button--danger',
    showCancelButton: true,
-    beforeClose: async(action, instance, done) => {
+    beforeClose: async (action, instance, done) => {
      if (action !== 'confirm') return done()
      instance.confirmButtonLoading = true
      try {
--- a/src/components/Table/TagSearch/index.vue
+++ b/src/components/Table/TagSearch/index.vue
@@ -244,12 +244,10 @@ export default {
        delete routeFilter.search
      }
      const asFilterTags = _.cloneDeep(this.filterTags)
-      setTimeout(() => {
-        this.filterTags = {
-          ...asFilterTags,
-          ...routeFilter
-        }
-      }, 100)
+      this.filterTags = {
+        ...asFilterTags,
+        ...routeFilter
+      }
    },
    getValueLabel(key, value) {
      for (const field of this.options) {
--- a/src/components/Table/TreeTable/index.vue
+++ b/src/components/Table/TreeTable/index.vue
@@ -8,7 +8,7 @@
        class="left"
      >
        <span v-if="component === 'AutoDataZTree'" class="title">
-          {{ $t('AssetTree') }}
+          {{ title }}
        </span>
        <component
          :is="component"
@@ -111,6 +111,13 @@ export default {
    headerActions: {
      type: Object,
      default: () => ({})
+    },
+    title: {
+      // eslint-disable-next-line vue/require-prop-type-constructor
+      type: String,
+      default() {
+        return this.$t('AssetTree')
+      }
    }
  },
  data() {
--- a/src/components/Widgets/Announcement/index.vue
+++ b/src/components/Widgets/Announcement/index.vue
@@ -1,20 +1,52 @@
 <template>
-  <el-alert
-    v-if="enabled && !isViewed()"
-    :center="false"
-    :title="title"
-    class="announcement"
-    type="success"
-    @close="onClose"
-  >
-    <MarkDown :value="announcement.content" class="markdown" />
-    <span v-if="announcement.link">
-      <el-link :href="announcement.link" class="link-more" target="_blank" type="info">
-        {{ $t('ViewMore') }}
-      </el-link>
-      <i class="fa fa-external-link icon" />
-    </span>
-  </el-alert>
+  <div>
+    <el-dialog
+      v-if="enabled && showModal"
+      :visible.sync="dialogVisible"
+      :title="title"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      width="35%"
+      class="announcement-dialog"
+      center
+    >
+      <div class="announcement-content">
+        <div class="content-wrapper">
+          <MarkDown :value="announcement.content" class="markdown" />
+        </div>
+        <div v-if="announcement.link" class="link-section">
+          <el-link :href="announcement.link" class="link-more" target="_blank" type="info">
+            {{ $t('ViewMore') }}
+          </el-link>
+          <i class="fa fa-external-link icon" />
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="onModalConfirm">
+          {{ $t('Confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+
+    <el-alert
+      v-if="enabled && showAlert"
+      :center="false"
+      :title="title"
+      class="announcement"
+      type="success"
+      @close="onAlertClose"
+    >
+      <MarkDown :value="announcement.content" class="markdown" />
+      <span v-if="announcement.link">
+        <el-link :href="announcement.link" class="link-more" target="_blank" type="info">
+          {{ $t('ViewMore') }}
+        </el-link>
+        <i class="fa fa-external-link icon" />
+      </span>
+    </el-alert>
+  </div>
 </template>

 <script>
@@ -26,7 +58,11 @@ export default {
  components: { MarkDown },
  data() {
    return {
-      viewedKey: 'AnnouncementViewed'
+      viewedKey: 'AnnouncementViewed',
+      modalConfirmedKey: 'AnnouncementModalConfirmed',
+      dialogVisible: false,
+      modalConfirmed: false,
+      alertViewed: false
    }
  },
  computed: {
@@ -58,48 +94,200 @@ export default {
      const start = new Date(this.announcement.date_start)
      const end = new Date(this.announcement.date_end)
      return now >= start && now <= end
+    },
+    showModal() {
+      return !this.modalConfirmed
+    },
+    showAlert() {
+      return this.modalConfirmed && !this.alertViewed
    }
  },
+  watch: {
+    enabled: {
+      handler(val) {
+        if (val) {
+          this.initializeState()
+          this.checkAndShowDialog()
+        }
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    this.initializeState()
+    this.checkAndShowDialog()
+  },
  methods: {
-    onClose() {
-      localStorage.setItem(this.viewedKey, this.announcement.id)
+    initializeState() {
+      this.modalConfirmed = this.isModalConfirmed()
+      this.alertViewed = this.isAlertViewed()
    },
-    isViewed() {
+    checkAndShowDialog() {
+      if (this.enabled && this.showModal) {
+        this.dialogVisible = true
+      }
+    },
+    onModalConfirm() {
+      localStorage.setItem(this.modalConfirmedKey, this.announcement.id)
+      this.modalConfirmed = true
+      this.dialogVisible = false
+
+      this.$emit('announcement-modal-confirmed', {
+        id: this.announcement.id,
+        subject: this.announcement.subject,
+        confirmedAt: new Date().toISOString()
+      })
+    },
+    onAlertClose() {
+      localStorage.setItem(this.viewedKey, this.announcement.id)
+      this.alertViewed = true
+
+      this.$emit('announcement-read', {
+        id: this.announcement.id,
+        subject: this.announcement.subject,
+        readAt: new Date().toISOString()
+      })
+    },
+    isModalConfirmed() {
+      const confirmedId = localStorage.getItem(this.modalConfirmedKey)
+      return confirmedId === this.announcement.id
+    },
+    isAlertViewed() {
      const viewedId = localStorage.getItem(this.viewedKey)
      return viewedId === this.announcement.id
+    },
+    isViewed() {
+      return this.isAlertViewed()
    }
  }
 }
 </script>

 <style lang="scss" scoped>
-.announcement ::v-deep .el-alert__content {
-  width: 100%;
+.announcement-dialog ::v-deep .el-dialog {
+  border-radius: 5px;
 }

-.announcement-main {
-  word-wrap: break-word;
-  white-space: pre-wrap;
+.announcement-dialog ::v-deep .el-dialog__wrapper {
+  backdrop-filter: blur(4px);
+}
+
+@media (max-width: 768px) {
+  .announcement-dialog ::v-deep .el-dialog {
+    width: 95% !important;
+    margin: 0 auto;
+  }
+
+  .announcement-content {
+    padding: 20px 25px 15px;
+
+    .content-wrapper {
+      padding: 15px;
+    }
+  }
+
+  .dialog-footer {
+    .el-button {
+      padding: 10px;
+      font-size: 14px;
+    }
+  }
+}
+
+.announcement-dialog ::v-deep .el-dialog__header {
+  border-radius: 8px 8px 0 0;
+  padding: 10px 20px 10px 20px;
+
+  .el-dialog__title {
+    color: black;
+    font-weight: 600;
+  }
+}
+
+.announcement-dialog ::v-deep .el-dialog__body {
+  padding: 0;
+}
+
+.announcement-content {
+  padding: 25px 30px 20px;
+
+  .link-section {
+    margin-top: 20px;
+    padding-top: 15px;
+    border-top: 1px solid #e4e7ed;
+    text-align: center;
+  }
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+
+  .el-button {
+    padding: 10px 20px;
+    font-size: 14px;
+  }
+}
+
+.announcement ::v-deep .el-alert__content {
+  width: 100%;
 }

 .icon {
  vertical-align: text-bottom;
  color: var(--color-info) !important;
+  margin-left: 5px;
 }

 .markdown {
  background-color: transparent !important;
+  font-size: 14px;
+  line-height: 1.8;
+  color: #2c3e50;

  .link-more {
-    font-size: 10px;
-    margin-left: 10px;
-    border-bottom: solid 1px;
-    color: var(--color-info) !important;
+    font-size: 13px;
+    color: #409eff !important;
+    text-decoration: none;
+    padding: 4px 8px;
+    border-radius: 4px;
+    background: rgba(64, 158, 255, 0.1);
+    transition: all 0.3s;
+
+    &:hover {
+      background: #409eff;
+      color: white !important;
+    }
  }

-  h1, h2, h3, h4, h5 {
-    margin-top: 0;
-    margin-bottom: 10px;
+  h1, h2, h3, h4, h5, h6 {
+    margin: 0 0 15px 0;
+    color: #303133;
+    font-weight: 600;
+    line-height: 1.4;
+  }
+
+  h1 {
+    font-size: 20px;
+  }
+
+  h2 {
+    font-size: 18px;
+  }
+
+  h3 {
+    font-size: 16px;
+  }
+
+  h4, h5, h6 {
+    font-size: 14px;
+  }
+
+  p {
+    margin-bottom: 16px;
+    line-height: 1.8;
+    color: #4b5563;
  }
 }
 </style>
--- a/src/components/Widgets/Breadcrumb/index.vue
+++ b/src/components/Widgets/Breadcrumb/index.vue
@@ -33,7 +33,7 @@ export default {
      const first = matched[0]

      if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'dashboard' }}].concat(matched)
+        matched = [{ path: '/dashboard', meta: { title: 'dashboard' } }].concat(matched)
      }

      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
--- a/src/components/Widgets/Icon/index.vue
+++ b/src/components/Widgets/Icon/index.vue
@@ -1,6 +1,6 @@
 <script>
 export default {
-  name: 'Index',
+  name: 'Icon',
  props: {
    icon: {
      type: String,
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -37,3 +37,4 @@ export { default as Pagination } from './Table/Pagination'
 export { default as Tooltip } from './Widgets/Tooltip'
 export { default as ResourceActivity } from './Apps/ResourceActivity'
 export { default as MarkDown } from './Widgets/MarkDown'
+export { default as VariablesHelpTextDialog } from './Apps/VariablesHelpTextDialog'
--- a/src/i18n/langs/index.js
+++ b/src/i18n/langs/index.js
@@ -6,6 +6,7 @@ import ptBrLocale from 'elementui-lts/lib/locale/lang/pt-br'
 import esLocale from 'elementui-lts/lib/locale/lang/es'
 import ruLocale from 'elementui-lts/lib/locale/lang/ru-RU'
 import koLocale from 'elementui-lts/lib/locale/lang/ko'
+import viLocale from 'elementui-lts/lib/locale/lang/vi'
 import zh from './zh.json'
 import zhHant from './zh_hant.json'
 import en from './en.json'
@@ -39,6 +40,9 @@ const messages = {
  },
  ko: {
    ...koLocale
+  },
+  vi: {
+    ...viLocale
  }
 }

--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -225,24 +225,9 @@ export default {
      default(error, method, vm) {
        const response = error.response
        const data = response.data
-        if (response.status === 400) {
-          for (const key of Object.keys(data)) {
-            let err = ''
-            let errorTips = data[key]
-            if (errorTips instanceof Array) {
-              errorTips = _.filter(errorTips, (item) => Object.keys(item).length > 0)
-              for (const i of errorTips) {
-                if (i instanceof Object) {
-                  err += i?.port?.join(',')
-                } else {
-                  err += i
-                }
-              }
-            } else {
-              err = errorTips
-            }
-            this.$refs.form.setFieldError(key, err)
-          }
+        if (response.status === 400 && data && typeof data === 'object') {
+          // 覆盖式设置错误映射，避免触发表单内容重建
+          this.$refs.form.setErrors(data)
        }
        this.$emit('performError', data)
      }
--- a/src/layout/components/GenericUpdateFormDialog/index.vue
+++ b/src/layout/components/GenericUpdateFormDialog/index.vue
@@ -137,14 +137,15 @@ export default {
            this.$emit('submitError', error)
            const response = error.response
            const data = response.data
-            if (response.status === 400) {
-              for (const key of Object.keys(data)) {
-                let value = data[key]
-                if (value instanceof Array) {
-                  value = value.join(';')
-                }
-                this.$refs.form.setFieldError(key, value)
-              }
+            // 不要逐个设置字段的 attrs.error 或改动 fields 引用。
+            // 这样会触发表单 content 重建，导致用户已输入的内容被覆盖/清空，
+            // 且可能出现只能显示一个字段错误的现象。
+            // 这里改为使用 AutoDataForm 暴露的 setErrors(errors) 覆盖式设置：
+            // - 直接同步到 UI 的 el-form-item.validateMessage
+            // - 支持同时显示多个字段错误
+            // - 不修改 fields/attrs 引用，避免输入丢失
+            if (response.status === 400 && data && typeof data === 'object') {
+              this.$refs.form.setErrors(data)
            }
          })
        }
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -71,7 +71,7 @@ export default {
    },
    async logout() {
      const currentOrg = this.$store.getters.currentOrg
-      if (currentOrg.autoEnter || currentOrg.is_system) {
+      if (currentOrg && (currentOrg.autoEnter || currentOrg.is_system)) {
        await this.$store.dispatch('users/setCurrentOrg', this.$store.getters.preOrg)
      }
      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
--- a/src/layout/components/NavHeader/Search.vue
+++ b/src/layout/components/NavHeader/Search.vue
@@ -0,0 +1,633 @@
+<template>
+  <span ref="root" class="global-search">
+    <!-- 搜索触发按钮 -->
+    <div class="search-trigger" @click="openPanel">
+      <el-input
+        v-model="search"
+        :placeholder="$t('Search')"
+        class="search-input"
+        readonly
+        prefix-icon="el-icon-search"
+        @keydown.esc.prevent="closePanel"
+        @clear="clearSearch"
+      >
+        <template slot="suffix">
+          <span class="search-shortcut">{{ shortcutText }}</span>
+        </template>
+      </el-input>
+    </div>
+
+    <!-- 搜索模态框 -->
+    <el-dialog
+      :visible.sync="isOpen"
+      :close-on-click-modal="true"
+      :close-on-press-escape="true"
+      :append-to-body="true"
+      custom-class="search-modal"
+      width="70%"
+      @close="closePanel"
+    >
+      <div class="search-modal-content">
+        <!-- 搜索框 -->
+        <div class="search-input-wrapper">
+          <el-input
+            ref="panelSearchInput"
+            v-model="search"
+            :placeholder="$t('Search')"
+            :clearable="true"
+            size="large"
+            prefix-icon="el-icon-search"
+            @input="onInput"
+            @keydown.enter.prevent="onEnter"
+          />
+        </div>
+
+        <!-- 搜索结果内容 -->
+        <div class="search-results">
+          <div v-if="loading" class="section loading">{{ $t('Loading') }}...</div>
+
+          <template v-if="showHistory">
+            <div class="section-title">
+              <span>{{ $t('History') }}</span>
+              <el-link class="clear-history-btn" @click="clearHistory">
+                {{ $t('Clear') }}
+              </el-link>
+            </div>
+            <ul class="list">
+              <li
+                v-for="(item, index) in history"
+                :key="'h-' + index"
+                class="item"
+                @click="applyHistory(item)"
+              >
+                <i class="el-icon-time icon" />
+                <span class="label">{{ item.q }}</span>
+                <i class="el-icon-arrow-right go" />
+              </li>
+            </ul>
+          </template>
+
+          <template v-if="routeSuggestions.length">
+            <div class="section-title">{{ $t('Routes') }}</div>
+            <ul class="list">
+              <li
+                v-for="route in routeSuggestions"
+                :key="'r-' + route.name + route.path"
+                class="item"
+                @click="navigateRoute(route)"
+              >
+                <i class="el-icon-location-outline icon" />
+                <span class="label">{{ route.title || route.name || route.path }}</span>
+                <span class="sub">{{ route.path }}</span>
+              </li>
+            </ul>
+          </template>
+
+          <template v-if="options.length">
+            <div v-for="group in options" :key="'g-' + group.label" class="section">
+              <div class="section-title">{{ group.label }}</div>
+              <ul class="list">
+                <li
+                  v-for="item in group.options"
+                  :key="item.value"
+                  class="item"
+                  @click="handleSearch(item)"
+                >
+                  <Icon :icon="iconMap[item.model] || 'el-icon-document'" class="icon" />
+                  <span class="label">{{ item.name }}</span>
+                  <span class="sub">{{ item.content }}</span>
+                </li>
+              </ul>
+            </div>
+          </template>
+
+          <div v-if="search && isEmpty" class="section empty">
+            {{ $t('NoData') }}
+          </div>
+
+          <div v-if="!search && history.length === 0" class="section placeholder">
+            <div class="placeholder-content">
+              <div class="supported-types">
+                <div class="types-title">{{ $t('SupportedTypes') }}:</div>
+                <div class="types-list">
+                  <span v-for="(icon, type) in iconMap" :key="type" class="type-item">
+                    <Icon :icon="icon" class="type-icon" />
+                    {{ $t(type) }}
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </span>
+</template>
+
+<script>
+import _ from 'lodash'
+import { mapGetters } from 'vuex'
+import { ObjectLocalStorage } from '@/utils/common'
+import Icon from '@/components/Widgets/Icon/index.vue'
+
+export default {
+  name: 'Search',
+  components: {
+    Icon
+  },
+  data() {
+    return {
+      search: '',
+      loading: false,
+      options: [],
+      isOpen: false,
+      history: [],
+      routeSuggestions: [],
+      routes: [],
+      iconMap: {
+        'Account': 'accounts',
+        'Asset': 'assets',
+        'User': 'user-o',
+        'UserGroup': 'user-group',
+        'AssetPermission': 'permission'
+      },
+      historyStore: new ObjectLocalStorage('globalSearchHistory')
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'viewRoutes'
+    ]),
+    isEmpty() {
+      return !this.routeSuggestions.length && this.options.length === 0
+    },
+    showHistory() {
+      return this.history.length > 0 && !this.search
+    },
+    shortcutText() {
+      return this.isMac ? '⌘K' : 'Ctrl+K'
+    },
+    isMac() {
+      return navigator.platform.toUpperCase().indexOf('MAC') >= 0
+    }
+  },
+  mounted() {
+    this.loadHistory()
+    this.buildRouteSuggestions()
+    this.bindKeyboardShortcut()
+  },
+  beforeDestroy() {
+    this.unbindKeyboardShortcut()
+  },
+  methods: {
+    openPanel() {
+      this.isOpen = true
+      this.buildRouteSuggestions()
+      this.$nextTick(() => {
+        this.$refs.panelSearchInput?.focus()
+      })
+    },
+    closePanel() {
+      this.isOpen = false
+    },
+    onInput() {
+      this.openPanel()
+      this.debouncedQuery()
+    },
+    clearSearch() {
+      this.search = ''
+      this.options = []
+      this.buildRouteSuggestions()
+    },
+    onEnter() {
+      if (this.options.length > 0) {
+        this.handleSearch(this.options[0].options[0])
+      }
+    },
+    debouncedQuery: _.debounce(function() {
+      this.searchQuery(this.search)
+    }, 300),
+    async searchQuery(q) {
+      if (!q) {
+        this.options = []
+        return
+      }
+      this.loading = true
+      const url = '/api/v1/search/?q=' + q
+      try {
+        const res = await this.$axios.get(url)
+        let options = res || []
+        options = _.groupBy(res, 'model_label')
+        this.options = Object.keys(options).map(key => ({
+          label: key,
+          options: options[key]
+        }))
+      } catch (error) {
+        console.error('Search error:', error)
+        this.options = []
+      } finally {
+        this.loading = false
+      }
+    },
+    handleSearch(item) {
+      const route = {
+        name: item.model + 'Detail',
+        params: { id: item.id }
+      }
+      this.addToHistory(this.search)
+      this.$router.push(route)
+      this.closePanel()
+    },
+    navigateRoute(route) {
+      this.$router.push(route.path)
+      this.closePanel()
+    },
+    filterRouteSuggestions(q) {
+      if (!q) {
+        this.routeSuggestions = []
+        return
+      }
+      this.routeSuggestions = this.routes.filter(r => {
+        const title = r.title || r.name || r.path
+        return title.toLowerCase().includes(q.toLowerCase()) || r.path.toLowerCase().includes(q.toLowerCase())
+      }).slice(0, 5)
+    },
+    buildRouteSuggestions() {
+      if (this.routes.length > 0) {
+        return
+      }
+      const allRoutes = this.viewRoutes
+      const flat = []
+      const walk = (routes, parentPath = '') => {
+        for (const r of routes) {
+          const path = parentPath + r.path
+          if (r.path && r.path !== '/' && !r.hidden) {
+            flat.push({
+              name: r.name,
+              path: path,
+              title: r.meta?.title
+            })
+          }
+
+          if (r.children && r.children.length) {
+            walk(r.children, path)
+          }
+        }
+      }
+      walk(allRoutes)
+      this.routes = flat
+    },
+    loadHistory() {
+      this.history = (this.historyStore.get('list') || []).filter(i => i.q)
+    },
+    addToHistory(q) {
+      const entry = { q: q }
+      const list = this.historyStore.get('list') || []
+      const next = [
+        entry,
+        ...list.filter(i => i.q !== entry.q)
+      ].slice(0, 10)
+      this.historyStore.set('list', next)
+      this.history = next
+    },
+    applyHistory(h) {
+      this.search = h.q
+      this.onInput()
+    },
+    clearHistory() {
+      this.historyStore.set('list', [])
+      this.history = []
+    },
+    bindKeyboardShortcut() {
+      document.addEventListener('keydown', this.handleKeyboardShortcut)
+    },
+    unbindKeyboardShortcut() {
+      document.removeEventListener('keydown', this.handleKeyboardShortcut)
+    },
+    handleKeyboardShortcut(event) {
+      // 检查是否按下了正确的快捷键
+      const isCorrectKey = event.key === 'k' || event.key === 'K'
+      const isCorrectModifier = this.isMac ? event.metaKey : event.ctrlKey
+
+      if (isCorrectKey && isCorrectModifier) {
+        // 阻止默认行为
+        event.preventDefault()
+
+        // 如果当前有输入框聚焦，不触发搜索
+        const activeElement = document.activeElement
+        const isInputFocused = activeElement && (
+          activeElement.tagName === 'INPUT' ||
+          activeElement.tagName === 'TEXTAREA' ||
+          activeElement.contentEditable === 'true'
+        )
+
+        if (!isInputFocused) {
+          this.openPanel()
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.global-search {
+  position: relative;
+  width: 200px;
+  height: 40px;
+  padding: 5px 0;
+  min-width: 200px;
+
+  .search-trigger {
+    height: 30px;
+    line-height: 1;
+
+    .search-input {
+      height: 30px;
+      line-height: 1;
+      background-color: rgba(255, 255, 255, 0.1);
+      border-radius: 4px;
+      cursor: pointer;
+
+      &:hover {
+        background-color: rgba(0, 0, 0, 0.1);
+      }
+
+      ::v-deep .el-input__inner {
+        height: 30px;
+        line-height: 1;
+        background: transparent;
+        border: none;
+        color: #fff;
+        cursor: pointer;
+      }
+
+      ::v-deep .el-input__inner::placeholder {
+        color: #fff;
+        opacity: 0.7;
+      }
+
+      ::v-deep .el-input__suffix {
+        display: flex;
+        align-items: center;
+        height: 100%;
+      }
+
+      .search-shortcut {
+        color: rgba(255, 255, 255, 0.6);
+        font-size: 11px;
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+        font-weight: 500;
+        letter-spacing: 0.5px;
+        padding: 2px 6px;
+        background: rgba(255, 255, 255, 0.1);
+        border-radius: 3px;
+        border: 1px solid rgba(255, 255, 255, 0.2);
+        user-select: none;
+        pointer-events: none;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        height: 18px;
+        line-height: 1;
+      }
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+/* 搜索模态框全局样式 */
+.search-modal {
+  &.el-dialog {
+    position: fixed;
+    top: 5px;
+    left: 50%;
+    transform: translateX(-50%);
+    max-height: calc(100vh - 10px);
+    max-width: calc(100vw - 10px);
+    border-radius: 5px;
+    // box-shadow: 0 0 8px 4px #00000014;
+    box-shadow: rgba(0, 0, 0, 0.2) 0px 3px 3px -2px, rgba(0, 0, 0, 0.14) 0px 3px 4px 0px, rgba(0, 0, 0, 0.12) 0px 1px 8px 0px;
+
+    .el-dialog__body {
+      padding: 0;
+    }
+
+    .el-dialog__header {
+      display: none;
+    }
+  }
+}
+
+body .v-modal {
+  opacity: 0.3;
+}
+
+.search-modal-content {
+  height: 70vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.search-input-wrapper {
+  padding: 20px;
+  border-bottom: 1px solid #f0f0f0;
+  // background: #fff;
+
+  .el-input {
+    .el-input__inner {
+      font-size: 14px;
+      height: 34px;
+      line-height: 34px;
+    }
+  }
+}
+
+.search-results {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: hidden;
+
+  /* 自定义滚动条 */
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: #f1f1f1;
+    border-radius: 3px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3px;
+  }
+
+  &::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8;
+  }
+}
+
+.section-title {
+  padding: 12px 24px 6px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #909399;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  border-top: 1px solid #f0f0f0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .clear-history-btn {
+    background: none;
+    border: none;
+    padding: 4px;
+    cursor: pointer;
+    border-radius: 4px;
+    transition: all 0.2s ease;
+    color: red;
+
+    &:hover {
+      background: #f5f5f5;
+      color: #f56c6c;
+    }
+
+    .clear-icon {
+      font-size: 14px;
+    color: red;
+    }
+  }
+}
+
+.list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+
+  .item {
+    display: flex;
+    align-items: center;
+    padding: 8px 24px;
+    cursor: pointer;
+    border-bottom: 1px solid #f8f9fa;
+    transition: all 0.2s ease;
+    position: relative;
+
+    &:before {
+      content: '';
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      width: 3px;
+      background: transparent;
+      transition: background 0.2s ease;
+    }
+
+    &:hover {
+      background: #f8f9fa;
+    }
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .icon {
+      // color: var(--color-primary, #409eff);
+      margin-right: 12px;
+      font-size: 14px;
+      font-weight: 400;
+    }
+
+    .label {
+      flex: 1;
+      font-size: 14px;
+      color: #333;
+      font-weight: 500;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: 60%;
+    }
+
+    .sub {
+      color: #909399;
+      font-size: 12px;
+      margin-left: 12px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      flex-shrink: 0;
+      width: 40%;
+      text-align: right;
+    }
+
+    .go {
+      color: #c0c4cc;
+      font-size: 12px;
+      flex-shrink: 0;
+    }
+  }
+}
+
+.loading,
+.empty {
+  padding: 32px 24px;
+  color: #909399;
+  text-align: center;
+  font-size: 14px;
+}
+
+.section.placeholder {
+  padding: 32px 24px;
+
+  .placeholder-content {
+    text-align: center;
+
+    .supported-types {
+      margin-bottom: 24px;
+
+      .types-title {
+        margin-bottom: 12px;
+        font-size: 14px;
+        font-weight: 500;
+        color: #333;
+      }
+
+      .types-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        gap: 16px;
+
+        .type-item {
+          display: flex;
+          align-items: center;
+          padding: 8px 12px;
+          background: #f8f9fa;
+          border-radius: 6px;
+          font-size: 13px;
+          color: #666;
+          transition: all 0.2s ease;
+
+          &:hover {
+            background: #e9ecef;
+            color: #333;
+          }
+
+          .type-icon {
+            margin-right: 6px;
+            font-size: 14px;
+            color: #409eff;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -1,6 +1,9 @@
 <template>
  <div class="navbar">
    <ul class="navbar-right">
+      <li class="header-item header-icon none-hover">
+        <Search @search-open="handleSearchOpen" />
+      </li>
      <li class="header-item header-icon">
        <el-tooltip :content="$tc('SiteMessageList')" :open-delay="500" effect="dark">
          <SiteMessages />
@@ -31,14 +34,18 @@
        <AccountDropdown />
      </li>
    </ul>
-    <hamburger :is-active="sidebar.opened" class="hamburger-container is-show-menu" @toggleClick="toggleSideBar" />
+    <hamburger
+      :is-active="sidebar.opened"
+      class="hamburger-container is-show-menu"
+      @toggleClick="toggleSideBar"
+    />
    <ul class="navbar-left">
      <li class="left-item">
        <div class="nav-logo">
          <Logo v-if="showLogo" :collapse="false" />
        </div>
      </li>
-      <li v-if="orgsShow" class="left-item" style="margin-left: 20px;">
+      <li v-if="orgsShow" class="left-item" style="margin-left: 20px">
        <Organization :disabled="orgsDisabled" class="organization" />
      </li>
    </ul>
@@ -57,6 +64,7 @@ import Organization from './Organization'
 import SystemSetting from './SystemSetting'
 import Logo from '../NavLeft/Logo'
 import Language from './Language'
+import Search from './Search'

 export default {
  components: {
@@ -69,19 +77,22 @@ export default {
    SiteMessages,
    SystemSetting,
    Logo,
-    Language
+    Language,
+    Search
  },
  data() {
-    return {}
+    return {
+      searchOpen: false
+    }
  },
  computed: {
-    ...mapGetters([
-      'sidebar', 'publicSettings', 'currentOrgRoles', 'currentViewRoute', 'isMobile'
-    ]),
+    ...mapGetters(['sidebar', 'publicSettings', 'currentOrgRoles', 'currentViewRoute', 'isMobile']),
    ticketsEnabled() {
-      return this.publicSettings['TICKETS_ENABLED'] &&
+      return (
+        this.publicSettings['TICKETS_ENABLED'] &&
        this.$hasLicense() &&
        this.$hasPerm('tickets.view_ticket')
+      )
    },
    showLogo() {
      return this.$store.state.settings.sidebarLogo
@@ -90,178 +101,188 @@ export default {
      return this.$route.meta?.disableOrgsChange === true
    },
    orgsShow() {
-      return (this.$route.meta?.showOrganization !== false) && this.$hasLicense()
+      return this.$route.meta?.showOrganization !== false && this.$hasLicense()
    }
  },
  methods: {
    toggleSideBar() {
      this.$store.dispatch('app/toggleSideBar')
+    },
+    handleSearchOpen(val) {
+      // this.searchOpen = val
    }
  }
 }
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/variables.scss";
+@import '~@/styles/variables.scss';

-  .navbar {
-    position: relative;
-    overflow: hidden;
-    background-color: var(--banner-bg);
+.navbar {
+  position: relative;
+  overflow: hidden;
+  background-color: var(--banner-bg);

-    ul {
-      margin: 0;
-      padding-inline-start: 0;
-    }
+  ul {
+    margin: 0;
+    padding-inline-start: 0;
+  }

-    .is-show-menu {
-      display: none;
-    }
+  .is-show-menu {
+    display: none;
+  }

-    .hamburger-container {
-      float: left;
-      height: 25px;
-      line-height: 25px;
-      margin: 8px;
-      padding: 1px 8px !important;
-      border-radius: 5px;
-      border-color: $--color-primary;
-      background-color: white;
-      color: var(--text-primary);
-      cursor: pointer;
-      transition: .2s;
-      opacity: 0.7;
-    }
+  .hamburger-container {
+    float: left;
+    height: 25px;
+    line-height: 25px;
+    margin: 8px;
+    padding: 1px 8px !important;
+    border-radius: 5px;
+    border-color: $--color-primary;
+    background-color: white;
+    color: var(--text-primary);
+    cursor: pointer;
+    transition: 0.2s;
+    opacity: 0.7;
+  }

-    .navbar-left {
-      float: left;
+  .navbar-left {
+    float: left;
+    display: flex;
+    height: 100%;
+
+    .left-item {
      display: flex;
-      height: 100%;
-
-      .left-item {
-        display: flex;
-        align-items: center;
-        list-style: none;
-
-        .nav-logo {
-          width: 200px;
-
-          &:hover {
-            background: rgba(0, 0, 0, 12%);
-          }
-        }
-
-        .organization {
-          display: flex;
-          align-items: center;
-          padding: 0 0 0 15px !important;
-          border-radius: 3px;
-          background-color: rgba(255, 255, 255, .10);
-          color: #fff;
-          font-weight: 600;
-          font-size: 15px;
-          max-width: 250px;
-
-          ::v-deep .el-input__inner {
-            padding-left: 25px;
-          }
-
-          ::v-deep .el-input.is-disabled > input {
-            background: none;
-          }
-
-          &:hover {
-            background-color: rgba(0, 0, 0, .12) !important;
-          }
-        }
-
-        // 未找到与之对应的
-        & ::v-deep .el-submenu__title {
-          font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-          padding: 0 8px;
-          line-height: $headerHeight;
-          height: $headerHeight;
-        }
-
-        // 未找到与之对应的
-        & ::v-deep .svg-icon {
-          color: #FFF !important;
-        }
-      }
-    }
-
-    .navbar-right {
-      display: flex;
-      float: right;
      align-items: center;
-      margin-right: 10px;
+      list-style: none;

-      .header-item {
-        display: flex;
-        line-height: $headerHeight;
-        padding-right: 10px;
-        padding-left: 10px;
-
-        & ::v-deep .svg-icon {
-          line-height: 40px;
-          color: #FFF !important;
-          font-size: 15px;
-        }
-
-        & ::v-deep .el-badge {
-          vertical-align: top;
-
-          .el-link {
-            vertical-align: baseline;
-          }
-
-          .el-badge__content--primary {
-            background-color: #fff;
-          }
-
-          .el-badge__content {
-            top: 8px;
-            height: 15px;
-            line-height: 15px;
-            border: none;
-            color: var(--color-primary);
-          }
-        }
-
-        & ::v-deep i {
-          color: #FFF;
-          font-size: 16px;
-
-          &.el-icon-arrow-down {
-            font-size: 13px;
-          }
-        }
-
-        & ::v-deep i.el-dialog__close.el-icon-close {
-          color: #7c7e7f;
-        }
+      .nav-logo {
+        width: 200px;

        &:hover {
          background: rgba(0, 0, 0, 12%);
        }
      }
-    }
-  }

-  @media screen and (max-width: 1006px) {
-    .navbar {
-      .is-show-menu {
-        display: block;
+      .organization {
+        display: flex;
+        align-items: center;
+        padding: 0 0 0 15px !important;
+        border-radius: 3px;
+        background-color: rgba(255, 255, 255, 0.1);
+        color: #fff;
+        font-weight: 600;
+        font-size: 15px;
+        max-width: 250px;
+
+        ::v-deep .el-input__inner {
+          padding-left: 25px;
+        }
+
+        ::v-deep .el-input.is-disabled > input {
+          background: none;
+        }
+
+        &:hover {
+          background-color: rgba(0, 0, 0, 0.12) !important;
+        }
      }

-      .navbar-left {
-        display: none;
+      // 未找到与之对应的
+      & ::v-deep .el-submenu__title {
+        font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        padding: 0 8px;
+        line-height: $headerHeight;
+        height: $headerHeight;
+      }
+
+      // 未找到与之对应的
+      & ::v-deep .svg-icon {
+        color: #fff !important;
      }
    }
  }

-  @media screen and (max-width: 480px) {
-    .active-menu {
-      display: none !important;;
+  .navbar-right {
+    display: flex;
+    float: right;
+    align-items: center;
+    margin-right: 10px;
+
+    .header-item {
+      display: flex;
+      line-height: $headerHeight;
+      padding-right: 10px;
+      padding-left: 10px;
+
+      & ::v-deep .svg-icon {
+        line-height: 40px;
+        color: #fff;
+        font-size: 15px;
+      }
+
+      & ::v-deep .el-badge {
+        vertical-align: top;
+
+        .el-link {
+          vertical-align: baseline;
+        }
+
+        .el-badge__content--primary {
+          background-color: #fff;
+        }
+
+        .el-badge__content {
+          top: 8px;
+          height: 15px;
+          line-height: 15px;
+          border: none;
+          color: var(--color-primary);
+        }
+      }
+
+      & ::v-deep i {
+        color: #fff;
+        font-size: 16px;
+
+        &.el-icon-arrow-down {
+          font-size: 13px;
+        }
+      }
+
+      & ::v-deep i.el-dialog__close.el-icon-close {
+        color: #7c7e7f;
+      }
+
+      &.none-hover {
+        padding: 0;
+        &:hover {
+          background: none;
+        }
+      }
+
+      &:hover {
+        background: rgba(0, 0, 0, 12%);
+      }
    }
  }
+}
+
+@media screen and (max-width: 1006px) {
+  .navbar {
+    .is-show-menu {
+      display: block;
+    }
+
+    .navbar-left {
+      display: none;
+    }
+  }
+}
+
+@media screen and (max-width: 480px) {
+  .active-menu {
+    display: none !important;
+  }
+}
 </style>
--- a/src/layout/components/NavLeft/index.vue
+++ b/src/layout/components/NavLeft/index.vue
@@ -1,18 +1,24 @@
 <template>
-  <div :class="{'has-logo': showLogo, 'show-orgs': showOrgs, 'collapsed': isCollapse}" class="left-side-wrapper">
+  <div
+    :class="{ 'has-logo': showLogo, 'show-orgs': showOrgs, collapsed: isCollapse }"
+    class="left-side-wrapper"
+  >
    <div class="nav-header">
      <div class="active-mobile">
        <Organization v-if="$hasLicense()" class="organization" />
      </div>
      <div class="nav-title">
        <span :class="switchViewOtherClasses" class="switch-view active-switch-view">
-          <el-popover
-            :open-delay="200"
-            placement="right-start"
-            trigger="hover"
-          >
+          <el-popover :open-delay="200" placement="right-start" trigger="hover">
            <span slot="reference" style="width: 100%">
-              <el-tooltip v-show="!isCollapse" :content="isRouteMeta.title" :open-delay="1000" placement="bottom" effect="dark" class="view-title">
+              <el-tooltip
+                v-show="!isCollapse"
+                :content="isRouteMeta.title"
+                :open-delay="1000"
+                placement="bottom"
+                effect="dark"
+                class="view-title"
+              >
                <span class="text-overflow">{{ isRouteMeta.title || '' }}</span>
              </el-tooltip>
              <span class="icon-zone">
@@ -49,10 +55,14 @@
    </div>
    <div class="nav-footer">
      <div class="toggle-bar">
-        <Hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+        <Hamburger
+          :is-active="sidebar.opened"
+          class="hamburger-container"
+          @toggleClick="toggleSideBar"
+        />
      </div>
    </div>
-    <div :class="{'is-show': viewShown}" class="mobile-menu" @click="viewShown = false">
+    <div :class="{ 'is-show': viewShown }" class="mobile-menu" @click="viewShown = false">
      <ViewSwitcher :mode="'vertical'" />
    </div>
  </div>
@@ -81,10 +91,7 @@ export default {
    }
  },
  computed: {
-    ...mapGetters([
-      'currentViewRoute',
-      'sidebar'
-    ]),
+    ...mapGetters(['currentViewRoute', 'sidebar']),
    defaultOpensMenu() {
      return []
    },
@@ -127,8 +134,7 @@ export default {
      return this.currentViewRoute.meta || {}
    }
  },
-  mounted() {
-  },
+  mounted() {},
  methods: {
    toggleSideBar() {
      this.$store.dispatch('app/toggleSideBar')
@@ -143,7 +149,9 @@ export default {
      }, 500)
    },
    setLeastMenuOpen() {
-      const hasOpened = document.querySelector('.el-submenu-sidebar.submenu-item.el-submenu.is-opened')
+      const hasOpened = document.querySelector(
+        '.el-submenu-sidebar.submenu-item.el-submenu.is-opened'
+      )
      if (hasOpened) {
        return
      }
@@ -156,7 +164,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/variables.scss";
+@import '~@/styles/variables.scss';

 $mobileHeight: 40px;
 $origin-color: #ffffff;
@@ -235,7 +243,7 @@ $hover-border-color: #d2d2d2;

          .view-title {
            width: calc(100% - 10px);
-            display: inline-block
+            display: inline-block;
          }

          .icon-zone {
@@ -299,7 +307,7 @@ $hover-border-color: #d2d2d2;
  }

  .is-show {
-    display: block !important;;
+    display: block !important;
  }

  .mobile-menu {
--- a/src/main.js
+++ b/src/main.js
@@ -25,6 +25,7 @@ import xss from '@/utils/secure'
 import ElTableTooltipPatch from '@/utils/vue/elTableTooltipPatch.js'
 import VSanitize from 'v-sanitize'
 import moment from 'moment'
+
 moment.locale('zh-cn')

 /**
@@ -35,10 +36,11 @@ moment.locale('zh-cn')
 * Currently MockJs will be used in the production environment,
 * please remove it before going online ! ! !
 */
-if (process.env.NODE_ENV === 'development') {
-  const { mockXHR } = require('../mock')
-  mockXHR()
-}
+// 使用 mockXHR 无法使用 axios 中的 onUploadProgress 回调函数
+// if (process.env.NODE_ENV === 'development') {
+//   const { mockXHR } = require('../mock')
+//   mockXHR()
+// }

 // set ElementUI lang to EN
 ElementUI.Tooltip.props.openDelay.default = 1000
--- a/src/router/audit/index.js
+++ b/src/router/audit/index.js
@@ -90,7 +90,8 @@ export default {
      meta: {
        title: i18n.t('Report'),
        icon: 'report',
-        permissions: []
+        permissions: [],
+        licenseRequired: true
      },
      children: ReportsRoutes
    }
--- a/src/router/audit/reports.js
+++ b/src/router/audit/reports.js
@@ -18,7 +18,7 @@ export default [
        component: () => import('@/views/reports/users/index.vue'),
        meta: {
          title: i18n.t('UserReport'),
-          permissions: []
+          permissions: ['rbac.view_userloginreport | rbac.view_userchangepasswordreport']
        }
      }
    ]
@@ -40,7 +40,7 @@ export default [
        component: () => import('@/views/reports/assets/index.vue'),
        meta: {
          title: i18n.t('AssetReport'),
-          permissions: []
+          permissions: ['rbac.view_assetactivityreport | rbac.view_assetstatisticsreport']
        }
      }
    ]
@@ -62,7 +62,7 @@ export default [
        component: () => import('@/views/reports/accounts/index.vue'),
        meta: {
          title: i18n.t('AccountReport'),
-          permissions: []
+          permissions: ['rbac.view_accountstatisticsreport | rbac.view_accountautomationreport']
        }
      }
    ]
--- a/src/router/console/accounts.js
+++ b/src/router/console/accounts.js
@@ -22,6 +22,7 @@ export default [
        component: () => import('@/views/accounts/Account/index.vue'),
        meta: {
          title: i18n.t('AssetAccount'),
+          showInSearch: true,
          app: 'accounts',
          permissions: ['accounts.view_account']
        }
@@ -29,8 +30,8 @@ export default [
      {
        path: ':id',
        component: () => import('@/views/accounts/Account/AccountDetail/index.vue'),
-        name: 'AssetAccountDetail',
-        meta: { title: i18n.t('AssetAccountDetail') },
+        name: 'AccountDetail',
+        meta: { title: i18n.t('AccountDetail') },
        hidden: true
      }
    ]
--- a/src/router/console/acls.js
+++ b/src/router/console/acls.js
@@ -34,7 +34,9 @@ export default [
            name: 'UserLoginACLList',
            component: () => import('@/views/acls/UserLoginACL/UserLoginACLList.vue'),
            meta: {
-              title: i18n.t('UserLoginACLs'), menuTitle: i18n.t('UserLogin'), activeMenu: ''
+              title: i18n.t('UserLoginACLs'),
+              menuTitle: i18n.t('UserLogin'),
+              activeMenu: ''
            }
          },
          {
@@ -74,7 +76,7 @@ export default [
        },
        name: 'CmdACL',
        meta: {
-          title: i18n.t('CommandFilterACLs',),
+          title: i18n.t('CommandFilterACLs'),
          menuTitle: i18n.t('CommandFilter'),
          app: 'acls',
          resource: 'commandfilteracl'
@@ -136,7 +138,11 @@ export default [
            path: '',
            name: 'AssetACLList',
            component: () => import('@/views/acls/AssetLoginACL/AssetLoginAclList.vue'),
-            meta: { title: i18n.t('AssetACLs'), activeMenu: '', menuTitle: i18n.t('AssetConnect') }
+            meta: {
+              title: i18n.t('AssetACLs'),
+              activeMenu: '',
+              menuTitle: i18n.t('AssetConnect')
+            }
          },
          {
            path: 'create',
@@ -161,6 +167,53 @@ export default [
          }
        ]
      },
+      {
+        path: 'data-masking-rules',
+        component: empty,
+        redirect: {
+          name: 'DataMaskingRuleList'
+        },
+        name: 'DataMaskingRules',
+        meta: {
+          title: i18n.t('DataMasking'),
+          licenseRequired: false,
+          app: 'acls',
+          resource: 'datamaskingrule'
+        },
+        children: [
+          {
+            path: '',
+            name: 'DataMaskingRuleList',
+            component: () => import('@/views/acls/DataMaskingRule/DataMaskingRuleList.vue'),
+            meta: {
+              title: i18n.t('DataMasking'),
+              activeMenu: '',
+              menuTitle: i18n.t('DataMasking')
+            }
+          },
+          {
+            path: 'create',
+            name: 'DataMaskingRuleCreate',
+            component: () => import('@/views/acls/DataMaskingRule/DataMaskingRuleCreateUpdate.vue'),
+            hidden: true,
+            meta: { title: '', activeMenu: '' }
+          },
+          {
+            path: ':id',
+            name: 'AssetACLDetail',
+            component: () => import('@/views/acls/AssetLoginACL/AssetLoginAclDetail/index'),
+            hidden: true,
+            meta: { title: i18n.t('AssetACLDetail'), activeMenu: '' }
+          },
+          {
+            path: ':id/update',
+            name: 'DataMaskingRuleUpdate',
+            component: () => import('@/views/acls/DataMaskingRule/DataMaskingRuleCreateUpdate.vue'),
+            hidden: true,
+            meta: { title: '', activeMenu: '' }
+          }
+        ]
+      },
      {
        path: 'cmd-groups',
        component: empty,
@@ -237,7 +290,11 @@ export default [
            path: '',
            name: 'ConnectMethodACLList',
            component: () => import('@/views/acls/ConnectMethodACL/ConnectMethodAclList.vue'),
-            meta: { title: i18n.t('ConnectMethodACLs'), activeMenu: '', menuTitle: i18n.t('ConnectMethod') }
+            meta: {
+              title: i18n.t('ConnectMethodACLs'),
+              activeMenu: '',
+              menuTitle: i18n.t('ConnectMethod')
+            }
          },
          {
            path: 'create',
--- a/src/router/console/assets.js
+++ b/src/router/console/assets.js
@@ -20,7 +20,7 @@ export default [
        path: '',
        name: 'AssetList',
        component: () => import('@/views/assets/Asset/AssetList/index.vue'),
-        meta: { title: i18n.t('AssetList') }
+        meta: { title: i18n.t('AssetList'), showInSearch: true }
      },
      {
        path: ':id',
--- a/src/router/console/index.js
+++ b/src/router/console/index.js
@@ -22,6 +22,7 @@ export default {
    showNavSwitcher: () => {
      return store.getters.consoleOrgs.length > 0
    },
+
    permissions: []
  },
  children: [
--- a/src/router/console/sessions.js
+++ b/src/router/console/sessions.js
@@ -34,14 +34,12 @@ export default [
  {
    path: `${BASE_URL}/luna/?_=${Date.now()}`,
    name: 'WebTerminal',
-    // component: () => window.open(`/luna/?_=${Date.now()}`),
    meta: { title: i18n.t('WebTerminal') }
    // hidden: true
  },
  {
    path: `${BASE_URL}/koko/elfinder/sftp/?`,
    name: 'FileManagement',
-    // component: () => window.open(`/koko/elfinder/sftp/?`),
    meta: { title: i18n.t('FileManagement') }
  }
 ]
--- a/src/router/reports/accounts.js
+++ b/src/router/reports/accounts.js
@@ -6,7 +6,7 @@ export default [
    component: () => import('@/views/reports/accounts/AccountStatistics.vue'), // Parent router-view
    name: 'AccountStatistics',
    meta: {
-      permissions: [],
+      permissions: ['rbac.view_accountstatisticsreport'],
      expanded: true,
      icon: 'user-o',
      title: i18n.t('AccountStatisticsReport')
@@ -17,7 +17,7 @@ export default [
    component: () => import('@/views/reports/accounts/AccountAutomation.vue'), // Parent router-view
    name: 'AccountAutomationReport',
    meta: {
-      permissions: [],
+      permissions: ['rbac.view_accountautomationreport'],
      expanded: true,
      icon: 'user-o',
      title: i18n.t('AccountAutomationReport')
--- a/src/router/reports/assets.js
+++ b/src/router/reports/assets.js
@@ -6,7 +6,7 @@ export default [
    component: () => import('@/views/reports/assets/AssetActivity.vue'), // Parent router-view
    name: 'AssetReport',
    meta: {
-      permissions: [],
+      permissions: ['rbac.view_assetactivityreport'],
      icon: 'user-o',
      expanded: true,
      title: i18n.t('AssetActivityReport')
@@ -17,7 +17,7 @@ export default [
    component: () => import('@/views/reports/assets/AssetStatistics.vue'), // Parent router-view
    name: 'AssetStatistics',
    meta: {
-      permissions: [],
+      permissions: ['rbac.view_assetstatisticsreport'],
      expanded: true,
      icon: 'user-o',
      title: i18n.t('AssetStatisticsReport')
--- a/src/router/reports/dashboard.js
+++ b/src/router/reports/dashboard.js
@@ -0,0 +1,48 @@
+import i18n from '@/i18n/i18n'
+
+export default [
+  {
+    path: 'console',
+    component: () => import('@/views/reports/console/index.vue'), // Parent router-view
+    name: 'ConsoleReport',
+    meta: {
+      permissions: ['rbac.view_console'],
+      icon: 'user-o',
+      expanded: true,
+      title: i18n.t('ConsoleReport')
+    }
+  },
+  {
+    path: 'pam',
+    component: () => import('@/views/reports/pam/Dashboard/index.vue'), // Parent router-view
+    name: 'PamReport',
+    meta: {
+      permissions: ['rbac.view_pam'],
+      expanded: true,
+      icon: 'user-o',
+      title: i18n.t('PamReport')
+    }
+  },
+  {
+    path: 'audits',
+    component: () => import('@/views/reports/audits/Dashboard.vue'), // Parent router-view
+    name: 'AuditsReport',
+    meta: {
+      permissions: ['rbac.view_audit'],
+      expanded: true,
+      icon: 'user-o',
+      title: i18n.t('AuditsReport')
+    }
+  },
+  {
+    path: 'change-secret',
+    component: () => import('@/views/reports/pam/ChangeSecret/index.vue'),
+    name: 'ChangeSecretReport',
+    meta: {
+      permissions: ['accounts.view_changesecretautomation'],
+      expanded: true,
+      icon: 'user-o',
+      title: i18n.t('ChangeSecretReport')
+    }
+  }
+]
--- a/src/router/reports/index.js
+++ b/src/router/reports/index.js
@@ -4,6 +4,7 @@ import empty from '@/layout/empty'
 import users from './users'
 import assets from './assets'
 import accounts from './accounts'
+import dashboard from './dashboard'

 export default {
  path: '/reports',
@@ -17,6 +18,18 @@ export default {
    permissions: []
  },
  children: [
+    {
+      path: '/reports/dashboard',
+      component: empty,
+      redirect: 'dashboard',
+      name: 'ReportsDashboard',
+      meta: {
+        title: i18n.t('ReportsDashboard'),
+        icon: 'reports',
+        permissions: []
+      },
+      children: dashboard
+    },
    {
      path: '/reports/users',
      component: empty,
--- a/src/router/reports/users.js
+++ b/src/router/reports/users.js
@@ -6,7 +6,7 @@ export default [
    component: () => import('@/views/reports/users/UserActivity.vue'), // Parent router-view
    name: 'UserReport',
    meta: {
-      permissions: [],
+      permissions: ['rbac.view_userloginreport'],
      icon: 'user-o',
      expanded: true,
      title: i18n.t('UserLoginReport')
@@ -17,7 +17,7 @@ export default [
    component: () => import('@/views/reports/users/ChangePassword.vue'), // Parent router-view
    name: 'ChangePassword',
    meta: {
-      permissions: [],
+      permissions: ['rbac.view_userchangepasswordreport'],
      expanded: true,
      icon: 'user-o',
      title: i18n.t('UserChangePasswordReport')
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -2,7 +2,7 @@
 //@import './transition.scss';
@import './sidebar.scss';
@import './menu.scss';
-@import "./fonts.scss";
+@import './fonts.scss';
@import './fonts/font-awesome.min.css';

 ::-webkit-scrollbar {
@@ -24,7 +24,7 @@

 ::-webkit-scrollbar-thumb {
  border-radius: 8px;
-  box-shadow: 8px 10px 20px #C6C6C6 inset;
+  box-shadow: 8px 10px 20px #c6c6c6 inset;
  border-left: 2px solid rgba(0, 0, 0, 0);
 }

@@ -38,7 +38,7 @@ body {
  -moz-osx-font-smoothing: grayscale;
  -webkit-font-smoothing: auto;
  color: var(--color-text-primary);
-  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
  font-size: 13px;
  line-height: 1.428;
 }
@@ -84,7 +84,7 @@ div:focus {
    visibility: hidden;
    display: block;
    font-size: 0;
-    content: " ";
+    content: ' ';
    clear: both;
    height: 0;
  }
@@ -94,7 +94,8 @@ div:focus {
  background-color: #ffffff;
 }

-.small, small {
+.small,
+small {
  font-size: 85%;
 }

@@ -102,7 +103,8 @@ div:focus {
  color: $--color-primary;
 }

-b, strong {
+b,
+strong {
  font-weight: 700;
 }

@@ -114,19 +116,37 @@ p {
  margin: 0 0 10px;
 }

-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
  font-family: inherit;
  font-weight: 500;
  line-height: 1.1;
  color: inherit;
 }

-.h4, .h5, .h6, h4, h5, h6 {
+.h4,
+.h5,
+.h6,
+h4,
+h5,
+h6 {
  margin-top: 10px;
  margin-bottom: 10px;
 }

-h3, h4, h5 {
+h3,
+h4,
+h5 {
  margin-top: 5px;
  font-weight: 600;
 }
@@ -135,8 +155,12 @@ h4 {
  font-size: 14px;
 }

-button, input, optgroup, select, textarea {
-  font-family: "Open Sans", sans-serif !important;
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: 'Open Sans', sans-serif !important;
 }

 // main-container global css
@@ -177,7 +201,7 @@ button, input, optgroup, select, textarea {
  word-break: keep-all;
 }

-input[type=file] {
+input[type='file'] {
  font-size: 12px;
  opacity: 80;
 }
@@ -214,7 +238,6 @@ input[type=file] {
  overflow: auto;
 }

-
 .el-input.is-disabled .el-input__inner {
  color: #737373 !important;
 }
@@ -256,7 +279,7 @@ input[type=file] {
    color: var(--color-text-primary);

    a {
-      color: #1c84c6
+      color: #1c84c6;
    }
  }

@@ -303,7 +326,7 @@ input[type=file] {
      white-space: nowrap;

      &:hover {
-        border-right: 2px solid #EBEEF5;
+        border-right: 2px solid #ebeef5;
      }
    }

@@ -314,7 +337,7 @@ input[type=file] {
    }

    &:last-child {
-      border-right: 1px solid #EBEEF5 !important;
+      border-right: 1px solid #ebeef5 !important;

      .cell {
        border-right: none;
@@ -353,7 +376,7 @@ input[type=file] {

      &:last-child {
        padding: 0;
-        border-right: 1px solid #EBEEF5 !important;
+        border-right: 1px solid #ebeef5 !important;

        .cell {
          vertical-align: unset;
@@ -391,7 +414,8 @@ input[type=file] {
  font-weight: 400;
 }

-.el-drawer.rtl, .drawer-panel {
+.el-drawer.rtl,
+.drawer-panel {
  border-radius: 5px 0 0 5px;
 }

@@ -399,13 +423,15 @@ input[type=file] {
  color: #909399 !important;
 }

-.el-button.el-button--small, .el-button--small.is-round {
+.el-button.el-button--small,
+.el-button--small.is-round {
  font-weight: 400;
  padding: 8px 12px;
  border-radius: 2px;
 }

-.el-button.el-button--mini, .el-button--mini.is-round {
+.el-button.el-button--mini,
+.el-button--mini.is-round {
  font-size: 0.7rem;
  font-weight: 400;
  border-radius: 2px;
@@ -435,18 +461,19 @@ input[type=file] {
  }

  .el-input__icon {
-    vertical-align: super
+    vertical-align: super;
  }
 }

-.el-form .el-input__inner, .el-dialog__body .el-input__inner {
+.el-form .el-input__inner,
+.el-dialog__body .el-input__inner {
  height: 30px;
  font-size: 13px;
 }

 .el-input input::placeholder {
  font-weight: 400 !important;
-  font-family: "Open Sans", sans-serif;
+  font-family: 'Open Sans', sans-serif;
  font-size: 13px;
 }

@@ -490,19 +517,19 @@ $tooltip-arrow-color: #c2d1e1;

 // 使用 SCSS 的嵌套和变量来简化代码
 .el-tooltip__popper.is-light {
-  &[x-placement^=right] .popper__arrow {
+  &[x-placement^='right'] .popper__arrow {
    border-right-color: $tooltip-arrow-color !important;
  }

-  &[x-placement^=left] .popper__arrow {
+  &[x-placement^='left'] .popper__arrow {
    border-left-color: $tooltip-arrow-color !important;
  }

-  &[x-placement^=top] .popper__arrow {
+  &[x-placement^='top'] .popper__arrow {
    border-top-color: $tooltip-arrow-color !important;
  }

-  &[x-placement^=bottom] .popper__arrow {
+  &[x-placement^='bottom'] .popper__arrow {
    border-bottom-color: $tooltip-arrow-color !important;
  }
 }
@@ -598,7 +625,6 @@ li.rmenu i.fa {
  }
 }

-
 //.link-btn {
 //  span {
 //    color: var(--color-link);
@@ -623,12 +649,12 @@ li.rmenu i.fa {
 }

 .el-input-number {
-  .el-input-number__decrease, .el-input-number__increase {
+  .el-input-number__decrease,
+  .el-input-number__increase {
    line-height: 26px;
  }
 }

-
 .el-form--label-top.el-form {
  //.el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:after {
  //  content: '*';
@@ -639,7 +665,6 @@ li.rmenu i.fa {
  }
 }

-
 .el-form-item {
  .CodeMirror {
    height: 200px;
@@ -706,3 +731,15 @@ div.el-loading-parent--relative {
 .el-drawer__header .drawer-title {
  color: var(--color-text-primary);
 }
+
+.margin-top-10 {
+  margin-top: 10px;
+}
+
+.margin-top-20 {
+  margin-top: 20px;
+}
+
+.el-message {
+  z-index: 999999 !important;
+}
--- a/src/utils/vue/elTableTooltipPatch.js
+++ b/src/utils/vue/elTableTooltipPatch.js
@@ -1,7 +1,7 @@
 // 鼠标可移入tooltip功能
-import { Table } from 'element-ui'
-import { getCell, getColumnByCell } from 'element-ui/packages/table/src/util'
-import { getStyle, hasClass } from 'element-ui/src/utils/dom'
+import { Table } from 'elementui-lts'
+import { getCell, getColumnByCell } from 'elementui-lts/packages/table/src/util'
+import { getStyle, hasClass } from 'elementui-lts/src/utils/dom'
 import { copy } from '../common/index'

 Object.assign(Table.components.TableBody.methods, {
--- a/src/utils/vue/index.js
+++ b/src/utils/vue/index.js
@@ -21,3 +21,16 @@ export function getComponentFromRoute(route, router) {
  }
  return r.components.default
 }
+
+export function getRouteUrl(route, router) {
+  if (typeof route === 'string') {
+    route = { name: route }
+  }
+
+  const r = router.match(route)
+
+  if (!r) {
+    return
+  }
+  return r.path
+}
--- a/src/utils/vue/message.js
+++ b/src/utils/vue/message.js
@@ -1,11 +1,18 @@
-// 重置message，防止重复点击重复弹出message弹框
 import { Message as elMessage } from 'element-ui'
 import { toSentenceCase } from '@/utils/common/index'

 let messageDom = null
+const DEFAULT_Z_INDEX = 20000
+
 const message = options => {
-  // 判断弹窗是否已存在, 若存在则关闭
  if (messageDom) messageDom.close()
+
+  if (typeof options === 'string') {
+    options = { message: options }
+  }
+
+  options.zIndex = options.zIndex || DEFAULT_Z_INDEX
+
  messageDom = elMessage(options)
 }

--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
@@ -107,6 +107,10 @@ export default {
          data.secret = data[secretType]
          delete data[secretType]
        }
+
+        if (data.ssh_key_change_strategy === 'add') {
+          data.ssh_key_change_strategy = this.initial.ssh_key_change_strategy
+        }
        return data
      }
    }
--- a/src/views/accounts/AccountChangeSecret/Overview/index.vue
+++ b/src/views/accounts/AccountChangeSecret/Overview/index.vue
@@ -1,6 +1,6 @@
 <template>
  <div v-if="this.$hasPerm('accounts.view_changesecretautomation')" class="change-secret-container">
-    <ChangeSecretReport :nav="false" />
+    <ChangeSecretReport :nav="false" :only-charts="true" />
  </div>
 </template>

--- a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
+++ b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
@@ -117,6 +117,10 @@ export default {
          data.secret = data[secretType]
          delete data[secretType]
        }
+
+        if (data.ssh_key_change_strategy === 'add') {
+          data.ssh_key_change_strategy = this.initial.ssh_key_change_strategy
+        }
        return data
      }
    }
--- a/src/views/accounts/RiskDetect/RiskHandlerFormatter/const.js
+++ b/src/views/accounts/RiskDetect/RiskHandlerFormatter/const.js
@@ -1,4 +1,5 @@
 import i18n from '@/i18n/i18n'
+
 const accountExistCache = new Map()

 async function checkAccountExist(username, asset) {
@@ -8,9 +9,10 @@ async function checkAccountExist(username, asset) {
  }
  const url = `/api/v1/accounts/accounts/?username=${encodeURIComponent(username)}&asset=${asset}`
  const data = await this.$axios.get(url)
-  const result = data.length > 0
-  accountExistCache.set(cacheKey, result)
-  return result
+  const results = data
+  const isExist = results.length > 0
+  accountExistCache.set(cacheKey, isExist)
+  return isExist
 }

 async function checkAccountsExist() {
--- a/src/views/acls/ConnectMethodACL/ConnectMethodAclCreateUpdate.vue
+++ b/src/views/acls/ConnectMethodACL/ConnectMethodAclCreateUpdate.vue
@@ -18,16 +18,13 @@ export default {
    return {
      initial: {},
      fields: [
-        [this.$t('Basic'), ['name', 'priority']],
+        [this.$t('Basic'), ['name']],
        [this.$t('Users'), ['users']],
        [this.$t('ConnectMethod'), ['connect_methods']],
        [this.$t('Action'), ['action', 'reviewers']],
        [this.$t('Other'), ['is_active', 'comment']]
      ],
      fieldsMeta: {
-        priority: {
-          rules: [rules.Required]
-        },
        assets: assetJSONSelectMeta(this),
        users: userJSONSelectMeta(this, true),
        connect_methods: {
--- a/src/views/acls/ConnectMethodACL/ConnectMethodAclDetail/Detail.vue
+++ b/src/views/acls/ConnectMethodACL/ConnectMethodAclDetail/Detail.vue
@@ -34,7 +34,7 @@ export default {
          key: this.$t('Reviewer'),
          value: this.object.reviewers.map(item => item.name).join(', ')
        },
-        'priority', 'date_created', 'created_by', 'comment'
+        'date_created', 'created_by', 'comment'
      ]
    }
  },
--- a/src/views/acls/ConnectMethodACL/ConnectMethodAclList.vue
+++ b/src/views/acls/ConnectMethodACL/ConnectMethodAclList.vue
@@ -17,8 +17,31 @@ export default {
        columnsShow: {
          min: ['name', 'actions'],
          default: [
-            'name', 'priority', 'is_active', 'comment', 'actions'
+            'name', 'is_active', 'comment', 'actions'
          ]
+        },
+        columnsMeta: {
+          'connect_methods': {
+            width: '240px',
+            formatter: (row) => {
+              const methods = Array.isArray(row.connect_methods) ? row.connect_methods : []
+              const colors = ['success', 'warning', 'info', 'danger']
+
+              return (
+                <div style='display: flex; flex-wrap: wrap; gap: 4px;'>
+                  {methods.map((item, idx) => (
+                    <el-tag
+                      key={idx}
+                      size='small'
+                      type={colors[idx % colors.length]}
+                    >
+                      {item}
+                    </el-tag>
+                  ))}
+                </div>
+              )
+            }
+          }
        }
      },
      headerActions: {
--- a/src/views/acls/DataMaskingRule/AssetLoginAclDetail/Detail.vue
+++ b/src/views/acls/DataMaskingRule/AssetLoginAclDetail/Detail.vue
@@ -0,0 +1,47 @@
+<template>
+  <TwoCol>
+    <AutoDetailCard :fields="detailFields" :object="object" :url="url" />
+  </TwoCol>
+</template>
+
+<script>
+import AutoDetailCard from '@/components/Cards/DetailCard/auto'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
+
+export default {
+  name: 'Detail',
+  components: {
+    TwoCol,
+    AutoDetailCard
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      url: `/api/v1/acls/login-asset-acls/${this.object.id}/`,
+      detailFields: [
+        'name',
+        {
+          key: this.$t('Action'),
+          value: this.object.action.label
+        },
+        {
+          key: this.$t('Reviewer'),
+          value: this.object.reviewers.map(item => item.name).join(', ')
+        },
+        'priority', 'date_created', 'created_by', 'comment'
+      ]
+    }
+  },
+  computed: {}
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>
--- a/src/views/acls/DataMaskingRule/AssetLoginAclDetail/index.vue
+++ b/src/views/acls/DataMaskingRule/AssetLoginAclDetail/index.vue
@@ -0,0 +1,51 @@
+<template>
+  <GenericDetailPage :active-menu.sync="config.activeMenu" :object.sync="instance" v-bind="config" v-on="$listeners">
+    <keep-alive>
+      <component :is="config.activeMenu" :object="instance" />
+    </keep-alive>
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage } from '@/layout/components'
+import Detail from './Detail.vue'
+import UserJsonTab from '@/components/Apps/ManyJsonTabs/UserJsonTab.vue'
+import AssetJsonTab from '@/components/Apps/ManyJsonTabs/AssetJsonTab.vue'
+
+export default {
+  components: {
+    GenericDetailPage,
+    Detail,
+    UserJsonTab,
+    AssetJsonTab
+  },
+  data() {
+    return {
+      instance: {},
+      config: {
+        url: `/api/v1/acls/login-asset-acls/`,
+        activeMenu: 'Detail',
+        submenu: [
+          {
+            title: this.$t('Basic'),
+            name: 'Detail'
+          },
+          {
+            title: this.$t('MenuUsers'),
+            name: 'UserJsonTab'
+          },
+          {
+            title: this.$t('Assets'),
+            name: 'AssetJsonTab'
+          }
+        ],
+        hasRightSide: true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/acls/DataMaskingRule/DataMaskingRuleCreateUpdate.vue
+++ b/src/views/acls/DataMaskingRule/DataMaskingRuleCreateUpdate.vue
@@ -0,0 +1,59 @@
+<template>
+  <GenericCreateUpdatePage v-bind="$data" />
+</template>
+
+<script>
+import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import { userJSONSelectMeta } from '@/views/users/const'
+import { assetJSONSelectMeta } from '@/views/assets/const'
+import AccountFormatter from '@/views/perms/AssetPermission/components/AccountFormatter.vue'
+
+export default {
+  name: 'DataMaskingRuleCreateUpdate',
+  components: {
+    GenericCreateUpdatePage
+  },
+  data() {
+    return {
+      initial: {
+        accounts: ['@ALL']
+      },
+      fields: [
+        [this.$t('Basic'), ['name', 'priority']],
+        [this.$t('Users'), ['users']],
+        [this.$t('Asset'), ['assets']],
+        [this.$t('Accounts'), ['accounts']],
+        [this.$t('Rules'), ['fields_pattern', 'masking_method', 'mask_pattern']],
+        [this.$t('Other'), ['is_active', 'comment']]
+      ],
+      fieldsMeta: {
+        assets: assetJSONSelectMeta(this),
+        users: userJSONSelectMeta(this),
+        accounts: {
+          component: AccountFormatter,
+          el: {
+            showAddTemplate: false,
+            enableVirtualAccount: false,
+            value: ['@ALL'],
+            assets: []
+          },
+          hidden: (formValue) => {
+            const ids = formValue.assets?.ids
+            this.fieldsMeta.accounts.el.assets = ids || []
+          }
+        },
+        mask_pattern: {
+          hidden: (formValue) => {
+            return !['fixed_char'].includes(formValue.masking_method)
+          }
+        }
+      },
+      url: '/api/v1/acls/data-masking-rules/'
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style>
+</style>
--- a/src/views/acls/DataMaskingRule/DataMaskingRuleList.vue
+++ b/src/views/acls/DataMaskingRule/DataMaskingRuleList.vue
@@ -0,0 +1,35 @@
+<template>
+  <GenericListPage :header-actions="headerActions" :help-tip="helpMsg" :table-config="tableConfig" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      helpMsg: this.$t('DataMaskingRuleHelpHelpMsg'),
+      tableConfig: {
+        url: '/api/v1/acls/data-masking-rules/',
+        columnsExclude: ['users', 'assets', 'accounts', 'rules'],
+        columnsShow: {
+          min: ['name', 'actions'],
+          default: [
+            'name', 'priority', 'is_active', 'comment', 'actions'
+          ]
+        }
+      },
+      updateRoute: 'DataMaskingRuleUpdate',
+      headerActions: {
+        createRoute: 'DataMaskingRuleCreate',
+        hasRefresh: true,
+        hasExport: false,
+        hasImport: false
+      }
+    }
+  }
+}
+</script>
--- a/src/views/acls/index.vue
+++ b/src/views/acls/index.vue
@@ -31,7 +31,7 @@ export default {
            id: 'connect-asset',
            display_name: this.$t('AssetACLs'),
            name: 'AssetACLList',
-            comment: this.$t('AssetLoginACLHelpText'),
+            comment: this.$t('DataMaskingRuleHelpHelpText'),
            icon: 'assets',
            edition: 'enterprise',
            tags: ['asset']
--- a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
@@ -86,6 +86,8 @@ export default {
          component: UploadKey
        }
      }
+
+      fieldsMeta['db_name']['rules'] = []
      if (['mongodb', 'postgresql'].indexOf(platform) !== -1) {
        fieldsMeta['db_name']['rules'] = [rules.Required]
      }
--- a/src/views/assets/Asset/AssetList/DatabaseList.vue
+++ b/src/views/assets/Asset/AssetList/DatabaseList.vue
@@ -22,7 +22,7 @@ export default {
              icon: 'cloud-provider',
              has: () => this.$hasPerm('xpack.view_account') && this.$hasLicense(),
              callback: () => this.$router.push(
-                { name: 'CloudAccountList', query: { category: 'database' }}
+                { name: 'CloudAccountList', query: { category: 'database' } }
              )
            }
          ]
--- a/src/views/assets/Cloud/Account/components/ResultPanel.vue
+++ b/src/views/assets/Cloud/Account/components/ResultPanel.vue
@@ -50,7 +50,7 @@ export default {
  },
  methods: {
    handleClick() {
-      this.$router.push({ name: 'CloudAccountDetail', params: { id: this.object.id }})
+      this.$router.push({ name: 'CloudAccountDetail', params: { id: this.object.id } })
      this.handleClose()
    },
    handleClose() {
--- a/src/views/assets/Cloud/Account/components/TimingPanel.vue
+++ b/src/views/assets/Cloud/Account/components/TimingPanel.vue
@@ -58,7 +58,7 @@ export default {
          }
        ],
        getNextRoute: (res, method) => {
-          return { name: 'CloudAccountDetail', params: { id: res.account.id }}
+          return { name: 'CloudAccountDetail', params: { id: res.account.id } }
        }
      }
    }
--- a/src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue
+++ b/src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue
@@ -36,8 +36,8 @@ export default {
          component: ActionInput
        }
      },
-      updateSuccessNextRoute: { name: 'CloudAccountList', params: { activeMenu: 'StrategyList' }},
-      createSuccessNextRoute: { name: 'CloudAccountList', params: { activeMenu: 'StrategyList' }},
+      updateSuccessNextRoute: { name: 'CloudAccountList', params: { activeMenu: 'StrategyList' } },
+      createSuccessNextRoute: { name: 'CloudAccountList', params: { activeMenu: 'StrategyList' } },
      cleanFormValue: (value) => {
        value['category'] = this.$route.query.category || 'host'
        return value
--- a/src/views/assets/Platform/PlatformDetail/PlatformDetailUpdateDialog.vue
+++ b/src/views/assets/Platform/PlatformDetail/PlatformDetailUpdateDialog.vue
@@ -38,7 +38,7 @@ export default {
  data() {
    return {
      initial: {},
-      successUrl: { name: 'Settings', params: { activeMenu: 'Basic' }},
+      successUrl: { name: 'Settings', params: { activeMenu: 'Basic' } },
      url: `/api/v1/assets/platforms/`,
      hasReset: false,
      hasDetailInMsg: false,
--- a/src/views/assets/Platform/PlatformList.vue
+++ b/src/views/assets/Platform/PlatformList.vue
@@ -110,7 +110,7 @@ export default {
            formatterArgs: {
              canClone: () => vm.$hasPerm('assets.add_platform'),
              onClone({ row }) {
-                vm.$refs.genericListTable.onClone({ row, query: { type: row.type.value, category: row.category.value }})
+                vm.$refs.genericListTable.onClone({ row, query: { type: row.type.value, category: row.category.value } })
              },
              canUpdate: ({ row }) => !row.internal && vm.$hasPerm('assets.change_platform'),
              canDelete: ({ row }) => !row.internal && vm.$hasPerm('assets.delete_platform'),
@@ -140,7 +140,7 @@ export default {
        },
        moreCreates: {
          callback: (item) => {
-            this.$refs.genericListTable.onCreate({ query: { type: item.name, category: item.category }})
+            this.$refs.genericListTable.onCreate({ query: { type: item.name, category: item.category } })
          },
          dropdown: []
        }
@@ -167,7 +167,7 @@ export default {

    if (platform) {
      this.$nextTick(() => {
-        this.$refs.genericListTable.onDetail({ row: { id: platform, name }})
+        this.$refs.genericListTable.onDetail({ row: { id: platform, name } })
      })
    }
  },
--- a/src/views/assets/Zone/ZoneDetail/GatewayCreateUpdate.vue
+++ b/src/views/assets/Zone/ZoneDetail/GatewayCreateUpdate.vue
@@ -13,7 +13,7 @@ export default {
  data() {
    return {
      url: '/api/v1/assets/gateways/',
-      updateInitial: async(initial) => {
+      updateInitial: async (initial) => {
        const url = `/api/v1/assets/platforms/?name__startswith=Gateway`
        const platform = await this.$axios.get(url)
        initial.platform = parseInt(platform[0].id)
--- a/src/views/assets/Zone/ZoneDetail/GatewayList.vue
+++ b/src/views/assets/Zone/ZoneDetail/GatewayList.vue
@@ -116,7 +116,7 @@ export default {
                query: { zone: this.object.id, platform_type: 'linux', 'category': 'host' }
              },
              onClone: ({ row }) => {
-                this.$refs.ListTable.onClone({ row: { ...row, payload: 'pam_asset_clone' }})
+                this.$refs.ListTable.onClone({ row: { ...row, payload: 'pam_asset_clone' } })
              },
              performDelete: ({ row }) => {
                const id = row.id
@@ -175,7 +175,7 @@ export default {
            name: 'GatewayAdd',
            title: this.$t('Add'),
            can: !this.$store.getters.currentOrgIsRoot,
-            callback: async() => {
+            callback: async () => {
              // 由于修改成为了抽屉形式，导致传入到 AddGateway 组件中的 obj 任然为最初的数量，就会导致新增的 item 依然会出现可选的情况
              // 此时修改为在打开 AddGateway 额外从 tableConfig.url 的接口中获取最新的 gateways 数目
              try {
@@ -203,7 +203,7 @@ export default {
          }
        ],
        onCreate: () => {
-          vm.$refs.ListTable.onCreate({ query: { zone: vm.object.id, platform_type: 'linux', category: 'host' }})
+          vm.$refs.ListTable.onCreate({ query: { zone: vm.object.id, platform_type: 'linux', category: 'host' } })
        }
      },
      addGatewaySetting: {
--- a/src/views/dashboard/Audit/index.vue
+++ b/src/views/dashboard/Audit/index.vue
@@ -2,7 +2,7 @@
  <Page>
    <div v-if="this.$hasPerm('rbac.view_audit')">
      <Announcement />
-      <AuditReport :only-charts="true" />
+      <AuditReport :only-charts="true" :nav="false" />
    </div>
    <Page403 v-else />
  </Page>
--- a/src/views/dashboard/Console/index.vue
+++ b/src/views/dashboard/Console/index.vue
@@ -2,7 +2,7 @@
  <Page>
    <div v-if="this.$hasPerm('rbac.view_console')">
      <Announcement />
-      <ConsoleReport :nav="false" />
+      <ConsoleReport :nav="false" :only-charts="true" />
    </div>
    <Page403 v-else />
  </Page>
--- a/src/views/dashboard/Pam/index.vue
+++ b/src/views/dashboard/Pam/index.vue
@@ -2,7 +2,7 @@
  <Page>
    <div v-if="this.$hasPerm('rbac.view_pam')">
      <Announcement />
-      <PamReport :nav="false" />
+      <PamReport :nav="false" :only-charts="true" />
    </div>
    <Page403 v-else />
  </Page>
--- a/src/views/labels/BindDialog.vue
+++ b/src/views/labels/BindDialog.vue
@@ -55,7 +55,7 @@ export default {
  },
  data() {
    const vm = this
-    const getPageData = async({ pageIndex, pageSize, keyword }) => {
+    const getPageData = async ({ pageIndex, pageSize, keyword }) => {
      const limit = pageSize
      const offset = (pageIndex - 1) * pageSize
      const params = {
--- a/src/views/ops/Adhoc/QuickJob.vue
+++ b/src/views/ops/Adhoc/QuickJob.vue
@@ -20,38 +20,37 @@
      :assets="classifiedAssets"
      @submit="onConfirmRunAsset"
    />
-    <AssetTreeTable ref="TreeTable" :tree-setting="treeSetting">
-      <template slot="table">
-        <div class="transition-box" style="width: calc(100% - 17px);">
-          <CodeEditor
-            v-if="ready"
-            :options="cmOptions"
-            :toolbar="toolbar"
-            :value.sync="command"
-            style="margin-bottom: 20px"
+    <div class="job-container">
+      <div class="select-assets">
+        <SelectJobAssetDialog @change="handleSelectAssets" />
+      </div>
+      <div class="transition-box" style="width: calc(100% - 17px);">
+        <CodeEditor
+          v-if="ready"
+          :options="cmOptions"
+          :toolbar="toolbar"
+          :value.sync="command"
+          style="margin-bottom: 20px"
+        />
+        <span v-if="executionInfo.status" style="float: right" />
+        <div class="xterm-container">
+          <QuickJobTerm
+            ref="xterm"
+            :show-tool-bar="true"
+            :select-assets="selectAssets"
+            :xterm-config="xtermConfig"
+            :execution-info="executionInfo"
+            @view-assets="viewConfirmRunAssets"
          />
-          <span v-if="executionInfo.status" style="float: right" />
-          <div class="xterm-container">
-            <QuickJobTerm
-              ref="xterm"
-              :show-tool-bar="true"
-              :select-assets="selectAssets"
-              :xterm-config="xtermConfig"
-              :execution-info="executionInfo"
-              @view-assets="viewConfirmRunAssets"
-            />
-          </div>
-          <div style="display: flex;margin-top:10px;justify-content: space-between" />
        </div>
-      </template>
-    </AssetTreeTable>
+        <div style="display: flex;margin-top:10px;justify-content: space-between" />
+      </div>
+    </div>
  </Page>
 </template>

 <script>
-import $ from '@/utils/jquery-vendor.js'
 import _isequal from 'lodash.isequal'
-import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import QuickJobTerm from '@/views/ops/Adhoc/components/QuickJobTerm.vue'
 import CodeEditor from '@/components/Form/FormFields/CodeEditor'
 import Page from '@/layout/components/Page'
@@ -61,15 +60,16 @@ import VariableHelpDialog from './VariableHelpDialog.vue'
 import ConfirmRunAssetsDialog from './components/ConfirmRunAssetsDialog.vue'
 import SetVariableDialog from '@/views/ops/Template/components/SetVariableDialog.vue'
 import { createJob, getJob, getTaskDetail, stopJob } from '@/api/ops'
+import SelectJobAssetDialog from './components/SelectJobAssetDialog.vue'

 export default {
  name: 'CommandExecution',
  components: {
+    SelectJobAssetDialog,
    VariableHelpDialog,
    AdhocSaveDialog,
    AdhocOpenDialog,
    SetVariableDialog,
-    AssetTreeTable,
    Page,
    QuickJobTerm,
    CodeEditor,
@@ -91,7 +91,6 @@ export default {
      showOpenAdhocSaveDialog: false,
      showSetVariableDialog: false,
      showConfirmRunAssetsDialog: false,
-      DataZTree: 0,
      runas: '',
      runasPolicy: 'skip',
      chdir: '',
@@ -109,7 +108,7 @@ export default {
            align: 'left',
            icon: 'fa fa-play',
            tip: this.$t('RunCommand'),
-            isVisible: this.$store.getters.currentOrgIsRoot,
+            disabled: this.$store.getters.currentOrgIsRoot,
            el: {
              type: 'primary'
            },
@@ -151,7 +150,7 @@ export default {
                  this.$message.warning(`${this.$t('RequiredAssetOrNode')}`)
                  return cb([])
                }
-
+                cb([]) // 先返回空，避免输入时出现下拉闪烁
                this.$axios.post('/api/v1/ops/username-hints/', {
                  nodes: nodes,
                  assets: hosts,
@@ -295,30 +294,6 @@ export default {
        lineWrapping: true,
        mode: 'shell'
      },
-      treeSetting: {
-        treeUrl: '/api/v1/perms/users/self/nodes/children-with-assets/tree/',
-        searchUrl: '/api/v1/perms/users/self/assets/tree/',
-        showRefresh: true,
-        showMenu: false,
-        showSearch: true,
-        notShowBuiltinTree: true,
-        check: {
-          enable: true
-        },
-        view: {
-          dblClickExpand: false,
-          showLine: true
-        },
-        callback: {
-          onCheck: function(_event, treeId, treeNode) {
-            const treeObj = $.fn.zTree.getZTreeObj(treeId)
-            if (treeNode.checked) {
-              treeObj.expandNode(treeNode, true, false, true)
-            }
-          }
-        }
-      },
-      iShowTree: true,
      variableFormData: [],
      variableQueryParam: '',
      classifiedAssets: {
@@ -328,6 +303,7 @@ export default {
      },
      selectAssets: [],
      selectNodes: [],
+      selectHosts: [],
      lastRequestPayload: null
    }
  },
@@ -335,9 +311,6 @@ export default {
    xterm() {
      return this.$refs.xterm.xterm
    },
-    ztree() {
-      return this.$refs.TreeTable.$refs.TreeList.$refs.AutoDataZTree.$refs.AutoDataZTree.$refs.dataztree.$refs.ztree
-    },
    isRunning() {
      return this.executionInfo.status.value === 'running'
    }
@@ -357,6 +330,9 @@ export default {
    async initData() {
      this.recoverStatus()
    },
+    handleSelectAssets(assets) {
+      this.selectHosts = assets
+    },
    recoverStatus() {
      if (this.$route.query.taskId) {
        this.currentTaskId = this.$route.query.taskId
@@ -432,13 +408,6 @@ export default {
      msg = JSON.stringify({ task: this.currentTaskId })
      this.ws.send(msg)
    },
-    getSelectedNodes() {
-      return this.ztree.getCheckedNodes().filter(node => {
-        const status = node.getCheckStatus()
-        return node.id !== 'search' && status.half === false
-      })
-    },
-
    setCostTimeInterval() {
      this.toolbar.left.run.icon = 'fa fa-spinner fa-spin'
      this.toolbar.left.run.isVisible = true
@@ -448,17 +417,8 @@ export default {
    },

    getSelectedNodesAndHosts() {
-      const hosts = this.getSelectedNodes().filter((item) => {
-        return item.meta.type !== 'node'
-      }).map(function(node) {
-        return node.id
-      })
-
-      const nodes = this.getSelectedNodes().filter((item) => {
-        return item.meta.type === 'node'
-      }).map(function(node) {
-        return node.meta.data.id
-      })
+      const hosts = this.selectHosts
+      const nodes = []
      return { hosts, nodes }
    },
    shouldReRequest(payload) {
@@ -470,8 +430,7 @@ export default {
    execute() {
      // const size = 'rows=' + this.xterm.rows + '&cols=' + this.xterm.cols
      const { hosts, nodes } = this.getSelectedNodesAndHosts()
-
-      if (hosts.length === 0 && nodes.length === 0) {
+      if (this.selectHosts.length === 0) {
        this.$message.error(this.$tc('RequiredAssetOrNode'))
        return
      }
@@ -572,6 +531,13 @@ export default {

 <style lang="scss" scoped>
 $container-bg-color: #f7f7f7;
+.job-container {
+  display: flex;
+
+  .select-assets {
+    width: 23.6%;
+  }
+}

 .transition-box {
  display: flex;
@@ -608,51 +574,21 @@ $container-bg-color: #f7f7f7;
  border-radius: 2px;
 }

-.el-tree {
-  background-color: inherit !important;
-}
-
 .mini {
  margin-right: 5px;
  width: 12px !important;
 }

-.auto-data-ztree {
-  overflow: auto;
-  /*border-right: solid 1px red;*/
-}
-
 .vue-codemirror-wrap ::v-deep .CodeMirror {
  width: 600px;
  height: 100px;
  border: 1px solid #eee;
 }

-.tree-box {
-  margin-right: 2px;
-  border: 1px solid #e0e0e0;
-
-  ::v-deep .ztree {
-    .level0 {
-      .node_name {
-        max-width: 100px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        display: inline-block;
-      }
-    }
-  }
-}
-
 .output {
  padding-left: 30px;
  background-color: rgb(247 247 247);
  border: solid 1px #f3f3f3;;
 }

-.tree-table-content {
-  ::v-deep .left {
-    padding-top: 4px;
-  }
-}
 </style>
--- a/src/views/ops/Adhoc/components/SelectJobAssetDialog.vue
+++ b/src/views/ops/Adhoc/components/SelectJobAssetDialog.vue
@@ -0,0 +1,378 @@
+<template>
+  <div class="asset-select">
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span>已选资产({{ selectAssets.length }})</span>
+        <el-button
+          v-if="selectAssets.length > 0"
+          style="float: right; padding: 3px 0"
+          type="text"
+          @click="handleClick"
+        >
+          请选择资产
+        </el-button>
+      </div>
+      <div
+        v-if="selectAssets.length === 0"
+        class="empty-assets"
+        role="button"
+        tabindex="0"
+        aria-label="Select assets"
+        @click=" handleClick()"
+      >
+        <i class="icon el-icon-plus" />
+        <span class="title">请选择资产</span>
+        <span class="subtitle">点击添加</span>
+      </div>
+      <div v-else class="asset-list">
+        <div
+          v-for="group in groupedAssets"
+          :key="group.key"
+          class="platform-group"
+        >
+          <div class="platform-group-header">
+            <el-checkbox
+              :indeterminate="isPlatformIndeterminate(group)"
+              :value="isPlatformAllSelected(group)"
+              @change="val => togglePlatformAll(group, val)"
+            >
+              <span class="platform-title">
+                <img
+                  v-if="group.assets.length"
+                  :src="getPlatformLogo(group.assets[0])"
+                  class="platform-icon"
+                >
+                {{ group.platformName }} ({{ group.assets.length }})
+              </span>
+            </el-checkbox>
+          </div>
+          <el-checkbox-group
+            v-model="selectAssets"
+            class="platform-group-assets"
+            @change="onCheckboxChange"
+          >
+            <el-checkbox
+              v-for="item in group.assets"
+              :key="item.id"
+              :label="item.id"
+            >
+              <span
+                :title="item.name"
+                class="asset-name"
+              >{{ item.name }}</span>
+              <i
+                class="el-icon-minus asset-remove-icon"
+                title="移除"
+                @click.stop="removeAsset(item)"
+              />
+            </el-checkbox>
+          </el-checkbox-group>
+        </div>
+      </div>
+    </el-card>
+
+    <AssetSelectDialog
+      v-if="dialogVisible"
+      ref="dialog"
+      :base-node-url="baseNodeUrl"
+      :base-url="baseUrl"
+      :tree-setting="treeSetting"
+      :tree-url-query="treeUrlQuery"
+      :value="selectAssets"
+      :visible.sync="dialogVisible"
+      v-bind="$attrs"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      v-on="$listeners"
+    />
+  </div>
+</template>
+
+<script>
+import AssetSelectDialog from '@/components/Apps/AssetSelect/dialog.vue'
+import { loadPlatformIcon } from '@/utils/jms/index'
+
+export default {
+  componentName: 'SelectJobAssetDialog',
+  components: { AssetSelectDialog },
+  props: {
+    baseUrl: {
+      type: String,
+      default: '/api/v1/perms/users/self/assets/'
+    },
+    defaultPageSize: {
+      type: Number,
+      default: 10
+    },
+    baseNodeUrl: {
+      type: String,
+      default: '/api/v1/perms/users/self/nodes/'
+    },
+    treeUrlQuery: {
+      type: Object,
+      default: () => {
+      }
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    treeSetting: {
+      type: Object,
+      default: () => ({})
+    },
+    disabled: {
+      type: [Boolean, Function],
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      selectAssetRows: [],
+      selectAssets: []
+    }
+  },
+  computed: {
+    groupedAssets() {
+      const map = {}
+      this.selectAssetRows.forEach(a => {
+        const key = a?.type?.value || 'unknown'
+        const name = a?.type?.label || a?.type?.value || 'Unknown'
+        if (!map[key]) {
+          map[key] = { key, platformName: name, assets: [] }
+        }
+        map[key].assets.push(a)
+      })
+      return Object.values(map)
+        .map(g => {
+          g.assets = g.assets.slice().sort((x, y) => (x.name || '').localeCompare(y.name || ''))
+          return g
+        })
+        .sort((a, b) => a.platformName.localeCompare(b.platformName))
+    }
+  },
+  methods: {
+    handleClick() {
+      this.dialogVisible = true
+    },
+    handleConfirm(valueSelected, rowsAdd) {
+      if (valueSelected === undefined) {
+        return
+      }
+      this.$emit('change', valueSelected)
+      rowsAdd.forEach(item => {
+        if (!this.selectAssetRows.find(i => i.id === item.id)) {
+          this.selectAssetRows.push(item)
+        }
+      })
+      // 移除已经取消选择的资产
+      this.selectAssetRows = this.selectAssetRows.filter(r => valueSelected.includes(r.id))
+      this.selectAssets = valueSelected
+      this.dialogVisible = false
+    },
+    handleCancel() {
+      this.dialogVisible = false
+    },
+    getPlatformLogo(platform) {
+      return loadPlatformIcon(platform.name, platform.type.value)
+    },
+    onCheckboxChange(value) {
+      this.selectAssets = value
+      this.$emit('change', value)
+    },
+    isPlatformAllSelected(group) {
+      return group.assets.length > 0 && group.assets.every(a => this.selectAssets.includes(a.id))
+    },
+    isPlatformIndeterminate(group) {
+      const selected = group.assets.filter(a => this.selectAssets.includes(a.id)).length
+      return selected > 0 && selected < group.assets.length
+    },
+    togglePlatformAll(group, checked) {
+      const ids = group.assets.map(a => a.id)
+      if (checked) {
+        const merged = new Set(this.selectAssets.concat(ids))
+        this.selectAssets = Array.from(merged)
+      } else {
+        this.selectAssets = this.selectAssets.filter(id => !ids.includes(id))
+      }
+      this.$emit('change', this.selectAssets)
+    },
+    removeAsset(asset) {
+      this.selectAssets = this.selectAssets.filter(id => id !== asset.id)
+      this.selectAssetRows = this.selectAssetRows.filter(r => r.id !== asset.id)
+      this.$emit('change', this.selectAssets)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.asset-select {
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+  color: var(--color-border);
+
+  ::v-deep {
+    .el-card {
+      flex: 1;
+    }
+
+    .el-card__body {
+      height: calc(100vh - 200px);
+      overflow-y: auto;
+      overflow-x: hidden;
+      padding: 10px 16px;
+    }
+
+    .el-checkbox {
+      width: 100%;
+      display: flex;
+      padding: 3px 0;
+      margin-right: 0;
+      align-items: center;
+
+      .asset-remove-icon {
+        opacity: 0;
+        visibility: hidden;
+        cursor: pointer;
+        font-weight: normal;
+        transition: opacity .15s ease;
+        margin-left: auto;
+        color: var(--color-danger);
+      }
+
+      .el-checkbox__label {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        gap: 3px;
+        padding-right: 20px;
+        padding-left: 3px;
+      }
+
+      .el-checkbox__label:hover .asset-remove-icon {
+        opacity: 1;
+        visibility: visible;
+      }
+    }
+  }
+
+  .asset-list {
+    margin: auto;
+  }
+
+  .asset-name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 180px;
+  }
+
+  .platform-group {
+    margin-bottom: 8px;
+    padding: 6px 8px;
+  }
+
+  .platform-group-header {
+    padding-bottom: 4px;
+    margin-bottom: 4px;
+  }
+
+  .platform-title {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    color: #a2aabd;
+    font-weight: 800;
+    font-size: 12px;
+  }
+
+  .platform-icon {
+    width: 18px;
+    height: 18px;
+  }
+
+  .platform-group-assets {
+    padding-left: 15px;
+    margin-left: 3px;
+    border-left: 2px solid var(--color-border);
+  }
+
+  .select-asset-button {
+    position: relative;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%); /* 让中心点对齐 */
+  }
+
+}
+
+.el-select {
+  width: 100%;
+}
+
+.page ::v-deep .page-heading {
+  display: none;
+}
+
+.el-dialog__wrapper ::v-deep .el-dialog__body {
+  padding: 0 0 0 3px;
+}
+
+.empty-assets {
+  border: 2px dashed #d9d9d9;
+  border-radius: 6px;
+  padding: 56px 16px;
+  text-align: center;
+  cursor: pointer;
+  transition: border-color .2s, background-color .25s, color .2s;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: #909399;
+  height: 100%;
+  background: #fff;
+
+  .icon {
+    font-size: 42px;
+    line-height: 1;
+    margin-bottom: 14px;
+    color: #c0c4cc;
+    transition: color .2s;
+  }
+
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    margin-bottom: 6px;
+  }
+
+  .subtitle {
+    font-size: 12px;
+    opacity: .75;
+  }
+}
+
+.empty-assets:hover:not(.is-disabled) {
+  border-color: var(--color-primary);
+  background: #f5f9ff;
+  color: var(--color-primary);
+
+  .icon {
+    color: var(--color-primary);
+  }
+}
+
+.empty-assets.is-disabled {
+  cursor: not-allowed;
+  opacity: .55;
+  background: #fafafa;
+
+  .disabled-tip {
+    color: #c0c4cc;
+  }
+}
+</style>
--- a/src/views/ops/File/index.vue
+++ b/src/views/ops/File/index.vue
@@ -10,136 +10,142 @@
        {{ tip }}
      </span>
    </el-alert>
-
-    <AssetTreeTable ref="AssetTreeTable" :tree-setting="treeSetting">
-      <template slot="table">
-        <div class="transition-box" style="width: calc(100% - 17px);">
-          <div class="upload_input">
-            <el-button
-              :disabled="runButton.disabled"
-              :type="runButton.el&&runButton.el.type"
-              size="small"
-              style="display: inline-block; padding: 6px 10px"
-              @click="runButton.callback()"
-            >
-              <i :class="runButton.icon" style="margin-right: 4px;" />{{ runButton.name }}
-            </el-button>
-          </div>
-          <span style="color: red">*</span>
-          <div class="upload_input">{{ $t('Account') }}:</div>
-          <div class="upload_input">
-            <el-autocomplete
-              v-model="runAsInput.value"
-              :fetch-suggestions="runAsInput.el.query"
-              :placeholder="runAsInput.placeholder"
-              size="mini"
-              style="display: inline-block; margin: 0 2px"
-              @change="runAsInput.callback(runAsInput.value)"
-              @select="runAsInput.callback(runAsInput.value)"
-            />
-          </div>
-          <div class="upload_input">{{ $t('UploadDir') }}:</div>
-          <div class="upload_input">
-            <el-input
-              v-if="dstPathInput.type==='input'"
-              v-model="dstPath"
-              :placeholder="dstPathInput.placeholder"
-              size="mini"
-              @change="dstPathInput.callback(dstPathInput.value)"
-            >
-              <template slot="prepend">/tmp/</template>
-            </el-input>
-          </div>
-          <div
-            class="file-uploader"
+    <div class="job-container">
+      <div class="select-assets">
+        <SelectJobAssetDialog @change="handleSelectAssets" />
+      </div>
+      <div class="transition-box" style="width: calc(100% - 17px);">
+        <div class="upload_input">
+          <el-button
+            :disabled="runButton.disabled"
+            :type="runButton.el&&runButton.el.type"
+            size="small"
+            style="display: inline-block; padding: 6px 10px"
+            @click="runButton.callback()"
          >
-            <el-card>
-              <el-upload
-                v-if="ready"
-                ref="upload"
-                :auto-upload="false"
-                :on-change="onFileChange"
-                :value.sync="uploadFileList"
-                action=""
-                drag
-                multiple
-              >
-                <i class="el-icon-upload" />
-                <div class="el-upload__text" style="margin-bottom: 10px;padding: 0 5px 0 5px ">
-                  {{ $t('DragUploadFileInfo') }}
-                </div>
-                <span>
-                  {{ $t('UploadFileLthHelpText', {limit: SizeLimitMb}) }}
-                </span>
-                <div slot="file" slot-scope="{file}">
-                  <li class="el-upload-list__item is-ready" tabindex="0">
-                    <a :style="sameFileStyle(file)" class="el-upload-list__item-name">
-                      <i class="el-icon-document" />{{ file.name }}
-                      <i style="color: #1ab394;float: right;font-weight:normal">
-                        {{ formatFileSize(file.size) }}
-                        <i class="el-icon-close" @click="removeFile(file)" />
-                      </i>
-                    </a>
-                  </li>
-                </div>
-                <div
-                  v-if="uploadFileList.length === 0"
-                  slot="tip"
-                  class="empty-file-tip"
-                >
-                  {{ $tc('NoFiles') }}
-                </div>
-              </el-upload>
-              <el-progress v-if="ShowProgress" :percentage="progressLength" />
-
-            </el-card>
-          </div>
-          <div style="margin-bottom: 5px;font-weight: bold; display: inline-block">{{ $tc('Output') }}:</div>
-          <span v-if="executionInfo.status && summary" style="float: right">
-            <span>
-              <span><b>{{ $tc('Status') }}: </b></span>
-              <span
-                v-if="executionInfo.status==='timeout'"
-                class="status_warning"
-              >{{ $tc('Timeout') }}</span>
-              <span v-else>
-                <span class="status_success">{{ $tc('Success') + ': ' + summary.success }}</span>
-                <span class="status_warning">{{ $tc('Skip') + ': ' + summary.skip }}</span>
-                <span class="status_danger">{{ $tc('Failed') + ': ' + summary.failed }}</span>
+            <i :class="runButton.icon" style="margin-right: 4px;" />{{ runButton.name }}
+          </el-button>
+        </div>
+        <span style="color: red">*</span>
+        <div class="upload_input">{{ $t('Account') }}:</div>
+        <div class="upload_input">
+          <el-autocomplete
+            v-model="runAsInput.value"
+            :fetch-suggestions="runAsInput.el.query"
+            :placeholder="runAsInput.placeholder"
+            size="mini"
+            style="display: inline-block; margin: 0 2px"
+            @change="runAsInput.callback(runAsInput.value)"
+            @select="runAsInput.callback(runAsInput.value)"
+          />
+        </div>
+        <div class="upload_input">{{ $t('UploadDir') }}:</div>
+        <div class="upload_input">
+          <el-input
+            v-if="dstPathInput.type==='input'"
+            v-model="dstPath"
+            :placeholder="dstPathInput.placeholder"
+            size="mini"
+            @change="dstPathInput.callback(dstPathInput.value)"
+          >
+            <template slot="prepend">/tmp/</template>
+          </el-input>
+        </div>
+        <div
+          class="file-uploader"
+        >
+          <el-card>
+            <el-upload
+              v-if="ready"
+              ref="upload"
+              :auto-upload="false"
+              :on-change="onFileChange"
+              :value.sync="uploadFileList"
+              action=""
+              drag
+              multiple
+            >
+              <i class="el-icon-upload" />
+              <div class="el-upload__text" style="margin-bottom: 10px;padding: 0 5px 0 5px ">
+                {{ $t('DragUploadFileInfo') }}
+              </div>
+              <span>
+                {{ $t('UploadFileLthHelpText', {limit: sizeLimitMb}) }}
              </span>
-            </span>
-            <span>
-              <span><b>{{ $tc('TimeDelta') }}: </b></span>
-              <span>{{ executionInfo.timeCost }}</span>
+              <div slot="file" slot-scope="{file}">
+                <li class="el-upload-list__item is-ready" tabindex="0">
+                  <a :style="sameFileStyle(file)" class="el-upload-list__item-name">
+                    <i class="el-icon-document" />{{ file.name }}
+                    <i style="color: #1ab394;float: right;font-weight:normal">
+                      {{ formatFileSize(file.size) }}
+                      <i class="el-icon-close" @click="removeFile(file)" />
+                    </i>
+                  </a>
+                </li>
+              </div>
+              <div
+                v-if="uploadFileList.length === 0"
+                slot="tip"
+                class="empty-file-tip"
+              >
+                {{ $tc('NoFiles') }}
+              </div>
+            </el-upload>
+            <el-progress
+              v-if="showProgress"
+              :percentage="progressLength"
+            />
+            <div v-if="showProgress" class="status-info">
+              <span class="left">{{ speedText }}</span>
+              <span class="right">{{ loadedSize }} / {{ totalSize }}</span>
+            </div>
+          </el-card>
+        </div>
+        <div style="margin-bottom: 5px;font-weight: bold; display: inline-block">{{ $tc('Output') }}:</div>
+        <span v-if="executionInfo.status && summary && !showProgress" style="float: right">
+          <span>
+            <span><b>{{ $tc('Status') }}: </b></span>
+            <span
+              v-if="executionInfo.status==='timeout'"
+              class="status_warning"
+            >{{ $tc('Timeout') }}</span>
+            <span v-else>
+              <span class="status_success">{{ $tc('Success') + ': ' + summary.success }}</span>
+              <span class="status_warning">{{ $tc('Skip') + ': ' + summary.skip }}</span>
+              <span class="status_danger">{{ $tc('Failed') + ': ' + summary.failed }}</span>
            </span>
          </span>
-          <div class="output">
-            <Term
-              ref="xterm"
-              :show-tool-bar="true"
-              :xterm-config="xtermConfig"
-            />
-            <div style="height: 2px" />
-          </div>
-          <div style="display: flex; margin-top:10px; justify-content: space-between" />
+          <span>
+            <span><b>{{ $tc('TimeDelta') }}: </b></span>
+            <span>{{ executionInfo.timeCost }}</span>
+          </span>
+        </span>
+        <div class="output">
+          <Term
+            ref="xterm"
+            :show-tool-bar="true"
+            :xterm-config="xtermConfig"
+          />
+          <div style="height: 2px" />
        </div>
-      </template>
-    </AssetTreeTable>
+        <div style="display: flex; margin-top:10px; justify-content: space-between" />
+      </div>
+    </div>
  </Page>
 </template>

 <script>
-import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import Term from '@/components/Widgets/Term'
 import Page from '@/layout/components/Page'
 import { createJob, getTaskDetail, JobUploadFile } from '@/api/ops'
 import { formatFileSize } from '@/utils/common/index'
 import store from '@/store'
+import SelectJobAssetDialog from '@/views/ops/Adhoc/components/SelectJobAssetDialog.vue'

 export default {
  name: 'FileTransfer',
  components: {
-    AssetTreeTable,
+    SelectJobAssetDialog,
    Page,
    Term
  },
@@ -154,7 +160,6 @@ export default {
        cancel: 0
      },
      xtermConfig: {},
-      DataZTree: 0,
      runas: '',
      dstPath: '',
      runButton: {
@@ -181,6 +186,7 @@ export default {
          autoComplete: true,
          query: (query, cb) => {
            const { hosts, nodes } = this.getSelectedNodesAndHosts()
+            cb([]) // 先返回空，避免输入时出现下拉闪烁
            this.$axios.post('/api/v1/ops/username-hints/', {
              nodes: nodes,
              assets: hosts,
@@ -208,27 +214,11 @@ export default {
          this.chdir = val
        }
      },
-      treeSetting: {
-        treeUrl: '/api/v1/perms/users/self/nodes/children-with-assets/tree/',
-        searchUrl: '/api/v1/perms/users/self/assets/tree/',
-        notShowBuiltinTree: true,
-        showRefresh: true,
-        showMenu: false,
-        showSearch: true,
-        check: {
-          enable: true
-        },
-        view: {
-          dblClickExpand: false,
-          showLine: true
-        }
-      },
-      iShowTree: true,
      progressLength: 0,
-      ShowProgress: false,
+      showProgress: false,
      upload_interval: null,
      uploadFileList: [],
-      SizeLimitMb: store.getters.publicSettings['FILE_UPLOAD_SIZE_LIMIT_MB'],
+      sizeLimitMb: store.getters.publicSettings['FILE_UPLOAD_SIZE_LIMIT_MB'],
      summary: {
        'success': 0,
        'failed': 0,
@@ -238,15 +228,16 @@ export default {
        this.$tc('FileTransferBootStepHelpTips1'),
        this.$tc('FileTransferBootStepHelpTips2'),
        this.$tc('FileTransferBootStepHelpTips3')
-      ]
+      ],
+      speedText: '',
+      loadedSize: '',
+      totalSize: '',
+      selectHosts: []
    }
  },
  computed: {
    xterm() {
      return this.$refs.xterm.xterm
-    },
-    ztree() {
-      return this.$refs.AssetTreeTable.$refs.TreeList.$refs.AutoDataZTree.$refs.AutoDataZTree.$refs.dataztree.$refs.ztree
    }
  },
  mounted() {
@@ -300,8 +291,7 @@ export default {
        if (this.executionInfo.status === 'success') {
          this.$message.success(this.$tc('RunSucceed'))
          clearInterval(this.upload_interval)
-          this.progressLength = 100
-          this.ShowProgress = true
+          this.showProgress = false
        }
      })
    },
@@ -314,13 +304,6 @@ export default {
      msg = JSON.stringify({ task: this.currentTaskId })
      this.ws.send(msg)
    },
-    getSelectedNodes() {
-      return this.ztree.getCheckedNodes().filter(node => {
-        const status = node.getCheckStatus()
-        return node.id !== 'search' && status.half === false
-      })
-    },
-
    setCostTimeInterval() {
      this.runButton.icon = 'fa fa-spinner fa-spin'
      this.runButton.disabled = true
@@ -329,17 +312,8 @@ export default {
      }, 1000)
    },
    getSelectedNodesAndHosts() {
-      const hosts = this.getSelectedNodes().filter((item) => {
-        return item.meta.type !== 'node'
-      }).map(function(node) {
-        return node.id
-      })
-
-      const nodes = this.getSelectedNodes().filter((item) => {
-        return item.meta.type === 'node'
-      }).map(function(node) {
-        return node.meta.data.id
-      })
+      const hosts = this.selectHosts
+      const nodes = []
      return { hosts, nodes }
    },
    truncateFileName(fullName) {
@@ -365,7 +339,7 @@ export default {
      return ''
    },
    isFileExceedsLimit(file) {
-      const isGtLimit = file.size / 1024 / 1024 > this.SizeLimitMb
+      const isGtLimit = file.size / 1024 / 1024 > this.sizeLimitMb
      if (isGtLimit) {
        this.$message.error(this.$tc('FileSizeExceedsLimit'))
      }
@@ -380,6 +354,9 @@ export default {
      this.uploadFileList.splice(this.uploadFileList.indexOf(file), 1)
      this.handleSameFile(this.uploadFileList)
    },
+    formatSpeed(bps) {
+      return `${this.formatFileSize(bps)}/s`
+    },
    execute() {
      const { hosts, nodes } = this.getSelectedNodesAndHosts()
      for (const file of this.uploadFileList) {
@@ -425,8 +402,10 @@ export default {
      createJob(data).then(res => {
        this.progressLength = 0
        this.executionInfo.timeCost = 0
-        this.ShowProgress = true
+        this.showProgress = true
+        this.speedText = ''
        const form = new FormData()
+        const start = Date.now()
        for (const file of this.uploadFileList) {
          form.append('files', file.raw)
          form.append('job_id', res.id)
@@ -436,31 +415,59 @@ export default {
            clearInterval(this.upload_interval)
            return
          }
-          this.progressLength += 1
        }, 100)
-        JobUploadFile(form).then(res => {
+        JobUploadFile(form, {
+          onUploadProgress: (e) => {
+            if (!e.total) return
+            const percent = Math.floor((e.loaded / e.total) * 100)
+            this.progressLength = Math.min(percent, 100)
+            this.loadedSize = formatFileSize(e.loaded)
+            this.totalSize = formatFileSize(e.total)
+            const elapsedSec = (Date.now() - start) / 1000
+            if (elapsedSec > 0) {
+              const speed = e.loaded / elapsedSec
+              this.speedText = this.formatSpeed(speed)
+            }
+          }
+        }).then(res => {
          this.executionInfo.status = 'running'
          this.currentTaskId = res.task_id
          this.xtermConfig = { taskId: this.currentTaskId, type: 'shortcut_cmd' }
          this.setCostTimeInterval()
          this.writeExecutionOutput()
-        }).catch(() => {
+        }).catch((error) => {
+          this.$message.error(this.$tc('Error'), error)
          this.execute_stop()
        })
      })
    },
    execute_stop() {
      this.progressLength = 0
-      this.ShowProgress = false
+      this.showProgress = false
      this.runButton.disabled = false
      clearInterval(this.upload_interval)
      this.runButton.icon = 'fa fa-play'
+    },
+    handleSelectAssets(assets) {
+      this.selectHosts = assets
    }
  }
 }
 </script>

 <style lang="scss" scoped>
+.job-container {
+  display: flex;
+
+  .select-assets {
+    width: 23.6%;
+  }
+}
+
+.transition-box {
+  margin-left: 30px;
+}
+
 .mini-button {
  width: 12px;
  float: right;
@@ -472,19 +479,11 @@ export default {
  border-radius: 2px;
 }

-.el-tree {
-  background-color: inherit !important;
-}
-
 .mini {
  margin-right: 5px;
  width: 12px !important;
 }

-.auto-data-ztree {
-  overflow: auto;
-}
-
 .vue-codemirror-wrap ::v-deep .CodeMirror {
  width: 600px;
  height: 100px;
@@ -495,11 +494,6 @@ export default {
  padding: 0 10px;
 }

-.tree-box {
-  margin-right: 2px;
-  border: 1px solid #e0e0e0;
-}
-
 .status_success {
  color: var(--color-primary);
 }
@@ -522,7 +516,8 @@ export default {
  min-width: 925px;

  ::v-deep .el-card__body {
-    div {
+    > div:first-child {
+      //不要影响到 el-progress
      display: flex;
      position: relative;

@@ -566,6 +561,14 @@ export default {
        }
      }
    }
+
+    .el-progress-bar {
+      padding-right: 0;
+    }
+
+    .el-progress__text {
+      display: none;
+    }
  }
 }

@@ -578,4 +581,11 @@ export default {
 .output ::v-deep #terminal {
  border: dashed 1px #d9d9d9;
 }
+
+.status-info {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+
 </style>
--- a/src/views/perms/AssetPermission/components/AccountFormatter.vue
+++ b/src/views/perms/AssetPermission/components/AccountFormatter.vue
@@ -16,7 +16,7 @@
      </el-radio-group>

      <div v-if="showSpecZone" class="spec-accounts spec-zone">
-        <div class="group-title">{{ $t('SpecAccount') }}</div>
+        <!-- <div class="group-title">{{ $t('SpecAccount') }}</div> -->
        <TagInput
          v-model="specAccountsInput"
          :autocomplete="autocomplete"
@@ -33,10 +33,10 @@
        </span>
      </div>

-      <!--      <div v-if="showNotAccounts" class="not-accounts spec-zone">-->
-      <!--        <div class="group-title">{{ $t('ExcludeAccount') }}</div>-->
-      <!--        <TagInput v-model="excludeAccountsInput" @change="handleTagChange" />-->
-      <!--      </div>-->
+      <div v-if="showExcludeZone" class="not-accounts spec-zone">
+        <!-- <div class="group-title">{{ $t('ExcludeAccount') }}</div> -->
+        <TagInput v-model="excludeAccountsInput" @change="handleTagChange" />
+      </div>

      <div v-if="enableVirtualAccount" class="spec-zone virtual-choices">
        <el-checkbox v-model="virtualChecked" @change="handleVirtualChecked">
@@ -83,7 +83,7 @@ import {
  AllAccount,
  AnonymousAccount,
  ManualAccount,
-  NotAccount,
+  ExcludeAccount,
  realChoices,
  SameAccount,
  SpecAccount,
@@ -139,7 +139,7 @@ export default {
      ALL: AllAccount,
      SPEC: SpecAccount,
      VIRTUAL: virtual,
-      EXCLUDE: NotAccount,
+      EXCLUDE: ExcludeAccount,
      showTemplateDialog: false,
      realRadioSelected: this.ALL,
      realChoices: realChoices,
@@ -215,7 +215,7 @@ export default {
      const value = this.value || []
      const specAccountsInput = this.getSpecValues(value)

-      // const excludeAccountsInput = this.getExcludeChoices(value)
+      const excludeAccountsInput = this.getExcludeChoices(value)
      // 先清理 radio
      const isAll = value.includes(this.ALL)

@@ -224,9 +224,10 @@ export default {
      } else if (specAccountsInput.length > 0 || value.includes(this.SPEC)) {
        this.realRadioSelected = this.SPEC
        this.specAccountsInput = specAccountsInput
-        // } else if (excludeAccountsInput.length > 0) {
-        //   this.realRadioSelected = this.EXCLUDE
-        //   this.excludeAccountsInput = excludeAccountsInput
+      } else if (excludeAccountsInput.length > 0) {
+        this.realRadioSelected = this.EXCLUDE
+        this.excludeAccountsInput = excludeAccountsInput
+        this.showExcludeZone = true
      } else {
        this.realRadioSelected = NoneAccount
      }
@@ -271,10 +272,9 @@ export default {
        choicesSelected = [this.realRadioSelected, ...this.specAccountsInput, ...templateIds]
      } else if (this.realRadioSelected === NoneAccount) {
        choicesSelected = []
+      } else if (this.realRadioSelected === this.EXCLUDE && this.excludeAccountsInput) {
+        choicesSelected = [...this.excludeAccountsInput].map(i => '!' + i)
      }
-      // else if (this.realRadioSelected === this.EXCLUDE && this.excludeAccountsInput) {
-      //   choicesSelected = [...this.excludeAccountsInput].map(i => '!' + i)
-      // }

      if (this.virtualChecked) {
        choicesSelected = [...choicesSelected, ...this.virtualSelected]
@@ -317,6 +317,7 @@ export default {
 .spec-zone {
  border-bottom: dashed 1px var(--color-border);
  padding-bottom: 10px;
+  padding-top: 5px;

  &:last-child {
    border-bottom: none;
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -154,7 +154,7 @@ export const AssetPermissionListPageSearchConfigOptions = [

 export const AllAccount = '@ALL'
 export const SpecAccount = '@SPEC'
-export const NotAccount = '@NOT'
+export const ExcludeAccount = '@NOT'
 export const SameAccount = '@USER'
 export const ManualAccount = '@INPUT'
 export const AnonymousAccount = '@ANON'
@@ -163,7 +163,7 @@ export const NoneAccount = '@NONE'
 export const AccountLabelMapper = {
  [AllAccount]: i18n.t('AllAccounts'),
  [SpecAccount]: i18n.t('SpecAccount'),
-  [NotAccount]: i18n.t('ExcludeAccount'),
+  [ExcludeAccount]: i18n.t('ExcludeAccount'),
  [NoneAccount]: i18n.t('None'),
  [SameAccount]: i18n.t('SameAccount'),
  [ManualAccount]: i18n.t('ManualAccount'),
@@ -187,15 +187,14 @@ export const realChoices = [
    value: SpecAccount,
    tip: i18n.t('SpecAccountTip')
  },
+  {
+    label: AccountLabelMapper[ExcludeAccount],
+    value: ExcludeAccount
+  },
  {
    label: AccountLabelMapper[NoneAccount],
    value: NoneAccount
  }
-  // {
-  //   label: AccountLabelMapper[NotAccount],
-  //   value: NotAccount,
-  //   tip: i18n.t('NotAccountTip')
-  // }
 ]

 export const virtualAccounts = [
--- a/src/views/profile/PasswordAndSSHKey/SSHKey/SSHKeyList.vue
+++ b/src/views/profile/PasswordAndSSHKey/SSHKey/SSHKeyList.vue
@@ -20,7 +20,8 @@ export default {
        hasExport: false,
        hasImport: false,
        hasBulkDelete: false,
-        hasCreate: true
+        hasCreate: true,
+        canCreate: true
      },
      tableConfig: {
        hasSelection: true,
@@ -41,6 +42,12 @@ export default {
          date_created: {
            label: this.$t('DateCreated'),
            formatter: DateFormatter
+          },
+          actions: {
+            formatterArgs: {
+              canUpdate: true,
+              canClone: true
+            }
          }
        }
      }
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -237,7 +237,7 @@ export default {
          },
          callbacks: {
            click: function() {
-              this.$router.push({ name: 'SSHKeyList', query: { tab: 'SSHKey' } })
+              this.$router.push({ name: 'SSHKeyList', query: { tab: 'SSHKeyList' } })
            }.bind(this)
          }
        }
--- a/src/views/reports/accounts/AccountAutomation.vue
+++ b/src/views/reports/accounts/AccountAutomation.vue
@@ -28,7 +28,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('TaskExecutionTrends') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="ExecutionMetricsOptions"
                :autoresize="true"
              />
@@ -52,6 +52,7 @@ import BaseReport from '../base/BaseReport.vue'
 import SummaryCountCard from '@/components/Dashboard/SummaryCountCard.vue'
 import SwitchDate from '@/components/Dashboard/SwitchDate.vue'
 import * as echarts from 'echarts'
+import Echart from '@/components/Dashboard/Echart.vue'
 import AccountSummary from '@/views/reports/pam/ChangeSecret/AccountSummary.vue'
 import RiskSummary from '@/views/reports/pam/Dashboard/RiskSummary.vue'

@@ -61,7 +62,8 @@ export default {
    AccountSummary,
    SwitchDate,
    SummaryCountCard,
-    BaseReport
+    BaseReport,
+    Echart
  },
  props: {
    nav: {
@@ -211,7 +213,6 @@ export default {
  methods: {
    onChange(val) {
      this.days = val
-      localStorage.setItem('reportDays', val)
    },
    async getData() {
      const data = await this.$axios.get(`/api/v1/reports/reports/account-automation/?days=${this.days}`)
--- a/src/views/reports/accounts/AccountStatistics.vue
+++ b/src/views/reports/accounts/AccountStatistics.vue
@@ -20,7 +20,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('AccountCreationSourceDistribution') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="SourceOptions"
                :autoresize="true"
              />
@@ -31,7 +31,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('AccountConnectivityStatusDistribution') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="ConnectivityOptions"
                :autoresize="true"
              />
@@ -42,7 +42,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('AccountPasswordChangeTrends') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="ChangeSecretOptions"
                :autoresize="true"
              />
@@ -70,6 +70,7 @@
 import BaseReport from '../base/BaseReport.vue'
 import SummaryCountCard from '@/components/Dashboard/SummaryCountCard.vue'
 import * as echarts from 'echarts'
+import Echart from '@/components/Dashboard/Echart.vue'
 import { mixColors } from '@/views/reports/const'
 import RankTable from '@/views/reports/users/components/RankTable.vue'

@@ -77,7 +78,8 @@ export default {
  components: {
    RankTable,
    SummaryCountCard,
-    BaseReport
+    BaseReport,
+    Echart
  },
  props: {
    nav: {
--- a/src/views/reports/accounts/index.vue
+++ b/src/views/reports/accounts/index.vue
@@ -6,7 +6,7 @@
          <h5>{{ title }}</h5>
          <ul class="folder-list m-b-md" style="padding: 0">
            <li
-              v-for="chart in charts"
+              v-for="chart in chartItems"
              :key="chart.name"
              :class="{ active: selectedChart && selectedChart.name === chart.name }"
            >
@@ -46,18 +46,27 @@ export default {
        {
          title: this.$t('AccountStatisticsReport'),
          name: 'AccountStatistics',
-          icon: 'fa fa-users'
+          icon: 'fa fa-users',
+          hidden: this.$hasPerm('rbac.view_accountstatisticsreport')
        },
        {
          title: this.$t('AccountAutomationReport'),
          name: 'AccountAutomationReport',
-          icon: 'fa fa-cogs'
+          icon: 'fa fa-cogs',
+          hidden: this.$hasPerm('rbac.view_accountautomationreport')
        }
      ]
    }
  },
+  computed: {
+    chartItems() {
+      return this.charts.filter(chart => chart.hidden)
+    }
+  },
  created() {
-    this.handleChangeChart(this.charts[0])
+    if (this.chartItems.length > 0) {
+      this.handleChangeChart(this.chartItems[0])
+    }
  },
  methods: {
    handleChangeChart(chart) {
--- a/src/views/reports/assets/AssetActivity.vue
+++ b/src/views/reports/assets/AssetActivity.vue
@@ -28,7 +28,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('DistributionOfAssetLoginMethods') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="LoginEntryOptions"
                :autoresize="true"
              />
@@ -40,7 +40,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('RemoteLoginProtocolUsageDistribution') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="LoginProtocolOptions"
                :autoresize="true"
              />
@@ -52,7 +52,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('OperatingSystemDistributionOfLoginAssets') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="LoginOSOptions"
                :autoresize="true"
              />
@@ -64,7 +64,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('AssetLoginTrends') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                ref="loginTrend"
                :options="loginTrendOptions"
                :autoresize="true"
@@ -83,6 +83,7 @@ import BaseReport from '@/views/reports/base/BaseReport.vue'
 import SummaryCountCard from '@/components/Dashboard/SummaryCountCard.vue'
 import UserAssetActivity from '@/views/reports/console/UserAssetActivity.vue'
 import * as echarts from 'echarts'
+import Echart from '@/components/Dashboard/Echart.vue'
 import { mixColors } from '@/views/reports/const'

 export default {
@@ -90,7 +91,8 @@ export default {
    UserAssetActivity,
    SummaryCountCard,
    BaseReport,
-    SwitchDate
+    SwitchDate,
+    Echart
  },
  props: {
    nav: {
--- a/src/views/reports/assets/AssetStatistics.vue
+++ b/src/views/reports/assets/AssetStatistics.vue
@@ -20,7 +20,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('AssetTypeDistribution') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="AssetTypeOptions"
                :autoresize="true"
              />
@@ -31,7 +31,7 @@
          <div class="chart-container-title">
            <div class="chart-container-title-text">{{ $t('WeeklyGrowthTrend') }}</div>
            <div class="chart">
-              <echarts
+              <Echart
                :options="AddedAssetOptions"
                :autoresize="true"
              />
@@ -47,12 +47,14 @@
 import BaseReport from '../base/BaseReport.vue'
 import SummaryCountCard from '@/components/Dashboard/SummaryCountCard.vue'
 import * as echarts from 'echarts'
+import Echart from '@/components/Dashboard/Echart.vue'
 import { mixColors } from '@/views/reports/const'

 export default {
  components: {
    SummaryCountCard,
-    BaseReport
+    BaseReport,
+    Echart
  },
  props: {
    nav: {
--- a/src/views/reports/assets/index.vue
+++ b/src/views/reports/assets/index.vue
@@ -6,7 +6,7 @@
          <h5>{{ title }}</h5>
          <ul class="folder-list m-b-md" style="padding: 0">
            <li
-              v-for="chart in charts"
+              v-for="chart in chartItems"
              :key="chart.name"
              :class="{ active: selectedChart && selectedChart.name === chart.name }"
            >
@@ -46,18 +46,27 @@ export default {
        {
          title: this.$t('AssetStatisticsReport'),
          name: 'AssetStatistics',
-          icon: 'fa fa-database'
+          icon: 'fa fa-database',
+          hidden: this.$hasPerm('rbac.view_assetstatisticsreport')
        },
        {
          title: this.$t('AssetActivityReport'),
          name: 'AssetReport',
-          icon: 'fa fa-exchange'
+          icon: 'fa fa-exchange',
+          hidden: this.$hasPerm('rbac.view_assetactivityreport')
        }
      ]
    }
  },
+  computed: {
+    chartItems() {
+      return this.charts.filter(chart => chart.hidden)
+    }
+  },
  created() {
-    this.handleChangeChart(this.charts[0])
+    if (this.chartItems.length > 0) {
+      this.handleChangeChart(this.chartItems[0])
+    }
  },
  methods: {
    handleChangeChart(chart) {
--- a/src/views/reports/audits/Dashboard.vue
+++ b/src/views/reports/audits/Dashboard.vue
@@ -1,13 +1,20 @@
 <template>
-  <BaseReport v-bind="$attrs">
+  <BaseReport
+    :url="url"
+    :nav="nav"
+    :title="$t('AuditsDashboard')"
+    :disable-charts-padding="true"
+    name="AuditsDashboard"
+    v-bind="$attrs"
+  >
    <SwitchDate class="switch-date" :name="name" @change="onChange" />
    <CardSummary :days="days" />
-    <el-row :gutter="16">
-      <el-col :lg="12" :md="12" :sm="24">
-        <DataSummary :days="days" />
+    <el-row :gutter="10">
+      <el-col :span="12" :md="12">
+        <DataSummary class="chart-container" :days="days" />
      </el-col>
-      <el-col :lg="12" :md="12" :sm="24">
-        <RightSummary :days="days" />
+      <el-col :span="12" :md="12">
+        <RightSummary class="chart-container" :days="days" />
      </el-col>
    </el-row>
    <TrendSummary :days="days" />
@@ -21,6 +28,7 @@ import DataSummary from './components/DataSummary'
 import CardSummary from './components/CardSummary.vue'
 import RightSummary from './components/RightSummary.vue'
 import BaseReport from '../base/BaseReport.vue'
+import { getRouteUrl } from '@/utils/vue'

 export default {
  components: {
@@ -31,10 +39,17 @@ export default {
    RightSummary,
    BaseReport
  },
+  props: {
+    nav: {
+      type: Boolean,
+      default: true
+    }
+  },
  data() {
    return {
      name: 'AuditsDashboard',
-      days: localStorage.getItem(this.name) || '7'
+      days: localStorage.getItem(this.name) || '7',
+      url: getRouteUrl('AuditsReport', this.$router)
    }
  },
  methods: {
@@ -44,3 +59,8 @@ export default {
  }
 }
 </script>
+<style lang="scss" scoped>
+.chart-container {
+  margin-top: 16px;
+}
+</style>
--- a/src/views/reports/audits/components/CardSummary.vue
+++ b/src/views/reports/audits/components/CardSummary.vue
@@ -1,10 +1,10 @@
 <template>
-  <div>
+  <div class="chart-container full-width">
    <el-row :gutter="16">
-      <el-col :lg="12" :sm="24" class="margin-top-10">
+      <el-col :lg="12" :sm="24">
        <SummaryCountCard :config="logConfig" :items="LogItems" />
      </el-col>
-      <el-col :lg="12" :sm="24" class="margin-top-10">
+      <el-col :lg="12" :sm="24">
        <SummaryCountCard :config="sessionConfig" :items="sessionItems" />
      </el-col>
    </el-row>
@@ -124,7 +124,5 @@ export default {
 </script>

 <style scoped>
-.margin-top-10 {
-  margin-top: 10px;
-}
+
 </style>
--- a/src/views/reports/audits/components/DataSummary.vue
+++ b/src/views/reports/audits/components/DataSummary.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-row :gutter="16">
-    <el-col :lg="12" :sm="12" class="margin-top-10">
+  <el-row>
+    <el-col :span="12">
      <DataCard :config="logConfig">
        <div class="custom">
          <span>{{ logConfig.total }}</span>
@@ -10,7 +10,7 @@
        </div>
      </DataCard>
    </el-col>
-    <el-col :lg="12" :sm="12" class="margin-top-10">
+    <el-col :span="12">
      <DataCard :config="assetConfig">
        <div class="custom">
          <span>{{ assetConfig.total }}</span>
@@ -115,11 +115,5 @@ export default {
 </script>

 <style scoped>
-.left, .right {
-  display: inline-block;
-}

-.margin-top-10 {
-  margin-top: 10px;
-}
 </style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aaron3S	2f79134023	feat: change some translate	2025-10-14 15:58:19 +08:00
feng	c59e6268b3	perf: remve chat fa-arrows-alt	2025-10-14 14:54:26 +08:00
w940853815	3344e01a9c	perf: Asset selection optimization	2025-10-13 15:58:21 +08:00
zhaojisen	0a42031220	Fixed: Fix the issue where updating the SSH public key incorrectly redirects to a page.	2025-10-13 11:21:48 +08:00
feng	686e48f273	perf: Translate	2025-10-11 15:22:12 +08:00
w940853815	f16830adfe	fix: In rule selection, the global organization will display all assets and users.	2025-10-11 10:52:51 +08:00
Chenyang Shen	be8d09b777	Merge pull request #5221 from jumpserver/pr@dev@feat_update_menu_name feat: update menu name	2025-10-11 00:03:48 +08:00
Aaron3S	5ed2b6d9c8	feat: update menu name	2025-10-11 00:01:06 +08:00
feng	ece3ebc6e9	perf: Global can update and create ssh key	2025-10-09 18:01:55 +08:00
Aaron3S	1afd8dc934	feat: data masking	2025-10-09 10:39:05 +08:00
feng	a239060798	perf: Open web ui	2025-09-25 15:53:35 +08:00
w940853815	05032d6c78	perf: Remove useless code	2025-09-25 15:34:35 +08:00
w940853815	9dc35a603e	perf: File transfer select asset component replacement	2025-09-25 15:34:35 +08:00
w940853815	43448aa482	perf: Style adjustment	2025-09-25 15:34:35 +08:00
w940853815	8887e98249	perf: Group platform	2025-09-25 15:34:35 +08:00
w940853815	43e4dcd760	perf: User checkbox select	2025-09-25 15:34:35 +08:00
w940853815	94d4be7555	perf: User checkbox select	2025-09-25 15:34:35 +08:00
w940853815	8210e2810f	perf: Optimize the asset selection method of Adhoc	2025-09-25 15:34:35 +08:00
w940853815	05be6876f3	perf: Optimize file upload progress bar display	2025-09-22 17:39:01 +08:00
zhaojisen	38f8d88cdf	Fixed: Fix the issue of incorrect form error messages	2025-09-22 14:14:43 +08:00
feng	3b0def17d7	perf: Translate	2025-09-22 11:21:24 +08:00
w940853815	57b0fa0b0e	perf: Community edition hide report export button	2025-09-19 15:34:53 +08:00
w940853815	9611eb9c73	fix: Improve chart management by using a global _echarts object for tracking active charts	2025-09-17 19:02:24 +08:00
w940853815	a2bbb6555b	fix: Optimize data fetching in AccountSummary and UserAssetActivity components	2025-09-17 18:01:03 +08:00
zhaojisen	ddd25208d8	Fixed: Fix the issue where error message prompts are being obscured.	2025-09-17 17:48:08 +08:00
w940853815	fe8db5831b	fix: Edit template onPerformError error	2025-09-17 16:26:54 +08:00
feng	0c29ade399	perf: Compatible v3 ssh_key_change_strategy	2025-09-17 14:32:40 +08:00
zhaojisen	f8b2840d89	Fixed: Restore component update component settings logic	2025-09-17 14:11:40 +08:00
zhaojisen	52a18c3c35	Fixed: Fix the error reporting issue in risk detection review	2025-09-17 10:35:49 +08:00
w940853815	ace9cdcd68	perf: Translate msg template	2025-09-16 19:14:22 +08:00
w940853815	7098c2266e	fix: Copy name field failed	2025-09-16 17:56:11 +08:00
w940853815	58d3489c33	fix: There is something wrong with the format of the site message	2025-09-16 17:56:11 +08:00
w940853815	396d20f31e	fix: Remove priority fields in ACL components	2025-09-16 17:46:21 +08:00
zhaojisen	c8b866412a	Fixed: Restore the logic for adding gateway lists	2025-09-16 17:33:13 +08:00
feng	63b163e382	perf: Translate	2025-09-16 16:14:46 +08:00
zhaojisen	e1acc642ca	perf: Optimize the way connection methods are displayed in the table.	2025-09-16 11:35:45 +08:00
w940853815	e3f4cc68d2	fix: Export report pdf failed	2025-09-15 18:48:24 +08:00
w940853815	983aff62f2	fix: Update account existence check	2025-09-15 17:52:26 +08:00
zhaojisen	26e1ffdbdd	Fixed: Fix Dashboard export issue on the Audit Workbench	2025-09-15 17:25:51 +08:00
zhaojisen	2002519f30	Fixed: Fix the issue of storage failure when updating components.	2025-09-15 14:40:58 +08:00
zhaojisen	c8f3e71d2c	Fixed: Fixed the issue of failing to add a gateway in domain details.	2025-09-15 14:22:30 +08:00
w940853815	bd8f21e17a	perf: Init template name	2025-09-12 18:32:13 +08:00
w940853815	0981b1854b	perf: Remember select template	2025-09-12 18:32:13 +08:00
w940853815	94ab823b50	fix: Trim whitespace in email template content	2025-09-12 18:32:13 +08:00
w940853815	b378f41c07	fix: vue el-autocomplete flashes	2025-09-12 16:39:35 +08:00
zhaojisen	6cce077441	Confirm dialog for new announcement content	2025-09-11 17:11:40 +08:00
ibuler	361e522c5e	perf: tag input min width	2025-09-11 16:53:26 +08:00
w940853815	08161c892e	fix: LineChart component error	2025-09-11 15:09:05 +08:00
ibuler	39e4fdf40c	perf: 优化 action btn 的大小	2025-09-11 15:03:37 +08:00
w940853815	11011f6b68	fix: Modify Dialog components import	2025-09-11 14:51:34 +08:00
mikebofs	7eb2e08f03	perf: add search place holder	2025-09-10 18:18:47 +08:00
w940853815	7d422bea51	perf: And license validation in msg template page	2025-09-10 17:24:58 +08:00
feng	3367ec624c	perf: Ticket not display comment	2025-09-10 17:07:55 +08:00
fit2bot	091db8e6aa	feat: setting email template content (#5173 ) * feat: setting email template content * perf: template list * perf: show variable help text * perf: custom template render to string * perf: help text * perf: update email template variable structure and improve formatting * perf: Template content reset * perf: typo MsgTemplate * fix: email page error * fix: package.json conflict * perf: Update Dockerfile with new base image tag --------- Co-authored-by: w940853815 <940853815@qq.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-09-10 16:49:14 +08:00
feng	5d0f2c5c60	perf: Message zIndex 20000	2025-09-09 15:09:20 +08:00
feng	71b9e87786	perf: Update mysql db_name not required	2025-09-09 11:09:14 +08:00
fit2bot	ae0b3572f8	perf: Complete the search (#5175 ) * perf: global search * perf: Update Dockerfile with new base image tag * perf: 完成基本搜索 * perf: show search direct * perf: change search style * perf: 优化 panel 格式，不再用 select * perf: search add route * perf: add route search * perf: change view * perf: add to body * perf: 再次优化格式 * perf: 优化了一些显示 * perf: 基本完成搜索功能 * perf: 完成搜索 * perf: Update Dockerfile with new base image tag * perf: merge with remote --------- Co-authored-by: mikebofs <mikebofs@gmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: ibuler <ibuler@qq.com>	2025-09-05 17:23:37 +08:00
fit2bot	217a09ebd6	perf: global search (#5171 ) * perf: global search * perf: Update Dockerfile with new base image tag * perf: 完成基本搜索 * perf: show search direct * perf: change search style * perf: 优化 panel 格式，不再用 select * perf: search add route * perf: add route search * perf: change view --------- Co-authored-by: ibuler <ibuler@qq.com>	2025-09-05 16:39:37 +08:00
w940853815	ca61a75997	perf: refine layout of card body to avoid affecting el-progress	2025-09-01 10:09:19 +08:00
ibuler	3310459b2c	perf: reports menus	2025-08-28 15:08:20 +08:00
w940853815	b000ca46c9	perf: update event handler from rendered to finished in Echart component	2025-08-26 16:23:23 +08:00
mikebofs	36bdf6db2b	perf: echarts to components	2025-08-26 16:23:23 +08:00
mikebofs	5f20a79c0a	perf: support exclude some account on permission	2025-08-26 14:58:24 +08:00
zhaojisen	67eee7bb45	Fixed: Fix the issue where the number of exported items does not match the number of items selected.	2025-08-25 16:45:17 +08:00
feng	4b54c07a42	perf: Report menu perm	2025-08-22 18:51:32 +08:00
feng626	c907e158eb	Merge pull request #5152 from jumpserver/pr@dev@dashboard_export perf: export dashboard	2025-08-22 17:57:54 +08:00
feng626	7a7d41803c	Merge branch 'dev' into pr@dev@dashboard_export	2025-08-22 17:57:19 +08:00
feng	b9604a6d02	perf: report perm	2025-08-22 17:50:32 +08:00
mikebofs	794b612b8b	perf: change echarts define	2025-08-22 15:26:56 +08:00
mikebofs	8a965daa39	perf: remove line chart	2025-08-22 15:15:14 +08:00
mikebofs	c0705e72e3	perf: export dashboard	2025-08-22 14:42:04 +08:00
wrd	d755fd37bd	fix: Account automation report show error	2025-08-21 22:18:36 +08:00
mikebofs	ed8e6b479f	stash it	2025-08-21 18:25:18 +08:00
mikebofs	c42e922d36	merge: with remote	2025-08-21 16:30:29 +08:00
mikebofs	fd7e32bbbd	perf: export dashboard	2025-08-21 15:30:37 +08:00