fix: 修复全局组织下更新、删除：用户、端点、端点规则、组织权限

v2.26.0

.env.development.example

@@ -20,6 +20,6 @@ VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
 
 
 # Dev server for core proxy
-VUE_APP_CORE_HOST = 'http://localhost:8080/'
-VUE_APP_CORE_WS = 'http://localhost:8080/'
+VUE_APP_CORE_HOST = 'http://localhost:8080'
+VUE_APP_CORE_WS = 'ws://localhost:8080'
 VUE_APP_ENV = 'development'

Dockerfile

@@ -1,9 +1,7 @@
 FROM node:10 as stage-build
-ARG VERSION
-ENV VERSION=$VERSION
-ARG NPM_REGISTRY="https://registry.npm.taobao.org"
+ARG NPM_REGISTRY="https://registry.npmmirror.com"
 ENV NPM_REGISTY=$NPM_REGISTRY
-ARG SASS_BINARY_SITE="https://npm.taobao.org/mirrors/node-sass"
+ARG SASS_BINARY_SITE="https://npmmirror.com/mirrors/node-sass"
 ENV SASS_BINARY_SITE=$SASS_BINARY_SITE
 
 WORKDIR /data
@@ -15,6 +13,8 @@ COPY package.json yarn.lock /data/
 RUN yarn install
 RUN npm rebuild node-sass
 
+ARG VERSION
+ENV VERSION=$VERSION
 ADD . /data
 RUN cd utils && bash -xieu build.sh build
 

README.md

@@ -19,7 +19,7 @@ VUE_APP_CORE_HOST = 'JUMPSERVER_APIHOST'
 $ yarn serve
 
 4. 构建
-$ yarn build
+$ yarn build:prod
 ```
 
 ## 生产中部署

build/index.js

@@ -24,9 +24,9 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
   )
 
   app.listen(port, function () {
-    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
+    // debug(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
     if (report) {
-      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
+      // debug(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
     }
 
   })

mock/index.js

@@ -56,7 +56,7 @@ const responseFake = (url, type, respond) => {
     url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
     type: type || 'get',
     response(req, res) {
-      console.log('request invoke:' + req.path)
+      // debug('request invoke:' + req.path)
       res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
     }
   }

mock/mock-server.js

@@ -59,9 +59,9 @@ module.exports = app => {
         mockRoutesLength = mockRoutes.mockRoutesLength
         mockStartIndex = mockRoutes.mockStartIndex
 
-        console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
+        // debug(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
       } catch (error) {
-        console.log(chalk.redBright(error))
+        // debug(chalk.redBright(error))
       }
     }
   })

mock/user.js

@@ -1,4 +1,3 @@
-
 const tokens = {
   admin: {
     token: 'admin-token'
@@ -46,7 +45,6 @@ export default [
       }
     }
   },
-
   // get user info
   {
     url: '/vue-admin-template/user/info\.*',

package.json

@@ -25,6 +25,8 @@
     "axios": "0.21.1",
     "axios-retry": "^3.1.9",
     "cron-parser": "^4.0.0",
+    "crypto-js": "^4.1.1",
+    "css-color-function": "^1.3.3",
     "deepmerge": "^4.2.2",
     "echarts": "^4.7.0",
     "element-ui": "2.13.2",
@@ -32,10 +34,11 @@
     "install": "^0.13.0",
     "jquery": "^3.5.0",
     "js-cookie": "2.2.0",
+    "jsencrypt": "^3.2.1",
     "krry-transfer": "^1.7.3",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
     "lodash.frompairs": "^4.0.1",
     "lodash.get": "^4.4.2",
@@ -47,8 +50,8 @@
     "lodash.set": "^4.3.2",
     "lodash.topairs": "^4.3.0",
     "lodash.values": "^4.3.0",
-    "moment": "^2.29.1",
-    "moment-parseformat": "^3.0.0",
+    "moment": "^2.29.4",
+    "moment-parseformat": "^4.0.0",
     "normalize.css": "7.0.0",
     "npm": "^7.8.0",
     "nprogress": "0.2.0",
@@ -94,7 +97,7 @@
     "lint-staged": "^10.1.2",
     "mockjs": "1.0.1-beta3",
     "runjs": "^4.3.2",
-    "sass": "^1.26.10",
+    "sass": "~1.32.6",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",

public/index.html

@@ -9,23 +9,7 @@
     <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>
-    <style>
-      ::-webkit-scrollbar {
-        width:14px;
-      }
-      ::-webkit-scrollbar-track {
-        border-radius:10px;
-      }
-      ::-webkit-scrollbar-thumb {
-        border-radius: 8px;
-        box-shadow: 8px 10px 20px #C6C6C6 inset;
-        border: 3px solid rgba(0, 0, 0, 0);
-      }
-      ::-webkit-scrollbar-thumb:hover {
-        box-shadow: 8px 10px 20px #878787 inset;
-      }
-
-    </style>
+    <link rel="stylesheet" href="<%= BASE_URL %>theme/element-ui.css">
   </head>
   <body>
     <noscript>

public/theme/README.md

@@ -0,0 +1,23 @@
+# 主题颜色
+```
+alpha-1: "rgba(64, 158, 255, 0.1)"
+alpha-2: "rgba(64, 158, 255, 0.2)"
+alpha-3: "rgba(64, 158, 255, 0.3)"
+alpha-4: "rgba(64, 158, 255, 0.4)"
+alpha-5: "rgba(64, 158, 255, 0.5)"
+alpha-6: "rgba(64, 158, 255, 0.6)"
+alpha-7: "rgba(64, 158, 255, 0.7)"
+alpha-8: "rgba(64, 158, 255, 0.8)"
+alpha-9: "rgba(64, 158, 255, 0.9)"
+light-1: "#53a8ff"
+light-2: "#66b1ff"
+light-3: "#79bbff"
+light-4: "#8cc5ff"
+light-5: "#a0cfff"
+light-6: "#b3d8ff"
+light-7: "#c6e2ff"
+light-8: "#d9ecff"
+light-9: "#ecf5ff"
+primary: "#409EFF"
+```
+primary是初始主题颜色，其他颜色均属于primary的系列颜色

public/theme/element-extra.css

@@ -1,66 +1,84 @@
-// cover some element-ui styles
+/* 这里只写element-variables里面改不动的、且和主题系列颜色相关的样式！！！ */
+/* 主题相关看该文件夹下的README.md */
+
+/* info type special treatment */
+.el-button--info {
+  background-color: info;
+  border-color: info;
+}
+
+.el-button--text {
+  padding: 5px
+}
+
+.el-button--text:hover {
+  background-color: rgba(0, 0, 0, .05);
+}
+
+.el-button--success {
+  background-color: success;
+  border-color: success;
+}
+
+.el-alert--info.is-light {
+  background-color: light-9;
+  color: light-2;
+  border: 1px solid;
+}
+
+.el-alert--info .el-alert__description {
+  color: light-2;
+}
+
+.el-pagination.is-background .el-pager li:not(.disabled):hover {
+  color: white;
+  background-color: primary;
+}
+
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .el-pager li {
+  margin: 0 5px;
+  background-color: white;
+  color: #606266;
+  min-width: 28px;
+  border-radius: 2px;
+  border: 1px solid #DCDFE6;
+  font-size: 12px;
+  line-height: 26px;
+  font-weight: 400;
+}
 
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
   font-weight: 400 !important;
 }
 
-$--color-primary: #1ab394;
-$--color-success: #1c84c6;
-$--color-info: #23c6c8;
-$--color-warning: #f8ac59;
-$--color-danger: #ed5565;
-
-$--color-link: #1c84c6;
-$--color-link-highlight: #23527c;
-
-$--color-text-primary: #303133;
-/// color|1|Font Color|2
-$--color-text-regular: #606266;
-
-.el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
+.el-upload input[type="file"] {
+  display: none !important;
 }
 
 .el-upload__input {
   display: none;
 }
 
-
-// to fixed https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-// refine element ui upload
-.upload-container {
-  .el-upload {
+.upload-container .el-upload {
     width: 100%;
-
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
-    }
-  }
 }
 
-// dropdown
-.el-dropdown-menu {
-  a {
-    display: block
-  }
+.upload-container .el-upload .el-upload-dragger {
+  width: 100%;
+  height: 200px;
+}
+
+.el-dropdown-menu a {
+  display: block
 }
 
 .el-table th > .cell {
   color: rgb(104, 106, 108);
 }
 
-// to fix el-date-picker css style
 .el-range-separator {
   box-sizing: content-box;
 }
@@ -111,22 +129,6 @@ td .el-button.el-button--mini {
   border-left-color: rgb(220, 223, 230);
 }
 
-.el-alert--success.is-light {
-  border: #bce8f1 solid 1px;
-}
-
-.el-alert--info.is-light {
-  border: #bce8f1 solid 1px;
-}
-
-.el-alert--warning.is-light {
-  border: #faebcc solid 1px;
-}
-
-.el-alert--error.is-light {
-  border: #f1dfe2 solid 1px;
-}
-
 .el-alert__content {
   line-height: 1.5;
 }
@@ -140,32 +142,32 @@ td .el-button.el-button--mini {
 }
 
 .el-card.primary > .el-card__header {
-  background-color: $--color-primary;
-  border-color: $--color-primary;
+  background-color: primary;
+  border-color: primary;
   color: white;
 }
 
 .el-card.success > .el-card__header {
-  background-color: $--color-success;
-  border-color: $--color-success;
+  background-color: success;
+  border-color: success;
   color: #ffffff;
 }
 
 .el-card.info > .el-card__header {
-  background-color: $--color-info;
-  border-color: $--color-info;
+  background-color: info;
+  border-color: info;
   color: #ffffff;
 }
 
 .el-card.warning > .el-card__header {
-  background-color: $--color-warning;
-  border-color: $--color-warning;
+  background-color: warning;
+  border-color: warning;
   color: #ffffff;
 }
 
 .el-card.danger > .el-card__header {
-  background-color: $--color-danger;
-  border-color: $--color-danger;
+  background-color: danger;
+  border-color: danger;
   color: #ffffff;
 }
 
@@ -192,28 +194,14 @@ td .el-button.el-button--mini {
   line-height: 34px;
 }
 
-
-.el-select-dropdown__item.selected {
-  font-weight: 400;
-  color: $--color-text-primary;
-  background-color: #ddd;
-}
-
-
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
   color: #606266;
   background-color: #ddd;
   font-weight: 400;
 }
 
-//.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
-//  color: #606266;
-//  background-color: #ddd;
-//  font-weight: 400;
-//}
-
-.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
-  background-color: $--color-primary;
+.el-select-dropdown__item.hover {
+  background-color: primary;
   color: white;
 }
 
@@ -222,27 +210,27 @@ td .el-button.el-button--mini {
 }
 
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
-  color: $--color-primary;
+  color: primary;
 }
 
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
   color: white;
-  background-color: $--color-primary;
+  background-color: primary;
 }
 
 .el-tag.el-tag--info {
-  background-color: #f1f1f1;
-  border-color: #e5e6e7;
-  color: #333333;
+  background-color: #f1f1f1!important;
+  border-color: #e5e6e7!important;
+  color: #333333!important;
 }
 
 .el-tag.el-tag--info .el-tag__close {
-  color: #333333;
+  color: #333333!important;
   background-color: inherit;
 }
 
 .el-tag.el-tag--info.is-hit {
-  border-color: #e5e6e7;
+  border-color: #e5e6e7!important;
 }
 
 .el-tag.el-tag--info .el-tag__close:hover {
@@ -259,120 +247,71 @@ td .el-button.el-button--mini {
   border-top-color: #676a6c;
 }
 
+.text-link {
+  color: info!important;
+}
+
+.text-link:hover {
+  color: info!important;
+  filter: opacity(65%)!important;
+}
+
 .text-danger {
-  color: $--color-danger;
+  color: danger;
 }
 
 .text-primary {
-  color: $--color-primary;
+  color: primary;
 }
 
 .text-info {
-  color: $--color-info;
+  color: info;
 }
 
 .text-warning {
-  color: $--color-warning;
+  color: warning;
 }
 
 .text-success {
-  color: $--color-success;
+  color: success;
 }
 
 .el-radio__input.is-checked+.el-radio__label {
   color: inherit;
 }
 
-.el-radio__input.is-checked .el-radio__inner {
-  border-color: #409EFF;
-  background-color: #409EFF;
-}
-
-.el-checkbox__input.is-checked .el-checkbox__inner {
-  border-color: #409EFF;
-  background-color: #409EFF;
-}
-
-.el-radio__inner:hover {
-  border-color: #409EFF;
-}
-
 .el-textarea__inner {
   border-radius: 0;
 }
 
-.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  border-color: #409EFF;
-  background-color: #409EFF;
-}
-
-.el-checkbox__input.is-checked+.el-checkbox__label {
-  color: #606266;
-}
-
-.el-checkbox__inner:hover {
-  border-color: #409EFF;
-}
-
-.el-checkbox__input.is-focus .el-checkbox__inner {
-  border-color: #409EFF;
-}
-
-.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
-  margin: 0 5px;
-  background-color: white;
-  color: #606266;
-  min-width: 28px;
-  border-radius: 2px;
-  border: 1px solid #DCDFE6;
-  font-size: 12px;
-  line-height: 26px;
-  font-weight: 400;
-}
-
-.el-pagination.is-background .el-pager li:not(.disabled):hover {
-  color: white;
-  background-color: $--color-primary;
-}
-
 .el-pagination.is-background .number {
   padding: 0;
 }
 
+.el-card.primary .el-card__header {
+  background-color: primary;
+}
+
+.el-card.success .el-card__header {
+  background-color: success;
+}
+
+.el-card.info .el-card__header {
+  background-color: info;
+}
+
+.el-card.warning .el-card__header {
+  background-color: warning;
+}
+
+.el-card.danger .el-card__header {
+  background-color: danger;
+}
+
 .el-message-box__headerbtn .el-message-box__close {
   color: #606266;
 }
 
-.el-card.primary {
-  .el-card__header {
-    background-color: $--color-primary;
-  }
-}
-
-.el-card.success {
-  .el-card__header {
-    background-color: $--color-success;
-  }
-}
-
-.el-card.info {
-  .el-card__header {
-    background-color: $--color-info;
-  }
-}
-
-.el-card.warning {
-  .el-card__header {
-    background-color: $--color-warning;
-  }
-}
-
-.el-card.danger {
-  .el-card__header {
-    background-color: $--color-danger;
-  }
-}
-
 .el-tooltip__popper.is-light {
   background: #FFF;
   border: 1px solid #e7eaec;
@@ -391,21 +330,13 @@ td .el-button.el-button--mini {
   border-bottom: 1px solid #e7e7e7 !important;
 }
 
-.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+.el-table .cell,
+.el-table--border td:first-child .cell,
+.el-table--border th:first-child .cell {
   padding-left: 10px;
   padding-right: 14px;
 }
 
-.el-tag--dark.el-tag--info {
-  background-color: #23c6c8;
-  border-color: #23c6c8;
-  color: #fff;
-}
-
-a {
-  color: $--color-link !important;
-  text-decoration: none;
-}
 
 .el-tag--default.el-tag--dark {
   background-color: #d1dade;
@@ -417,7 +348,6 @@ a {
   color: #676a6c;
 }
 
-
 .el-table__empty-block {
  width: 100% !important;
 }
@@ -433,62 +363,101 @@ a {
   color: #000;
   font-size: 22px;
   font-weight: 800;
-  //color: red;
+}
+
+.el-tag--default.el-tag--dark {
+  background-color: #d1dade;
+  color: #5e5e5e;
+  border: none;
+}
+
+.el-card {
+  color: #676a6c;
+}
+
+.el-table__empty-block {
+ width: 100% !important;
+}
+
+.el-dialog__headerbtn .el-dialog__close {
+  font-size: 21px;
+  font-weight: 700;
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+}
+
+.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close {
+  color: #000;
+  font-size: 22px;
+  font-weight: 800;
 }
 
 .el-button--danger.is-plain {
-  color: $--color-danger;
+  color: danger;
   background: #ffffff;
-  border-color: $--color-danger;
+  border-color: danger;
+}
+
+.el-button--danger.is-plain.is-disabled,
+.el-button--danger.is-plain.is-disabled:active,
+.el-button--danger.is-plain.is-disabled:focus,
+.el-button--danger.is-plain.is-disabled:hover {
+  color: white;
 }
 
 .el-alert .el-alert__description {
   margin: 1px 0 0;
 }
 
-.el-input-group__prepend div.el-select .el-input__inner {
-  color: $--color-text-primary;
-}
-
-.el-input-group__prepend div.el-select .el-input__inner:hover {
-  color: $--color-text-primary;
-}
-
 .el-table {
   font-size: 13px;
 }
 
-.el-table-filter__list-item:hover {
-  color: $--color-text-primary;
-}
-
-
 .el-dialog {
-  // 居中弹框
   position: absolute;
   top: 50%;
   left: 50%;
   margin: 0 !important;
   transform: translate(-50%, -50%);
-  // 防止超出视窗
   max-height: calc(100% - 30px);
   max-width: calc(100% - 30px);
-  //实现body内部滚动
   display: flex;
   flex-direction: column;
-
-  .el-dialog__body {
-    max-height: 90vh;
-    overflow: auto;
-  }
 }
 
-.el-button--text {
-  color: $--color-link;
-  padding: 5px;
+.el-dialog  .el-dialog__body {
+  max-height: 90vh;
+  overflow: auto;
+  padding: 30px;
 }
 
-.el-button--text:hover {
-  color: $--color-link-highlight;
-  background-color: rgba(0,0,0,.05)
+.el-dialog .el-dialog__body form {
+  padding-right: 20px;
+}
+
+.el-dialog .el-dialog__footer {
+  padding: 10px 30px 30px;
+}
+
+.el-cascader {
+  line-height: 34px;
+}
+
+.el-input__icon {
+  line-height: 34px;
+}
+
+.el-checkbox__input.is-checked+.el-checkbox__label {
+  color: #606266;
+}
+
+.el-select-dropdown__item.selected {
+  font-weight: 400;
+  color: #606266;
+  background-color: #ddd;
+}
+
+.el-input-group__prepend div.el-select .el-input__inner,
+.el-input-group__prepend div.el-select .el-input__inner:hover {
+  color: #303133;
 }

src/App.vue

@@ -9,3 +9,6 @@ export default {
   name: 'App'
 }
 </script>
+
+<style>
+</style>

src/api/interface.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function postInterface(formData) {
+export function updateInterface(formData) {
   return request({
-    url: '/api/v1/xpack/interface/setting',
+    url: '/api/v1/xpack/interface/setting/',
     method: 'put',
     headers: {
       'Content-Type': 'multipart/form-data'
@@ -12,15 +12,15 @@ export function postInterface(formData) {
 }
 export function getInterfaceInfo() {
   return request({
-    url: '/api/v1/xpack/interface/setting',
+    url: '/api/v1/xpack/interface/setting/',
     method: 'get'
   })
 }
 
 export function restoreInterface() {
   return request({
-    url: '/api/v1/xpack/interface/restore',
-    method: 'get'
+    url: '/api/v1/xpack/interface/setting/restore/',
+    method: 'put'
   })
 }
 
@@ -34,3 +34,10 @@ export function importLicense(formData) {
     data: formData
   })
 }
+
+export function previewThemes() {
+  return request({
+    url: `/api/v1/xpack/interface/setting/themes/`,
+    method: 'get'
+  })
+}

src/api/orgs.js

@@ -13,3 +13,9 @@ export function getCurrentOrg() {
     method: 'get'
   })
 }
+
+export default {
+  getCurrentOrg,
+  getOrgDetail
+}
+

src/api/settings.js

@@ -68,15 +68,21 @@ export function importLdapUser(data) {
   })
 }
 
-export function getPublicSettings() {
+export function getPublicSettings(isOpen) {
+  let url
+  if (isOpen) {
+    url = '/api/v1/settings/public/open/'
+  } else {
+    url = '/api/v1/settings/public/'
+  }
   return request({
-    url: '/api/v1/settings/public/',
+    url: url,
     method: 'get'
   })
 }
 export function getLogo() {
   return request({
-    url: '/api/v1/xpack/interface/setting',
+    url: '/api/v1/xpack/interface/setting/',
     method: 'get'
   })
 }

src/api/users.js

@@ -69,3 +69,8 @@ export function logout() {
 export function refreshSessionIdAge() {
   return getProfile()
 }
+
+export default {
+  getProfile,
+  getUserList
+}

src/components/AccountHistoryTable/index.vue

@@ -0,0 +1,156 @@
+<template>
+  <div>
+    <GenericListPage :table-config="tableConfig" :header-actions="headerActions" :help-message="title" />
+    <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
+  </div>
+</template>
+
+<script>
+import { ActionsFormatter, DetailFormatter, DisplayFormatter } from '@/components/TableFormatters'
+import ShowSecretInfo from '../AccountListTable/ShowSecretInfo'
+import { GenericListPage } from '@/layout/components'
+
+export default {
+  name: 'AccountHistoryTable',
+  components: {
+    GenericListPage,
+    ShowSecretInfo
+  },
+  props: {
+    url: {
+      type: String,
+      required: true
+    },
+    exportUrl: {
+      type: String,
+      default() {
+        return this.url.replace('/assets/accounts-history/', '/assets/account-history-secrets/')
+      }
+    },
+    hasLeftActions: {
+      type: Boolean,
+      default: false
+    },
+    otherActions: {
+      type: Array,
+      default: null
+    },
+    hasClone: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      showViewSecretDialog: false,
+      account: {},
+      tableConfig: {
+        url: this.url,
+        permissions: {
+          app: 'assets',
+          resource: 'authbook'
+        },
+        columns: [
+          'hostname', 'ip', 'username', 'version',
+          'systemuser', 'date_created', 'date_updated', 'actions'
+        ],
+        columnsShow: {
+          min: ['username', 'actions'],
+          default: ['hostname', 'ip', 'username', 'version', 'actions']
+        },
+        columnsMeta: {
+          hostname: {
+            prop: 'hostname',
+            label: this.$t('assets.Hostname'),
+            showOverflowTooltip: true,
+            formatter: DetailFormatter,
+            formatterArgs: {
+              can: this.$hasPerm('assets.view_asset'),
+              getRoute({ row }) {
+                return {
+                  name: 'AssetDetail',
+                  params: { id: row.asset }
+                }
+              }
+            }
+          },
+          ip: {
+            width: '120px'
+          },
+          username: {
+            showOverflowTooltip: true
+          },
+          systemuser: {
+            formatter: DisplayFormatter
+          },
+          version: {
+            width: '70px'
+          },
+          actions: {
+            formatter: ActionsFormatter,
+            formatterArgs: {
+              hasUpdate: false, // can set function(row, value)
+              hasDelete: false, // can set function(row, value)
+              hasClone: this.hasClone,
+              moreActionsTitle: this.$t('common.More'),
+              extraActions: [
+                {
+                  name: 'View',
+                  title: this.$t('common.View'),
+                  can: this.$hasPerm('assets.view_assethistoryaccountsecret'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    vm.account = row
+                    vm.showViewSecretDialog = true
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasLeftActions: this.hasLeftActions,
+        hasMoreActions: false,
+        hasCreate: false,
+        hasImport: false,
+        hasExport: this.$hasPerm('assets.view_assethistoryaccountsecret'),
+        exportOptions: {
+          url: this.exportUrl,
+          mfaVerifyRequired: true
+        },
+        searchConfig: {
+          exclude: ['systemuser', 'asset']
+        },
+        hasSearch: true
+      }
+    }
+  },
+  computed: {
+    title() {
+      return this.$t('accounts.AccountHistableHelpMessage')
+    }
+  },
+  watch: {
+    url(iNew) {
+      this.$set(this.tableConfig, 'url', iNew)
+      this.$set(this.headerActions.exportOptions, 'url', iNew.replace('/accounts-history/', '/account-history-secrets/'))
+    }
+  },
+  mounted() {
+    if (this.otherActions) {
+      const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
+      for (const item of this.otherActions) {
+        actionColumn.formatterArgs.extraActions.push(item)
+      }
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>

src/components/AccountListTable/ShowSecretInfo.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
-    <MFAVerifyDialog
-      @MFAVerifyDone="getAuthInfo"
-      @MFAVerifyCancel="exit"
+    <UserConfirmDialog
+      :url="url"
+      @UserConfirmDone="getAuthInfo"
+      @UserConfirmCancel="exit"
     />
     <Dialog
       :title="dialogTitle"
@@ -36,12 +37,12 @@
 
 <script>
 import Dialog from '@/components/Dialog'
-import MFAVerifyDialog from '@/components/MFAVerifyDialog'
+import UserConfirmDialog from '@/components/UserConfirmDialog'
 export default {
   name: 'ShowSecretInfo',
   components: {
     Dialog,
-    MFAVerifyDialog
+    UserConfirmDialog
   },
   props: {
     account: {
@@ -57,16 +58,13 @@ export default {
     return {
       dialogTitle: this.$t('common.ViewSecret'),
       authInfo: {},
-      showAuthInfo: false
+      showAuthInfo: false,
+      url: `/api/v1/assets/account-secrets/${this.account.id}/`
     }
   },
-  mounted() {
-    this.getAuthInfo()
-  },
   methods: {
     getAuthInfo() {
-      const url = `/api/v1/assets/account-secrets/${this.account.id}/`
-      this.$axios.get(url, { disableFlashErrorMsg: true }).then(resp => {
+      this.$axios.get(this.url, { disableFlashErrorMsg: true }).then(resp => {
         this.authInfo = resp
         this.showAuthInfo = true
       })

src/components/AccountListTable/UpdateSecretInfo.vue

@@ -2,8 +2,8 @@
   <Dialog
     width="50"
     :title="this.$t('assets.UpdateAssetUserToken')"
+    :visible.sync="visible"
     :destroy-on-close="true"
-    v-bind="$attrs"
     @confirm="handleConfirm()"
     @cancel="handleCancel()"
     v-on="$listeners"
@@ -29,8 +29,9 @@
 </template>
 
 <script>
-import { Dialog, UploadKey } from '@/components'
-import { UpdateToken } from '@/components/FormFields'
+import Dialog from '@/components/Dialog'
+import { UpdateToken, UploadKey } from '@/components/FormFields'
+import { encryptPassword } from '@/utils/crypto'
 export default {
   name: 'UpdateSecretInfo',
   components: {
@@ -42,6 +43,10 @@ export default {
     account: {
       type: Object,
       default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -57,10 +62,10 @@ export default {
     handleConfirm() {
       const data = {}
       if (this.authInfo.password !== '') {
-        data.password = this.authInfo.password
+        data.password = encryptPassword(this.authInfo.password)
       }
       if (this.authInfo.private_key !== '') {
-        data.private_key = this.authInfo.private_key
+        data.private_key = encryptPassword(this.authInfo.private_key)
         if (this.authInfo.passphrase) data.passphrase = this.authInfo.passphrase
       }
       this.$axios.patch(

src/components/AccountListTable/index.vue

@@ -2,7 +2,7 @@
   <div>
     <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
     <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
-    <UpdateSecretInfo :visible.sync="showUpdateSecretDialog" :account="account" @updateAuthDone="onUpdateAuthDone" />
+    <UpdateSecretInfo v-if="showUpdateSecretDialog" :visible.sync="showUpdateSecretDialog" :account="account" @updateAuthDone="onUpdateAuthDone" />
   </div>
 </template>
 
@@ -13,6 +13,7 @@ import ShowSecretInfo from './ShowSecretInfo'
 import UpdateSecretInfo from './UpdateSecretInfo'
 import { connectivityMeta } from './const'
 import { openTaskPage } from '@/utils/jms'
+// import i18n from '@/i18n/i18n'
 
 export default {
   name: 'AccountListTable',
@@ -46,12 +47,17 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
       showViewSecretDialog: false,
       showUpdateSecretDialog: false,
       account: {},
       tableConfig: {
         url: this.url,
+        permissions: {
+          app: 'assets',
+          resource: 'authbook'
+        },
         columns: [
           'hostname', 'ip', 'username', 'version', 'connectivity',
           'systemuser', 'date_created', 'date_updated', 'actions'
@@ -67,6 +73,7 @@ export default {
             showOverflowTooltip: true,
             formatter: DetailFormatter,
             formatterArgs: {
+              can: this.$hasPerm('assets.view_asset'),
               getRoute({ row }) {
                 return {
                   name: 'AssetDetail',
@@ -99,15 +106,20 @@ export default {
                 {
                   name: 'View',
                   title: this.$t('common.View'),
+                  can: this.$hasPerm('assets.view_assetaccountsecret'),
                   type: 'primary',
-                  callback: function({ row }) {
-                    this.account = row
-                    this.showViewSecretDialog = true
-                  }.bind(this)
+                  callback: ({ row }) => {
+                    vm.account = row
+                    vm.showViewSecretDialog = false
+                    setTimeout(() => {
+                      vm.showViewSecretDialog = true
+                    })
+                  }
                 },
                 {
                   name: 'Delete',
                   title: this.$t('common.Delete'),
+                  can: this.$hasPerm('assets.delete_authbook'),
                   type: 'primary',
                   callback: ({ row }) => {
                     this.$axios.delete(`/api/v1/assets/accounts/${row.id}/`).then(() => {
@@ -119,6 +131,7 @@ export default {
                 {
                   name: 'Test',
                   title: this.$t('common.Test'),
+                  can: this.$hasPerm('assets.test_authbook'),
                   callback: ({ row }) => {
                     this.$axios.post(
                       `/api/v1/assets/accounts/${row.id}/verify/`,
@@ -131,12 +144,26 @@ export default {
                 {
                   name: 'Update',
                   title: this.$t('common.Update'),
-                  can: !this.$store.getters.currentOrgIsRoot,
-                  callback: function({ row }) {
-                    this.account = row
-                    this.showUpdateSecretDialog = true
-                  }.bind(this)
+                  can: this.$hasPerm('assets.change_assetaccountsecret') && !this.$store.getters.currentOrgIsRoot,
+                  callback: ({ row }) => {
+                    vm.account = row
+                    vm.showUpdateSecretDialog = false
+                    setTimeout(() => {
+                      vm.showUpdateSecretDialog = true
+                    })
+                  }
                 }
+                // {
+                //   name: 'History',
+                //   title: i18n.t('common.History'),
+                //   can: this.$hasPerm('assets.view_assethistoryaccount') && !this.$store.getters.currentOrgIsRoot,
+                //   callback: ({ row }) => {
+                //     this.$router.push({
+                //       name: 'AssetAccountHistoryList',
+                //       query: { id: row.id }
+                //     })
+                //   }
+                // }
               ]
             }
           }
@@ -144,9 +171,10 @@ export default {
       },
       headerActions: {
         hasLeftActions: this.hasLeftActions,
-        hasMoreActions: false,
+        hasMoreActions: true,
+        hasCreate: false,
         hasImport: false,
-        hasExport: true,
+        hasExport: this.$hasPerm('assets.view_assetaccountsecret'),
         exportOptions: {
           url: this.exportUrl,
           mfaVerifyRequired: true

src/components/Announcement/index.vue

@@ -7,12 +7,12 @@
     :title="title"
     @close="onClose"
   >
-    <span class="announcement-main"> {{ announcement.content }}</span>
+    <span class="announcement-main">{{ announcement.content }}</span>
     <span v-if="announcement.link">
       <el-link :href="announcement.link" target="_blank" class="link-more">
         {{ $t('common.ViewMore') }}
       </el-link>
-      <i class="fa fa-share-square-o" />
+      <i class="fa fa-external-link" />
     </span>
   </el-alert>
 </template>
@@ -60,6 +60,7 @@ export default {
 }
 .announcement-main {
   word-wrap:break-word;
+  white-space: pre-wrap;
 }
 .link-more {
   font-size: 10px;

src/components/AppAccountListTable/ShowSecretInfo.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
-    <MFAVerifyDialog
-      @MFAVerifyDone="getAuthInfo"
-      @MFAVerifyCancel="exit"
+    <UserConfirmDialog
+      :url="url"
+      @UserConfirmDone="getAuthInfo"
+      @UserConfirmCancel="exit"
     />
     <Dialog
       :title="dialogTitle"
@@ -33,12 +34,12 @@
 
 <script>
 import Dialog from '@/components/Dialog'
-import MFAVerifyDialog from '@/components/MFAVerifyDialog'
+import UserConfirmDialog from '@/components/UserConfirmDialog'
 export default {
   name: 'ShowSecretInfo',
   components: {
     Dialog,
-    MFAVerifyDialog
+    UserConfirmDialog
   },
   props: {
     account: {
@@ -54,16 +55,13 @@ export default {
     return {
       dialogTitle: this.$t('common.ViewSecret'),
       authInfo: {},
-      showAuthInfo: false
+      showAuthInfo: false,
+      url: `/api/v1/applications/account-secrets/${this.account.id}/`
     }
   },
-  mounted() {
-    this.getAuthInfo()
-  },
   methods: {
     getAuthInfo() {
-      const url = `/api/v1/applications/account-secrets/${this.account.id}/`
-      this.$axios.get(url, { disableFlashErrorMsg: true }).then(resp => {
+      this.$axios.get(this.url, { disableFlashErrorMsg: true }).then(resp => {
         this.authInfo = resp
         this.showAuthInfo = true
       })

src/components/AppAccountListTable/index.vue

@@ -38,6 +38,10 @@ export default {
     hasClone: {
       type: Boolean,
       default: false
+    },
+    systemUserDisabled: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -84,6 +88,7 @@ export default {
             showOverflowTooltip: true,
             formatter: DetailFormatter,
             formatterArgs: {
+              can: this.systemUserDisabled && this.$hasPerm('assets.view_systemuser'),
               getTitle({ row }) {
                 return row.systemuser_display
               },
@@ -107,6 +112,7 @@ export default {
                   name: 'View',
                   title: this.$t('common.View'),
                   type: 'primary',
+                  can: this.$hasPerm('applications.view_applicationaccountsecret'),
                   callback: function({ row }) {
                     this.account = row
                     this.showViewSecretDialog = true
@@ -129,7 +135,7 @@ export default {
         hasLeftActions: this.hasLeftActions,
         hasMoreActions: false,
         hasImport: false,
-        hasExport: true,
+        hasExport: this.$hasPerm('applications.view_applicationaccountsecret'),
         exportOptions: {
           url: this.exportUrl,
           mfaVerifyRequired: true

src/components/AssetSelect/index.vue

@@ -13,7 +13,7 @@
       :title="this.$t('assets.Assets')"
       :visible.sync="dialogVisible"
       custom-class="asset-select-dialog"
-      width="70%"
+      width="80vw"
       top="1vh"
       @confirm="handleConfirm"
       @cancel="handleCancel"
@@ -75,6 +75,8 @@ export default {
         showMenu: false,
         showRefresh: true,
         showAssets: false,
+        showSearch: true,
+        customTreeHeader: true,
         url: '/api/v1/assets/assets/?fields_size=mini',
         nodeUrl: '/api/v1/assets/nodes/',
         // ?assets=0不显示资产. =1显示资产
@@ -192,7 +194,7 @@ export default {
   .el-dialog__wrapper  ::v-deep .el-dialog__body{
     padding: 5px 10px;
   }
-  .page  ::v-deep  .treebox{
+  .page  ::v-deep  .treebox {
     height: inherit !important;
   }
   .asset-select-dialog >>> .transition-box:first-child {

src/components/AutoDataForm/index.vue

@@ -78,15 +78,22 @@ export default {
     },
     _cleanFormValue(form, remoteMeta) {
       for (const [k, v] of Object.entries(remoteMeta)) {
-        if (v.default === undefined) {
-          continue
+        let valueSet = form[k]
+        if (v.type === 'nested object' && v.children) {
+          // 有一些字段属性时 nested object 类型，但是没有 children，没有children的不需要走递归逻辑，
+          // 比如：认证配置中的属性映射字段
+          if (typeof valueSet !== 'object') {
+            // 处理一些前端没有设置初始值的情况
+            valueSet = {}
+          }
+          form[k] = valueSet
+          this._cleanFormValue(valueSet, v.children)
         }
-        const valueSet = form[k]
         if (valueSet !== undefined) {
           continue
         }
-        if (v.type === 'nested object' && typeof valueSet === 'object') {
-          this._cleanFormValue(valueSet, v.children)
+        if (v.default === undefined) {
+          continue
         }
         form[k] = v.default
       }

src/components/AutoDataForm/utils.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Select2 from '@/components/FormFields/Select2'
 import NestedField from '@/components/AutoDataForm/components/NestedField'
+import Swicher from '@/components/FormFields/Swicher'
 import rules from '@/components/DataForm/rules'
 import { assignIfNot } from '@/utils/common'
 
@@ -45,7 +46,8 @@ export class FormFieldGenerator {
         }
         break
       case 'boolean':
-        type = 'checkbox'
+        type = ''
+        field.component = Swicher
         break
       case 'nested object':
         type = 'nestedField'

src/components/AutoDataSearch/index.vue

@@ -4,9 +4,12 @@
 
 <script>
 import TagSearch from '@/components/TagSearch'
+import i18n from '@/i18n/i18n'
 export default {
   name: 'AutoDataSearch',
-  components: { TagSearch },
+  components: {
+    TagSearch
+  },
   props: {
     url: {
       type: String,
@@ -78,10 +81,13 @@ export default {
         }
         if (field.type === 'boolean') {
           option.children = [
-            { label: this.$t('common.Yes'), value: true },
-            { label: this.$t('common.No'), value: false }
+            { label: i18n.t('common.Yes'), value: true },
+            { label: i18n.t('common.No'), value: false }
           ]
         }
+        if (option.value === 'id') {
+          option.label = 'ID'
+        }
         vm.internalOptions.push(option)
       }
     },

src/components/AutoDataTable/index.vue

@@ -64,7 +64,6 @@ export default {
     }
   },
   computed: {
-
   },
   watch: {
     config: {
@@ -174,8 +173,8 @@ export default {
         }
         if (column.type === 'boolean') {
           col.filters = [
-            { text: this.$t('common.Yes'), value: true },
-            { text: this.$t('common.No'), value: false }
+            { text: i18n.t('common.Yes'), value: true },
+            { text: i18n.t('common.No'), value: false }
           ]
           col.sortable = false
           col['column-key'] = col.prop
@@ -211,7 +210,7 @@ export default {
     },
     generateTotalColumns() {
       const config = _.cloneDeep(this.config)
-      const columns = []
+      let columns = []
       for (let col of config.columns) {
         if (typeof col === 'object') {
           columns.push(col)
@@ -220,6 +219,15 @@ export default {
           columns.push(col)
         }
       }
+      columns = columns.filter(item => {
+        let has = item.has
+        if (has === undefined) {
+          has = true
+        } else if (typeof has === 'function') {
+          has = has()
+        }
+        return has
+      })
       // 第一次初始化时记录 totalColumns
       this.totalColumns = columns
       config.columns = columns

src/components/AutoDataZTree/index.vue

@@ -1,13 +1,13 @@
 <template>
   <DataZTree ref="dataztree" :setting="treeSetting" class="data-z-tree" v-on="$listeners">
     <slot v-if="treeSetting.hasRightMenu" slot="rMenu">
-      <li id="m_create" class="rmenu" tabindex="-1" @click="createTreeNode">
+      <li v-if="treeSetting.showCreate" id="m_create" class="rmenu" tabindex="-1" @click="createTreeNode">
         <i class="fa fa-plus-square-o" />  {{ this.$t('tree.CreateNode') }}
       </li>
-      <li id="m_edit" class="rmenu" tabindex="-1" @click="editTreeNode">
+      <li v-if="treeSetting.showUpdate" id="m_edit" class="rmenu" tabindex="-1" @click="editTreeNode">
         <i class="fa fa-pencil-square-o" />  {{ this.$t('tree.RenameNode') }}
       </li>
-      <li id="m_del" class="rmenu" tabindex="-1" @click="removeTreeNode">
+      <li v-if="treeSetting.showDelete" id="m_del" class="rmenu" tabindex="-1" @click="removeTreeNode">
         <i class="fa fa-minus-square" />  {{ this.$t('tree.DeleteNode') }}
       </li>
       <slot name="rMenu" />
@@ -18,6 +18,7 @@
 <script>
 import DataZTree from '../DataZTree'
 import $ from '@/utils/jquery-vendor'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'AutoDataZTree',
@@ -34,6 +35,13 @@ export default {
   data() {
     return {
       defaultSetting: {
+        showCreate: true,
+        showDelete: true,
+        showUpdate: true,
+        showSearch: false,
+        // 自定义header
+        customTreeHeader: false,
+        customTreeHeaderName: this.$t('assets.AssetTree'),
         async: {
           enable: true,
           url: (process.env.VUE_APP_ENV === 'production') ? (`${this.setting.treeUrl}`) : (`${process.env.VUE_APP_BASE_API}${this.setting.treeUrl}`),
@@ -63,6 +71,9 @@ export default {
     }
   },
   computed: {
+    ...mapGetters([
+      'currentOrg'
+    ]),
     treeSetting() {
       this.$log.debug('Settings: ', this.setting)
       return _.merge(this.defaultSetting, this.setting)
@@ -79,8 +90,8 @@ export default {
   },
   methods: {
     refreshTree: function() {
-      const refreshIconRef = $('#tree-refresh')
-      refreshIconRef.click()
+      // const refreshIconRef = $('#tree-refresh')
+      // refreshIconRef.click()
     },
     editTreeNode: function() {
       this.hideRMenu()
@@ -100,22 +111,26 @@ export default {
     // Request URL: http://localhost/api/v1/assets/assets/?node_id=d8212328-538d-41a6-bcfd-1e8cc7e3aed4&show_current_asset=null&draw=2&limit=15&offset=0&_=1587022917769
     onSelected: function(event, treeNode) {
       const show_current_asset = this.$cookie.get('show_current_asset') || '0'
+      if (!this.setting.url) {
+        return
+      }
       let combinator = '?'
       if (this.setting.url.indexOf('?') !== -1) {
         combinator = '&'
       }
       let url = ''
       const query = Object.assign({}, this.$route.query)
+      const objectId = treeNode.meta.data.id
       if (treeNode.meta.type === 'node') {
         this.currentNode = treeNode
         this.currentNodeId = treeNode.meta.data.id
         query['node'] = this.currentNodeId
         query['asset'] = ''
-        url = `${this.setting.url}${combinator}node_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
+        url = `${this.setting.url}${combinator}node_id=${objectId}&show_current_asset=${show_current_asset}`
       } else if (treeNode.meta.type === 'asset') {
         query['asset'] = treeNode.meta.data.id
         query['node'] = ''
-        url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
+        url = `${this.setting.url}${combinator}asset_id=${objectId}&show_current_asset=${show_current_asset}`
       }
       this.$router.push({ query })
       this.$emit('urlChange', url)
