Merge pull request #4600 from jumpserver/dev

v4.6.0

.gitignore

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20250616_083043 AS stage-build
+FROM jumpserver/lina-base:20240723_084702 AS stage-build
 
 ARG VERSION
 ENV VERSION=$VERSION

jsconfig.json

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

package.json

@@ -1,148 +1,146 @@
 {
-    "name": "lina",
-    "version": "v4.0.0",
-    "description": "JumpServer Web UI",
-    "author": "JumpServer Team <support@lxware.hk>",
-    "license": "GPL-3.0-or-later",
-    "scripts": {
-        "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-        "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-        "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
-        "build:prod": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
-        "preview": "node build/index.js --preview",
-        "lint": "eslint --ext .js,.vue src",
-        "fix": "eslint --ext .js,.vue --fix src",
-        "test:unit": "jest --clearCache && vue-cli-service test:unit",
-        "test:ci": "npm run lint && npm run test:unit",
-        "svgo": "svgo -f src/icons/svg --config=src/icas/svgo.yml",
-        "vue-i18n-extract": "vue-i18n-extract",
-        "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'",
-        "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json",
-        "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a",
-        "diff-i18n": "python ./src/i18n/langs/i18n-util.py diff en ja zh_Hant",
-        "apply-i18n": "python ./src/i18n/langs/i18n-util.py apply en ja zh_Hant"
-    },
-    "dependencies": {
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@fontsource/open-sans": "^5.0.24",
-        "@traptitech/markdown-it-katex": "^3.6.0",
-        "@ztree/ztree_v3": "3.5.44",
-        "axios": "0.28.0",
-        "axios-retry": "^3.1.9",
-        "caniuse-lite": "^1.0.30001642",
-        "cron-parser": "^4.0.0",
-        "crypto-js": "^4.1.1",
-        "css-color-function": "^1.3.3",
-        "decimal.js": "^10.4.3",
-        "deepmerge": "^4.2.2",
-        "dompurify": "^3.1.6",
-        "echarts": "4.7.0",
-        "element-ui": "2.15.14",
-        "eslint-plugin-html": "^6.0.0",
-        "highlight.js": "^11.9.0",
-        "install": "^0.13.0",
-        "jquery": "^3.6.1",
-        "js-cookie": "2.2.0",
-        "jsencrypt": "^3.2.1",
-        "less": "^3.10.3",
-        "less-loader": "^5.0.0",
-        "lodash": "^4.17.21",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.frompairs": "^4.0.1",
-        "lodash.get": "^4.4.2",
-        "lodash.has": "^4.5.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isempty": "^4.4.0",
-        "lodash.isequal": "^4.5.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.set": "^4.3.2",
-        "lodash.topairs": "^4.3.0",
-        "lodash.values": "^4.3.0",
-        "markdown-it": "^13.0.2",
-        "markdown-it-link-attributes": "^4.0.1",
-        "moment": "^2.29.4",
-        "moment-parseformat": "^4.0.0",
-        "normalize.css": "7.0.0",
-        "npm": "^7.8.0",
-        "nprogress": "0.2.0",
-        "path-to-regexp": "3.3.0",
-        "sortablejs": "^1.15.6",
-        "v-sanitize": "^0.0.13",
-        "vue": "2.6.10",
-        "vue-codemirror": "4.0.6",
-        "vue-cookie": "^1.1.4",
-        "vue-echarts": "^5.0.0-beta.0",
-        "vue-i18n": "^8.15.5",
-        "vue-json-editor": "^1.4.3",
-        "vue-markdown": "^2.2.4",
-        "vue-password-strength-meter": "^1.7.2",
-        "vue-router": "3.0.6",
-        "vue-select": "^3.9.5",
-        "vuejs-logger": "^1.5.4",
-        "vuex": "3.1.0",
-        "watermark-js-plus": "^1.5.8",
-        "xss": "^1.0.14",
-        "xterm": "^4.5.0",
-        "xterm-addon-fit": "^0.3.0",
-        "zxcvbn": "^4.4.2"
-    },
-    "devDependencies": {
-        "@babel/core": "7.18.6",
-        "@babel/register": "7.0.0",
-        "@vue/cli-plugin-babel": "3.6.0",
-        "@vue/cli-plugin-eslint": "^3.9.1",
-        "@vue/cli-plugin-unit-jest": "3.6.3",
-        "@vue/cli-service": "3.6.0",
-        "@vue/test-utils": "1.0.0-beta.29",
-        "autoprefixer": "^9.5.1",
-        "babel-core": "7.0.0-bridge.0",
-        "babel-eslint": "10.0.1",
-        "babel-jest": "23.6.0",
-        "chalk": "2.4.2",
-        "compression-webpack-plugin": "^6.1.1",
-        "connect": "3.6.6",
-        "deasync": "^0.1.29",
-        "element-theme-chalk": "^2.13.1",
-        "eslint": "^5.15.3",
-        "eslint-plugin-vue": "5.2.2",
-        "eslint-plugin-vue-i18n": "^0.3.0",
-        "github-markdown-css": "^5.1.0",
-        "html-webpack-plugin": "3.2.0",
-        "husky": "^4.2.3",
-        "less-loader": "^5.0.0",
-        "lint-staged": "^10.1.2",
-        "mockjs": "1.0.1-beta3",
-        "runjs": "^4.3.2",
-        "sass": "~1.32.6",
-        "sass-loader": "^7.1.0",
-        "script-ext-html-webpack-plugin": "2.1.3",
-        "script-loader": "0.7.2",
-        "serve-static": "^1.16.0",
-        "strip-ansi": "^7.1.0",
-        "svg-sprite-loader": "4.1.3",
-        "svgo": "1.2.2",
-        "vue-i18n-extract": "^1.1.1",
-        "vue-template-compiler": "2.6.10"
-    },
-    "engines": {
-        "node": ">=8.9",
-        "npm": ">= 3.0.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 4 versions",
-        "ie 11"
-    ],
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
-    "lint-staged": {
-        "src/**/*.{js,vue}": [
-            "eslint --fix"
-        ]
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "name": "lina",
+  "version": "v4.0.0",
+  "description": "JumpServer Web UI",
+  "author": "JumpServer Team <support@fit2cloud.com>",
+  "license": "GPL-3.0-or-later",
+  "scripts": {
+    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src",
+    "fix": "eslint --ext .js,.vue --fix src",
+    "test:unit": "jest --clearCache && vue-cli-service test:unit",
+    "test:ci": "npm run lint && npm run test:unit",
+    "svgo": "svgo -f src/icons/svg --config=src/icas/svgo.yml",
+    "vue-i18n-extract": "vue-i18n-extract",
+    "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'",
+    "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json",
+    "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a",
+    "diff-i18n": "python ./src/i18n/langs/i18n-util.py diff en ja zh_Hant",
+    "apply-i18n": "python ./src/i18n/langs/i18n-util.py apply en ja zh_Hant"
+  },
+  "dependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+    "@fontsource/open-sans": "^5.0.24",
+    "@traptitech/markdown-it-katex": "^3.6.0",
+    "@ztree/ztree_v3": "3.5.44",
+    "axios": "0.28.0",
+    "axios-retry": "^3.1.9",
+    "caniuse-lite": "^1.0.30001642",
+    "cron-parser": "^4.0.0",
+    "crypto-js": "^4.1.1",
+    "css-color-function": "^1.3.3",
+    "decimal.js": "^10.4.3",
+    "deepmerge": "^4.2.2",
+    "dompurify": "^3.1.6",
+    "echarts": "4.7.0",
+    "element-ui": "2.15.14",
+    "eslint-plugin-html": "^6.0.0",
+    "highlight.js": "^11.9.0",
+    "install": "^0.13.0",
+    "jquery": "^3.6.1",
+    "js-cookie": "2.2.0",
+    "jsencrypt": "^3.2.1",
+    "less": "^3.10.3",
+    "less-loader": "^5.0.0",
+    "lodash": "^4.17.21",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.frompairs": "^4.0.1",
+    "lodash.get": "^4.4.2",
+    "lodash.has": "^4.5.2",
+    "lodash.includes": "^4.3.0",
+    "lodash.isempty": "^4.4.0",
+    "lodash.isequal": "^4.5.0",
+    "lodash.isplainobject": "^4.0.6",
+    "lodash.set": "^4.3.2",
+    "lodash.topairs": "^4.3.0",
+    "lodash.values": "^4.3.0",
+    "markdown-it": "^13.0.2",
+    "markdown-it-link-attributes": "^4.0.1",
+    "moment": "^2.29.4",
+    "moment-parseformat": "^4.0.0",
+    "normalize.css": "7.0.0",
+    "npm": "^7.8.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "3.3.0",
+    "v-sanitize": "^0.0.13",
+    "vue": "2.6.10",
+    "vue-codemirror": "4.0.6",
+    "vue-cookie": "^1.1.4",
+    "vue-echarts": "^5.0.0-beta.0",
+    "vue-i18n": "^8.15.5",
+    "vue-json-editor": "^1.4.3",
+    "vue-markdown": "^2.2.4",
+    "vue-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",
+    "xss": "^1.0.14",
+    "xterm": "^4.5.0",
+    "xterm-addon-fit": "^0.3.0",
+    "zxcvbn": "^4.4.2"
+  },
+  "devDependencies": {
+    "@babel/core": "7.18.6",
+    "@babel/register": "7.0.0",
+    "@vue/cli-plugin-babel": "3.6.0",
+    "@vue/cli-plugin-eslint": "^3.9.1",
+    "@vue/cli-plugin-unit-jest": "3.6.3",
+    "@vue/cli-service": "3.6.0",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "23.6.0",
+    "chalk": "2.4.2",
+    "compression-webpack-plugin": "^6.1.1",
+    "connect": "3.6.6",
+    "deasync": "^0.1.29",
+    "element-theme-chalk": "^2.13.1",
+    "eslint": "^5.15.3",
+    "eslint-plugin-vue": "5.2.2",
+    "eslint-plugin-vue-i18n": "^0.3.0",
+    "github-markdown-css": "^5.1.0",
+    "html-webpack-plugin": "3.2.0",
+    "husky": "^4.2.3",
+    "less-loader": "^5.0.0",
+    "lint-staged": "^10.1.2",
+    "mockjs": "1.0.1-beta3",
+    "runjs": "^4.3.2",
+    "sass": "~1.32.6",
+    "sass-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "2.1.3",
+    "script-loader": "0.7.2",
+    "serve-static": "^1.16.0",
+    "strip-ansi": "^7.1.0",
+    "svg-sprite-loader": "4.1.3",
+    "svgo": "1.2.2",
+    "vue-i18n-extract": "^1.1.1",
+    "vue-template-compiler": "2.6.10"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 4 versions",
+    "ie 11"
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix"
+    ]
+  }
 }

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 content="0" http-equiv="Expires">
-    <meta content="no-cache" http-equiv="Pragma">
-    <meta content="no-cache" http-equiv="Cache-control">
-    <meta content="no-cache" http-equiv="Cache">
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="Expires" content="0">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-control" content="no-cache">
+    <meta http-equiv="Cache" content="no-cache">
+    <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">
-    <style>
-        #loading {
-            position: fixed;
-            top: 0;
-            left: 0;
-            width: 100vw;
-            height: 100vh;
-            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 () {
+    <link rel="stylesheet" href="<%= BASE_URL %>theme/element-ui.css">
+  </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) {
-            window.location.href = window.location.origin + '/ui/#' + pathname
+        if(pathname.indexOf('/ui') === -1) {
+          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>
-<div id="app">
-</div>
-<div id="loading">
-    <div class="spinner"></div>
-</div>
-<!-- built files will be auto injected -->
-</body>
+      }
+    </script>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
 </html>

src/App.vue

@@ -5,90 +5,14 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex'
-import { Watermark } from 'watermark-js-plus'
+import { mapState } from 'vuex'
 
 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/users.js

@@ -8,20 +8,11 @@ export function login(data) {
   })
 }
 
