feat: Update v4.0.0

v4.0.0

.eslintrc.js

@@ -14,97 +14,64 @@ module.exports = {
     window: true,
     _: true
   },
-  plugins: ['vue', 'spellcheck'],
   // add your custom rules here
   // it is base on https://github.com/vuejs/eslint-config-vue
   rules: {
-    'vue/max-attributes-per-line': [
+    'vue/max-attributes-per-line': [2, {
-      2,
+      'singleline': 10,
-      {
+      'multiline': {
-        singleline: 10,
+        'max': 1,
-        multiline: {
+        'allowFirstLine': false
-          max: 1,
-          allowFirstLine: false
-        }
       }
-    ],
+    }],
     'vue/singleline-html-element-content-newline': 'off',
     'vue/multiline-html-element-content-newline': 'off',
     'vue/name-property-casing': ['error', 'PascalCase'],
     'vue/no-v-html': 'off',
     'accessor-pairs': 2,
-    'arrow-spacing': [
+    'arrow-spacing': [2, {
-      2,
+      'before': true,
-      {
+      'after': true
-        before: true,
+    }],
-        after: true
-      }
-    ],
     'block-spacing': [2, 'always'],
-    'brace-style': [
+    'brace-style': [2, '1tbs', {
-      2,
+      'allowSingleLine': true
-      '1tbs',
+    }],
-      {
+    'camelcase': [0, {
-        allowSingleLine: true
+      'properties': 'always'
-      }
+    }],
-    ],
-    camelcase: [
-      0,
-      {
-        properties: 'always'
-      }
-    ],
     'comma-dangle': [2, 'never'],
-    'comma-spacing': [
+    'comma-spacing': [2, {
-      2,
+      'before': false,
-      {
+      'after': true
-        before: false,
+    }],
-        after: true
-      }
-    ],
     'comma-style': [2, 'last'],
     'constructor-super': 2,
-    curly: [2, 'multi-line'],
+    'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    eqeqeq: ['error', 'always', { null: 'ignore' }],
+    'eqeqeq': ['error', 'always', { 'null': 'ignore' }],
-    'generator-star-spacing': [
+    'generator-star-spacing': [2, {
-      2,
+      'before': true,
-      {
+      'after': true
-        before: true,
+    }],
-        after: true
-      }
-    ],
     'handle-callback-err': [2, '^(err|error)$'],
-    indent: [
+    'indent': [2, 2, {
-      2,
+      'SwitchCase': 1
-      2,
+    }],
-      {
-        SwitchCase: 1
-      }
-    ],
     'jsx-quotes': [2, 'prefer-single'],
-    'key-spacing': [
+    'key-spacing': [2, {
-      2,
+      'beforeColon': false,
-      {
+      'afterColon': true
-        beforeColon: false,
+    }],
-        afterColon: true
+    'keyword-spacing': [2, {
-      }
+      'before': true,
-    ],
+      'after': true
-    'keyword-spacing': [
+    }],
-      2,
+    'new-cap': [2, {
-      {
+      'newIsCap': true,
-        before: true,
+      'capIsNew': false
-        after: true
+    }],
-      }
-    ],
-    'new-cap': [
-      2,
-      {
-        newIsCap: true,
-        capIsNew: false
-      }
-    ],
     'new-parens': 2,
     'no-array-constructor': 2,
     'no-caller': 2,
@@ -135,23 +102,17 @@ module.exports = {
     'no-irregular-whitespace': 2,
     'no-iterator': 2,
     'no-label-var': 2,
-    'no-labels': [
+    'no-labels': [2, {
-      2,
+      'allowLoop': false,
-      {
+      'allowSwitch': false
-        allowLoop: false,
+    }],
-        allowSwitch: false
-      }
-    ],
     'no-lone-blocks': 2,
     'no-mixed-spaces-and-tabs': 2,
     'no-multi-spaces': 2,
     'no-multi-str': 2,
-    'no-multiple-empty-lines': [
+    'no-multiple-empty-lines': [2, {
-      2,
+      'max': 1
-      {
+    }],
-        max: 1
-      }
-    ],
     'no-native-reassign': 2,
     'no-negated-in-lhs': 2,
     'no-new-object': 2,
@@ -179,126 +140,62 @@ module.exports = {
     'no-undef-init': 2,
     'no-unexpected-multiline': 2,
     'no-unmodified-loop-condition': 2,
-    'no-unneeded-ternary': [
+    'no-unneeded-ternary': [2, {
-      2,
+      'defaultAssignment': false
-      {
+    }],
-        defaultAssignment: false
-      }
-    ],
     'no-unreachable': 2,
     'no-unsafe-finally': 2,
-    'no-unused-vars': [
+    'no-unused-vars': [2, {
-      2,
+      'vars': 'all',
-      {
+      'args': 'none'
-        vars: 'all',
+    }],
-        args: 'none'
-      }
-    ],
     'no-useless-call': 2,
     'no-useless-computed-key': 2,
     'no-useless-constructor': 2,
     'no-useless-escape': 0,
     'no-whitespace-before-property': 2,
     'no-with': 2,
-    'one-var': [
+    'one-var': [2, {
-      2,
+      'initialized': 'never'
-      {
+    }],
-        initialized: 'never'
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
       }
-    ],
+    }],
-    'operator-linebreak': [
-      2,
-      'after',
-      {
-        overrides: {
-          '?': 'before',
-          ':': 'before'
-        }
-      }
-    ],
     'padded-blocks': [2, 'never'],
-    quotes: [
+    'quotes': [2, 'single', {
-      2,
+      'avoidEscape': true,
-      'single',
+      'allowTemplateLiterals': true
-      {
+    }],
-        avoidEscape: true,
+    'semi': [2, 'never'],
-        allowTemplateLiterals: true
+    'semi-spacing': [2, {
-      }
+      'before': false,
-    ],
+      'after': true
-    semi: [2, 'never'],
+    }],
-    'semi-spacing': [
-      2,
-      {
-        before: false,
-        after: true
-      }
-    ],
     'space-before-blocks': [2, 'always'],
-    'space-before-function-paren': [
+    'space-before-function-paren': [2, 'never'],
-      2,
-      { anonymous: 'never', named: 'never', asyncArrow: 'always' }
-    ],
     'space-in-parens': [2, 'never'],
     'space-infix-ops': 2,
-    'space-unary-ops': [
+    'space-unary-ops': [2, {
-      2,
+      'words': true,
-      {
+      'nonwords': false
-        words: true,
+    }],
-        nonwords: false
+    'spaced-comment': [2, 'always', {
-      }
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
-    ],
+    }],
-    'object-curly-spacing': [2, 'always'],
-    'spaced-comment': [
-      2,
-      'always',
-      {
-        markers: ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
-      }
-    ],
     'template-curly-spacing': [2, 'never'],
     'use-isnan': 2,
     'valid-typeof': 2,
     'wrap-iife': [2, 'any'],
     'yield-star-spacing': [2, 'both'],
-    yoda: [2, 'never'],
+    'yoda': [2, 'never'],
     'prefer-const': 2,
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'array-bracket-spacing': [2, 'never'],
+    'object-curly-spacing': [2, 'always', {
-    'spellcheck/spell-checker': [
+      objectsInObjects: false
-      'warn',
+    }],
-      {
+    'array-bracket-spacing': [2, 'never']
-        comments: true,
-        strings: false,
-        identifiers: false,
-        lang: 'en_US',
-        skipWords: [
-          'echarts',
-          'resize',
-          'vue',
-          'eslint',
-          'babel',
-          'jsx',
-          'scss',
-          'v-deep',
-          'calc',
-          'vw',
-          'vh',
-          'px',
-          'rgba',
-          'rgb',
-          'var',
-          'lang',
-          'scoped',
-          'pdf',
-          'rbac'
-        ],
-        skipIfMatch: [
-          'http://[^s]*',
-          '^[-\\w]+/[-\\w\\.]+$',
-          String.raw`^\/api\/[a-z0-9\/._-]+$`,
-        ],
-        minLength: 3
-      }
-    ]
   }
 }

.github/workflows/.github/workflows/llm-code-review.yml

@@ -1,28 +0,0 @@
-name: LLM Code Review
-
-permissions:
-  contents: read
-  pull-requests: write
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-jobs:
-  llm-code-review:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: fit2cloud/LLM-CodeReview-Action@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.FIT2CLOUDRD_LLM_CODE_REVIEW_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.ALIYUN_LLM_API_KEY }}
-          LANGUAGE: English
-          OPENAI_API_ENDPOINT: https://dashscope.aliyuncs.com/compatible-mode/v1
-          MODEL: qwen2-1.5b-instruct
-          PROMPT: "Please check the following code differences for any irregularities, potential issues, or optimization suggestions, and provide your answers in English."
-          top_p: 1
-          temperature: 1
-          # max_tokens: 10000
-          MAX_PATCH_LENGTH: 10000 
-          IGNORE_PATTERNS: "/node_modules,*.md,/dist,/.github"
-          FILE_PATTERNS: "*.java,*.go,*.py,*.vue,*.ts,*.js,*.css,*.scss,*.html"

.github/workflows/build-base-image.yml

@@ -1,72 +0,0 @@
-name: Build and Push Base Image
-
-on:
-  push:
-    branches:
-      - 'pr*'
-    paths:
-      - 'package.json'
-      - 'package-lock.json'
-      - 'yarn.lock'
-      - 'Dockerfile-base'
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Lock Pull Request
-        run: |
-          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-          -d '{"state":"pending", "description":"Action running, merge disabled", "context":"Lock PR"}' \
-          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Extract date
-        id: vars
-        run: echo "IMAGE_TAG=$(date +'%Y%m%d_%H%M%S')" >> $GITHUB_ENV
-
-      - name: Extract repository name
-        id: repo
-        run: echo "REPO=$(basename ${{ github.repository }})" >> $GITHUB_ENV
-
-      - name: Build and push multi-arch image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          file: Dockerfile-base
-          tags: jumpserver/${{ env.REPO }}-base:${{ env.IMAGE_TAG }}
-
-      - name: Update Dockerfile
-        run: |
-          sed -i 's|-base:.* AS stage-build|-base:${{ env.IMAGE_TAG }} AS stage-build|' Dockerfile
-
-      - name: Commit changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add Dockerfile
-          git commit -m "perf: Update Dockerfile with new base image tag"
-          git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Unlock Pull Request
-        run: |
-          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-          -d '{"state":"success", "description":"Action running, merge disabled", "context":"Lock PR"}' \
-          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"

.github/workflows/jms-build-test.yml

@@ -0,0 +1,46 @@
+name: "Run Build Test"
+on:
+  push:
+    paths:
+      - 'Dockerfile'
+      - 'Dockerfile*'
+      - 'package.json'
+      - 'yarn.lock'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        component: [lina]
+        version: [v4]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: docker/setup-buildx-action@v3
+
+    - name: Prepare Build
+      run: |
+        sed -i 's@registry.npmmirror.com@registry.yarnpkg.com@g' yarn.lock
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        file: Dockerfile
+        tags: ghcr.io/jumpserver/${{ matrix.component }}:${{ matrix.version }}
+        platforms: linux/amd64
+        build-args: |
+          VERSION=${{ matrix.version }}
+          APT_MIRROR=http://deb.debian.org
+          NPM_REGISTRY=https://registry.yarnpkg.com
+        outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+        cache-from: type=gha
+        cache-to: type=gha,mode=max

.github/workflows/jms-build-test.yml.disabled

@@ -1,46 +0,0 @@
-name: "Run Build Test"
-on:
-  push:
-    paths:
-      - 'Dockerfile'
-      - 'Dockerfile*'
-      - 'package.json'
-      - 'yarn.lock'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        component: [ lina ]
-        version: [ v4 ]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-buildx-action@v3
-
-      - name: Prepare Build
-        run: |
-          sed -i 's@registry.npmmirror.com@registry.yarnpkg.com@g' yarn.lock
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          file: Dockerfile
-          tags: ghcr.io/jumpserver/${{ matrix.component }}:${{ matrix.version }}
-          platforms: linux/amd64
-          build-args: |
-            VERSION=${{ matrix.version }}
-            APT_MIRROR=http://deb.debian.org
-            NPM_REGISTRY=https://registry.yarnpkg.com
-          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/llm-code-review.yml

@@ -1,28 +0,0 @@
-name: LLM Code Review
-
-permissions:
-  contents: read
-  pull-requests: write
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-jobs:
-  llm-code-review:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: fit2cloud/LLM-CodeReview-Action@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.FIT2CLOUDRD_LLM_CODE_REVIEW_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.ALIYUN_LLM_API_KEY }}
-          LANGUAGE: English
-          OPENAI_API_ENDPOINT: https://dashscope.aliyuncs.com/compatible-mode/v1
-          MODEL: qwen2-1.5b-instruct
-          PROMPT: "Please check the following code differences for any irregularities, potential issues, or optimization suggestions, and provide your answers in English."
-          top_p: 1
-          temperature: 1
-          # max_tokens: 10000
-          MAX_PATCH_LENGTH: 10000 
-          IGNORE_PATTERNS: "/node_modules,*.md,/dist,/.github"
-          FILE_PATTERNS: "*.java,*.go,*.py,*.vue,*.ts,*.js,*.css,*.scss,*.html"

.github/workflows/release-drafter.yml

@@ -31,7 +31,7 @@ jobs:
           tag: ${{ steps.get_version.outputs.TAG }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '20.15'
+          node-version: '16.20'
       - name: Install dependencies
         run: yarn install
       - name: Build web

.gitignore

@@ -17,5 +17,3 @@ tests/**/coverage/
 *.sln
 .env.development
 .python-version
-
-helper.json

.prettierignore

@@ -1,57 +0,0 @@
-# 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

.prettierrc.js

@@ -1,11 +0,0 @@
-module.exports = {
-  singleQuote: true,
-  semi: false,
-  trailingComma: 'none',
-  printWidth: 100,
-  tabWidth: 2,
-  useTabs: false,
-  bracketSpacing: true,
-  arrowParens: 'avoid',
-  endOfLine: 'auto'
-}

Dockerfile

@@ -1,4 +1,34 @@
-FROM jumpserver/lina-base:20260114_045651 AS stage-build
+FROM node:16.20-bullseye-slim as stage-build
+ARG TARGETARCH
+
+ARG DEPENDENCIES="                    \
+        g++                           \
+        make                          \
+        python3"
+
+ARG APT_MIRROR=http://mirrors.ustc.edu.cn
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    set -ex \
+    && rm -f /etc/apt/apt.conf.d/docker-clean \
+    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \
+    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
+    && apt-get update \
+    && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
+    && echo "no" | dpkg-reconfigure dash
+
+ARG NPM_REGISTRY="https://registry.npmmirror.com"
+
+RUN set -ex \
+    && npm config set registry ${NPM_REGISTRY} \
+    && yarn config set registry ${NPM_REGISTRY}
+
+WORKDIR /data
+
+RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked \
+    --mount=type=bind,source=package.json,target=package.json \
+    --mount=type=bind,source=yarn.lock,target=yarn.lock \
+    yarn install
 
 ARG VERSION
 ENV VERSION=$VERSION

Dockerfile-base

@@ -1,22 +0,0 @@
-FROM node:20.15-bullseye-slim
-
-ARG DEPENDENCIES="                    \
-        g++                           \
-        make                          \
-        python3"
-
-RUN set -ex \
-    && rm -f /etc/apt/apt.conf.d/docker-clean \
-    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
-    && echo "no" | dpkg-reconfigure dash
-
-WORKDIR /data
-
-COPY package.json yarn.lock ./
-
-ARG NPM_MIRROR="https://registry.npmjs.org"
-RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=yarn-cache \
-    sed -i "s|https://registry.npmmirror.com|${NPM_MIRROR}|g" yarn.lock \
-    && yarn install

GITSHA

@@ -0,0 +1 @@
+4596887bf142787e14ffe6d510cd324a43b6ed4d

PRETTIER.md

@@ -1,76 +0,0 @@
-# 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` 配置正确。

jsconfig.json

@@ -5,6 +5,5 @@
         "@/*": ["src/*"]
     }
   },
-  "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

mock/index.js

@@ -1,25 +1,13 @@
 import Mock from 'mockjs'
+import { param2Obj } from '../src/utils'
 
 import user from './user'
 import table from './table'
 
-export function param2Obj(url) {
+const mocks = [
-  const search = url.split('?')[1]
+  ...user,
-  if (!search) {
+  ...table
-    return {}
+]
-  }
-  return JSON.parse(
-    '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, ' ') +
-      '"}'
-  )
-}
-
-const mocks = [...user, ...table]
 
 // for front mock
 // please use it cautiously, it will redefine XMLHttpRequest,

package.json

@@ -1,13 +1,13 @@
 {
-  "name": "lina",
+  "name": "Lina",
   "version": "v4.0.0",
   "description": "JumpServer Web UI",
-  "author": "JumpServer Team <support@lxware.hk>",
+  "author": "JumpServer Team <support@fit2cloud.com>",
   "license": "GPL-3.0-or-later",
   "scripts": {
-    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "dev": "vue-cli-service serve",
-    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "serve": "vue-cli-service serve",
-    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
+    "build": "vue-cli-service build",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
@@ -15,7 +15,7 @@
     "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/icons/svgo.yml",
+    "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",
@@ -26,22 +26,17 @@
   "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.2.4",
     "echarts": "4.7.0",
-    "element-ui": "https://github.com/jumpserver-dev/element/releases/download/v2.15.15/jumpserver-element-ui-2.15.15.tgz",
+    "element-ui": "2.15.14",
     "eslint-plugin-html": "^6.0.0",
     "highlight.js": "^11.9.0",
     "install": "^0.13.0",
@@ -51,6 +46,17 @@
     "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",
@@ -58,22 +64,21 @@
     "normalize.css": "7.0.0",
     "npm": "^7.8.0",
     "nprogress": "0.2.0",
-    "path-to-regexp": "3.3.0",
+    "path-to-regexp": "2.4.0",
-    "sortablejs": "^1.15.6",
     "v-sanitize": "^0.0.13",
-    "vue": "2.7.16",
+    "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-moment": "^4.1.0",
     "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",
@@ -88,17 +93,15 @@
     "@vue/cli-service": "3.6.0",
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "^9.5.1",
-    "babel-core": "6.26.3",
+    "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",
+    "element-theme-chalk": "^2.13.1",
     "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",
@@ -107,23 +110,20 @@
     "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",
+    "serve-static": "^1.13.2",
     "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.7.16",
+    "vue-template-compiler": "2.6.10"
-    "webpack": "^4.28.4"
   },
   "engines": {
-    "node": ">=12",
+    "node": ">=8.9",
     "npm": ">= 3.0.0"
   },
   "browserslist": [
@@ -140,6 +140,5 @@
     "src/**/*.{js,vue}": [
       "eslint --fix"
     ]
-  },
+  }
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

public/index.html

@@ -1,90 +1,38 @@
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
     <meta charset="utf-8">
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta content="0" http-equiv="Expires">
+    <meta http-equiv="Expires" content="0">
-    <meta content="no-cache" http-equiv="Pragma">
+    <meta http-equiv="Pragma" content="no-cache">
-    <meta content="no-cache" http-equiv="Cache-control">
+    <meta http-equiv="Cache-control" content="no-cache">
-    <meta content="no-cache" http-equiv="Cache">
+    <meta http-equiv="Cache" content="no-cache">
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title><%= webpackConfig.name %></title>
-    <link href="<%= BASE_URL %>theme/element-ui.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%= BASE_URL %>theme/element-ui.css">
-    <style>
+  </head>
-        #loading {
+  <body>
-            position: fixed;
+    <noscript>
-            top: 0;
+      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-            left: 0;
+    </noscript>
-            width: 100vw;
+    <script>
-            height: 100vh;
+      window.onload = function() {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            background-color: rgba(255, 255, 255, 0.98);
-            z-index: 9999;
-        }
-
-        #loading .spinner {
-            width: 40px;
-            height: 40px;
-            border: 3px solid transparent;
-            border-top-color: var(--color-primary);
-            border-radius: 50%;
-            animation: spin 1s linear infinite;
-        }
-
-        #loading .spinner::after {
-            content: '';
-            position: absolute;
-            top: -3px;
-            left: -3px;
-            width: 40px;
-            height: 40px;
-            border: 3px solid transparent;
-            border-top-color: rgba(64, 158, 255, 0.2);
-            border-radius: 50%;
-            animation: spin 2s linear infinite;
-        }
-
-        @keyframes spin {
-            0% {
-                transform: rotate(0deg);
-            }
-            100% {
-                transform: rotate(360deg);
-            }
-        }
-    </style>
-</head>
-<body>
-<noscript>
-    <strong>
-        We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled.
-        Please enable it to continue.
-    </strong>
-</noscript>
-<script>
-    window.onload = function () {
         if (location.pathname === '/') {
-            location.pathname = '/ui/'
+           location.pathname = '/ui/'
         }
         const pathname = window.location.pathname
         if (pathname.startsWith('/core')) {
             return
         }
-        if (pathname.indexOf('/ui') === -1) {
+        if(pathname.indexOf('/ui') === -1) {
-            window.location.href = window.location.origin + '/ui/#' + pathname
+          window.location.href = window.location.origin + '/ui/#' + pathname
         }
         if (pathname.startsWith('/ui/#/chat')) {
-            window.location.href = window.location.origin + pathname
+          window.location.href = window.location.origin + pathname
         }
-    }
+      }
-</script>
+    </script>
-<div id="app">
+    <div id="app"></div>
-</div>
+    <!-- built files will be auto injected -->
-<div id="loading">
+  </body>
-    <div class="spinner"></div>
-</div>
-<!-- built files will be auto injected -->
-</body>
 </html>