@@ -145,11 +160,12 @@ export default {
         url,
         { 'value': treeNode.name }
       ).then(res => {
-        let assetsAmount = treeNode.meta.data.assetsAmount
+        let assetsAmount = treeNode.meta.data['assetsAmount']
         if (!assetsAmount) {
           assetsAmount = 0
         }
         treeNode.name = treeNode.name + ' (' + assetsAmount + ')'
+        treeNode.meta.data = res
         this.zTree.updateNode(treeNode)
         this.$message.success(this.$t('common.updateSuccessMsg'))
       }).finally(() => { this.refreshTree() })
@@ -164,7 +180,7 @@ export default {
       const rMenuID = this.$refs.dataztree.$refs.ztree.iRMenuID
       const zTreeID = this.$refs.dataztree.$refs.ztree.iZTreeID
       const offset = $(`#${zTreeID}`).offset()
-      const scrollTop = document.querySelector('.treebox').scrollTop
+      const scrollTop = document.querySelector('.treebox')?.scrollTop
       x -= offset.left
       // Tmp
       y -= (offset.top + scrollTop) / 3 - 10
@@ -184,7 +200,7 @@ export default {
         return
       }
       // 屏蔽收藏资产
-      if (treeNode.id === '-12') {
+      if (treeNode?.id === '-12') {
         return
       }
       if (!treeNode && event.target.tagName.toLowerCase() !== 'button' && $(event.target).parents('a').length === 0) {
@@ -221,7 +237,7 @@ export default {
         this.$message.success(this.$t('common.updateSuccessMsg'))
       }).catch(error => {
         this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
-      }).finally(() => this.refreshTree())
+      }).finally()
     },
     createTreeNode: function() {
       this.hideRMenu()
@@ -237,13 +253,14 @@ export default {
           id: data['key'],
           name: data['value'],
           pId: parentNode.id,
+          isParent: true,
           meta: {
-            data: data
+            data: data,
+            type: 'node'
           }
         }
         newNode.checked = this.zTree.getSelectedNodes()[0].checked
         this.zTree.addNodes(parentNode, 0, newNode)
-        // vm.$refs.dataztree.refresh()
         const node = this.zTree.getNodeByParam('id', newNode.id, parentNode)
         this.currentNodeId = node.meta.data.id || newNode.id
         this.zTree.editName(node)

src/components/CronTab/Crontab.vue

@@ -238,7 +238,7 @@ export default {
     updateContabValue(name, value, from) {
       this.contabValueObj[name] = value
       if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`)
+        // debug(`来自组件 ${from} 改变了 ${name} ${value}`)
         this.changeRadio(name, value)
       }
     },

src/components/CronTab/components/Crontab-Result.vue

@@ -53,7 +53,7 @@ export default {
         }
       } catch (error) {
         this.isShow = false
-        console.log(error, 'error')
+        // debug(error, 'error')
       }
     }
   }

src/components/DataActions/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="grouped ? 'el-button-group' : 'el-button-ungroup'">
+  <div :class="grouped ? 'el-button-group' : 'el-button-ungroup'" class="layout">
     <template v-for="action in iActions">
       <el-dropdown
         v-if="action.dropdown"
@@ -13,9 +13,14 @@
         <el-button :size="size" v-bind="cleanButtonAction(action)">
           {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
         </el-button>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu slot="dropdown" style="overflow: auto;max-height: 60vh">
           <template v-for="option in action.dropdown">
-            <div v-if="option.group" :key="'group:'+option.name" class="dropdown-menu-title" style="width:130px">
+            <div
+              v-if="option.group"
+              :key="'group:'+option.name"
+              class="dropdown-menu-title"
+              style="width:130px"
+            >
               {{ option.group }}
             </div>
             <el-dropdown-item
@@ -149,6 +154,11 @@ export default {
 </script>
 
 <style scoped>
+.layout {
+  display: flex;
+  justify-content: center;
+}
+
 .dropdown-menu-title {
   text-align: left;
   font-size: 12px;
@@ -165,7 +175,7 @@ export default {
 }
 
 .el-button-ungroup .action-item {
-  margin-left: 4px
+  margin-left: 4px;
 }
 
 .el-button-ungroup .action-item:first-child {

src/components/DataForm/components/el-form-renderer/el-form-renderer.vue

@@ -146,7 +146,7 @@ export default {
        * - el-form 的 resetFields 不会触发 input & change 事件，无法监听
        * - bug1: https://github.com/FEMessage/el-data-table/issues/176#issuecomment-587280825
        * - bug2:
-       *   0. 建议先在监听器 watch.value 里 console.log(v.name, oldV.name)
+       *   0. 建议先在监听器 watch.value 里 // debug(v.name, oldV.name)
        *   1. 打开 basic 示例
        *   2. 在 label 为 name 的输入框里输入 1，此时 log：'1' ''
        *   3. 点击 reset 按钮，此时 log 两条数据： '1' '1', '' ''

src/components/DataForm/index.vue

@@ -1,9 +1,10 @@
 <template>
   <ElFormRender
     ref="form"
+    :class="mobile? 'mobile' : 'desktop'"
     :content="fields"
     :form="basicForm"
-    label-position="right"
+    :label-position="labelPosition"
     label-width="20%"
     v-bind="$attrs"
     v-on="$listeners"
@@ -13,7 +14,7 @@
     <slot v-for="item in fields" :slot="`$id:${item.id}`" :name="`$id:${item.id}`" />
 
     <el-form-item v-if="hasButtons" class="form-buttons">
-      <el-button v-for="button in moreButtons" :key="button.title" size="small" v-bind="button" @click="handleClick(button)">{{ button.title }}</el-button>
+      <el-button v-for="button in moreButtons" :key="button.title" size="small" v-bind="button" :loading="button.loading" @click="handleClick(button)">{{ button.title }}</el-button>
       <el-button v-if="defaultButton && hasReset" size="small" @click="resetForm('form')">{{ $t('common.Reset') }}</el-button>
       <el-button v-if="defaultButton && hasSaveContinue" size="small" @click="submitForm('form', true)">{{ $t('common.SaveAndAddAnother') }}</el-button>
       <el-button v-if="defaultButton" size="small" :loading="isSubmitting" type="primary" @click="submitForm('form')">{{ $t('common.Submit') }}</el-button>
@@ -68,6 +69,14 @@ export default {
       basicForm: this.form
     }
   },
+  computed: {
+    mobile() {
+      return this.$store.state.app.device === 'mobile'
+    },
+    labelPosition() {
+      return this.mobile ? 'top' : 'right'
+    }
+  },
   methods: {
     // 获取表单数据
     submitForm(formName, addContinue) {
@@ -88,38 +97,46 @@ export default {
     },
     handleClick(button) {
       const callback = button.callback || function(values, form) {
-        // console.log('Click ', button.title, ': ', values)
+        // debug('Click ', button.title, ': ', values)
       }
       const form = this.$refs['form']
       const values = form.getFormValue()
-      callback(values, form)
+      callback(values, form, button)
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
-  .el-form  ::v-deep  .el-form-item {
+  .el-form ::v-deep .el-form-item {
     margin-bottom: 12px;
   }
 
-  .el-form  ::v-deep  .el-form-item__content {
+  .el-form ::v-deep .el-form-item__content {
     width: 75%;
   }
 
-  .el-form  ::v-deep  .el-form-item__label {
+  .mobile.el-form ::v-deep .el-form-item__content {
+    width: 100%;
+  }
+
+  .el-form ::v-deep .el-form-item__label {
     padding: 0 30px 0 0;
   }
 
-  .el-form  ::v-deep  .el-form-item__error {
+  .el-form ::v-deep .el-form-item__error {
      position: inherit;
   }
 
-  .el-form  ::v-deep  .form-group-header {
+  .el-form ::v-deep .form-group-header {
     margin-left: 50px;
   }
 
-  .el-form  ::v-deep  .help-block {
+  .el-form.mobile ::v-deep .form-group-header {
+    margin-left: 0;
+  }
+
+  .el-form ::v-deep .help-block {
     display: block;
     margin-top: 5px;
     margin-bottom: 10px;
@@ -127,7 +144,10 @@ export default {
     font-size: 12px;
     line-height: 18px;
   }
-  .el-form  ::v-deep  .help-block a {
-    color: #1c84c6;
+  .el-form ::v-deep .help-block a {
+    color: var(--color-primary);
+  }
+  .form-buttons {
+    padding-top: 10px;
   }
 </style>

src/components/DataForm/rules/index.js

@@ -14,10 +14,23 @@ export const EmailCheck = {
   trigger: ['blur', 'change']
 }
 
+export const specialEmojiCheck = {
+  validator: (rule, value, callback) => {
+    value = value.trim()
+    if (/[\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/.test(value)) {
+      callback(new Error(i18n.t('common.NotSpecialEmoji')))
+    } else {
+      callback()
+    }
+  },
+  trigger: ['blur', 'change']
+}
+
 export default {
   Required,
   RequiredChange,
-  EmailCheck
+  EmailCheck,
+  specialEmojiCheck
 }
 
 export const JsonRequired = {
@@ -32,3 +45,20 @@ export const JsonRequired = {
     }
   }
 }
+
+export const JsonRequiredUserNameMapped = {
+  required: true,
+  trigger: 'change',
+  validator: (rule, value, callback) => {
+    try {
+      JSON.parse(value)
+      const hasUserName = _.map(JSON.parse(value), (value) => value)
+      if (!hasUserName.includes('username')) {
+        callback(new Error(i18n.t('common.requiredHasUserNameMapped')))
+      }
+      callback()
+    } catch (e) {
+      callback(new Error(i18n.t('common.InvalidJson')))
+    }
+  }
+}

src/components/DataZTree/components/ZTree/index.vue

@@ -1,14 +1,50 @@
 <template>
   <div>
-    <ul v-show="loading" class="ztree">
-      {{ this.$t('common.tree.Loading') }}...
-    </ul>
-    <div v-show="!loading" class="treebox">
-      <ul :id="iZTreeID" class="ztree">
+    <div
+      v-if="treeSetting.customTreeHeader"
+      class="tree-header treebox"
+    >
+      <div class="content">
+        <span class="title">
+          {{ treeSetting.customTreeHeaderName }}
+        </span>
+        <span class="tree-banner-icon-zone">
+          <a id="searchIcon" class="tree-search special">
+            <i
+              class="fa fa-search tree-banner-icon"
+              @click.stop="treeSearch"
+            />
+            <input
+              id="searchInput"
+              v-model="treeSearchValue"
+              type="text"
+              autocomplete="off"
+              class="tree-input"
+            >
+          </a>
+          <i
+            class="fa fa-refresh tree-banner-icon"
+            style="margin-right: 2px;"
+            @click.stop="refresh"
+          />
+        </span>
+      </div>
+      <ul v-show="loading" class="ztree">
         {{ this.$t('common.tree.Loading') }}...
       </ul>
-      <div v-if="treeSetting.treeUrl===''">
-        {{ this.$t('common.tree.Empty') }}<a id="tree-refresh"><i class="fa fa-refresh" /></a>
+      <ul v-show="!loading" :id="iZTreeID" class="ztree" />
+      <div v-if="treeSetting.treeUrl===''" class="tree-empty">
+        {{ this.$t('common.tree.Empty') }}
+      </div>
+    </div>
+    <div v-else class="treebox">
+      <ul v-show="loading" class="ztree">
+        {{ this.$t('common.tree.Loading') }}...
+      </ul>
+      <ul v-show="!loading" :id="iZTreeID" class="ztree" />
+      <div v-if="treeSetting.treeUrl===''" class="tree-empty">
+        {{ this.$t('common.tree.Empty') }}
+        <a id="tree-refresh"><i class="fa fa-refresh" /></a>
       </div>
     </div>
     <div :id="iRMenuID" class="rMenu">
@@ -24,6 +60,7 @@
 // eslint-disable-next-line no-unused-vars
 import $ from '@/utils/jquery-vendor.js'
 import '@ztree/ztree_v3/js/jquery.ztree.all.min.js'
+import '@ztree/ztree_v3/js/jquery.ztree.exhide.min.js'
 import '@/styles/ztree.css'
 import axiosRetry from 'axios-retry'
 
@@ -45,7 +82,8 @@ export default {
       zTree: '',
       rMenu: '',
       init: false,
-      loading: false
+      loading: false,
+      treeSearchValue: ''
     }
   },
   computed: {
@@ -54,8 +92,9 @@ export default {
     }
   },
   mounted() {
+    window.refresh = this.refresh
+    window.treeSearch = this.treeSearch
     this.initTree()
-    // $('.treebox').css('height', window.innerHeight - 60)
   },
   beforeDestroy() {
     $.fn.zTree.destroy(this.iZTreeID)
@@ -82,9 +121,7 @@ export default {
           retryDelay: () => { return 5000 }
         }
       }).then(res => {
-        if (!res) {
-          res = []
-        }
+        if (!res) res = []
         if (res.length === 0) {
           res.push({
             name: this.$t('common.tree.Empty')
@@ -94,15 +131,13 @@ export default {
         if (this.init) {
           vm.zTree.destroy()
         }
+
         this.zTree = $.fn.zTree.init($(`#${this.iZTreeID}`), this.treeSetting, res)
+        if (!this.treeSetting.customTreeHeader) {
+          this.rootNodeAddDom(this.zTree)
+        }
         // 手动上报事件, Tree加载完成
         this.$emit('TreeInitFinish', this.zTree)
-        if (this.treeSetting.showRefresh) {
-          this.rootNodeAddDom(
-            this.zTree,
-            this.treeSetting.callback.refresh
-          )
-        }
 
         if (this.treeSetting.showMenu) {
           this.rMenu = $(`#${this.iRMenuID}`)
@@ -115,43 +150,196 @@ export default {
         vm.init = true
       })
     },
-    rootNodeAddDom: function(ztree, callback) {
-      const vm = this
-      const refreshIcon = "<a id='tree-refresh'><i class='fa fa-refresh'></i></a>"
+    rootNodeAddDom(ztree) {
+      const { showSearch, showRefresh } = this.treeSetting
+      const searchIcon = `<a class="tree-search" id="searchIcon">
+                            <i class='fa fa-search tree-banner-icon' onclick="treeSearch()" /></i>
+                             <input type="text" autocomplete="off" id="searchInput" class="tree-input" />
+                          </a>`
+      const refreshIcon = "<a id='tree-refresh' onclick='refresh()'><i class='fa fa-refresh'></i></a>"
+      const treeActions = `${showSearch ? searchIcon : ''}${showRefresh ? refreshIcon : ''}`
+      const icons = `<span class="">${treeActions}</span>`
       const rootNode = ztree.getNodes()[0]
-      let $rootNodeRef
       if (rootNode) {
-        $rootNodeRef = $('#' + rootNode.tId + '_a')
-        $rootNodeRef.after(refreshIcon)
-      } else {
-        $rootNodeRef = $('#' + ztree.setting.treeId)
-        $rootNodeRef.html(refreshIcon)
+        const $rootNodeRef = $('#' + rootNode.tId + '_a')
+        $rootNodeRef.after(icons)
       }
-      const refreshIconRef = $('#tree-refresh')
-      refreshIconRef.bind('click', function() {
-        const result = callback()
-        if (result && result.then) {
-          result.finally(() => {
-            vm.initTree()
-          })
-        } else {
-          vm.initTree()
-        }
-      })
     },
-    refresh: function() {
-      const refreshIconRef = $('#tree-refresh')
-      refreshIconRef.click()
+    refresh() {
+      this.treeSearchValue = ''
+      const result = this.treeSetting?.callback?.refresh()
+      if (result && result.then) {
+        result.finally(() => {
+          this.initTree()
+        })
+      } else {
+        this.initTree()
+      }
+    },
+    treeSearch() {
+      const searchIcon = document.getElementById(`searchIcon`)
+      const searchInput = document.getElementById(`searchInput`)
+      searchIcon.classList.toggle('active')
+      searchInput.focus()
+      searchInput.onclick = (e) => {
+        e.stopPropagation()
+      }
+      searchInput.onblur = (e) => {
+        e.stopPropagation()
+        if (!(e.target.value)) {
+          searchIcon.classList.toggle('active')
+        }
+      }
+      searchInput.oninput = _.debounce((e) => {
+        e.stopPropagation()
+        const value = e.target.value || ''
+        if (this.treeSetting.async.enable) {
+          this.filterAssetsServer(value)
+        } else {
+          this.filterTree(value)
+        }
+      }, 600)
     },
     getCheckedNodes: function() {
       return this.zTree.getCheckedNodes(true)
+    },
+    recurseParent(node) {
+      const parentNode = node.getParentNode()
+      if (parentNode && parentNode.pId) {
+        return [parentNode, ...this.recurseParent(parentNode)]
+      } else if (parentNode) {
+        return [parentNode]
+      } else {
+        return []
+      }
+    },
+    recurseChildren(node) {
+      if (!node.isParent) {
+        return []
+      }
+      const children = node.children
+      if (!children) {
+        return []
+      }
+      let allChildren = []
+      children.forEach((n) => {
+        allChildren = [...children, ...this.recurseChildren(n)]
+      })
+      return allChildren
+    },
+    groupBy(array, filter) {
+      const groups = {}
+      array.forEach(function(o) {
+        const group = JSON.stringify(filter(o))
+        groups[group] = groups[group] || []
+        groups[group].push(o)
+      })
+      return Object.keys(groups).map(function(group) {
+        return groups[group]
+      })
+    },
+    filterTree(keyword, tree = this.zTree) {
+      if (!this.zTree) return
+      const searchNode = tree.getNodesByFilter((node) => node.id === 'search')
+      if (searchNode) tree.removeNode(searchNode[0])
+      const nodes = tree.transformToArray(tree.getNodes())
+      if (!keyword) {
+        tree.showNodes(nodes)
+        return
+      }
+
+      if (!keyword) {
+        if (tree.hiddenNodes) {
+          tree.showNodes(tree.hiddenNodes)
+          tree.hiddenNodes = null
+        }
+        if (tree.expandNodes) {
+          tree.expandNodes.forEach((node) => {
+            if (node.id !== nodes[0].id) {
+              tree.expandNode(node, false)
+            }
+          })
+          tree.expandNodes = null
+        }
+        return null
+      }
+      let shouldShow = []
+      const matchedNodes = tree.getNodesByFilter((node) => {
+        return node.name.toLowerCase().indexOf(keyword.toLowerCase()) > -1
+      })
+
+      if (matchedNodes.length < 1) {
+        let name = this.$t('common.Search')
+        const assetsAmount = matchedNodes.length
+        name = `${name} (${assetsAmount})`
+        const newNode = { id: 'search', name: name, isParent: false, open: false }
+        tree.addNodes(null, newNode)
+      }
+
+      matchedNodes.forEach((node) => {
+        const parents = this.recurseParent(node)
+        const children = this.recurseChildren(node)
+        shouldShow = [...shouldShow, ...parents, ...children, node]
+      })
+
+      tree.hiddenNodes = nodes
+      tree.expandNodes = shouldShow
+      tree.hideNodes(nodes)
+      tree.showNodes(shouldShow)
+      for (const node of shouldShow) {
+        if (node.isParent) {
+          tree.expandNode(node, true)
+        }
+      }
+    },
+    filterAssetsServer(keyword) {
+      if (!this.zTree) return
+      let searchNode = this.zTree.getNodesByFilter((node) => node.id === 'search')
+      if (searchNode) {
+        this.zTree.removeChildNodes(searchNode[0])
+        this.zTree.removeNode(searchNode[0])
+      }
+      const treeNodes = this.zTree.getNodes()
+      if (!keyword) {
+        if (treeNodes.length !== 0) {
+          this.zTree.showNodes(treeNodes)
+        }
+        return
+      }
+      if (treeNodes.length !== 0) {
+        this.zTree.hideNodes(treeNodes)
+      }
+
+      let treeUrl = this.treeSetting.treeUrl
+      const filterField = treeUrl.includes('?') ? `&search=${keyword}` : `?search=${keyword}`
+      if (treeUrl.indexOf('assets/nodes/children/tree') > -1) {
+        treeUrl = treeUrl + '&all=all'
+      }
+      const searchUrl = `${treeUrl}${filterField}`
+      this.$axios.get(searchUrl).then(nodes => {
+        let name = this.$t('common.Search')
+        const assetsAmount = nodes.length
+        name = `${name} (${assetsAmount})`
+        const newNode = { id: 'search', name: name, isParent: true, open: true, zAsync: true }
+        searchNode = this.zTree.addNodes(null, newNode)[0]
+        searchNode.zAsync = true
+        const nodesGroupByOrg = this.groupBy(nodes, (node) => {
+          return node.meta.data.org_name
+        })
+
+        for (const item of nodesGroupByOrg) {
+          this.zTree.addNodes(searchNode, item)
+        }
+        searchNode.open = true
+      })
+      return
     }
   }
 
 }
 </script>
 
-<style lang='less' scoped>
+<style lang='scss' scoped>
   div.rMenu {
     position: absolute;
     visibility: hidden;
@@ -191,7 +379,7 @@ export default {
     top: 100%;
     z-index: 1000;
   }
-  .ztree  ::v-deep  .fa-refresh {
+  .ztree ::v-deep .fa {
     font: normal normal normal 14px/1 FontAwesome !important;
   }
   .dropdown a:hover {
@@ -218,4 +406,106 @@ export default {
     height: 80vh;
     overflow: auto;
   }
+  ::v-deep #tree-refresh {
+    margin-left: 3px;
+  }
+  ::v-deep .tree-banner-icon-zone {
+    position: absolute;
+    right: 7px;
+    height: 30px;
+    overflow: hidden;
+    .fa {
+      color: #838385!important;;
+      &:hover {
+        color: #606266!important;;
+      }
+    }
+  }
+
+  ::v-deep .tree-search {
+    position: relative;
+    top: -2px;
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    border-radius: 12px;
+    vertical-align: sub;
+    transition: .25s;
+    overflow: hidden;
+    .fa {
+      width: 13px!important;
+    }
+    .fa-search {
+      padding-top: 1px;
+    }
+  }
+
+  ::v-deep .tree-search .tree-banner-icon {
+    position: absolute;
+    top: 1px;
+    left: 6px;
+    width: 6px;
+    height: 6px;
+    border-radius: 12px;
+    padding: 10px 6px;
+    overflow: hidden;
+    background-color: transparent!important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+  }
+
+  ::v-deep .tree-search.active  {
+    width: 160px;
+    background-color: #ffffff!important;
+  }
+
+  ::v-deep .tree-search.active:hover {
+    border-radius: 12px;
+  }
+
+  ::v-deep .tree-search input {
+    position: relative;
+    left: 20px;
+    width: 133px;
+    height: 100%;
+    background-color: #ffffff!important;
+    color: #606266;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border: none;
+    outline: none;
+  }
+  .tree-header {
+    position: relative;
+    .title {
+      font-weight: 500;
+    }
+    .content {
+      height: 30px;
+      line-height: 30px;
+      border-bottom: 1px solid #e0e0e0;
+      border-radius: 3px;
+      padding: 0 5px;
+      box-sizing: border-box;
+      overflow: hidden;
+      cursor: pointer;
+      background-color: #D7D8DC;
+      .rotate {
+        transition: all .1.8s;
+        transform: rotate(-90deg);
+      }
+      .fa-caret-down {
+        font-size: 16px;
+      }
+      .special {
+        top: 1px!important;
+      }
+    }
+  }
+  .tree-empty {
+    margin-left: 4px;
+  }
 </style>

src/components/DataZTree/index.vue

@@ -72,7 +72,7 @@ export default {
   },
   methods: {
     defaultCallback: function(action) {
-      // console.log(action)
+      // debug(action)
     }
   }
 }

src/components/Dialog/index.vue

@@ -2,8 +2,11 @@
   <el-dialog
     :title="title"
     :top="top"
+    :width="iWidth"
     class="dialog"
     v-bind="$attrs"
+    :append-to-body="false"
+    :modal-append-to-body="false"
     v-on="$listeners"
   >
     <slot />
@@ -38,6 +41,10 @@ export default {
       type: String,
       default: '3vh'
     },
+    width: {
+      type: String,
+      default: '60%'
+    },
     showConfirm: {
       type: Boolean,
       default: true
@@ -57,6 +64,11 @@ export default {
     return {
     }
   },
+  computed: {
+    iWidth() {
+      return this.$store.getters.isMobile ? '80%' : this.width
+    }
+  },
   methods: {
     onCancel() {
       this.$emit('cancel')

src/components/FormFields/DatetimeRangePicker.vue

@@ -91,18 +91,22 @@ export default {
 }
 </script>
 
-<style lang='less' scoped>
+<style lang='scss' scoped>
   .datepicker{
     width: 233px;
+    &>>> .el-range__icon {
+      margin-top: 2px;
+      margin-right: 3px;
+    }
+    &>>> .el-range-input {
+      width: 49%;
+    }
   }
   .el-input__inner{
     border: 1px solid #dcdee2;
     border-radius: 3px;
-    height: 36px;
+    height: 32x;
   }
-  /*.el-date-editor  ::v-deep  .el-input__icon{*/
-  /*  line-height: 28px;*/
-  /*}*/
   .el-date-editor  ::v-deep  .el-range-separator{
     line-height: 28px;
   }

src/components/FormFields/JsonEditor.vue

@@ -52,6 +52,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  @import "~@/styles/variables.scss";
   .json-editor {
     &>>> .jsoneditor {
       border: 1px solid #e5e6e7;
@@ -66,8 +67,8 @@ export default {
       display: none;
     }
     &>>> .jsoneditor-menu {
-      background: #1ab394;
-      border-bottom: 1px solid #1ab394;
+      background: var(--color-primary);
+      border-bottom: 1px solid var(--color-primary);
     }
   }
 </style>

src/components/FormFields/Link.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-link @click="onClick">
+  <el-link :disabled="disabled" @click="onClick">
     {{ title }}
   </el-link>
 </template>
@@ -15,6 +15,10 @@ export default {
     title: {
       type: String,
       default: ''
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {

src/components/FormFields/PasswordInput.vue

@@ -1,5 +1,5 @@
 <template>
-  <password
+  <Password
     :value="value"
     v-bind="iAttrs"
     class="el-input password-input"
@@ -32,7 +32,8 @@ export default {
       const defaultAttrs = {
         secureLength: 7,
         defaultClass: 'el-input__inner',
-        toggle: true
+        toggle: true,
+        showStrengthMeter: false
       }
       return Object.assign(defaultAttrs, this.attrs)
     }
@@ -46,17 +47,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/element-variables.scss";
   .password-input >>> .Password__badge--error {
-    background-color: $--color-danger;
+    background-color: var(--color-danger);
   }
   .password-input >>> .Password__strength-meter--fill[data-score="4"] {
-    background: $--color-primary;
+    background: var(--color-success);
     width: 100%;
   }
 
   .password-input >>> .Password__badge--success {
-    background: $--color-primary;
+    background: var(--color-success);
   }
 
   .password-input >>> .Password__strength-meter {

src/components/FormFields/Select2.vue

@@ -12,6 +12,7 @@
     filterable
     popper-append-to-body
     class="select2"
+    :disabled="selectDisabled"
     v-bind="$attrs"
     @change="onChange"
     @visible-change="onVisibleChange"
@@ -85,9 +86,14 @@ export default {
     disabledValues: {
       type: Array,
       default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
+    const vm = this
     const defaultPageSize = 10
     const defaultParams = {
       search: '',
@@ -95,7 +101,20 @@ export default {
       hasMore: true,
       pageSize: defaultPageSize
     }
+    // 设置axios全局报错提示不显示
+    const validateStatus = (status) => {
+      if (status === 403) {
+        setTimeout(() => {
+          vm.initialized = true
+          vm.selectDisabled = true
+        }, 200)
+        return 200
+      }
+      return status
+    }
     return {
+      validateStatus,
+      selectDisabled: this.disabled,
       loading: false,
       initialized: false,
       defaultParams: _.cloneDeep(defaultParams),
@@ -143,10 +162,19 @@ export default {
       }
       const transformOption = this.ajax.transformOption || defaultTransformOption
       const defaultProcessResults = (data) => {
-        let results = data.results
+        let results = []
+        let more = false
+        let total = 0
+        if (Array.isArray(data)) {
+          results = data
+          total = data.length
+        } else if (typeof data === 'object') {
+          results = data?.results || []
+          more = !!data.next
+          total = data.count
+        }
         results = results.map(transformOption)
-        const more = !!data.next
-        const total = data.count
+        results = results.filter(Boolean)
         return { results: results, pagination: more, total: total }
       }
       const defaultAjax = {
@@ -154,7 +182,8 @@ export default {
         pageSize: defaultPageSize,
         makeParams: defaultMakeParams,
         transformOption: defaultTransformOption,
-        processResults: defaultProcessResults
+        processResults: defaultProcessResults,
+        validateStatus: this.validateStatus
       }
       return Object.assign(defaultAjax, this.ajax, this.url ? { url: this.url } : {})
     }
@@ -222,9 +251,13 @@ export default {
       this.getOptions()
     },
     async getInitialOptions() {
+      const { url, processResults, validateStatus } = this.iAjax
       const params = this.safeMakeParams(this.params)
-      let data = await this.$axios.get(this.iAjax.url, { params: params })
-      data = this.iAjax.processResults.bind(this)(data)
+      let data = await this.$axios.get(url, {
+        params,
+        validateStatus
+      })
+      data = processResults.bind(this)(data)
       data.results.forEach((v) => {
         this.initialOptions.push(v)
         if (this.optionsValues.indexOf(v.value) === -1) {
@@ -242,9 +275,13 @@ export default {
       }
     },
     async getOptions() {
+      const { url, processResults, validateStatus } = this.iAjax
       const params = this.safeMakeParams(this.params)
-      const resp = await this.$axios.get(this.iAjax.url, { params: params })
-      const data = this.iAjax.processResults.bind(this)(resp)
+      const resp = await this.$axios.get(url, {
+        params,
+        validateStatus
+      })
+      const data = processResults.bind(this)(resp)
       if (!data.pagination) {
         this.params.hasMore = false
       }

src/components/FormFields/Swicher.vue

@@ -1,8 +1,8 @@
 <template>
   <el-switch
     v-model="iValue"
-    :active-color="activeColor"
     inactive-color="#dcdfe6"
+    :class="type"
     v-bind="$attrs"
     v-on="$listeners"
   />
@@ -26,21 +26,6 @@ export default {
     }
   },
   computed: {
-    activeColor() {
-      // $--color-primary: #1ab394;
-      // $--color-success: #1c84c6;
-      // $--color-info: #23c6c8;
-      // $--color-warning: #f8ac59;
-      // $--color-danger: #ed5565;
-      switch (this.type) {
-        case 'primary':
-          return '#1ab394'
-        case 'danger':
-          return '#ed5565'
-        default:
-          return '#1ab394'
-      }
-    },
     iValue: {
       set: function(newValue) {
         this.$emit('input', newValue)

src/components/FormFields/Text.vue

@@ -0,0 +1,26 @@
+<template>
+  <span>
+    {{ text }}
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'Text',
+  props: {
+    text: {
+      type: String,
+      default: ''
+    }
+  },
+  methods: {
+    onClick() {
+      window.open(this.href)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/FormFields/UploadKey.vue

@@ -1,9 +1,15 @@
 <template>
   <div class="upload-key">
     <input ref="upLoadFile" type="file" style="display: none" @change="onChange">
-    <el-button size="mini" @click.native.stop="onUpLoad">
+    <el-button v-if="!fingerprint" size="mini" @click.native.stop="onUpLoad">
       {{ this.$t('common.SelectFile') }}
     </el-button>
+    <span v-else>
+      <el-button type="text" icon="el-icon-edit" @click.native.stop="onUpLoad">
+        {{ this.$t('common.Update') }}
+      </el-button>
+      <span v-if="!fileName" class="fingerprint">{{ fingerprint }}</span>
+    </span>
     <span>{{ fileName }}</span>
     <div v-if="tip !== ''">{{ tip }}</div>
   </div>
@@ -12,10 +18,6 @@
 <script>
 export default {
   props: {
-    // value: {
-    //   type: String,
-    //   default: () => ''
-    // },
     tip: {
       type: String,
       default: () => ''
@@ -23,6 +25,10 @@ export default {
     toFormat: {
       type: String,
       default: () => 'string'
+    },
+    fingerprint: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -44,7 +50,7 @@ export default {
       const reader = new FileReader()
       reader.onload = function() {
         let result = this.result
-        if (vm.toFormat === 'object') {
+        if (vm.toFormat === 'object' && vm.fileName.endsWith('.json')) {
           result = JSON.parse(result)
         }
         vm.$emit('input', result)
@@ -58,4 +64,7 @@ export default {
 </script>
 
 <style scoped>
+.fingerprint {
+  font-size: 12px
+}
 </style>

src/components/FormFields/UserPassword.vue

@@ -32,16 +32,16 @@ export default {
         return callback()
       }
       const patterns = []
-      if (passwordRule.SECURITY_PASSWORD_UPPER_CASE) {
+      if (passwordRule['SECURITY_PASSWORD_UPPER_CASE']) {
         patterns.push([/[A-Z]/, i18n.t('common.password.UPPER_CASE_REQUIRED')])
       }
-      if (passwordRule.SECURITY_PASSWORD_LOWER_CASE) {
+      if (passwordRule['SECURITY_PASSWORD_LOWER_CASE']) {
         patterns.push([/[a-z]/, i18n.t('common.password.LOWER_CASE_REQUIRED')])
       }
-      if (passwordRule.SECURITY_PASSWORD_NUMBER) {
+      if (passwordRule['SECURITY_PASSWORD_NUMBER']) {
         patterns.push([/\d/, i18n.t('common.password.NUMBER_REQUIRED')])
       }
-      if (passwordRule.SECURITY_PASSWORD_SPECIAL_CHAR) {
+      if (passwordRule['SECURITY_PASSWORD_SPECIAL_CHAR']) {
         const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
         patterns.push([pattern, i18n.t('common.password.SPECIAL_CHAR_REQUIRED')])
       }
@@ -50,7 +50,7 @@ export default {
           return callback(new Error(msg))
         }
       }
-      let secureLength = passwordRule ? passwordRule.SECURITY_PASSWORD_MIN_LENGTH : 7
+      let secureLength = passwordRule ? passwordRule['SECURITY_PASSWORD_MIN_LENGTH'] : 7
       if (userIsOrgAdmin) {
         secureLength = passwordRule ? passwordRule.SECURITY_ADMIN_USER_PASSWORD_MIN_LENGTH : 7
       }
@@ -66,6 +66,7 @@ export default {
   data() {
     return {
       attrs: {
+        showStrengthMeter: true
       }
     }
   },

src/components/FormFields/index.js

@@ -9,6 +9,7 @@ import UserPassword from './UserPassword'
 import WeekCronSelect from './WeekCronSelect'
 import UpdateToken from './UpdateToken'
 import JsonEditor from './JsonEditor'
+import Text from './Text'
 
 export default {
   DatetimeRangePicker,
@@ -21,7 +22,8 @@ export default {
   UserPassword,
   WeekCronSelect,
   UpdateToken,
-  JsonEditor
+  JsonEditor,
+  Text
 }
 
 export {
@@ -35,5 +37,6 @@ export {
   UserPassword,
   WeekCronSelect,
   UpdateToken,
-  JsonEditor
+  JsonEditor,
+  Text
 }

src/components/Hamburger/index.vue

@@ -1,8 +1,6 @@
 <template>
-  <div style="">
-    <el-button type="primary" class="hamburger" size="mini" @click="toggleClick">
-      <i class="fa fa-bars" style="color: white; margin-right: 0" />
-    </el-button>
+  <div style="padding: 0 15px;" @click="toggleClick">
+    <svg-icon icon-class="hamburger" class="hamburger" :class="{'is-active':isActive}" />
   </div>
 </template>
 
@@ -23,13 +21,15 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+@import "~@/styles/variables.scss";
 .hamburger {
- padding: 7px 12px;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 20px;
+  color: $menuText;
 }
-
 .hamburger.is-active {
   transform: rotate(180deg);
 }
-
 </style>

src/components/ListTable/TableAction/ExportDialog.vue

@@ -1,9 +1,10 @@
 <template>
   <div>
-    <MFAVerifyDialog
+    <UserConfirmDialog
       v-if="mfaDialogShow"
-      @MFAVerifyDone="showExportDialog"
-      @MFAVerifyCancel="handleExportCancel"
+      :url="url"
+      @UserConfirmDone="showExportDialog"
+      @UserConfirmCancel="handleExportCancel"
     />
     <Dialog
       v-if="exportDialogShow"
@@ -31,7 +32,7 @@
 
 <script>
 import Dialog from '@/components/Dialog'
-import MFAVerifyDialog from '@/components/MFAVerifyDialog'
+import UserConfirmDialog from '@/components/UserConfirmDialog'
 import { createSourceIdCache } from '@/api/common'
 import * as queryUtil from '@/components/DataTable/compenents/el-data-table/utils/query'
 
@@ -39,7 +40,7 @@ export default {
   name: 'ExportDialog',
   components: {
     Dialog,
-    MFAVerifyDialog
+    UserConfirmDialog
   },
   props: {
     selectedRows: {
@@ -92,11 +93,11 @@ export default {
       return this.selectedRows.length > 0
     },
     tableQuery() {
-      const listTableRef = this.$parent.$parent.$parent.$parent
+      const listTableRef = this.$parent?.$parent?.$parent?.$parent
       if (!listTableRef) {
         return {}
       }
-      const query = listTableRef.dataTable.getQuery()
+      const query = listTableRef?.dataTable?.getQuery() || {}
       delete query['limit']
       delete query['offset']
       delete query['date_from']
@@ -199,8 +200,11 @@ export default {
       this.mfaDialogShow = false
     },
     handleExportCancel() {
-      this.exportDialogShow = false
-      this.mfaDialogShow = false
+      const vm = this
+      setTimeout(() => {
+        vm.exportDialogShow = false
+        vm.mfaDialogShow = false
+      }, 100)
     }
   }
 }

src/components/ListTable/TableAction/ImportDialog.vue

@@ -13,8 +13,12 @@
   >
     <el-form v-if="!showTable" label-position="left" style="padding-left: 50px">
       <el-form-item :label="$t('common.Import' )" :label-width="'100px'">
-        <el-radio v-model="importOption" class="export-item" label="create">{{ this.$t('common.Create') }}</el-radio>
-        <el-radio v-model="importOption" class="export-item" label="update">{{ this.$t('common.Update') }}</el-radio>
+        <el-radio v-if="canImportCreate" v-model="importOption" class="export-item" label="create">
+          {{ this.$t('common.Create') }}
+        </el-radio>
+        <el-radio v-if="canImportUpdate" v-model="importOption" class="export-item" label="update">
+          {{ this.$t('common.Update') }}
+        </el-radio>
         <div style="line-height: 1.5">
           <span class="el-upload__tip">
             {{ downloadTemplateTitle }}
@@ -77,12 +81,20 @@ export default {
     url: {
       type: String,
       default: () => ''
+    },
+    canImportCreate: {
+      type: [Boolean, Function],
+      default: false
+    },
+    canImportUpdate: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       showImportDialog: false,
-      importOption: 'create',
+      importOption: this.canImportCreate && this.canImportUpdate ? 'create' : this.canImportCreate ? 'create' : 'update',
       errorMsg: '',
       loadStatus: false,
       importTypeOption: 'csv',
@@ -193,8 +205,9 @@ export default {
       }
       return this.url.indexOf('?') === -1 ? `${this.url}?${query}` : `${this.url}&${query}`
     },
+    // eslint-disable-next-line handle-callback-err
     catchError(error) {
-      console.log(error)
+      // debug(error)
     },
     onSuccess(msg) {
       this.errorMsg = ''
@@ -220,7 +233,7 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-  @import "~@/styles/element-variables.scss";
+  @import "~@/styles/variables.scss";
   .error-msg {
     color: $--color-danger;
   }

src/components/ListTable/TableAction/ImportTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="8">
+      <el-col :md="8" :sm="24">
         <div class="tableFilter">
           <el-radio-group v-model="importStatusFilter" size="small">
             <el-radio-button label="all">{{ $t('common.Total') }}</el-radio-button>
@@ -11,7 +11,7 @@
           </el-radio-group>
         </div>
       </el-col>
-      <el-col :span="8" style="text-align: center">
+      <el-col :md="8" :sm="24" style="text-align: center">
         <span class="summary-item summary-total"> {{ $t('common.Total') }}: {{ totalCount }}</span>
         <span class="summary-item summary-success"> {{ $t('common.Success') }}: {{ successCount }}</span>
         <span class="summary-item summary-failed"> {{ $t('common.Failed') }}: {{ failedCount }}</span>
@@ -202,11 +202,14 @@ export default {
       }]
       for (const item of tableTitles) {
         const dataItemLens = tableData.map(d => {
-          const prop = item[1]
-          const itemColData = d[prop]
           if (!d) {
             return 0
           }
+          const prop = item[1]
+          const itemColData = d[prop]
+          if (typeof itemColData === 'boolean') {
+            return 5 // boolean is 5 characters long 并且 boolean.length 是 undefined
+          }
           if (typeof itemColData !== 'number' && (!itemColData || !itemColData.length)) {
             return 0
           }
@@ -405,7 +408,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/element-variables.scss";
+@import "~@/styles/variables.scss";
 .summary-item {
   padding: 0 10px
 }

src/components/ListTable/TableAction/LeftSide.vue

@@ -27,7 +27,7 @@ export default {
     createRoute: {
       type: [String, Object, Function],
       default: function() {
-        return this.$route.name.replace('List', 'Create')
+        return this.$route.name?.replace('List', 'Create')
       }
     },
     createInNewPage: {
@@ -35,7 +35,9 @@ export default {
       default: false
     },
     hasBulkDelete: defaultTrue,
+    canBulkDelete: defaultTrue,
     hasBulkUpdate: defaultFalse,
+    canBulkUpdate: defaultTrue,
     hasMoreActions: defaultTrue,
     tableUrl: {
       type: String,
@@ -98,6 +100,7 @@ export default {
       const createCreateAction = Object.assign(defaultMoreCreate, this.moreCreates)
       defaultActions.push(createCreateAction)
     }
+    const vm = this
     return {
       defaultActions: defaultActions,
       defaultMoreActions: [
@@ -107,7 +110,7 @@ export default {
           has: this.hasBulkDelete,
           can({ selectedRows }) {
             // vm.$log.debug('Delete select rows length: ', selectedRows.length)
-            return selectedRows.length > 0
+            return selectedRows.length > 0 && vm.canBulkDelete
           },
           callback: this.defaultBulkDeleteCallback
         },
@@ -115,7 +118,9 @@ export default {
           title: this.$t('common.updateSelected'),
           name: 'actionUpdateSelected',
           has: this.hasBulkUpdate,
-          can: ({ selectedRows }) => selectedRows.length > 0,
+          can: ({ selectedRows }) => {
+            return selectedRows.length > 0 && vm.canBulkUpdate
+          },
           callback: this.handleBulkUpdate
         }
       ]
@@ -136,7 +141,7 @@ export default {
       if (!this.hasMoreActions) {
         return
       }
-      let dropdown = [...this.defaultMoreActions, ...this.extraMoreActions]
+      let dropdown = _.uniqBy([...this.extraMoreActions, ...this.defaultMoreActions], 'name')
       dropdown = cleanActions(dropdown, true, {
         selectedRows: this.selectedRows,
         reloadTable: this.reloadTable

src/components/ListTable/TableAction/RightSide.vue

@@ -76,6 +76,14 @@ export default {
     extraRightSideActions: {
       type: Array,
       default: () => []
+    },
+    canCreate: {
+      type: [Boolean, Function],
+      default: false
+    },
+    canBulkUpdate: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -102,7 +110,11 @@ export default {
       return this.selectedRows.length > 0
     },
     iImportOptions() {
-      return assignIfNot(this.importOptions, { url: this.tableUrl })
+      return assignIfNot(this.importOptions, {
+        url: this.tableUrl,
+        canImportCreate: this.canCreate,
+        canImportUpdate: this.canBulkUpdate
+      })
     },
     iExportOptions() {
       const options = assignIfNot(this.exportOptions, { url: this.tableUrl })
@@ -164,8 +176,4 @@ export default {
     justify-content:center;
   }
 
-  .export-item {
-
-  }
-
 </style>

src/components/ListTable/TableAction/index.vue

@@ -1,17 +1,11 @@
 <template>
-  <div class="table-header">
+  <div class="table-header clearfix" :class="device">
     <slot name="header">
-      <div class="table-header-left-side">
-        <LeftSide v-if="hasLeftActions" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
-        <span v-else style="display: flex;flex-direction: row">
-          <AutoDataSearch v-if="hasSearch" class="right-side-item action-search" v-bind="iSearchTableConfig" @tagSearch="handleTagSearch" />
-          <DatetimeRangePicker v-if="hasDatePicker" v-bind="datePicker" class="datepicker" @dateChange="handleDateChange" />
-        </span>
-      </div>
-      <div class="table-action-right-side">
-        <AutoDataSearch v-if="hasLeftActions && hasSearch" class="right-side-item action-search" v-bind="iSearchTableConfig" @tagSearch="handleTagSearch" />
-        <DatetimeRangePicker v-if="hasDatePicker && hasLeftActions" v-bind="datePicker" class="datepicker" @dateChange="handleDateChange" />
-        <RightSide v-if="hasRightActions" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
+      <LeftSide v-if="hasLeftActions" class="left-side" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
+      <RightSide v-if="hasRightActions" class="right-side" :selected-rows="selectedRows" :table-url="tableUrl" v-bind="$attrs" v-on="$listeners" />
+      <div class="search" :class="searchClass">
+        <AutoDataSearch v-if="hasSearch" class="right-side-item action-search" v-bind="iSearchTableConfig" @tagSearch="handleTagSearch" />
+        <DatetimeRangePicker v-if="hasDatePicker" v-bind="datePicker" class="datepicker" @dateChange="handleDateChange" />
       </div>
     </slot>
   </div>
@@ -77,6 +71,15 @@ export default {
         url: this.tableUrl
       }
       return Object.assign(configDefault, this.searchConfig)
+    },
+    device() {
+      if (this.$store.state.app.device === 'mobile') {
+        return 'mobile'
+      }
+      return ''
+    },
+    searchClass() {
+      return this.hasLeftActions ? 'right' : 'left'
     }
   },
   methods: {
@@ -92,9 +95,9 @@ export default {
 
 <style scoped>
   .table-header {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
+    /*display: flex;*/
+    /*flex-direction: row;*/
+    /*justify-content: space-between;*/
   }
 
   .right-side-item {
@@ -124,6 +127,10 @@ export default {
     color: #888;
   }
 
+  .action-search >>> .el-cascader {
+    line-height: 32px !important;
+  }
+
   .right-side-actions {
     display: flex;
     padding-left: 10px;
@@ -143,5 +150,43 @@ export default {
   .datepicker{
     margin-left: 10px;
   }
+  .table-header {
+    line-height: 32px;
+  }
+  .left-side {
+    float: left;
+    display: block;
+  }
+  .right-side {
+    float: right;
+  }
+  .search {
+    display: flex;
+    flex-direction: row;
+  }
+  .mobile .search {
+    display: inherit;
+  }
+  .mobile .search .datepicker {
+    margin-left: 0;
+  }
+  .search.left {
+    float: left;
+  }
+  .search.right {
+    float: right;
+  }
+  .mobile .search.right {
+    float: none;
+  }
+  .mobile .search.right .action-search {
+    width: 100%;
+  }
+  .mobile .right-side {
+    padding-top: 5px;
+  }
 
+  .filter-field.right-side-item.action-search {
+    height: 34px;
+  }
 </style>

src/components/ListTable/TableAction/utils.js

@@ -1,5 +1,5 @@
 export function cleanActions(actions, canDefaults, { selectedRows, reloadTable }) {
-  // console.log('Start clean actions: ', selectedRows.length, reloadTable)
+  // debug('Start clean actions: ', selectedRows.length, reloadTable)
   const cleanedActions = []
   const cloneActions = _.cloneDeep(actions)
   cloneActions.forEach((action) => {

src/components/ListTable/index.vue

@@ -6,7 +6,7 @@
       :date-pick="handleDateChange"
       :selected-rows="selectedRows"
       :reload-table="reloadTable"
-      v-bind="headerActions"
+      v-bind="iHeaderActions"
     />
     <IBox class="table-content">
       <AutoDataTable
@@ -25,7 +25,9 @@ import AutoDataTable from '../AutoDataTable'
 import IBox from '../IBox'
 import TableAction from './TableAction'
 import Emitter from '@/mixins/emitter'
+import { getResourceFromApiUrl } from '@/utils/jms'
 import deepmerge from 'deepmerge'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'ListTable',
@@ -55,17 +57,72 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['currentOrgIsRoot']),
     dataTable() {
       return this.$refs.dataTable.$refs.dataTable
     },
+    iHeaderActions() {
+      const actions = {
+        canCreate: { action: 'add', checkRoot: true },
+        canBulkDelete: { action: 'delete', checkRoot: false },
+        canBulkUpdate: { action: 'change', checkRoot: true },
+        hasImport: { action: 'add|change', checkRoot: true },
+        hasExport: { action: 'view', checkRoot: false }
+      }
+      const defaults = {}
+      for (const [k, v] of Object.entries(actions)) {
+        let hasPerm = v.action.split('|').some(i => this.hasActionPerm(i.trim()))
+        if (v.checkRoot) {
+          hasPerm = hasPerm && !this.currentOrgIsRoot
+        }
+        defaults[k] = hasPerm
+      }
+      return Object.assign(defaults, this.headerActions)
+    },
     iTableConfig() {
-      const config = deepmerge(this.tableConfig, { extraQuery: this.extraQuery })
+      const config = deepmerge(this.tableConfig, {
+        extraQuery: this.extraQuery
+      })
+      const formatterArgs = {
+        'columnsMeta.actions.formatterArgs.canUpdate': () => {
+          return this.hasActionPerm('change') && !this.currentOrgIsRoot
+        },
+        'columnsMeta.actions.formatterArgs.canDelete': 'delete',
+        'columnsMeta.actions.formatterArgs.canClone': () => {
+          return this.hasActionPerm('add') && !this.currentOrgIsRoot
+        },
+        'columnsMeta.name.formatterArgs.can': 'view'
+      }
+
+      for (const [arg, action] of Object.entries(formatterArgs)) {
+        const notSet = _.get(config, arg) === undefined
+        const isFunction = typeof action === 'function'
+        if (notSet) {
+          const hasActionPerm = isFunction ? action() : this.hasActionPerm(action)
+          _.set(config, arg, hasActionPerm)
+        }
+      }
       this.$log.debug('Header actions', this.headerActions)
       this.$log.debug('ListTable: iTableConfig change', config)
       return config
     },
     tableUrl() {
-      return this.iTableConfig.url
+      return this.tableConfig.url
+    },
+    permissions() {
+      // 获取 permissions，获取不到通过 url 解析
+      const permissions = this.tableConfig.permissions || {}
+      const { app: apiApp, resource: apiResource } = getResourceFromApiUrl(this.tableUrl)
+      const app = permissions.app || apiApp
+      const resource = permissions.resource || apiResource
+      const actions = ['add', 'change', 'delete', 'view']
+      const defaultPermissions = actions.reduce((result, action) => {
+        result[action] = `${app}.${action}_${resource}`
+        return result
+      }, {})
+      const perms = Object.assign(defaultPermissions, permissions)
+      // this.$log.debug('Permissions: ', perms)
+      return perms
     }
   },
   watch: {
@@ -97,6 +154,10 @@ export default {
       this.$emit('TagFilter', attrs)
       this.$refs.dataTable.$refs.dataTable.search(attrs, true)
     },
+    hasActionPerm(action) {
+      const permRequired = this.permissions[action]
+      return this.$hasPerm(permRequired)
+    },
     handleDateChange(attrs) {
       let dateFrom = ''
       let dateTo = ''
@@ -139,6 +200,15 @@ export default {
   & >>> .el-table__header thead > tr > th {
     background-color: white;
   }
+  &>>> .el-table__row .cell {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  &>>> .el-table__expanded-cell pre {
+    max-height: 500px;
+    overflow-y: scroll;
+  }
 }
 
 //修改颜色

src/components/MFAVerifyDialog/index.vue

@@ -1,77 +0,0 @@
-<template>
-  <Dialog
-    :title="$t('common.MFAVerify')"
-    :width="'50'"
-    :show-confirm="false"
-    :show-cancel="false"
-    :visible.sync="visible"
-    :destroy-on-close="true"
-    v-bind="$attrs"
-    v-on="$listeners"
-  >
-    <el-row :gutter="20">
-      <el-col :span="4">
-        <div style="line-height: 34px;text-align: center">MFA</div>
-      </el-col>
-      <el-col :span="14">
-        <el-input v-model="MFAToken" />
-        <span class="help-tips help-block">{{ $t('common.MFARequireForSecurity') }}</span>
-      </el-col>
-      <el-col :span="4">
-        <el-button size="mini" type="primary" style="line-height:20px " @click="verifyMFA">
-          {{ this.$t('common.Confirm') }}
-        </el-button>
-      </el-col>
-    </el-row>
-  </Dialog>
-</template>
-
-<script>
-import Dialog from '@/components/Dialog'
-
-export default {
-  name: 'MFAVerifyDialog',
-  components: {
-    Dialog
-  },
-  data() {
-    return {
-      MFAToken: '',
-      visible: false
-    }
-  },
-  watch: {
-    visible(val) {
-      if (!val) {
-        this.$emit('MFAVerifyCancel', true)
-      }
-    }
-  },
-  mounted() {
-    this.$axios.get('/api/v1/authentication/otp/verify/', { disableFlashErrorMsg: true }).then(() => {
-      this.$emit('MFAVerifyDone', true)
-    }).catch(err => {
-      this.$log.debug('Verify otp code error: ', err)
-      this.visible = true
-    })
-  },
-  methods: {
-    verifyMFA() {
-      if (this.MFAToken.length !== 6) {
-        return this.$message.error(this.$tc('common.MFAErrorMsg'))
-      }
-      this.$axios.post(
-        `/api/v1/authentication/otp/verify/`, {
-          code: this.MFAToken
-        }
-      ).then(res => {
-        this.$emit('MFAVerifyDone', true)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/RelationCard/index.vue

@@ -217,9 +217,17 @@ export default {
     async loadHasObjects() {
       this.$log.debug('Start loadHasObject: ', this.params)
       const params = this.safeMakeParams(this.params)
-      let data = await this.$axios.get(this.iAjax.url, { params: params })
+      let data = await this.$axios.get(this.iAjax.url, {
+        params: params,
+        validateStatus: (status) => {
+          if (status === 403) {
+            return 200
+          }
+          return status
+        }
+      })
       data = this.iAjax.processResults.bind(this)(data)
-      data.results.forEach((v) => {
+      data.results && data.results.forEach((v) => {
         if (!this.hasObjects.find((item) => item.value === v.value)) {
           this.iHasObjects.push(v)
         }

src/components/TableFormatters/ActionsFormatter.vue

@@ -61,10 +61,6 @@ const defaultDeleteCallback = function({ row, col, cellValue, reload }) {
         done()
         reload()
         this.$message.success(this.$t('common.deleteSuccessMsg'))
-      } catch (error) {
-        if (!error.response || !error.response.data || !error.response.data.msg) {
-          this.$message.error(this.$t('common.deleteErrorMsg') + ' ' + error)
-        }
       } finally {
         instance.confirmButtonLoading = false
       }
@@ -84,15 +80,11 @@ export default {
       default: function() {
         return {
           hasUpdate: true, // can set function(row, value)
-          canUpdate: () => {
-            return !this.$store.getters.currentOrgIsRoot
-          }, // can set function(row, value)
+          canUpdate: true, // can set function(row, value)
           hasDelete: true, // can set function(row, value)
           canDelete: true,
           hasClone: true,
-          canClone: () => {
-            return !this.$store.getters.currentOrgIsRoot
-          },
+          canClone: true,
           updateRoute: this.$route.name.replace('List', 'Update'),
           cloneRoute: this.$route.name.replace('List', 'Create'),
           performDelete: defaultPerformDelete,
@@ -153,6 +145,7 @@ export default {
         v.fa = this.cleanValue(v, 'fa')
         v.order = v.order || 100
         v.tip = this.cleanValue(v, 'tip')
+        v.title = this.cleanValue(v, 'title')
         return v
       })
       actions = actions.filter((v) => v.has)

src/components/TableFormatters/DateFormatter.vue

@@ -17,7 +17,7 @@ export default {
     }
     // const locale = this.$i18n.locale
     // const value = dt.toLocaleString(locale, { hourCycle: 'h23' })
-    // console.log(this.$i18n.locale)
+    // debug(this.$i18n.locale)
     return {
       value: value
     }

src/components/TableFormatters/DeleteActionFormatter.vue

@@ -1,5 +1,11 @@
 <template>
-  <el-button ref="deleteButton" size="mini" type="danger" :disabled="iDisabled" @click="onDelete(col, row, cellValue, reload)">
+  <el-button
+    ref="deleteButton"
+    size="mini"
+    type="danger"
+    :disabled="iDisabled"
+    @click="onDelete(col, row, cellValue, reload)"
+  >
     <i class="fa fa-minus" />
   </el-button>
 </template>

src/components/TableFormatters/DetailFormatter.vue

@@ -1,9 +1,17 @@
 <template>
-  <el-link class="detail" :type="col.type || 'success'" @click="goDetail">{{ iTitle }}</el-link>
+  <el-link
+    class="detail"
+    :disabled="disabled"
+    :type="col.type || 'info'"
+    @click="goDetail"
+  >
+    {{ iTitle }}
+  </el-link>
 </template>
 
 <script>
 import BaseFormatter from './base'
+
 export default {
   name: 'DetailFormatter',
   extends: BaseFormatter,
@@ -14,7 +22,8 @@ export default {
         return {
           route: this.$route.name.replace('List', 'Detail'),
           getRoute: null,
-          routeQuery: {},
+          routeQuery: null,
+          can: true,
           getTitle({ col, row, cellValue }) {
             return cellValue
           }
@@ -35,6 +44,13 @@ export default {
         row: this.row,
         cellValue: this.cellValue
       })
+    },
+    disabled() {
+      let can = this.formatterArgs.can
+      if (typeof can === 'function') {
+        can = can(this.col)
+      }
+      return !can
     }
   },
   methods: {
@@ -42,13 +58,17 @@ export default {
       // const defaultRoute = this.$route.name.replace('List', 'Detail')
       let route = this.formatterArgs.route
       if (this.formatterArgs.getRoute && typeof this.formatterArgs.getRoute === 'function') {
-        route = this.formatterArgs.getRoute({ row: this.row, col: this.col, cellValue: this.cellValue })
+        route = this.formatterArgs.getRoute({
+          row: this.row,
+          col: this.col,
+          cellValue: this.cellValue
+        })
       }
       if (!route) {
         console.error('No route found')
         return
       }
-      let detailRoute = {}
+      let detailRoute = { replace: true }
       if (typeof route === 'string') {
         detailRoute.name = route
         detailRoute.params = { id: this.row.id }

src/components/TableFormatters/ShowKeyCopyFormatter.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="content">
+    <span>{{ currentValue }}</span>
+    <span class="right">
+      <el-tooltip
+        effect="dark"
+        placement="top"
+        :content="this.$t('common.View')"
+      >
+        <i class="el-icon-view" @click="onShow()" />
+      </el-tooltip>
+      <el-tooltip
+        effect="dark"
+        placement="top"
+        :content="this.$t('common.Copy')"
+      >
+        <i class="el-icon-copy-document" @click="onCopy()" />
+      </el-tooltip>
+    </span>
+  </div>
+</template>
+
+<script>
+import BaseFormatter from './base'
+
+export default {
+  name: 'ShowKeyCopyFormatter',
+  extends: BaseFormatter,
+  proops: {
+    cellValue: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      currentValue: this.switchShowValue()
+    }
+  },
+  methods: {
+    switchShowValue() {
+      return '******' + this.cellValue.replace(/[\w-]/g, '')
+    },
+    onShow() {
+      const { currentValue, cellValue, switchShowValue } = this
+      this.currentValue = currentValue === cellValue ? switchShowValue() : cellValue
+    },
+    onCopy: _.throttle(function() {
+      const inputDom = document.createElement('input')
+      inputDom.id = 'creatInputDom'
+      inputDom.value = this.cellValue
+      document.body.appendChild(inputDom)
+      inputDom.select()
+      document?.execCommand('copy')
+      this.$message({
+        message: this.$t('common.CopySuccess'),
+        type: 'success',
+        duration: 1400
+      })
+      document.body.removeChild(inputDom)
+    }, 1800)
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .content {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    .right {
+      float: right;
+      font-size: 15px;
+      cursor: pointer;
+      .el-icon-view, .el-icon-copy-document {
+        &:hover {
+          color: #1c84c6;
+        }
+      }
+    }
+  }
+</style>

src/components/TableFormatters/index.js

@@ -7,6 +7,7 @@ import DeleteActionFormatter from './DeleteActionFormatter'
 import DateFormatter from './DateFormatter'
 import SystemUserFormatter from './GrantedSystemUsersShowFormatter'
 import ShowKeyFormatter from '@/components/TableFormatters/ShowKeyFormatter'
+import ShowKeyCopyFormatter from './ShowKeyCopyFormatter'
 import DialogDetailFormatter from './DialogDetailFormatter'
 import EditableInputFormatter from './EditableInputFormatter'
 import StatusFormatter from './StatusFormatter'
@@ -21,6 +22,7 @@ export default {
   DateFormatter,
   SystemUserFormatter,
   ShowKeyFormatter,
+  ShowKeyCopyFormatter,
   DialogDetailFormatter,
   ArrayFormatter,
   EditableInputFormatter,
@@ -37,6 +39,7 @@ export {
   DateFormatter,
   SystemUserFormatter,
   ShowKeyFormatter,
+  ShowKeyCopyFormatter,
   DialogDetailFormatter,
   ArrayFormatter,
   EditableInputFormatter,

src/components/TagSearch/index.vue

@@ -102,43 +102,13 @@ export default {
     }
   },
   watch: {
-    // filterTags: {
-    //   handler(val) {
-    //     this.$nextTick(() => this.$emit('tagSearch', this.filterMaps))
-    //     // this.$emit('tagSearch', this.filterMaps)
-    //   },
-    //   deep: true
-    // }
     options: {
       handler(val) {
         if (val && val.length > 0) {
           const routeFilter = this.checkInTableColumns()
-          const routerSearch = routeFilter.search || {}
-          const routerSearchArrs = routerSearch?.value?.split(',') || []
-          const routerSearchArrsLength = routerSearchArrs.length || 0
-          if (routerSearch && routerSearchArrsLength > 0) {
-            for (let i = 0; i < routerSearchArrsLength; i++) {
-              const cur = routerSearchArrs[i]
-              routeFilter[`search_${cur}`] = {
-                ...routerSearch,
-                value: cur
-              }
-            }
-            delete routeFilter.search
-          }
-          const asFilterTags = _.cloneDeep(this.filterTags)
-          this.filterTags = {
-            ...asFilterTags,
-            ...routeFilter
-          }
-          if (Object.keys(routeFilter).length > 0) {
-            setTimeout(() => {
-              return this.$emit('tagSearch', this.filterMaps)
-            }, 490)
-          }
+          this.filterTagSearch(routeFilter)
         }
       },
-      immediate: true,
       deep: true
     }
   },
@@ -153,43 +123,90 @@ export default {
   methods: {
     // 获取url中的查询条件，判断是不是包含在当前查询条件里
     checkInTableColumns() {
+      const searchFieldOptions = {}
+      const queryInfoValues = this.options.map((i) => i.value)
       const routeQuery = this.getUrlQuery ? this.$route?.query : {}
-      const routeQueryKeys = Object.keys(routeQuery)
-      const routeQueryKeysLength = routeQueryKeys.length
-      const keys = {}
-      if (routeQueryKeysLength < 1) return keys
-      if (routeQueryKeysLength > 0) {
-        for (let i = 0; i < routeQueryKeysLength; i++) {
-          const key = routeQueryKeys[i]
-          let valueDecode = decodeURI(routeQuery[key])
-          const isSearch = key !== 'search'
-          const curOptions = this.options || []
-          for (let k = 0, len = curOptions.length; k < len; k++) {
-            const cur = curOptions[k]
-            if (cur?.type === 'boolean') {
-              valueDecode = !!valueDecode
-            }
-            if (key === cur.value || !isSearch) {
-              const curChildren = cur.children || []
-              keys[key] = {
-                ...cur,
-                key,
-                label: isSearch ? cur.label : '',
-                value: valueDecode
-              }
-              if (isSearch && curChildren.length > 0) {
-                for (const item of curChildren) {
-                  if (valueDecode === item.value) {
-                    keys[key].valueLabel = item.label
-                    break
-                  }
-                }
+      const routeQueryKeysLength = Object.keys(routeQuery).length
+      if (routeQueryKeysLength < 1) return searchFieldOptions
+
+      for (const [key, value] of Object.entries(routeQuery)) {
+        const valueDecode = decodeURI(value)
+        const isSearch = key === 'search'
+
+        if (isSearch) {
+          searchFieldOptions[key] = {
+            key,
+            label: '',
+            value: valueDecode
+          }
+          continue
+        }
+
+        if (queryInfoValues.includes(key)) {
+          searchFieldOptions[key] = this.getInQueryInfoFields(key, value)
+        }
+      }
+      return searchFieldOptions
+    },
+    getInQueryInfoFields(key, value) {
+      let searchFieldOption = {}
+      let valueDecode = decodeURI(value)
+      const currentOptions = this.options || []
+
+      for (let k = 0, len = currentOptions.length; k < len; k++) {
+        const current = currentOptions[k]
+        if (key === current.value) {
+          const curChildren = current.children || []
+          if (current?.type === 'boolean') {
+            valueDecode = !!valueDecode
+          }
+          searchFieldOption = {
+            ...current,
+            key,
+            label: current.label,
+            value: valueDecode
+          }
+          if (curChildren.length > 0) {
+            for (const item of curChildren) {
+              if (valueDecode === item.value) {
+                searchFieldOption.valueLabel = item.label
+                break
               }
             }
           }
+          break
         }
       }
-      return keys
+
+      return searchFieldOption
+    },
+    filterTagSearch(routeFilter) {
+      const routerSearch = routeFilter.search || {}
+      let routerSearchAttrs = []
+      if (typeof routerSearch?.value === 'string') {
+        routerSearchAttrs = routerSearch?.value?.split(',') || []
+      }
+
+      for (const attr of routerSearchAttrs) {
+        routeFilter[`search_${attr}`] = {
+          ...routerSearch,
+          value: attr
+        }
+      }
+
+      if (routerSearchAttrs.length !== 0) {
+        delete routeFilter.search
+      }
+      const asFilterTags = _.cloneDeep(this.filterTags)
+      this.filterTags = {
+        ...asFilterTags,
+        ...routeFilter
+      }
+      if (Object.keys(routeFilter).length > 0) {
+        setTimeout(() => {
+          return this.$emit('tagSearch', this.filterMaps)
+        }, 490)
+      }
     },
     getValueLabel(key, value) {
       for (const field of this.options) {

src/components/TreeTable/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-collapse-transition>
     <div style="display: flex;justify-items: center; flex-wrap: nowrap;justify-content:space-between;">
-      <div v-show="iShowTree" :style="iShowTree?('width:20%;'):('width:0;')" class="transition-box">
+      <div v-show="iShowTree" :style="iShowTree?('width:20%;'):('width:0;')" class="transition-box left">
         <component
           :is="component"
           ref="AutoDataZTree"
@@ -76,6 +76,9 @@ export default {
       deep: true
     }
   },
+  mounted() {
+    // debug(this.treeSetting)
+  },
   methods: {
     handleUrlChange(url) {
       this.$set(this.iTableConfig, 'url', url)
@@ -110,12 +113,13 @@ export default {
     float: right;
     text-align: center;
     padding: 5px 0;
-    background-color: #1ab394;
-    border-color: #1ab394;
+    background-color: var(--color-primary);
+    border-color: var(--color-primary);
     color: #FFFFFF;
     border-radius: 3px;
     line-height: 1.428;
     cursor:pointer;
+    height: 30px;
   }
   .el-tree{
     background-color: inherit !important;
@@ -129,4 +133,10 @@ export default {
     overflow: auto;
     /*border-right: solid 1px red;*/
   }
+  .transition-box.left {
+    background: #f3f3f3;
+    border: 1px solid #e0e0e0;
+    border-radius: 3px;
+    margin-right: 2px;
+  }
 </style>

src/components/UserConfirmDialog/index.vue

@@ -0,0 +1,230 @@
+<template>
+  <Dialog
+    :title="title"
+    :width="'36%'"
+    :show-confirm="false"
+    :show-cancel="false"
+    :visible.sync="visible"
+    :destroy-on-close="true"
+    v-bind="$attrs"
+    class="dialog-content"
+    v-on="$listeners"
+  >
+    <div v-if="ConfirmType === 'relogin'">
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-alert
+            :title="this.$t('auth.ReLoginTitle')"
+            type="info"
+            center
+            :closable="false"
+            style="margin-bottom: 20px;"
+          />
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-button
+            size="mini"
+            type="primary"
+            style="width: 100%; line-height:20px;"
+            @click="logOut"
+          >
+            {{ this.$t('auth.ReLogin') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <div v-else>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :span="24" :md="24" :sm="24" class="add">
+          <el-select
+            v-model="Select"
+            :disabled="ConfirmType === 'password'"
+            style="width: 100%; margin-bottom: 20px;"
+            @change="helpText(Select)"
+          >
+            <el-option
+              v-for="(item, i) of Content"
+              :key="i"
+              :label="item.display_name"
+              :value="item.name"
+              :disabled="item.disabled"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24 - smsWidth" :sm="24">
+          <el-input v-model="SecretKey" :show-password="showPassword" :placeholder="HelpText" style="margin-bottom: 20px;" />
+        </el-col>
+        <el-col v-if="Select === 'sms'" :md="smsWidth" :sm="24">
+          <el-button
+            size="mini"
+            type="primary"
+            style="line-height:20px; float: right;"
+            :disabled="smsBtndisabled"
+            @click="sendChallengeCode"
+          >
+            {{ smsBtnText }}
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-button
+            size="mini"
+            type="primary"
+            style="width: 100%; line-height:20px;"
+            @click="userConfirm"
+          >
+            {{ this.$t('common.Confirm') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </Dialog>
+</template>
+<script>
+import Dialog from '@/components/Dialog'
+
+export default {
+  name: 'UserConfirmDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    url: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      title: '',
+      smsWidth: 0,
+      Select: '',
+      Level: null,
+      HelpText: '',
+      smsBtnText: '',
+      smsBtndisabled: false,
+      ConfirmType: '',
+      Content: null,
+      SecretKey: '',
+      visible: false
+    }
+  },
+
+  computed: {
+    showPassword() {
+      if (this.ConfirmType === 'password') {
+        return true
+      }
+      return false
+    }
+  },
+  watch: {
+    visible(val) {
+      if (!val) {
+        this.$emit('UserConfirmCancel', true)
+      }
+    }
+  },
+  mounted() {
+    this.smsBtnText = this.$t('common.SendVerificationCode')
+    this.$axios.get(`${this.url}`, { disableFlashErrorMsg: true }).then(
+      () => { this.$emit('UserConfirmDone', true) }).catch((err) => {
+      const confirm_type = err.response.data.code
+      this.$axios.get('/api/v1/authentication/confirm/', { params: { confirm_type: confirm_type }}).then((data) => {
+        this.ConfirmType = data.confirm_type
+        this.Content = data.content
+        if (this.ConfirmType === 'relogin') {
+          this.$axios.post(
+            `/api/v1/authentication/confirm/`,
+            {
+              confirm_type: this.ConfirmType,
+              secret_key: ''
+            },
+            { disableFlashErrorMsg: true },
+          ).then(() => { this.$emit('UserConfirmDone', true) }).catch(() => {
+            this.title = this.$t('auth.NeedReLogin')
+            this.visible = true
+          })
+          return
+        }
+        if (this.ConfirmType === 'mfa') {
+          this.Select = this.Content.filter(item => !item.disabled)[0].name
+          if (this.Select === 'sms') {
+            this.smsWidth = 6
+          }
+          this.HelpText = this.Content.filter(item => !item.disabled)[0].placeholder
+        } else if (this.ConfirmType === 'password') {
+          this.Select = this.$t('setting.password')
+          this.HelpText = this.$t('common.PasswordRequireForSecurity')
+          this.Content = [{ 'name': 'password' }]
+        }
+        this.title = this.$t('common.CurrentUserVerify')
+        this.visible = true
+      })
+    })
+  },
+  methods: {
+    helpText(val) {
+      this.HelpText = this.Content.filter(item => item.name === val)[0]?.placeholder
+      if (val === 'sms') {
+        this.smsWidth = 6
+      } else {
+        this.smsWidth = 0
+      }
+    },
+    logOut() {
+      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
+    },
+    sendChallengeCode() {
+      this.$axios.post(
+        `/api/v1/authentication/mfa/select/`, {
+          type: 'sms'
+        }
+      ).then(res => {
+        this.$message.success(this.$t('common.VerificationCodeSent'))
+        let time = 60
+        const interval = setInterval(() => {
+          this.smsBtnText = this.$t('common.Pending') + `: ${time}`
+          this.smsBtndisabled = true
+          time -= 1
+
+          if (time === 0) {
+            this.smsBtnText = this.$t('common.SendVerificationCode')
+            this.smsBtndisabled = false
+            clearInterval(interval)
+          }
+        }, 1000)
+      })
+    },
+    userConfirm() {
+      if (this.Select === 'otp' && this.SecretKey.length !== 6) {
+        return this.$message.error(this.$t('common.MFAErrorMsg'))
+      }
+      this.$axios.post(
+        `/api/v1/authentication/confirm/`, {
+          confirm_type: this.ConfirmType,
+          mfa_type: this.ConfirmType === 'password' ? undefined : this.Select,
+          secret_key: this.SecretKey
+        }
+      ).then(res => {
+        this.$emit('UserConfirmDone', true)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .dialog-content >>> .el-dialog__footer{
+    padding: 0;
+  }
+
+  .dialog-content >>> .el-dialog{
+    padding: 8px;
+  }
+</style>

src/components/index.js

@@ -25,6 +25,6 @@ export { default as UploadField } from './FormFields/UploadField'
 export { default as AccountListTable } from './AccountListTable/index'
 export { default as AppAccountListTable } from './AppAccountListTable'
 export { default as AssetRelationCard } from './AssetRelationCard'
-export { default as MFAVerifyDialog } from './MFAVerifyDialog'
+export { default as UserConfirmDialog } from './UserConfirmDialog'
 export { default as Announcement } from './Announcement'
 export { default as CronTab } from './CronTab'

src/directive/index.js

@@ -0,0 +1 @@
+import './permission'

src/directive/permission/index.js

@@ -0,0 +1,39 @@
+import { hasPermission, getRouteRequiredPerms, getApiUrlRequirePerms } from '@/utils/jms'
+import permission from './permission'
+import Vue from 'vue'
+
+const install = function(Vue) {
+  Vue.directive('perms', permission)
+
+  Vue.prototype.$hasPerm = function(perms) {
+    return hasPermission(perms)
+  }
+
+  Vue.prototype.$hasApiActionPerm = function(url, action) {
+    const permsRequired = getApiUrlRequirePerms(url, action)
+    return hasPermission(permsRequired)
+  }
+
+  Vue.prototype.$getCurrentResActionPerms = function(action) {
+    return getRouteRequiredPerms(this.$route, action)
+  }
+
+  Vue.prototype.$hasCurrentResAction = function(action) {
+    const permsRequired = getRouteRequiredPerms(this.$route, action)
+    return hasPermission(permsRequired)
+  }
+
+  Vue.prototype.$hasLicense = function() {
+    return this.$store.getters.hasValidLicense
+  }
+
+  Vue.prototype.$isRootOrg = function() {
+    return this.$store.getters.currentOrgIsRoot
+  }
+}
+
+window['permission'] = permission
+Vue.use(install); // eslint-disable-line
+
+permission.install = install
+export default permission

src/directive/permission/permission.js

@@ -0,0 +1,18 @@
+import { hasPermission } from '@/utils/jms'
+
+function checkPermission(el, binding) {
+  const { value } = binding
+
+  if (!hasPermission(value)) {
+    el.parentNode && el.parentNode.removeChild(el)
+  }
+}
+
+export default {
+  inserted(el, binding) {
+    checkPermission(el, binding)
+  },
+  update(el, binding) {
+    checkPermission(el, binding)
+  }
+}

src/guards.js

@@ -0,0 +1,47 @@
+/* eslint-disable no-unused-vars */
+import router from './router'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
+import { startup } from '@/utils/startup'
+import store from '@/store'
+import { isSameView } from '@/utils/jms'
+
+NProgress.configure({
+  showSpinner: false
+}) // NProgress Configuration
+
+router.beforeEach(async(to, from, next) => {
+  // start progress bar
+  NProgress.start()
+  try {
+    await startup({ to, from, next })
+    next()
+  } catch (e) {
+    const msg = 'Start service error: ' + e
+    // debug(e)
+  }
+})
+
+function generateViewRoutesIfChange({ to, from }) {
+  const sameView = isSameView(to, from)
+  if (!sameView) {
+    return store.dispatch('permission/generateViewRoutes', { to: to, from: from })
+  }
+}
+
+function setPageTitle() {
+  const currentRoute = router.currentRoute
+  const loginTitle = store.getters.publicSettings['INTERFACE']['login_title']
+  const routeTitle = currentRoute.meta.title
+  if (routeTitle) {
+    document.title = routeTitle + ' - ' + loginTitle
+  }
+}
+
+router.afterEach(async(to, from) => {
+  // finish progress bar
+  await setPageTitle()
+  await generateViewRoutesIfChange({ to, from })
+  NProgress.done()
+})
+

src/i18n/date.js

@@ -26,5 +26,19 @@ export default {
       year: 'numeric', month: 'short', day: 'numeric',
       hour: 'numeric', minute: 'numeric', hour12: true
     }
+  },
+  'ja': {
+    short: {
+      year: 'numeric', month: 'short', day: 'numeric'
+    },
+    medium: {
+      year: 'numeric', month: '2-digit', day: '2-digit',
+      hour: '2-digit', minute: '2-digit', second: '2-digit',
+      hourCycle: 'h23', hour12: false
+    },
+    long: {
+      year: 'numeric', month: 'short', day: 'numeric',
+      hour: 'numeric', minute: 'numeric', hour12: true
+    }
   }
 }

src/i18n/i18n.js

@@ -4,10 +4,15 @@ import locale from 'element-ui/lib/locale'
 import VueI18n from 'vue-i18n'
 import messages from './langs'
 import date from './date'
+import VueCookie from 'vue-cookie'
 
 Vue.use(VueI18n)
+const cookieLang = VueCookie.get('django_language')
+const browserLang = navigator.systemLanguage || navigator.language
+let lang = cookieLang || browserLang || 'zh'
+lang = lang.slice(0, 2)
 const i18n = new VueI18n({
-  locale: localStorage.lang || 'cn',
+  locale: lang,
   fallbackLocale: 'en',
   silentFallbackWarn: true,
   silentTranslationWarn: true,

src/i18n/langs/en.json

@@ -1,6 +1,7 @@
 {
   "": "",
   "accounts": {
+    "AccountHistableHelpMessage": "Record the historical version of the current account",
     "PleaseClickLeftAssetToViewAssetAccount": "Asset account list,  please click on the assets on the left to view",
     "PleaseClickLeftApplicationToViewApplicationAccount": "Application account list, please click on the application on the left to view",
     "PleaseClickLeftAssetToViewGatheredUser": "Gathered user list, please click on the assets on the left to view"
@@ -40,11 +41,12 @@
       "vmware_client":"Vmware Client",
       "custom":"Custom",
       "mysql": "MySQL",
-      "redis": "Redis",
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
       "sqlserver": "SQLServer",
+      "redis": "Redis",
+      "mongodb": "MongoDB",
       "k8s": "kubernetes"
     },
     "applicationsCategory": {
@@ -96,6 +98,7 @@
     "Action": "Action",
     "ActiveSelected": "Active selected",
     "AdminUser": "Admin user",
+    "AssetTree": "Asset tree",
     "ReplaceNodeAssetsAdminUser":"Replace node assets admin user with this",
     "AdminUserDetail": "Admin user detail",
     "DynamicUsername": "Dynamic username",
@@ -124,7 +127,7 @@
     "Charset": "Charset",
     "CmdFilter": "CmdFilter",
     "CommandFilterDetail": "Command filter detail",
-    "CommandFilterHelpMessage": "System user bound some command filter, each command filter has some rules, When user login asset with this system user, then run a command, The command will be filter by rules, higher priority rule run first, When a rule matched, if rule action is allow, then allow command execute, else if action is deny, then command with be deny, else match next rule, if none matched, allowed",
+    "CommandFilterHelpMessage": "The system user supports binding multiple command filters to achieve the effect of prohibiting the input of certain commands; multiple rules can be configured in the filter. When the system user is used to connect to the asset, the input command takes effect according to the priority of the rules configured in the filter. <br>Example: The first matched rule is \"Allow\", the command is executed, the first matched rule is \"Forbidden\", the command execution is prohibited; if the last rule is not matched, it is allowed to be executed.",
     "CommandFilterRuleContentHelpText": "One line one command",
     "CommandFilterRulePriorityHelpText": "1-100, the higher will be match first",
     "CommandFilterRules": "Command filter rules",
@@ -238,13 +241,25 @@
     "User": "User",
     "Username": "Username",
     "SystemUserName": "System username",
-    "View": "View"
+    "View": "View",
+    "LoginIP": "Login IP",
+    "LoginCity": "Login city",
+    "LoginDate": "Login date"
   },
   "auth": {
     "LoginRequiredMsg": "You account has logout, Please login again",
-    "ReLogin": "Re-Login"
+    "ReLogin": "Re-Login",
+    "ReLoginTitle": "The current three-party login user (cas/saml) is not bound to MFA and does not support password verification. Please login again",
+    "NeedReLogin": "Need Re-Login",
+    "ReLoginErr": "Login time has exceeded 5 minutes, please login again"
   },
   "common": {
+    "NeedAddAppsOrSystemUserErrMsg": "Please add apps or system user",
+    "VerificationCodeSent": "The verification code has been sent",
+    "SendVerificationCode": "Send verification code",
+    "History": "History",
+    "ChangeViewHelpText": "Click to change view",
+    "Component": "component",
     "PrivateCloud": "Private cloud",
     "PublicCloud": "Public cloud",
     "Correlation": "Correlation",
@@ -252,12 +267,24 @@
     "IPLoginLimit": "IP login limit",
     "Setting": "Setting",
     "Certificate": "Certificate",
+    "CACertificate": "CA Certificate",
+    "ClientCertificate": "Client certificate",
+    "CertificateKey": "Certificate key file",
+    "AllowInvalidCert": "Allow invalid cert",
+    "UseSSL": "Use SSL/TLS",
+    "SecretKey": "Secret key",
+    "Scope": "Type",
+    "Builtin": "Builtin",
+    "DateCreated": "Date created",
+    "UpdatedBy": "Update by",
     "ViewMore": "View more",
     "Announcement": "Announcement",
     "Logging": "Logging",
+    "RecentLogin": "Recent login",
     "Database": "Database",
     "Params": "Params",
     "MFAVerify": "Verify MFA",
+    "CurrentUserVerify": "Verify Current User",
     "ViewSecret": "View secret",
     "ConnectWebSocketError": "Connect Websocket failed",
     "Nothing": "Nothing",
@@ -305,12 +332,15 @@
     "Delete": "Delete",
     "Disable": "Disable",
     "Download": "Download",
+    "Copy": "Copy",
+    "CopySuccess": "Copy success",
     "Enable": "Enable",
     "On/Off": "On/Off",
     "EnterForSearch": "Press enter to search",
     "Export": "Export",
     "Import": "Import",
     "ContinueImport": "ContinueImport",
+    "ImportAll": "Import All",
     "Continue": "Continue",
     "Stop": "Stop",
     "Finished": "Finished",
@@ -379,9 +409,12 @@
     "deleteFailedMsg": "Delete failed",
     "deleteSelected": "Delete selected",
     "deleteSuccessMsg": "Delete success",
+    "activateSuccessMsg": "Active success",
     "deleteWarningMsg": "Are you sure to delete ",
     "disableSelected": "Disable selected",
+    "disableSuccessMsg": "Disable success",
     "fieldRequiredError": "This field is required",
+    "requiredHasUserNameMapped": "The mapping of the username field must be included, such as {'uid': 'username'}",
     "getErrorMsg": "Get failed",
     "fileType": "File type",
     "Status": "Status",
@@ -398,21 +431,32 @@
       "downloadImportTemplateMsg": "Download import template",
       "downloadUpdateTemplateMsg": "Download update template",
       "onlyCSVFilesTips": "Only csv supported",
+      "ImportFail": "Import fail",
       "updateSuccessMsg": "Update success, total: {count}",
-      "dragUploadFileInfo": "Drag file here or click to upload",
+      "dragUploadFileInfo": "Drag file here or click here to upload",
       "uploadCsvLth10MHelpText": "csv/xlsx files with a size less than 10M",
       "hasImportErrorItemMsg": "There is an error item, click the x icon to view the details, and continue to import after editing"
     },
     "isValid": "Is valid",
     "nav": {
+      "TempPassword": "Temporary password",
+      "ConnectionToken": "Connection token",
       "APIKey": "API Key",
-      "AdminPage": "Admin page",
+      "Workbench": "Workbench",
+      "Navigation": "Navigation",
+      "Console": "Console",
+      "Audits": "Audit",
+      "HomePage": "Home page",
+      "QuickAccess": "Quick access",
+      "SwitchPage": "Switch page",
       "Docs": "Docs",
       "Help": "Help",
       "Logout": "Logout",
       "Profile": "Profile",
       "Support": "Support",
+      "Download": "Download",
       "UserPage": "User page",
+      "View": "View",
       "EnterpriseEdition": "Enterprise edition"
     },
     "passwordOrPassphrase": "Password or Passphrase",
@@ -425,6 +469,7 @@
       "Loading": "Loading"
     },
     "updateErrorMsg": "Update failed",
+    "ErrorMsg": "Error",
     "updateSelected": "Update selected",
     "updateSuccessMsg": "Update success",
     "SelectProperties": "Select properties",
@@ -438,6 +483,7 @@
       "SPECIAL_CHAR_REQUIRED": "Special char required",
       "MIN_LENGTH_ERROR": "Password minimum length {}"
     },
+    "noAnnouncement": "No announcement",
     "lastCannotBeDeleteMsg": "The last one can't be delete",
     "InvalidJson": "Not a valid json format",
     "time_period": "Time period",
@@ -478,6 +524,7 @@
     },
     "Cycle": "Cycle",
     "FormatError": "Format error",
+    "NotSpecialEmoji": "Special emoticons are not allowed",
     "WeekCronSelect": {
       "Monday": "Monday",
       "Tuesday": "Tuesday",
@@ -514,6 +561,7 @@
     "Monthly": "Monthly",
     "OnlineSessions": "Online sessions",
     "OnlineUsers": "Online users",
+    "ConnectUsers": "Connect users",
     "TimesWeekUnit": "times/week",
     "TopAssetsOfWeek": "Top assets of week",
     "TopUsersOfWeek": "Top user of week",
@@ -566,11 +614,12 @@
     "version": "Version",
     "versionDetail": "Version detail",
     "versionRunExecution": "Version run execution",
-    "Unkown": "Unkown"
+    "Unkown": "Unkown",
+    "Unknown": "Unknown"
   },
   "perms": {
     "": "",
-    "Actions": "Permission",
+    "Actions": "Actions",
     "Permission": "Permissions",
     "Asset": "Asset",
     "Basic": "Basic",
@@ -630,10 +679,27 @@
   },
   "route": {
     "": "",
+    "AssignedTicketList": "Assigned tickets",
+    "CreateEndpoint": "Create endpoint",
+    "UpdateEndpoint": "Update endpoint",
+    "CreateEndpointRule": "Create endpoint rule",
+    "UpdateEndpointRule": "Update endpoint rule",
+    "SystemSetting": "System setting",
+    "Index": "Index",
+    "Role": "Role",
+    "Overview": "Overview",
+    "OrgRole": "Org role",
+    "OrgRoles": "Organization roles",
+    "SystemRole": "System roles",
+    "RoleList": "Roles",
+    "RoleCreate": "Role create",
+    "RoleUpdate": "Role update",
+    "RoleDetail": "Role detail",
     "SessionDetail": "SessionDetail",
     "Accounts": "Accounts",
-    "AssetAccount": "Asset account",
-    "ApplicationAccount": "Application account",
+    "AssetAccount": "Asset Account",
+    "AssetHistoryAccount": "Asset History Account",
+    "ApplicationAccount": "Application Account",
     "Ticket": "Tickets",
     "CommandConfirm": "Command confirm",
     "AdminUserCreate": "Admin user create",
@@ -650,7 +716,9 @@
     "AssetPermissionUpdate": "Asset permissions update",
     "AssetUpdate": "Asset update",
     "Assets": "Assets",
-    "Audits": "Audits",
+    "LogsAudit": "Logs audit",
+    "SessionsAudit": "Sessions audit",
+    "SessionList": "Session list",
     "BatchCommand": "Batch Command",
     "BatchCommandLog": "Batch Command Logs",
     "CeleryTaskLog": "Celery task log",
@@ -663,6 +731,7 @@
     "CommandFilterUpdate": "Command filter update",
     "CommandStorageUpdate": "Command storage update",
     "Commands": "Commands",
+    "FileTransfer": "File transfer",
     "CreateCommandStorage": "Create command storage",
     "CreateReplayStorage": "Create replay storage",
     "Dashboard": "Dashboard",
@@ -700,7 +769,7 @@
     "FtpLog": "FTP Logs",
     "GatewayCreate": "Gateway create",
     "GatewayUpdate": "Gateway update",
-    "JobCenter": "Jobcenter",
+    "JobCenter": "Devops",
     "LabelCreate": "Label create",
     "LabelList": "Labels",
     "LabelUpdate": "Label update",
@@ -710,7 +779,7 @@
     "OperateLog": "Operation  Logs",
     "PasswordChangeLog": "Password Update Logs",
     "Perms": "Permissions",
-    "PersonalInformationImprovement": "PersonalInformationImprovement",
+    "PersonalInformationImprovement": "Personal information improvement",
     "PlatformCreate": "Platform create",
     "PlatformDetail": "Platform detail",
     "PlatformList": "Platforms",
@@ -732,6 +801,7 @@
     "Activity": "Activity",
     "SessionOffline": "Sessions offline",
     "SessionOnline": "Sessions online",
+    "RecentSession": "Recent session",
     "Sessions": "Sessions",
     "Settings": "Settings",
     "SystemUserCreate": "System user create",
@@ -750,7 +820,7 @@
     "UserFirstLogin": "UserFirstLogin",
     "UserGroupCreate": "User group create",
     "UserGroupDetail": "User group detail",
-    "UserGroupList": "User Groups",
+    "UserGroupList": "Groups",
     "UserGroupUpdate": "User group update",
     "UserGuide": "UserGuide",
     "UserList": "Users",
@@ -761,7 +831,16 @@
     "WebTerminal": "Web Terminal",
     "Notifications": "Notifications",
     "SiteMessageList": "Site message",
-    "UserLoginACL": "User Login ACL"
+    "UserLoginACL": "User Login ACL",
+    "UserLoginACLDetail": "User Login ACL",
+    "NoPermission403": "403 No permission",
+    "NoPermissionVew": "No permission view current page",
+    "AjaxError404": "404 ajax error",
+    "CannotAccess": "Unable to access the current page",
+    "GoHomePage": "Go home page"
+  },
+  "rbac": {
+    "Permissions": "Permissions"
   },
   "sessions": {
     "SetToDefaultStorage": "Set to default storage",
@@ -834,23 +913,30 @@
     "UseProtocol": "Use protocol",
     "SessionState": "Session state",
     "Monitor": "Monitor",
-    "XRDPNotSupport": "RDP Client session not support now",
+    "RazorNotSupport": "RDP Client session not support now",
     "sessionMonitor": "Session Monitor",
     "TerminateTaskSendSuccessMsg": "Terminate task has been send, Please check later",
     "helpText": {
       "esUrl": "Tip: If you have multiple hosts, use comma (, ) to split (eg: http://www.jumpserver.a.com, http://www.jumpserver.b.com)",
-      "esIndex":"Es provides the default index: jumpserver",
-      "esDocType": "Es provides the default document type: command",
-      "s3Endpoint": "S3: http://s3.{REGION_NAME}.amazonaws.com<br>S3(China): http://s3.{REGION_NAME}.amazonaws.com.cn<br>Example: http://s3.cn-north-1.amazonaws.com.cn",
-      "ossEndpoint": "OSS: http://{REGION_NAME}.aliyuncs.com<br>Example: http://oss-cn-hangzhou.aliyuncs.com"
+      "esIndex":"Es provides the default index: jumpserver. If you choose to build an index by date, this blank is the index prefix",
+      "esDocType": "Es provides the default document type: command"
     }
   },
   "setting": {
+    "OAuth2LogoTip": "Tip: Authentication Service Provider (recommended image size: 64px*64px)",
+    "EndpointListHelpMessage": "The service endpoint is the address (port) for the user to access the service. When the user connects to the asset, the service endpoint will be selected according to the endpoint rules and asset tags, and the connection will be established as the access entry to realize the distributed connection of assets.",
+    "EndpointRuleListHelpMessage": "For the service endpoint selection strategy, two types are currently supported: <br>1. Specify the endpoint according to the endpoint rule (current page); <br>2. Select the endpoint through the asset tag. The tag name is fixed to endpoint, and the value is the name of the `endpoint`. <br>Two methods preferentially use label matching, because the IP segment may conflict, and the label method exists as a supplement to the rules.",
+    "EnableKoKoSSHHelpText": "Enabled, connect assets to display SSH Client pull-up method",
+    "SettingInEndpointHelpText": "Configure the service address and port in System Settings / Terminal Settings / Service Endpoints",
     "Feature": "Feature",
-    "SMSProvider": "SMS provider",
+    "SMSProvider": "SMS provider / Protocol",
     "SMS": "SMS",
     "AlibabaCloud": "Alibaba cloud",
     "TencentCloud": "Tencent cloud",
+    "HuaweiCloud": "Huawei cloud",
+    "SignChannelNum": "Signature Channel Number",
+    "AppEndpoint": "App access address",
+    "CMPP2": "CMPP v2.0",
     "VerifySignTmpl": "Verification code template",
     "Radius": "Radius",
     "Enable": "Enable",
@@ -858,6 +944,7 @@
     "SMTP": "SMTP server",
     "Setting": "Setting",
     "AuthMethod": "Auth methods",
+    "SSO": "SSO",
     "AuthLimit": "Auth limit",
     "Ops": "Task",
     "OTP": "OTP(MFA)",
@@ -865,6 +952,8 @@
     "Cleaning": "Period clean",
     "Perms": "Perms",
     "CASSetting": "CAS setting",
+    "CAS": "CAS",
+    "OIDC": "OIDC",
     "Other": "More...",
     "Auth": "Auth",
     "SyncSetting": "Sync setting",
@@ -901,9 +990,12 @@
     "authLdapServerUri": "LDAP server",
     "authLdapUserAttrMap": "User attr map",
     "authUserAttrMap": "User attr map",
-    "authUserAttrMapHelpText": "Mapping relationship { idp_key: sp_key}",
+    "authUserAttrMapHelpText": "The key on the left is the JumpServer user property, and the value on the right is the authenticated platform user property",
     "SAML2": "SAML2",
+    "OAuth2": "OAuth2",
     "enableSAML2Auth": "Enable SAML2 Auth",
+    "enableOAuth2Auth": "Enable OAuth2 Auth",
+    "tokenHTTPMethod": "Token Obtaining Method",
     "SAML2Auth": "SAML2 Auth",
     "authSAML2Xml": "IDP metadata XML",
     "authSAML2MetadataUrl": "IDP metadata URL",
@@ -937,7 +1029,9 @@
     "LDAPUser": "LDAP User",
     "InsecureCommandAlert": "Insecure command alert",
     "helpText": {
+      "TempPassword": "For a while, there is a period of 300 seconds, failure immediately after use",
       "ApiKeyList": "The API key is used to sign the request header. The header of each request is different. Please refer to the usage documentation",
+      "ConnectionTokenList": "The connection token is a kind of authentication information that combines authentication and connection assets. It allows users to log in to assets with one click. Currently supported components include: KoKo, Lion, Magnus, Razor, etc.",
       "authLdapSearchFilter": "Choice may be (cn|uid|sAMAccountName)=%(user)s)",
       "authLdapSearchOu": "Use | split User OUs",
       "authLdapUserAttrMap": "User attr map present how to map LDAP user attr to jumpserver, username, name, email is jumpserver attr",
@@ -1012,16 +1106,23 @@
     "refreshLdapCache":"Refreshing Ldap cache ",
     "LicenseExpired": "License expired",
     "LicenseWillBe": "License will expire at ",
-    "Expire": "",
+    "LicenseReachedAssetAmountLimit": "The number of assets has exceeded the license limit",
+    "LicenseForTest": "Testing license, This license is only for testing",
+    "Expire": "Expire",
     "WeCom": "WeCom",
     "DingTalk": "DingTalk",
     "dingTalkTest": "Test",
     "weComTest": "Test",
     "FeiShu": "FeiShu",
     "feiShuTest": "Test",
-    "setting": "Setting"
+    "setting": "Setting",
+    "SystemTools": "System Tools",
+    "basicTools": "Basic Tools",
+    "destinationIP": "Destination IP",
+    "testPort": "Test Port",
+    "testTools": "Test",
+    "testHelpText": "Please enter the destination address for testing"
   },
-
   "tickets": {
     "PermissionName": "Permission name",
     "Accept": "Accept",
@@ -1035,6 +1136,7 @@
     "OpenTicket": "Open Ticket",
     "HandleTicket": "Handle Ticket",
     "FinishedTicket": "Finished Ticket",
+    "CheckViewAcceptor": "Click to view the acceptor",
     "Assignees": "Assignees",
     "Close": "Close",
     "OpenStatus":"Open",
@@ -1048,6 +1150,10 @@
     "reply": "Reply",
     "status": "Status",
     "title": "Title",
+    "RelevantApp": "App",
+    "RelevantAsset": "Asset",
+    "RelevantCommand": "Command",
+    "RelevantSystemUser": "System user",
     "type": "Type",
     "user": "User",
     "Status": "Status",
@@ -1090,12 +1196,19 @@
     "UpdateNodeAssetHardwareInfo": "Update node asset hardware information"
   },
   "users": {
+    "InviteSuccess": "Invite success",
     "FileEncryptionPassword": "File encryption password",
+    "OrgRoles": "Org roles",
+    "RoleUsers": "Role users",
+    "RoleInfo": "Role info",
+    "RolePerms": "Role perms",
     "MessageSubscription": "Message Subscription",
     "AuthSettings": "Auth settings",
     "UserName": "Name",
     "Account": "Account",
     "Existing":"Existing",
+    "AccountInformation": "Account information",
+    "PersonalSetting": "Personal setting",
     "Authentication": "Account",
     "Comment": "Comment",
     "ConfirmPassword": "Confirm password",
@@ -1127,7 +1240,8 @@
       "MFAOfUserFirstLoginPersonalInformationImprovementPage": "Enable multi-factor authentication to make the account more secure <br/> After is enabled, you will enter the multi-factor authentication binding process on your next login <br/> You can also bind directly in (personal information -> fast modifier -> modifier multiple factor Settings)",
       "MFAOfUserFirstLoginUserGuidePage": "To protect the security of you and the company <br/> please properly keep your account, password, key and other important and sensitive information <br/> (e.g., set a complex password and enable multi-factor authentication)",
       "SSHKeyOfProfileSSHUpdatePage": "Copy your public key here",
-      "OrgRoleHelpText": "Organizational roles are the user's role in the current organization"
+      "OrgRoleHelpText": "Organizational roles are the user's role in the current organization",
+      "addRolePermissions": "After add or update success, set permissions in detail page"
     },
     "IAgree": "I agree",
     "ImprovePersonalInformation": "Improve personal information",
@@ -1146,8 +1260,8 @@
     "ResetAndDownloadSSHKey": "Reset and download SSH Key",
     "ResetPublicKeyAndDownload": "Reset public key and download",
     "Role": "Role",
-    "SuperRole": "Super role",
-    "OrgRole": "Org role",
+    "SystemRoles": "System roles",
+    "OrgRole": "Org roles",
     "SSHKey": "SSH Key",
     "SSHKeySetting": "SSH Key setting",
     "Secure": "Secure",
@@ -1211,12 +1325,14 @@
     "Sender": "Sender",
     "MarkAsRead": "Mark as read",
     "OneClickRead": "Currently read",
+    "AllClickRead": "All read",
     "OneClickReadMsg": "Are you sure you want to mark the current information as read?",
     "NoUnreadMsg": "No unread messages",
     "SiteMessage": "Site messages",
     "SMS": "SMS"
   },
   "xpack": {
+    "Images": "Images",
     "NavHelp": "Navigation Link",
     "helpDocument": "Docs link",
     "helpSupport": "Support link",
@@ -1225,6 +1341,7 @@
     "officialWebsiteTip": "You can change the URL of the site navigation bar help -> Website",
     "Admin": "Admin",
     "Asset": "Asset",
+    "ip": "IP",
     "Database": "Database",
     "AssetCount": "Asset count",
     "Auditor": "Auditor",
@@ -1291,26 +1408,33 @@
     "AccountBackupPlan": {
       "Types": "Types",
       "Backup": "Backup",
-      "AccountBackupPlan": "Account backup plan",
-      "AccountBackupPlanreate": "Account backup plan",
-      "AccountBackupPlanUpdate": "Account backup plan",
+      "AccountBackupPlan": "Account Backup Plan",
+      "AccountBackupPlanCreate": "Account backup plan create",
+      "AccountBackupPlanUpdate": "Account backup plan update",
       "ExecutionDetail": "Execution detail",
       "MailRecipient": "Mail recipient",
       "IsSuccess": "Is success",
       "Reason": "Reason"
     },
     "Cloud": {
+      "CloudSync": "Cloud sync",
       "ServerAccountKey": "Server Account Key",
       "IPNetworkSegment": "Ip Network Segment",
       "Aliyun": "Ali Cloud",
       "Qcloud": "Tencent Cloud",
+      "QcloudLighthouse": "Tencent Cloud(Lighthouse)",
       "QingyunPrivatecloud": "Qingyun Private Cloud",
       "HuaweiPrivatecloud": "Huawei Private Cloud",
       "OpenStack": "OpenStack",
+      "CTYunPrivate": "CTYun Private Cloud",
       "GCP": "Google Cloud Platform",
+      "FC": "Fusion Compute",
+      "LAN": "LAN",
       "AWS_China": "AWS(China)",
       "AWS_Int": "AWS(International)",
       "HuaweiCloud": "Huawei Cloud",
+      "BaiduCloud": "Baidu Cloud",
+      "JDCloud": "JD Cloud",
       "Azure":"Azure(China)",
       "Azure_Int": "Azure(International)",
       "HostnameStrategy": "Used to produce the asset hostname. For example, 1. Instance name (instanceDemo)；2. Instance name and Partial IP (instanceDemo-250.1)",
@@ -1376,7 +1500,9 @@
     "InterfaceSettings": "Interface Setting",
     "License": "License",
     "LicenseDetail": "License detail",
-    "SystemMonitor": "System Monitor",
+    "ComponentMonitor": "System Monitor",
+    "Endpoint": "Endpoint",
+    "EndpointRule": "Endpoint rule",
     "ServiceRatio": "Service ratio",
     "LoadStatus":"Status",
     "NormalLoad":"Normal",
@@ -1387,7 +1513,9 @@
     "NoLicense": "No License",
     "Node": "Node",
     "Organization": {
+      "AllOrganization": "All organization",
       "OrganizationCreate": "Create organization",
+      "OrganizationLists": "Organization lists",
       "OrganizationDetail": "Org detail",
       "OrganizationList": "Organizations",
       "OrganizationUpdate": "Update org",
@@ -1430,6 +1558,9 @@
     "technologyConsult": "Technology Consult",
     "RegularlyPerform": "Regularly perform",
     "CyclePerform": "Cycle perform",
+    "ModifyTheme": "Modify theme",
+    "ClassicGreen": "Classic green",
+    "ChinaRed": "China red",
     "HelpText": {
       "CrontabOfCreateUpdatePage": "For example: every Sunday at 03:05 execute <5 3 * * 0> <br/> Using the 5-bit Linux crontab expression <minute hour day month week> (<a href=\"https://tool.lu/crontab/\" target=\"_blank\"> Online tool </a>) <br/> If both regularly perform and cycle perform execution are set, use regularly perform first",
       "IntervalOfCreateUpdatePage": "Unit: hour",

src/i18n/langs/index.js

@@ -1,15 +1,21 @@
 import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import enLocale from 'element-ui/lib/locale/lang/en'
-import zh from './cn.json'
+import jaLocale from 'element-ui/lib/locale/lang/ja'
+import zh from './zh.json'
 import en from './en.json'
+import ja from './ja.json'
 
 export default {
-  cn: {
+  zh: {
     ...zhLocale,
     ...zh
   },
   en: {
     ...enLocale,
     ...en
+  },
+  ja: {
+    ...jaLocale,
+    ...ja
   }
 }

src/i18n/langs/removeUnusedKeys.py

@@ -4,7 +4,8 @@ import json
 i18n_report_path = '/tmp/abc.json'
 lang_paths = {
     'cn': 'cn.json',
-    'en': 'en.json'
+    'en': 'en.json',
+    'ja': 'ja.json'
 }
 
 
@@ -51,5 +52,5 @@ def remove_keys(lang):
         f.write(data)
 
 
-for i in ['cn', 'en']:
+for i in ['cn', 'en', 'ja']:
     remove_keys(i)

src/i18n/langs/zh.json

@@ -1,6 +1,7 @@
 {
   "": "",
   "accounts": {
+    "AccountHistableHelpMessage": "记录当前账号的历史版本",
     "PleaseClickLeftAssetToViewAssetAccount": "资产账号列表，点击左侧资产进行查看",
     "PleaseClickLeftApplicationToViewApplicationAccount": "应用账号列表，点击左侧应用进行查看",
     "PleaseClickLeftAssetToViewGatheredUser": "收集用户列表，点击左侧资产进行查看"
@@ -45,11 +46,12 @@
       "vmware_client":"Vmware Client",
       "custom":"Custom",
       "mysql": "MySQL",
-      "redis": "Redis",
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
       "sqlserver": "SQLServer",
+      "redis": "Redis",
+      "mongodb": "MongoDB",
       "k8s": "Kubernetes"
     },
     "applicationsCategory": {
@@ -108,6 +110,7 @@
     "AssetDetail": "资产详情",
     "AssetList": "资产列表",
     "ReplaceNodeAssetsAdminUser":"替换节点资产的管理员",
+    "AssetTree": "资产树",
     "AssetListHelpMessage": "左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，右侧是属于该节点下的资产\n",
     "TestGatewayTestConnection":"测试连接网关",
     "TestGatewayHelpMessage": "如果使用了nat端口映射，请设置为ssh真实监听的端口",
@@ -126,7 +129,7 @@
     "Charset": "字符集",
     "CmdFilter": "命令过滤器",
     "CommandFilterDetail": "命令过滤器详情",
-    "CommandFilterHelpMessage": "系统用户可以绑定一些命令过滤器，一个过滤器可以定义一些规则 当用户使用这个系统用户登录资产，然后执行一个命令 这个命令需要被绑定过滤器的所有规则匹配，高优先级先被匹配， 当一个规则匹配到了，如果规则的动作是允许，这个命令会被放行， 如果规则的动作是禁止，命令将会被禁止执行， 否则就匹配下一个规则，如果最后没有匹配到规则，则允许执行",
+    "CommandFilterHelpMessage": "系统用户支持绑定多个命令过滤器实现禁止输入某些命令的效果；过滤器中可配置多个规则，在使用该系统用户连接资产时，输入的命令按照过滤器中配置的规则优先级生效。<br>例：首先匹配到的规则是“允许”，则该命令执行，首先匹配到的规则为“禁止”，则禁止该命令执行；如果最后未匹配到规则，则允许执行。",
     "CommandFilterRuleContentHelpText": "每行一个命令",
     "CommandFilterRulePriorityHelpText": "优先级可选范围为1-100，1最低优先级，100最高优先级",
     "CommandFilterRules": "命令过滤器规则",
@@ -243,13 +246,25 @@
     "User": "用户",
     "Username": "用户名",
     "View": "查看",
-    "SystemUserName": "系统用户名"
+    "SystemUserName": "系统用户名",
+    "LoginIP": "登录IP",
+    "LoginCity": "登录城市",
+    "LoginDate": "登录日期"
   },
   "auth": {
     "LoginRequiredMsg": "账号已退出，请重新登录",
-    "ReLogin": "重新登录"
+    "ReLogin": "重新登录",
+    "ReLoginTitle": "当前三方登录用户（CAS/SAML），未绑定 MFA 且不支持密码校验，请重新登录。",
+    "NeedReLogin": "需要重新登录",
+    "ReLoginErr": "登录时长已超过 5 分钟，请重新登录"
   },
   "common": {
+    "NeedAddAppsOrSystemUserErrMsg": "需要添加应用或系统用户",
+    "VerificationCodeSent": "验证码已发送",
+    "SendVerificationCode": "发送验证码",
+    "History": "历史",
+    "ChangeViewHelpText": "点击切换不同视图",
+    "Component": "组件",
     "PrivateCloud": "私有云",
     "PublicCloud": "公有云",
     "Correlation": "关联",
@@ -257,15 +272,27 @@
     "IPLoginLimit": "IP 登录限制",
     "Setting": "设置",
     "Certificate": "证书",
+    "CACertificate": "CA 证书",
+    "ClientCertificate": "客户端证书",
+    "CertificateKey": "证书秘钥文件",
+    "AllowInvalidCert": "忽略证书检查",
+    "UseSSL": "使用 SSL/TLS",
+    "SecretKey": "密钥",
+    "Scope": "类别",
+    "Builtin": "内置",
+    "DateCreated": "创建日期",
+    "UpdatedBy": "更新者",
     "ViewMore": "查看更多",
     "Announcement": "公告",
     "Logging": "日志记录",
+    "RecentLogin": "最近登录",
     "Database": "数据库记录",
     "Params": "参数",
     "BasicInfo": "基本信息",
     "DateUpdated": "更新日期",
     "ApprovaLevel": "审批信息",
     "MFAVerify": "验证 MFA",
+    "CurrentUserVerify": "验证当前用户",
     "ViewSecret": "查看密码",
     "ConnectWebSocketError": "连接 WebSocket 失败",
     "Action": "动作",
@@ -317,12 +344,15 @@
     "Delete": "删除",
     "Disable": "禁用",
     "Download": "下载",
+    "Copy": "复制",
+    "CopySuccess": "复制成功",
     "Enable": "启用",
     "On/Off": "启/停",
     "EnterForSearch": "按回车进行搜索",
     "Export": "导出",
     "Import": "导入",
     "ContinueImport": "继续导入",
+    "ImportAll": "导入全部",
     "Continue": "继续",
     "Stop": "停止",
     "Finished": "完成",
@@ -342,7 +372,7 @@
     "NoData": "暂无数据",
     "Open": "打开",
     "Other": "其它",
-    "Others": "其他",
+    "Others": "其它",
     "Push": "推送",
     "QuickUpdate": "快速更新",
     "RemoveSuccessMsg": "移除成功",
@@ -388,9 +418,12 @@
     "deleteFailedMsg": "删除失败",
     "deleteSelected": "删除所选",
     "deleteSuccessMsg": "删除成功",
+    "activateSuccessMsg": "激活成功",
     "deleteWarningMsg": "你确定要删除",
     "disableSelected": "禁用所选",
+    "disableSuccessMsg": "禁用成功",
     "fieldRequiredError": "这个字段是必填项",
+    "requiredHasUserNameMapped": "必须包含 username 字段的映射，如 { 'uid': 'username' }",
     "getErrorMsg": "获取失败",
     "MFAErrorMsg": "MFA错误，请检查",
     "Total": "总共",
@@ -409,22 +442,33 @@
       "downloadImportTemplateMsg": "下载创建模板",
       "downloadUpdateTemplateMsg": "下载更新模板",
       "onlyCSVFilesTips": "仅支持csv文件导入",
+      "ImportFail": "导入失败",
       "updateSuccessMsg": "导入更新成功，总共：{count}",
       "uploadCsvLth10MHelpText": "只能上传 csv/xlsx, 且不超过 10M",
-      "dragUploadFileInfo": "将文件拖到此处，或点击上传",
+      "dragUploadFileInfo": "将文件拖到此处，或点击此处上传",
       "hasImportErrorItemMsg": "存在导入失败项，点击左侧 x 查看失败原因，点击表格编辑后，可以继续导入失败项"
     },
     "fileType": "文件类型",
     "isValid": "有效",
     "nav": {
+      "TempPassword": "临时密码",
+      "ConnectionToken": "连接令牌",
       "APIKey": "API Key",
-      "AdminPage": "管理页面",
+      "Workbench": "工作台",
+      "Navigation": "导航",
+      "Console": "控制台",
+      "Audits": "审计台",
+      "HomePage": "首页",
+      "QuickAccess": "快速访问",
+      "SwitchPage": "切换视图",
       "Docs": "文档",
       "Help": "帮助",
       "Logout": "退出登录",
       "Profile": "个人信息",
       "Support": "支持",
-      "UserPage": "用户页面",
+      "Download": "下载",
+      "UserPage": "用户视图",
+      "View": "视图",
       "EnterpriseEdition": "企业版"
     },
     "passwordOrPassphrase": "密码或密钥密码",
@@ -437,6 +481,7 @@
       "Loading": "加载中"
     },
     "updateErrorMsg": "更新失败",
+    "ErrorMsg": "错误",
     "updateSelected": "更新所选",
     "updateSuccessMsg": "更新成功",
     "SelectProperties": "选择属性",
@@ -450,10 +495,12 @@
       "SPECIAL_CHAR_REQUIRED": "须包含特殊字符",
       "MIN_LENGTH_ERROR": "密码最小长度 {0} 位"
     },
+    "noAnnouncement": "暂无公告",
     "lastCannotBeDeleteMsg": "最后一项，不能被删除",
     "InvalidJson": "不是合法 JSON",
     "time_period": "时段",
     "FormatError": "格式错误",
+    "NotSpecialEmoji": "不允许输入特殊表情符号",
     "WeekCronSelect": {
       "Monday": "星期一",
       "Tuesday": "星期二",
@@ -525,6 +572,7 @@
     "Monthly": "按月",
     "OnlineSessions": "在线会话",
     "OnlineUsers": "在线用户",
+    "ConnectUsers": "连接用户",
     "TimesWeekUnit": "次/周",
     "TopAssetsOfWeek": "周资产 TOP10",
     "TopUsersOfWeek": "周用户 TOP10",
@@ -577,11 +625,12 @@
     "version": "版本",
     "versionDetail": "版本详情",
     "versionRunExecution": "执行历史",
-    "Unkown": "未知"
+    "Unkown": "未知",
+    "Unknown": "未知"
   },
   "perms": {
     "": "",
-    "Actions": "权限",
+    "Actions": "动作",
     "Asset": "资产",
     "Basic": "基本",
     "Exclude": "不包含",
@@ -628,7 +677,7 @@
     "appsList":"应用列表",
     "DatabaseAppCount": "数据库应用数量",
     "KubernetesAppCount": "Kubernetes应用数量",
-    "systemUserCount": "系统用户数量",
+    "systemUserCount": "系统用户",
     "upDownload": "上传下载",
     "uploadFile": "上传文件",
     "clipboardCopyPaste":"剪贴板复制粘贴",
@@ -640,13 +689,31 @@
   },
   "route": {
     "": "",
+    "CreateEndpoint": "创建端点",
+    "UpdateEndpoint": "更新端点",
+    "CreateEndpointRule": "创建端点规则",
+    "UpdateEndpointRule": "更新端点规则",
+    "Index": "首页",
+    "SystemSetting": "系统设置",
+    "WorkBench": "工作台",
+    "Role": "角色",
+    "Overview": "概览",
+    "RoleDetail": "角色详情",
+    "RoleList": "角色列表",
+    "RoleCreate": "创建角色",
+    "RoleUpdate": "更新角色",
+    "OrgRole": "组织角色",
+    "SystemRole": "系统角色",
     "TicketFlow": "工单流",
     "TicketFlowCreate": "创建审批流",
     "TicketFlowUpdate": "更新审批流",
     "Accounts": "账号管理",
     "AssetAccount": "资产账号",
+    "AssetHistoryAccount": "资产历史账号",
     "ApplicationAccount": "应用账号",
     "Ticket":"工单",
+    "MyTickets": "我的申请",
+    "AssignedTicketList": "待我审批",
     "SessionDetail": "会话详情",
     "CommandConfirm": "命令复核",
     "AdminUserCreate": "创建管理用户",
@@ -664,8 +731,13 @@
     "AssetPermissionUpdate": "更新资产授权规则",
     "AssetUpdate": "更新资产",
     "Assets": "资产管理",
-    "Audits": "日志审计",
+    "SessionsAudit": "会话审计",
+    "LogsAudit": "日志审计",
+    "SessionList": "会话记录",
     "BatchCommand": "批量命令",
+    "TicketsTodo": "待办工单",
+    "TicketsDone": "已办工单",
+    "TicketsNew": "提交工单",
     "BatchCommandLog": "批量命令",
     "CeleryTaskLog": "Celery任务日志",
     "CommandExecutions": "命令执行",
@@ -677,6 +749,7 @@
     "CommandFilterUpdate": "更新命令过滤器",
     "CommandStorageUpdate": "更新命令存储",
     "Commands": "命令记录",
+    "FileTransfer": "文件传输",
     "CreateCommandStorage": "创建命令存储",
     "CreateReplayStorage": "创建录像存储",
     "Dashboard": "仪表盘",
@@ -745,6 +818,7 @@
     "Detail": "详情",
     "SessionOffline": "历史会话",
     "SessionOnline": "在线会话",
+    "RecentSession": "最近会话",
     "Sessions": "会话管理",
     "Settings": "系统设置",
     "SystemUserCreate": "创建系统用户",
@@ -758,7 +832,7 @@
     "Terminal": "终端管理",
     "TicketDetail": "工单详情",
     "TicketCreate": "创建工单",
-    "Tickets": "工单管理",
+    "Tickets": "工单列表",
     "Templates": "模版管理",
     "TemplateDetail": "模版详情",
     "TemplateCreate": "创建模版",
@@ -779,7 +853,16 @@
     "WebTerminal": "Web终端",
     "Notifications": "通知",
     "SiteMessageList": "站内信",
-    "UserLoginACL": "用户登录"
+    "UserLoginACL": "用户登录",
+    "UserLoginACLDetail": "用户登录限制",
+    "NoPermission403": "403 暂无权限",
+    "NoPermissionVew": "没有权限查看当前页面",
+    "AjaxError404": "404 请求错误",
+    "CannotAccess": "无法访问当前页面",
+    "GoHomePage": "去往首页"
+  },
+  "rbac": {
+    "Permissions": "权限"
   },
   "sessions": {
     "SetToDefaultStorage": "设置为默认存储",
@@ -852,21 +935,28 @@
     "UseProtocol": "使用协议",
     "SessionState": "会话状态",
     "Monitor": "监控",
-    "XRDPNotSupport": "RDP 客户端会话, 暂不支持监控",
+    "RazorNotSupport": "RDP 客户端会话, 暂不支持监控",
     "sessionMonitor": "监控",
     "TerminateTaskSendSuccessMsg": "终断任务已下发，请稍后刷新查看",
     "helpText": {
       "esUrl": "提示：如果有多台主机，请使用逗号 ( , ) 进行分割。（eg: http://www.jumpserver.a.com:3000,http://www.jumpserver.b.com:3000）",
-      "esIndex": "es提供默认index：jumpserver",
-      "esDocType": "es默认文档类型：command",
-      "s3Endpoint": "S3 格式: http://s3.{REGION_NAME}.amazonaws.com<br>S3(China) 格式: http://s3.{REGION_NAME}.amazonaws.com.cn<br>如: http://s3.cn-north-1.amazonaws.com.cn",
-      "ossEndpoint": "OSS 格式: http://{REGION_NAME}.aliyuncs.com<br>如: http://oss-cn-hangzhou.aliyuncs.com"
+      "esIndex": "es 提供默认 index：jumpserver。如果开启按日期建立索引，那么输入的值会作为索引前缀",
+      "esDocType": "es 默认文档类型：command"
     }
   },
   "setting": {
+    "OAuth2LogoTip": "提示：认证服务提供商（建议图片大小为: 64px*64px）",
+    "EndpointListHelpMessage": "服务端点是用户访问服务的地址(端口)，当用户在连接资产时，会根据端点规则和资产标签选择服务端点，作为访问入口建立连接，实现分布式连接资产",
+    "EndpointRuleListHelpMessage": "对于服务端点选择策略，目前支持两种：<br>1、根据端点规则指定端点(当前页面)；<br>2、通过资产标签选择端点，标签名固定是 endpoint，值是端点的名称。<br>两种方式优先使用标签匹配，因为 IP 段可能冲突，标签方式是作为规则的补充存在的。",
+    "EnableKoKoSSHHelpText": "开启时连接资产会显示 SSH Client 拉起方式",
+    "SettingInEndpointHelpText": "在 系统设置 / 终端设置 / 服务端点 中配置服务地址和端口",
     "Feature": "功能",
     "AlibabaCloud": "阿里云",
     "TencentCloud": "腾讯云",
+    "HuaweiCloud": "华为云",
+    "SignChannelNum": "签名通道号",
+    "AppEndpoint": "应用接入地址",
+    "CMPP2": "CMPP v2.0",
     "Radius": "Radius",
     "VerifySignTmpl": "验证码短信模板",
     "Enable": "启用",
@@ -886,6 +976,8 @@
     "Cleaning": "定期清理",
     "Other": "其它设置",
     "CASSetting": "CAS 配置",
+    "CAS": "CAS",
+    "OIDC": "OIDC",
     "Auth": "认证设置",
     "SyncSetting": "同步设置",
     "Advanced": "高级设置",
@@ -922,9 +1014,10 @@
     "authLdapServerUri": "LDAP地址",
     "authLdapUserAttrMap": "用户属性映射",
     "authUserAttrMap": "用户属性映射",
-    "authUserAttrMapHelpText": "映射关系 {idp：sp}",
-    "SAML2": "SAML2",
-    "enableSAML2Auth": "开启 SAML2 认证",
+    "authUserAttrMapHelpText": "左侧的键为 JumpServer 用户属性，右侧的值为认证平台用户属性",
+    "OAuth2": "OAuth2",
+    "enableOAuth2Auth": "开启 OAuth2 认证",
+    "tokenHTTPMethod": "Token 获取方法",
     "SAML2Auth": "SAML2 认证",
     "authSAML2Xml": "IDP metadata XML",
     "authSAML2MetadataUrl": "IDP metadata URL",
@@ -961,7 +1054,9 @@
     "LDAPServerInfo": "LDAP 服务器",
     "LDAPUser": "LDAP 用户",
     "helpText": {
+      "TempPassword": "临时密码有效期为 300 秒，使用后立刻失效",
       "ApiKeyList": "使用api key签名请求头，每个请求的头部是不一样的, 请查阅使用文档",
+      "ConnectionTokenList": "连接令牌是将身份验证和连接资产结合起来使用的一种认证信息，支持用户一键登录到资产，目前支持的组件包括：KoKo、Lion、Magnus、Razor 等",
       "authLdapSearchFilter": "可能的选项是(cn或uid或sAMAccountName=%(user)s)",
       "authLdapSearchOu": "使用|分隔各OU",
       "authLdapUserAttrMap": "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name,email 是jumpserver的属性",
@@ -1038,6 +1133,8 @@
     "refreshLdapCache":"刷新Ldap缓存，请稍后",
     "LicenseExpired": "许可证已经过期",
     "LicenseWillBe": "许可证即将在 ",
+    "LicenseReachedAssetAmountLimit": "资产数量已经超过许可证数量限制",
+    "LicenseForTest": "测试用途许可证， 本许可证仅用于 开发、测试（PoC）和演示",
     "Expire": " 过期",
     "WeCom": "企业微信",
     "DingTalk": "钉钉",
@@ -1047,7 +1144,14 @@
     "SMS": "短信设置",
     "feiShuTest": "测试",
     "setting": "设置",
-    "SMSProvider": "短信服务商"
+    "SMSProvider": "短信服务商",
+    "SystemTools": "系统工具",
+    "basicTools": "基本工具",
+    "destinationIP": "目的地址",
+    "testPort": "端口",
+    "testTools": "测试",
+    "testHelpText": "请输入目的地址进行测试",
+    "SMSProvider": "短信服务商 / 协议"
   },
   "tickets": {
     "OneAssigneeType": "一级受理人类型",
@@ -1069,8 +1173,8 @@
     "Assignee": "处理人",
     "Assignees": "待处理人",
     "Close": "关闭",
-    "OpenStatus":"开启",
-    "CloseStatus":"关闭",
+    "OpenStatus":"审批中",
+    "CloseStatus":"已完成",
     "Comment": "备注",
     "MyTickets": "我发起的",
     "RequestPerm":"授权申请",
@@ -1079,6 +1183,10 @@
     "reply": "回复",
     "status": "状态",
     "title": "标题",
+    "RelevantApp": "应用",
+    "RelevantAsset": "资产",
+    "RelevantCommand": "命令",
+    "RelevantSystemUser": "系统用户",
     "action": "动作",
     "type": "类型",
     "user": "用户",
@@ -1089,6 +1197,7 @@
     "OpenTicket": "创建工单",
     "HandleTicket": "处理工单",
     "FinishedTicket": "完成工单",
+    "CheckViewAcceptor": "点击查看受理人",
     "IP": "IP",
     "Hostname": "主机名",
     "Asset": "资产",
@@ -1127,11 +1236,17 @@
     "UpdateNodeAssetHardwareInfo": "更新节点资产硬件信息"
   },
   "users": {
+    "InviteSuccess": "邀请成功",
     "FileEncryptionPassword": "文件加密密码",
+    "RoleUsers": "授权用户",
+    "RoleInfo": "角色信息",
+    "RolePerms": "角色权限",
     "MessageSubscription": "消息订阅",
     "AuthSettings": "认证配置",
     "UserName": "姓名",
     "Account": "账户",
+    "AccountInformation": "账号信息",
+    "PersonalSetting": "个人设置",
     "Authentication": "认证",
     "Comment": "备注",
     "ConfirmPassword": "确认密码",
@@ -1162,7 +1277,8 @@
       "MFAOfUserFirstLoginPersonalInformationImprovementPage": "启用多因子认证，使账号更加安全。<br/> 启用之后您将会在下次登录时进入多因子认证绑定流程；您也可以在（个人信息->快速修改->更改多因子设置）中直接绑定！",
       "MFAOfUserFirstLoginUserGuidePage": "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如：设置复杂密码，并启用多因子认证）",
       "SSHKeyOfProfileSSHUpdatePage": "复制你的公钥到这里",
-      "OrgRoleHelpText": "组织角色是用户在当前组织中的角色"
+      "OrgRoleHelpText": "组织角色是用户在当前组织中的角色",
+      "addRolePermissions": "创建/更新成功后，详情中添加权限"
     },
     "IAgree": "我同意",
     "ImprovePersonalInformation": "完善个人信息",
@@ -1182,8 +1298,8 @@
     "ResetAndDownloadSSHKey": "重置并下载密钥",
     "ResetPublicKeyAndDownload": "重置并下载SSH密钥",
     "Role": "角色",
-    "SuperRole": "系统角色",
-    "OrgRole": "组织角色",
+    "SystemRoles": "系统角色",
+    "OrgRoles": "组织角色",
     "SSHKey": "SSH公钥",
     "SSHKeySetting": "SSH公钥设置",
     "Secure": "安全",
@@ -1250,12 +1366,14 @@
     "Sender": "发送人",
     "MarkAsRead": "标记已读",
     "OneClickRead": "当前已读",
+    "AllClickRead": "全部已读",
     "OneClickReadMsg": "你确定要将当前信息标记为已读吗?",
     "NoUnreadMsg": "暂无未读消息",
     "SiteMessage": "站内信",
     "SMS": "短信"
   },
   "xpack": {
+    "Images": "图片",
     "NavHelp": "导航栏链接",
     "helpDocument": "文档链接",
     "helpSupport": "支持链接",
@@ -1265,6 +1383,7 @@
     "officialWebsiteTip": "可以更改网站导航栏 帮助 -> 官网 的网址",
     "Admin": "管理员",
     "Asset": "资产",
+    "ip": "IP",
     "Database": "数据库",
     "AssetCount": "资产数量",
     "Auditor": "审计员",
@@ -1342,17 +1461,24 @@
       "Reason": "原因"
     },
     "Cloud": {
+      "CloudSync": "云同步",
       "ServerAccountKey": "服务账号密钥",
       "IPNetworkSegment": "IP网段",
       "Aliyun": "阿里云",
       "Qcloud": "腾讯云",
+      "QcloudLighthouse": "腾讯云(轻量应用服务器)",
       "QingyunPrivatecloud": "青云私有云",
       "HuaweiPrivatecloud": "华为私有云",
+      "CTYunPrivate": "天翼私有云",
       "OpenStack": "OpenStack",
       "GCP": "谷歌云",
+      "FC": "Fusion Compute",
+      "LAN": "局域网",
       "AWS_China": "AWS(中国)",
       "AWS_Int": "AWS(国际)",
       "HuaweiCloud": "华为云",
+      "BaiduCloud": "百度云",
+      "JDCloud": "京东云",
       "Azure":"Azure(中国)",
       "Azure_Int": "Azure(国际)",
       "HostnameStrategy": "用于生成资产主机名。例如：1. 实例名称 (instanceDemo)；2. 实例名称和部分IP(后两位) (instanceDemo-250.1)",
@@ -1420,7 +1546,9 @@
     "ImportLicenseTip": "请导入许可证",
     "InterfaceSettings": "界面设置",
     "License": "许可证",
-    "SystemMonitor": "系统监控",
+    "ComponentMonitor": "组件监控",
+    "Endpoint": "服务端点",
+    "EndpointRule": "端点规则",
     "ServiceRatio": "组件负载统计",
     "LoadStatus":"组件状态",
     "NormalLoad":"正常",
@@ -1432,7 +1560,9 @@
     "NoLicense": "暂无许可证",
     "Node": "节点",
     "Organization": {
+      "AllOrganization": "组织列表",
       "OrganizationCreate": "创建组织",
+      "OrganizationLists": "组织列表",
       "OrganizationDetail": "组织详情",
       "OrganizationList": "组织管理",
       "OrganizationUpdate": "更新组织",
@@ -1440,14 +1570,14 @@
       "DeleteOrgTitle": "请确保组织内的以下信息已删除",
       "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则",
       "OrgRole": "组织角色",
-      "users_amount": "用户数量",
-      "groups_amount": "用户组数量",
-      "assets_amount": "资产数量",
-      "admin_users_amount": "特权用户数量",
-      "system_users_amount": "系统用户数量",
-      "applications_amount": "应用数量",
-      "asset_perms_amount": "资产授权数量",
-      "app_perms_amount": "应用授权数量",
+      "users_amount": "用户",
+      "groups_amount": "用户组",
+      "assets_amount": "资产",
+      "admin_users_amount": "特权用户",
+      "system_users_amount": "系统用户",
+      "applications_amount": "应用",
+      "asset_perms_amount": "资产授权",
+      "app_perms_amount": "应用授权",
       "CreateOrgMsg": "请去组织详情内添加用户",
       "AddOrgMembers": "添加组织成员"
     },
@@ -1475,6 +1605,9 @@
     "technologyConsult": "技术咨询",
     "RegularlyPerform": "定期执行",
     "CyclePerform": "周期执行",
+    "ModifyTheme": "修改主题",
+    "ClassicGreen": "经典绿",
+    "ChinaRed": "中国红",
     "HelpText": {
       "CrontabOfCreateUpdatePage": "例如：每周日 03:05 执行 <5 3 * * 0> <br/> 使用5位 Linux crontab 表达式 <分 时 日 月 星期> （<a href=\"https://tool.lu/crontab/\" target=\"_blank\">在线工具</a>） <br/> 如果同时设置了定期执行和周期执行，优先使用定期执行",
       "IntervalOfCreateUpdatePage": "单位：时",

src/icons/svg/email-fill.svg

@@ -0,0 +1 @@
+<svg t="1659513943772" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5163" width="200" height="200"><path d="M1024 146.285714v731.428572H0V146.285714h1024z m-149.942857 94.573715L512 602.88l-362.057143-362.057143L98.267429 292.571429 512 706.340571 925.769143 292.571429l-51.748572-51.712z" fill="#7c7e7f" p-id="5164"></path></svg>

src/icons/svg/email.svg

@@ -0,0 +1,2 @@
+<?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="1644305786242" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7592" width="160" height="160"><path d="M64 186.688 512 506.688 960 186.688 960 272 512 592 64 272Z" p-id="7593"></path><path d="M0 128l0 768 1024 0L1024 128 0 128zM960 832 64 832 64 192l896 0L960 832z" p-id="7594"></path></svg>

src/icons/svg/hamburger.svg

@@ -0,0 +1 @@
+<?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="1584946926481" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2735" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" p-id="2736"></path></svg>

src/icons/svg/logout.svg

@@ -0,0 +1,2 @@
+<?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="1644392731383" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" width="660" height="660"><path d="M868 732h-70.3c-4.8 0-9.3 2.1-12.3 5.8-7 8.5-14.5 16.7-22.4 24.5-32.6 32.5-70.5 58.1-112.7 75.9-43.6 18.4-90 27.8-137.9 27.8-47.9 0-94.3-9.4-137.9-27.8-42.2-17.8-80.1-43.4-112.7-75.9-32.6-32.5-58.1-70.4-76-112.5C167.3 606.2 158 559.9 158 512s9.4-94.2 27.8-137.8c17.8-42.1 43.4-80 76-112.5s70.5-58.1 112.7-75.9c43.6-18.4 90-27.8 137.9-27.8 47.9 0 94.3 9.3 137.9 27.8 42.2 17.8 80.1 43.4 112.7 75.9 7.9 7.9 15.3 16.1 22.4 24.5 3 3.7 7.6 5.8 12.3 5.8H868c6.3 0 10.2-7 6.7-12.3C798 160.5 663.8 81.6 511.3 82 271.7 82.6 79.6 277.1 82 516.4 84.4 751.9 276.2 942 512.4 942c152.1 0 285.7-78.8 362.3-197.7 3.4-5.3-0.4-12.3-6.7-12.3z" p-id="2176"></path><path d="M956.9 505.7L815 393.7c-5.3-4.2-13-0.4-13 6.3v76H488c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112c4.1-3.2 4.1-9.4 0-12.6z" p-id="2177"></path></svg>

src/icons/svg/setting-fill.svg

@@ -0,0 +1 @@
+<?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="1645523497356" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8682" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512.5 390.6c-29.9 0-57.9 11.6-79.1 32.8-21.1 21.2-32.8 49.2-32.8 79.1 0 29.9 11.7 57.9 32.8 79.1 21.2 21.1 49.2 32.8 79.1 32.8 29.9 0 57.9-11.7 79.1-32.8 21.1-21.2 32.8-49.2 32.8-79.1 0-29.9-11.7-57.9-32.8-79.1-21.2-21.2-49.2-32.8-79.1-32.8z" p-id="8683"></path><path d="M924.8 626.1l-65.4-55.9c3.1-19 4.7-38.4 4.7-57.7s-1.6-38.8-4.7-57.7l65.4-55.9c10.1-8.6 13.8-22.6 9.3-35.2l-0.9-2.6c-18.1-50.4-44.8-96.8-79.6-137.7l-1.8-2.1c-8.6-10.1-22.5-13.9-35.1-9.5l-81.2 28.9c-30-24.6-63.4-44-99.6-57.5l-15.7-84.9c-2.4-13.1-12.7-23.3-25.8-25.7l-2.7-0.5c-52-9.4-106.8-9.4-158.8 0l-2.7 0.5c-13.1 2.4-23.4 12.6-25.8 25.7l-15.8 85.3c-35.9 13.6-69.1 32.9-98.9 57.3l-81.8-29.1c-12.5-4.4-26.5-0.7-35.1 9.5l-1.8 2.1c-34.8 41.1-61.5 87.4-79.6 137.7l-0.9 2.6c-4.5 12.5-0.8 26.5 9.3 35.2l66.2 56.5c-3.1 18.8-4.6 38-4.6 57 0 19.2 1.5 38.4 4.6 57l-66 56.5c-10.1 8.6-13.8 22.6-9.3 35.2l0.9 2.6c18.1 50.3 44.8 96.8 79.6 137.7l1.8 2.1c8.6 10.1 22.5 13.9 35.1 9.5l81.8-29.1c29.8 24.5 63 43.9 98.9 57.3l15.8 85.3c2.4 13.1 12.7 23.3 25.8 25.7l2.7 0.5c26.1 4.7 52.7 7.1 79.4 7.1 26.7 0 53.4-2.4 79.4-7.1l2.7-0.5c13.1-2.4 23.4-12.6 25.8-25.7l15.7-84.9c36.2-13.6 69.6-32.9 99.6-57.5l81.2 28.9c12.5 4.4 26.5 0.7 35.1-9.5l1.8-2.1c34.8-41.1 61.5-87.4 79.6-137.7l0.9-2.6c4.3-12.4 0.6-26.3-9.5-35z m-412.3 52.2c-97.1 0-175.8-78.7-175.8-175.8s78.7-175.8 175.8-175.8 175.8 78.7 175.8 175.8-78.7 175.8-175.8 175.8z" p-id="8684"></path></svg>

src/icons/svg/setting.svg

@@ -0,0 +1 @@
+<?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="1645506884918" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2221" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M872.554667 306.304c-22.613333 8.128-45.696 9.941333-69.162667 4.373333a119.722667 119.722667 0 0 1-85.504-158.144c1.749333-4.842667 0.853333-6.954667-3.605333-8.96-17.92-8.106667-35.541333-16.917333-53.674667-24.533333-11.925333-4.992-24.533333-8.384-36.501333-12.373333-23.146667 47.658667-59.456 74.88-112.064 74.88-52.821333 0-89.258667-27.306667-111.978667-74.538667a411.733333 411.733333 0 0 0-95.530667 39.573333c17.216 49.493333 10.922667 94.634667-26.538666 131.925334-37.376 37.205333-82.496 43.712-131.776 26.282666A413.290667 413.290667 0 0 0 106.666667 400.298667c46.933333 22.656 74.197333 58.666667 74.517333 110.997333 0.32 53.162667-26.986667 89.770667-74.538667 112.768a410.154667 410.154667 0 0 0 39.637334 95.530667c47.808-16.789333 91.669333-11.370667 128.64 23.253333 39.957333 37.44 47.274667 83.626667 29.653333 134.933333a404.949333 404.949333 0 0 0 95.530667 39.466667c23.04-47.36 59.349333-74.474667 111.978666-74.453333 52.885333 0.064 89.216 27.541333 111.893334 74.538666a411.584 411.584 0 0 0 95.488-39.616c-17.386667-49.493333-10.816-94.4 26.24-131.626666 37.290667-37.418667 82.432-43.776 132.053333-26.538667a407.637333 407.637333 0 0 0 39.509333-95.509333c-47.786667-23.210667-74.986667-59.946667-74.517333-113.066667 0.448-52.053333 27.562667-87.957333 74.56-110.656a420.394667 420.394667 0 0 0-38.016-92.970667c-2.048-3.712-4.309333-1.92-6.762667-1.066666z m85.952 82.794667a42.666667 42.666667 0 0 1-22.613334 49.642666c-34.602667 16.725333-50.176 39.146667-50.453333 72.618667-0.298667 34.282667 15.253333 57.194667 50.496 74.304a42.666667 42.666667 0 0 1 22.549333 49.536 450.304 450.304 0 0 1-43.669333 105.472 42.666667 42.666667 0 0 1-51.050667 19.178667c-36.650667-12.736-63.850667-7.68-87.808 16.362666-23.914667 24.021333-28.949333 51.093333-16.213333 87.381334a42.666667 42.666667 0 0 1-19.072 51.178666 454.229333 454.229333 0 0 1-105.344 43.690667 42.666667 42.666667 0 0 1-49.770667-22.592c-16.725333-34.688-39.509333-50.368-73.493333-50.389333-33.92-0.021333-56.597333 15.509333-73.578667 50.432a42.666667 42.666667 0 0 1-49.322666 22.570666 447.338667 447.338667 0 0 1-105.6-43.562666 42.666667 42.666667 0 0 1-19.328-50.986667c13.034667-37.973333 7.381333-65.728-18.474667-89.941333-23.594667-22.101333-50.090667-26.517333-85.333333-14.144a42.666667 42.666667 0 0 1-51.157334-19.050667 452.821333 452.821333 0 0 1-43.733333-105.450667 42.666667 42.666667 0 0 1 22.549333-49.706666c35.072-16.938667 50.666667-39.808 50.453334-74.069334-0.213333-33.642667-15.786667-56.149333-50.389334-72.853333A42.666667 42.666667 0 0 1 65.493333 389.12a455.808 455.808 0 0 1 43.541334-105.344 42.666667 42.666667 0 0 1 51.392-19.242667c36.096 12.778667 63.317333 7.722667 87.466666-16.298666 24-23.893333 29.034667-51.072 16.32-87.68a42.666667 42.666667 0 0 1 19.178667-51.050667 454.4 454.4 0 0 1 105.386667-43.669333 42.666667 42.666667 0 0 1 49.706666 22.656c16.725333 34.730667 39.509333 50.389333 73.536 50.368 33.898667 0 56.576-15.616 73.664-50.837334a42.666667 42.666667 0 0 1 51.882667-21.845333c2.517333 0.832 4.992 1.621333 9.28 2.965333l7.530667 2.346667c8.96 2.88 15.786667 5.290667 22.698666 8.192 10.154667 4.245333 18.090667 7.872 35.029334 15.829333 10.069333 4.736 14.4 6.741333 19.733333 9.152 25.024 11.306667 35.349333 36.821333 26.154667 62.336-16 44.352 9.344 91.221333 55.253333 102.144 14.805333 3.52 29.418667 2.538667 44.864-3.029333a33.28 33.28 0 0 1 4.48-1.621333c5.269333-1.621333 10.88-2.453333 17.322667-1.941334 16.853333 1.344 29.525333 11.093333 36.736 24.170667a462.890667 462.890667 0 0 1 41.813333 102.357333zM522.666667 320a202.666667 202.666667 0 1 0 166.4 86.954667 21.333333 21.333333 0 0 0-35.008 24.384 160 160 0 1 1-69.184-56.128 21.333333 21.333333 0 0 0 16.597333-39.317334A202.090667 202.090667 0 0 0 522.666667 320z" fill="#3D3D3D" p-id="2222"></path></svg>

src/icons/svg/sitemsg.svg

@@ -0,0 +1 @@
+<?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="1645509489750" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1546" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1021.5936 836.5056 702.3616 480.9216 1021.0304 185.0368C1022.5152 189.3376 1023.8976 193.6896 1023.8976 198.3488L1023.8976 825.6C1023.8976 829.4912 1022.5664 832.9216 1021.5936 836.5056ZM39.168 155.1872C42.0864 154.6752 44.6464 153.5488 47.5648 153.5488L976.5376 153.5488C979.456 153.5488 982.0672 154.6752 984.9344 155.1872L512.0512 572.416 39.168 155.1872ZM2.4576 836.5568C1.536 832.9728 0.1024 829.5424 0.1024 825.6L0.1024 198.3488C0.1024 193.5872 1.5872 189.2864 3.0208 184.9856L321.8432 480.9216 2.4576 836.5568ZM496.8448 618.8032C501.248 622.336 506.6752 624.0256 512.0512 624.0256 517.4784 624.0256 522.8032 622.336 527.1552 618.8032L665.7536 509.7472 988.1088 868.1984C984.32 869.12 980.6336 870.4512 976.5376 870.4512L47.5648 870.4512C43.52 870.4512 39.8336 869.12 36.096 868.1984L358.4 509.7472 496.8448 618.8032Z" p-id="1547"></path></svg>

src/icons/svg/terminal-fill.svg

@@ -0,0 +1 @@
+<?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="1645509271413" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3715" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M0 128v768h1024V128H0z m242.816 577.536L192 654.72l154.304-154.368L192 346.048l50.816-50.816L448 500.352l-205.184 205.184z m584.32 13.248H512V640h315.072v78.72z" fill="#262626" p-id="3716"></path></svg>

src/icons/svg/terminal.svg

@@ -0,0 +1 @@
+<?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="1645509388374" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3850" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M0 64l0 896 1024 0 0-896-1024 0zM960 896l-896 0 0-768 896 0 0 768zM896 192l-768 0 0 640 768 0 0-640zM448 512l-64 0 0 64-64 0 0 64-64 0 0-64 64 0 0-64 64 0 0-64-64 0 0-64-64 0 0-64 64 0 0 64 64 0 0 64 64 0 0 64zM704 640l-192 0 0-64 192 0 0 64z" p-id="3851"></path></svg>

src/layout/components/AppMain.vue

@@ -32,7 +32,7 @@ export default {
   /*padding: 10px 20px 10px;*/
 }
 .fixed-header+.app-main {
-  padding-top: 50px;
+  padding-top: 55px;
 }
 .hasTagsView {
   .app-main {

src/layout/components/Footer/index.vue

@@ -1,11 +1,9 @@
 <template>
-  <div class="footer" :style="style">
-    <div class="pull-right">
-      Version <strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
-    </div>
-    <div style="padding-left:20px;">
-      {{ publicSettings.XPACK_LICENSE_INFO.corporation }}
+  <div class="footer" :class="device" :style="style">
+    <div class="pull-right version">
+      Version <strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv3. </span>
     </div>
+    <div>{{ corporation }}</div>
   </div>
 </template>
 <script>
@@ -27,7 +25,10 @@ export default {
       if (this.device === 'mobile') {
         return ''
       }
-      return this.sidebar.opened ? ('margin-left: 210px;') : ('margin-left: 54px')
+      return this.sidebar.opened ? ('margin-left: 220px;') : ('margin-left: 54px')
+    },
+    corporation() {
+      return this.publicSettings.XPACK_LICENSE_INFO.corporation
     }
   }
 }
@@ -38,9 +39,9 @@ export default {
     height: 35px !important;
 }
 .pull-right {
-    float: right!important;
+    float: right
 }
-.footer{
+.footer {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -55,4 +56,11 @@ export default {
         font-size: 13px;
     }
 }
+.mobile.footer {
+  text-align: center;
+}
+.mobile.footer .pull-right{
+  float: none;
+  display: block;
+}
 </style>

src/layout/components/GenericCreateUpdateForm/index.vue

@@ -16,6 +16,8 @@
 <script>
 import AutoDataForm from '@/components/AutoDataForm'
 import { getUpdateObjURL } from '@/utils/common'
+import { encryptPassword } from '@/utils/crypto'
+
 export default {
   name: 'GenericCreateUpdateForm',
   components: {
@@ -87,7 +89,7 @@ export default {
     createSuccessNextRoute: {
       type: Object,
       default: function() {
-        const routeName = this.$route.name.replace('Create', 'List')
+        const routeName = this.$route.name?.replace('Create', 'List')
         return { name: routeName }
       }
     },
@@ -95,15 +97,14 @@ export default {
     updateSuccessNextRoute: {
       type: Object,
       default: function() {
-        const routeName = this.$route.name.replace('Update', 'List')
+        const routeName = this.$route.name?.replace('Update', 'List')
         return { name: routeName }
       }
     },
     objectDetailRoute: {
       type: Object,
       default: function() {
-        const routeName = this.$route.name
-          .replace('Update', 'Detail')
+        const routeName = this.$route.name?.replace('Update', 'Detail')
           .replace('Create', 'Detail')
         return { name: routeName }
       }
@@ -136,6 +137,16 @@ export default {
         if (params.id) {
           url = getUpdateObjURL(url, params.id)
         }
+
+        const clone_from = this.$route.query['clone_from']
+        const query = clone_from ? `clone_from=${clone_from}` : ''
+        if (query) {
+          if (url.indexOf('?') === -1) {
+            url = `${url}?${query}`
+          } else {
+            url = `${url}&${query}`
+          }
+        }
         return url
       }
     },
@@ -153,12 +164,14 @@ export default {
           msgLinkName = res.hostname
         }
         const h = this.$createElement
+        const detailRoute = this.objectDetailRoute
+        detailRoute.params = { id: res.id }
         if (this.hasDetailInMsg) {
           this.$message({
             message: h('p', null, [
               h('el-link', {
                 on: {
-                  click: () => this.$router.push(this.objectDetailRoute)
+                  click: () => this.$router.push(detailRoute)
                 },
                 style: { 'vertical-align': 'top' }
               }, msgLinkName),
@@ -181,7 +194,7 @@ export default {
       default(res, method, vm, addContinue) {
         const route = this.getNextRoute(res, method)
         if (!(route.params && route.params.id)) {
-          route['params'] = { 'id': res.id }
+          route['params'] = Object.assign(route['params'] || {}, { 'id': res.id })
         }
         this.$emit('submitSuccess', res)
 
@@ -194,6 +207,7 @@ export default {
     onPerformError: {
       type: Function,
       default(error, method, vm) {
+        this.$log.error('error: ', error)
         this.$emit('submitError', error)
         const response = error.response
         const data = response.data
@@ -215,6 +229,14 @@ export default {
     hasDetailInMsg: {
       type: Boolean,
       default: true
+    },
+    encryptedFields: {
+      type: Array,
+      default: () => ['password', 'token', 'private_key']
+    },
+    needGetObjectDetail: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -262,10 +284,27 @@ export default {
     isUpdateMethod() {
       return ['put', 'patch'].indexOf(this.method.toLowerCase()) > -1
     },
+    encryptFields(values) {
+      // 批量提交，clean 后可能是个数组
+      if (values instanceof Array) {
+        return values.map((item) => this.encryptFields(item))
+      }
+      values = { ...values }
+      for (const field of this.encryptedFields) {
+        let value = values[field]
+        if (!value || typeof value !== 'string') {
+          continue
+        }
+        value = encryptPassword(value)
+        values[field] = value
+      }
+      return values
+    },
     handleSubmit(values, formName, addContinue) {
       let handler = this.onSubmit || this.defaultOnSubmit
       handler = handler.bind(this)
       values = this.cleanFormValue(values)
+      values = this.encryptFields(values)
       return handler(values, formName, addContinue)
     },
     defaultOnSubmit(validValues, formName, addContinue) {
@@ -277,7 +316,7 @@ export default {
     },
     async getFormValue() {
       const cloneFrom = this.$route.query['clone_from']
-      if (!this.isUpdateMethod() && !cloneFrom) {
+      if ((!this.isUpdateMethod() && !cloneFrom) || !this.needGetObjectDetail) {
         return Object.assign(this.form, this.initial)
       }
       let object = this.object

src/layout/components/GenericDetailPage/index.vue

@@ -28,10 +28,20 @@ export default {
     ActionsGroup
   },
   props: {
+    url: {
+      type: String,
+      required: false,
+      default: ''
+    },
     object: {
       type: Object,
       required: true
     },
+    titlePrefix: {
+      type: String,
+      required: false,
+      default: ''
+    },
     title: {
       type: String,
       default: ''
@@ -61,12 +71,11 @@ export default {
     getTitle: {
       type: Function,
       default: function(obj) {
-        const objectType = this.$route.meta.title
-          .replace('Detail', '')
-          .replace('详情', '')
+        const objectType = this.$route.meta.title.replace('Detail', '').replace('详情', '')
         this.$log.debug('Object is: ', obj)
+        const titlePrefix = this.titlePrefix || objectType
         const objectName = this.getObjectName(obj)
-        let title = `${objectType}: ${objectName}`
+        let title = `${titlePrefix}: ${objectName}`
         if (title.length > 80) {
           title = title.slice(0, 80) + '...'
         }
@@ -82,20 +91,29 @@ export default {
   },
   data() {
     const vm = this
+    const detailApiUrl = (function() {
+      if (vm.url) {
+        return `${vm.url}/${vm.$route.params.id}/`
+      } else {
+        return getApiPath(vm)
+      }
+    }())
     const defaultActions = {
-      canDelete: true,
-      deleteCallback: function(item) { this.defaultDelete(item) },
-      deleteApiUrl: getApiPath(this),
+      // Delete button
+      canDelete: vm.$hasCurrentResAction('delete'),
+      deleteCallback: function(item) { vm.defaultDelete(item) },
+      deleteApiUrl: detailApiUrl,
       deleteSuccessRoute: this.$route.name.replace('Detail', 'List'),
+      // Update button
       canUpdate: () => {
-        return !vm.currentOrgIsRoot
+        return !vm.currentOrgIsRoot && vm.$hasCurrentResAction('change')
       },
       updateCallback: function(item) { this.defaultUpdate(item) },
-      updateRoute: this.$route.name.replace('Detail', 'Update'),
-      detailApiUrl: getApiPath(this)
+      updateRoute: this.$route.name.replace('Detail', 'Update')
     }
     return {
-      defaultActions: defaultActions,
+      detailApiUrl,
+      defaultActions,
       loading: true,
       validActions: Object.assign(defaultActions, this.actions)
     }
@@ -146,7 +164,7 @@ export default {
     defaultDelete() {
       const msg = this.$t('common.deleteWarningMsg') + ' ' + this.iTitle + ' ?'
       const title = this.$t('common.Info')
-      const performDelete = async function() {
+      const performDelete = () => {
         const url = this.validActions.deleteApiUrl
         this.$log.debug('Start perform delete: ', url)
         return this.$axios.delete(url)
@@ -179,11 +197,16 @@ export default {
       if (typeof route === 'string') {
         route = { name: route, params: {}}
       }
+      route = {
+        ...route,
+        query: this.$route.query || {}
+      }
       route.params.id = id
       this.$router.push(route)
     },
     getObject() {
-      const url = this.validActions.detailApiUrl
+      // 兼容之前的 detailApiUrl
+      const url = this.validActions.detailApiUrl || this.detailApiUrl
       return this.$axios.get(url, { disableFlashErrorMsg: true }).then(data => {
         this.$emit('update:object', data)
         this.$emit('getObjectDone', data)

src/layout/components/GenericListTable/index.vue

@@ -4,23 +4,17 @@
 
 <script>
 import ListTable from '@/components/ListTable/index'
-import { mapGetters } from 'vuex'
+
 export default {
   name: 'GenericListTable',
   components: {
     ListTable
   },
   computed: {
-    ...mapGetters(['currentOrgIsRoot'])
   },
   created() {
-    const headerActions = this.$attrs['header-actions'] || {}
-    if (headerActions.canCreate === undefined && this.currentOrgIsRoot) {
-      _.set(this.$attrs, 'header-actions.canCreate', false)
-    }
-    if (headerActions.hasImport === undefined && this.currentOrgIsRoot) {
-      _.set(this.$attrs, 'header-actions.hasImport', false)
-    }
+  },
+  methods: {
   }
 }
 </script>