-export async function getProfile(token) {
-  let profile = await request({
+export function getProfile(token) {
+  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 + '/',

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

@@ -5,18 +5,10 @@ import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSettin
 
 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 {
     assets: {
       component: Select2,
-      label: vm.$t('Asset'),
+      label: vm.$t('Assets'),
       rules: [Required],
       el: {
         multiple: true,
@@ -35,9 +27,6 @@ export const accountFieldsMeta = (vm) => {
       component: Select2,
       rules: [Required],
       el: {
-        get disabled() {
-          return vm.isDisabled
-        },
         multiple: false,
         ajax: {
           url: '/api/v1/accounts/account-templates/',
@@ -54,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
       }
@@ -66,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: () => {
@@ -87,16 +69,17 @@ export const accountFieldsMeta = (vm) => {
     },
     username: {
       el: {
-        get disabled() {
-          return !!vm.account?.name || vm.isDisabled
-        }
+        disabled: !!vm.account?.name
       },
       on: {
         input: ([value], updateForm) => {
           vm.usernameChanged = true
         },
         change: ([value], updateForm) => {
-          onPrivilegedUser(value, updateForm)
+          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+          if (maybePrivileged) {
+            updateForm({ privileged: true })
+          }
         }
       },
       hidden: () => {
@@ -105,11 +88,6 @@ export const accountFieldsMeta = (vm) => {
     },
     privileged: {
       label: vm.$t('Privileged'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      },
       hidden: () => {
         return vm.addTemplate
       }
@@ -132,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
       }
@@ -144,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
       }
@@ -156,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
       }
@@ -225,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 ||
-          !formValue.secret_reset
+          vm.addTemplate
       }
     },
     params: {
@@ -235,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 ||
@@ -250,27 +184,12 @@ export const accountFieldsMeta = (vm) => {
       }
     },
     is_active: {
-      label: vm.$t('IsActive'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      }
+      label: vm.$t('IsActive')
     },
     comment: {
       label: vm.$t('Comment'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
-      }
-    },
-    secret_reset: {
-      label: vm.$t('SecretReset'),
-      el: {
-        get disabled() {
-          return vm.isDisabled
-        }
+      hidden: () => {
+        return vm.addTemplate
       }
     }
   }

src/components/Apps/AccountCreateUpdateForm/index.vue

@@ -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('Asset'), ['assets']],
+        [this.$t('AccountTemplate'), ['template']],
+        [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',
-          'secret_reset'
+          'access_key', 'passphrase', 'api_key'
         ]],
         [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('add', form)
-        } else {
-          this.$emit('edit', form)
-        }
+        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/AccountCreateUpdate.vue

@@ -1,38 +1,36 @@
-<template v-if="iVisible">
-  <Drawer
+<template>
+  <Dialog
+    v-if="iVisible"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
     :title="title"
-    :visible="iVisible"
-    class="drawer"
-    @close-drawer="handleCloseDrawer"
+    :visible.sync="iVisible"
+    v-bind="$attrs"
+    width="900px"
+    v-on="$listeners"
   >
-    <Page :title="'null'">
-      <IBox class="content">
-        <AccountCreateUpdateForm
-          v-if="!loading"
-          ref="form"
-          :account="account"
-          :add-template="addTemplate"
-          :asset="asset"
-          @add="addAccount"
-          @edit="editAccount"
-        />
-      </IBox>
-    </Page>
-  </Drawer>
+    <AccountCreateUpdateForm
+      v-if="!loading"
+      ref="form"
+      :account="account"
+      :add-template="addTemplate"
+      :asset="asset"
+      @add="addAccount"
+      @edit="editAccount"
+    />
+  </Dialog>
 </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,
-    Drawer,
-    Page,
+    Dialog,
     AccountCreateUpdateForm
   },
   props: {
@@ -113,22 +111,11 @@ export default {
     },
     editAccount(form) {
       const data = { ...form }
-      const flag = this.$route.query.flag
-
-      switch (flag) {
-        case 'copy':
-          this.handleAccountOperation(this.account.id, 'copy-to-assets', data)
-          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))
-      }
+      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
@@ -181,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
-      ref="ListTable"
-      :detail-drawer="detailDrawer"
-      :header-actions="headerActions"
-      :quick-filters="quickFilters"
-      :table-config="tableConfig"
-    />
+    <ListTable ref="ListTable" :header-actions="headerActions" :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 { accountOtherActions, accountQuickFilters, connectivityMeta, isDirectoryServiceAccount } from './const'
-import { openTaskPage } from '@/utils/jms'
-import {
-  AccountConnectFormatter,
-  ActionsFormatter,
-  PlatformFormatter,
-  SecretViewerFormatter
-} from '@/components/Table/TableFormatters'
+import ListTable from '@/components/Table/ListTable/index.vue'
+import { ActionsFormatter } 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 DrawerListTable from '@/components/Table/DrawerListTable/index.vue'
+import { connectivityMeta } from './const'
+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,
-    PasswordHistoryDialog,
-    AccountBulkUpdateDialog
+    ViewSecret,
+    AccountCreateUpdate
   },
   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',
-            formatterArgs: {
-              can: () => vm.$hasPerm('accounts.view_account'),
-              getRoute: ({ row }) => ({
-                name: 'AccountDetail',
+            width: '120px',
+            formatter: function(row) {
+              const to = {
+                name: 'AssetAccountDetail',
                 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}`
               }
-            }
-          },
-          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']
+              if (vm.$hasPerm('accounts.view_account')) {
+                return <router-link to={to}>{row.name}</router-link>
               } 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',
-            formatter: function(row) {
-              if (row.ds && row.ds['domain_name']) {
-                return `${row.username}@${row.ds['domain_name']}`
-              } else {
-                return row.username
-              }
-            }
+            width: '120px'
           },
           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)
-              hasClone: false,
-              canDelete: ({ row }) => vm.$hasPerm('accounts.delete_account') && !isDirectoryServiceAccount(row, this),
+              hasDelete: false, // can set function(row, value)
+              hasClone: this.hasClone,
               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,23 +313,7 @@ export default {
             type: 'primary',
             icon: 'plus',
             can: () => {
-              return vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot
-            },
-            callback: () => {
-              setTimeout(() => {
-                vm.iAsset = this.asset
-                vm.account = {}
-                this.addTemplate = false
-                this.showAddDialog = true
-              }, 200)
-            }
-          },
-          {
-            name: 'add-template',
-            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() => {
               await this.getAssetDetail()
@@ -347,7 +321,22 @@ export default {
                 vm.iAsset = this.asset
                 vm.account = {}
                 vm.showAddDialog = true
-                vm.addTemplate = true
+              })
+            }
+          },
+          {
+            name: 'add-template',
+            title: this.$t('TemplateAdd'),
+            has: !(this.platform || this.asset),
+            can: () => {
+              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
+            },
+            callback: async() => {
+              await this.getAssetDetail()
+              setTimeout(() => {
+                vm.iAsset = this.asset
+                vm.account = {}
+                vm.showAddTemplateDialog = 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 &&
-                !this.$store.getters.currentOrgIsRoot
+                  ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&
+                  !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,35 +423,52 @@ 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(() => this.refresh(), 300)
-    }
-  },
-  deactivated() {
-    this.tabDeactivated = true
+    setTimeout(() => {
+      this.refresh()
+    }, 300)
   },
   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() {
@@ -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/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/UpdateSecretInfo.vue

@@ -1,36 +1,44 @@
 <template>
   <Dialog
     :destroy-on-close="true"
-    :show-buttons="false"
     :title="$tc('UpdateAssetUserToken')"
-    :visible.sync="iVisible"
-    width="800px"
+    :visible.sync="visible"
+    width="50"
+    @cancel="handleCancel()"
+    @confirm="handleConfirm()"
     v-on="$listeners"
   >
-    <AutoDataForm
-      :fields="fields"
-      :fields-meta="fieldsMeta"
-      :form="init"
-      :has-reset="false"
-      :has-save-continue="false"
-      :url="''"
-      method="patch"
-      @submit="handleConfirm"
-    />
+    <el-form label-position="right" label-width="90px">
+      <el-form-item :label="$tc('Name')">
+        <el-input v-model="account['asset_name']" readonly />
+      </el-form-item>
+      <el-form-item :label="$tc('Username')">
+        <el-input v-model="account['username']" readonly />
+      </el-form-item>
+      <el-form-item :label="$tc('Password')">
+        <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/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: [
-        'name', 'secret_type', 'password', 'ssh_key', 'token',
-        'access_key', 'passphrase', 'api_key'
-      ],
-      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)
+      secretInfo: {
+        password: '',
+        private_key: '',
+        passphrase: ''
       }
     }
   },
   methods: {
-    handleConfirm(form) {
-      const secretType = this.account.secret_type.value
-      const data = {
-        secret: encryptPassword(form[secretType])
+    handleConfirm() {
+      const data = {}
+      if (this.secretInfo.password !== '') {
+        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,7 +60,7 @@
 <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/crypto'
 
 export default {
@@ -68,7 +68,7 @@ export default {
   components: {
     Dialog,
     PasswordHistoryDialog,
-    SecretViewerFormatter
+    ShowKeyCopyFormatter
   },
   props: {
     account: {

src/components/Apps/AccountListTable/const.js

@@ -1,5 +1,4 @@
 import { ChoicesFormatter } from '@/components/Table/TableFormatters'
-import { openTaskPage } from '@/utils/jms'
 
 export const connectivityMeta = {
   formatter: ChoicesFormatter,
@@ -7,23 +6,11 @@ export const connectivityMeta = {
     faChoices: {
       '-': '',
       ok: 'fa-check-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'
+      err: 'fa-times-circle'
     },
     classChoices: {
       ok: 'text-primary',
-      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'
+      err: 'text-danger'
     },
     getText({ cellValue }) {
       if (cellValue?.value === '-' || cellValue?.value === 'unknown') {
@@ -35,309 +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.add_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/AccountSelect/dialog.vue

@@ -1,221 +0,0 @@
-<template>
-  <Dialog
-    :close-on-click-modal="false"
-    :title="$t('AssetAccount')"
-    custom-class="account-select-dialog"
-    top="2vh"
-    v-bind="$attrs"
-    width="1000px"
-    @cancel="handleCancel"
-    @close="handleClose"
-    @confirm="handleConfirm"
-    v-on="$listeners"
-  >
-    <AssetTreeTable
-      ref="ListPage"
-      :header-actions="headerActions"
-      :node-url="baseNodeUrl"
-      :sync-select-to-url="false"
-      :table-config="tableConfig"
-      :tree-setting="iTreeSetting"
-      :tree-url="`${baseNodeUrl}children/tree/`"
-      :url="baseUrl"
-      class="tree-table"
-      v-bind="$attrs"
-      @loaded="handleTableLoaded"
-      v-on="$listeners"
-    />
-  </Dialog>
-</template>
-
-<script>
-import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
-import Dialog from '@/components/Dialog/index.vue'
-
-export default {
-  componentName: 'AssetSelectDialog',
-  components: { AssetTreeTable, Dialog },
-  props: {
-    baseUrl: {
-      type: String,
-      default: '/api/v1/accounts/accounts/'
-    },
-    baseNodeUrl: {
-      type: String,
-      default: '/api/v1/assets/nodes/'
-    },
-    value: {
-      type: Array,
-      default: () => []
-    },
-    canSelect: {
-      type: Function,
-      default(row, index) {
-        return true
-      }
-    },
-    disabled: {
-      type: [Boolean, Function],
-      default: false
-    },
-    treeSetting: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    const vm = this
-    return {
-      isLoaded: false,
-      dialogVisible: false,
-      rowSelected: _.cloneDeep(this.value) || [],
-      rowsAdd: [],
-      tableConfig: {
-        url: this.baseUrl,
-        hasTree: true,
-        canSelect: this.canSelect,
-        columns: [
-          {
-            prop: 'name',
-            label: this.$t('Name'),
-            sortable: true
-          },
-          {
-            prop: 'username',
-            label: this.$t('Username'),
-            sortable: 'custom'
-          },
-          {
-            prop: 'asset.name',
-            label: this.$t('Asset'),
-            sortable: 'custom',
-            formatter: function(row) {
-              return row.asset.name
-            }
-          },
-          {
-            prop: 'asset.platform.name',
-            label: this.$t('Platform'),
-            sortable: true,
-            formatter: function(row) {
-              return row.asset.platform.name
-            }
-          },
-          {
-            prop: 'secret_type.label',
-            label: this.$t('SecretType'),
-            sortable: true,
-            formatter: function(row) {
-              return row.secret_type.label
-            }
-          },
-          {
-            prop: 'actions',
-            has: false
-          }
-        ],
-        listeners: {
-          'toggle-row-selection': (isSelected, row) => {
-            if (isSelected) {
-              vm.addRowToSelect(row)
-            } else {
-              vm.removeRowFromSelect(row)
-            }
-          }
-        }
-        // theRowDefaultIsSelected: (row) => {
-        //   return this.value.indexOf(row.id) > -1
-        // }
-      },
-      headerActions: {
-        hasLeftActions: false,
-        hasRightActions: false,
-        hasLabelSearch: true,
-        searchConfig: {
-          getUrlQuery: false
-        }
-      }
-    }
-  },
-  computed: {
-    iTreeSetting() {
-      return { ...this.treeSetting, selectSyncToRoute: false }
-    }
-  },
-  methods: {
-    handleTableLoaded() {
-      this.isLoaded = true
-    },
-    handleClose() {
-      this.$refs.ListPage.$refs.TreeList.componentKey += 1
-    },
-    handleConfirm() {
-      this.$emit('confirm', this.rowSelected, this.rowsAdd)
-      if (this.rowSelected.length > 0) {
-        this.handleClose()
-      }
-    },
-    handleCancel() {
-      this.$emit('cancel')
-      this.handleClose()
-    },
-    addRowToSelect(row) {
-      this.rowSelected.push(row.username)
-      this.rowsAdd.push(row)
-      // const selectValueIndex = this.rowSelected.indexOf(row.id)
-      // if (selectValueIndex === -1) {
-      //   this.rowSelected.push(row.id)
-      //   this.rowsAdd.push(row)
-      // }
-    },
-    removeRowFromSelect(row) {
-      const selectValueIndex = this.rowSelected.indexOf(row.username)
-      this.rowSelected.splice(selectValueIndex, 1)
-      // const selectValueIndex = this.rowSelected.indexOf(row.id)
-      // if (selectValueIndex > -1) {
-      //   this.rowSelected.splice(selectValueIndex, 1)
-      // }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page ::v-deep .page-heading {
-  display: none;
-}
-
-.el-dialog__wrapper ::v-deep .el-dialog__body {
-  padding: 0 0 0 3px;
-
-  .tree-table {
-    .search {
-    }
-
-    .left {
-      padding: 5px;
-    }
-
-    .right {
-      min-height: 500px;
-      overflow: auto;
-    }
-
-    .mini {
-      padding-top: 8px;
-    }
-
-    .transition-box {
-      padding: 10px 5px;
-    }
-  }
-}
-
-.page ::v-deep .treebox .ztree {
-
-}
-
-.account-select-dialog ::v-deep .el-icon-circle-check {
-  display: none;
-}
-</style>

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 {
-  font-weight: 700;
-  font-size: 13px;
-}
+  b, strong {
+    font-weight: 700;
+    font-size: 13px;
+  }
 
-tr td {
-  line-height: 1.42857;
-  padding: 8px;
-  vertical-align: top;
-}
+  tr td {
+    line-height: 1.42857;
+    padding: 8px;
+    vertical-align: top;
+  }
 
-tr.item td {
-  border-top: 1px solid #e7eaec;
-}
+  tr.item td {
+    border-top: 1px solid #e7eaec;
+  }
 </style>

src/components/Apps/AssetSelect/dialog.vue

@@ -2,6 +2,7 @@
   <Dialog
     :close-on-click-modal="false"
     :title="$tc('Assets')"
+    :disabled-status="!isLoaded"
     custom-class="asset-select-dialog"
     top="2vh"
     v-bind="$attrs"
@@ -22,8 +23,8 @@
       :url="baseUrl"
       class="tree-table"
       v-bind="$attrs"
-      @loaded="handleTableLoaded"
       v-on="$listeners"
+      @loaded="handleTableLoaded"
     />
   </Dialog>
 </template>
@@ -82,7 +83,7 @@ export default {
           },
           {
             prop: 'address',
-            label: this.$t('Address'),
+            label: this.$t('IpDomain'),
             sortable: 'custom'
           },
           {

src/components/Apps/AssetSelect/index.vue

@@ -56,10 +56,6 @@ export default {
     treeSetting: {
       type: Object,
       default: () => ({})
-    },
-    disabled: {
-      type: [Boolean, Function],
-      default: false
     }
   },
   data() {
@@ -75,7 +71,6 @@ export default {
       dialogVisible: false,
       initialValue: _.cloneDeep(iValue),
       select2Config: {
-        disabled: this.disabled,
         value: iValue,
         multiple: true,
         clearable: true,

src/components/Apps/AssetTreeTable/index.vue

@@ -114,11 +114,6 @@ export default {
               treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
               callback: {
                 onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
-              },
-              edit: {
-                drag: {
-                  isMove: false
-                }
               }
             }
           }
@@ -147,9 +142,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) {

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="chart-item-container">
-      <div class="avatar">
-        <el-avatar
-          :src="isUserRole ? userUrl : chatUrl"
-          class="header-avatar"
-        />
+  <div :class="{'user-role': isUserRole}" class="chat-item">
+    <div class="avatar">
+      <el-avatar :src="isUserRole ? userUrl : chatUrl" class="header-avatar" />
+    </div>
+    <div class="content">
+      <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="operational">
-          <div v-if="!item.message.is_reasoning" class="date">
-            {{
-              $moment(item.message.create_time).format("YYYY-MM-DD HH:mm:ss")
-            }}
-          </div>
-
-          <div v-else class="thinking-time">{{ $i18n.t('DeeplyThoughtAbout') }}</div>
+      <div class="message">
+        <div class="message-content">
+          <span v-if="isSystemError" class="error">
+            {{ item.message.content }}
+          </span>
+          <span v-else class="chat-text">
+            <MessageText :message="item.message" />
+          </span>
         </div>
-        <div :class="item.reasoning ? 'reasoning' : 'message'">
-          <div class="message-content">
-            <div v-if="!item.reasoning">
-              <span v-if="isSystemError" class="error">
-                {{ item.message.content }}
-              </span>
-              <span v-else class="chat-text">
-                <MessageText :message="item.message" />
-              </span>
-            </div>
-
-            <div v-else class="thinking-wrapper">
-              <div class="thinking-content">
-                <!-- eslint-disable-next-line -->
-                <div class="divider"></div>
-                <p>
-                  <MessageText :message="item.reasoning" @insert-code="handleInsertCode" />
-                </p>
-              </div>
-
-              <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 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>
@@ -76,7 +45,7 @@
 
 <script>
 import MessageText from './MessageText.vue'
-import { mapGetters, mapState } from 'vuex'
+import { mapState } from 'vuex'
 import { copy } from '@/utils/common'
 import { useChat } from '../../useChat.js'
 import { reconnect } from '@/utils/socket'
@@ -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 (
-        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')
+      return this.item.type === 'error' && this.item.message?.role === 'assistant'
     }
   },
   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;
-
-  .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;
-        }
-      }
-    }
-  }
+  padding: 16px 14px 0;
 
   &:last-child {
     padding-bottom: 16px;
   }
 
-  &.user-role {
-    flex-direction: row-reverse;
+  .avatar {
+    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 {
-      margin-right: 10px;
+    .message {
+      flex-direction: row-reverse;
 
-      .operational {
-        flex-direction: row-reverse;
-      }
-
-      .message {
-        flex-direction: row-reverse;
-
-        .message-content {
-          background-color: var(--menu-hover);
-          border-radius: 12px 2px 12px 12px;
-        }
+      .message-content {
+        background-color: var(--menu-hover);
+        border-radius: 12px 2px 12px 12px;
       }
     }
   }

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

@@ -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() {
@@ -73,64 +69,26 @@ export default {
       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>`
-      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>`
+      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>`
     },
-    addEvents() {
-      this.addBtnClickEvents('.code-block-header__copy', this.handlerClickCopy)
-      this.addBtnClickEvents('.code-block-header__insert', this.handlerClickInsert)
-    },
-
-    handlerClickCopy(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
-          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', () => {
+    addCopyEvents() {
+      const copyBtn = document.querySelectorAll('.code-block-header__copy')
+      copyBtn.forEach((btn) => {
+        btn.addEventListener('click', () => {
+          const code = btn.parentElement?.nextElementSibling?.textContent
+          if (code) {
+            copy(code)
+          }
         })
       })
     },
-    removeEvents() {
+    removeCopyEvents() {
       if (this.$refs.textRef) {
-        this.removeBtnClickEvent('.code-block-header__copy')
-        this.addBtnClickEvents('.code-block-header__insert')
+        const copyBtn = this.$refs.textRef.querySelectorAll('.code-block-header__copy')
+        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 {
-        display: flex;
-        gap: 8px;
+      .code-block-header__copy {
+        float: right;
+        cursor: pointer;
 
-        .code-block-header__copy {
-          cursor: pointer;
-
-          &:hover {
-            color: #6e747b;
-          }
-        }
-
-        .code-block-header__insert {
-          cursor: pointer;
-
-          &:hover {
-            color: #6e747b;
-          }
+        &: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>
@@ -68,10 +68,7 @@ export default {
       prompt: '',
       conversationId: '',
       showIntroduction: false,
-      introduction: [],
-      terminalContext: null,
-      isTerminal: false,
-      sessionChat: {}
+      introduction: []
     }
   },
   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
-
-        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)
+        updateChaMessageContentById(data.message.id, data)
       }
       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/index.vue

@@ -47,9 +47,7 @@ import Chat from './components/ChitChat/index.vue'
 import { getInputFocus } from './useChat.js'
 import { ws } from '@/utils/socket'
 import DrawerPanel from '@/components/Apps/DrawerPanel/index.vue'
-import { ObjectLocalStorage } from '@/utils/common'
 
-const aiPannelLocalStorage = new ObjectLocalStorage('ai_panel_settings')
 export default {
   components: {
     DrawerPanel,
@@ -78,15 +76,12 @@ export default {
       robotUrl: require('@/assets/img/robot-assistant.png'),
       height: '400px',
       expanded: false,
-      clientOffset: {},
-      currentTerminalContent: {}
+      clientOffset: {}
     }
   },
   watch: {
   },
   mounted() {
-    const expanded = aiPannelLocalStorage.get('expanded')
-    this.updateExpandedState(expanded)
     this.handlePostMessage()
   },
   methods: {
@@ -94,17 +89,6 @@ export default {
       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
         }
       })
     },
@@ -112,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() {
@@ -128,20 +107,12 @@ export default {
       this.$refs.drawer.show = false
     },
     expandFull() {
-      this.updateExpandedState(true)
-      this.save_pannel_settings()
+      this.height = '100%'
+      this.expanded = true
     },
     compress() {
-      this.updateExpandedState(false)
-      this.save_pannel_settings()
-    },
-    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'
+      this.height = '400px'
+      this.expanded = false
     },
     onNewChat() {
       this.active = 'chat'

src/components/Apps/GrantedAssets/index.vue

@@ -7,7 +7,7 @@
   />
 </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'
@@ -87,7 +87,7 @@ export default {
         columnsExclude: ['spec_info'],
         columnsShow: {
           min: ['name', 'address', 'accounts'],
-          default: ['name', 'address', 'platform', 'view_account', 'actions']
+          default: ['name', 'address', 'platform', 'connectivity', 'view_account', 'actions']
         },
         columnsMeta: {
           name: {

src/components/Apps/LeakPasswords/LeakPasswordList.vue

@@ -1,59 +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: false,
-        hasImport: 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,26 +1,24 @@
 <template>
-  <TwoCol>
-    <ListTable v-bind="config" />
-  </TwoCol>
+  <el-row :gutter="24">
+    <el-col :md="20" :sm="22">
+      <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'
-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() {
@@ -34,18 +32,21 @@ export default {
         },
         tableConfig: {
           url: `/api/v1/assets/assets/?${key}=${value}`,
-          columns: ['name', 'address', 'platform', 'type', 'is_active'],
-          columnsShow: {
-            min: ['name', 'address'],
-            default: ['name', 'address', 'platform']
-          },
+          columns: ['name', 'address', 'platform',
+            'type', 'is_active'
+          ],
           columnsMeta: {
             name: {
               label: this.$t('Asset'),
-              formatter: DetailFormatter,
-              formatterArgs: {
-                getRoute: ({ row }) => {
-                  return { name: 'AssetDetail', params: { id: row.id }}
+              formatter: (row) => {
+                const to = {
+                  name: 'AssetDetail',
+                  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>
                 }
               }
             },
@@ -64,3 +65,7 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+
+</style>

src/components/Apps/ManyJsonTabs/UserJsonTab.vue

@@ -1,19 +1,18 @@
 <template>
-  <TwoCol>
-    <ListTable v-bind="config" />
-  </TwoCol>
+  <el-row :gutter="24">
+    <el-col :md="20" :sm="22">
+      <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'
-import TwoCol from '@/layout/components/Page/TwoColPage.vue'
-import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'User',
   components: {
-    TwoCol,
     ListTable
   },
   props: {
@@ -35,23 +34,22 @@ export default {
         tableConfig: {
           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,
-              formatterArgs: {
-                getRoute: ({ row }) => {
-                  return {
-                    name: 'UserDetail',
-                    params: { id: row.id }
-                  }
+              width: 85,
+              formatter: (row) => {
+                const to = {
+                  name: 'UserDetail',
+                  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>
                 }
               }
             },
@@ -89,3 +87,7 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+
+</style>

src/components/Apps/ResourceActivity/index.vue

@@ -1,43 +1,43 @@
 <template>
   <div>
-    <TwoCol>
-      <IBox :title="title" class="block" v-bind="$attrs">
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in activities"
-            :key="index"
-            :size="activity.size"
-            :timestamp="activity.timestamp"
-            :type="activity.type"
-            placement="bottom"
-          >
-            {{ activity.content }}
-            <el-link
-              v-if="activity['detail_url']"
-              type="primary"
-              @click.native="onClick(activity)"
+    <el-row :gutter="20">
+      <el-col :md="16" :sm="24">
+        <IBox :title="title" class="block" v-bind="$attrs">
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in activities"
+              :key="index"
+              :size="activity.size"
+              :timestamp="activity.timestamp"
+              :type="activity.type"
+              placement="bottom"
             >
-              {{ $tc('Detail') }}
-            </el-link>
-          </el-timeline-item>
-        </el-timeline>
-      </IBox>
-    </TwoCol>
+              {{ activity.content }}
+              <el-link
+                v-if="activity['detail_url']"
+                type="primary"
+                @click.native="onClick(activity)"
+              >
+                {{ $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'
 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

@@ -49,47 +49,41 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-row v-if="!noCodeMFA.includes(subTypeSelected)" :gutter="24" style="margin: 0 auto;">
-        <el-col :md="24" :sm="24" style="display: flex; align-items: center; ">
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24" style="display: flex; align-items: center; margin-bottom: 20px;">
           <el-input
+            v-if="subTypeSelected !== 'face'"
             v-model="secretValue"
             :placeholder="inputPlaceholder"
             :show-password="showPassword"
             @keyup.enter.native="handleConfirm"
           />
-          <span v-if="subTypeSelected === 'sms' || subTypeSelected === 'email'" style="margin: -1px 0 0 20px;">
+
+          <iframe
+            v-if="isFaceCaptureVisible && subTypeSelected ==='face' && faceCaptureUrl"
+            :src="faceCaptureUrl"
+            allow="camera"
+            sandbox="allow-scripts allow-same-origin"
+            style="width: 100%; height: 800px;border: none;"
+          />
+
+          <span v-if="subTypeSelected === 'sms'" style="margin: -1px 0 0 20px;">
             <el-button
               :disabled="smsBtnDisabled"
               size="mini"
               style="line-height: 14px; float: right;"
               type="primary"
-              @click="sendCode"
+              @click="sendSMSCode"
             >
               {{ smsBtnText }}
             </el-button>
           </span>
         </el-col>
       </el-row>
-      <el-row>
-        <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-row :gutter="24" style="margin: 10px auto;">
         <el-col :md="24" :sm="24">
           <el-button
-            v-if="!noCodeMFA.includes(subTypeSelected)"
+            v-if="subTypeSelected!=='face'"
             class="confirm-btn"
             size="mini"
             type="primary"
@@ -98,24 +92,13 @@
             {{ this.$t('Confirm') }}
           </el-button>
           <el-button
-            v-if="subTypeSelected === 'face'"
-            v-show="!isFaceCaptureVisible"
+            v-if="subTypeSelected==='face'&&!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>
@@ -158,11 +141,7 @@ export default {
       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'
+      faceCaptureUrl: null
     }
   },
   computed: {
@@ -225,8 +204,8 @@ export default {
     logout() {
       window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     },
-    sendCode() {
-      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: this.subTypeSelected }).then(res => {
+    sendSMSCode() {
+      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: 'sms' }).then(res => {
         this.$message.success(this.$tc('VerificationCodeSent'))
         let time = 60
         this.smsBtnDisabled = true
@@ -245,26 +224,6 @@ export default {
         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 => {
@@ -288,13 +247,6 @@ export default {
     handleFaceCapture() {
       this.startFaceCapture()
     },
-    onSuccess() {
-      this.secretValue = ''
-      this.visible = false
-      this.$nextTick(() => {
-        this.callback()
-      })
-    },
     handleConfirm() {
       if (this.confirmTypeRequired === 'relogin') {
         return this.logout()
@@ -310,7 +262,11 @@ export default {
       }
 
       this.$axios.post(`/api/v1/authentication/confirm/`, data).then(() => {
-        this.onSuccess()
+        this.secretValue = ''
+        this.visible = false
+        this.$nextTick(() => {
+          this.callback()
+        })
       }).catch((err) => {
         this.$message.error(err.message || this.$tc('ConfirmFailed'))
         this.faceCaptureUrl = null

src/components/Apps/VariableCreateUpdateForm/index.vue

@@ -39,9 +39,6 @@ export default {
         ['', ['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) => {

src/components/Cards/DetailCard/auto.vue

@@ -1,12 +1,7 @@
 <template>
   <IBox v-if="loading" style="width: 100%; height: 200px" />
   <div v-else>
-    <DetailCard
-      v-if="hasObject && items.length > 0"
-      :items="validItems"
-      :loading="loading"
-      v-bind="$attrs"
-    />
+    <DetailCard v-if="hasObject && items.length > 0" :items="validItems" :loading="loading" v-bind="$attrs" />
   </div>
 </template>
 
@@ -14,7 +9,7 @@
 import DetailCard from './index.vue'
 import { copy } from '@/utils/common'
 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">
-      <template v-for="item in items">
-        <div v-if="item.has !== false" :key="item.key" :class="item.class " :label="item.key" class="el-form-item">
-          <span slot="label" class="el-form-item__label"> {{ formateLabel(item.key) }}</span>
-          <span class="item-value el-form-item__content">
-            <template
-              :is="item.component"
-              v-if="item.component"
-              v-bind="{...item}"
-            />
-            <ItemValue v-else :value="item.value" v-bind="item" />
-          </span>
-        </div>
-      </template>
+    <el-form :label-width="labelWidth" class="content" label-position="left">
+      <span v-for="item in items" :key="item.key">
+        <el-form-item v-if="item.has !== false" :class="item.class" :label="item.key">
+          <span slot="label"> {{ formateLabel(item.key) }}</span>
+          <span
+            :is="item.component"
+            v-if="item.component"
+            v-bind="{...item}"
+          />
+          <ItemValue v-else :value="item.value" class="item-value" v-bind="item" />
+        </el-form-item>
+      </span>
     </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 {
-  font-size: 13px;
-  line-height: 2;
+.el-form-item {
+  border-bottom: 1px dashed #EBEEF5;
+  padding: 1px 0;
+  margin-bottom: 0;
 
-  ::v-deep .el-form-item {
-    border-bottom: 1px dashed #F4F4F4;
-    padding: 1px 0;
-    margin-bottom: 0;
-    display: flex;
-    align-items: center;
-    //text-align: end;
-    line-height: 32px;
-    min-height: 32px;
+  &:last-child {
+    border-bottom: none;
+  }
 
-    &:last-child {
-      //border-bottom: none;
+  &.array-item {
+    border-bottom: none;
+
+    ::v-deep .el-form-item__content {
+      border-bottom: 1px dashed #EBEEF5
     }
 
-    &.array-item {
-      border-bottom: none;
-
-      ::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;
+    ::v-deep .el-form-item__label:last-child {
+      border: 1px dashed #EBEEF5;
     }
   }
 
-  .item-value {
-    ::v-deep span {
-      //display: -webkit-box;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      word-break: break-word;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-      vertical-align: middle;
+  ::v-deep .el-form-item__label {
+    padding-right: 8%;
+    overflow: hidden;
+    color: var(--color-icon-primary);
+
+    span {
+      display: inline-block;
+      line-height: 1.5;
     }
   }
+
+  ::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;
-  padding: 8px 0;
+  line-height: 1.42857;
+  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>
-    <div class="summary-header">
-      <el-tooltip :content="title" :open-delay="500" placement="top">
-        <span class="title">{{ title }}</span>
-      </el-tooltip>
+  <el-card shadow="never">
+    <div slot="header" class="summary-header">
+      <span class="header-title">{{ title }}</span>
     </div>
     <slot>
-      <h3 class="no-margins ">
-        <span
-          :class="{ 'can-direct': canDirect }"
-          class="num"
-          @click="handleClick"
-        >
-          <span v-if="count === null"> - </span>
-          <span v-else>{{ count }}</span>
-        </span>
-      </h3>
+      <h1 class="no-margins">
+        <span v-if="body.disabled" class="disabled-link">{{ body.count }}</span>
+        <router-link v-else :to="body.route">
+          <span>{{ body.count }}</span>
+        </router-link>
+      </h1>
+      <small>{{ body.comment }}</small>
     </slot>
-  </div>
+  </el-card>
 </template>
 
 <script>
@@ -28,78 +23,56 @@ export default {
       type: String,
       default: ''
     },
-    count: {
-      type: [Number, String, Promise],
-      default: null
+    rightSideLabel: {
+      type: Object,
+      default: () => ({})
     },
-    route: {
-      type: [String, Object],
-      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')
+    body: {
+      type: Object,
+      default: () => ({})
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.summary-header {
-  //color: var(--color-icon-primary);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer;
+  .pull-right {
+    float: right !important;
+  }
 
-  .title {
-    font-style: normal;
+  .header-title {
+    font-size: 14px;
+    margin: 0 0 7px;
     font-weight: 600;
-    font-size: 12px;
-    text-transform: uppercase;
-    line-height: 1.2;
   }
-}
 
-.no-margins {
-  margin: 0 !important;
-
-  .num {
-    font-style: normal;
-    font-weight: 500;
-    font-size: 24px;
-    line-height: 40px;
-    color: var(--color-text-primary);
-    cursor: pointer;
-
-    &.can-direct:hover {
-      color: var(--color-primary);
-    }
+  .right-side ::v-deep .el-tag {
+    font-weight: 600;
+    padding: 3px 8px;
+    text-shadow: none;
+    line-height: 1;
+  }
+
+  h1 {
+    font-size: 30px;
+    font-weight: 100;
+  }
+
+  .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/Common/QuickActions/index.vue

@@ -1,70 +0,0 @@
-<template>
-  <IBox :fa="fa" :title="title" v-bind="$attrs">
-    <div v-for="action of actions" :key="action.title" class="quick-actions">
-      <table>
-        <ActionItem v-if="action.has === undefined || action.has" :action="action" />
-      </table>
-    </div>
-  </IBox>
-</template>
-
-<script>
-import IBox from '@/components/Common/IBox/index.vue'
-import ActionItem from './action.vue'
-
-// 查看 views/users/users/UserDetail/UserInfo.vue 使用样例
-export default {
-  name: 'QuickActions',
-  components: {
-    IBox,
-    ActionItem
-  },
-  props: {
-    fa: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default() {
-        return this.$t('QuickUpdate')
-      }
-    },
-    actions: {
-      type: Array,
-      default: () => []
-    }
-  }
-}
-</script>
-
-<style scoped>
-.quick-actions ::v-deep table {
-  width: 100%;
-}
-
-.quick-actions ::v-deep tr > td {
-  line-height: 1.43;
-  padding: 8px 0;
-  vertical-align: top;
-  font-size: 13px;
-  width: 50%;
-}
-
-.quick-actions ::v-deep tr > td > span:last-child {
-  float: right;
-}
-
-.quick-actions ::v-deep button {
-  padding: 4px 5px;
-  font-size: 13px;
-  min-width: 65px;
-
-  span {
-    overflow: hidden;
-    white-space: nowrap; /* 控制文本不换行 */
-    text-overflow: ellipsis;
-    display: block;
-  }
-}
-</style>

src/components/DataActions/index.vue

@@ -5,28 +5,15 @@
         v-if="action.dropdown"
         v-show="action.dropdown.length > 0"
         :key="action.name"
-        :class="[action.name, {grouped: action.grouped }]"
-        :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' }">
-          {{ action.title }}
-        </span>
-        <el-button
-          v-else
-          :class="action.name"
-          :size="size"
-          class="more-action"
-          v-bind="{...cleanButtonAction(action), icon: ''}"
-        >
-          <span class="pre-icon">
-            <Icon v-if="action.icon" :icon="action.icon" />
+        <el-button :size="size" class="more-action" v-bind="cleanButtonAction(action)">
+          <span v-if="action.icon && !action.icon.startsWith('el-')" class="pre-icon">
+            <i v-if="action.icon.startsWith('fa')" :class="'fa fa-fw ' + action.icon" />
+            <svg-icon v-else :icon-class="action.icon" />
           </span>
           <span v-if="action.title">
             {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
@@ -42,13 +29,7 @@
             >
               {{ option.group }}
             </div>
-            <el-tooltip
-              :key="option.name"
-              :content="option.tip"
-              :disabled="!option.tip"
-              :open-delay="500"
-              placement="top"
-            >
+            <el-tooltip :key="option.name" :content="option.tip" :disabled="!option.tip" :open-delay="500" placement="top">
               <el-dropdown-item
                 :key="option.name"
                 :command="[option, action]"
@@ -56,8 +37,9 @@
                 class="dropdown-item"
                 v-bind="{...option, icon: ''}"
               >
-                <span v-if="actionsHasIcon(action.dropdown)" class="pre-icon">
-                  <Icon v-if="option.icon" :icon="option.icon" />
+                <span v-if="option.icon" class="pre-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>
@@ -69,16 +51,16 @@
       <el-button
         v-else
         :key="action.name"
-        :class="[action.name, {grouped: action.grouped }]"
         :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">
-          <span>
-            <span v-if="action.icon" style="vertical-align: initial">
-              <Icon :icon="action.icon" />
+        <el-tooltip :content="action.tip" :disabled="!action.tip" :open-delay="500" placement="top">
+          <span :title="action.tip">
+            <span v-if="action.icon && !action.icon.startsWith('el-')" style="vertical-align: initial">
+              <i v-if="action.icon.startsWith('fa')" :class="'fa ' + action.icon" />
+              <svg-icon v-else :icon-class="action.icon" />
             </span>
             {{ action.title }}
           </span>
@@ -90,13 +72,9 @@
 
 <script>
 import { toSentenceCase } from '@/utils/common'
-import Icon from '@/components/Widgets/Icon/index.vue'
 
 export default {
   name: 'DataActions',
-  components: {
-    Icon
-  },
   props: {
     grouped: {
       type: Boolean,
@@ -121,9 +99,6 @@ export default {
     }
   },
   methods: {
-    actionsHasIcon(actions) {
-      return actions.some(action => action.icon)
-    },
     hasIcon(action, type = '') {
       const icon = action.icon
       if (!icon) {
@@ -181,7 +156,6 @@ export default {
       delete action['callback']
       delete action['name']
       delete action['can']
-      delete action['split']
       return action
     },
     cleanActions(actions) {
@@ -211,10 +185,6 @@ export default {
         }
         delete action['can']
 
-        if (!action.size) {
-          action.size = 'small'
-        }
-
         if (action.dropdown) {
           action.dropdown = this.cleanActions(action.dropdown)
         }
@@ -239,10 +209,6 @@ $color-drop-menu-border: #e4e7ed;
   .action-item {
     margin-left: 5px;
 
-    &.grouped {
-      margin-left: 0;
-    }
-
     &:first-child {
       margin-left: 0;
     }
@@ -284,11 +250,7 @@ $color-drop-menu-border: #e4e7ed;
 
   .el-button {
     padding: 2px 5px;
-
-    &:not(.is-plain) {
-      color: $btn-text-color;
-    }
-
+    color: $btn-text-color;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -319,6 +281,7 @@ $color-drop-menu-border: #e4e7ed;
 // 下拉 options
 .el-dropdown-menu {
   ::v-deep .more-batch-processing {
+    text-align: center;
 
     &:hover {
       background-color: transparent !important;
@@ -341,7 +304,6 @@ $color-drop-menu-border: #e4e7ed;
 
   .dropdown-item {
     color: var(--color-text-primary);
-    line-height: 34px;
 
     .pre-icon {
       width: 17px;
@@ -363,8 +325,6 @@ $color-drop-menu-border: #e4e7ed;
   }
 
   .el-dropdown-menu__item {
-    padding: 0 20px;
-
     &.is-disabled {
       color: var(--color-disabled);
       cursor: not-allowed;

src/components/Dialog/DiffDetail.vue

@@ -1,7 +1,6 @@
 <template>
   <Dialog
     v-if="detailVisible"
-    :modal="false"
     :show-cancel="false"
     :show-confirm="false"
     :title="title"

src/components/Dialog/ProcessingDialog.vue

@@ -1,71 +0,0 @@
-<template>
-  <Dialog
-    :show-cancel="false"
-    :visible="iVisible"
-    class="processing-dialog"
-    height="300"
-    :title="$tc('Processing')"
-    width="300"
-    @confirm="iVisible=false"
-  >
-    <div id="load">
-      <div class="spinner" />
-    </div>
-  </Dialog>
-</template>
-
-<script>
-import Dialog from './index.vue'
-
-export default {
-  name: 'ProcessingDialog',
-  components: { Dialog },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {}
-  },
-  computed: {
-    iVisible: {
-      get() {
-        return this.visible
-      },
-      set(val) {
-        this.$emit('update:visible', val)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.processing-dialog {
-  ::v-deep .el-dialog__body {
-    overflow: hidden;
-  }
-}
-
-.spinner {
-  width: 100px;
-  height: 100px;
-  border: 5px solid rgba(0, 0, 0, 0.1);
-  border-radius: 50%;
-  border-top-color: var(--color-primary);
-  animation: spin 1s infinite linear;
-}
-
-#load {
-  display: flex;
-  justify-content: center;
-}
-
-@keyframes spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-</style>

src/components/Dialog/RemoteProcessingDialog.vue

@@ -1,69 +0,0 @@
-<template>
-  <Dialog
-    :visible="iVisible"
-    height="300"
-    title="Processing"
-    width="300"
-    class="processing-dialog"
-  >
-    <div id="load">
-      <div class="spinner" />
-    </div>
-  </Dialog>
-</template>
-
-<script>
-import Dialog from './index.vue'
-
-export default {
-  name: 'RemoteProcessingDialog',
-  components: { Dialog },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {}
-  },
-  computed: {
-    iVisible: {
-      get() {
-        return this.visible
-      },
-      set(val) {
-        this.$emit('update:visible', val)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.processing-dialog {
-  ::v-deep .el-dialog__body {
-    overflow: hidden;
-  }
-}
-
-.spinner {
-    width: 100px;
-    height: 100px;
-    border: 5px solid rgba(0, 0, 0, 0.1);
-    border-radius: 50%;
-    border-top-color: var(--color-primary);
-    animation: spin 1s infinite linear;
-}
-
-#load {
-  display: flex;
-  justify-content: center;
-}
-
-@keyframes spin {
-    to {
-        transform: rotate(360deg);
-    }
-}
-</style>

src/components/Dialog/ReportDialog.vue

@@ -1,75 +0,0 @@
-<template>
-  <div>
-    <Dialog
-      v-if="iVisible"
-      :destroy-on-close="true"
-      :show-cancel="false"
-      :show-confirm="false"
-      :title="$tc('Report')"
-      :visible.sync="iVisible"
-      top="35vh"
-      width="80%"
-      @close="loading=true"
-    >
-      <span v-if="loading" v-loading="loading" class="loading" />
-      <iframe title="dialog" :src="url" style="border: none;" @load="onIframeLoad" />
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import Dialog from '@/components/Dialog/index.vue'
-
-export default {
-  name: 'ReportDialog',
-  components: {
-    Dialog
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    url: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loading: true
-    }
-  },
-  computed: {
-    iVisible: {
-      get() {
-        return this.visible
-      },
-      set(val) {
-        this.$emit('update:visible', val)
-      }
-    }
-  },
-  mounted() {
-  },
-  beforeMount() {
-  },
-  methods: {
-    onIframeLoad() {
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-iframe {
-  width: 100%;
-  height: 500px;
-}
-
-.loading {
-  margin-top: 20px;
-  display: block;
-}
-</style>

src/components/Dialog/Secret.vue

@@ -1,96 +0,0 @@
-<template>
-  <Dialog
-    :show-cancel="false"
-    :title="title"
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    width="700px"
-    @close="onClose"
-    @confirm="visible = false"
-  >
-    <el-alert type="warning" :closable="false">
-      {{ warningText }}
-      <div class="secret">
-        <div class="row">
-          <span class="col">ID:</span>
-          <span class="value">{{ keyInfo.id }}</span>
-          <i class="el-icon-copy-document copy-icon" @click="handleCopy(keyInfo.id)" />
-        </div>
-        <div class="row">
-          <span class="col">Secret:</span>
-          <span class="value">{{ keyInfo.secret }}</span>
-          <i class="el-icon-copy-document copy-icon" @click="handleCopy(keyInfo.secret)" />
-        </div>
-      </div>
-    </el-alert>
-  </Dialog>
-</template>
-
-<script>
-import i18n from '@/i18n/i18n'
-import { copy } from '@/utils/common'
-import Dialog from '@/components/Dialog/index'
-
-export default {
-  name: 'Secret',
-  components: {
-    Dialog
-  },
-  props: {
-    title: {
-      type: String,
-      default: () => i18n.t('CreateAccessKey')
-    },
-    warningText: {
-      type: String,
-      default: () => i18n.t('ApiKeyWarning')
-    }
-  },
-  data() {
-    return {
-      keyInfo: { id: '', secret: '' },
-      visible: false
-    }
-  },
-  methods: {
-    show(data) {
-      this.keyInfo = data
-      this.visible = true
-    },
-    onClose() {
-      this.$emit('close')
-    },
-    handleCopy(value) {
-      copy(value)
-    }
-  }
-}
-
-</script>
-
-<style lang='scss' scoped>
- .secret {
-  color: #2b2f3a;
-  margin-top: 20px;
-}
-
-.row {
-  margin-bottom: 10px;
-}
-
-.col {
-  width: 100px;
-  text-align: left;
-  display: inline-block;
-}
-
-.copy-icon {
-  margin-left: 5px;
-  cursor: pointer;
-  transition: color 0.2s;
-}
-
-.value {
-  font-weight: 600;
-}
-</style>

src/components/Dialog/index.vue

@@ -2,7 +2,6 @@
   <transition name="dialog-fade">
     <el-dialog
       :append-to-body="true"
-      :class="{ shadow: shadow }"
       :modal-append-to-body="true"
       :title="title"
       :top="top"
@@ -47,7 +46,7 @@ export default {
     },
     width: {
       type: String,
-      default: '800px'
+      default: '60%'
     },
     showConfirm: {
       type: Boolean,
@@ -80,14 +79,11 @@ export default {
     maxWidth: {
       type: String,
       default: '1200px'
-    },
-    shadow: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
-    return {}
+    return {
+    }
   },
   computed: {
     iWidth() {
@@ -106,69 +102,59 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.dialog.shadow ::v-deep .el-dialog {
-  box-shadow: 1px 2px 12px 0 rgba(0, 0, 0, 0.6);
-}
-
-.dialog ::v-deep .el-dialog {
-  border-radius: 0.3em;
-  max-width: min(100vw, 1500px);
-
-  .form-group-header {
-    margin-left: 20px;
-  }
-
-  .el-form--label-top {
-    .form-group-header {
-      margin-left: 0;
-    }
-  }
-
-  .el-icon-circle-check {
-    display: none;
-  }
-
-  &__header {
-    box-sizing: border-box;
-    padding: 15px 22px;
-    border-bottom: 1px solid #dee2e6;
-    font-weight: 400;
-  }
-
-  &__body {
-    padding: 20px 30px;
-    font-size: 13px;
-
-    &:has(.el-table) {
-      background: #f3f3f4;
-    }
-  }
-
-  &__footer {
-    border-top: 1px solid #dee2e6;
-    padding: 16px 25px;
-    justify-content: flex-end;
-  }
-}
-
-@media (max-width: 900px) {
   .dialog ::v-deep .el-dialog {
-    max-width: calc(100% - 30px);
+    border-radius: 0.3em;
+    max-width: min(100vw, 1500px);
+
+    .form-group-header {
+      margin-left: 20px;
+    }
+
+    .el-icon-circle-check {
+      display: none;
+    }
+
+    &__header {
+      box-sizing: border-box;
+      padding: 15px 22px;
+      border-bottom: 1px solid #dee2e6;
+      font-weight: 400;
+    }
+
+    &__body {
+      padding: 20px 30px;
+      font-size: 13px;
+
+      &:has(.el-table) {
+        background: #f3f3f4;
+      }
+    }
+
+    &__footer {
+      border-top: 1px solid #dee2e6;
+      padding: 16px 25px;
+      justify-content: flex-end;
+    }
   }
-}
 
-.dialog-footer ::v-deep button.el-button {
-  font-size: 13px;
-  padding: 8px 12px;
-}
+  @media (max-width: 900px) {
+    .dialog ::v-deep .el-dialog {
+      max-width: calc(100% - 30px);
+    }
+  }
 
-.dialog-fade-enter-active, .dialog-fade-leave-active {
-  transition: opacity 1s ease;
-}
+  .dialog-footer ::v-deep button.el-button {
+    font-size: 13px;
+    padding: 8px 12px;
+  }
 
-.dialog-fade-enter, .dialog-fade-leave-to /* .dialog-fade-leave-active 在 <2.1.8 中以及被重复声明 */
-{
-  opacity: 0;
-}
+  .dialog-fade-enter-active, .dialog-fade-leave-active {
+    transition: opacity 1s ease;
+  }
+
+  .dialog-fade-enter, .dialog-fade-leave-to /* .dialog-fade-leave-active 在 <2.1.8 中以及被重复声明 */
+  {
+    opacity: 0;
+  }
 
 </style>

src/components/Drawer/index.vue

@@ -1,305 +0,0 @@
-<template>
-  <el-drawer
-    ref="drawer"
-    v-el-drawer-drag-width
-    :append-to-body="true"
-    :before-close="handleClose"
-    :class="['drawer', { 'drawer__no-footer': !hasFooter }]"
-    :modal="modal"
-    :size="size"
-    :title="title"
-    :visible.sync="iVisible"
-    custom-class="drawer"
-    destroy-on-close
-    direction="rtl"
-    v-on="$listeners"
-  >
-    <div class="drawer__content">
-      <slot name="default">
-        <component
-          :is="component"
-          v-if="component"
-          ref="dynamicComponent"
-          v-bind="componentProps"
-          v-on="componentListeners"
-        />
-      </slot>
-    </div>
-    <div v-if="hasFooter" ref="drawerFooter" class="drawer__footer" />
-  </el-drawer>
-</template>
-
-<script>
-import { getDrawerWidth } from '@/utils/common'
-
-export default {
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    size: {
-      type: String,
-      default: () => {
-        return getDrawerWidth()
-      }
-    },
-    component: {
-      type: [String, Function, Object],
-      default: ''
-    },
-    componentProps: {
-      type: Object,
-      default: () => ({})
-    },
-    componentListeners: {
-      type: Object,
-      default: () => ({})
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    modal: {
-      type: Boolean,
-      default: true
-    },
-    hasFooter: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      formLabelWidth: '80px'
-    }
-  },
-  computed: {
-    iVisible: {
-      get() {
-        return this.visible
-      },
-      set(val) {
-        this.$emit('update:visible', val)
-      }
-    }
-  },
-  mounted() {
-  },
-  methods: {
-    handleClose(done) {
-      this.$emit('close-drawer')
-      done()
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.drawer__no-footer {
-  ::v-deep {
-    .drawer {
-      .page {
-        height: calc(100vh - 55px);
-      }
-    }
-  }
-}
-
-@media (max-width: 992px) {
-  .drawer ::v-deep {
-    .el-form-item {
-      display: flex;
-      flex-direction: column;
-      gap: 0.3rem;
-    }
-  }
-}
-
-.drawer {
-  ::v-deep {
-    min-width: 565px;
-
-    .el-card__body {
-      padding-top: 10px;
-      padding-bottom: 20px;
-    }
-
-    .page-submenu {
-      .el-tabs__header {
-        padding: 0 15px;
-      }
-
-      .el-tabs__item.is-top {
-        padding: 0 10px;
-      }
-    }
-
-    .form-buttons {
-      margin-left: 13px;
-    }
-
-    .el-form {
-      margin-right: 1px;
-      padding-right: 15px;
-      height: 100%;
-
-      &.detail-card {
-        padding-right: 0;
-        margin-top: unset;
-      }
-
-      // Detail 中
-      &.content {
-        margin-right: 0;
-      }
-
-      .form-buttons {
-        //position: absolute;
-        // bottom: 13px;
-        // margin-left: 20%;
-        // margin-top: 0;
-      }
-
-      // Form 中的子 form
-      .el-form {
-        margin-left: 0;
-        margin-top: 0;
-        margin-bottom: 0;
-      }
-
-      .el-form-item {
-        .el-form-item__label {
-          padding-right: 20px;
-        }
-
-        .el-radio {
-          line-height: 25px;
-          margin-right: 13px;
-
-          .el-radio__label {
-            padding-left: 5px;
-          }
-        }
-      }
-
-      &.el-form--label-top {
-        .el-radio-group {
-          .el-radio {
-            display: block;
-            padding-bottom: 3px;
-          }
-        }
-
-        .el-form-item {
-          padding-left: 12px;
-
-          .el-form-item__label {
-            padding: 0 20px 0 0;
-            line-height: 30px;
-          }
-
-          .sub-form {
-            margin-left: -1px;
-
-            .form-fields {
-              max-height: unset;
-            }
-          }
-        }
-
-        &.form-fields {
-          //overflow: auto;
-          //max-height: calc(100vh - 180px);
-        }
-
-        .el-checkbox-group {
-          .el-checkbox {
-            display: block;
-            padding-bottom: 3px;
-          }
-        }
-
-        .el-form-item__content:has(.el-checkbox):not(:has(.el-checkbox-group)) {
-          display: inline-block; /* 更改为 inline-block */
-          //width: unset; /* 这个设置上去后，平台详情中， Automations 会有问题 */
-          vertical-align: bottom;
-        }
-
-        .el-form-item__content {
-          form {
-            .el-form-item {
-              padding-left: 0;
-            }
-          }
-        }
-      }
-
-      .form-group-header {
-        margin-left: 20px;
-      }
-    }
-
-    .el-drawer__header {
-      border-bottom: 1px solid #EBEEF5;
-      margin-bottom: 0;
-      padding: 15px 20px;
-      font-size: 16px;
-      font-weight: 500;
-      color: var(--color-text-primary);
-    }
-
-    .sql.container {
-      display: none;
-    }
-
-    .page {
-      overflow-y: auto;
-
-      height: calc(100vh - 110px);
-
-      &.tab-page {
-        .page-content {
-          padding-right: 0;
-          padding-left: 0;
-        }
-      }
-
-      .page-content {
-        height: unset;
-        padding-right: 10px;
-        padding-left: 20px;
-
-        & > div {
-          margin-bottom: 1px;
-        }
-      }
-
-      .ibox {
-        margin-bottom: 10px;
-        border: none;
-      }
-    }
-
-    .drawer__content, .tab-page-content {
-      height: 100%;
-      background: #f3f3f3;
-    }
-
-    .drawer__footer {
-      border-top: solid 1px #f3f3f3;
-    }
-
-    //.el-drawer__header {
-    //  margin-bottom: 20px;
-    //
-    //  span {
-    //    font-size: 16px;
-    //    font-weight: 800;
-    //    color: var(--color-text-primary);
-    //  }
-    //}
-  }
-}
-</style>

src/components/Form/AutoDataForm/index.vue

@@ -1,27 +1,25 @@
 <template>
-  <div>
-    <DataForm
-      v-if="!loading"
-      ref="dataForm"
-      :fields="totalFields"
-      :form="iForm"
-      v-bind="$attrs"
-      v-on="$listeners"
+  <DataForm
+    v-if="!loading"
+    ref="dataForm"
+    :fields="totalFields"
+    :form="iForm"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <div
+      v-for="(group, i) in groups"
+      :key="'group-'+group.name"
+      :slot="'id:'+group.name"
     >
-      <template
-        v-for="(group, i) in groups"
-        :slot="'id:'+group.name"
-      >
-        <FormGroupHeader
-          v-if="!groupHidden(group, i)"
-          :key="'group-' + group.name"
-          :group="group"
-          :index="i"
-          :line="i !== 0 && !groupHidden(groups[i - 1], i - 1)"
-        />
-      </template>
-    </DataForm>
-  </div>
+      <FormGroupHeader
+        v-if="!groupHidden(group, i)"
+        :group="group"
+        :index="i"
+        :line="i !== 0 && !groupHidden(groups[i - 1], i - 1)"
+      />
+    </div>
+  </DataForm>
 </template>
 
 <script>
@@ -89,7 +87,6 @@ export default {
     }
   },
   mounted() {
-    // this.$log.debug('>>> Method: ', this.method)
     this.optionUrlMetaAndGenerateColumns()
   },
   methods: {
@@ -140,11 +137,14 @@ export default {
       this._cleanFormValue(this.iForm, this.remoteMeta)
     },
     setFieldError(name, error) {
-      error = error.replace(/[。.]+$/, '')
       const field = this.totalFields.find((v) => v.prop === name)
       if (!field) {
         return
       }
+      if (field.attrs.error === error) {
+        error += '.'
+      }
+
       if (typeof error === 'string') {
         field.el.errors = error
         field.attrs.error = error
@@ -163,6 +163,5 @@ export default {
       return true
     }
   }
-
 }
 </script>

src/components/Form/AutoDataForm/utils.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import ObjectSelect2 from '@/components/Form/FormFields/NestedObjectSelect2.vue'
 import NestedField from '@/components/Form/AutoDataForm/components/NestedField.vue'
+import Switcher from '@/components/Form/FormFields/Switcher.vue'
 import rules from '@/components/Form/DataForm/rules'
 import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
 import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
@@ -63,9 +64,8 @@ export class FormFieldGenerator {
         }
         break
       case 'boolean':
-        type = 'checkbox'
-        // field.component = Switcher
-        // field.type = 'checkbox'
+        type = ''
+        field.component = Switcher
         break
       case 'list':
         type = 'input'
@@ -112,7 +112,7 @@ export class FormFieldGenerator {
     let nestedFields = fieldMeta.fields || []
     const nestedFieldsMeta = fieldMeta.fieldsMeta || {}
     const nestedFieldsRemoteMeta = fieldRemoteMeta.children || {}
-    if (nestedFields.toString() === '__all__') {
+    if (nestedFields === '__all__') {
       nestedFields = Object.keys(nestedFieldsRemoteMeta)
     }
     for (const name of nestedFields) {

src/components/Form/CronTab/Crontab.vue

@@ -361,10 +361,9 @@ export default {
     },
     // 填充表达式
     submitFill() {
-      const minMinutes = 60
       const crontabDiffMin = this.crontabDiff / 1000 / 60
-      if (crontabDiffMin > 0 && crontabDiffMin < minMinutes) {
-        const msg = this.$t('CrontabDiffError', { minutes: minMinutes })
+      if (crontabDiffMin > 0 && crontabDiffMin < 10) {
+        const msg = this.$tc('CrontabDiffError')
         this.$message.error(msg)
         return
       }

src/components/Form/CronTab/components/Crontab-Hour.vue

@@ -10,18 +10,15 @@
     <el-form-item>
       <el-radio v-model="radioValue" :label="2">
         {{ this.$t('From') }}
-        <el-input-number v-model="cycle01" :max="23" :min="0" size="mini" />
-        -
-        <el-input-number v-model="cycle02" :max="23" :min="0" size="mini" />
-        {{ this.$t('Hour') }}
+        <el-input-number v-model="cycle01" :max="60" :min="0" size="mini" /> -
+        <el-input-number v-model="cycle02" :max="60" :min="0" size="mini" /> {{ this.$t('Hour') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('Every') }}
-        <el-input-number v-model="average02" :max="23" :min="1" size="mini" />
-        {{ this.$t('Hour') }} {{ this.$t('ExecuteOnce') }}
+        <el-input-number v-model="average02" :max="60" :min="1" size="mini" /> {{ this.$t('Hour') }} {{ this.$t('ExecuteOnce') }}
       </el-radio>
     </el-form-item>
 
@@ -35,7 +32,7 @@
           multiple
           style="width:100%"
         >
-          <el-option v-for="item in 24" :key="item" :value="item-1">{{ item - 1 }}</el-option>
+          <el-option v-for="item in 24" :key="item" :value="item-1">{{ item-1 }}</el-option>
         </el-select>
       </el-radio>
     </el-form-item>

src/components/Form/CronTab/components/Crontab-Min.vue

@@ -9,7 +9,7 @@
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('From') }}
-        <el-input-number v-model="average02" :max="59" :min="1" size="mini" />
+        <el-input-number v-model="average02" :max="60" :min="1" size="mini" />
         {{ this.$t('Min') }} {{ this.$t('ExecuteOnce') }}
       </el-radio>
     </el-form-item>

src/components/Form/CronTab/index.vue

@@ -39,13 +39,6 @@ export default {
       showCron: false
     }
   },
-  watch: {
-    value: {
-      handler(val) {
-        this.crontabFill(val)
-      }
-    }
-  },
   methods: {
     crontabFill(value) {
       // 确定后回传的值

src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue

@@ -8,21 +8,18 @@
     v-bind="data.attrs"
   >
     <template v-if="data.label" #label>
-      <span :title="data.label">
-        <span v-if="data.required">* </span>
-        {{ data.label }}
-        <el-tooltip
-          v-if="data.helpTip"
-          :open-delay="500"
-          :tabindex="-1"
-          effect="dark"
-          placement="right"
-          popper-class="help-tips"
-        >
-          <div slot="content" v-sanitize="data.helpTip" class="help-tip-content" /> <!-- Noncompliant -->
-          <i class="fa fa-question-circle-o help-tip-icon" />
-        </el-tooltip>
-      </span>
+      <span>{{ data.label }}</span>
+      <el-tooltip
+        v-if="data.helpTip"
+        :open-delay="500"
+        :tabindex="-1"
+        effect="dark"
+        placement="right"
+        popper-class="help-tips"
+      >
+        <div slot="content" v-sanitize="data.helpTip" class="help-tip-content" /> <!-- Noncompliant -->
+        <i class="fa fa-question-circle-o help-tip-icon" />
+      </el-tooltip>
     </template>
     <template v-if="readonly && hasReadonlyContent">
       <div
@@ -74,7 +71,6 @@
           <el-tooltip v-if="opt.tip" :content="opt.tip" :open-delay="500" placement="top">
             <i class="el-icon-warning-outline" />
           </el-tooltip>
-          <span v-if="data.helpText">{{ data.helpText }}</span>
         </el-checkbox>
         <!-- WARNING: radio 用 label 属性来表示 value 的含义 -->
         <!-- FYI: radio 的 value 属性可以在没有 radio-group 时用来关联到同一个 v-model -->
@@ -91,7 +87,7 @@
         </el-radio>
       </template>
     </custom-component>
-    <div v-if="data.helpText" :class="data.type" class="help-block">
+    <div v-if="data.helpText" class="help-block">
       <el-alert
         v-if="data.helpText.startsWith('!')"
         :closable="false"
@@ -103,9 +99,6 @@
       </el-alert>
       <span v-else v-sanitize="data.helpText" />
     </div>
-    <div v-if="data.helpTextFormatter" class="help-block">
-      <RenderHelpTextSafe :render-content="data.helpTextFormatter" />
-    </div>
   </el-form-item>
 </template>
 <script>
@@ -128,18 +121,6 @@ function validator(data) {
 
 export default {
   components: {
-    RenderHelpTextSafe: {
-      functional: true,
-      props: {
-        renderContent: {
-          type: Function,
-          required: true
-        }
-      },
-      render(h, { props }) {
-        return props.renderContent()
-      }
-    },
     /**
      * 🐂🍺只需要有组件选项对象，就可以立刻包装成函数式组件在 template 中使用
      * FYI: https://cn.vuejs.org/v2/guide/render-function.html#%E5%87%BD%E6%95%B0%E5%BC%8F%E7%BB%84%E4%BB%B6
@@ -334,10 +315,6 @@ export default {
   ::v-deep .el-alert__icon {
     font-size: 16px
   }
-
-  &.checkbox {
-    //display: inline;
-  }
 }
 
 .help-tip-icon {

src/components/Form/DataForm/index.vue

@@ -1,71 +1,68 @@
 <template>
-  <div>
-    <ElFormRender
-      :id="id"
-      ref="form"
-      :class="[mobile ? 'mobile' : 'desktop']"
-      :content="fields"
-      :form="basicForm"
-      :label-position="iLabelPosition"
-      class="form-fields"
-      label-width="25%"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <!-- slot 透传 -->
-      <slot
-        v-for="item in fields"
-        :slot="`id:${item.id}`"
-        :name="`id:${item.id}`"
-      />
-      <slot
-        v-for="item in fields"
-        :slot="`$id:${item.id}`"
-        :name="`$id:${item.id}`"
-      />
+  <ElFormRender
+    :id="id"
+    ref="form"
+    :class="mobile ? 'mobile' : 'desktop'"
+    :content="fields"
+    :form="basicForm"
+    :label-position="labelPosition"
+    label-width="25%"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <!-- slot 透传 -->
+    <slot
+      v-for="item in fields"
+      :slot="`id:${item.id}`"
+      :name="`id:${item.id}`"
+    />
+    <slot
+      v-for="item in fields"
+      :slot="`$id:${item.id}`"
+      :name="`$id:${item.id}`"
+    />
 
-      <div v-if="hasButtons" class="form-buttons">
-        <el-button
-          v-if="defaultButton"
-          :disabled="!canSubmit"
-          :loading="isSubmitting"
-          :size="submitBtnSize"
-          type="primary"
-          @click="submitForm('form')"
-        >
-          {{ iSubmitBtnText }}
-        </el-button>
+    <el-form-item v-if="hasButtons" class="form-buttons">
+      <el-button
+        v-if="defaultButton"
+        :disabled="!canSubmit"
+        :loading="isSubmitting"
+        :size="submitBtnSize"
+        type="primary"
+        @click="submitForm('form')"
+      >
+        {{ iSubmitBtnText }}
+      </el-button>
 
-        <el-button
-          v-if="defaultButton && hasSaveContinue"
-          size="small"
-          @click="submitForm('form', true)"
-        >
-          {{ $t("SaveAndAddAnother") }}
-        </el-button>
+      <el-button
+        v-if="defaultButton && hasSaveContinue"
+        size="small"
+        @click="submitForm('form', true)"
+      >
+        {{ $t("SaveAndAddAnother") }}
+      </el-button>
 
-        <el-button
-          v-if="defaultButton && hasReset"
-          size="small"
-          @click="resetForm('form')"
-        >
-          {{ $t("Reset") }}
-        </el-button>
+      <el-button
+        v-if="defaultButton && hasReset"
+        size="small"
+        @click="resetForm('form')"
+      >
+        {{ $t("Reset") }}
+      </el-button>
 
-        <el-button
-          v-for="button in moreButtons"
-          v-show="!button.hidden"
-          :key="button.title"
-          :loading="button.loading"
-          size="small"
-          v-bind="button"
-          @click="handleClick(button)"
-        >
-          {{ button.title }}
-        </el-button>
-      </div>
-    </ElFormRender>
-  </div>
+      <el-button
+        v-for="button in moreButtons"
+        v-show="!button.hidden"
+        :key="button.title"
+        :loading="button.loading"
+        size="small"
+        v-bind="button"
+        @click="handleClick(button)"
+      >
+        {{ button.title }}
+      </el-button>
+    </el-form-item>
+  </ElFormRender>
 </template>
 
 <script>
@@ -124,10 +121,6 @@ export default {
     isSubmitting: {
       type: Boolean,
       default: false
-    },
-    labelPosition: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -144,17 +137,7 @@ export default {
     mobile() {
       return this.$store.state.app.device === 'mobile'
     },
-    drawer() {
-      return this.$store.state.common.inDrawer
-    },
-    iLabelPosition() {
-      if (this.labelPosition) {
-        return this.labelPosition
-      }
-      // if (this.drawer) {
-      //   return 'left'
-      // }
-      // return this.drawer || this.mobile ? 'top' : 'right'
+    labelPosition() {
       return this.mobile ? 'top' : 'right'
     }
   },
@@ -228,17 +211,13 @@ export default {
     color: var(--color-text-primary);
   }
 
-  &.label-top {
-    ::v-deep .el-form-item {
-      .el-form-item__content {
-        width: 100%;
-      }
-    }
-  }
-
   ::v-deep .el-form-item {
     margin-bottom: 10px;
 
+    .item-params {
+      margin-top: 0;
+    }
+
     .el-form-item__label {
       padding: 0 30px 0 0;
       line-height: 30px;
@@ -251,15 +230,6 @@ export default {
       i {
         color: var(--color-icon-primary);
       }
-
-      span {
-        max-width: calc(100% - 25px);
-        //white-space: nowrap; /* 禁止换行 */
-        //text-overflow: ellipsis;
-        overflow: hidden;
-        display: inline-block;
-        line-height: 16px;
-      }
     }
 
     .el-form-item__content {
@@ -335,9 +305,8 @@ export default {
     }
   }
 
-  ::v-deep .form-buttons {
-    margin-top: 30px;
-    margin-left: 25%;
+  ::v-deep .el-form-item.form-buttons {
+    margin-top: 20px;
   }
 }
 

src/components/Form/FormFields/AttrInput.vue

@@ -27,9 +27,7 @@ export default {
     },
     beforeSubmit: {
       type: Function,
-      default: (val) => {
-        return true
-      }
+      default: (val) => { return true }
     }
   },
   data() {
@@ -52,16 +50,14 @@ export default {
 ::v-deep .el-select {
   width: 100%;
 }
-
 ::v-deep .el-form-item__content {
   width: 100% !important;
 }
-
 ::v-deep .form-buttons {
   margin: 0 !important;
 }
-
 .attr-input {
+  margin-top: -10px;
 }
 </style>
 

src/components/Form/FormFields/BasicTree.vue

@@ -47,9 +47,6 @@ export default {
   },
   computed: {
     iValue() {
-      if (!this.value) {
-        return []
-      }
       return this.value.map(item => {
         if (item.value) {
           return item.value
@@ -118,73 +115,6 @@ export default {
     color: #999;
   }
 
-  .el-tree > .el-tree-node:after {
-    border-top: none;
-  }
-
-  //节点有间隙，隐藏掉展开按钮就好了,如果觉得空隙没事可以删掉
-  .el-tree-node__expand-icon.is-leaf {
-    display: none;
-  }
-
-  .el-tree > .el-tree-node:before {
-    border-left: none;
-    display: none;
-  }
-
-  .el-tree > .el-tree-node:after {
-    border-top: none;
-    display: none;
-  }
-
-  .el-tree-node__children {
-    padding-left: 13px;
-
-    .el-tree-node {
-      position: relative;
-      padding-left: 13px;
-
-      &:before {
-        content: "";
-        left: -4px;
-        position: absolute;
-        right: auto;
-        border-width: 1px;
-      }
-
-      &:first-child::before {
-        display: none;
-      }
-
-      &:last-child:before {
-        height: 38px;
-      }
-
-      &:before {
-        border-left: 1px dashed #dcdcdc;
-        bottom: 0;
-        height: 100%;
-        top: -26px;
-        width: 1px;
-      }
-
-      &:after {
-        content: "";
-        left: -4px;
-        position: absolute;
-        right: auto;
-        border-width: 1px;
-      }
-
-      &:after {
-        border-top: 1px dashed #dcdcdc;
-        height: 20px;
-        top: 12px;
-        width: 24px;
-      }
-    }
-  }
-
   .el-tree-node__content:hover {
     background-color: transparent;
   }
@@ -199,7 +129,7 @@ export default {
     }
 
     .el-tree-node__children {
-      //margin-left: -25px;
+      margin-left: -25px;
     }
   }
 }

src/components/Form/FormFields/DatetimeRangePicker.vue

@@ -5,11 +5,11 @@
     :default-time="['00:00:01', '23:59:59']"
     :end-placeholder="$tc('DateEnd')"
     :picker-options="pickerOptions"
+    :range-separator="$tc('To')"
     :start-placeholder="$tc('DateStart')"
-    :type="type"
     class="datepicker"
-    range-separator="-"
     size="small"
+    type="datetimerange"
     v-bind="$attrs"
     @change="handleDateChange"
     v-on="$listeners"
@@ -28,15 +28,6 @@ export default {
     dateEnd: {
       type: [Number, String, Date],
       default: null
-    },
-    type: {
-      type: String,
-      default: 'daterange'
-      // default: 'datetimerange'
-    },
-    toMinMax: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
@@ -44,10 +35,6 @@ export default {
     const endValue = this.dateEnd || this.$route.query['date_end']
     const dateStart = new Date(startValue)
     const dateTo = new Date(endValue)
-    if (this.toMinMax) {
-      dateStart.setHours(0, 0, 0, 0)
-      dateTo.setHours(23, 59, 59, 999)
-    }
     return {
       value: [dateStart, dateTo],
       pickerOptions: {
@@ -87,13 +74,9 @@ export default {
       }
     },
     onShortcutClick(picker, day) {
-      let start = new Date()
-      let end = new Date()
+      const end = new Date()
+      const start = new Date()
       start.setTime(start.getTime() - 3600 * 1000 * 24 * day)
-      if (this.toMinMax) {
-        start = new Date(start.setHours(0, 0, 0, 0))
-        end = new Date(end.setHours(23, 59, 59, 999))
-      }
       picker.$emit('pick', [start, end])
     }
   }
@@ -101,18 +84,9 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-html:lang(pt-br) {
-  .datepicker ::v-deep .el-range-separator {
-    padding: 0 10px;
-  }
-}
-
 .datepicker {
-  &.el-date-editor--daterange.el-input__inner {
-    width: 243px;
-  }
-
   margin-left: 10px;
+  width: 233px;
   border: 1px solid #dcdee2;
   border-radius: 2px;
   height: 28px;

src/components/Form/FormFields/PasswordInput.vue

@@ -5,9 +5,7 @@
     v-bind="iAttrs"
     @input="handleInput"
     v-on="$listeners"
-  >
-    hello
-  </Password>
+  />
 </template>
 
 <script>

src/components/Form/FormFields/PasswordRule.vue

@@ -55,22 +55,22 @@ export default {
           {
             id: 'uppercase',
             label: this.$t('Uppercase'),
-            type: 'checkbox'
+            type: 'switch'
           },
           {
             id: 'lowercase',
             label: this.$t('Lowercase'),
-            type: 'checkbox'
+            type: 'switch'
           },
           {
             id: 'digit',
             label: this.$t('Digit'),
-            type: 'checkbox'
+            type: 'switch'
           },
           {
             id: 'symbol',
             label: this.$t('SpecialSymbol'),
-            type: 'checkbox'
+            type: 'switch'
           },
           {
             id: 'exclude_symbols',

src/components/Form/FormFields/PhoneInput.vue

@@ -5,6 +5,7 @@
         slot="prepend"
         :placeholder="$tc('Select')"
         :value="rawValue.code"
+        style="width: 105px;"
         @change="onChange"
       >
         <el-option
@@ -68,11 +69,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-.el-select {
-  width: 85px;
-}
-
+<style scoped>
 .country-name {
   display: inline-block;
   width: 150px;

src/components/Form/FormFields/ProtocolSelector/ProtocolSettingDialog.vue

@@ -3,7 +3,6 @@
     v-if="$attrs.visible"
     :close-on-click-modal="false"
     :destroy-on-close="true"
-    :modal="false"
     :show-cancel="false"
     :show-confirm="false"
     :title="$tc('PlatformProtocolConfig') + '：' + protocol.name"
@@ -53,7 +52,6 @@ export default {
     const vm = this
     const platform = this.$route.query.platform
     return {
-      platform: '',
       loading: true,
       form: this.protocol,
       platformDetail: platform ? '#/console/assets/platforms/' + platform : '',
@@ -98,29 +96,11 @@ export default {
       }
     }
   },
-  async mounted() {
-    try {
-      const drawActionMeta = await this.$store.dispatch('common/getDrawerActionMeta')
-      const platform = drawActionMeta.row.platform.id
-      const name = drawActionMeta.row.platform.name
-
-      if (platform) {
-        this.platformDetail = `/ui/#/settings/platforms?id=${platform}&name=${name}`
-      } else {
-        this.platformDetail = ''
-      }
-    } catch (e) {
-      throw new Error(e)
-    }
-  },
   methods: {
     onSubmit(form) {
       this.protocol = Object.assign(this.protocol, form)
       this.$emit('update:visible', false)
       this.$emit('confirm', this.protocol)
-    },
-    openInNewTab() {
-      window.open(this.platformDetail, '_blank')
     }
   }
 }

src/components/Form/FormFields/TagInput.vue

@@ -78,18 +78,16 @@ export default {
   },
   data() {
     return {
+      filterTags: this.value,
       focus: false,
       filterValue: '',
-      filterTags: this.value,
-      isCheckShowPassword: this.replaceShowPassword
+      isCheckShowPassword: this.replaceShowPassword,
+      component: this.autocomplete ? 'el-autocomplete' : 'el-input'
     }
   },
   computed: {
     iPlaceholder() {
       return `${this.placeholder} (${this.$t('EnterToContinue')})`
-    },
-    component() {
-      return this.autocomplete !== null ? 'el-autocomplete' : 'el-input'
     }
   },
   watch: {
@@ -100,7 +98,7 @@ export default {
   methods: {
     handleTagClose(tag) {
       this.filterTags.splice(this.filterTags.indexOf(tag), 1)
-      this.handleConfirm()
+      this.$emit('change', this.filterTags)
     },
     handleSelect(item) {
       this.filterValue = item.value
@@ -115,9 +113,8 @@ export default {
       if (!this.filterTags.includes(this.filterValue)) {
         this.filterTags.push(this.filterValue)
         this.filterValue = ''
+        this.$emit('change', this.filterTags)
       }
-      this.$emit('change', this.filterTags)
-      this.$emit('input', this.filterTags)
       this.$refs.SearchInput.focus()
     },
     handleTagClick(v, k) {
@@ -154,7 +151,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  //padding: 0 6px;
+  padding: 1px 2px 1px;
   border: 1px solid #dcdee2;
   border-radius: 1px;
   background-color: #fff;
@@ -165,9 +162,8 @@ export default {
   }
 
   & ::v-deep .el-tag {
-    margin-bottom: 1px;
+    margin-top: 1px;
     font-family: sans-serif !important;
-    margin-left: 5px;
   }
 
   & ::v-deep .el-autocomplete {
@@ -181,8 +177,7 @@ export default {
   & ::v-deep .el-input__inner {
     max-width: 100%;
     border: none;
-    padding-left: 12px;
-    height: 28px;
+    padding-left: 10px;
   }
 }
 
@@ -192,7 +187,7 @@ export default {
 }
 
 .filter-field ::v-deep .el-input__inner {
-  height: 27px !important;
+  height: 28px;
 }
 
 .show-password {

src/components/Form/FormFields/UpdateToken.vue

@@ -1,27 +1,21 @@
 <template>
-  <div class="update-token">
+  <div>
     <el-button v-show="!isShow" icon="el-icon-edit" type="text" @click="isShow=true">
       {{ text }}
     </el-button>
     <el-input
       v-show="isShow"
       v-model.trim="curValue"
-      :disabled="disabled"
       :placeholder="placeholder"
       :type="type"
-      class="password-input"
+      autocomplete="new-password"
       show-password
       @change="onChange"
     />
-    <el-button :disabled="disabled" size="small" type="text" @click="randomPassword">
-      <i class="fa fa-refresh" />
-    </el-button>
   </div>
 </template>
 
 <script>
-import { randomString } from '@/utils/string'
-
 export default {
   props: {
     value: {
@@ -45,10 +39,6 @@ export default {
     placeholder: {
       type: String,
       default: () => ''
-    },
-    disabled: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -65,24 +55,7 @@ export default {
   methods: {
     onChange(e) {
       this.$emit('input', this.curValue)
-    },
-    randomPassword() {
-      this.curValue = randomString(24, true)
-      this.$emit('input', this.curValue)
     }
   }
 }
 </script>
-<style lang='scss' scoped>
-.password-input {
-  width: calc(100% - 50px);
-}
-
-.update-token {
-  i {
-    color: var(--color-text-secondary);
-    font-size: 14px;
-  }
-}
-
-</style>

src/components/Form/FormFields/UploadField.vue

@@ -8,11 +8,8 @@
     <div v-if="tip !== ''" class="help-block">{{ tip }}</div>
     <input v-model="value" hidden type="text" v-on="$listeners">
     <div>
-      <img v-if="preview" :class="showBG ? 'show-bg' : ''" :src="preview" v-bind="$attrs" alt="">
+      <img :class="showBG ? 'show-bg' : ''" :src="preview" v-bind="$attrs">
     </div>
-    <el-button v-if="fileName" size="mini" type="danger" @click.native.stop="resetUpload">
-      {{ this.$t('Cancel') }}
-    </el-button>
   </div>
 </template>
 
@@ -58,29 +55,21 @@ export default {
     },
     Onchange(e) {
       const upLoadFile = e.target.files[0]
-
       if (upLoadFile === undefined) {
+        this.$emit('input', this.initial)
         return
       }
-
       this.fileName = upLoadFile?.name || ''
       this.$emit('fileChange', upLoadFile)
       this.$emit('input', this.getObjectURL(upLoadFile))
     },
-    resetUpload() {
-      this.fileName = ''
-      this.preview = ''
-      this.$refs.upLoadFile.value = ''
-      this.$emit('input', '')
-      this.$emit('fileChange', null)
-    },
     getObjectURL(file) {
       let url = null
-      if (window.createObjectURL !== undefined) {
+      if (window.createObjectURL !== undefined) { // basic
         url = window.createObjectURL(file)
-      } else if (window.URL !== undefined) {
+      } else if (window.URL !== undefined) { // mozilla(firefox)
         url = window.URL.createObjectURL(file)
-      } else if (window.webkitURL !== undefined) {
+      } else if (window.webkitURL !== undefined) { // webkit or chrome
         url = window.webkitURL.createObjectURL(file)
       }
       return url

src/components/Form/FormFields/WeekCronSelect.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="c-weektime">
     <div class="c-schedue" />
-    <div :class="{'c-schedue': true, 'c-schedue-notransi': mode}" />
+    <div :class="{'c-schedue': true, 'c-schedue-notransi': mode}" :style="styleValue" />
     <table :class="{'c-min-table': colspan < 2}" class="c-weektime-table">
       <thead class="c-weektime-head">
         <tr>
@@ -14,7 +14,7 @@
         </tr>
       </thead>
       <tbody class="c-weektime-body" @mouseleave="containerLeave()">
-        <tr v-for="t in weekTimeData" :key="t.row">
+        <tr v-for="t in weektimeData" :key="t.row">
           <td>{{ t.value }}</td>
           <td
             v-for="n in t.child"
@@ -45,7 +45,6 @@
 const createArr = len => {
   return Array.from(Array(len)).map((ret, id) => id)
 }
-
 function splicing(list) {
   let same
   let i = -1
@@ -68,7 +67,6 @@ function splicing(list) {
   arr.shift()
   return arr.join('')
 }
-
 export default {
   name: 'WeekCronSelect',
   props: {
@@ -79,7 +77,7 @@ export default {
     colspan: {
       type: Number,
       default() {
-        return 1
+        return 2
       }
     }
   },
@@ -102,7 +100,7 @@ export default {
         this.$t('Saturday'),
         this.$t('Sunday')
       ],
-      weekTimeData: [],
+      weektimeData: [],
       timeRange: [] // 格式化之后数据
     }
   },
@@ -144,10 +142,10 @@ export default {
         return {
           value: ret,
           row: index,
-          child: children(ret, index, 24 * this.colspan)
+          child: children(ret, index, 48)
         }
       })
-      this.weekTimeData = isData
+      this.weektimeData = isData
     },
     // 反解析传递过来的默认值
     nextValue() {
@@ -170,19 +168,19 @@ export default {
       const [start, end] = val.split('~')
       const startVal = this.countIndex(start)
       const endVal = this.countIndex(end)
-      for (let i = startVal; i < (endVal === 0 ? 24 : endVal); i++) {
-        const curWeek = this.weekTimeData[idNum]
-        const curChild = curWeek.child[i]
-        if (curChild) {
-          curChild.check = true
-        }
+      for (let i = startVal; i < (endVal === 0 ? 48 : endVal); i++) {
+        const curWeek = this.weektimeData[idNum]
+        curWeek.child[i].check = true
       }
     },
     // 计算索引
     countIndex(val) {
       const one = val.substr(0, 2)
-      const index = one.startsWith('0') ? one.substr(1, 2) : one
-      return Number(index)
+      const a1 = one.startsWith('0') ? one.substr(1, 2) : one
+      var reg = RegExp(/30/)
+      const a2 = val.match(reg) ? 1 : 0
+      const curIndex = (a1 * 2) + a2
+      return curIndex
     },
     formatDate(date, fmt) {
       const o = {
@@ -211,9 +209,8 @@ export default {
       const nowDate = new Date(timeStamp).getTime()
       const targetStamp = new Date(nowDate + offsetGMT * 60 * 1000 + timezone * 60 * 60 * 1000).getTime()
 
-      // (2 / this.colspan) 原来是一个单元格 30分钟，现在是一个单元格 30 * 2 / this.colspan 分钟
-      const beginStamp = targetStamp + col * 1800000 * (2 / this.colspan) // col * 30 * 60 * 1000
-      const endStamp = beginStamp + 1800000 * (2 / this.colspan)
+      const beginStamp = targetStamp + col * 1800000 // col * 30 * 60 * 1000
+      const endStamp = beginStamp + 1800000
 
       const begin = this.formatDate(new Date(beginStamp), 'hh:mm')
       const end = this.formatDate(new Date(endStamp), 'hh:mm')
@@ -221,7 +218,7 @@ export default {
     },
     // 清空时间段
     clearWeektime() {
-      this.weekTimeData.forEach(item => {
+      this.weektimeData.forEach(item => {
         item.child.forEach(t => {
           this.$set(t, 'check', false)
         })
@@ -231,7 +228,7 @@ export default {
     },
     // 全选
     selectAll() {
-      this.weekTimeData.forEach(item => {
+      this.weektimeData.forEach(item => {
         item.child.forEach(t => {
           this.$set(t, 'check', true)
         })
@@ -244,7 +241,7 @@ export default {
       this.mode = 0
     },
     setTimeRange() {
-      this.timeRange = this.weekTimeData.map(item => {
+      this.timeRange = this.weektimeData.map(item => {
         return {
           id: item.row === 6 ? 0 : item.row + 1,
           value: splicing(item.child)
@@ -311,7 +308,7 @@ export default {
     selectWeek(row, col, check) {
       const [minRow, maxRow] = row
       const [minCol, maxCol] = col
-      this.weekTimeData.forEach(item => {
+      this.weektimeData.forEach(item => {
         item.child.forEach(t => {
           if (t.row >= minRow && t.row <= maxRow && t.col >= minCol && t.col <= maxCol) {
             this.$set(t, 'check', check)
@@ -324,12 +321,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .c-weektime {
-  //min-width: 440px;
+  min-width: 640px;
   position: relative;
   display: inline-block;
   padding-right: 20px;
 }
-
 .c-schedue {
   background: #598fe6;
   position: absolute;
@@ -338,70 +334,55 @@ export default {
   opacity: .6;
   pointer-events: none;
 }
-
 .c-schedue-notransi {
   transition: width .12s ease, height .12s ease, top .12s ease, left .12s ease;
 }
-
 .c-weektime-table {
   border-collapse: collapse;
-
   th {
     vertical-align: inherit;
     font-weight: bold;
   }
-
   tr {
     height: 30px;
   }
-
   tr, td, th {
     user-select: none;
     border: 1px solid #dee4f5;
     text-align: center;
-    min-width: 10px;
+    min-width: 12px;
     line-height: 1.6em;
     transition: background .16s ease;
   }
-
   .c-weektime-head {
     font-size: 12px;
-
     .week-td {
       width: 72px;
     }
   }
-
   .c-weektime-body {
     font-size: 12px;
-
     td {
       &.weektime-atom-item {
         user-select: unset;
         background-color: #f5f5f5;
-        width: 18px;
       }
-
       &.ui-selected {
         background-color: #598fe6;
       }
     }
   }
-
   .c-weektime-preview {
     line-height: 2.4em;
     padding: 0 10px;
-    font-size: 11px;
-
+    font-size: 13px;
     .c-weektime-con {
       line-height: 42px;
       user-select: none;
     }
-
     .c-weektime-time {
       text-align: left;
       line-height: 2.4em;
-
       p {
         max-width: 625px;
         line-height: 1.4em;
@@ -411,13 +392,11 @@ export default {
     }
   }
 }
-
 .c-min-table {
   tr, td, th {
-    min-width: 17px;
+    min-width: 24px;
   }
 }
-
 .g-clearfix {
   &:after, &:before {
     clear: both;
@@ -425,20 +404,16 @@ export default {
     display: table;
   }
 }
-
 .g-pull-left {
   float: left;
 }
-
 .g-pull-right {
   float: right;
-  color: #409eff !important;
+  color: #409eff!important;
 }
-
 .g-pull-margin {
   margin-right: 12px;
 }
-
 .g-tip-text {
   color: #999;
 }

src/components/Form/FormGroupHeader/index.vue

@@ -1,15 +1,7 @@
 <template>
-  <div ref="formGroup" class="form-group-header">
+  <div class="form-group-header">
     <div v-if="line" class="hr-line-dashed" />
-    <div v-if="group['title']">
-      <h3 @click="toggle">{{ group['title'] }} </h3>
-      <span class="compass" @click="toggle">
-        <i :class="iconClass" />
-      </span>
-    </div>
-    <div v-if="!isVisible" class="ellipsis" @click="toggle">
-      <i class="fa fa-angle-double-down" />
-    </div>
+    <h3>{{ group['title'] }} </h3>
   </div>
 </template>
 
@@ -28,62 +20,16 @@ export default {
       type: Object,
       default: () => ({})
     }
-  },
-  data() {
-    return {
-      isVisible: true
-    }
-  },
-  computed: {
-    iconClass() {
-      return this.isVisible ? 'el-icon-arrow-down' : 'el-icon-arrow-up'
-    }
-  },
-  methods: {
-    toggle() {
-      this.isVisible = !this.isVisible
-      this.toggleSiblingVisibility()
-    },
-    toggleSiblingVisibility() {
-      // 当前 form-group-header 的 DOM 元素
-      const formGroupHeader = this.$refs.formGroup
-      if (!formGroupHeader) return
-
-      // 找到当前 form-group-header 的下一个兄弟节点
-      let sibling = formGroupHeader.nextElementSibling
-
-      // 循环隐藏或显示直到找到下一个 form-group-header
-      while (sibling && sibling.classList.contains('el-form-item')) {
-        sibling.style.display = this.isVisible ? '' : 'none'
-        sibling = sibling.nextElementSibling
-      }
-    }
   }
 }
 </script>
 
 <style lang="less" scoped>
 .hr-line-dashed {
-  border-top: 1px dashed #e7eaec;
-  color: #ffffff;
-  background-color: #ffffff;
-  height: 1px;
-  margin: 20px 0;
-}
-
-h3 {
-  display: inline-block;
-  cursor: pointer;
-}
-
-.compass {
-  display: inline-block;
-  float: right;
-  cursor: pointer;
-}
-
-.ellipsis {
-  text-align: center;
-  cursor: pointer;
+    border-top: 1px dashed #e7eaec;
+    color: #ffffff;
+    background-color: #ffffff;
+    height: 1px;
+    margin: 20px 0;
 }
 </style>

src/components/IBox/HeadingIBox.vue

@@ -2,8 +2,7 @@
   <IBox v-bind="$attrs">
     <div v-if="contentHeading" class="ibox-heading">
       <slot name="content-heading">
-        <h3 v-if="contentHeading.title"><i v-if="contentHeading.fa" :class="'fa ' + contentHeading.fa" /> {{
-          contentHeading.title }}</h3>
+        <h3 v-if="contentHeading.title"><i v-if="contentHeading.fa" :class="'fa ' + contentHeading.fa" /> {{ contentHeading.title }}</h3>
         <small v-if="contentHeading.content"><i class="fa fa-tim" /> {{ contentHeading.content }}</small>
       </slot>
     </div>
@@ -12,8 +11,7 @@
 </template>
 
 <script>
-import IBox from './index.vue'
-
+import IBox from './index'
 export default {
   name: 'HeadingIBox',
   components: { IBox },
@@ -27,22 +25,20 @@ export default {
 </script>
 
 <style scoped>
-.ibox-heading {
-  background-color: #f3f6fb;
-  border-bottom: none;
-  margin: -15px -20px 20px -20px;
-  padding: 20px
-}
-
-.ibox-heading h3 {
-  font-weight: 200;
-  font-size: 24px;
-  margin-top: 5px;
-  margin-bottom: 10px;
-  line-height: 1.1;
-}
-
-.ibox .el-card__body {
-  background-color: #f3f6fb;
-}
+  .ibox-heading {
+    background-color: #f3f6fb;
+    border-bottom: none;
+    margin: -15px -20px 20px -20px;
+    padding: 20px
+  }
+  .ibox-heading h3 {
+    font-weight: 200;
+    font-size: 24px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    line-height: 1.1;
+  }
+  .ibox .el-card__body {
+   background-color: #f3f6fb;
+  }
 </style>

src/components/IBox/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card :class="'ibox ' + type" :shadow="shadow" v-bind="$attrs">
+  <el-card :class="'ibox ' + type" shadow="never" v-bind="$attrs">
     <template #header>
       <slot name="header">
         <div v-if="title" slot="header" class="clearfix ibox-title">
@@ -26,10 +26,6 @@ export default {
     type: {
       type: String,
       default: 'default'
-    },
-    shadow: {
-      type: String,
-      default: 'never'
     }
   },
   computed: {

src/components/QuickActions/action.vue

@@ -1,31 +1,33 @@
 <template>
   <tr>
+    <td>{{ getActionTitle(action) }}</td>
     <td>
-      {{ getActionTitle(action) }}
-      <el-tooltip v-if="action.attrs.showTip" :content="action.attrs.tip" :open-delay="500" effect="dark">
-        <i class="fa fa-question-circle-o" />
-      </el-tooltip>
-    </td>
-    <td>
-      <span slot="reference">
-        <component
-          :is="iType"
-          v-model="action.attrs.model"
-          :title="label"
-          v-bind="action.attrs"
-          v-on="callbacks"
-        >
-          {{ label }}
-        </component>
-      </span>
+      <el-popover
+        :content="action.attrs.tip"
+        :disabled="!action.attrs.showTip"
+        placement="left-end"
+        trigger="hover"
+      >
+        <span slot="reference">
+          <component
+            :is="iType"
+            v-model="action.attrs.model"
+            :title="label"
+            v-bind="action.attrs"
+            v-on="callbacks"
+          >
+            {{ label }}
+          </component>
+        </span>
+      </el-popover>
     </td>
   </tr>
 </template>
 
 <script>
-import Switcher from '@/components/Form/FormFields/Switcher.vue'
-import Select2 from '@/components/Form/FormFields/Select2.vue'
-import UpdateSelect from '@/components/Form/FormFields/UpdateSelect.vue'
+import Switcher from '@/components/Form/FormFields/Switcher'
+import Select2 from '@/components/Form/FormFields/Select2'
+import UpdateSelect from '@/components/Form/FormFields/UpdateSelect'
 import { toSentenceCase } from '@/utils/common'
 
 class Action {

src/components/QuickActions/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <IBox :fa="fa" :title="title" v-bind="$attrs">
+    <div v-for="action of actions" :key="action.title" class="quick-actions">
+      <table>
+        <ActionItem v-if="action.has === undefined || action.has" :action="action" />
+      </table>
+    </div>
+  </IBox>
+</template>
+
+<script>
+import IBox from '@/components/IBox'
+import ActionItem from './action'
+
+// 查看 views/users/users/UserDetail/UserInfo.vue 使用样例
+export default {
+  name: 'QuickActions',
+  components: {
+    IBox,
+    ActionItem
+  },
+  props: {
+    fa: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default() {
+        return this.$t('QuickUpdate')
+      }
+    },
+    actions: {
+      type: Array,
+      default: () => []
+    }
+  }
+}
+</script>
+
+<style scoped>
+  html:lang(en) .quick-actions ::v-deep button {
+    width: 80px;
+  }
+
+  html:lang(ja) .quick-actions ::v-deep button {
+    width: 100px;
+  }
+
+  html:lang(zh-tw) .quick-actions ::v-deep button {
+    width: 65px;
+  }
+
+  html:lang(zh-cn) .quick-actions ::v-deep button {
+    width: 65px;
+  }
+
+  .quick-actions ::v-deep table {
+    width: 100%;
+  }
+
+  .quick-actions ::v-deep tr > td {
+    line-height: 1.43;
+    padding: 8px;
+    vertical-align: top;
+    font-size: 13px;
+    width: 50%;
+  }
+
+  .quick-actions ::v-deep tr > td > span:last-child {
+    float: right;
+  }
+
+  .quick-actions ::v-deep button {
+    padding: 4px 5px;
+    font-size: 13px;
+
+    span {
+      overflow: hidden;
+      white-space: nowrap; /* 控制文本不换行 */
+      text-overflow: ellipsis;
+      display: block;
+    }
+  }
+</style>

src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue

@@ -36,7 +36,6 @@
           <el-checkbox
             :disabled="item.prop==='actions' || minColumns.indexOf(item.prop)!==-1"
             :label="item.prop"
-            :title="item.label"
           >
             {{ item.label }}
           </el-checkbox>

src/components/Table/AutoDataTable/index.vue

@@ -21,11 +21,15 @@
 </template>
 
 <script type="text/jsx">
-import Sortable from 'sortablejs'
 import DataTable from '@/components/Table/DataTable/index.vue'
-import { newURL, ObjectLocalStorage, replaceAllUUID } from '@/utils/common'
+import {
+  ActionsFormatter, ArrayFormatter, ChoicesFormatter, DateFormatter, DetailFormatter, DisplayFormatter,
+  ObjectRelatedFormatter
+} from '@/components/Table/TableFormatters'
+import i18n from '@/i18n/i18n'
+import { newURL, replaceAllUUID, toSentenceCase } from '@/utils/common'
 import ColumnSettingPopover from './components/ColumnSettingPopover.vue'
-import { TableColumnsGenerator } from './utils'
+import LabelsFormatter from '@/components/Table/TableFormatters/LabelsFormatter.vue'
 
 export default {
   name: 'AutoDataTable',
@@ -47,9 +51,9 @@ export default {
     return {
       loading: true,
       method: 'get',
-      meta: {},
-      iConfig: {},
       autoConfig: {},
+      iConfig: {},
+      meta: {},
       cleanedColumnsShow: {},
       totalColumns: [],
       popoverColumns: {
@@ -58,11 +62,10 @@ export default {
         currentCols: [],
         defaultCols: []
       },
-      isDeactivated: false,
-      tableColumnsStorage: this.getTableColumnsStorage(),
-      sortable: null
+      isDeactivated: false
     }
   },
+  computed: {},
   watch: {
     config: {
       handler: _.debounce(function(iNew, iOld) {
@@ -82,9 +85,8 @@ export default {
       }, 200)
     }
   },
-  async created() {
-    await this.optionUrlMetaAndGenCols()
-    this.loading = false
+  created() {
+    this.optionUrlMetaAndGenCols()
   },
   deactivated() {
     this.isDeactivated = true
@@ -93,101 +95,312 @@ export default {
     this.isDeactivated = false
   },
   methods: {
-    setColumnDraggable() {
-      const el = this.$el.querySelector('.el-table__header-wrapper thead tr')
-      if (!el) {
-        setTimeout(() => this.setColumnDraggable(), 500)
-        return
-      }
-      if (this.sortable) {
-        this.sortable.destroy()
-      }
-
-      this.sortable = Sortable.create(el, {
-        animation: 150,
-        onEnd: (evt) => {
-          let { oldIndex, newIndex } = evt
-          if (oldIndex === newIndex) {
-            return
-          }
-          // 检测表格是否有选择列
-          const hasSelectionColumn = this.$el.querySelector('.el-table-column--selection') !== null
-          if (hasSelectionColumn) {
-            // 如果有选择列，调整索引
-            if (oldIndex > 0) oldIndex -= 1
-            if (newIndex > 0) newIndex -= 1
-          }
-
-          let columnNames = [...this.cleanedColumnsShow.show]
-          if (columnNames.includes('actions')) {
-            columnNames = columnNames.filter(item => item !== 'actions')
-            columnNames.push('actions')
-          }
-          // 边界
-          if (oldIndex >= 0 && oldIndex < columnNames.length &&
-            newIndex >= 0 && newIndex < columnNames.length) {
-            const movedItem = columnNames.splice(oldIndex, 1)[0]
-            columnNames.splice(newIndex, 0, movedItem)
-
-            this.$log.debug('Column moved: ', movedItem, oldIndex, ' => ', newIndex)
-            // 保存更新的列顺序
-            this.tableColumnsStorage.set(columnNames)
-
-            // 更新内部状态
-            this.cleanedColumnsShow.show = columnNames
-            this.popoverColumns.currentCols = columnNames
-
-            // 重新应用列顺序
-            this.filterShowColumns()
-
-            this.loading = true
-            setTimeout(() => {
-              this.loading = false
-              // 在DOM完全更新后重新初始化拖拽
-              this.$nextTick(() => {
-                setTimeout(() => this.setColumnDraggable(), 200)
-              })
-            }, 300)
-          }
-        }
-      })
-    },
-    generateTotalColumns() {
-      const generator = new TableColumnsGenerator(this.config, this.meta, this)
-      this.totalColumns = generator.generateColumns()
-      this.config.columns = this.totalColumns
-      this.iConfig = _.cloneDeep(this.config)
-    },
     async optionUrlMetaAndGenCols() {
       if (this.config.url === '') {
         return
       }
       const url = (this.config.url.indexOf('?') === -1)
-        ? `${this.config.url}?display=1`
-        : `${this.config.url}&display=1`
-
-      /**
-       * 原有代码无法正确的同步 storage 的原因是 currentOrder 总是在 totalColumns 之前进行的
-       * 这导致在首次加载时，currentOrder总是为空数组，因为此时cleanedColumnsShow.show还未初始化
-       */
-      try {
-        const data = await this.$store.dispatch('common/getUrlMeta', { url: url })
+        ? `${this.config.url}?draw=1&display=1`
+        : `${this.config.url}&draw=1&display=1`
+      this.$store.dispatch('common/getUrlMeta', { url: url }).then(data => {
         const method = this.method.toUpperCase()
         this.meta = data.actions && data.actions[method] ? data.actions[method] : {}
-
         this.generateTotalColumns()
-        this.cleanColumnsShow()
+      }).then(() => {
+        //  根据当前列重新生成最终渲染表格
         this.filterShowColumns()
+      }).then(() => {
+        // 生成给子组件使用的TotalColList
         this.generatePopoverColumns()
-        this.setColumnDraggable()
-      } catch (error) {
+      }).catch((error) => {
         this.$log.error('Error occur: ', error)
-      }
+      }).finally(() => {
+        this.loading = false
+      })
     },
-    getTableColumnsStorage() {
-      let tableName = this.config.name || this.$route.name + '_' + newURL(this.config.url).pathname
-      tableName = replaceAllUUID(tableName)
-      return new ObjectLocalStorage('tableColumns', tableName)
+    generateColumnByName(name, col) {
+      switch (name) {
+        case 'name':
+          col.formatter = DetailFormatter
+          col.sortable = 'custom'
+          col.showOverflowTooltip = true
+          col.minWidth = '150px'
+          break
+        case 'actions':
+          col = {
+            prop: 'actions',
+            label: i18n.t('Actions'),
+            align: 'center',
+            width: '100px',
+            formatter: ActionsFormatter,
+            fixed: 'right',
+            formatterArgs: {}
+          }
+          break
+        case 'is_valid':
+          col.label = i18n.t('Valid')
+          col.formatter = ChoicesFormatter
+          col.formatterArgs = {
+            textChoices: {
+              true: i18n.t('Yes'),
+              false: i18n.t('No')
+            }
+          }
+          col.width = '80px'
+          break
+        case 'is_active':
+          col.formatter = ChoicesFormatter
+          col.formatterArgs = {
+            textChoices: {
+              true: i18n.t('Active'),
+              false: i18n.t('Inactive')
+            }
+          }
+          col.width = '100px'
+          break
+        case 'datetime':
+        case 'date_start':
+          col.formatter = DateFormatter
+          break
+        case 'labels':
+          col.formatter = LabelsFormatter
+          col.width = '200px'
+          break
+        case 'comment':
+          col.showOverflowTooltip = true
+      }
+      return col
+    },
+    generateColumnByType(type, col, meta) {
+      switch (type) {
+        case 'choice':
+          col.sortable = 'custom'
+          col.formatter = DisplayFormatter
+          break
+        case 'labeled_choice':
+          col.sortable = 'custom'
+          col.formatter = ChoicesFormatter
+          break
+        case 'boolean':
+          col.formatter = ChoicesFormatter
+          // col.width = '80px'
+          break
+        case 'datetime':
+          col.formatter = DateFormatter
+          col.width = '175px'
+          break
+        case 'object_related_field':
+          col.formatter = ObjectRelatedFormatter
+          break
+        case 'm2m_related_field':
+          col.formatter = ObjectRelatedFormatter
+          break
+        case 'list':
+          col.formatter = ArrayFormatter
+          break
+        case 'json':
+        case 'field':
+          if (meta.child && meta.child.type === 'nested object') {
+            col.formatter = ObjectRelatedFormatter
+          }
+          break
+      }
+      // this.$log.debug('Field: ', type, col.prop, col)
+      return col
+    },
+    addHelpTipIfNeed(col) {
+      const helpTip = col.helpTip
+      if (!helpTip) {
+        return col
+      }
+      col.renderHeader = (h, { column, $index }) => {
+        const binds = {
+          props: {
+            placement: 'bottom',
+            effect: 'dark',
+            openDelay: 500,
+            popperClass: 'help-tips'
+          }
+        }
+
+        return (
+          <span>{column.label}
+            <el-tooltip {...binds}>
+              <div slot='content' v-sanitize={helpTip}/>
+              <i class='fa fa-question-circle-o help-tip-icon' style='padding-left: 2px'/>
+            </el-tooltip>
+          </span>
+        )
+      }
+      return col
+    },
+    addFilterIfNeed(col) {
+      if (col.prop) {
+        const column = this.meta[col.prop] || {}
+        if (!column.filter) {
+          return col
+        }
+        if (column.type === 'boolean') {
+          col.filters = [
+            { text: i18n.t('Yes'), value: true },
+            { text: i18n.t('No'), value: false }
+          ]
+          col.sortable = false
+          col['column-key'] = col.prop
+        }
+        if (column.type === 'choice' && column.choices) {
+          col.filters = column.choices.map(item => {
+            if (typeof (item.value) === 'boolean') {
+              if (item.value) {
+                return { text: item['label'], value: 'True' }
+              } else {
+                return { text: item['label'], value: 'False' }
+              }
+            }
+            return { text: item['label'], value: item.value }
+          })
+          col.sortable = false
+          col['column-key'] = col.prop
+        }
+      }
+      return col
+    },
+    addOrderingIfNeed(col) {
+      if (col.prop) {
+        const column = this.meta[col.prop] || {}
+        if (column.order) {
+          col.sortable = 'custom'
+          col['column-key'] = col.prop
+        }
+      }
+      return col
+    },
+    setDefaultFormatterIfNeed(col) {
+      if (!col.formatter) {
+        col.formatter = (row, column, cellValue) => {
+          let value = cellValue
+          let padding = '0'
+          const excludes = [undefined, null, '']
+          if (excludes.indexOf(value) !== -1) {
+            padding = '6px'
+            value = '-'
+          }
+          return <span style={{ marginLeft: padding }}>{value}</span>
+        }
+      }
+      return col
+    },
+    setDefaultWidthIfNeed(col) {
+      const lang = this.$i18n.locale
+      let factor = 10
+      if (lang === 'zh') {
+        factor = 20
+      }
+      let [sortable, filters] = [0, 0]
+      if (col && col?.sortable === 'custom') {
+        sortable = 10
+      }
+      if (col && col?.filters?.length > 0) {
+        filters = 12
+      }
+      if (col && !col.width && col.label && !col.minWidth) {
+        col.minWidth = `${col.label.length * factor + sortable + filters + 30}px`
+      }
+      return col
+    },
+    generateColumn(name) {
+      const colMeta = this.meta[name] || {}
+      const customMeta = this.config.columnsMeta ? this.config.columnsMeta[name] : {}
+      let col = { prop: name, label: colMeta.label, showOverflowTooltip: true }
+
+      col = this.generateColumnByType(colMeta.type, col, colMeta)
+      col = this.generateColumnByName(name, col)
+      col = this.setDefaultFormatterIfNeed(col)
+      col = Object.assign(col, customMeta)
+      col = this.addHelpTipIfNeed(col)
+      col = this.addFilterIfNeed(col)
+      col = this.addOrderingIfNeed(col)
+      col = this.updateLabelIfNeed(col)
+      col = this.setDefaultWidthIfNeed(col)
+      return col
+    },
+    updateLabelIfNeed(col) {
+      if (!col.label) {
+        return col
+      }
+      col.label = col.label
+        .replace(' Amount', '')
+        .replace(' amount', '')
+        .replace('数量', '')
+      if (col.label.startsWith('Is ')) {
+        col.label = col.label.replace('Is ', '')
+      }
+      col.label = toSentenceCase(col.label)
+      return col
+    },
+    generateTotalColumns() {
+      const config = _.cloneDeep(this.config)
+      let columns = []
+      const allColumnNames = Object.entries(this.meta)
+        .filter(([name, meta]) => !meta['write_only'])
+        .map(([name, meta]) => name)
+        .concat(config.columnsExtra || [])
+
+      let configColumns = config.columns || allColumnNames
+      const columnsExclude = config.columnsExclude || []
+      configColumns = configColumns.filter(item => !columnsExclude.includes(item))
+
+      // 解决后端 API 返回字段中包含 actions 的问题;
+      const hasColumnActions = configColumns.findIndex(item => item?.prop === 'actions') !== -1
+      if (!hasColumnActions) {
+        configColumns = [...configColumns.filter(i => i !== 'actions'), 'actions']
+      }
+
+      for (let col of configColumns) {
+        if (typeof col === 'object') {
+          columns.push(col)
+        } else if (typeof col === 'string') {
+          col = this.generateColumn(col)
+          columns.push(col)
+        }
+      }
+
+      columns = columns.filter(item => {
+        if (item?.showFullContent) {
+          item.className = 'show-full-content'
+        }
+        let has = item.has
+        if (has === undefined) {
+          has = true
+        } else if (typeof has === 'function') {
+          has = has()
+        }
+        return has
+      })
+
+      columns = this.orderingColumns(columns)
+      // 第一次初始化时记录 totalColumns
+      this.totalColumns = columns
+      config.columns = columns
+      this.iConfig = config
+    },
+    orderingColumns(columns) {
+      const cols = _.cloneDeep(this.config.columns)
+      const defaults = _.get(this.config, 'columnsShow.default')
+      const ordering = (cols || defaults || []).map(item => {
+        let prop = item
+        if (typeof item === 'object') {
+          prop = item.prop
+        }
+        return prop
+      })
+      return _.sortBy(columns, (item) => {
+        if (item.prop === 'actions') {
+          return 1000
+        }
+        const i = ordering.indexOf(item.prop)
+        return i === -1 ? 999 : i
+      })
     },
     // 生成给子组件使用的TotalColList
     cleanColumnsShow() {
@@ -197,12 +410,20 @@ export default {
       if (defaultColumnsNames.length === 0) {
         defaultColumnsNames = totalColumnsNames
       }
+      // Clean it
+      defaultColumnsNames = totalColumnsNames.filter(n => defaultColumnsNames.indexOf(n) > -1)
 
       // 最小列
       const minColumnsNames = _.get(this.iConfig, 'columnsShow.min', ['actions', 'id'])
         .filter(n => totalColumnsNames.includes(n))
 
-      const configShowColumnsNames = this.tableColumnsStorage.get()
+      // 应该显示的列
+      const _tableConfig = localStorage.getItem('tableConfig')
+        ? JSON.parse(localStorage.getItem('tableConfig'))
+        : {}
+      let tableName = this.config.name || this.$route.name + '_' + newURL(this.config.url).pathname
+      tableName = replaceAllUUID(tableName)
+      const configShowColumnsNames = _.get(_tableConfig[tableName], 'showColumns', null)
       let showColumnsNames = configShowColumnsNames || defaultColumnsNames
       if (showColumnsNames.length === 0) {
         showColumnsNames = totalColumnsNames
@@ -213,6 +434,8 @@ export default {
           showColumnsNames.push(v)
         }
       })
+      // Clean it
+      showColumnsNames = totalColumnsNames.filter(n => showColumnsNames.indexOf(n) > -1)
 
       this.cleanedColumnsShow = {
         default: defaultColumnsNames,
@@ -224,38 +447,9 @@ export default {
     },
     filterShowColumns() {
       this.cleanColumnsShow()
-      const showFieldNames = this.cleanedColumnsShow.show
-      let showFields = this.totalColumns.filter(obj => {
-        return showFieldNames.indexOf(obj.prop) > -1
+      this.iConfig.columns = this.totalColumns.filter(obj => {
+        return this.cleanedColumnsShow.show.indexOf(obj.prop) > -1
       })
-      showFields = this.orderingColumns(showFields)
-      this.iConfig.columns = showFields
-
-      // 确保最新的列配置也应用到config对象上，保持同步
-      this.config.columns = this.iConfig.columns
-
-      this.$nextTick(() => {
-        if (this.$refs.dataTable) {
-          this.$refs.dataTable.getList()
-        }
-      })
-    },
-    orderingColumns(columns) {
-      const cols = _.cloneDeep(this.config.columns)
-      const show = this.cleanedColumnsShow.show
-      const ordering = (show || cols || []).map(item => {
-        let prop = item
-        if (typeof item === 'object') {
-          prop = item.prop
-        }
-        return prop
-      })
-      const sorted = _.sortBy(columns, (item) => {
-        const i = ordering.indexOf(item.prop)
-        item.order = i
-        return i === -1 ? 999 : i
-      })
-      return sorted
     },
     generatePopoverColumns() {
       this.popoverColumns.totalColumnsList = this.totalColumns.filter(obj => {
@@ -275,7 +469,18 @@ export default {
         columns = this.cleanedColumnsShow.default
       }
       this.popoverColumns.currentCols = columns
-      this.tableColumnsStorage.set(columns)
+
+      const _tableConfig = localStorage.getItem('tableConfig')
+        ? JSON.parse(localStorage.getItem('tableConfig'))
+        : {}
+      let tableName = this.config.name || this.$route.name + '_' + newURL(url).pathname
+      // 替换url中的uuid，避免同一个类型接口生成多个key，localStorage中的数据无法共用.
+      tableName = replaceAllUUID(tableName)
+
+      _tableConfig[tableName] = {
+        'showColumns': columns
+      }
+      localStorage.setItem('tableConfig', JSON.stringify(_tableConfig))
       this.filterShowColumns()
     },
     filterChange(filters) {

src/components/Table/AutoDataTable/utils.js

@@ -1,326 +0,0 @@
-import { toSentenceCase } from '@/utils/common'
-import i18n from '@/i18n/i18n'
-
-import {
-  ActionsFormatter,
-  ArrayFormatter,
-  ChoicesFormatter,
-  CopyableFormatter,
-  DateFormatter,
-  DetailFormatter,
-  DisplayFormatter,
-  ObjectRelatedFormatter
-} from '@/components/Table/TableFormatters'
-import LabelsFormatter from '@/components/Table/TableFormatters/LabelsFormatter.vue'
-
-export class TableColumnsGenerator {
-  constructor(config, meta, vm) {
-    this.config = config
-    this.meta = meta
-    this.vm = vm
-  }
-
-  dynamicActionWidth() {
-    console.log(i18n.locale)
-    if (i18n.locale === 'zh-hans' || i18n.locale === 'zh-hant') {
-      return '100px'
-    }
-
-    if (i18n.locale === 'ja' || i18n.locale === 'ko') {
-      return '120px'
-    }
-
-    return '160px'
-  }
-
-  generateColumns() {
-    const config = _.cloneDeep(this.config)
-    let columns = []
-    const allColumnNames = Object.entries(this.meta)
-      .filter(([name, meta]) => !meta['write_only'])
-      .map(([name, meta]) => name)
-      .concat(config.columnsExtra || [])
-
-    let configColumns = config.columns || allColumnNames
-    const columnsExclude = config.columnsExclude || []
-    const columnsAdd = config.columnsAdd || []
-    configColumns = configColumns.concat(columnsAdd)
-    configColumns = configColumns.filter(item => !columnsExclude.includes(item))
-
-    // 解决后端 API 返回字段中包含 actions 的问题;
-    const hasColumnActions = configColumns.findIndex(item => item?.prop === 'actions') !== -1
-    if (!hasColumnActions) {
-      configColumns = [...configColumns.filter(i => i !== 'actions'), 'actions']
-    }
-
-    for (let col of configColumns) {
-      if (typeof col === 'object') {
-        columns.push(col)
-      } else if (typeof col === 'string') {
-        col = this.generateColumn(col)
-        columns.push(col)
-      }
-    }
-
-    columns = columns.filter(item => {
-      if (item?.showFullContent) {
-        item.className = 'show-full-content'
-      }
-      let has = item.has
-      if (has === undefined) {
-        has = true
-      } else if (typeof has === 'function') {
-        has = has()
-      }
-      return has
-    })
-
-    // columns = this.orderingColumns(columns)
-    // 第一次初始化时记录 totalColumns
-    config.columns = columns
-    return columns
-  }
-
-  updateLabelIfNeed(col) {
-    if (!col.label) {
-      return col
-    }
-    col.label = col.label
-      .replace(' Amount', '')
-      .replace(' amount', '')
-      .replace('数量', '')
-    if (col.label.startsWith('Is ')) {
-      col.label = col.label.replace('Is ', '')
-    }
-    col.label = toSentenceCase(col.label)
-    return col
-  }
-
-  generateColumn(name) {
-    const colMeta = this.meta[name] || {}
-    const customMeta = this.config.columnsMeta ? this.config.columnsMeta[name] : {}
-    let col = { prop: name, label: colMeta.label, showOverflowTooltip: true }
-
-    col = this.generateColumnByType(colMeta.type, col, colMeta)
-    col = this.generateColumnByName(name, col)
-    col = this.setDefaultFormatterIfNeed(col)
-    col = Object.assign(col, customMeta)
-    col = this.addHelpTipIfNeed(col)
-    col = this.addFilterIfNeed(col)
-    col = this.addOrderingIfNeed(col)
-    col = this.updateLabelIfNeed(col)
-    col = this.setDefaultWidthIfNeed(col)
-    return col
-  }
-
-  generateColumnByName(name, col) {
-    switch (name) {
-      case 'id':
-        if (!col.width) {
-          col.width = '299px'
-        }
-        if (!col.formatter) {
-          col.formatter = CopyableFormatter
-          col.iconPosition = 'left'
-        }
-        break
-      case 'name':
-        col.formatter = DetailFormatter
-        col.sortable = 'custom'
-        col.showOverflowTooltip = true
-        col.minWidth = '150px'
-        break
-      case 'actions':
-        col = {
-          prop: 'actions',
-          label: i18n.t('Actions'),
-          align: 'center',
-          width: this.dynamicActionWidth(),
-          formatter: ActionsFormatter,
-          fixed: 'right',
-          formatterArgs: {}
-        }
-        break
-      case 'is_valid':
-        col.label = i18n.t('Valid')
-        col.formatter = ChoicesFormatter
-        col.formatterArgs = {
-          textChoices: {
-            true: i18n.t('Yes'),
-            false: i18n.t('No')
-          }
-        }
-        col.width = '80px'
-        break
-      case 'is_active':
-        col.formatter = ChoicesFormatter
-        col.formatterArgs = {
-          textChoices: {
-            true: i18n.t('Active'),
-            false: i18n.t('Inactive')
-          }
-        }
-        col.width = '100px'
-        break
-      case 'datetime':
-      case 'date_start':
-        col.formatter = DateFormatter
-        break
-      case 'labels':
-        col.formatter = LabelsFormatter
-        col.width = '200px'
-        break
-      case 'comment':
-        col.showOverflowTooltip = true
-    }
-    return col
-  }
-
-  generateColumnByType(type, col, meta) {
-    switch (type) {
-      case 'choice':
-        col.sortable = 'custom'
-        col.formatter = DisplayFormatter
-        break
-      case 'labeled_choice':
-        col.sortable = 'custom'
-        col.formatter = ChoicesFormatter
-        break
-      case 'boolean':
-        col.formatter = ChoicesFormatter
-        // col.width = '80px'
-        break
-      case 'datetime':
-        col.formatter = DateFormatter
-        col.width = '155px'
-        break
-      case 'object_related_field':
-        col.formatter = ObjectRelatedFormatter
-        break
-      case 'm2m_related_field':
-        col.formatter = ObjectRelatedFormatter
-        break
-      case 'list':
-        col.formatter = ArrayFormatter
-        break
-      case 'json':
-      case 'field':
-        if (meta.child && meta.child.type === 'nested object') {
-          col.formatter = ObjectRelatedFormatter
-        }
-        break
-    }
-    // this.$log.debug('Field: ', type, col.prop, col)
-    return col
-  }
-
-  setDefaultFormatterIfNeed(col) {
-    const h = this.vm.$createElement
-    if (!col.formatter) {
-      col.formatter = (row, column, cellValue) => {
-        let value = cellValue
-        let padding = '0'
-        const excludes = [undefined, null, '']
-        if (excludes.indexOf(value) !== -1) {
-          padding = '6px'
-          value = '-'
-        }
-        return h('span', {
-          'style': {
-            marginLeft: padding
-          }
-        }, [value])
-      }
-    }
-    return col
-  }
-
-  setDefaultWidthIfNeed(col) {
-    const lang = i18n.locale
-    let factor = 10
-    if (lang === 'zh') {
-      factor = 20
-    }
-    let [sortable, filters] = [0, 0]
-    if (col && col?.sortable === 'custom') {
-      sortable = 10
-    }
-    if (col && col?.filters?.length > 0) {
-      filters = 12
-    }
-    if (col && !col.width && col.label && !col.minWidth) {
-      col.minWidth = `${col.label.length * factor + sortable + filters + 30}px`
-    }
-    return col
-  }
-
-  addOrderingIfNeed(col) {
-    if (col.prop) {
-      const column = this.meta[col.prop] || {}
-      if (column.order) {
-        col.sortable = 'custom'
-        col['column-key'] = col.prop
-      }
-    }
-    return col
-  }
-
-  addHelpTipIfNeed(col) {
-    const helpTip = col.helpTip
-    if (!helpTip) {
-      return col
-    }
-    col.renderHeader = (h, { column, $index }) => {
-      const binds = {
-        props: {
-          placement: 'bottom',
-          effect: 'dark',
-          openDelay: 500,
-          popperClass: 'help-tips'
-        }
-      }
-
-      return (
-        <span>{column.label}
-          <el-tooltip {...binds}>
-            <div slot='content' v-sanitize={helpTip}/>
-            <i class='fa fa-question-circle-o help-tip-icon' style='padding-left: 2px'/>
-          </el-tooltip>
-        </span>
-      )
-    }
-    return col
-  }
-
-  addFilterIfNeed(col) {
-    if (col.prop) {
-      const column = this.meta[col.prop] || {}
-      if (!column.filter) {
-        return col
-      }
-      if (column.type === 'boolean') {
-        col.filters = [
-          { text: i18n.t('Yes'), value: true },
-          { text: i18n.t('No'), value: false }
-        ]
-        col.sortable = false
-        col['column-key'] = col.prop
-      }
-      if (column.type === 'choice' && column.choices) {
-        col.filters = column.choices.map(item => {
-          if (typeof (item.value) === 'boolean') {
-            if (item.value) {
-              return { text: item['label'], value: 'True' }
-            } else {
-              return { text: item['label'], value: 'False' }
-            }
-          }
-          return { text: item['label'], value: item.value }
-        })
-        col.sortable = false
-        col['column-key'] = col.prop
-      }
-    }
-    return col
-  }
-}