src/App.vue

@@ -5,90 +5,14 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex'
+import { mapState } from 'vuex'
-import { Watermark } from 'watermark-js-plus'
 
 export default {
   name: 'App',
-  data() {
-    return {
-      watermark: null
-    }
-  },
   computed: {
     ...mapState({
       isRouterAlive: state => state.common.isRouterAlive
-    }),
-    ...mapGetters({
-      currentUser: 'currentUser',
-      publicSettings: 'publicSettings'
     })
-  },
-  watch: {
-    currentUser: {
-      handler(newVal) {
-        this.createWatermark()
-      }
-    },
-    'publicSettings.SECURITY_WATERMARK_ENABLED': {
-      handler(newVal) {
-        if (!newVal) {
-          return setTimeout(() => {
-            this.watermark?.destroy()
-            this.watermark = null
-          })
-        }
-
-        this.createWatermark()
-      }
-    }
-  },
-  methods: {
-    getWaterMarkFields() {
-      const user = this.currentUser
-      const userId = user?.id || ''
-      const name = user?.name || ''
-      const userName = user?.username || ''
-      const currentTime = this.$moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-      return { userId, name, userName, currentTime }
-    },
-    getWaterMarkContent() {
-      const fields = this.getWaterMarkFields()
-      const template = this.publicSettings.SECURITY_WATERMARK_CONSOLE_CONTENT || ''
-
-      // 找出模板中所有的变量占位符 ${xxx}
-      const placeholders = template.match(/\${([^}]+)}/g) || []
-      const allVariables = {}
-
-      // 为模板中的每个变量准备值
-      placeholders.forEach(placeholder => {
-        const varName = placeholder.slice(2, -1) // 提取变量名，去掉 ${ 和 }
-        allVariables[varName] = fields[varName] !== undefined ? fields[varName] : 'N/A'
-      })
-
-      // 合并用户现有的字段和模板中可能缺失的字段
-      const safeFields = { ...fields, ...allVariables }
-
-      // 安全解析模板
-      return new Function(...Object.keys(safeFields), `return \`${template}\`;`)(...Object.values(safeFields))
-    },
-
-    createWatermark() {
-      if (this.currentUser?.username && this.publicSettings?.SECURITY_WATERMARK_ENABLED) {
-        this.watermark = new Watermark({
-          content: this.getWaterMarkContent(),
-          width: this.publicSettings?.SECURITY_WATERMARK_WIDTH,
-          height: this.publicSettings?.SECURITY_WATERMARK_HEIGHT,
-          rotate: this.publicSettings?.SECURITY_WATERMARK_ROTATE,
-          fontWeight: 'normal',
-          fontSize: this.publicSettings?.SECURITY_WATERMARK_FONT_SIZE + 'px',
-          fontColor: this.publicSettings?.SECURITY_WATERMARK_COLOR,
-          contentType: 'multi-line-text',
-          lineHeight: this.publicSettings?.SECURITY_WATERMARK_FONT_SIZE
-        })
-        this.watermark.create()
-      }
-    }
   }
 }
 </script>

src/api/asset.js

@@ -16,9 +16,9 @@ export function getSystemUserList(data) {
   })
 }
 
-export function getZoneList(data) {
+export function getDomainList(data) {
   return request({
-    url: '/api/v1/assets/zones/',
+    url: '/api/v1/assets/domains/',
     method: 'get',
     params: data
   })

src/api/ops.js

@@ -53,7 +53,7 @@ export function createJob(form) {
   })
 }
 
-export function stopJob(form) {
+export function StopJob(form) {
   return request({
     url: '/api/v1/ops/job-executions/stop/',
     method: 'post',
@@ -61,21 +61,13 @@ export function stopJob(form) {
   })
 }
 
-export function JobUploadFile(form, config = {}) {
+export function JobUploadFile(form) {
   return request({
     url: '/api/v1/ops/jobs/upload/',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     timeout: 60 * 60 * 1000,
-    data: form,
-    ...config
-  })
-}
-
-export function auditUpdateJob(id, form) {
-  return request({
-    url: `/api/v1/audits/jobs/${id}/`,
-    method: 'patch',
     data: form
   })
 }
+

src/api/sessions.js

@@ -18,14 +18,14 @@ export function toggleLockSession(data) {
 
 export function getAllCommandStorage() {
   return request({
-    url: '/api/v1/terminal/command-storages/',
+    url: `/api/v1/terminal/command-storages/`,
     method: 'get'
   })
 }
 
 export function getAllReplayStorage() {
   return request({
-    url: '/api/v1/terminal/replay-storages/',
+    url: `/api/v1/terminal/replay-storages/`,
     method: 'get'
   })
 }

src/api/settings.js

@@ -15,7 +15,6 @@ export function testEmailSetting(data) {
     data: data
   })
 }
-
 export function importLicense(formData) {
   return request({
     url: '/api/v1/xpack/license/import',
@@ -26,7 +25,6 @@ export function importLicense(formData) {
     data: formData
   })
 }
-
 export function testLdapSetting(data, refresh = true) {
   let url = '/api/v1/settings/ldap/testing/config/'
   if (refresh) {
@@ -98,17 +96,9 @@ export function getPublicSettings(isOpen) {
     method: 'get'
   })
 }
-
 export function getLogo() {
   return request({
     url: '/api/v1/xpack/interface/setting/',
     method: 'get'
   })
 }
-
-export function getPreference() {
-  return request({
-    url: '/api/v1/users/preference/?category=luna',
-    method: 'get'
-  })
-}

src/api/users.js

@@ -8,20 +8,11 @@ export function login(data) {
   })
 }
 
-export async function getProfile(token) {
+export function getProfile(token) {
-  let profile = await request({
+  return request({
     url: '/api/v1/users/profile/',
     method: 'get'
   })
-  const perms = await request({
-    url: '/api/v1/users/profile/permissions/',
-    method: 'get'
-  })
-  profile = {
-    ...profile,
-    ...perms
-  }
-  return profile
 }
 
 export function getUserList(data) {
@@ -31,7 +22,6 @@ export function getUserList(data) {
     params: data
   })
 }
-
 export function getUserGroupList(params) {
   return request({
     url: '/api/v1/users/groups/',
@@ -39,7 +29,6 @@ export function getUserGroupList(params) {
     params: params
   })
 }
-
 export function getUserGroupDetail(id) {
   return request({
     url: `/api/v1/users/groups/${id}/`,
@@ -61,7 +50,6 @@ export function editUserGroup(data) {
     data: data
   })
 }
-
 export function updateUserGroup(id, data) {
   return request({
     url: '/api/v1/users/groups/' + id + '/',
@@ -77,6 +65,10 @@ export function logout() {
   })
 }
 
+export function refreshSessionIdAge() {
+  return getProfile()
+}
+
 export default {
   getProfile,
   getUserList

src/assets/img/cloud/proxmox.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1752631175762" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4421" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M93.866667 234.666667c-34.133333 12.8-51.2 25.6-51.2 34.133333 0 4.266667 51.2 64 115.2 136.533333 64 68.266667 115.2 128 115.2 128s-51.2 59.733333-115.2 128C93.866667 729.6 42.666667 793.6 42.666667 797.866667c4.266667 17.066667 59.733333 42.666667 98.133333 42.666666 64 0 81.066667-12.8 217.6-162.133333 68.266667-76.8 128-140.8 128-140.8 0-4.266667-55.466667-64-123.733333-140.8-85.333333-102.4-132.266667-145.066667-153.6-157.866667-29.866667-12.8-81.066667-17.066667-115.2-4.266666z m725.333333 4.266666c-21.333333 8.533333-68.266667 59.733333-153.6 153.6-68.266667 76.8-123.733333 140.8-123.733333 140.8 0 4.266667 55.466667 68.266667 128 140.8 136.533333 153.6 153.6 162.133333 217.6 162.133334 42.666667 0 98.133333-21.333333 98.133333-42.666667 0-4.266667-51.2-68.266667-115.2-136.533333-64-68.266667-115.2-128-115.2-128s51.2-59.733333 115.2-128c64-68.266667 115.2-128 115.2-136.533334-4.266667-17.066667-55.466667-38.4-98.133333-38.4-34.133333 0-46.933333 4.266667-68.266667 12.8z" fill="#E57000" p-id="4422"></path><path d="M238.933333 136.533333c-42.666667 21.333333-42.666667 25.6-4.266666 68.266667 221.866667 243.2 273.066667 302.933333 277.333333 302.933333 4.266667 0 311.466667-332.8 315.733333-341.333333 0-4.266667-8.533333-12.8-21.333333-21.333333-17.066667-12.8-34.133333-17.066667-68.266667-17.066667-64-4.266667-85.333333 8.533333-162.133333 93.866667-34.133333 38.4-64 72.533333-64 72.533333s-29.866667-29.866667-64-68.266667c-34.133333-38.4-72.533333-76.8-89.6-85.333333-25.6-17.066667-89.6-21.333333-119.466667-4.266667zM354.133333 725.333333c-85.333333 93.866667-153.6 170.666667-153.6 174.933334 0 4.266667 8.533333 12.8 21.333334 21.333333 17.066667 12.8 34.133333 17.066667 68.266666 17.066667 59.733333 4.266667 85.333333-8.533333 162.133334-98.133334 34.133333-38.4 64-68.266667 64-68.266666s29.866667 29.866667 64 68.266666c81.066667 89.6 98.133333 102.4 162.133333 98.133334 34.133333 0 51.2-4.266667 68.266667-17.066667 12.8-8.533333 21.333333-17.066667 21.333333-21.333333-4.266667-8.533333-311.466667-345.6-315.733333-341.333334-8.533333 0-76.8 76.8-162.133334 166.4z" p-id="4423"></path></svg>

src/assets/img/cloud/smartx.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1748326203303" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2853" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M10.24 605.184l839.168-481.28L1013.76 220.672v191.488L174.592 895.488 10.24 804.352z" fill="#0096FF" p-id="2854"></path><path d="M10.24 416.768V220.672l168.96-96.768 308.736 178.688-331.776 193.536zM541.184 717.312l331.264-195.072 141.312 88.064v194.048l-165.376 95.744z" fill="#25C764" p-id="2855"></path></svg>

src/components/ActionsGroup/index.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import DataActions from '@/components/Common/DataActions/index.vue'
+import DataActions from '@/components/DataActions'
 
 export default {
   name: 'ActionsGroup',

src/components/Apps/AccountCreateUpdateForm/const.js

@@ -1,42 +1,24 @@
 import { UpdateToken, UploadSecret } from '@/components/Form/FormFields'
 import Select2 from '@/components/Form/FormFields/Select2.vue'
-import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
 import { Required, RequiredChange } from '@/components/Form/DataForm/rules'
 import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSetting.vue'
 
 export const accountFieldsMeta = (vm) => {
   const defaultPrivilegedAccounts = ['root', 'administrator']
-
-  function onPrivilegedUser(value, updateForm) {
-    const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-    if (maybePrivileged) {
-      updateForm({ privileged: true, secret_reset: false, push_now: false })
-    }
-  }
-
   return {
-    nodes: {
+    assets: {
       component: Select2,
-      label: vm.$t('Node'),
+      label: vm.$t('Assets'),
+      rules: [Required],
       el: {
-        value: [],
+        multiple: true,
         ajax: {
-          url: '/api/v1/assets/nodes/',
+          url: '/api/v1/assets/assets/',
           transformOption: (item) => {
-            return { label: item.full_value, value: item.id }
+            return { label: item.name + '(' + item.address + ')', value: item.id }
           }
         }
       },
-      hidden: () => {
-        return !vm.addTemplate
-      }
-    },
-    assets: {
-      component: AssetSelect,
-      label: vm.$t('Asset'),
-      el: {
-        multiple: false
-      },
       hidden: () => {
         return vm.platform || vm.asset
       }
@@ -45,10 +27,7 @@ export const accountFieldsMeta = (vm) => {
       component: Select2,
       rules: [Required],
       el: {
-        get disabled() {
+        multiple: false,
-          return vm.isDisabled
-        },
-        multiple: vm.addTemplate,
         ajax: {
           url: '/api/v1/accounts/account-templates/',
           transformOption: (item) => {
@@ -64,11 +43,6 @@ export const accountFieldsMeta = (vm) => {
       rules: [Required],
       label: vm.$t('AccountPolicy'),
       helpTip: vm.$t('AccountPolicyHelpText'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: () => {
         return vm.platform || vm.asset
       }
@@ -76,19 +50,17 @@ export const accountFieldsMeta = (vm) => {
     name: {
       label: vm.$t('Name'),
       rules: [RequiredChange],
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       on: {
         input: ([value], updateForm) => {
           if (!vm.usernameChanged) {
             if (!vm.account?.name) {
               updateForm({ username: value })
             }
+            const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+            if (maybePrivileged) {
+              updateForm({ privileged: true })
+            }
           }
-          onPrivilegedUser(value, updateForm)
         }
       },
       hidden: () => {
@@ -97,16 +69,17 @@ export const accountFieldsMeta = (vm) => {
     },
     username: {
       el: {
-        get disabled() {
+        disabled: !!vm.account?.name
-          return !!vm.account?.name || vm.isDisabled
-        }
       },
       on: {
         input: ([value], updateForm) => {
           vm.usernameChanged = true
         },
         change: ([value], updateForm) => {
-          onPrivilegedUser(value, updateForm)
+          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+          if (maybePrivileged) {
+            updateForm({ privileged: true })
+          }
         }
       },
       hidden: () => {
@@ -115,11 +88,6 @@ export const accountFieldsMeta = (vm) => {
     },
     privileged: {
       label: vm.$t('Privileged'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: () => {
         return vm.addTemplate
       }
@@ -142,11 +110,6 @@ export const accountFieldsMeta = (vm) => {
     },
     su_from_username: {
       label: vm.$t('UserSwitchFrom'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => {
         return vm.platform || vm.asset || vm.addTemplate
       }
@@ -154,11 +117,6 @@ export const accountFieldsMeta = (vm) => {
     password: {
       label: vm.$t('Password'),
       component: UpdateToken,
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => {
         return formValue.secret_type !== 'password' || vm.addTemplate
       }
@@ -166,63 +124,33 @@ export const accountFieldsMeta = (vm) => {
     ssh_key: {
       label: vm.$t('PrivateKey'),
       component: UploadSecret,
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
     },
     passphrase: {
       label: vm.$t('Passphrase'),
       component: UpdateToken,
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
     },
     token: {
       label: vm.$t('Token'),
       component: UploadSecret,
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => formValue.secret_type !== 'token' || vm.addTemplate
     },
     access_key: {
       id: 'access_key',
       label: vm.$t('AccessKey'),
       component: UploadSecret,
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => formValue.secret_type !== 'access_key' || vm.addTemplate
     },
     api_key: {
       id: 'api_key',
       label: vm.$t('ApiKey'),
       component: UploadSecret,
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: (formValue) => formValue.secret_type !== 'api_key' || vm.addTemplate
     },
     secret_type: {
       type: 'radio-group',
       options: [],
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: () => {
         return vm.addTemplate
       }
@@ -235,8 +163,7 @@ export const accountFieldsMeta = (vm) => {
           !automation.ansible_enabled ||
           !vm.$hasPerm('accounts.push_account') ||
           (formValue.secret_type === 'ssh_key' && vm.iPlatform.type.value === 'windows') ||
-          vm.addTemplate ||
+          vm.addTemplate
-          !formValue.secret_reset
       }
     },
     params: {
@@ -245,9 +172,6 @@ export const accountFieldsMeta = (vm) => {
       el: {},
       hidden: (formValue) => {
         const automation = vm.iPlatform.automation || {}
-        if (!vm.iPlatform.automation) {
-          return true
-        }
         vm.fieldsMeta.params.el.method = vm.iPlatform.automation.push_account_method
         vm.fieldsMeta.params.el.pushAccountParams = vm.iPlatform.automation.push_account_params
         return !formValue.push_now ||
@@ -260,27 +184,12 @@ export const accountFieldsMeta = (vm) => {
       }
     },
     is_active: {
-      label: vm.$t('IsActive'),
+      label: vm.$t('IsActive')
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      }
     },
     comment: {
       label: vm.$t('Comment'),
-      el: {
+      hidden: () => {
-        get disabled() {
+        return vm.addTemplate
-          return vm.isDisabled
-        }
-      }
-    },
-    secret_reset: {
-      label: vm.$t('SecretReset'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
       }
     }
   }

src/components/Apps/AccountCreateUpdateForm/index.vue

@@ -11,7 +11,7 @@
 
 <script>
 import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
-import { encryptPassword } from '@/utils/secure'
+import { encryptPassword } from '@/utils/crypto'
 import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
 
 export default {
@@ -45,7 +45,6 @@ export default {
   data() {
     return {
       loading: true,
-      isDisabled: false,
       usernameChanged: false,
       submitBtnText: this.$t('Confirm'),
       iPlatform: {
@@ -62,12 +61,11 @@ export default {
       form: Object.assign({ 'on_invalid': 'error' }, this.account || {}),
       encryptedFields: ['secret'],
       fields: [
-        [this.$t('Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username', 'template']],
+        [this.$t('AccountTemplate'), ['template']],
-        [this.$t('Asset'), ['nodes', 'assets']],
+        [this.$t('Basic'), ['assets', 'name', 'username', 'privileged', 'su_from', 'su_from_username']],
         [this.$t('Secret'), [
           'secret_type', 'password', 'ssh_key', 'token',
-          'access_key', 'passphrase', 'api_key',
+          'access_key', 'passphrase', 'api_key'
-          'secret_reset'
         ]],
         [this.$t('Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
       ],
@@ -75,16 +73,6 @@ export default {
       hasSaveContinue: false
     }
   },
-  watch: {
-    '$route.query': {
-      handler(nv, ov) {
-        if (nv && (nv.flag === 'move' || nv.flag === 'copy')) {
-          this.isDisabled = true
-        }
-      },
-      immediate: true
-    }
-  },
   async mounted() {
     try {
       await this.getPlatform()
@@ -157,11 +145,7 @@ export default {
         delete form['secret']
       }
       if (this.account?.name) {
-        if (this.account.payload && this.account.payload === 'pam_account_clone') {
+        this.$emit('edit', form)
-          this.$emit('add', form)
-        } else {
-          this.$emit('edit', form)
-        }
       } else {
         this.$emit('add', form)
       }
@@ -173,16 +157,16 @@ export default {
 <style lang='scss' scoped>
 .account-add {
   ::v-deep .el-form-item {
-    //margin-bottom: 5px;
+    margin-bottom: 5px;
 
     .help-block {
-      //margin-bottom: 5px;
+      margin-bottom: 5px;
     }
   }
 
   ::v-deep .form-group-header {
     .hr-line-dashed {
-      //margin: 5px 0;
+      margin: 5px 0;
     }
 
     h3 {

src/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue

@@ -11,7 +11,7 @@
 <script>
 import { GenericUpdateFormDialog } from '@/layout/components'
 import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
-import { encryptPassword } from '@/utils/secure'
+import { encryptPassword } from '@/utils/crypto'
 
 export default {
   name: 'AccountBulkUpdateDialog',

src/components/Apps/AccountListTable/AccountCreateUpdate.vue

@@ -1,38 +1,36 @@
-<template v-if="iVisible">
+<template>
-  <Drawer
+  <Dialog
+    v-if="iVisible"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
     :title="title"
-    :visible="iVisible"
+    :visible.sync="iVisible"
-    class="drawer"
+    v-bind="$attrs"
-    @close-drawer="handleCloseDrawer"
+    width="900px"
+    v-on="$listeners"
   >
-    <Page :title="'null'">
+    <AccountCreateUpdateForm
-      <IBox class="content">
+      v-if="!loading"
-        <AccountCreateUpdateForm
+      ref="form"
-          v-if="!loading"
+      :account="account"
-          ref="form"
+      :add-template="addTemplate"
-          :account="account"
+      :asset="asset"
-          :add-template="addTemplate"
+      @add="addAccount"
-          :asset="asset"
+      @edit="editAccount"
-          @add="addAccount"
+    />
-          @edit="editAccount"
+  </Dialog>
-        />
-      </IBox>
-    </Page>
-  </Drawer>
 </template>
 
 <script>
-import Drawer from '@/components/Drawer/index.vue'
+import Dialog from '@/components/Dialog/index.vue'
 import AccountCreateUpdateForm from '@/components/Apps/AccountCreateUpdateForm/index.vue'
-import IBox from '@/components/Common/IBox/index.vue'
-import Page from '@/layout/components/Page/index.vue'
 
 export default {
   name: 'CreateAccountDialog',
   components: {
-    IBox,
+    Dialog,
-    Drawer,
-    Page,
     AccountCreateUpdateForm
   },
   props: {
@@ -93,8 +91,8 @@ export default {
         iVisible = true
         data = formValue
         url = `/api/v1/accounts/accounts/bulk/`
-        if ((!data.assets || data.assets.length === 0) && (!data.nodes || data.nodes.length === 0)) {
+        if (data.assets.length === 0) {
-          this.$message.error(this.$tc('PleaseSelectAssetOrNode'))
+          this.$message.error(this.$tc('PleaseSelectAsset'))
           return
         }
       }
@@ -107,32 +105,17 @@ export default {
           this.$emit('add', true)
         }
       }).catch(error => {
-        if (error?.response?.data?.code === 'no_valid_assets') {
-          this.$message.error(error?.response?.data?.detail)
-          return
-        }
         this.iVisible = true
         this.handleResult(null, error)
       })
     },
     editAccount(form) {
       const data = { ...form }
-      const flag = this.$route.query.flag
+      this.$axios.patch(`/api/v1/accounts/accounts/${this.account.id}/`, data).then(() => {
-
+        this.iVisible = false
-      switch (flag) {
+        this.$emit('add', true)
-        case 'copy':
+        this.$message.success(this.$tc('UpdateSuccessMsg'))
-          this.handleAccountOperation(this.account.id, 'copy-to-assets', data)
+      }).catch(error => this.setFieldError(error))
-          break
-        case 'move':
-          this.handleAccountOperation(this.account.id, 'move-to-assets', data)
-          break
-        default:
-          this.$axios.patch(`/api/v1/accounts/accounts/${this.account.id}/`, data).then(() => {
-            this.iVisible = false
-            this.$emit('add', true)
-            this.$message.success(this.$tc('UpdateSuccessMsg'))
-          }).catch(error => this.setFieldError(error))
-      }
     },
     handleResult(resp, error) {
       let bulkCreate = !this.asset
@@ -185,29 +168,7 @@ export default {
           refsAutoDataForm.setFieldError(current, err)
         }
       }
-    },
-    handleCloseDrawer() {
-      this.iVisible = false
-      // Reflect.deleteProperty(this.$route.query, 'flag')
-    },
-    handleAccountOperation(id, path, data) {
-      this.$axios.post(`/api/v1/accounts/accounts/${id}/${path}/`, data).then((res) => {
-        this.iVisible = false
-        this.$emit('add', true)
-        this.handleResult(res, null)
-      }).catch(error => this.handleResult(null, error))
     }
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.drawer {
-  ::v-deep .el-drawer__body {
-
-    .el-form {
-      margin-right: 30px;
-    }
-  }
-}
-</style>

src/components/Apps/AccountListTable/AccountList.vue

@@ -1,12 +1,6 @@
 <template>
   <div>
-    <DrawerListTable
+    <ListTable ref="ListTable" :header-actions="headerActions" :table-config="tableConfig" />
-      ref="ListTable"
-      :detail-drawer="detailDrawer"
-      :header-actions="headerActions"
-      :quick-filters="quickFilters"
-      :table-config="tableConfig"
-    />
     <ViewSecret
       v-if="showViewSecretDialog"
       :account="account"
@@ -22,13 +16,22 @@
     <AccountCreateUpdate
       v-if="showAddDialog"
       :account="account"
-      :add-template="addTemplate"
       :asset="iAsset"
       :title="accountCreateUpdateTitle"
       :visible.sync="showAddDialog"
       @add="addAccountSuccess"
       @bulk-create-done="showBulkCreateResult($event)"
     />
+    <AccountCreateUpdate
+      v-if="showAddTemplateDialog"
+      :account="account"
+      :add-template="true"
+      :asset="iAsset"
+      :title="accountCreateByTemplateTitle"
+      :visible.sync="showAddTemplateDialog"
+      @add="addAccountSuccess"
+      @bulk-create-done="showBulkCreateResult($event)"
+    />
     <ResultDialog
       v-if="showResultDialog"
       :result="createAccountResults"
@@ -41,42 +44,29 @@
       v-bind="updateSelectedDialogSetting"
       @update="handleAccountBulkUpdate"
     />
-    <PasswordHistoryDialog
-      v-if="showPasswordHistoryDialog"
-      :account="currentAccountColumn"
-      :visible.sync="showPasswordHistoryDialog"
-    />
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import ListTable from '@/components/Table/ListTable/index.vue'
-import { accountOtherActions, accountQuickFilters, connectivityMeta, isDirectoryServiceAccount } from './const'
+import { ActionsFormatter } from '@/components/Table/TableFormatters'
-import { openTaskPage } from '@/utils/jms/index'
-import {
-  AccountConnectFormatter,
-  ActionsFormatter,
-  PlatformFormatter,
-  SecretViewerFormatter
-} from '@/components/Table/TableFormatters'
 import ViewSecret from './ViewSecret.vue'
 import UpdateSecretInfo from './UpdateSecretInfo.vue'
-import ResultDialog from './BulkCreateResultDialog.vue'
 import AccountCreateUpdate from './AccountCreateUpdate.vue'
-import PasswordHistoryDialog from './PasswordHistoryDialog.vue'
+import { connectivityMeta } from './const'
-import DrawerListTable from '@/components/Table/DrawerListTable/index.vue'
+import { openTaskPage } from '@/utils/jms'
+import ResultDialog from './BulkCreateResultDialog.vue'
 import AccountBulkUpdateDialog from '@/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue'
 
 export default {
   name: 'AccountListTable',
   components: {
-    ViewSecret,
+    AccountBulkUpdateDialog,
     ResultDialog,
-    DrawerListTable,
+    ListTable,
     UpdateSecretInfo,
-    AccountCreateUpdate,
+    ViewSecret,
-    PasswordHistoryDialog,
+    AccountCreateUpdate
-    AccountBulkUpdateDialog
   },
   props: {
     url: {
@@ -99,7 +89,7 @@ export default {
     },
     hasClone: {
       type: Boolean,
-      default: true
+      default: false
     },
     asset: {
       type: Object,
@@ -129,7 +119,7 @@ export default {
     columnsDefault: {
       type: Array,
       default: () => ([
-        'name', 'username', 'secret', 'asset', 'platform', 'connect'
+        'name', 'username', 'asset', 'date_updated'
       ])
     },
     headerExtraActions: {
@@ -139,34 +129,22 @@ export default {
     extraQuery: {
       type: Object,
       default: () => ({})
-    },
-    showQuickFilters: {
-      type: Boolean,
-      default: true
-    },
-    showActions: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
     const vm = this
     return {
-      addTemplate: false,
-      isUpdateAccount: false,
-      currentAccountColumn: {},
-      showPasswordHistoryDialog: false,
       showViewSecretDialog: false,
       showUpdateSecretDialog: false,
       showResultDialog: false,
       showAddDialog: false,
       showAddTemplateDialog: false,
-      detailDrawer: () => import('@/views/accounts/Account/AccountDetail/index.vue'),
       createAccountResults: [],
+      accountCreateUpdateTitle: this.$t('AddAccount'),
+      accountCreateByTemplateTitle: this.$t('AddAccountByTemplate'),
       iAsset: this.asset,
       account: {},
       secretUrl: '',
-      quickFilters: this.showQuickFilters ? accountQuickFilters(this) : [],
       tableConfig: {
         url: this.url,
         permissions: {
@@ -175,86 +153,40 @@ export default {
         },
         extraQuery: this.extraQuery,
         columnsExclude: ['spec_info'],
-        columnsAdd: ['secret', 'platform', 'connect'],
         columnsShow: {
           min: ['name', 'username', 'actions'],
           default: this.columnsDefault
         },
         columnsMeta: {
           name: {
-            minWidth: '60px',
+            width: '120px',
-            formatterArgs: {
+            formatter: function(row) {
-              can: () => vm.$hasPerm('accounts.view_account'),
+              const to = {
-              getRoute: ({ row }) => ({
+                name: 'AssetAccountDetail',
-                name: 'AccountDetail',
                 params: { id: row.id }
-              }),
-              getTitle: ({ row }) => {
-                let title = row.name
-                if (row.ds && this.asset && this.asset.id !== row.asset.id) {
-                  const dsID = row.ds.id.split('-')[0]
-                  title = `${row.name}@${dsID}`
-                }
-                return title
-              },
-              getDrawerTitle({ row }) {
-                return `${row.username}@${row.asset.name}`
               }
-            }
+              if (vm.$hasPerm('accounts.view_account')) {
-          },
+                return <router-link to={to}>{row.name}</router-link>
-          secret: {
-            formatter: SecretViewerFormatter,
-            width: '130px',
-            formatterArgs: {
-              secretFrom: 'api',
-              hasDownload: false,
-              actionLeft: true
-            }
-          },
-          connect: {
-            label: this.$t('Connect'),
-            width: '80px',
-            formatter: AccountConnectFormatter,
-            formatterArgs: {
-              asset: this.asset,
-              can: ({ row }) => {
-                return this.currentUserIsSuperAdmin
-              }
-            }
-          },
-          ds: {
-            width: '100px',
-            formatter: (row) => {
-              if (row.ds && row.ds['domain_name']) {
-                return row.ds['domain_name']
               } else {
-                return ''
+                return <span>{row.name}</span>
               }
             }
           },
-          platform: {
-            label: this.$t('Platform'),
-            width: '150px',
-            formatter: PlatformFormatter,
-            formatterArgs: {
-              platformAttr: 'asset.platform'
-            }
-          },
           asset: {
-            minWidth: '100px',
             formatter: function(row) {
-              return row.asset.name
+              const to = {
+                name: 'AssetDetail',
+                params: { id: row.asset.id }
+              }
+              if (vm.$hasPerm('assets.view_asset')) {
+                return <router-link to={to}>{row.asset.name}</router-link>
+              } else {
+                return <span>{row.asset.name}</span>
+              }
             }
           },
           username: {
-            minWidth: '60px',
+            width: '120px'
-            formatter: function(row) {
-              if (row.ds && row.ds['domain_name']) {
-                return `${row.username}@${row.ds['domain_name']}`
-              } else {
-                return row.username
-              }
-            }
           },
           secret_type: {
             formatter: function(row) {
@@ -282,19 +214,77 @@ export default {
           connectivity: connectivityMeta,
           actions: {
             formatter: ActionsFormatter,
-            has: this.showActions,
             formatterArgs: {
-              performDelete: ({ row }) => {
-                const id = row.id
-                const url = `/api/v1/accounts/accounts/${id}/`
-                return this.$axios.delete(url)
-              },
               hasUpdate: false, // can set function(row, value)
-              hasDelete: true, // can set function(row, value)
+              hasDelete: false, // can set function(row, value)
-              hasClone: false,
+              hasClone: this.hasClone,
-              canDelete: ({ row }) => vm.$hasPerm('accounts.delete_account') && !isDirectoryServiceAccount(row, this),
               moreActionsTitle: this.$t('More'),
-              extraActions: accountOtherActions(this)
+              extraActions: [
+                {
+                  name: 'View',
+                  title: this.$t('View'),
+                  can: this.$hasPerm('accounts.view_accountsecret'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    // debugger
+                    vm.secretUrl = `/api/v1/accounts/account-secrets/${row.id}/`
+                    vm.account = row
+                    vm.showViewSecretDialog = false
+                    setTimeout(() => {
+                      vm.showViewSecretDialog = true
+                    })
+                  }
+                },
+                {
+                  name: 'Update',
+                  title: this.$t('Edit'),
+                  can: this.$hasPerm('accounts.change_account') && !this.$store.getters.currentOrgIsRoot,
+                  callback: ({ row }) => {
+                    const data = {
+                      ...this.asset,
+                      ...row.asset
+                    }
+                    vm.account = row
+                    vm.iAsset = data
+                    vm.showAddDialog = false
+                    vm.accountCreateUpdateTitle = this.$t('UpdateAccount')
+                    setTimeout(() => {
+                      vm.showAddDialog = true
+                    })
+                  }
+                },
+                {
+                  name: 'Test',
+                  title: this.$t('Test'),
+                  can: ({ row }) =>
+                    !this.$store.getters.currentOrgIsRoot &&
+                    this.$hasPerm('accounts.verify_account') &&
+                    row.asset['auto_config'].ansible_enabled &&
+                    row.asset['auto_config'].ping_enabled,
+                  callback: ({ row }) => {
+                    this.$axios.post(
+                      `/api/v1/accounts/accounts/tasks/`,
+                      { action: 'verify', accounts: [row.id] }
+                    ).then(res => {
+                      openTaskPage(res['task'])
+                    })
+                  }
+                },
+                {
+                  name: 'ClearSecret',
+                  title: this.$t('ClearSecret'),
+                  can: this.$hasPerm('accounts.change_account'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    this.$axios.patch(
+                      `/api/v1/accounts/accounts/clear-secret/`,
+                      { account_ids: [row.id] }
+                    ).then(() => {
+                      this.$message.success(this.$tc('ClearSuccessMsg'))
+                    })
+                  }
+                }
+              ]
             }
           },
           ...this.columnsMeta
@@ -323,15 +313,15 @@ export default {
             type: 'primary',
             icon: 'plus',
             can: () => {
-              return vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot
+              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
             },
-            callback: () => {
+            callback: async() => {
+              await this.getAssetDetail()
               setTimeout(() => {
                 vm.iAsset = this.asset
                 vm.account = {}
-                this.addTemplate = false
+                vm.showAddDialog = true
-                this.showAddDialog = true
+              })
-              }, 200)
             }
           },
           {
@@ -339,15 +329,14 @@ export default {
             title: this.$t('TemplateAdd'),
             has: !(this.platform || this.asset),
             can: () => {
-              return vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot
+              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
             },
-            callback: async () => {
+            callback: async() => {
               await this.getAssetDetail()
               setTimeout(() => {
                 vm.iAsset = this.asset
                 vm.account = {}
-                vm.showAddDialog = true
+                vm.showAddTemplateDialog = true
-                vm.addTemplate = true
               })
             }
           },
@@ -358,11 +347,11 @@ export default {
             name: 'TestSelected',
             title: this.$t('TestSelected'),
             type: 'primary',
-            icon: 'verify',
+            icon: 'fa-link',
             can: ({ selectedRows }) => {
               return selectedRows.length > 0 &&
-                ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&
+                  ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&
-                !this.$store.getters.currentOrgIsRoot && vm.$hasPerm('accounts.verify_account')
+                  !this.$store.getters.currentOrgIsRoot
             },
             callback: function({ selectedRows }) {
               const ids = selectedRows.map(v => {
@@ -427,18 +416,6 @@ export default {
       }
     }
   },
-  computed: {
-    ...mapGetters(['currentUserIsSuperAdmin']),
-    accountCreateUpdateTitle() {
-      if (this.addTemplate) {
-        return this.$t('AddAccountByTemplate')
-      } else if (this.isUpdateAccount) {
-        return this.$t('UpdateAccount')
-      } else {
-        return this.$t('AddAccount')
-      }
-    }
-  },
   watch: {
     url(iNew) {
       this.$set(this.tableConfig, 'url', iNew)
@@ -446,39 +423,56 @@ export default {
     }
   },
   mounted() {
-    this.setActions()
+    if (this.columns.length > 0) {
+      this.tableConfig.columns = this.columns
+    }
+    if (this.otherActions) {
+      const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
+      for (const item of this.otherActions) {
+        actionColumn.formatterArgs.extraActions.push(item)
+      }
+    }
+    if (this.hasDeleteAction) {
+      this.tableConfig.columnsMeta.actions.formatterArgs.extraActions.push(
+        {
+          name: 'Delete',
+          title: this.$t('Delete'),
+          can: this.$hasPerm('accounts.delete_account'),
+          type: 'primary',
+          callback: ({ row }) => {
+            const msg = this.$t('AccountDeleteConfirmMsg')
+            this.$confirm(msg, this.$tc('Info'), {
+              type: 'warning',
+              confirmButtonClass: 'el-button--danger',
+              beforeClose: async(action, instance, done) => {
+                if (action !== 'confirm') return done()
+                this.$axios.delete(`/api/v1/accounts/accounts/${row.id}/`).then(() => {
+                  done()
+                  this.$refs.ListTable.reloadTable()
+                  this.$message.success(this.$tc('DeleteSuccessMsg'))
+                })
+              }
+            })
+          }
+        }
+      )
+    }
   },
   activated() {
     // 由于组件嵌套较深，有可能导致 Error in activated hook: "TypeError: Cannot read properties of undefined (reading 'getList')" 的问题
-    if (this.tabDeactivated) {
+    setTimeout(() => {
-      setTimeout(() => this.refresh(), 300)
+      this.refresh()
-    }
+    }, 300)
-  },
-  deactivated() {
-    this.tabDeactivated = true
   },
   methods: {
-    setActions() {
-      if (this.columns.length > 0) {
-        this.tableConfig.columns = this.columns
-      }
-      if (this.otherActions) {
-        const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
-        for (const item of this.otherActions) {
-          actionColumn.formatterArgs.extraActions.push(item)
-        }
-      }
-    },
     onUpdateAuthDone(account) {
       Object.assign(this.account, account)
     },
     addAccountSuccess() {
-      // Reflect.deleteProperty(this.$route.query, 'flag')
-      this.isUpdateAccount = false
       this.$refs.ListTable.reloadTable()
     },
     async getAssetDetail() {
-      const { query: { asset } } = this.$route
+      const { query: { asset }} = this.$route
       if (asset) {
         this.iAsset = await this.$axios.get(`/api/v1/assets/assets/${asset}/`)
       }
@@ -513,7 +507,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 .cell a {
   color: var(--color-info);
 }

src/components/Apps/AccountListTable/BulkCreateResultDialog.vue

@@ -6,7 +6,7 @@
     @confirm="closeDialog"
     v-on="$listeners"
   >
-    <el-alert style="margin-bottom: 10px" type="info">
+    <el-alert style="margin-bottom: 10px" type="success">
       <span v-for="item of summary" :key="item.key"><b>{{ item.label }}</b>: {{ item.value }} </span>
     </el-alert>
     <DataTable :config="config" />
@@ -49,10 +49,6 @@ export default {
             prop: 'asset',
             label: this.$t('Asset')
           },
-          {
-            prop: 'account',
-            label: this.$t('Account')
-          },
           {
             prop: 'state',
             label: this.$t('Status'),

src/components/Apps/AccountListTable/PasswordHistoryDialog.vue

@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListTableDialog } from '@/layout/components'
-import { SecretViewerFormatter } from '@/components/Table/TableFormatters'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   components: {
@@ -33,7 +33,7 @@ export default {
           columnsMeta: {
             secret: {
               label: this.$t('Password'),
-              formatter: SecretViewerFormatter,
+              formatter: ShowKeyCopyFormatter,
               formatterArgs: {
                 hasDownload: false,
                 name: this.account.name

src/components/Apps/AccountListTable/RemoveAccount.vue

@@ -12,7 +12,7 @@
 
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { openTaskPage } from '@/utils/jms/index'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'RemoveAccount',

src/components/Apps/AccountListTable/UpdateSecretInfo.vue

@@ -1,36 +1,44 @@
 <template>
   <Dialog
     :destroy-on-close="true"
-    :show-buttons="false"
     :title="$tc('UpdateAssetUserToken')"
-    :visible.sync="iVisible"
+    :visible.sync="visible"
-    width="800px"
+    width="50"
+    @cancel="handleCancel()"
+    @confirm="handleConfirm()"
     v-on="$listeners"
   >
-    <AutoDataForm
+    <el-form label-position="right" label-width="90px">
-      :fields="fields"
+      <el-form-item :label="$tc('Name')">
-      :fields-meta="fieldsMeta"
+        <el-input v-model="account['asset_name']" readonly />
-      :form="init"
+      </el-form-item>
-      :has-reset="false"
+      <el-form-item :label="$tc('Username')">
-      :has-save-continue="false"
+        <el-input v-model="account['username']" readonly />
-      :url="''"
+      </el-form-item>
-      method="patch"
+      <el-form-item :label="$tc('Password')">
-      @submit="handleConfirm"
+        <UpdateToken v-model="authInfo.password" />
-    />
+      </el-form-item>
+      <el-form-item :label="$tc('SSHSecretKey')">
+        <UploadKey @input="getFile" />
+      </el-form-item>
+      <el-form-item :label="$tc('Passphrase')">
+        <UpdateToken v-model="authInfo.passphrase" />
+      </el-form-item>
+    </el-form>
   </Dialog>
 </template>
 
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
+import { UpdateToken, UploadKey } from '@/components/Form/FormFields'
-import { encryptPassword } from '@/utils/secure'
+import { encryptPassword } from '@/utils/crypto'
-import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
 
 export default {
   name: 'UpdateSecretInfo',
   components: {
-    AutoDataForm,
+    Dialog,
-    Dialog
+    UploadKey,
+    UpdateToken
   },
   props: {
     account: {
@@ -43,59 +51,49 @@ export default {
     }
   },
   data() {
-    const accountMeta = accountFieldsMeta(this)
     return {
-      fields: [
+      secretInfo: {
-        'name', 'secret_type', 'password', 'ssh_key', 'token',
+        password: '',
-        'access_key', 'passphrase', 'api_key'
+        private_key: '',
-      ],
+        passphrase: ''
-      fieldsMeta: {
-        ...accountMeta,
-        name: {
-          ...accountMeta.name,
-          readonly: true
-        },
-        secret_type: {
-          hidden: () => true
-        }
-      },
-      init: {
-        ...this.account
-      }
-    }
-  },
-  computed: {
-    iVisible: {
-      get() {
-        return this.visible
-      },
-      set(val) {
-        this.$emit('update:visible', val)
       }
     }
   },
   methods: {
-    handleConfirm(form) {
+    handleConfirm() {
-      const secretType = this.account.secret_type.value
+      const data = {}
-      const data = {
+      if (this.secretInfo.password !== '') {
-        secret: encryptPassword(form[secretType])
+        data.password = encryptPassword(this.secretInfo.password)
+      }
+      if (this.secretInfo.private_key !== '') {
+        data.private_key = encryptPassword(this.secretInfo.private_key)
+        if (this.secretInfo.passphrase) data.passphrase = this.secretInfo.passphrase
       }
       this.$axios.patch(
         `/api/v1/accounts/accounts/${this.account.id}/`,
         data,
         { disableFlashErrorMsg: true }
       ).then(res => {
+        this.authInfo = { password: '', private_key: '' }
         this.$message.success(this.$tc('UpdateSuccessMsg'))
-        this.iVisible = false
+        this.$emit('updateAuthDone', res)
+        this.$emit('update:visible', false)
       }).catch(err => {
         const errMsg = Object.values(err.response.data).join(', ')
         this.$message.error(this.$tc('UpdateErrorMsg') + ' ' + errMsg)
-        this.iVisible = false
+        this.$emit('update:visible', true)
       })
     },
     handleCancel() {
       this.$emit('update:visible', false)
+    },
+    getFile(file) {
+      this.secretInfo.private_key = file
     }
   }
 }
 </script>
+
+<style scoped>
+
+</style>

src/components/Apps/AccountListTable/ViewSecret.vue

@@ -18,7 +18,7 @@
           <span>{{ account['username'] }}</span>
         </el-form-item>
         <el-form-item :label="secretTypeLabel">
-          <SecretViewerFormatter
+          <ShowKeyCopyFormatter
             :cell-value="secretInfo.secret"
             :col="{ formatterArgs: {
               name: account['name'],
@@ -60,16 +60,15 @@
 <script>
 import Dialog from '@/components/Dialog/index.vue'
 import PasswordHistoryDialog from './PasswordHistoryDialog.vue'
-import { SecretViewerFormatter } from '@/components/Table/TableFormatters'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
-import { encryptPassword } from '@/utils/secure'
+import { encryptPassword } from '@/utils/crypto'
-import { mapGetters } from 'vuex'
 
 export default {
   name: 'ShowSecretInfo',
   components: {
     Dialog,
     PasswordHistoryDialog,
-    SecretViewerFormatter
+    ShowKeyCopyFormatter
   },
   props: {
     account: {
@@ -112,9 +111,6 @@ export default {
     }
   },
   computed: {
-    ...mapGetters({
-      publicSettings: 'publicSettings'
-    }),
     secretTypeLabel() {
       return this.account['secret_type'].label || 'Password'
     },
@@ -150,11 +146,7 @@ export default {
       })
     },
     showSecretDialog() {
-      if (!this.publicSettings.SECURITY_ACCOUNT_SECRET_READ) {
+      return this.$axios.get(this.url, { disableFlashErrorMsg: true }).then((res) => {
-        this.$message.warning(this.$tc('AccountSecretReadDisabled'))
-        return
-      }
-      return this.$axios.get(this.url).then((res) => {
         this.secretInfo = res
         this.sshKeyFingerprint = res?.spec_info?.ssh_key_fingerprint || '-'
         this.showSecret = true
@@ -175,54 +167,54 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.item-textarea ::v-deep .el-textarea__inner {
+  .item-textarea ::v-deep .el-textarea__inner {
-  height: 110px;
+    height: 110px;
-}
-
-.el-form-item {
-  border-bottom: 1px solid #EBEEF5;
-  padding: 5px 0;
-  margin-bottom: 0;
-
-  &:last-child {
-    border-bottom: none;
   }
 
-  ::v-deep .el-form-item__label {
+  .el-form-item {
-    display: flex;
+    border-bottom: 1px solid #EBEEF5;
-    align-items: center;
+    padding: 5px 0;
-    justify-content: flex-start;
+    margin-bottom: 0;
-    padding-right: 20px;
-    line-height: 30px;
-    word-break: keep-all;
-    overflow-wrap: break-word;
-    white-space: normal;
-  }
 
-  ::v-deep .el-form-item__content {
+    &:last-child {
-    line-height: 30px;
+      border-bottom: none;
+    }
 
-    pre {
+    ::v-deep .el-form-item__label {
-      margin: 0;
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      padding-right: 20px;
+      line-height: 30px;
+      word-break: keep-all;
+      overflow-wrap: break-word;
+      white-space: normal;
+    }
+
+    ::v-deep .el-form-item__content {
+      line-height: 30px;
+
+      pre {
+        margin: 0;
+      }
     }
   }
-}
 
-ul {
+  ul {
-  margin: 0;
+    margin: 0;
-}
+  }
-
+
-li {
+  li {
-  display: block;
+    display: block;
-  font-size: 13px;
+    font-size: 13px;
-  margin-bottom: 8px;
+    margin-bottom: 8px;
-  white-space: nowrap;
+    white-space: nowrap;
-  overflow: hidden;
+    overflow: hidden;
-  text-overflow: ellipsis;
+    text-overflow: ellipsis;
-
+
-  .title {
+    .title {
-    color: #303133;
+      color: #303133;
-    font-weight: 500;
+      font-weight: 500;
+    }
   }
-}
 </style>

src/components/Apps/AccountListTable/const.js

@@ -1,5 +1,4 @@
 import { ChoicesFormatter } from '@/components/Table/TableFormatters'
-import { openTaskPage } from '@/utils/jms/index'
 
 export const connectivityMeta = {
   formatter: ChoicesFormatter,
@@ -7,23 +6,11 @@ export const connectivityMeta = {
     faChoices: {
       '-': '',
       ok: 'fa-check-circle',
-      err: 'fa-times-circle',
+      err: 'fa-times-circle'
-      auth_err: 'fa-times-circle',
-      rdp_err: 'fa-times-circle',
-      password_err: 'fa-times-circle',
-      openssh_key_err: 'fa-times-circle',
-      ntlm_err: 'fa-times-circle',
-      create_temp_err: 'fa-times-circle'
     },
     classChoices: {
       ok: 'text-primary',
-      err: 'text-danger',
+      err: 'text-danger'
-      auth_err: 'text-danger',
-      rdp_err: 'text-danger',
-      password_err: 'text-danger',
-      openssh_key_err: 'text-danger',
-      ntlm_err: 'text-danger',
-      create_temp_err: 'text-danger'
     },
     getText({ cellValue }) {
       if (cellValue?.value === '-' || cellValue?.value === 'unknown') {
@@ -35,316 +22,3 @@ export const connectivityMeta = {
   },
   width: '130px'
 }
-
-export function isDirectoryServiceAccount(account, vm) {
-  return vm.asset && vm.asset.id !== account.asset.id
-}
-
-export const accountOtherActions = vm => {
-  return [
-    {
-      name: 'View',
-      title: vm.$t('View'),
-      can: vm.$hasPerm('accounts.view_accountsecret'),
-      type: 'primary',
-      order: 1,
-      callback: ({ row }) => {
-        // debugger
-        vm.secretUrl = `/api/v1/accounts/account-secrets/${row.id}/`
-        vm.account = row
-        vm.showViewSecretDialog = false
-        setTimeout(() => {
-          vm.showViewSecretDialog = true
-        })
-      }
-    },
-    {
-      name: 'Update',
-      title: vm.$t('Edit'),
-      can: ({ row }) => {
-        return (
-          vm.$hasPerm('accounts.change_account') &&
-          !vm.$store.getters.currentOrgIsRoot &&
-          !isDirectoryServiceAccount(row, vm)
-        )
-      },
-      callback: ({ row }) => {
-        vm.isUpdateAccount = true
-        const data = {
-          ...vm.asset,
-          ...row.asset
-        }
-        vm.iAsset = data
-        vm.account = row
-        vm.addTemplate = false
-        vm.showAddDialog = false
-        setTimeout(() => {
-          vm.showAddDialog = true
-        })
-      }
-    },
-    {
-      name: 'UpdateSecret',
-      title: vm.$t('EditSecret'),
-      can: ({ row }) => {
-        return (
-          vm.$hasPerm('accounts.change_account') &&
-          !vm.$store.getters.currentOrgIsRoot &&
-          !isDirectoryServiceAccount(row, vm)
-        )
-      },
-      callback: ({ row }) => {
-        const data = {
-          ...vm.asset,
-          ...row.asset
-        }
-        vm.account = row
-        vm.iAsset = data
-        vm.showUpdateSecretDialog = false
-        vm.accountCreateUpdateTitle = vm.$t('UpdateAccount')
-        setTimeout(() => {
-          vm.showUpdateSecretDialog = true
-        })
-      }
-    },
-    {
-      name: 'Clone',
-      title: vm.$t('Duplicate'),
-      has: () => {
-        return !vm.asset
-      },
-      can: ({ row }) => {
-        return (
-          vm.$hasPerm('accounts.add_account') &&
-          !vm.$store.getters.currentOrgIsRoot &&
-          !isDirectoryServiceAccount(row, vm)
-        )
-      },
-      callback: ({ row }) => {
-        vm.account = {
-          name: `${row.name} - ${vm.$t('Duplicate').toLowerCase()}`,
-          username: `${row.username} - ${vm.$t('Duplicate').toLowerCase()}`,
-          payload: 'pam_account_clone'
-        }
-        vm.iAsset = vm.asset
-
-        vm.showAddDialog = false
-        setTimeout(() => {
-          vm.showAddDialog = true
-        })
-      }
-    },
-    {
-      name: 'Test',
-      title: vm.$t('VerifySecret'),
-      divided: true,
-      can: ({ row }) =>
-        !vm.$store.getters.currentOrgIsRoot &&
-        vm.$hasPerm('accounts.verify_account') &&
-        row.asset['auto_config'].ansible_enabled &&
-        row.asset['auto_config'].ping_enabled,
-      callback: ({ row }) => {
-        vm.$axios
-          .post(`/api/v1/accounts/accounts/tasks/`, { action: 'verify', accounts: [row.id] })
-          .then(res => {
-            openTaskPage(res['task'])
-          })
-      }
-    },
-    {
-      name: 'ClearSecret',
-      title: vm.$t('ClearSecret'),
-      can: ({ row }) => {
-        return vm.$hasPerm('accounts.change_account') && !isDirectoryServiceAccount(row, vm)
-      },
-      type: 'primary',
-      callback: ({ row }) => {
-        vm.$axios
-          .patch(`/api/v1/accounts/accounts/clear-secret/`, { account_ids: [row.id] })
-          .then(() => {
-            vm.$message.success(vm.$tc('ClearSuccessMsg'))
-          })
-      }
-    },
-    {
-      name: 'SecretHistory',
-      title: vm.$t('HistoryPassword'),
-      can: () => vm.$hasPerm('accounts.view_accountsecret'),
-      type: 'primary',
-      callback: ({ row }) => {
-        vm.account = row
-        vm.currentAccountColumn = row
-        vm.showViewSecretDialog = false
-        vm.secretUrl = `/api/v1/accounts/account-secrets/${row.id}/`
-        setTimeout(() => {
-          vm.showViewSecretDialog = true
-        })
-      }
-    },
-    {
-      name: 'CopyToOther',
-      title: vm.$t('CopyToAsset'),
-      type: 'primary',
-      divided: true,
-      can: ({ row }) => {
-        return (
-          vm.$hasPerm('accounts.add_account') &&
-          !vm.$store.getters.currentOrgIsRoot &&
-          !isDirectoryServiceAccount(row, vm)
-        )
-      },
-      has: () => {
-        return !vm.asset
-      },
-      callback: ({ row }) => {
-        vm.accountCreateUpdateTitle = vm.$t('CopyToOther')
-        vm.$route.query.flag = 'copy'
-        vm.iAsset = vm.asset
-        vm.account = row
-        vm.showAddDialog = true
-      }
-    },
-    {
-      name: 'MoveToOther',
-      title: vm.$t('MoveToAsset'),
-      type: 'primary',
-      can: ({ row }) => {
-        return (
-          vm.$hasPerm('accounts.delete_account') &&
-          !vm.$store.getters.currentOrgIsRoot &&
-          !isDirectoryServiceAccount(row, vm)
-        )
-      },
-      has: () => {
-        return !vm.asset
-      },
-      callback: ({ row }) => {
-        vm.accountCreateUpdateTitle = vm.$t('MoveToOther')
-        vm.$route.query.flag = 'move'
-        vm.iAsset = vm.asset
-        vm.account = row
-        vm.showAddDialog = true
-      }
-    }
-  ]
-}
-
-export const accountQuickFilters = vm => [
-  {
-    label: vm.$t('Recent (7 days)'),
-    options: [
-      {
-        label: vm.$t('RecentlyDiscovered'),
-        filter: {
-          latest_discovery: '1'
-        }
-      },
-      {
-        label: vm.$t('RecentlyLoggedIn'),
-        filter: {
-          latest_accessed: '1'
-        }
-      },
-      {
-        label: vm.$t('RecentlyModified'),
-        filter: {
-          latest_updated: '1'
-        }
-      },
-      {
-        label: vm.$t('RecentlyChangedPassword'),
-        filter: {
-          latest_secret_changed: '1'
-        }
-      },
-      {
-        label: vm.$t('RecentPasswordChangeFailed'),
-        filter: {
-          latest_secret_change_failed: '1'
-        }
-      }
-    ]
-  },
-  {
-    label: vm.$t('RiskyAccount'),
-    options: [
-      {
-        label: vm.$t('NoLoginLongTime'),
-        filter: {
-          long_time_no_login: 'true'
-        }
-      },
-      {
-        label: vm.$t('AddAccount'),
-        filter: {
-          risk: 'new_found'
-        }
-      },
-      {
-        label: vm.$t('WeakPassword'),
-        filter: {
-          risk: 'weak_password'
-        }
-      },
-      {
-        label: vm.$t('EmptyPassword'),
-        filter: {
-          has_secret: 'false'
-        }
-      },
-      {
-        label: vm.$t('LongTimePassword'),
-        filter: {
-          long_time_no_change_secret: 'true'
-        }
-      }
-    ]
-  },
-  {
-    label: vm.$t('AccountType'),
-    options: [
-      {
-        label: vm.$t('All'),
-        filter: {
-          category: ''
-        }
-      },
-      {
-        label: vm.$t('Host'),
-        filter: {
-          category: 'host'
-        }
-      },
-      {
-        label: vm.$t('Database'),
-        filter: {
-          category: 'database'
-        }
-      },
-      {
-        label: vm.$t('Cloud'),
-        filter: {
-          category: 'cloud'
-        }
-      },
-      {
-        label: vm.$t('Device'),
-        filter: {
-          category: 'device'
-        }
-      },
-      {
-        label: 'Web',
-        filter: {
-          category: 'web'
-        }
-      },
-      {
-        label: vm.$t('Other'),
-        filter: {
-          category: 'custom'
-        }
-      }
-    ]
-  }
-]

src/components/Apps/AssetRelationCard/index.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import IBox from '@/components/Common/IBox/index.vue'
+import IBox from '@/components/IBox/index.vue'
 import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
 
 export default {
@@ -48,13 +48,11 @@ export default {
     },
     performAdd: {
       type: Function,
-      default: (objects, that) => {
+      default: (objects, that) => {}
-      }
     },
     onAddSuccess: {
       type: Function,
-      default: (objects, that) => {
+      default: (objects, that) => {}
-      }
     },
     canSelect: {
       type: Function,
@@ -64,7 +62,8 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+    }
   },
   methods: {
     addObjects() {
@@ -78,18 +77,18 @@ export default {
 </script>
 
 <style scoped>
-b, strong {
+  b, strong {
-  font-weight: 700;
+    font-weight: 700;
-  font-size: 13px;
+    font-size: 13px;
-}
+  }
 
-tr td {
+  tr td {
-  line-height: 1.42857;
+    line-height: 1.42857;
-  padding: 8px;
+    padding: 8px;
-  vertical-align: top;
+    vertical-align: top;
-}
+  }
 
-tr.item td {
+  tr.item td {
-  border-top: 1px solid #e7eaec;
+    border-top: 1px solid #e7eaec;
-}
+  }
 </style>

src/components/Apps/AssetSelect/dialog.vue

@@ -22,8 +22,6 @@
       :url="baseUrl"
       class="tree-table"
       v-bind="$attrs"
-      @loaded="handleTableLoaded"
-      v-on="$listeners"
     />
   </Dialog>
 </template>
@@ -66,7 +64,6 @@ export default {
   data() {
     const vm = this
     return {
-      isLoaded: false,
       dialogVisible: false,
       rowSelected: _.cloneDeep(this.value) || [],
       rowsAdd: [],
@@ -82,7 +79,7 @@ export default {
           },
           {
             prop: 'address',
-            label: this.$t('Address'),
+            label: this.$t('IpDomain'),
             sortable: 'custom'
           },
           {
@@ -127,9 +124,6 @@ export default {
     }
   },
   methods: {
-    handleTableLoaded() {
-      this.isLoaded = true
-    },
     handleClose() {
       this.$refs.ListPage.$refs.TreeList.componentKey += 1
     },

src/components/Apps/AssetSelect/index.vue

@@ -28,6 +28,7 @@
 <script>
 import Select2 from '@/components/Form/FormFields/Select2.vue'
 import AssetSelectDialog from './dialog.vue'
+import { b } from 'css-color-function/lib/adjusters'
 
 export default {
   componentName: 'AssetSelect',
@@ -37,10 +38,6 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
-    defaultPageSize: {
-      type: Number,
-      default: 10
-    },
     baseNodeUrl: {
       type: String,
       default: '/api/v1/assets/nodes/'
@@ -56,10 +53,6 @@ export default {
     treeSetting: {
       type: Object,
       default: () => ({})
-    },
-    disabled: {
-      type: [Boolean, Function],
-      default: false
     }
   },
   data() {
@@ -75,11 +68,9 @@ export default {
       dialogVisible: false,
       initialValue: _.cloneDeep(iValue),
       select2Config: {
-        disabled: this.disabled,
         value: iValue,
         multiple: true,
         clearable: true,
-        defaultPageSize: this.defaultPageSize,
         ajax: {
           url: this.baseUrl,
           transformOption: (item) => {
@@ -90,6 +81,7 @@ export default {
     }
   },
   methods: {
+    b,
     handleFocus() {
       this.$refs.select2.selectRef.blur()
       this.dialogVisible = true

src/components/Apps/AssetTreeTable/index.vue

@@ -20,7 +20,7 @@
 
 <script>
 import TreeTable from '../../Table/TreeTable/index.vue'
-import { getShowCurrentAssetValue, setRouterQuery, setUrlParam } from '@/utils/common/index'
+import { setRouterQuery, setUrlParam } from '@/utils/common'
 import $ from '@/utils/jquery-vendor'
 
 export default {
@@ -32,10 +32,6 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
-    typeUrl: {
-      type: String,
-      default: '/api/v1/assets/nodes/category/tree/'
-    },
     nodeUrl: {
       type: String,
       default: '/api/v1/assets/nodes/'
@@ -109,16 +105,11 @@ export default {
               showAssets: false,
               showSearch: false,
               customTreeHeaderName: this.$t('TypeTree'),
-              url: this.typeUrl,
+              url: '/api/v1/assets/nodes/category/tree/',
               nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
-              treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
+              treeUrl: `/api/v1/assets/nodes/category/tree/?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
               callback: {
                 onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
-              },
-              edit: {
-                drag: {
-                  isMove: false
-                }
               }
             }
           }
@@ -147,9 +138,6 @@ export default {
     treeSetting.showDelete = this.$hasPerm('assets.delete_node')
   },
   methods: {
-    reloadTable() {
-      this.$refs.TreeList.reloadTable()
-    },
     setTreeUrlQuery() {
       let str = ''
       for (const key in this.treeUrlQuery) {
@@ -160,7 +148,7 @@ export default {
       return str
     },
     decorateRMenu() {
-      const show_current_asset = getShowCurrentAssetValue(this.$cookie)
+      const show_current_asset = this.$cookie.get('show_current_asset') || '0'
       if (show_current_asset === '1') {
         $('#m_show_asset_all_children_node').css('color', '#606266')
         $('#m_show_asset_only_current_node').css('color', 'green')
@@ -169,40 +157,30 @@ export default {
         $('#m_show_asset_only_current_node').css('color', '#606266')
       }
     },
-
     getAssetsUrl(treeNode) {
       let url = this.treeSetting?.url || this.url
-      const showCurrentAsset = getShowCurrentAssetValue(this.$cookie)
-
-      const setParam = (param, value, delay) => {
-        setTimeout(() => {
-          url = setUrlParam(url, param, value)
-        })
-      }
-
       if (treeNode.meta.type === 'node') {
         const nodeId = treeNode.meta.data.id
-        setParam('node_id', nodeId)
+        url = setUrlParam(url, 'node_id', nodeId)
-        setParam('asset_id', '')
+        url = setUrlParam(url, 'asset_id', '')
-        setParam('show_current_asset', showCurrentAsset)
       } else if (treeNode.meta.type === 'asset') {
         const assetId = treeNode.meta.data?.id || treeNode.id
-        setParam('node_id', '')
+        url = setUrlParam(url, 'node_id', '')
-        setParam('asset_id', assetId)
+        url = setUrlParam(url, 'asset_id', assetId)
-        setParam('show_current_asset', showCurrentAsset)
       } else if (treeNode.meta.type === 'category') {
-        setParam('category', treeNode.meta.category)
+        url = setUrlParam(url, 'category', treeNode.meta.category)
       } else if (treeNode.meta.type === 'type') {
-        setParam('category', treeNode.meta.category)
+        url = setUrlParam(url, 'category', treeNode.meta.category)
-        setParam('type', treeNode.meta._type)
+        url = setUrlParam(url, 'type', treeNode.meta._type)
       } else if (treeNode.meta.type === 'platform') {
-        setParam('platform', treeNode.id)
+        url = setUrlParam(url, 'platform', treeNode.id)
       }
+      const query = this.setTreeUrlQuery()
+      url = query ? `${url}&${query}` : url
+
       setTimeout(() => {
-        const query = this.setTreeUrlQuery()
-        url = query ? `${url}&${query}` : url
         this.$set(this.tableConfig, 'url', url)
-      })
+      }, 300)
 
       if (this.treeSetting.selectSyncToRoute !== false) {
         setRouterQuery(this, url)

src/components/Apps/BlockedIPs/BlockedIPList.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import { DrawerListTable as ListTable } from '@/components'
+import ListTable from '@/components/Table/ListTable/index.vue'
 
 export default {
   name: 'BlockedIPList',

src/components/Apps/ChangeSecret/RecordViewSecret.vue

@@ -12,7 +12,7 @@
     >
       <el-form :model="secretInfo" class="password-form" label-position="right" label-width="100px">
         <el-form-item :label="$tc('OldSecret')">
-          <SecretViewerFormatter
+          <ShowKeyCopyFormatter
             :cell-value="secretInfo.old_secret"
             :col="{ formatterArgs: {
               name: 'old_secret'
@@ -20,7 +20,7 @@
           />
         </el-form-item>
         <el-form-item :label="$tc('NewSecret')">
-          <SecretViewerFormatter
+          <ShowKeyCopyFormatter
             :cell-value="secretInfo.new_secret"
             :col="{ formatterArgs: {
               name: 'new_secret'
@@ -34,13 +34,13 @@
 
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { SecretViewerFormatter } from '@/components/Table/TableFormatters'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'RecordViewSecret',
   components: {
     Dialog,
-    SecretViewerFormatter
+    ShowKeyCopyFormatter
   },
   props: {
     visible: {

src/components/Apps/ChatAi/components/ChitChat/ChatInput.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <div v-if="hasPrompt" class="chat-action">
+    <div class="chat-action">
       <Select2
         v-model="select.value"
         :disabled="isLoading || isSelectDisabled"
@@ -36,10 +36,6 @@ export default {
     expanded: {
       type: Boolean,
       default: false
-    },
-    hasPrompt: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
@@ -50,7 +46,7 @@ export default {
         url: '/api/v1/settings/chatai-prompts/',
         value: '',
         multiple: false,
-        placeholder: this.$t('Role'),
+        placeholder: this.$t('Prompt'),
         ajax: {
           transformOption: (item) => {
             return { label: item.name, value: item.content }

src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue

@@ -1,73 +1,42 @@
 <template>
-  <div :class="{ 'user-role': isUserRole }" class="chat-item">
+  <div :class="{'user-role': isUserRole}" class="chat-item">
-    <div class="chart-item-container">
+    <div class="avatar">
-      <div class="avatar">
+      <el-avatar :src="isUserRole ? userUrl : chatUrl" class="header-avatar" />
-        <el-avatar
+    </div>
-          :src="isUserRole ? userUrl : chatUrl"
+    <div class="content">
-          class="header-avatar"
+      <div class="operational">
-        />
+        <span class="date">
+          {{ $moment(item.message.create_time).format('YYYY-MM-DD HH:mm:ss') }}
+        </span>
       </div>
-      <div class="content">
+      <div class="message">
-        <div class="operational">
+        <div class="message-content">
-          <div v-if="!item.message.is_reasoning" class="date">
+          <span v-if="isSystemError" class="error">
-            {{
+            {{ item.message.content }}
-              $moment(item.message.create_time).format("YYYY-MM-DD HH:mm:ss")
+          </span>
-            }}
+          <span v-else class="chat-text">
-          </div>
+            <MessageText :message="item.message" />
-
+          </span>
-          <div v-else class="thinking-time">{{ $i18n.t('DeeplyThoughtAbout') }}</div>
         </div>
-        <div :class="item.reasoning ? 'reasoning' : 'message'">
+        <div class="action">
-          <div class="message-content">
+          <el-tooltip
-            <div v-if="!item.reasoning">
+            v-if="isSystemError && isLoading"
-              <span v-if="isSystemError" class="error">
+            :content="$tc('Reconnect')"
-                {{ item.message.content }}
+            :open-delay="500"
-              </span>
+            placement="top"
-              <span v-else class="chat-text">
+          >
-                <MessageText :message="item.message" />
+            <svg-icon icon-class="refresh" @click="onRefresh" />
-              </span>
+          </el-tooltip>
-            </div>
+          <el-dropdown v-else size="small" @command="handleCommand">
-
+            <span class="el-dropdown-link">
-            <div v-else class="thinking-wrapper">
+              <i class="fa fa-ellipsis-v" />
-              <div class="thinking-content">
+            </span>
-                <!-- eslint-disable-next-line -->
+            <el-dropdown-menu slot="dropdown">
-                <div class="divider"></div>
+              <el-dropdown-item v-for="i in dropdownOptions" :key="i.action" :command="i.action">
-                <p>
+                {{ i.label }}
-                  <MessageText :message="item.reasoning" @insert-code="handleInsertCode" />
+              </el-dropdown-item>
-                </p>
+            </el-dropdown-menu>
-              </div>
+          </el-dropdown>
-
-              <div class="thinking-result">
-                <span v-if="isServerError" class="error">
-                  {{ isServerError }}
-                </span>
-                <MessageText :message="item.result" :is-terminal="isTerminal" @insert-code="handleInsertCode" /></div>
-            </div>
-          </div>
-          <div class="action">
-            <el-tooltip
-              v-if="isSystemError && isLoading"
-              :content="$tc('Reconnect')"
-              :open-delay="500"
-              placement="top"
-            >
-              <svg-icon icon-class="refresh" @click="onRefresh" />
-            </el-tooltip>
-            <el-dropdown v-else size="small" @command="handleCommand">
-              <span class="el-dropdown-link">
-                <i class="fa fa-ellipsis-v" />
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  v-for="i in dropdownOptions"
-                  :key="i.action"
-                  :command="i.action"
-                >
-                  {{ i.label }}
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
         </div>
       </div>
     </div>
@@ -76,10 +45,10 @@
 
 <script>
 import MessageText from './MessageText.vue'
-import { mapGetters, mapState } from 'vuex'
+import { mapState } from 'vuex'
-import { copy } from '@/utils/common/index'
+import { copy } from '@/utils/common'
 import { useChat } from '../../useChat.js'
-import { reconnect } from '@/utils/request'
+import { reconnect } from '@/utils/socket'
 
 const { setLoading, removeLoadingMessageInChat } = useChat()
 
@@ -92,14 +61,11 @@ export default {
       type: Object,
       default: () => {
       }
-    },
-    isTerminal: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
     return {
+      chatUrl: require('@/assets/img/chat.png'),
       userUrl: '/api/v1/settings/logo/',
       dropdownOptions: [
         {
@@ -113,26 +79,11 @@ export default {
     ...mapState({
       isLoading: state => state.chat.loading
     }),
-    ...mapGetters([
-      'publicSettings'
-    ]),
     isUserRole() {
       return this.item.message?.role === 'user'
     },
     isSystemError() {
-      return (
+      return this.item.type === 'error' && this.item.message?.role === 'assistant'
-        this.item.type === 'error' && this.item?.role === 'assistant'
-      )
-    },
-    isServerError() {
-      return (this.item.type === 'finish' && this.item.result.content === '')
-        ? this.$i18n.t('ServerBusyRetry')
-        : ''
-    },
-    chatUrl() {
-      return this.publicSettings.CHAT_AI_TYPE === 'gpt'
-        ? require('@/assets/img/chat.png')
-        : require('@/assets/img/deepSeek.png')
     }
   },
   methods: {
@@ -143,11 +94,8 @@ export default {
     },
     handleCommand(value) {
       if (value === 'copy') {
-        copy(this.item.result.content)
+        copy(this.item.message.content)
       }
-    },
-    handleInsertCode(code) {
-      this.$emit('insert-code', code)
     }
   }
 }
@@ -156,160 +104,101 @@ export default {
 <style lang="scss" scoped>
 .chat-item {
   display: flex;
-  padding: 0.5rem;
+  padding: 16px 14px 0;
-
-  .chart-item-container {
-    display: flex;
-    gap: 0.5rem;
-
-    .avatar {
-      width: 24px;
-      height: 24px;
-      margin-top: 2px;
-
-      .header-avatar {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-
-        &::v-deep img {
-          background-color: #fff;
-        }
-      }
-    }
-
-    .content {
-      display: flex;
-      flex-direction: column;
-      // gap: 0.5rem;
-      overflow: hidden;
-
-      .operational {
-        display: flex;
-        justify-content: space-between;
-        overflow: hidden;
-
-        .date {
-          padding-top: 5px;
-        }
-
-        .thinking-time {
-          width: 6rem;
-          display: flex;
-          justify-content: center;
-          padding: 5px 10px;
-          border-radius: 0.5rem;
-          background-color: #f5f5f5;
-        }
-
-        .copy {
-          float: right;
-          cursor: pointer;
-        }
-      }
-
-      .reasoning {
-        display: flex;
-        gap: 0.5rem;
-        align-items: flex-end;
-
-        .message-content .thinking-wrapper {
-          display: flex;
-          flex-direction: column;
-          gap: 0.5rem;
-
-          .thinking-content {
-            position: relative;
-            color: #8b8b8b;
-
-            .divider {
-              position: absolute;
-              top: 0;
-              left: 0;
-              height: 100%;
-              border-left: 2px solid #e5e5e5;
-            }
-
-            p {
-              margin: unset;
-              padding-left: 0.5rem;
-
-              ::v-deep p {
-                color: #8b8b8b;
-              }
-            }
-          }
-        }
-      }
-
-      .message {
-        display: -webkit-box;
-
-        .message-content {
-          flex: 1;
-          padding: 6px 10px;
-          border-radius: 2px 12px 12px;
-          background-color: #f0f1f5;
-        }
-
-        .action {
-          .svg-icon {
-            transform: translateY(50%);
-            margin-left: 3px;
-            cursor: pointer;
-          }
-
-          .el-dropdown {
-            height: 32px;
-            line-height: 37px;
-            font-size: 13px;
-
-            .el-dropdown-link {
-              i {
-                padding: 4px 5px;
-                font-size: 15px;
-                color: #8d9091;
-
-                &:hover {
-                  color: #7b8085;
-                }
-              }
-            }
-          }
-        }
-
-        .error {
-          color: red;
-        }
-      }
-    }
-  }
 
   &:last-child {
     padding-bottom: 16px;
   }
 
-  &.user-role {
+  .avatar {
-    flex-direction: row-reverse;
+    width: 22px;
+    height: 22px;
+    margin-top: 2px;
 
-    .chart-item-container {
+    .header-avatar {
+      width: 100%;
+      height: 100%;
+
+      &::v-deep img {
+        background-color: #e5e5e7;
+      }
+    }
+  }
+
+  .content {
+    margin-left: 6px;
+    overflow: hidden;
+
+    .operational {
+      display: flex;
+      justify-content: space-between;
+      overflow: hidden;
+
+      .copy {
+        float: right;
+        cursor: pointer;
+      }
+    }
+
+    .message {
+      display: -webkit-box;
+
+      .message-content {
+        flex: 1;
+        padding: 6px 10px;
+        border-radius: 2px 12px 12px;
+        background-color: #f0f1f5;
+      }
+
+      .action {
+        .svg-icon {
+          transform: translateY(50%);
+          margin-left: 3px;
+          cursor: pointer;
+        }
+
+        .el-dropdown {
+          height: 32px;
+          line-height: 37px;
+          font-size: 13px;
+
+          .el-dropdown-link {
+            i {
+              padding: 4px 5px;
+              font-size: 15px;
+              color: #8d9091;
+
+              &:hover {
+                color: #7b8085
+              }
+            }
+          }
+        }
+      }
+
+      .error {
+        color: red;
+      }
+    }
+  }
+}
+
+.user-role {
+  flex-direction: row-reverse;
+
+  .content {
+    margin-right: 10px;
+
+    .operational {
       flex-direction: row-reverse;
     }
 
-    .content {
+    .message {
-      margin-right: 10px;
+      flex-direction: row-reverse;
 
-      .operational {
+      .message-content {
-        flex-direction: row-reverse;
+        background-color: var(--menu-hover);
-      }
+        border-radius: 12px 2px 12px 12px;
-
-      .message {
-        flex-direction: row-reverse;
-
-        .message-content {
-          background-color: var(--menu-hover);
-          border-radius: 12px 2px 12px 12px;
-        }
       }
     }
   }

src/components/Apps/ChatAi/components/ChitChat/MessageText.vue

@@ -17,7 +17,7 @@ import mdKatex from '@traptitech/markdown-it-katex'
 import mila from 'markdown-it-link-attributes'
 import hljs from 'highlight.js'
 import 'highlight.js/styles/atom-one-dark.css'
-import { copy } from '@/utils/common/index'
+import { copy } from '@/utils/common'
 
 export default {
   props: {
@@ -25,10 +25,6 @@ export default {
       type: Object,
       default: () => {
       }
-    },
-    isTerminal: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -49,10 +45,10 @@ export default {
     this.init()
   },
   updated() {
-    this.addEvents()
+    this.addCopyEvents()
   },
   destroyed() {
-    this.removeEvents()
+    this.removeCopyEvents()
   },
   methods: {
     init() {
@@ -69,68 +65,30 @@ export default {
           return vm.highlightBlock(hljs.highlightAuto(code).value, '')
         }
       })
-      this.markdown.use(mila, { attrs: { target: '_blank', rel: 'noopener', class: 'link-style' } })
+      this.markdown.use(mila, { attrs: { target: '_blank', rel: 'noopener', class: 'link-style' }})
       this.markdown.use(mdKatex, { blockClass: 'katexmath-block rounded-md', errorColor: ' #cc0000' })
     },
     highlightBlock(str, lang) {
-      let insertSpanHtml = `<span class="code-block-header__insert">${this.$t('Insert')}</span>`
+      return `<pre class="code-block-wrapper"><div class="code-block-header"><span class="code-block-header__lang">${lang}</span><span class="code-block-header__copy">${'Copy'}</span></div><code class="hljs code-block-body ${lang}">${str}</code></pre>`
-      if (!this.isTerminal) {
-        insertSpanHtml = ''
-      }
-      return `<pre class="code-block-wrapper">
-        <div class="code-block-header">
-        <span class="code-block-header__lang">${lang}</span>  
-        <span class="code-block-header__actions">
-        ${insertSpanHtml}
-          <span class="code-block-header__copy">${this.$t('Copy')}</span>
-        </span>
-        </div>
-        <code class="hljs code-block-body ${lang}">${str}</code></pre>`
     },
-    addEvents() {
+    addCopyEvents() {
-      this.addBtnClickEvents('.code-block-header__copy', this.handlerClickCopy)
+      const copyBtn = document.querySelectorAll('.code-block-header__copy')
-      this.addBtnClickEvents('.code-block-header__insert', this.handlerClickInsert)
+      copyBtn.forEach((btn) => {
-    },
+        btn.addEventListener('click', () => {
-
+          const code = btn.parentElement?.nextElementSibling?.textContent
-    handlerClickCopy(event) {
+          if (code) {
-      const wrapper = event.target.closest('.code-block-wrapper')
+            copy(code)
-      if (wrapper) {
+          }
-        // 查找里面的 code 元素
-        const codeElement = wrapper.querySelector('code.code-block-body')
-        if (codeElement) {
-          const codeText = codeElement.textContent
-          copy(codeText)
-        }
-      }
-    },
-    handlerClickInsert(event) {
-      const wrapper = event.target.closest('.code-block-wrapper')
-      if (wrapper) {
-        // 查找里面的 code 元素
-        const codeElement = wrapper.querySelector('code.code-block-body')
-        if (codeElement) {
-          const codeText = codeElement.textContent
-          this.$emit('insert-code', codeText)
-        }
-      }
-    },
-    addBtnClickEvents(selector, callback) {
-      const buttons = this.$refs.textRef.querySelectorAll(selector)
-      buttons.forEach((btn) => {
-        btn.addEventListener('click', callback)
-      })
-    },
-    removeBtnClickEvent(selector) {
-      const buttons = this.$refs.textRef.querySelectorAll(selector)
-      buttons.forEach((btn) => {
-        btn.removeEventListener('click', () => {
         })
       })
     },
-    removeEvents() {
+    removeCopyEvents() {
       if (this.$refs.textRef) {
-        this.removeBtnClickEvent('.code-block-header__copy')
+        const copyBtn = this.$refs.textRef.querySelectorAll('.code-block-header__copy')
-        this.addBtnClickEvents('.code-block-header__insert')
+        copyBtn.forEach((btn) => {
+          btn.removeEventListener('click', () => {
+          })
+        })
       }
     }
   }
@@ -140,7 +98,6 @@ export default {
 <style lang="scss" scoped>
 .markdown-body {
   font-size: 13px;
-  max-width: 300px;;
 
   &::v-deep p {
     margin-bottom: 0 !important;
@@ -158,46 +115,26 @@ export default {
 
   &::v-deep .code-block-wrapper {
     background: #1F2329;
-    padding: 0;
+    padding: 2px 6px;
     margin: 5px 0;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
 
     .code-block-body {
-      padding: 5px 10px;
+      padding: 5px 10px 0;
     }
+  ;
 
     .code-block-header {
       margin-bottom: 4px;
       overflow: hidden;
       background: #353946;
       color: #c2d1e1;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 4px 8px;
-      width: 100%;
-      box-sizing: border-box;
 
-      .code-block-header__actions {
+      .code-block-header__copy {
-        display: flex;
+        float: right;
-        gap: 8px;
+        cursor: pointer;
 
-        .code-block-header__copy {
+        &:hover {
-          cursor: pointer;
+          color: #6e747b;
-
-          &:hover {
-            color: #6e747b;
-          }
-        }
-
-        .code-block-header__insert {
-          cursor: pointer;
-
-          &:hover {
-            color: #6e747b;
-          }
         }
       }
     }
@@ -241,7 +178,6 @@ export default {
   0% {
     opacity: 1;
   }
-
   100% {
     opacity: 0;
   }

src/components/Apps/ChatAi/components/ChitChat/index.vue

@@ -17,7 +17,7 @@
           </div>
         </div>
       </div>
-      <ChatMessage v-for="(item, index) in activeChat.chats" :key="index" :item="item" :is-terminal="isTerminal" @insert-code="insertCode" />
+      <ChatMessage v-for="(item, index) in activeChat.chats" :key="index" :item="item" />
     </div>
     <div class="input-box">
       <el-button
@@ -28,7 +28,7 @@
         size="small"
         @click="onStopHandle"
       >{{ $tc('Stop') }}</el-button>
-      <ChatInput ref="chatInput" :expanded="expanded" :has-prompt="!isTerminal" @send="onSendHandle" @select-prompt="onSelectPromptHandle" />
+      <ChatInput ref="chatInput" :expanded="expanded" @send="onSendHandle" @select-prompt="onSelectPromptHandle" />
     </div>
   </div>
 </template>
@@ -37,7 +37,7 @@
 import ChatInput from './ChatInput.vue'
 import ChatMessage from './ChatMessage.vue'
 import { mapState } from 'vuex'
-import { closeWebSocket, createWebSocket, onSend, ws } from '@/utils/request'
+import { closeWebSocket, createWebSocket, onSend, ws } from '@/utils/socket'
 import { getInputFocus, useChat } from '../../useChat.js'
 
 const {
@@ -68,10 +68,7 @@ export default {
       prompt: '',
       conversationId: '',
       showIntroduction: false,
-      introduction: [],
+      introduction: []
-      terminalContext: null,
-      isTerminal: false,
-      sessionChat: {}
     }
   },
   computed: {
@@ -103,9 +100,6 @@ export default {
       this.showIntroduction = true
       this.conversationId = ''
       this.$refs.chatInput.select.value = ''
-      if (this.terminalContext) {
-        this.prompt = this.terminalContext.content || ''
-      }
       const chat = {
         message: {
           content: this.$t('ChatHello'),
@@ -129,17 +123,7 @@ export default {
         setLoading(true)
         removeLoadingMessageInChat()
         this.conversationId = data.id
-
+        updateChaMessageContentById(data.message.id, data)
-        const newFragment = {
-          message: { id: data.message.id, is_reasoning: data.message.is_reasoning },
-          reasoning: { content: data.message.is_reasoning ? data.message.content : '' },
-          result: { content: data.message.is_reasoning ? '' : data.message.content },
-          role: data.message.role,
-          type: data.message.type,
-          create_time: data.message.create_time
-        }
-
-        updateChaMessageContentById(data.message.id, newFragment)
       }
       if (data.message?.type === 'finish') {
         setLoading(false)
@@ -156,32 +140,6 @@ export default {
       addMessageToActiveChat(data)
       setLoading(true)
     },
-    onTerminalContext(terminalContext) {
-      const originSessionId = this.terminalContext?.sessionId
-      const newSessionId = terminalContext.sessionId || ''
-      if (originSessionId) {
-        this.saveSessionChat(originSessionId)
-      }
-      this.terminalContext = terminalContext
-      this.isTerminal = true
-      this.prompt = terminalContext.content || ''
-      if (originSessionId !== newSessionId) {
-        if (this.sessionChat[newSessionId]) {
-          clearChats()
-          for (const chat of this.sessionChat[newSessionId]) {
-            addChatMessageById(chat)
-          }
-        } else {
-          this.onNewChat()
-        }
-      }
-    },
-    saveSessionChat(sessionId) {
-      if (this.terminalContext) {
-        this.sessionChat[sessionId] = JSON.parse(JSON.stringify(this.activeChat.chats))
-      }
-    },
-
     onSendHandle(value) {
       this.showIntroduction = false
       this.socket = ws || {}
@@ -236,15 +194,6 @@ export default {
     sendIntroduction(item) {
       this.showIntroduction = false
       this.onSendHandle(item.content)
-    },
-    insertCode(code) {
-      this.sendPostMessage({
-        name: 'INSERT_TERMINAL_CODE',
-        data: code.replace(/^[\s\r\n]+|[\s\r\n]+$/g, '')
-      })
-    },
-    sendPostMessage(data) {
-      window.parent.postMessage(data)
     }
   }
 }

src/components/Apps/ChatAi/components/Sidebar/index.vue

@@ -13,8 +13,6 @@
 </template>
 
 <script>
-import { BASE_URL } from '@/utils/common/index'
-
 export default {
   props: {
     active: {
@@ -43,16 +41,6 @@ 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
     }
   }
 }

src/components/Apps/ChatAi/index.vue

@@ -1,6 +1,5 @@
 <template>
   <DrawerPanel
-    v-if="visible"
     ref="drawer"
     :default-show-panel="!!defaultShowPanel"
     :expanded="expanded"
@@ -46,12 +45,9 @@
 import Sidebar from './components/Sidebar/index.vue'
 import Chat from './components/ChitChat/index.vue'
 import { getInputFocus } from './useChat.js'
-import { ws } from '@/utils/request'
+import { ws } from '@/utils/socket'
 import DrawerPanel from '@/components/Apps/DrawerPanel/index.vue'
-import { ObjectLocalStorage } from '@/utils/common'
-import { mapGetters } from 'vuex'
 
-const aiPannelLocalStorage = new ObjectLocalStorage('ai_panel_settings')
 export default {
   components: {
     DrawerPanel,
@@ -76,68 +72,23 @@ export default {
   },
   data() {
     return {
-      visible: false,
       active: 'chat',
       robotUrl: require('@/assets/img/robot-assistant.png'),
       height: '400px',
       expanded: false,
-      clientOffset: {},
+      clientOffset: {}
-      currentTerminalContent: {}
     }
   },
-  computed: {
-    ...mapGetters([
-      'publicSettings'
-    ])
-  },
   watch: {
-    'publicSettings.CHAT_AI_METHOD': {
-      handler(newVal) {
-        this.visible = newVal === 'api'
-      }
-    }
   },
   mounted() {
-    this.handleStartChat()
+    this.handlePostMessage()
   },
   methods: {
-    handleStartChat() {
-      if (this.publicSettings.CHAT_AI_METHOD === 'api') {
-        this.visible = true
-        const expanded = aiPannelLocalStorage.get('expanded')
-        this.updateExpandedState(expanded)
-        this.handlePostMessage()
-      } else if (this.publicSettings.CHAT_AI_METHOD === 'embed') {
-        const embedScriptId = 'chat-ai-embed-id'
-        if (document.getElementById(embedScriptId)) {
-          return
-        }
-        const script = document.createElement('script')
-        script.id = embedScriptId
-        script.src = this.publicSettings.CHAT_AI_EMBED_URL
-        script.async = true
-        script.onload = () => {
-          const loadEvent = new Event('load', { bubbles: false, cancelable: false })
-          window.dispatchEvent(loadEvent)
-        }
-        document.body.appendChild(script)
-      }
-    },
     handlePostMessage() {
       window.addEventListener('message', (event) => {
         if (event.data === 'show-chat-panel') {
           this.$refs.drawer.show = true
-          this.initWebSocket()
-          return
-        }
-        const msg = event.data
-        switch (msg.name) {
-          case 'current_terminal_content':
-            // {content: '...', terminalId: '',sessionId: '',viewId: '',viewName: ''}
-            this.$log.debug('current_terminal_content', msg)
-            this.currentTerminalContent = msg.data
-            this.$refs.component?.onTerminalContext(msg.data)
-            break
         }
       })
     },
@@ -145,11 +96,6 @@ export default {
       this.$refs.drawer.handleHeaderMoveDown(event)
     },
     handleMouseMoveUp(event) {
-      // Prevent the new chat button from triggering the header move up
-      const newButton = event.target.closest('.new')
-      if (newButton) {
-        return
-      }
       this.$refs.drawer.handleHeaderMoveUp(event)
     },
     initWebSocket() {
@@ -161,20 +107,12 @@ export default {
       this.$refs.drawer.show = false
     },
     expandFull() {
-      this.updateExpandedState(true)
+      this.height = '100%'
-      this.save_pannel_settings()
+      this.expanded = true
     },
     compress() {
-      this.updateExpandedState(false)
+      this.height = '400px'
-      this.save_pannel_settings()
+      this.expanded = false
-    },
-    save_pannel_settings() {
-      aiPannelLocalStorage.set('expanded', this.expanded)
-      console.log('AI panel settings saved:', this.expanded)
-    },
-    updateExpandedState(expanded) {
-      this.expanded = expanded
-      this.height = expanded ? '100%' : '400px'
     },
     onNewChat() {
       this.active = 'chat'

src/components/Apps/ChatAi/useChat.js

@@ -1,5 +1,5 @@
 import store from '@/store'
-import { pageScroll } from '@/utils/common/index'
+import { pageScroll } from '@/utils/common'
 
 export const getInputFocus = () => {
   const dom = document.querySelector('.chat-input .el-textarea__inner')
@@ -9,11 +9,11 @@ export const getInputFocus = () => {
 export function useChat() {
   const chatStore = {}
 
-  const setLoading = loading => {
+  const setLoading = (loading) => {
     store.commit('chat/setLoading', loading)
   }
 
-  const onNewChat = name => {
+  const onNewChat = (name) => {
     const data = {
       name: name || `new chat`,
       id: 1,
@@ -27,7 +27,7 @@ export function useChat() {
     store.commit('chat/clearChats')
   }
 
-  const addMessageToActiveChat = chat => {
+  const addMessageToActiveChat = (chat) => {
     store.commit('chat/addMessageToActiveChat', chat)
   }
 
@@ -35,7 +35,7 @@ export function useChat() {
     store.commit('chat/removeLoadingMessageInChat')
   }
 
-  const addChatMessageById = chat => {
+  const addChatMessageById = (chat) => {
     store.commit('chat/addMessageToActiveChat', chat)
     if (chat?.conversation_id) {
       store.commit('chat/setActiveChatConversationId', chat.conversation_id)
@@ -54,7 +54,7 @@ export function useChat() {
     addChatMessageById(temporaryChat)
   }
 
-  const newChatAndAddMessageById = chat => {
+  const newChatAndAddMessageById = (chat) => {
     onNewChat(chat.message.content)
     addChatMessageById(chat)
   }

src/components/Apps/GatewayDialog/index.vue

@@ -34,7 +34,7 @@
 
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { openTaskPage } from '@/utils/jms/index'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'GatewayDialog',

src/components/Apps/GrantedAssets/index.vue

@@ -1,13 +1,12 @@
 <template>
   <AssetTreeTable
-    ref="AssetTreeTable"
     :header-actions="headerActions"
     :table-config="tableConfig"
     :tree-setting="treeSetting"
   />
 </template>
 
-<script>
+<script type="text/jsx">
 import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import { AccountInfoFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
 import { connectivityMeta } from '@/components/Apps/AccountListTable/const'
@@ -48,19 +47,9 @@ export default {
         return this.tableUrl.replace('/assets/', `/assets/${row.id}/accounts/`)
       }
     },
-    name: {
+    nameDisabled: {
-      type: Object,
+      type: Boolean,
-      default: () => ({
+      default: true
-        formatter: DetailFormatter,
-        formatterArgs: {
-          route: 'AssetDetail',
-          can: true
-        }
-      })
-    },
-    comment: {
-      type: Object,
-      default: () => ({})
     }
   },
   data() {
@@ -85,14 +74,17 @@ export default {
         hasTree: true,
         columnsExtra: ['view_account'],
         columnsExclude: ['spec_info'],
-        columns: ['id', 'name', 'address', 'comment', 'labels', 'connectivity', 'platform', 'view_account', 'actions'],
         columnsShow: {
           min: ['name', 'address', 'accounts'],
-          default: ['name', 'address', 'platform', 'view_account', 'actions']
+          default: ['name', 'address', 'platform', 'connectivity', 'view_account', 'actions']
         },
         columnsMeta: {
           name: {
-            ...this.name
+            formatter: DetailFormatter,
+            formatterArgs: {
+              route: 'AssetDetail',
+              can: !this.nameDisabled
+            }
           },
           labels: {
             formatterArgs: {
@@ -107,8 +99,12 @@ export default {
             formatter: AccountInfoFormatter,
             width: '100px'
           },
-          connectivity: connectivityMeta,
+          connectivity: connectivityMeta
-          comment: { ...this.comment }
+        },
+        tableAttrs: {
+          rowClassName({ row }) {
+            return !row.is_active ? 'row_disabled' : ''
+          }
         }
       },
       headerActions: {

src/components/Apps/LeakPasswords/LeakPasswordList.vue

@@ -1,63 +0,0 @@
-<template>
-  <ListTable ref="ListTable" :header-actions="headerActions" :table-config="tableConfig" :create-drawer="createDrawer" />
-</template>
-
-<script>
-import { DrawerListTable as ListTable } from '@/components'
-
-export default {
-  name: 'LeakPasswordList',
-  components: {
-    ListTable
-  },
-  props: {
-    object: {
-      type: Object,
-      required: false,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      createDrawer: () => import('@/components/Apps/LeakPasswords/LeakPasswordsCreateUpdate.vue'),
-      tableConfig: {
-        url: '/api/v1/settings/leak-passwords/',
-        columns: [
-          'password'
-        ],
-        columnsMeta: {
-          actions: {
-            formatterArgs: {
-              hasClone: false,
-              canDelete: this.$hasPerm('settings.change_security'),
-              canUpdate: this.$hasPerm('settings.change_security')
-            }
-          }
-        }
-
-      },
-      headerActions: {
-        hasExport: true,
-        hasImport: true,
-        importOptions: {
-          encryptFields: [''], // 这里不加密 password，''只是为了保证数组有值
-          canImportUpdate: false
-        },
-        hasCreate: true,
-        hasSearch: true,
-        hasRefresh: true,
-        hasBulkDelete: true,
-        hasBulkUpdate: false,
-        hasLeftActions: true,
-        hasRightActions: true,
-        canCreate: this.$hasPerm('settings.change_security'),
-        canBulkDelete: this.$hasPerm('settings.change_security')
-      }
-    }
-  }
-}
-</script>
-
-<style lang='less' scoped>
-
-</style>

src/components/Apps/LeakPasswords/LeakPasswordsCreateUpdate.vue

@@ -1,41 +0,0 @@
-<template>
-  <div v-loading="loading">
-    <GenericCreateUpdatePage
-      v-if="!loading"
-      class="user-create-update"
-      v-bind="$data"
-      :title="null"
-      v-on="$listeners"
-    />
-  </div>
-</template>
-
-<script>
-import { GenericCreateUpdatePage } from '@/layout/components'
-
-export default {
-  name: 'LeakPasswordsCreateUpdate',
-  components: {
-    GenericCreateUpdatePage
-  },
-  data() {
-    return {
-      loading: true,
-      fields: [
-        [this.$t('Basic'), ['password']]
-      ],
-      encryptedFields: [],
-      url: '/api/v1/settings/leak-passwords/'
-
-    }
-  },
-  async mounted() {
-    this.loading = false
-  },
-  methods: {}
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/components/Apps/LeakPasswords/index.vue

@@ -1,76 +0,0 @@
-<template>
-  <div>
-    <div>
-      <el-button
-        size="mini"
-        type="primary"
-        @click="onOpenDialog"
-      >
-        {{ $tc('View') }}
-      </el-button>
-    </div>
-    <Dialog
-      :destroy-on-close="true"
-      :show-cancel="false"
-      :show-confirm="false"
-      :title="title"
-      :visible.sync="visible"
-      v-bind="$attrs"
-      width="40%"
-      v-on="$listeners"
-    >
-      <LeakPasswordList />
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import { Dialog } from '@/components'
-import LeakPasswordList from '@/components/Apps/LeakPasswords/LeakPasswordList.vue'
-
-export default {
-  componentName: 'LeakPasswords',
-  components: {
-    LeakPasswordList,
-    Dialog
-  },
-  props: {
-    value: {
-      type: Object,
-      default: () => ({})
-    },
-    title: {
-      type: String,
-      default: function() {
-        return this.$t('LeakPasswordList')
-      }
-    },
-    url: {
-      type: String,
-      default: `/api/v1/settings/leak-passwords/`
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      form: this.value,
-      config: {
-        url: this.url,
-        hasSaveContinue: false,
-        hasButtons: true,
-        fields: [],
-        fieldsMeta: {}
-      }
-    }
-  },
-
-  methods: {
-    onOpenDialog() {
-      this.visible = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>

src/components/Apps/ManyJsonTabs/AssetJsonTab.vue

@@ -1,31 +1,28 @@
 <template>
-  <TwoCol>
+  <el-row :gutter="24">
-    <ListTable v-bind="config" />
+    <el-col :md="20" :sm="22">
-  </TwoCol>
+      <ListTable v-bind="config" />
+    </el-col>
+  </el-row>
 </template>
 
 <script>
-import { DrawerListTable as ListTable } from '@/components'
+import ListTable from '@/components/Table/ListTable/index.vue'
-import { toM2MJsonParams } from '@/utils/jms/index'
+import { toM2MJsonParams } from '@/utils/jms'
-import { DetailFormatter } from '@/components/Table/TableFormatters'
-import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
   name: 'AssetJsonTab',
   components: {
-    TwoCol,
     ListTable
   },
   props: {
     object: {
       type: Object,
-      default: () => {
+      default: () => {}
-      }
     }
   },
   data() {
     const [key, value] = toM2MJsonParams(this.object.assets)
-    const org_id = this.object.org_id || this.$store.getters.currentOrg.id
     return {
       config: {
         headerActions: {
@@ -34,19 +31,22 @@ export default {
           hasExport: false
         },
         tableConfig: {
-          url: `/api/v1/assets/assets/?${key}=${value}&oid=${org_id}`,
+          url: `/api/v1/assets/assets/?${key}=${value}`,
-          columns: ['name', 'address', 'platform', 'type', 'is_active'],
+          columns: ['name', 'address', 'platform',
-          columnsShow: {
+            'type', 'is_active'
-            min: ['name', 'address'],
+          ],
-            default: ['name', 'address', 'platform']
-          },
           columnsMeta: {
             name: {
               label: this.$t('Asset'),
-              formatter: DetailFormatter,
+              formatter: (row) => {
-              formatterArgs: {
+                const to = {
-                getRoute: ({ row }) => {
+                  name: 'AssetDetail',
-                  return { name: 'AssetDetail', params: { id: row.id } }
+                  params: { id: row.id }
+                }
+                if (this.$hasPerm('assets.view_asset')) {
+                  return <router-link to={to} class='text-link'>{row.name}</router-link>
+                } else {
+                  return <span>{row.name}</span>
                 }
               }
             },
@@ -65,3 +65,7 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+
+</style>

src/components/Apps/ManyJsonTabs/UserJsonTab.vue

@@ -1,19 +1,18 @@
 <template>
-  <TwoCol>
+  <el-row :gutter="24">
-    <ListTable v-bind="config" />
+    <el-col :md="20" :sm="22">
-  </TwoCol>
+      <ListTable v-bind="config" />
+    </el-col>
+  </el-row>
 </template>
 
 <script>
-import { DrawerListTable as ListTable } from '@/components'
+import ListTable from '@/components/Table/ListTable/index.vue'
-import { toM2MJsonParams } from '@/utils/jms/index'
+import { toM2MJsonParams } from '@/utils/jms'
-import TwoCol from '@/layout/components/Page/TwoColPage.vue'
-import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'User',
   components: {
-    TwoCol,
     ListTable
   },
   props: {
@@ -25,7 +24,6 @@ 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: {
@@ -34,25 +32,24 @@ export default {
           hasExport: false
         },
         tableConfig: {
-          url: `/api/v1/users/users/?${key}=${value}&oid=${org_id}`,
+          url: `/api/v1/users/users/?${key}=${value}`,
           columns: [
-            'name', 'username', 'email', 'groups', 'system_roles',
+            'name', 'username', 'groups', 'system_roles',
             'org_roles', 'source', 'is_valid'
           ],
-          columnsShow: {
-            min: ['name', 'username'],
-            default: ['name', 'username', 'email']
-          },
           columnsMeta: {
             name: {
               label: this.$t('Name'),
-              formatter: DetailFormatter,
+              width: 85,
-              formatterArgs: {
+              formatter: (row) => {
-                getRoute: ({ row }) => {
+                const to = {
-                  return {
+                  name: 'UserDetail',
-                    name: 'UserDetail',
+                  params: { id: row.id }
-                    params: { id: row.id }
+                }
-                  }
+                if (this.$hasPerm('users.view_user')) {
+                  return <router-link to={to} class='text-link'>{row.name}</router-link>
+                } else {
+                  return <span>{row.name}</span>
                 }
               }
             },
@@ -90,3 +87,7 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+
+</style>

src/components/Apps/ResourceActivity/index.vue

@@ -1,43 +1,43 @@
 <template>
   <div>
-    <TwoCol>
+    <el-row :gutter="20">
-      <IBox :title="title" class="block" v-bind="$attrs">
+      <el-col :md="16" :sm="24">
-        <el-timeline>
+        <IBox :title="title" class="block" v-bind="$attrs">
-          <el-timeline-item
+          <el-timeline>
-            v-for="(activity, index) in activities"
+            <el-timeline-item
-            :key="index"
+              v-for="(activity, index) in activities"
-            :size="activity.size"
+              :key="index"
-            :timestamp="activity.timestamp"
+              :size="activity.size"
-            :type="activity.type"
+              :timestamp="activity.timestamp"
-            placement="bottom"
+              :type="activity.type"
-          >
+              placement="bottom"
-            {{ activity.content }}
-            <el-link
-              v-if="activity['detail_url']"
-              type="primary"
-              @click.native="onClick(activity)"
             >
-              {{ $tc('Detail') }}
+              {{ activity.content }}
-            </el-link>
+              <el-link
-          </el-timeline-item>
+                v-if="activity['detail_url']"
-        </el-timeline>
+                type="primary"
-      </IBox>
+                @click.native="onClick(activity)"
-    </TwoCol>
+              >
+                {{ $tc('Detail') }}
+              </el-link>
+            </el-timeline-item>
+          </el-timeline>
+        </IBox>
+      </el-col>
+    </el-row>
     <DiffDetail ref="DetailDialog" :title="$tc('OperateLog')" />
   </div>
 </template>
 
 <script>
-import IBox from '@/components/Common/IBox/index.vue'
+import IBox from '@/components/IBox/index.vue'
 import DiffDetail from '@/components/Dialog/DiffDetail.vue'
-import { openTaskPage } from '@/utils/jms/index'
+import { openTaskPage } from '@/utils/jms'
-import { toSafeLocalDateStr } from '@/utils/common/time'
+import { toSafeLocalDateStr } from '@/utils/time'
-import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
   name: 'ResourceActivity',
   components: {
-    TwoCol,
     IBox,
     DiffDetail
   },

src/components/Apps/UserConfirmDialog/index.vue

@@ -13,12 +13,17 @@
     v-on="$listeners"
   >
     <div v-if="confirmTypeRequired === 'relogin'">
-      <el-row :gutter="24" style="margin: 0 auto">
+      <el-row :gutter="24" style="margin: 0 auto;">
         <el-col :md="24" :sm="24">
-          <el-alert :title="$tc('ReLoginTitle')" center style="margin-bottom: 20px" type="error" />
+          <el-alert
+            :title="$tc('ReLoginTitle')"
+            center
+            style="margin-bottom: 20px;"
+            type="error"
+          />
         </el-col>
       </el-row>
-      <el-row :gutter="24" style="margin: 0 auto">
+      <el-row :gutter="24" style="margin: 0 auto;">
         <el-col :md="24" :sm="24">
           <el-button class="confirm-btn" size="mini" type="primary" @click="logout">
             {{ this.$t('ReLogin') }}
@@ -27,11 +32,11 @@
       </el-row>
     </div>
     <div v-else>
-      <el-row :gutter="24" style="margin: 0 auto">
+      <el-row :gutter="24" style="margin: 0 auto;">
         <el-col :md="24" :sm="24" :span="24" class="add">
           <el-select
             v-model="subTypeSelected"
-            style="width: 100%; margin-bottom: 20px"
+            style="width: 100%; margin-bottom: 20px;"
             @change="handleSubTypeChange"
           >
             <el-option
@@ -44,73 +49,32 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-row v-if="!noCodeMFA.includes(subTypeSelected)" :gutter="24" style="margin: 0 auto">
+      <el-row :gutter="24" style="margin: 0 auto;">
-        <el-col :md="24" :sm="24" style="display: flex; align-items: center">
+        <el-col :md="24" :sm="24" style="display: flex; align-items: center; margin-bottom: 20px;">
           <el-input
             v-model="secretValue"
             :placeholder="inputPlaceholder"
             :show-password="showPassword"
             @keyup.enter.native="handleConfirm"
           />
-          <span
+          <span v-if="subTypeSelected === 'sms'" style="margin: -1px 0 0 20px;">
-            v-if="subTypeSelected === 'sms' || subTypeSelected === 'email'"
-            style="margin: -1px 0 0 20px"
-          >
             <el-button
               :disabled="smsBtnDisabled"
               size="mini"
-              style="line-height: 14px; float: right"
+              style="line-height: 14px; float: right;"
               type="primary"
-              @click="sendCode"
+              @click="sendSMSCode"
             >
               {{ smsBtnText }}
             </el-button>
           </span>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="24" style="margin: 10px auto;">
-        <el-col>
-          <iframe v-if="passkeyVisible" :src="passkeyUrl" style="display: none" />
-          <iframe
-            v-if="isFaceCaptureVisible && subTypeSelected === 'face' && faceCaptureUrl"
-            :src="faceCaptureUrl"
-            allow="camera"
-            sandbox="allow-scripts allow-same-origin"
-            style="width: 100%; height: 600px; border: none"
-          />
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin: 20px auto 10px">
         <el-col :md="24" :sm="24">
-          <el-button
+          <el-button class="confirm-btn" size="mini" type="primary" @click="handleConfirm">
-            v-if="!noCodeMFA.includes(subTypeSelected)"
-            class="confirm-btn"
-            size="mini"
-            type="primary"
-            @click="handleConfirm"
-          >
             {{ this.$t('Confirm') }}
           </el-button>
-          <el-button
-            v-if="subTypeSelected === 'face'"
-            v-show="!isFaceCaptureVisible"
-            class="confirm-btn"
-            size="mini"
-            type="primary"
-            @click="handleFaceCapture"
-          >
-            {{ this.$tc('VerifyFace') }}
-          </el-button>
-          <el-button
-            v-if="subTypeSelected === 'passkey'"
-            v-loading="passkeyVisible"
-            class="confirm-btn"
-            size="mini"
-            type="primary"
-            @click="handlePasskeyVerify"
-          >
-            {{ this.$tc('Next') }}
-          </el-button>
         </el-col>
       </el-row>
     </div>
@@ -118,7 +82,7 @@
 </template>
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { encryptPassword } from '@/utils/secure'
+import { encryptPassword } from '@/utils/crypto'
 
 export default {
   name: 'UserConfirmDialog',
@@ -149,14 +113,7 @@ export default {
       visible: false,
       callback: null,
       cancel: null,
-      processing: false,
+      processing: false
-      isFaceCaptureVisible: false,
-      faceToken: null,
-      faceCaptureUrl: null,
-      noCodeMFA: ['face', 'passkey'],
-      sendCodeMFA: ['email', 'sms', 'otp'],
-      passkeyVisible: false,
-      passkeyUrl: '/api/v1/authentication/passkeys/login/?mfa=1'
     }
   },
   computed: {
@@ -172,10 +129,6 @@ export default {
   },
   methods: {
     handleSubTypeChange(val) {
-      if (val !== 'face') {
-        this.isFaceCaptureVisible = false
-      }
-
       this.inputPlaceholder = this.subTypeChoices.filter(item => item.name === val)[0]?.placeholder
       this.smsWidth = val === 'sms' ? 6 : 0
     },
@@ -189,117 +142,54 @@ export default {
       this.$log.debug('perform confirm action')
       const confirmType = response.data?.code
       const confirmUrl = '/api/v1/authentication/confirm/'
-      this.$axios
+      this.$axios.get(confirmUrl, { params: { confirm_type: confirmType }}).then((data) => {
-        .get(confirmUrl, { params: { confirm_type: confirmType } })
+        this.confirmTypeRequired = data.confirm_type
-        .then(data => {
-          this.confirmTypeRequired = data.confirm_type
 
-          if (this.confirmTypeRequired === 'relogin') {
+        if (this.confirmTypeRequired === 'relogin') {
-            this.$axios
+          this.$axios.post(confirmUrl, { 'confirm_type': 'relogin', 'secret_key': 'x' }).then(() => {
-              .post(confirmUrl, { confirm_type: 'relogin', secret_key: 'x' })
+            this.callback()
-              .then(() => {
+            this.visible = false
-                this.callback()
+          }).catch(() => {
-                this.visible = false
+            this.title = this.$t('NeedReLogin')
-              })
+            this.visible = true
-              .catch(() => {
+          })
-                this.title = this.$t('NeedReLogin')
+          return
-                this.visible = true
+        }
-              })
+        this.subTypeChoices = data.content
-            return
+        const defaultSubType = this.subTypeChoices.filter(item => !item.disabled)[0]
-          }
+        this.subTypeSelected = defaultSubType.name
-          this.subTypeChoices = data.content
+        this.inputPlaceholder = defaultSubType.placeholder
-          const defaultSubType = this.subTypeChoices.filter(item => !item.disabled)[0]
+        this.visible = true
-          this.subTypeSelected = defaultSubType.name
+      }).catch((err) => {
-          this.inputPlaceholder = defaultSubType.placeholder
+        const data = err.response?.data
-          this.visible = true
+        const msg = data?.error || data?.detail || data?.msg || this.$t('GetConfirmTypeFailed')
-        })
+        this.$message.error(msg)
-        .catch(err => {
+        this.cancel(err)
-          const data = err.response?.data
+      }).finally(() => {
-          const msg = data?.error || data?.detail || data?.msg || this.$t('GetConfirmTypeFailed')
+        this.processing = false
-          this.$message.error(msg)
+      })
-          this.cancel(err)
-        })
-        .finally(() => {
-          this.processing = false
-        })
     }, 500),
     logout() {
       window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     },
-    sendCode() {
+    sendSMSCode() {
-      this.$axios
+      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: 'sms' }).then(res => {
-        .post(`/api/v1/authentication/mfa/select/`, { type: this.subTypeSelected })
+        this.$message.success(this.$tc('VerificationCodeSent'))
-        .then(res => {
+        let time = 60
-          this.$message.success(this.$tc('VerificationCodeSent'))
+        this.smsBtnDisabled = true
-          let time = 60
-          this.smsBtnDisabled = true
 
-          const interval = setInterval(() => {
+        const interval = setInterval(() => {
-            time -= 1
+          time -= 1
-            this.smsBtnText = `${this.$t('Pending')}: ${time}`
+          this.smsBtnText = `${this.$t('Pending')}: ${time}`
 
-            if (time <= 0) {
+          if (time <= 0) {
-              clearInterval(interval)
+            clearInterval(interval)
-              this.smsBtnText = this.$t('SendVerificationCode')
+            this.smsBtnText = this.$t('SendVerificationCode')
-              this.smsBtnDisabled = false
+            this.smsBtnDisabled = false
-            }
+          }
-          }, 1000)
+        }, 1000)
-        })
+      }).catch(() => {
-        .catch(() => {
+        this.$message.error(this.$tc('FailedToSendVerificationCode'))
-          this.$message.error(this.$tc('FailedToSendVerificationCode'))
-        })
-    },
-    handlePasskeyVerify() {
-      this.passkeyVisible = true
-      this.checkPasskeyStatus()
-    },
-    checkPasskeyStatus() {
-      const url = '/api/v1/authentication/confirm/check/?confirm_type=mfa'
-      const t = setInterval(() => {
-        this.$axios.get(url).then(data => {
-          this.passkeyVisible = false
-          this.onSuccess()
-        })
-      }, 2000)
-      setTimeout(() => {
-        clearInterval(t)
-        if (this.passkeyVisible) {
-          this.passkeyVisible = false
-          this.$message.error(this.$tc('PasskeyTimeout'))
-        }
-      }, 20000)
-    },
-    startFaceCapture() {
-      const url = '/api/v1/authentication/face/context/'
-      this.$axios
-        .post(url)
-        .then(data => {
-          const token = data['token']
-          this.faceCaptureUrl = '/facelive/capture?token=' + token
-          this.isFaceCaptureVisible = true
-
-          const timer = setInterval(() => {
-            this.$axios.get(url + `?token=${token}`).then(data => {
-              if (data['is_finished']) {
-                clearInterval(timer)
-                this.isFaceCaptureVisible = false
-                this.handleConfirm()
-              }
-            })
-          }, 1000)
-        })
-        .catch(() => {
-          this.$message.error(this.$tc('FailedToStartFaceCapture'))
-        })
-    },
-    handleFaceCapture() {
-      this.startFaceCapture()
-    },
-    onSuccess() {
-      this.secretValue = ''
-      this.visible = false
-      this.$nextTick(() => {
-        this.callback()
       })
     },
     handleConfirm() {
@@ -313,43 +203,39 @@ export default {
       const data = {
         confirm_type: this.confirmTypeRequired,
         mfa_type: this.confirmTypeRequired === 'mfa' ? this.subTypeSelected : '',
-        secret_key:
+        secret_key: this.confirmTypeRequired === 'password' ? encryptPassword(this.secretValue) : this.secretValue
-          this.confirmTypeRequired === 'password'
-            ? encryptPassword(this.secretValue)
-            : this.secretValue
       }
 
-      this.$axios
+      this.$axios.post(`/api/v1/authentication/confirm/`, data).then(() => {
-        .post(`/api/v1/authentication/confirm/`, data)
+        this.secretValue = ''
-        .then(() => {
+        this.visible = false
-          this.onSuccess()
+        this.$nextTick(() => {
-        })
+          this.callback()
-        .catch(err => {
-          this.$message.error(err.message || this.$tc('ConfirmFailed'))
-          this.faceCaptureUrl = null
-          this.isFaceCaptureVisible = false
         })
+      }).catch((err) => {
+        this.$message.error(err.message || this.$tc('ConfirmFailed'))
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.dialog-content ::v-deep .el-dialog__footer {
+  .dialog-content ::v-deep .el-dialog__footer {
-  padding: 0;
+    padding: 0;
-}
-
-.dialog-content ::v-deep .el-dialog {
-  padding: 8px;
-
-  .el-dialog__body {
-    padding-top: 30px;
-    padding-bottom: 30px;
   }
-}
 
-.confirm-btn {
+  .dialog-content ::v-deep .el-dialog {
-  width: 100%;
+    padding: 8px;
-  line-height: 20px;
+
-}
+    .el-dialog__body {
+      padding-top: 30px;
+      padding-bottom: 30px;
+    }
+  }
+
+  .confirm-btn {
+    width: 100%;
+    line-height: 20px;
+  }
 </style>

src/components/Apps/VariableCreateUpdateForm/index.vue

@@ -1,136 +0,0 @@
-<template>
-  <AutoDataForm
-    ref="AutoDataForm"
-    class="variable-add"
-    :submit-btn-text="submitBtnText"
-    v-bind="$data"
-    @submit="confirm"
-  />
-</template>
-
-<script>
-import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
-
-export default {
-  name: 'VariableCreateForm',
-  components: {
-    AutoDataForm
-  },
-  props: {
-    variable: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    const defaultValidator = (rule, value, callback) => {
-      if (this.defaultValueRequired && !value) {
-        callback(new Error(this.$t('FieldRequiredError')))
-      } else {
-        callback()
-      }
-    }
-    return {
-      defaultValueRequired: false,
-      submitBtnText: this.$t('Confirm'),
-      url: '/api/v1/ops/variables/',
-      form: Object.assign({ 'on_invalid': 'error' }, this.variable || {}),
-      fields: [
-        ['', ['name', 'var_name', 'type', 'text_default_value', 'select_default_value', 'extra_args', 'tips', 'required']]
-      ],
-      fieldsMeta: {
-        var_name: {
-          helpTextAsTip: false
-        },
-        text_default_value: {
-          label: this.$t('DefaultValue'),
-          hidden: (formValue) => {
-            return formValue.type !== 'text'
-          },
-          rules: [{ validator: defaultValidator }],
-          helpTip: this.$t('DefaultValueTip'),
-          el: {
-            type: 'input'
-          }
-        },
-        select_default_value: {
-          label: this.$t('DefaultValue'),
-          helpTip: this.$t('DefaultValueTip'),
-          hidden: (formValue) => {
-            return formValue.type !== 'select'
-          },
-          rules: [{ validator: defaultValidator }],
-          el: { type: 'input' }
-        },
-        extra_args: {
-          hidden: (formValue) => {
-            return formValue.type !== 'select'
-          },
-          el: { type: 'textarea', rows: 4, placeholder: this.$t('ExtraArgsPlaceholder') },
-          rules: [
-            {
-              validator: (rule, value, callback) => {
-                try {
-                  const lines = value.split('\n')
-                  const regex = /^[^:]+:[^:]+$/
-                  for (const line of lines) {
-                    if (!regex.test(line.trim())) {
-                      callback(new Error(this.$t('ExtraArgsFormatError')))
-                    }
-                  }
-                } catch (e) {
-                  callback(new Error(this.$t('ExtraArgsFormatError')))
-                }
-                callback()
-              }
-            }
-          ]
-        },
-        required: {
-          on: {
-            change: ([event], updateForm) => {
-              this.defaultValueRequired = event
-            }
-          }
-        }
-      },
-      hasSaveContinue: false,
-      method: 'get'
-    }
-  },
-  mounted() {
-    this.defaultValueRequired = this.variable?.required || false
-  },
-  methods: {
-    confirm(form) {
-      if (this.variable?.name) {
-        this.$emit('edit', form)
-      } else {
-        this.$emit('add', form)
-      }
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.variable-add {
-  ::v-deep .el-form-item {
-    margin-bottom: 5px;
-
-    .help-block {
-      margin-bottom: 5px;
-    }
-  }
-
-  ::v-deep .form-group-header {
-    .hr-line-dashed {
-      margin: 5px 0;
-    }
-
-    h3 {
-      margin-bottom: 10px;
-    }
-  }
-}
-</style>

src/components/Apps/VariableSetForm/index.vue

@@ -1,74 +0,0 @@
-<template>
-  <AutoDataForm
-    ref="AutoDataForm"
-    class="variable-set"
-    :submit-btn-text="submitBtnText"
-    v-bind="$data"
-    :fields="fields"
-    @submit="confirm"
-  />
-</template>
-
-<script>
-import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
-
-export default {
-  name: 'VariableSetForm',
-  components: {
-    AutoDataForm
-  },
-  props: {
-    formData: {
-      type: Array,
-      default: () => ([])
-    },
-    queryParam: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      submitBtnText: this.$t('Confirm'),
-      // 防止缓存form remoteMeta
-      url: `/api/v1/ops/variables/form-data/?t=${new Date().getTime()}&` + this.queryParam,
-      form: {},
-      hasSaveContinue: false,
-      method: 'get',
-      hasReset: false
-    }
-  },
-  computed: {
-    fields() {
-      return [['', this.formData.map(item => item.var_name)]]
-    }
-  },
-  methods: {
-    confirm(form) {
-      this.$emit('confirm', form)
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.variable-set {
-  ::v-deep .el-form-item {
-    margin-bottom: 5px;
-
-    .help-block {
-      margin-bottom: 5px;
-    }
-  }
-
-  ::v-deep .form-group-header {
-    .hr-line-dashed {
-      margin: 5px 0;
-    }
-
-    h3 {
-      margin-bottom: 10px;
-    }
-  }
-}
-</style>

src/components/Apps/VariablesHelpTextDialog/index.vue

@@ -1,100 +0,0 @@
-<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 lang="scss" scoped>
-::v-deep .help-dialog.dialog .el-dialog__footer {
-  border-top: none;
-  padding: 8px;
-}
-
-.help-table {
-  width: 100%;
-  border-collapse: collapse;
-  border: 1px solid #dee2e6;
-}
-
-::v-deep .help-table th,
-::v-deep .help-table td {
-  height: 40px;
-  padding: 0 8px;
-  text-align: left;
-}
-
-::v-deep .help-table .item-td,
-::v-deep .help-table .item-label {
-  cursor: pointer;
-  color: var(--color-primary);
-}
-</style>

src/components/Cards/DetailCard/ItemValue.vue

@@ -1,5 +1,5 @@
 <script type="text/jsx">
-import { toSafeLocalDateStr } from '@/utils/common/time'
+import { toSafeLocalDateStr } from '@/utils/time'
 
 export default {
   name: 'ItemValue',
@@ -78,7 +78,7 @@ export default {
         formatterData = data
       }
       return (
-        <span style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', lineHeight: '1.2' }}>{formatterData}</span>
+        <span>{formatterData}</span>
       )
     }
     if (this.value instanceof Array) {
@@ -92,7 +92,7 @@ export default {
       )
     }
     return (
-      <span style='white-space: pre-wrap;' title={this.displayValue}>{this.displayValue}</span>
+      <span title={this.displayValue}>{this.displayValue}</span>
     )
   }
 }

src/components/Cards/DetailCard/auto.vue

@@ -1,20 +1,15 @@
 <template>
   <IBox v-if="loading" style="width: 100%; height: 200px" />
   <div v-else>
-    <DetailCard
+    <DetailCard v-if="hasObject && items.length > 0" :items="validItems" :loading="loading" v-bind="$attrs" />
-      v-if="hasObject && items.length > 0"
-      :items="validItems"
-      :loading="loading"
-      v-bind="$attrs"
-    />
   </div>
 </template>
 
 <script>
 import DetailCard from './index.vue'
-import { copy } from '@/utils/common/index'
+import { copy } from '@/utils/common'
-import { toSafeLocalDateStr } from '@/utils/common/time'
+import { toSafeLocalDateStr } from '@/utils/time'
-import IBox from '@/components/Common/IBox/index.vue'
+import IBox from '@/components/IBox/index.vue'
 import LabelsDetailFormatter from '../Formatters/LabelsDetailFormatter.vue'
 
 export default {
@@ -37,7 +32,7 @@ export default {
       type: Array,
       default: null
     },
-    showUndefined: {
+    showUndefine: {
       type: Boolean,
       default: true
     },
@@ -129,18 +124,8 @@ export default {
     parseArrayValue(value, excludes, label) {
       if (Array.isArray(value)) {
         const tp = typeof value[0]
-        let object = {}
-
-        if (value.length === 0) {
-          object = {
-            key: label,
-            value: '-'
-          }
-          return this.items.push(object)
-        }
-
-        // 如果是空数组，那么循环体将不会执行
         for (const [index, item] of value.entries()) {
+          let object = {}
           if (tp === 'object') {
             const firstValue = value[0]
             if (firstValue.hasOwnProperty('name')) {
@@ -183,7 +168,7 @@ export default {
       const data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
       let remoteMeta = data.actions['GET'] || {}
       if (this.nested) {
-        remoteMeta = remoteMeta[this.nested]?.children || remoteMeta || {}
+        remoteMeta = remoteMeta[this.nested]?.children || {}
       }
       let fields = this.fields
       fields = fields || Object.keys(remoteMeta)
@@ -235,7 +220,7 @@ export default {
         value = this.parseValue(value, fieldMeta.type)
 
         if (value === undefined) {
-          if (this.showUndefined) {
+          if (this.showUndefine) {
             value = '-'
           } else {
             continue

src/components/Cards/DetailCard/index.vue

@@ -1,25 +1,24 @@
 <template>
   <IBox :fa="fa" :title="title">
-    <el-form :label-width="labelWidth" class="content detail-card" label-position="left">
+    <el-form :label-width="labelWidth" class="content" label-position="left">
-      <template v-for="item in items">
+      <span v-for="item in items" :key="item.key">
-        <div v-if="item.has !== false" :key="item.key" :class="item.class " :label="item.key" class="el-form-item">
+        <el-form-item v-if="item.has !== false" :class="item.class" :label="item.key">
-          <span slot="label" class="el-form-item__label"> {{ formateLabel(item.key) }}</span>
+          <span slot="label"> {{ formateLabel(item.key) }}</span>
-          <span class="item-value el-form-item__content">
+          <span
-            <component
+            :is="item.component"
-              :is="item.component"
+            v-if="item.component"
-              v-if="item.component"
+            v-bind="{...item}"
-              v-bind="{...item}"
+          />
-            />
+          <ItemValue v-else :value="item.value" class="item-value" v-bind="item" />
-            <ItemValue v-else :value="item.value" v-bind="item" />
+        </el-form-item>
-          </span>
+      </span>
-        </div>
-      </template>
     </el-form>
+    <slot />
   </IBox>
 </template>
 
 <script>
-import IBox from '@/components/Common/IBox/index.vue'
+import IBox from '../../IBox/index.vue'
 import ItemValue from './ItemValue.vue'
 
 export default {
@@ -46,7 +45,7 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: '120px'
+      default: '25%'
     }
   },
   data() {
@@ -72,76 +71,55 @@ export default {
   padding: 20px 40px;
 }
 
-.content {
+.el-form-item {
-  font-size: 13px;
+  border-bottom: 1px dashed #EBEEF5;
-  line-height: 2;
+  padding: 1px 0;
+  margin-bottom: 0;
 
-  ::v-deep .el-form-item {
+  &:last-child {
-    border-bottom: 1px dashed #F4F4F4;
+    border-bottom: none;
-    padding: 1px 0;
+  }
-    margin-bottom: 0;
-    display: flex;
-    align-items: center;
-    //text-align: end;
-    line-height: 32px;
-    min-height: 32px;
 
-    &:last-child {
+  &.array-item {
-      //border-bottom: none;
+    border-bottom: none;
+
+    ::v-deep .el-form-item__content {
+      border-bottom: 1px dashed #EBEEF5
     }
 
-    &.array-item {
+    ::v-deep .el-form-item__label:last-child {
-      border-bottom: none;
+      border: 1px dashed #EBEEF5;
-
-      ::v-deep .el-form-item__content {
-        border-bottom: 1px dashed #EBEEF5
-      }
-
-      ::v-deep .el-form-item__label:last-child {
-        border: 1px dashed #EBEEF5;
-      }
-    }
-
-    .el-form-item__label {
-      //padding-right: 8%;
-      overflow: hidden;
-      color: var(--color-icon-primary);
-      font-size: 12px;
-      line-height: 1.5;
-      font-weight: 400;
-      width: 33%;
-      min-width: 120px;
-      padding: 5px 0;
-
-      span {
-        display: inline-block;
-        //line-height: 1.1;
-      }
-    }
-
-    .el-form-item__content {
-      color: var(--color-text-primary);
-      font-size: 13px;
-      line-height: 1.5;
-      width: calc(100% - 120px);
-      padding: 5px 0;
-    }
-
-    ::v-deep .el-tag--mini {
-      margin-right: 3px;
     }
   }
 
-  .item-value {
+  ::v-deep .el-form-item__label {
-    ::v-deep span {
+    padding-right: 8%;
-      //display: -webkit-box;
+    overflow: hidden;
-      overflow: hidden;
+    color: var(--color-icon-primary);
-      text-overflow: ellipsis;
+
-      word-break: break-word;
+    span {
-      -webkit-line-clamp: 2;
+      display: inline-block;
-      -webkit-box-orient: vertical;
+      line-height: 1.5;
-      vertical-align: middle;
     }
   }
+
+  ::v-deep .el-form-item__content {
+    color: var(--color-text-primary);
+    font-size: 13px;
+    line-height: 40px;
+  }
+
+  ::v-deep .el-tag--mini {
+    margin-right: 3px;
+  }
+}
+
+.item-value span {
+  word-break: break-word;
+}
+
+.content {
+  font-size: 13px;
+  line-height: 2.5;
 }
 </style>

src/components/Cards/RelationCard/index.vue

@@ -49,7 +49,7 @@
 <script>
 import { createSourceIdCache } from '@/api/common'
 import { Select2 } from '@/components/Form/FormFields'
-import IBox from '@/components/Common/IBox/index.vue'
+import IBox from '@/components/IBox/index.vue'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -340,13 +340,13 @@ b, strong {
 }
 
 tr td {
-  line-height: 1.4;
+  line-height: 1.42857;
-  padding: 8px 0;
+  padding: 8px;
   vertical-align: top;
 }
 
 tr.item td {
-  border-top: 1px dashed #EBEEF5;
+  border-top: 1px solid #e7eaec;
 }
 
 .box-margin {

src/components/Cards/SummaryCard/index.vue

@@ -1,23 +1,18 @@
 <template>
-  <div>
+  <el-card shadow="never">
-    <div class="summary-header">
+    <div slot="header" class="summary-header">
-      <el-tooltip :content="title" :open-delay="500" placement="top">
+      <span class="header-title">{{ title }}</span>
-        <span class="title">{{ title }}</span>
-      </el-tooltip>
     </div>
     <slot>
-      <h3 class="no-margins ">
+      <h1 class="no-margins">
-        <span
+        <span v-if="body.disabled" class="disabled-link">{{ body.count }}</span>
-          :class="{ 'can-direct': canDirect }"
+        <router-link v-else :to="body.route">
-          class="num"
+          <span>{{ body.count }}</span>
-          @click="handleClick"
+        </router-link>
-        >
+      </h1>
-          <span v-if="count === null"> - </span>
+      <small>{{ body.comment }}</small>
-          <span v-else>{{ count }}</span>
-        </span>
-      </h3>
     </slot>
-  </div>
+  </el-card>
 </template>
 
 <script>
@@ -28,78 +23,56 @@ export default {
       type: String,
       default: ''
     },
-    count: {
+    rightSideLabel: {
-      type: [Number, String, Promise],
+      type: Object,
-      default: null
+      default: () => ({})
     },
-    route: {
+    body: {
-      type: [String, Object],
+      type: Object,
-      default: ''
+      default: () => ({})
-    },
-    canDirect: {
-      type: Boolean,
-      default: false
-    },
-    callback: {
-      type: Function,
-      default: () => {
-      }
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {}
-  },
-  methods: {
-    handleClick() {
-      if (this.disabled) {
-        return
-      }
-      if (this.route) {
-        this.$router.push(this.route)
-        return
-      }
-      this.callback.bind(this)()
-      this.$emit('click')
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.summary-header {
+  .pull-right {
-  //color: var(--color-icon-primary);
+    float: right !important;
-  overflow: hidden;
+  }
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer;
 
-  .title {
+  .header-title {
-    font-style: normal;
+    font-size: 14px;
+    margin: 0 0 7px;
     font-weight: 600;
-    font-size: 12px;
-    text-transform: uppercase;
-    line-height: 1.2;
   }
-}
 
-.no-margins {
+  .right-side ::v-deep .el-tag {
-  margin: 0 !important;
+    font-weight: 600;
-
+    padding: 3px 8px;
-  .num {
+    text-shadow: none;
-    font-style: normal;
+    line-height: 1;
-    font-weight: 500;
+  }
-    font-size: 24px;
+
-    line-height: 40px;
+  h1 {
-    color: var(--color-text-primary);
+    font-size: 30px;
-    cursor: pointer;
+    font-weight: 100;
-
+  }
-    &.can-direct:hover {
+
-      color: var(--color-primary);
+  .el-card__body {
-    }
+    background-color: #ffffff;
+    color: inherit;
+    padding: 15px 20px 20px 20px !important;
+    border-color: #e7eaec;
+    border-image: none;
+    border-style: solid solid none;
+    border-width: 1px 0;
+  }
+
+  .no-margins {
+    margin: 0 !important;
+  }
+
+  .disabled-link {
+    color: #428bca;
   }
-}
 </style>

src/components/Dashboard/Echart.vue

@@ -1,71 +0,0 @@
-<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>

src/components/DataActions/index.vue

@@ -5,62 +5,41 @@
         v-if="action.dropdown"
         v-show="action.dropdown.length > 0"
         :key="action.name"
-        :class="[action.name, { grouped: action.grouped, 'table-action-text': isTableActionText }]"
-        :size="action.size"
-        :split-button="!!action.split"
-        :type="action.type"
         class="action-item"
         placement="bottom-start"
         trigger="click"
-        @click="handleClick(action)"
         @command="handleDropdownCallback"
       >
-        <span v-if="action.split" :style="{ cursor: action.disabled ? 'not-allowed' : 'pointer' }">
+        <el-button :size="size" class="more-action" v-bind="cleanButtonAction(action)">
-          <Icon v-if="isEllipsisAction(action)" class="ellipsis-icon" icon="fa-ellipsis-v" />
+          <span v-if="action.icon && !action.icon.startsWith('el-')" class="pre-icon">
-          <span v-else>{{ getActionTitle(action) }}</span>
+            <i v-if="action.icon.startsWith('fa')" :class="'fa fa-fw ' + action.icon" />
-        </span>
+            <svg-icon v-else :icon-class="action.icon" />
-        <el-button
-          v-else
-          :class="[action.name, { 'table-action-text': isTableActionText }]"
-          :size="size"
-          class="more-action"
-          v-bind="{ ...cleanButtonAction(action), icon: '' }"
-        >
-          <span class="pre-icon">
-            <Icon v-if="action.icon" :icon="action.icon" />
           </span>
           <span v-if="action.title">
-            <Icon v-if="isEllipsisAction(action)" class="ellipsis-icon" icon="fa-ellipsis-v" />
+            {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
-            <span v-else>{{ getActionTitle(action) }}</span>
-            <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>
-            <el-tooltip
+            <el-tooltip :key="option.name" :content="option.tip" :disabled="!option.tip" :open-delay="500" placement="top">
-              :key="option.name"
-              :content="option.tip"
-              :disabled="!option.tip"
-              :open-delay="500"
-              placement="top"
-            >
               <el-dropdown-item
                 :key="option.name"
                 :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">
+                <span v-if="option.icon" class="pre-icon">
-                  <Icon v-if="option.icon" :icon="option.icon" />
+                  <i v-if="option.icon.startsWith('fa')" :class="'fa fa-fw ' + option.icon" />
+                  <svg-icon v-else :icon-class="option.icon" />
                 </span>
                 {{ option.title }}
               </el-dropdown-item>
@@ -72,19 +51,18 @@
       <el-button
         v-else
         :key="action.name"
-        :class="[action.name, { grouped: action.grouped, 'table-action-text': isTableActionText }]"
         :size="size"
         class="action-item"
-        v-bind="{ ...cleanButtonAction(action), icon: '' }"
+        v-bind="{...cleanButtonAction(action), icon: action.icon && action.icon.startsWith('el-') ? action.icon : ''}"
         @click="handleClick(action)"
       >
-        <el-tooltip :content="action.tip" :disabled="!action.tip" placement="top">
+        <el-tooltip :content="action.tip" :disabled="!action.tip" :open-delay="500" placement="top">
           <span>
-            <span v-if="action.icon" style="vertical-align: initial">
+            <span v-if="action.icon && !action.icon.startsWith('el-')" style="vertical-align: initial">
-              <Icon :icon="action.icon" />
+              <i v-if="action.icon.startsWith('fa')" :class="'fa ' + action.icon" />
+              <svg-icon v-else :icon-class="action.icon" />
             </span>
-            <Icon v-if="isEllipsisAction(action)" class="ellipsis-icon" icon="fa-ellipsis-v" />
+            {{ action.title }}
-            <span v-else>{{ getActionTitle(action) }}</span>
           </span>
         </el-tooltip>
       </el-button>
@@ -93,14 +71,10 @@
 </template>
 
 <script>
-import { toSentenceCase } from '@/utils/common/index'
+import { toSentenceCase } from '@/utils/common'
-import Icon from '@/components/Widgets/Icon/index.vue'
 
 export default {
   name: 'DataActions',
-  components: {
-    Icon
-  },
   props: {
     grouped: {
       type: Boolean,
@@ -122,24 +96,9 @@ export default {
   computed: {
     iActions() {
       return this.cleanActions(this.actions)
-    },
-    tableActionButtonType() {
-      return this.$store?.state?.settings?.tableActionButtonType || 'default'
-    },
-    isTableActionText() {
-      return this.tableActionButtonType === 'text'
     }
   },
   methods: {
-    getActionTitle(action) {
-      return action?.title
-    },
-    isEllipsisAction(action) {
-      return this.isTableActionText && action?.title === '...'
-    },
-    actionsHasIcon(actions) {
-      return actions.some(action => action.icon)
-    },
     hasIcon(action, type = '') {
       const icon = action.icon
       if (!icon) {
@@ -197,7 +156,6 @@ export default {
       delete action['callback']
       delete action['name']
       delete action['can']
-      delete action['split']
       return action
     },
     cleanActions(actions) {
@@ -227,10 +185,6 @@ export default {
         }
         delete action['can']
 
-        if (!action.size) {
-          action.size = 'small'
-        }
-
         if (action.dropdown) {
           action.dropdown = this.cleanActions(action.dropdown)
         }
@@ -244,10 +198,9 @@ export default {
 
 <style lang="scss" scoped>
 $btn-text-color: #ffffff;
-$color-btn-background: var(--color-primary-light-3, #e8f7f4);
+$color-btn-background: #E8F7F4;
-$color-btn-focus-background: var(--color-primary-light-1, var(--color-primary));
+$color-btn-focus-background: #83CBBA;
-$color-text-hover: var(--color-primary-light-1);
+$color-divided: #E4E7ED;
-$color-divided: #e4e7ed;
 $color-drop-menu-title: #909399;
 $color-drop-menu-border: #e4e7ed;
 
@@ -256,10 +209,6 @@ $color-drop-menu-border: #e4e7ed;
   .action-item {
     margin-left: 5px;
 
-    &.grouped {
-      margin-left: 0;
-    }
-
     &:first-child {
       margin-left: 0;
     }
@@ -275,11 +224,9 @@ $color-drop-menu-border: #e4e7ed;
   .action-item.el-dropdown {
     font-size: 11px;
 
-    .more-action {
+    .more-action.el-button--default {
-      .el-button--default {
+      ::v-deep .el-icon-arrow-down.el-icon--right {
-        ::v-deep .el-icon-arrow-down.el-icon--right {
+        color: var(--color-icon-primary) !important;
-          color: var(--color-icon-primary) !important;
-        }
       }
     }
 
@@ -302,17 +249,10 @@ $color-drop-menu-border: #e4e7ed;
   align-items: flex-end;
 
   .el-button {
-    padding: 2px 5px;
+    display: flex;
-    line-height: 1.3;
+    align-items: center;
-    font-size: 13px;
+    padding: 2px 6px;
-
+    color: $btn-text-color;
-    &:not(.is-plain) {
-      color: $btn-text-color;
-    }
-
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
 
     * {
       vertical-align: baseline !important;
@@ -335,29 +275,13 @@ $color-drop-menu-border: #e4e7ed;
       background-color: $color-btn-focus-background;
     }
   }
-
-  .action-item.table-action-text.el-button,
-  ::v-deep .action-item.table-action-text.el-dropdown .el-button {
-    color: var(--color-primary) !important;
-    background-color: transparent !important;
-    border-color: transparent !important;
-    transition: color 0.2s ease;
-  }
-
-  .action-item.table-action-text.el-button:hover,
-  .action-item.table-action-text.el-button:focus,
-  ::v-deep .action-item.table-action-text.el-dropdown .el-button:hover,
-  ::v-deep .action-item.table-action-text.el-dropdown .el-button:focus {
-    color: $color-text-hover !important;
-    background-color: transparent !important;
-    border-color: transparent !important;
-    box-shadow: none !important;
-  }
 }
 
 // 下拉 options
 .el-dropdown-menu {
   ::v-deep .more-batch-processing {
+    text-align: center;
+
     &:hover {
       background-color: transparent !important;
     }
@@ -379,7 +303,6 @@ $color-drop-menu-border: #e4e7ed;
 
   .dropdown-item {
     color: var(--color-text-primary);
-    line-height: 34px;
 
     .pre-icon {
       width: 17px;
@@ -401,8 +324,6 @@ $color-drop-menu-border: #e4e7ed;
   }
 
   .el-dropdown-menu__item {
-    padding: 0 20px;
-
     &.is-disabled {
       color: var(--color-disabled);
       cursor: not-allowed;