fix: 批量更新不请求接口

Revert "fix: form表单组件增加是否回显配置；批量更新弹窗组件默认设置为不回显"
This reverts commit 40655ca239.
2026-01-14 11:55:34 +00:00 · 2022-09-06 19:06:42 +08:00 · 2022-09-06 18:30:31 +08:00 · 2022-09-06 18:12:20 +08:00 · 2022-09-05 13:55:17 +08:00 · 2022-08-19 13:39:17 +08:00
84 changed files with 3709 additions and 6246 deletions
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -39,7 +39,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Build it and upload
-        uses: jumpserver/action-build-upload-assets@node14.16
+        uses: jumpserver/action-build-upload-assets@node10
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/25
+++ b/25
@@ -1,26 +1,23 @@
-FROM node:14.16 as stage-build
-ARG TARGETARCH
+FROM node:10 as stage-build
 ARG NPM_REGISTRY="https://registry.npmmirror.com"
 ENV NPM_REGISTY=$NPM_REGISTRY
+ARG SASS_BINARY_SITE="https://npmmirror.com/mirrors/node-sass"
+ENV SASS_BINARY_SITE=$SASS_BINARY_SITE

 WORKDIR /data

-RUN set -ex \
-    && npm config set registry ${NPM_REGISTRY} \
-    && yarn config set registry ${NPM_REGISTRY} \
-    && yarn config set cache-folder /root/.cache/yarn/lina
-
-ADD package.json yarn.lock /data
-RUN --mount=type=cache,target=/root/.cache/yarn \
-    yarn install
+RUN npm config set sass_binary_site=${SASS_BINARY_SITE}
+RUN npm config set registry ${NPM_REGISTRY}
+RUN yarn config set registry ${NPM_REGISTRY}
+COPY package.json yarn.lock /data/
+RUN yarn install
+RUN npm rebuild node-sass

 ARG VERSION
 ENV VERSION=$VERSION
 ADD . /data
-RUN --mount=type=cache,target=/root/.cache/yarn \
-    sed -i "s@Version <strong>.*</strong>@Version <strong>${VERSION}</strong>@g" src/layout/components/Footer/index.vue \
-    && yarn build
+RUN cd utils && bash -xieu build.sh build

 FROM nginx:alpine
-COPY --from=stage-build /data/lina /opt/lina
+COPY --from=stage-build /data/release/lina /opt/lina
 COPY nginx.conf /etc/nginx/conf.d/default.conf
--- a/1
+++ b/1
@@ -1 +0,0 @@
-754e8612947ecf4e8d71f108b1877f2bda410040
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
  "scripts": {
    "dev": "vue-cli-service serve",
    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
    "build:prod": "vue-cli-service build",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
@@ -33,7 +32,7 @@
    "element-ui": "2.13.2",
    "eslint-plugin-html": "^6.0.0",
    "install": "^0.13.0",
-    "jquery": "^3.6.1",
+    "jquery": "^3.5.0",
    "js-cookie": "2.2.0",
    "jsencrypt": "^3.2.1",
    "krry-transfer": "^1.7.3",
--- a/public/theme/element-extra.css
+++ b/public/theme/element-extra.css
@@ -247,15 +247,6 @@ 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: danger;
 }
--- a/src/components/DataForm/rules/index.js
+++ b/src/components/DataForm/rules/index.js
@@ -45,20 +45,3 @@ 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')))
-    }
-  }
-}
--- a/src/components/TableFormatters/TwoTabFormatter.vue
+++ b/src/components/TableFormatters/TwoTabFormatter.vue
@@ -1,61 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <div v-if="isAllEmpty()" style="text-align: center">
-      {{ this.$t('common.NoContent') }}
-    </div>
-    <div v-else>
-      <el-col :span="rightEmpty() ? 24 : 12">
-        <div v-if="!leftEmpty()">
-          <el-tag type="primary" effect="dark" :closable="false" style="width: 100%;">{{ row.leftTitle }}</el-tag>
-          <div v-for="(value, key, index) in row.left" :key="index">
-            <el-tag type="primary"><strong>{{ key }}: </strong>{{ value }}</el-tag>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="leftEmpty() ? 24 : 12">
-        <div v-if="!rightEmpty()">
-          <el-tag type="primary" effect="dark" :closable="false" style="width: 100%;">{{ row.rightTitle }}</el-tag>
-          <div v-for="(value, key, index) in row.right" :key="index">
-            <el-tag type="primary"><strong>{{ key }}: </strong>{{ value }}</el-tag>
-          </div>
-        </div>
-      </el-col>
-    </div>
-  </el-row>
-</template>
-
-<script>
-
-export default {
-  name: 'TwoTabFormatter',
-  props: {
-    row: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  methods: {
-    isEmpty(content) {
-      return !content || JSON.stringify(content) === '{}'
-    },
-    leftEmpty() {
-      return this.isEmpty(this.row.left)
-    },
-    rightEmpty() {
-      return this.isEmpty(this.row.right)
-    },
-    isAllEmpty() {
-      return this.leftEmpty() && this.rightEmpty()
-    }
-  }
-}
-
-</script>
-
-<style scoped>
-  .el-tag{
-    width: 100%;
-    white-space: normal;
-    height:auto;
-}
-</style>
--- a/src/components/TableFormatters/index.js
+++ b/src/components/TableFormatters/index.js
@@ -12,7 +12,6 @@ import DialogDetailFormatter from './DialogDetailFormatter'
 import EditableInputFormatter from './EditableInputFormatter'
 import StatusFormatter from './StatusFormatter'
 import TagsFormatter from './TagsFormatter'
-import TwoTabFormatter from './TwoTabFormatter'

 export default {
  DetailFormatter,
@@ -28,8 +27,7 @@ export default {
  ArrayFormatter,
  EditableInputFormatter,
  StatusFormatter,
-  TagsFormatter,
-  TwoTabFormatter
+  TagsFormatter
 }

 export {
@@ -46,6 +44,5 @@ export {
  ArrayFormatter,
  EditableInputFormatter,
  StatusFormatter,
-  TagsFormatter,
-  TwoTabFormatter
+  TagsFormatter
 }
--- a/src/components/UserConfirmDialog/index.vue
+++ b/src/components/UserConfirmDialog/index.vue
@@ -55,19 +55,19 @@
        </el-col>
      </el-row>
      <el-row :gutter="24" style="margin: 0 auto;">
-        <el-col :md="24" :sm="24" style="display: flex; margin-bottom: 20px;">
-          <el-input v-model="SecretKey" :show-password="showPassword" :placeholder="HelpText" />
-          <span v-if="Select === 'sms'" style="margin: -1px 0 0 20px;">
-            <el-button
-              size="mini"
-              type="primary"
-              style="line-height:20px; float: right;"
-              :disabled="smsBtndisabled"
-              @click="sendChallengeCode"
-            >
-              {{ smsBtnText }}
-            </el-button>
-          </span>
+        <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;">
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -47,7 +47,6 @@
      "sqlserver": "SQLServer",
      "redis": "Redis",
      "mongodb": "MongoDB",
-      "clickhouse": "ClickHouse",
      "k8s": "kubernetes"
    },
    "applicationsCategory": {
@@ -245,9 +244,7 @@
    "View": "View",
    "LoginIP": "Login IP",
    "LoginCity": "Login city",
-    "LoginDate": "Login date",
-    "BeforeChange": "Before change",
-    "AfterChange": "After change"
+    "LoginDate": "Login date"
  },
  "auth": {
    "LoginRequiredMsg": "You account has logout, Please login again",
@@ -257,7 +254,6 @@
    "ReLoginErr": "Login time has exceeded 5 minutes, please login again"
  },
  "common": {
-    "NoContent": "No content",
    "NeedAddAppsOrSystemUserErrMsg": "Please add apps or system user",
    "VerificationCodeSent": "The verification code has been sent",
    "SendVerificationCode": "Send verification code",
@@ -271,12 +267,6 @@
    "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",
@@ -418,7 +408,6 @@
    "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",
@@ -783,7 +772,7 @@
    "OperateLog": "Operation  Logs",
    "PasswordChangeLog": "Password Update Logs",
    "Perms": "Permissions",
-    "PersonalInformationImprovement": "Personal information improvement",
+    "PersonalInformationImprovement": "PersonalInformationImprovement",
    "PlatformCreate": "Platform create",
    "PlatformDetail": "Platform detail",
    "PlatformList": "Platforms",
@@ -937,9 +926,6 @@
    "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",
@@ -1154,10 +1140,6 @@
    "reply": "Reply",
    "status": "Status",
    "title": "Title",
-    "RelevantApp": "App",
-    "RelevantAsset": "Asset",
-    "RelevantCommand": "Command",
-    "RelevantSystemUser": "System user",
    "type": "Type",
    "user": "User",
    "Status": "Status",
@@ -1426,11 +1408,9 @@
      "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",
@@ -1439,7 +1419,6 @@
      "HuaweiCloud": "Huawei Cloud",
      "BaiduCloud": "Baidu Cloud",
      "JDCloud": "JD Cloud",
-      "KingSoftCloud": "KingSoft 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)",
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -52,7 +52,6 @@
      "sqlserver": "SQLServer",
      "redis": "Redis",
      "mongodb": "MongoDB",
-      "clickhouse": "ClickHouse",
      "k8s": "Kubernetes"
    },
    "applicationsCategory": {
@@ -250,9 +249,7 @@
    "SystemUserName": "システムユーザー名",
    "LoginIP": "ログインIP",
    "LoginCity": "ログイン都市",
-    "LoginDate": "ログイン日",
-    "BeforeChange": "変更前",
-    "AfterChange": "変更後"
+    "LoginDate": "ログイン日"
  },
  "auth": {
    "LoginRequiredMsg": "アカウントが終了しました。ログインし直してください",
@@ -262,7 +259,6 @@
    "ReLoginErr": "ログイン時間が 5 分を超えました。もう一度ログインしてください"
  },
  "common": {
-    "NoContent": "まだ内容がない",
    "NeedAddAppsOrSystemUserErrMsg": "アプリケーションまたはシステムユーザーを追加してください",
    "VerificationCodeSent": "検証コードが送信されました",
    "SendVerificationCode": "認証コードの送信",
@@ -276,12 +272,6 @@
    "IPLoginLimit": "IPログイン制限",
    "Setting": "設定",
    "Certificate": "証明書",
-    "CACertificate": "CA 証明書",
-    "ClientCertificate": "クライアント証明書",
-    "CertificateKey": "証明書秘密鍵ファイル",
-    "AllowInvalidCert": "証明書チェックを無視する",
-    "UseSSL": "使う SSL/TLS",
-    "SecretKey": "鍵",
    "Scope": "カテゴリ",
    "Builtin": "内蔵",
    "DateCreated": "作成日",
@@ -427,7 +417,6 @@
    "disableSelected": "選択した無効",
    "disableSuccessMsg": "成功を無効にする",
    "fieldRequiredError": "このフィールドは必須項目です",
-    "requiredHasUserNameMapped": "usernameフィールドのマッピングを含める必要があります, {'uid':'username'}など",
    "getErrorMsg": "の取得に失敗しました",
    "MFAErrorMsg": "MFAエラーです。チェックしてください",
    "Total": "合計",
@@ -956,9 +945,6 @@
    "Feature": "機能",
    "AlibabaCloud": "Alibaba cloud",
    "TencentCloud": "テンセント雲",
-    "HuaweiCloud": "ファーウェイ雲",
-    "SignChannelNum": "サインパス番号",
-    "AppEndpoint": "アクセスアドレスを適用する",
    "CMPP2": "CMPP v2.0",
    "Radius": "Radius",
    "VerifySignTmpl": "認証コードメールテンプレート",
@@ -1186,10 +1172,6 @@
    "reply": "返信",
    "status": "ステータス",
    "title": "タイトル",
-    "RelevantApp": "するアプリケーション",
-    "RelevantAsset": "する資産",
-    "RelevantCommand": "するコマンド",
-    "RelevantSystemUser": "するシステムユーザー",
    "action": "アクション",
    "type": "タイプ",
    "user": "ユーザー",
@@ -1259,7 +1241,7 @@
    "DatePasswordLastUpdated": "パスワード最終更新日",
    "DatePasswordUpdated": "パスワード更新日",
    "DescribeOfGuide": "詳細については、をクリックしてください。",
-    "Email": "ポスト",
+    "Email": "メール",
    "Phone": "携帯番号",
    "WeCom": "企業wechat",
    "DingTalk": "ホッチキス",
@@ -1469,11 +1451,9 @@
      "IPNetworkSegment": "IPネットワークセグメント",
      "Aliyun": "Alibaba cloud",
      "Qcloud": "テンセント雲",
-      "QcloudLighthouse": "テンセント雲(軽量アプリケーションサーバー)",
      "QingyunPrivatecloud": "青雲プライベートクラウド",
      "HuaweiPrivatecloud": "ファーウェイプライベートクラウド",
      "OpenStack": "OpenStack",
-      "CTYunPrivate": "天翼プライベート・クラウド",
      "GCP": "Googleクラウド",
      "FC": "Fusion Compute",
      "LAN": "ローカルエリアネットワーク",
@@ -1482,7 +1462,6 @@
      "HuaweiCloud": "ファーウェイ雲",
      "BaiduCloud": "百度雲",
      "JDCloud": "京東雲",
-      "KingSoftCloud": "金山雲",
      "Azure": "Azure(中国)",
      "Azure_Int": "Azure (国際)",
      "HostnameStrategy": "資産を生成するためにホスト名。例: 1. インスタンス名 (instanceDemo) 2.インスタンス名と一部IP (下位2桁) (instanceDemo-250.1)",
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -52,7 +52,6 @@
      "sqlserver": "SQLServer",
      "redis": "Redis",
      "mongodb": "MongoDB",
-      "clickhouse": "ClickHouse",
      "k8s": "Kubernetes"
    },
    "applicationsCategory": {
@@ -250,9 +249,7 @@
    "SystemUserName": "系统用户名",
    "LoginIP": "登录IP",
    "LoginCity": "登录城市",
-    "LoginDate": "登录日期",
-    "BeforeChange": "变更前",
-    "AfterChange": "变更后"
+    "LoginDate": "登录日期"
  },
  "auth": {
    "LoginRequiredMsg": "账号已退出，请重新登录",
@@ -262,7 +259,6 @@
    "ReLoginErr": "登录时长已超过 5 分钟，请重新登录"
  },
  "common": {
-    "NoContent": "暂无内容",
    "NeedAddAppsOrSystemUserErrMsg": "需要添加应用或系统用户",
    "VerificationCodeSent": "验证码已发送",
    "SendVerificationCode": "发送验证码",
@@ -276,12 +272,6 @@
    "IPLoginLimit": "IP 登录限制",
    "Setting": "设置",
    "Certificate": "证书",
-    "CACertificate": "CA 证书",
-    "ClientCertificate": "客户端证书",
-    "CertificateKey": "证书秘钥文件",
-    "AllowInvalidCert": "忽略证书检查",
-    "UseSSL": "使用 SSL/TLS",
-    "SecretKey": "密钥",
    "Scope": "类别",
    "Builtin": "内置",
    "DateCreated": "创建日期",
@@ -427,7 +417,6 @@
    "disableSelected": "禁用所选",
    "disableSuccessMsg": "禁用成功",
    "fieldRequiredError": "这个字段是必填项",
-    "requiredHasUserNameMapped": "必须包含 username 字段的映射，如 { 'uid': 'username' }",
    "getErrorMsg": "获取失败",
    "MFAErrorMsg": "MFA错误，请检查",
    "Total": "总共",
@@ -957,9 +946,6 @@
    "Feature": "功能",
    "AlibabaCloud": "阿里云",
    "TencentCloud": "腾讯云",
-    "HuaweiCloud": "华为云",
-    "SignChannelNum": "签名通道号",
-    "AppEndpoint": "应用接入地址",
    "CMPP2": "CMPP v2.0",
    "Radius": "Radius",
    "VerifySignTmpl": "验证码短信模板",
@@ -1187,10 +1173,6 @@
    "reply": "回复",
    "status": "状态",
    "title": "标题",
-    "RelevantApp": "应用",
-    "RelevantAsset": "资产",
-    "RelevantCommand": "命令",
-    "RelevantSystemUser": "系统用户",
    "action": "动作",
    "type": "类型",
    "user": "用户",
@@ -1260,7 +1242,7 @@
    "DatePasswordLastUpdated": "最后更新密码日期",
    "DatePasswordUpdated": "密码更新日期",
    "DescribeOfGuide": "欢迎使用JumpServer堡垒机系统，获取更多信息请点击",
-    "Email": "邮箱",
+    "Email": "邮件",
    "Phone": "手机号",
    "WeCom": "企业微信",
    "DingTalk": "钉钉",
@@ -1470,10 +1452,8 @@
      "IPNetworkSegment": "IP网段",
      "Aliyun": "阿里云",
      "Qcloud": "腾讯云",
-      "QcloudLighthouse": "腾讯云(轻量应用服务器)",
      "QingyunPrivatecloud": "青云私有云",
      "HuaweiPrivatecloud": "华为私有云",
-      "CTYunPrivate": "天翼私有云",
      "OpenStack": "OpenStack",
      "GCP": "谷歌云",
      "FC": "Fusion Compute",
@@ -1483,7 +1463,6 @@
      "HuaweiCloud": "华为云",
      "BaiduCloud": "百度云",
      "JDCloud": "京东云",
-      "KingSoftCloud": "金山云",
      "Azure":"Azure(中国)",
      "Azure_Int": "Azure(国际)",
      "HostnameStrategy": "用于生成资产主机名。例如：1. 实例名称 (instanceDemo)；2. 实例名称和部分IP(后两位) (instanceDemo-250.1)",
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -326,9 +326,9 @@ export default {
          const url = `${curUrl}${cloneFrom}/${query ? ('?' + query) : ''}`
          object = await this.getObjectDetail(url)
          if (object['name']) {
-            object.name = this.$t('common.cloneFrom') + object.name
+            object.name = this.$t('common.cloneFrom') + ' ' + object.name
          } else if (object['hostname']) {
-            object.hostname = this.$t('common.cloneFrom') + object.hostname
+            object.hostname = this.$t('common.cloneFrom') + ' ' + object.hostname
          }
        } else {
          object = await this.getObjectDetail(this.iUrl)
--- a/src/layout/components/NavHeader/Organization.vue
+++ b/src/layout/components/NavHeader/Organization.vue
@@ -177,7 +177,7 @@ export default {
  }

  &>>> .el-input__icon {
-    color: #606266!important;
+    color: #606266;
  }
 }

--- a/src/layout/components/Page/PageContent.vue
+++ b/src/layout/components/Page/PageContent.vue
@@ -12,7 +12,7 @@ export default {

 <style scoped>
  .wrapper-content {
-    padding: 20px 25px 10px;
+    padding: 20px 25px 40px;
  }

  .wrapper-content >>> .el-alert {
--- a/src/layout/components/Page/index.vue
+++ b/src/layout/components/Page/index.vue
@@ -43,10 +43,6 @@ export default {
 </script>

 <style scoped>
-.page {
-  height: calc(100vh - 55px - 41px);
-  overflow: auto;
-}
@media print {
  .disabled-when-print{
    display: none;
--- a/src/main.js
+++ b/src/main.js
@@ -46,6 +46,7 @@ Vue.use(require('vue-moment'), {
  moment
 })

+// logger
 import VueLogger from 'vuejs-logger'
 import loggerOptions from './utils/logger'
 Vue.use(VueLogger, loggerOptions)
@@ -54,14 +55,14 @@ import ECharts from 'vue-echarts'
 Vue.component('echarts', ECharts)

 import service from '@/utils/request'
-Vue.prototype.$axios = service

+// lodash
+// import _ from 'lodash'
 window._ = require('lodash')
 // Vue.set(Vue.prototype, '_', _)

-import { Message } from '@/utils/Message'
-Vue.prototype.$message = Message
-
+// if the table component cannot access `this.$axios`, it cannot send request
+Vue.prototype.$axios = service
 // 注册全局事件总线
 Vue.prototype.$eventBus = new Vue()
 new Vue({
--- a/src/router/common.js
+++ b/src/router/common.js
@@ -15,16 +15,6 @@ export default [
      permissions: []
    }
  },
-  {
-    path: '/ops/ansible/task/:id/log/',
-    component: () => import('@/views/ops/CeleryTaskLog'),
-    name: 'AnsibleTaskLog',
-    hidden: true,
-    meta: {
-      title: i18n.t('route.CeleryTaskLog'),
-      permissions: []
-    }
-  },
  {
    path: '/ops/task/task/:id/log/',
    component: () => import('@/views/ops/CeleryTaskLog'),
--- a/src/router/console/xpack.js
+++ b/src/router/console/xpack.js
@@ -1,8 +1,6 @@
 import empty from '@/layout/empty'
 import i18n from '@/i18n/i18n'

-const activateMenu = '/console/assets/assets'
-
 export default [
  {
    path: 'cloud',
@@ -22,7 +20,7 @@ export default [
        hidden: true,
        meta: {
          title: i18n.t('xpack.Cloud.CloudSync'),
-          activeMenu: activateMenu
+          activeMenu: '/console/assets/assets'
        }
      },
      {
@@ -73,7 +71,6 @@ export default [
            hidden: true,
            meta: {
              title: i18n.t('xpack.Cloud.AccountDetail'),
-              activeMenu: activateMenu,
              permissions: ['xpack.view_account']
            }
          }
@@ -124,8 +121,7 @@ export default [
            name: 'SyncInstanceTaskDetail',
            hidden: true,
            meta: {
-              title: i18n.t('xpack.Cloud.SyncInstanceTaskDetail'),
-              activeMenu: activateMenu
+              title: i18n.t('xpack.Cloud.SyncInstanceTaskDetail')
            }
          }
        ]
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -72,9 +72,6 @@ const mutations = {
  },
  ADD_WORKBENCH_ORGS(state, org) {
    state.workbenchOrgs.push(org)
-  },
-  SET_IS_FIRST_LOGIN(state, flag) {
-    state.profile.is_first_login = flag
  }
 }

@@ -143,9 +140,6 @@ const actions = {
    const usingOrgs = mapper[viewName] || state.consoleOrgs
    Vue.$log.debug('Set using orgs: ', viewName, usingOrgs)
    commit('SET_USING_ORGS', usingOrgs)
-  },
-  ifFirstLogin({ commit }, flag) {
-    commit('SET_IS_FIRST_LOGIN', flag)
  }
 }

--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -182,9 +182,6 @@ input[type=file] {

 .el-col.el-col-sm-24 .ibox {
  margin-bottom: 10px;
-  &:last-child {
-    margin-bottom: 0;
-  }
 }

 .el-pagination {
--- a/src/utils/Message.js
+++ b/src/utils/Message.js
@@ -1,20 +0,0 @@
-// 重置message，防止重复点击重复弹出message弹框
-import { Message as elMessage } from 'element-ui'
-
-let messageDom = null
-const Message = (options) => {
-  // 判断弹窗是否已存在, 若存在则关闭
-  if (messageDom) messageDom.close()
-  messageDom = elMessage(options)
-}
-
-const typeArray = ['success', 'error', 'warning', 'info']
-typeArray.forEach(type => {
-  Message[type] = options => {
-    if (typeof options === 'string') options = { message: options }
-    options.type = type
-    return Message(options)
-  }
-})
-
-export { Message }
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -302,8 +302,3 @@ export function groupedDropdownToCascader(group) {

 export { BASE_URL }

-export function openWindow(url, name = '', iWidth = 900, iHeight = 600) {
-  var iTop = (window.screen.height - 30 - iHeight) / 2
-  var iLeft = (window.screen.width - 10 - iWidth) / 2
-  window.open(url, name, 'height=' + iHeight + ',width=' + iWidth + ',top=' + iTop + ',left=' + iLeft)
-}
--- a/src/utils/crypto.js
+++ b/src/utils/crypto.js
@@ -37,13 +37,10 @@ export function encryptPassword(password) {
  if (!password) {
    return ''
  }
-  let rsaPublicKeyText = getCookie('jms_public_key')
-  if (!rsaPublicKeyText) {
-    return password
-  }
  const aesKey = (Math.random() + 1).toString(36).substring(2)
  // public key 是 base64 存储的
-  rsaPublicKeyText = rsaPublicKeyText.replaceAll('"', '')
+  const rsaPublicKeyText = getCookie('jms_public_key')
+    .replaceAll('"', '')
  const rsaPublicKey = atob(rsaPublicKeyText)
  const keyCipher = rsaEncrypt(aesKey, rsaPublicKey)
  const passwordCipher = aesEncrypt(password, aesKey)
--- a/src/utils/jms.js
+++ b/src/utils/jms.js
@@ -1,10 +1,8 @@
 import store from '@/store'
 import { constantRoutes } from '@/router'
-import { openWindow } from './common'

-export function openTaskPage(taskId, taskType) {
-  taskType = taskType || 'celery'
-  openWindow(`/#/ops/${taskType}/task/${taskId}/log/?type=${taskType}`)
+export function openTaskPage(taskId) {
+  window.open(`/#/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
 }

 export function checkPermission(permsRequired, permsAll) {
--- a/src/utils/jquery-vendor.js
+++ b/src/utils/jquery-vendor.js
@@ -1,4 +1,4 @@
-import $ from 'jquery/dist/jquery.min.js'
+import $ from 'jquery'
 window.$ = $
 window.jQuery = $
 export default $
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,7 @@ import i18n from '@/i18n/i18n'
 import { getTokenFromCookie } from '@/utils/auth'
 import { getErrorResponseMsg } from '@/utils/common'
 import { refreshSessionIdAge } from '@/api/users'
-import { MessageBox } from 'element-ui'
-import { Message } from '@/utils/Message'
+import { Message, MessageBox } from 'element-ui'
 import store from '@/store'
 import axiosRetry from 'axios-retry'
 import router from '@/router'
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -3,7 +3,7 @@ import store from '@/store'
 import router, { resetRouter } from '@/router'
 import Vue from 'vue'
 import VueCookie from 'vue-cookie'
-import { Message } from '@/utils/Message'
+import { Message } from 'element-ui'
 import orgUtil from '@/utils/org'
 import orgs from '@/api/orgs'
 import { getPropView, isViewHasOrgs } from '@/utils/jms'
--- a/src/utils/theme/index.js
+++ b/src/utils/theme/index.js
@@ -39,9 +39,6 @@ export function changeElementColor(themeColors) {
        .el-link.el-link--${key}:after {
          border-color: ${value}!important;
        }
-        .el-tag--dark.el-tag--${key} {
-          background-color: ${value} !important;
-        }
      `
    }
  }
--- a/src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue
@@ -78,6 +78,7 @@ export default {
        hasRefresh: true,
        hasExport: false,
        hasImport: false,
+        hasMoreActions: false,
        createRoute: () => {
          return {
            name: 'AccountBackupPlanCreate'
--- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue
@@ -123,6 +123,7 @@ export default {
        hasRefresh: true,
        hasExport: false,
        hasImport: false,
+        hasMoreActions: false,
        searchConfig: {
          getUrlQuery: false
        },
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
@@ -74,9 +74,6 @@ export default {
        hasExport: false,
        hasImport: false,
        hasCreate: false,
-        searchConfig: {
-          getUrlQuery: false
-        },
        hasMoreActions: false
      },
      assetRelationConfig: {
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanList.vue
@@ -107,6 +107,7 @@ export default {
        hasRefresh: true,
        hasExport: false,
        hasImport: false,
+        hasMoreActions: false,
        createRoute: () => {
          return {
            name: 'AssetChangeAuthPlanCreate'
--- a/src/views/acl/AssetAcl/AssetAclList.vue
+++ b/src/views/acl/AssetAcl/AssetAclList.vue
@@ -84,7 +84,8 @@ export default {
        createRoute: 'AssetAclCreate',
        hasRefresh: true,
        hasExport: false,
-        hasImport: false
+        hasImport: false,
+        hasMoreActions: false
      }
    }
  }
--- a/src/views/applications/DatabaseApp/DatabaseAppCreateUpdate.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppCreateUpdate.vue
@@ -5,9 +5,6 @@
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
 import { getDatabaseTypeFieldsMap } from '@/views/applications/DatabaseApp/const'
-import { UploadKey } from '@/components'
-import { Required } from '@/components/DataForm/rules'
-
 export default {
  components: {
    GenericCreateUpdatePage
@@ -39,32 +36,6 @@ export default {
          fieldsMeta: {
            host: {
              type: 'input'
-            },
-            port: {
-              rules: [Required]
-            },
-            use_ssl: {
-              label: this.$t('common.UseSSL'),
-              component: 'el-switch'
-            },
-            allow_invalid_cert: {
-              label: this.$t('common.AllowInvalidCert'),
-              hidden: (form) => { return !form.use_ssl }
-            },
-            ca_cert: {
-              label: this.$t('common.CACertificate'),
-              hidden: (form) => { return !form.use_ssl },
-              component: UploadKey
-            },
-            client_cert: {
-              label: this.$t('common.ClientCertificate'),
-              hidden: (form) => { return !form.use_ssl },
-              component: UploadKey
-            },
-            cert_key: {
-              label: this.$t('common.CertificateKey'),
-              hidden: (form) => { return !form.use_ssl },
-              component: UploadKey
            }
          }
        }
--- a/src/views/applications/DatabaseApp/const.js
+++ b/src/views/applications/DatabaseApp/const.js
@@ -1,14 +1,10 @@
-import { MONGODB, REDIS } from '../const'
+import { ORACLE } from '../const'

 export function getDatabaseTypeFieldsMap(type) {
-  const baseParams = ['host', 'port', 'database']
-  const tlsParams = ['use_ssl', 'ca_cert']
  switch (type) {
-    case REDIS:
-      return baseParams.concat(tlsParams.concat(['client_cert', 'cert_key']))
-    case MONGODB:
-      return baseParams.concat(tlsParams.concat(['cert_key', 'allow_invalid_cert']))
+    case ORACLE:
+      return ['host', 'port', 'database', 'version']
    default:
-      return baseParams
+      return ['host', 'port', 'database']
  }
 }
--- a/src/views/applications/const.js
+++ b/src/views/applications/const.js
@@ -52,82 +52,64 @@ export const DATABASE_CATEGORY = 'db'
 export const SQLSERVER = 'sqlserver'
 export const REDIS = 'redis'
 export const MONGODB = 'mongodb'
-export const CLICKHOUSE = 'clickhouse'
-
-const MYSQL_ITEM = {
-  name: MYSQL,
-  title: i18n.t(`applications.applicationsType.${MYSQL}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: true,
-  group: i18n.t('applications.RDBProtocol')
-}
-
-const MARIADB_ITEM = {
-  name: MARIADB,
-  title: i18n.t(`applications.applicationsType.${MARIADB}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: true
-}
-
-const ORACLE_ITEM = {
-  name: ORACLE,
-  title: i18n.t(`applications.applicationsType.${ORACLE}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: hasLicence
-}
-
-const POSTGRESQL_ITEM = {
-  name: POSTGRESQL,
-  title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: hasLicence
-}
-
-const SQLSERVER_ITEM = {
-  name: SQLSERVER,
-  title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: hasLicence
-}
-
-const CLICKHOUSE_ITEM = {
-  name: CLICKHOUSE,
-  title: i18n.t(`applications.applicationsType.${CLICKHOUSE}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: hasLicence
-}
-
-const MONGODB_ITEM = {
-  name: MONGODB,
-  title: i18n.t(`applications.applicationsType.${MONGODB}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  group: i18n.t('applications.NoSQLProtocol')
-}
-
-const REDIS_ITEM = {
-  name: REDIS,
-  title: i18n.t(`applications.applicationsType.${REDIS}`),
-  type: 'primary',
-  category: DATABASE_CATEGORY,
-  has: true
-}

 export const DATABASE = [
-  MYSQL_ITEM, MARIADB_ITEM, ORACLE_ITEM, POSTGRESQL_ITEM, SQLSERVER_ITEM, CLICKHOUSE_ITEM
+  {
+    name: MYSQL,
+    title: i18n.t(`applications.applicationsType.${MYSQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.RDBProtocol')
+  },
+  {
+    name: MARIADB,
+    title: i18n.t(`applications.applicationsType.${MARIADB}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true
+  },
+  {
+    name: ORACLE,
+    title: i18n.t(`applications.applicationsType.${ORACLE}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: POSTGRESQL,
+    title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: SQLSERVER,
+    title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  }
 ]

 export const KV_DATABASE = [
-  MONGODB_ITEM, REDIS_ITEM
+  {
+    name: REDIS,
+    title: i18n.t(`applications.applicationsType.${REDIS}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.NoSQLProtocol')
+  },
+  {
+    name: MONGODB,
+    title: i18n.t(`applications.applicationsType.${MONGODB}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY
+  }
 ]

-export const AppPlanDatabase = [MYSQL_ITEM, MARIADB_ITEM, ORACLE_ITEM, POSTGRESQL_ITEM, SQLSERVER_ITEM, MONGODB_ITEM]
+export const AppPlanDatabase = DATABASE

 export const KUBERNETES = 'k8s'
 export const CLOUD_CATEGORY = 'cloud'
--- a/src/views/assets/Asset/AssetDetail/components/PermUserGroupCard.vue
+++ b/src/views/assets/Asset/AssetDetail/components/PermUserGroupCard.vue
@@ -1,40 +1,18 @@
 <template>
-  <IBox
-    :fa="icon"
-    :type="type"
-    :title="title"
-    v-bind="$attrs"
-  >
-    <table class="card-table">
-      <div v-if="iObjects.length > 0" v-cloak>
-        <tr v-for="obj of iObjects" :key="obj.value" class="item">
-          <td>
-            <el-tooltip
-              style="margin: 4px;"
-              effect="dark"
-              :content="obj.label"
-              placement="left"
-            >
-              <el-link class="detail" @click="goDetail(obj)">
-                {{ obj.label }}
-              </el-link>
-            </el-tooltip>
-          </td>
-          <td>
-            <el-button
-              size="mini"
-              type="primary"
-              style="float: right"
-              @click="buttonClickCallback(obj)"
-            >
-              {{ buttonTitle }}
-            </el-button>
-          </td>
-        </tr>
-      </div>
-      <div v-else v-cloak style="text-align: center;">
-        {{ $t('common.NoData') }}
-      </div>
+  <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
+    <table style="width: 100%;table-layout:fixed;" class="CardTable">
+      <tr v-for="obj of iObjects" :key="obj.value" class="item">
+        <td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+          <el-tooltip style="margin: 4px;" effect="dark" :content="obj.label" placement="left">
+            <el-link class="detail" @click="goDetail(obj)">{{ obj.label }}</el-link>
+          </el-tooltip>
+        </td>
+        <td>
+          <el-button size="mini" type="primary" style="float: right" @click="buttonClickCallback(obj)">
+            {{ buttonTitle }}
+          </el-button>
+        </td>
+      </tr>
    </table>
  </IBox>
 </template>
@@ -93,9 +71,9 @@ export default {
  methods: {
    async loadObjects() {
      const data = await this.$axios.get(this.url)
-      for (const v of data) {
+      data.forEach((v) => {
        v['label'] = v['name']
-      }
+      })
      this.objects = data
    },
    goDetail(obj) {
@@ -106,26 +84,18 @@ export default {
 </script>

 <style lang="scss" scoped>
-  .card-table {
-    width: 100%;
-    table-layout:fixed;
-  }
-  [v-cloak]{
-    display: none!important;
-  }
  b, strong {
    font-weight: 700;
    font-size: 13px;
  }
+
  tr td {
    line-height: 1.42857;
    padding: 8px;
    vertical-align: top;
    display: inline;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
  }
+
  tr.item {
    border-bottom: 1px solid #e7eaec;
    padding: 8px;
--- a/src/views/assets/Asset/NodeAssetsUpdateDialog.vue
+++ b/src/views/assets/Asset/NodeAssetsUpdateDialog.vue
@@ -88,10 +88,7 @@ export default {
      },
      headerActions: {
        hasLeftActions: false,
-        hasRightActions: false,
-        searchConfig: {
-          getUrlQuery: false
-        }
+        hasRightActions: false
      }
    }
  },
--- a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
+++ b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
@@ -22,7 +22,7 @@ export default {
    const accountProviderAttrs = ACCOUNT_PROVIDER_ATTRS_MAP[accountProvider]
    function setFieldAttrs() {
      const fieldsObject = {}
-      const updateNotRequiredFields = ['access_key_secret', 'client_secret', 'password', 'sc_password', 'oc_password', 'cert_file', 'key_file']
+      const updateNotRequiredFields = ['access_key_secret', 'client_secret', 'password', 'sc_password', 'oc_password']
      for (const item of accountProviderAttrs?.attrs) {
        fieldsObject[item] = {
          rules: updateNotRequiredFields.includes(item) && vm.$route.params.id ? [] : [Required]
@@ -61,20 +61,6 @@ export default {
                toFormat: 'object'
              }
            },
-            cert_file: {
-              label: this.$t('common.Certificate'),
-              component: UploadKey,
-              el: {
-                toFormat: 'object'
-              }
-            },
-            key_file: {
-              label: this.$t('common.SecretKey'),
-              component: UploadKey,
-              el: {
-                toFormat: 'object'
-              }
-            },
            password: {
              rules: this.$route.params.id ? [] : [Required]
            }
--- a/src/views/assets/Cloud/Account/AccountList.vue
+++ b/src/views/assets/Cloud/Account/AccountList.vue
@@ -4,7 +4,7 @@

 <script type="text/jsx">
 import GenericListTable from '@/layout/components/GenericListTable'
-import { ACCOUNT_PROVIDER_ATTRS_MAP, aliyun, aws_china, aws_international, huaweicloud, qcloud, qcloud_lighthouse, azure, azure_international, vmware, nutanix, qingcloud_private, huaweicloud_private, ctyun_private, openstack, gcp, baiducloud, jdcloud, kingsoftcloud, fc, lan } from '../const'
+import { ACCOUNT_PROVIDER_ATTRS_MAP, aliyun, aws_china, aws_international, huaweicloud, qcloud, azure, azure_international, vmware, nutanix, qingcloud_private, huaweicloud_private, openstack, gcp, baiducloud, jdcloud, fc, lan } from '../const'

 export default {
  name: 'AccountList',
@@ -82,10 +82,6 @@ export default {
              type: 'primary',
              can: true
            },
-            {
-              name: qcloud_lighthouse,
-              title: ACCOUNT_PROVIDER_ATTRS_MAP[qcloud_lighthouse].title
-            },
            {
              name: huaweicloud,
              title: ACCOUNT_PROVIDER_ATTRS_MAP[huaweicloud].title
@@ -98,10 +94,6 @@ export default {
              name: jdcloud,
              title: ACCOUNT_PROVIDER_ATTRS_MAP[jdcloud].title
            },
-            {
-              name: kingsoftcloud,
-              title: ACCOUNT_PROVIDER_ATTRS_MAP[kingsoftcloud].title
-            },
            {
              name: aws_china,
              title: ACCOUNT_PROVIDER_ATTRS_MAP[aws_china].title
@@ -135,10 +127,6 @@ export default {
              name: huaweicloud_private,
              title: ACCOUNT_PROVIDER_ATTRS_MAP[huaweicloud_private].title
            },
-            {
-              name: ctyun_private,
-              title: ACCOUNT_PROVIDER_ATTRS_MAP[ctyun_private].title
-            },
            {
              name: openstack,
              title: ACCOUNT_PROVIDER_ATTRS_MAP[openstack].title
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
@@ -24,7 +24,7 @@ export default {
      fields: [
        [this.$t('common.Basic'), ['name']],
        [this.$t('xpack.Cloud.CloudSource'), ['account', 'regions']],
-        [this.$t('xpack.Cloud.SaveSetting'), ['hostname_strategy', 'node', 'unix_admin_user', 'windows_admin_user', 'protocols', 'ip_network_segment_group', 'sync_ip_type', 'is_always_update']],
+        [this.$t('xpack.Cloud.SaveSetting'), ['hostname_strategy', 'node', 'unix_admin_user', 'windows_admin_user', 'protocols', 'ip_network_segment_group', 'is_always_update']],
        [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],
        [this.$t('common.Other'), ['comment']]
      ],
@@ -92,7 +92,6 @@ export default {
          component: Select2,
          el: {
            multiple: true,
-            allowCreate: true,
            value: [],
            ajax: {
              url: '/api/v1/xpack/cloud/regions/',
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
@@ -38,7 +38,6 @@ export default {
      },
      tableConfig: {
        url: `/api/v1/xpack/cloud/sync-instance-tasks/${this.object.id}/instances/`,
-        hasSelection: false,
        columns: [
          'instance_id',
          {
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
@@ -58,7 +58,10 @@ export default {
            formatter: DetailFormatter,
            formatterArgs: {
              permissions: 'xpack.view_syncinstancedetail',
-              route: 'SyncInstanceTaskDetail'
+              route: 'SyncInstanceTaskDetail',
+              routeQuery: {
+                activeTab: 'detail'
+              }
            }
          },
          history_count: {
--- a/src/views/assets/Cloud/const.js
+++ b/src/views/assets/Cloud/const.js
@@ -1,25 +1,21 @@
 import i18n from '@/i18n/i18n'

-export const gcp = 'gcp'
 export const aliyun = 'aliyun'
-export const baiducloud = 'baiducloud'
-export const jdcloud = 'jdcloud'
-export const kingsoftcloud = 'kingsoftcloud'
 export const aws_international = 'aws_international'
 export const aws_china = 'aws_china'
 export const huaweicloud = 'huaweicloud'
 export const qcloud = 'qcloud'
-export const qcloud_lighthouse = 'qcloud_lighthouse'
 export const azure = 'azure'
 export const azure_international = 'azure_international'
-
+export const vmware = 'vmware'
+export const nutanix = 'nutanix'
 export const qingcloud_private = 'qingcloud_private'
 export const huaweicloud_private = 'huaweicloud_private'
-export const ctyun_private = 'ctyun_private'
 export const openstack = 'openstack'
-export const nutanix = 'nutanix'
-export const vmware = 'vmware'
+export const gcp = 'gcp'
 export const fc = 'fc'
+export const baiducloud = 'baiducloud'
+export const jdcloud = 'jdcloud'
 export const lan = 'lan'

 export const ACCOUNT_PROVIDER_ATTRS_MAP = {
@@ -53,21 +49,11 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = {
    title: i18n.t('xpack.Cloud.JDCloud'),
    attrs: ['access_key_id', 'access_key_secret']
  },
-  [kingsoftcloud]: {
-    name: kingsoftcloud,
-    title: i18n.t('xpack.Cloud.KingSoftCloud'),
-    attrs: ['access_key_id', 'access_key_secret']
-  },
  [qcloud]: {
    name: qcloud,
    title: i18n.t('xpack.Cloud.Qcloud'),
    attrs: ['access_key_id', 'access_key_secret']
  },
-  [qcloud_lighthouse]: {
-    name: qcloud_lighthouse,
-    title: i18n.t('xpack.Cloud.QcloudLighthouse'),
-    attrs: ['access_key_id', 'access_key_secret']
-  },
  [azure]: {
    name: azure,
    title: i18n.t('xpack.Cloud.Azure'),
@@ -78,11 +64,6 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = {
    title: i18n.t('xpack.Cloud.Azure_Int'),
    attrs: ['client_id', 'client_secret', 'tenant_id', 'subscription_id']
  },
-  [gcp]: {
-    name: gcp,
-    title: i18n.t('xpack.Cloud.GCP'),
-    attrs: ['service_account_key']
-  },
  [vmware]: {
    name: vmware,
    title: 'VMware',
@@ -108,16 +89,16 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = {
    title: i18n.t('xpack.Cloud.OpenStack'),
    attrs: ['auth_url', 'user_domain_name', 'username', 'password']
  },
+  [gcp]: {
+    name: gcp,
+    title: i18n.t('xpack.Cloud.GCP'),
+    attrs: ['service_account_key']
+  },
  [fc]: {
    name: fc,
    title: i18n.t('xpack.Cloud.FC'),
    attrs: ['api_endpoint', 'username', 'password']
  },
-  [ctyun_private]: {
-    name: ctyun_private,
-    title: i18n.t('xpack.Cloud.CTYunPrivate'),
-    attrs: ['access_key_id', 'access_key_secret', 'api_endpoint', 'cert_file', 'key_file']
-  },
  [lan]: {
    name: lan,
    title: i18n.t('xpack.Cloud.LAN'),
--- a/src/views/assets/CommandFilter/CommandFilterCreateUpdate.vue
+++ b/src/views/assets/CommandFilter/CommandFilterCreateUpdate.vue
@@ -15,7 +15,7 @@ export default {
      },
      fields: [
        [this.$t('common.Basic'), ['name']],
-        [this.$t('common.Correlation'), ['users', 'user_groups', 'nodes', 'assets', 'applications', 'system_users']],
+        [this.$t('common.Correlation'), ['users', 'user_groups', 'assets', 'applications', 'system_users']],
        [this.$t('common.Other'), ['is_active', 'comment']]
      ],
      fieldsMeta: {
@@ -36,17 +36,6 @@ export default {
            url: '/api/v1/users/groups/'
          }
        },
-        nodes: {
-          el: {
-            value: [],
-            ajax: {
-              url: '/api/v1/assets/nodes/',
-              transformOption: (item) => {
-                return { label: item.full_value, value: item.id }
-              }
-            }
-          }
-        },
        assets: {
          type: 'assetSelect',
          component: AssetSelect,
@@ -74,7 +63,7 @@ export default {
          el: {
            value: [],
            ajax: {
-              url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s,redis,mongodb,clickhouse`,
+              url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s`,
              transformOption: (item) => {
                if (this.$route.query.type === 'k8s') {
                  return { label: item.name, value: item.id }
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
@@ -75,7 +75,7 @@ export default {
        icon: 'fa-info-circle',
        title: this.$t('assets.SystemUser'),
        objectsAjax: {
-          url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s,redis,mongodb,clickhouse`,
+          url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s`,
          transformOption: (item) => defaultTransformOption(item, 'username')
        },
        hasObjectsId: this.object.system_users,
--- a/src/views/assets/CommandFilter/CommandFilterList.vue
+++ b/src/views/assets/CommandFilter/CommandFilterList.vue
@@ -80,7 +80,11 @@ export default {
        hasImport: false,
        hasRefresh: true,
        hasSearch: true,
-        createRoute: 'CommandFilterCreate'
+        hasMoreActions: false,
+        createRoute: 'CommandFilterCreate',
+        canCreate: () => {
+          return this.$hasPerm('assets.add_commandfilter')
+        }
      }
    }
  },
--- a/src/views/assets/Domain/DomainList.vue
+++ b/src/views/assets/Domain/DomainList.vue
@@ -42,6 +42,7 @@ export default {
        }
      },
      headerActions: {
+        hasMoreActions: false,
        createRoute: 'DomainCreate'
      },
      notice: this.$t('assets.DomainHelpMessage')
--- a/src/views/assets/Label/LabelList.vue
+++ b/src/views/assets/Label/LabelList.vue
@@ -27,6 +27,7 @@ export default {
        }
      },
      headerActions: {
+        hasMoreActions: false,
        createRoute: 'LabelCreate'
      }
    }
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
@@ -49,7 +49,6 @@ export default {
        case 'sqlserver':
        case 'redis':
        case 'mongodb':
-        case 'clickhouse':
          return Database
        case 'k8s':
          return K8S
--- a/src/views/audits/CommandExecutionList.vue
+++ b/src/views/audits/CommandExecutionList.vue
@@ -42,7 +42,7 @@ export default {
                vm.relationDialog.tableConfig.url = setUrlParam(vm.relationDialog.tableConfig.url, 'commandexecution', row.id)
                vm.relationDialog.show = true
              }
-              return <el-link class='text-link' onClick={onClick}>{ cellValue.length }</el-link>
+              return <el-link onClick={onClick}>{ cellValue.length }</el-link>
            }
          },
          command: {
@@ -67,7 +67,7 @@ export default {
            formatter: (row) => {
              const label = this.$t('audits.View')
              const route = { to: { name: 'CeleryTaskLog', params: { id: row.id }}}
-              return <router-link class='text-link' {...{ attrs: route }} target='_blank'>{ label }</router-link>
+              return <router-link {...{ attrs: route }} target='_blank'>{ label }</router-link>
            }
          },
          date_start: {
@@ -138,4 +138,5 @@ export default {
 </script>

 <style>
+
 </style>
--- a/src/views/audits/OperateLogList.vue
+++ b/src/views/audits/OperateLogList.vue
@@ -1,48 +1,23 @@
 <template>
-  <div>
-    <GenericListPage
-      v-loading="loading"
-      :table-config="tableConfig"
-      :header-actions="headerActions"
-    />
-    <el-dialog
-      :title="this.$t('route.OperateLog')"
-      :visible.sync="logDetailVisible"
-      width="70%"
-    >
-      <TwoTabFormatter :row="rowObj" />
-    </el-dialog>
-  </div>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>

 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
 import { getDaysAgo, getDaysFuture } from '@/utils/common'
-import TwoTabFormatter from '@/components/TableFormatters/TwoTabFormatter'
-import { ActionsFormatter } from '@/components/TableFormatters'

 export default {
  components: {
-    GenericListPage,
-    TwoTabFormatter
+    GenericListPage
  },
  data() {
-    const vm = this
    const now = new Date()
    const dateFrom = getDaysAgo(7, now).toISOString()
    const dateTo = getDaysFuture(1, now).toISOString()
    return {
-      rowObj: {
-        left: '',
-        right: '',
-        leftTitle: vm.$t('audits.BeforeChange'),
-        rightTitle: vm.$t('audits.AfterChange')
-      },
-      logDetailVisible: false,
-      loading: false,
      tableConfig: {
        url: '/api/v1/audits/operate-logs/',
-        columns: ['user', 'action_display', 'resource_type_display', 'resource', 'remote_addr', 'datetime', 'actions'],
+        columns: ['user', 'action_display', 'resource_type_display', 'resource', 'remote_addr', 'datetime'],
        columnsMeta: {
          user: {
            showOverflowTooltip: true
@@ -61,38 +36,7 @@ export default {
            width: '140px'
          },
          action_display: {
-            width: '70px'
-          },
-          actions: {
-            width: '70px',
-            formatter: ActionsFormatter,
-            formatterArgs: {
-              hasUpdate: false,
-              canUpdate: false,
-              hasDelete: false,
-              canDelete: false,
-              hasClone: false,
-              canClone: false,
-              extraActions: [
-                {
-                  name: 'View',
-                  title: this.$t('common.View'),
-                  type: 'primary',
-                  callback: ({ row }) => {
-                    vm.loading = true
-                    vm.$axios.get(
-                      `/api/v1/audits/operate-logs/${row.id}/?type=action_detail`,
-                    ).then(res => {
-                      vm.rowObj.left = res.before
-                      vm.rowObj.right = res.after
-                      vm.logDetailVisible = true
-                    }).finally(() => {
-                      vm.loading = false
-                    })
-                  }
-                }
-              ]
-            }
+            width: '90px'
          }
        },
        extraQuery: {
--- a/src/views/ops/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
+++ b/src/views/ops/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
@@ -6,7 +6,6 @@
 import ListTable from '@/components/ListTable'
 import { ActionsFormatter } from '@/components/TableFormatters'
 import { toSafeLocalDateStr } from '@/utils/common'
-import { openTaskPage } from '@/utils/jms'

 export default {
  name: 'AdhocExecutionHistory',
@@ -87,14 +86,6 @@ export default {
                  callback: function({ row, tableData }) {
                    return this.$router.push({ name: 'HistoryExecutionDetail', params: { id: row.id }})
                  }
-                },
-                {
-                  name: 'log',
-                  title: this.$t('ops.output'),
-                  type: 'info',
-                  callback: function({ row }) {
-                    openTaskPage(row.id, 'ansible')
-                  }
                }
              ]
            }
--- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -15,6 +15,7 @@ import DetailCard from '@/components/DetailCard'
 import { toSafeLocalDateStr } from '@/utils/common'
 import RunInfoCard from '../../RunInfoCard'
 import { toLastFailureDisplay, toLastSucessDisplay } from '../business'
+import { openTaskPage } from '@/utils/jms'

 export default {
  name: 'HistoryExecutionDetail',
@@ -71,6 +72,17 @@ export default {
        {
          key: this.$t('ops.isSuccess'),
          value: this.object.is_success
+        },
+        {
+          key: this.$t('ops.output'),
+          value: this.object.id,
+          formatter: function(row, value) {
+            const onClick = function() {
+              openTaskPage(value, 'ansible')
+            }
+            const title = this.$t('common.View')
+            return <a onClick={onClick} >{ title }</a>
+          }
        }
      ]
    }
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -108,7 +108,7 @@ export default {
              openTaskPage(value, 'ansible')
            }
            const title = this.$t('common.View')
-            return <a class='text-link' onClick={onClick} >{ title }</a>
+            return <a onClick={onClick} >{ title }</a>
          }
        }
      ]
--- a/src/views/ops/TaskDetail/TaskHistory.vue
+++ b/src/views/ops/TaskDetail/TaskHistory.vue
@@ -6,7 +6,6 @@
 import ListTable from '@/components/ListTable'
 import { DetailFormatter } from '@/components/TableFormatters'
 import { toSafeLocalDateStr } from '@/utils/common'
-import { openTaskPage } from '@/utils/jms'

 export default {
  name: 'TaskHistory',
@@ -96,14 +95,6 @@ export default {
                  callback: function({ row, tableData }) {
                    return this.$router.push({ name: 'HistoryExecutionDetail', params: { id: row.id }})
                  }
-                },
-                {
-                  name: 'log',
-                  title: this.$t('ops.output'),
-                  type: 'info',
-                  callback: function({ row }) {
-                    openTaskPage(row.id, 'ansible')
-                  }
                }
              ]
            }
--- a/src/views/profile/ProfileImprovement.vue
+++ b/src/views/profile/ProfileImprovement.vue
@@ -78,7 +78,6 @@ export default {
      },
      onPerformSuccess() {
        this.$message.success(this.$t('common.updateSuccessMsg'))
-        this.$store.dispatch('users/ifFirstLogin', false)
        setTimeout(() => this.$router.push({ name: 'ProfileInfo' }), 100)
      },
      submitMethod() {
--- a/src/views/profile/ProfileInfo.vue
+++ b/src/views/profile/ProfileInfo.vue
@@ -160,7 +160,7 @@ export default {
          attrs: {
            disabled: true,
            name: 'site_msg',
-            model: this.object?.receive_backends.indexOf('site_msg') !== -1
+            model: this.object.receive_backends.indexOf('site_msg') !== -1
          },
          callbacks: {
            change: this.updateUserReceiveBackends
@@ -171,7 +171,7 @@ export default {
          type: 'switcher',
          attrs: {
            name: 'email',
-            model: this.object?.receive_backends.indexOf('email') !== -1
+            model: this.object.receive_backends.indexOf('email') !== -1
          },
          callbacks: {
            change: this.updateUserReceiveBackends
@@ -182,7 +182,7 @@ export default {
          type: 'switcher',
          attrs: {
            name: 'wecom',
-            model: this.object?.receive_backends.indexOf('wecom') !== -1
+            model: this.object.receive_backends.indexOf('wecom') !== -1
          },
          has: this.$store.getters.publicSettings.AUTH_WECOM,
          callbacks: {
@@ -194,7 +194,7 @@ export default {
          type: 'switcher',
          attrs: {
            name: 'dingtalk',
-            model: this.object?.receive_backends.indexOf('dingtalk') !== -1
+            model: this.object.receive_backends.indexOf('dingtalk') !== -1
          },
          has: this.$store.getters.publicSettings.AUTH_DINGTALK,
          callbacks: {
@@ -206,7 +206,7 @@ export default {
          type: 'switcher',
          attrs: {
            name: 'feishu',
-            model: this.object?.receive_backends.indexOf('feishu') !== -1
+            model: this.object.receive_backends.indexOf('feishu') !== -1
          },
          has: this.$store.getters.publicSettings.AUTH_FEISHU,
          callbacks: {
@@ -306,7 +306,6 @@ export default {
        { 'receive_backends': this.getReceiveBackendList() }
      ).then(res => {
        this.$message.success(this.$t('common.updateSuccessMsg'))
-        this.$store.dispatch('users/getProfile', true)
      }).catch(err => {
        this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
      })
--- a/src/views/settings/Auth/CAS.vue
+++ b/src/views/settings/Auth/CAS.vue
@@ -8,7 +8,7 @@

 <script>
 import BaseAuth from './Base'
-import { JsonRequiredUserNameMapped } from '@/components/DataForm/rules'
+import { JsonRequired } from '@/components/DataForm/rules'
 import { JsonEditor } from '@/components/FormFields'

 export default {
@@ -25,14 +25,16 @@ export default {
            'AUTH_CAS', 'CAS_SERVER_URL', 'CAS_ROOT_PROXIED_AS', 'CAS_VERSION'
          ]],
          [this.$t('common.Other'), [
-            'CAS_LOGOUT_COMPLETELY', 'CAS_RENAME_ATTRIBUTES', 'CAS_CREATE_USER'
+            'CAS_LOGOUT_COMPLETELY', 'CAS_USERNAME_ATTRIBUTE',
+            'CAS_APPLY_ATTRIBUTES_TO_USER', 'CAS_RENAME_ATTRIBUTES',
+            'CAS_CREATE_USER'
          ]]
        ],
        fieldsMeta: {
          CAS_RENAME_ATTRIBUTES: {
            component: JsonEditor,
            label: this.$t('setting.authUserAttrMap'),
-            rules: [JsonRequiredUserNameMapped]
+            rules: [JsonRequired]
          }
        },
        submitMethod: () => 'patch',
@@ -41,18 +43,9 @@ export default {
          return obj
        },
        cleanFormValue(data) {
-          let userNameAttribute = ''
-          const renameAttributes = JSON.parse(data['CAS_RENAME_ATTRIBUTES'])
-          if (renameAttributes) {
-            data['CAS_RENAME_ATTRIBUTES'] = renameAttributes
+          if (data['CAS_RENAME_ATTRIBUTES']) {
+            data['CAS_RENAME_ATTRIBUTES'] = JSON.parse(data['CAS_RENAME_ATTRIBUTES'])
          }
-          for (const key in renameAttributes) {
-            if (renameAttributes[key] === 'username') {
-              userNameAttribute = key
-            }
-          }
-          data['CAS_USERNAME_ATTRIBUTE'] = userNameAttribute
-          data['CAS_APPLY_ATTRIBUTES_TO_USER'] = true
          return data
        }
      }
--- a/src/views/settings/Auth/OAuth2.vue
+++ b/src/views/settings/Auth/OAuth2.vue
@@ -36,11 +36,9 @@ export default {
            'AUTH_OAUTH2_SCOPE',
            'AUTH_OAUTH2_PROVIDER_AUTHORIZATION_ENDPOINT',
            'AUTH_OAUTH2_ACCESS_TOKEN_ENDPOINT',
-            'AUTH_OAUTH2_PROVIDER_USERINFO_ENDPOINT',
-            'AUTH_OAUTH2_PROVIDER_END_SESSION_ENDPOINT'
+            'AUTH_OAUTH2_PROVIDER_USERINFO_ENDPOINT'
          ]],
          [this.$t('common.Other'), [
-            'AUTH_OAUTH2_LOGOUT_COMPLETELY',
            'AUTH_OAUTH2_ALWAYS_UPDATE_USER',
            'AUTH_OAUTH2_USER_ATTR_MAP'
          ]]
--- a/src/views/settings/Auth/OIDC.vue
+++ b/src/views/settings/Auth/OIDC.vue
@@ -32,7 +32,6 @@ export default {
            'AUTH_OPENID_PROVIDER_TOKEN_ENDPOINT', 'AUTH_OPENID_PROVIDER_JWKS_ENDPOINT',
            'AUTH_OPENID_PROVIDER_USERINFO_ENDPOINT', 'AUTH_OPENID_PROVIDER_END_SESSION_ENDPOINT',
            'AUTH_OPENID_PROVIDER_SIGNATURE_ALG', 'AUTH_OPENID_PROVIDER_SIGNATURE_KEY',
-            'AUTH_OPENID_PKCE', 'AUTH_OPENID_CODE_CHALLENGE_METHOD',
            'AUTH_OPENID_SCOPES', 'AUTH_OPENID_ID_TOKEN_MAX_AGE', 'AUTH_OPENID_ID_TOKEN_INCLUDE_CLAIMS',
            'AUTH_OPENID_USE_STATE', 'AUTH_OPENID_USE_NONCE', 'AUTH_OPENID_ALWAYS_UPDATE_USER',
            'AUTH_OPENID_IGNORE_SSL_VERIFICATION', 'AUTH_OPENID_SHARE_SESSION', 'AUTH_OPENID_USER_ATTR_MAP'
@@ -88,12 +87,6 @@ export default {
          AUTH_OPENID_PROVIDER_SIGNATURE_KEY: {
            hidden: (form) => form['AUTH_OPENID_KEYCLOAK']
          },
-          AUTH_OPENID_PKCE: {
-            hidden: (form) => form['AUTH_OPENID_KEYCLOAK']
-          },
-          AUTH_OPENID_CODE_CHALLENGE_METHOD: {
-            hidden: (form) => form['AUTH_OPENID_KEYCLOAK'] || !form['AUTH_OPENID_PKCE']
-          },
          'AUTH_OPENID_SCOPES': {
            hidden: (form) => form['AUTH_OPENID_KEYCLOAK']
          },
--- a/src/views/settings/Org/OrganizationList.vue
+++ b/src/views/settings/Org/OrganizationList.vue
@@ -60,7 +60,6 @@ export default {
          actions: {
            prop: 'id',
            formatterArgs: {
-              canUpdate: this.$hasPerm('orgs.change_organization'),
              canDelete: function({ row }) {
                return !row.is_default && vm.$hasPerm('orgs.delete_organization')
              },
--- a/src/views/settings/Other.vue
+++ b/src/views/settings/Other.vue
@@ -47,8 +47,7 @@ export default {
          this.$t('setting.Perm'),
          [
            'PERM_SINGLE_ASSET_TO_UNGROUP_NODE',
-            'TICKET_AUTHORIZE_DEFAULT_TIME',
-            'TICKET_AUTHORIZE_DEFAULT_TIME_UNIT'
+            'TICKET_AUTHORIZE_DEFAULT_TIME'
          ]
        ]
      ],
--- a/src/views/settings/SMS/Base.vue
+++ b/src/views/settings/SMS/Base.vue
@@ -12,7 +12,7 @@
      v-on="$listeners"
      @confirm="onConfirm()"
    >
-      <GenericCreateUpdateForm ref="form" v-bind="iConfig" @submitSuccess="submitSuccess" />
+      <GenericCreateUpdateForm v-bind="iConfig" @submitSuccess="submitSuccess" />
    </Dialog>
  </div>
 </template>
@@ -52,16 +52,6 @@ export default {
    submitSuccess(res) {
      this.$emit('input', !!res[this.enableField])
      this.visible = false
-    },
-    testPerformError(error) {
-      const data = error.response.data
-      for (const key of Object.keys(data)) {
-        let value = data[key]
-        if (value instanceof Array) {
-          value = value.join(';')
-        }
-        this.$refs.form.$refs.form.setFieldError(key, value)
-      }
    }
  }
 }
--- a/src/views/settings/SMS/CMPP2.vue
+++ b/src/views/settings/SMS/CMPP2.vue
@@ -1,5 +1,5 @@
 <template>
-  <BaseSMS ref="baseSms" :title="$t('setting.CMPP2')" :config="$data" />
+  <BaseSMS :title="$t('setting.CMPP2')" :config="$data" />
 </template>

 <script>
@@ -28,9 +28,8 @@ export default {
              value
            ).then(res => {
              vm.$message.success(res['msg'])
-            }).catch((error) => {
+            }).catch(() => {
              vm.$log.error('err occur')
-              vm.$refs.baseSms.testPerformError(error)
            }).finally(() => { btn.loading = false })
          }
        }
--- a/src/views/settings/SMS/SMSAlibaba.vue
+++ b/src/views/settings/SMS/SMSAlibaba.vue
@@ -1,5 +1,5 @@
 <template>
-  <BaseSMS ref="baseSms" :title="$t('setting.AlibabaCloud')" :config="$data" />
+  <BaseSMS :title="$t('setting.AlibabaCloud')" :config="$data" />
 </template>

 <script>
@@ -28,9 +28,8 @@ export default {
              value
            ).then(res => {
              vm.$message.success(res['msg'])
-            }).catch((error) => {
+            }).catch(() => {
              vm.$log.error('err occur')
-              vm.$refs.baseSms.testPerformError(error)
            }).finally(() => { btn.loading = false })
          }
        }
--- a/src/views/settings/SMS/SMSHuawei.vue
+++ b/src/views/settings/SMS/SMSHuawei.vue
@@ -1,88 +0,0 @@
-<template>
-  <BaseSMS ref="baseSms" :title="$t('setting.HuaweiCloud')" :config="$data" />
-</template>
-
-<script>
-import BaseSMS from './Base'
-import { UpdateToken } from '@/components/FormFields'
-
-export default {
-  name: 'SMSHuawei',
-  components: {
-    BaseSMS
-  },
-  data() {
-    const vm = this
-    return {
-      url: `/api/v1/settings/setting/?category=huawei`,
-      hasDetailInMsg: false,
-      visible: false,
-      moreButtons: [
-        {
-          title: this.$t('common.Test'),
-          loading: false,
-          callback: function(value, form, btn) {
-            btn.loading = true
-            vm.$axios.post(
-              `/api/v1/settings/sms/huawei/testing/`,
-              value
-            ).then(res => {
-              vm.$message.success(res['msg'])
-            }).catch((error) => {
-              vm.$log.error('err occur')
-              vm.$refs.baseSms.testPerformError(error)
-            }).finally(() => { btn.loading = false })
-          }
-        }
-      ],
-      fields: [
-        [
-          this.$t('common.BasicInfo'),
-          [
-            'HUAWEI_APP_KEY', 'HUAWEI_APP_SECRET', 'HUAWEI_SMS_ENDPOINT'
-          ]
-        ],
-        [
-          this.$t('setting.VerifySignTmpl'),
-          [
-            'HUAWEI_SIGN_CHANNEL_NUM', 'HUAWEI_VERIFY_SIGN_NAME', 'HUAWEI_VERIFY_TEMPLATE_CODE'
-          ]
-        ],
-        [
-          this.$t('common.Other'),
-          [
-            'SMS_TEST_PHONE'
-          ]
-        ]
-      ],
-      fieldsMeta: {
-        HUAWEI_VERIFY_SIGN_TMPL: {
-          fields: ['SIGN_NAME', 'TEMPLATE_CODE'],
-          fieldsMeta: {
-          }
-        },
-        HUAWEI_APP_SECRET: {
-          component: UpdateToken
-        },
-        HUAWEI_SIGN_CHANNEL_NUM: {
-          label: this.$t('setting.SignChannelNum')
-        },
-        HUAWEI_SMS_ENDPOINT: {
-          label: this.$t('setting.AppEndpoint')
-        }
-      },
-      submitMethod() {
-        return 'put'
-      }
-    }
-  },
-  computed: {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
--- a/src/views/settings/SMS/SMSTencent.vue
+++ b/src/views/settings/SMS/SMSTencent.vue
@@ -1,5 +1,5 @@
 <template>
-  <BaseSMS ref="baseSms" :title="$t('setting.TencentCloud')" :config="$data" />
+  <BaseSMS :title="$t('setting.TencentCloud')" :config="$data" />
 </template>

 <script>
@@ -28,9 +28,8 @@ export default {
              value
            ).then(res => {
              vm.$message.success(res['msg'])
-            }).catch((error) => {
+            }).catch(() => {
              vm.$log.error('err occur')
-              vm.$refs.baseSms.testPerformError(error)
            }).finally(() => { btn.loading = false })
          }
        }
--- a/src/views/settings/SMS/index.vue
+++ b/src/views/settings/SMS/index.vue
@@ -6,7 +6,6 @@
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
 import SMSAlibaba from './SMSAlibaba'
 import SMSTencent from './SMSTencent'
-import SMSHuawei from './SMSHuawei'
 import CMPP2 from './CMPP2'

 export default {
@@ -25,7 +24,7 @@ export default {
        ],
        [
          this.$t('setting.SMSProvider'), [
-            'ALIYUN', 'QCLOUD', 'HUAWEICLOUD', 'CMPP2'
+            'ALIYUN', 'QCLOUD', 'CMPP2'
          ]
        ]
      ],
@@ -44,13 +43,6 @@ export default {
            return form['SMS_BACKEND'] !== 'tencent'
          }
        },
-        HUAWEICLOUD: {
-          label: this.$t('setting.HuaweiCloud'),
-          component: SMSHuawei,
-          hidden: (form) => {
-            return form['SMS_BACKEND'] !== 'huawei'
-          }
-        },
        CMPP2: {
          label: this.$t('setting.CMPP2'),
          component: CMPP2,
--- a/src/views/settings/Terminal/Base.vue
+++ b/src/views/settings/Terminal/Base.vue
@@ -37,12 +37,6 @@ export default {
          [
            'TERMINAL_MAGNUS_ENABLED'
          ]
-        ],
-        [
-          `Web ${comp}(Luna)`,
-          [
-            'TERMINAL_GRAPHICAL_RESOLUTION'
-          ]
        ]
      ],
      fieldsMeta: {
--- a/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue
+++ b/src/views/settings/Terminal/Endpoint/EndpointCreateUpdate.vue
@@ -23,15 +23,13 @@ export default {
          this.$t('applications.port'),
          [
            'http_port', 'https_port', 'ssh_port', 'rdp_port',
-            'magnus_listen_port_range'
+            'mysql_port', 'mariadb_port', 'postgresql_port', 'redis_port',
+            'oracle_11g_port', 'oracle_12c_port'
          ]
        ],
        [this.$t('common.Other'), ['comment']]
      ],
      fieldsMeta: {
-        magnus_listen_port_range: {
-          disabled: true
-        }
      },
      hasDetailInMsg: false
    }
--- a/src/views/settings/Terminal/Endpoint/EndpointList.vue
+++ b/src/views/settings/Terminal/Endpoint/EndpointList.vue
@@ -20,15 +20,17 @@ export default {
        url: '/api/v1/terminal/endpoints/',
        columns: [
          'name', 'host',
-          'http_port', 'https_port', 'ssh_port', 'rdp_port',
-          'magnus_listen_port_range',
+          'http_port', 'https_port', 'ssh_port',
+          'rdp_port', 'mysql_port', 'mariadb_port',
+          'postgresql_port', 'redis_port',
+          'oracle_11g_port', 'oracle_12c_port',
          'date_created', 'comment', 'actions'
        ],
        columnsShow: {
          min: ['name', 'actions'],
          default: [
            'name', 'host', 'actions',
-            'http_port', 'https_port', 'ssh_port', 'rdp_port', 'magnus_listen_port_range'
+            'http_port', 'https_port', 'ssh_port', 'rdp_port'
          ]
        },
        columnsMeta: {
@@ -37,10 +39,9 @@ export default {
          },
          actions: {
            formatterArgs: {
-              canUpdate: this.$hasPerm('terminal.change_endpoint'),
              updateRoute: 'EndpointUpdate',
              cloneRoute: 'EndpointCreate',
-              canDelete: ({ row }) => row.id !== '00000000-0000-0000-0000-000000000001' && this.$hasPerm('terminal.delete_endpoint')
+              canDelete: ({ row }) => row.id !== '00000000-0000-0000-0000-000000000001'
            }
          }
        }
--- a/src/views/settings/Terminal/EndpointRule/EndpointRuleList.vue
+++ b/src/views/settings/Terminal/EndpointRule/EndpointRuleList.vue
@@ -38,7 +38,6 @@ export default {
          },
          actions: {
            formatterArgs: {
-              canUpdate: this.$hasPerm('terminal.change_endpointrule'),
              updateRoute: 'EndpointRuleUpdate',
              cloneRoute: 'EndpointRuleCreate'
            }
--- a/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue
+++ b/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue
@@ -27,8 +27,7 @@ export default {
      initial: {
        type: storageType,
        endpoint_suffix: 'core.chinacloudapi.cn',
-        protocol: 'http',
-        is_default: true
+        protocol: 'http'
      },
      getUrl() {
        const params = this.$route.params
--- a/src/views/settings/Tools.vue
+++ b/src/views/settings/Tools.vue
@@ -1,38 +1,27 @@
 <template>
  <Page v-bind="$attrs">
    <IBox>
-      <el-form ref="testForm" label-width="20%" :model="testData" :rules="testRules">
-        <el-form-item :label="$t('setting.basicTools')">
-          <el-radio-group v-model="testData.tool_type" @change="changeToolType">
-            <el-radio v-for="t in tools" :key="t" :label="t" />
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="$t('setting.destinationIP')" prop="dest_addr">
-          <el-input v-model="testData.dest_addr" :placeholder="$t('setting.destinationIP')" />
-        </el-form-item>
-        <el-form-item v-if="testData.tool_type=='Telnet'" :label="$t('setting.testPort')" prop="port_num">
-          <el-input v-model="testData.port_num" :placeholder="$t('setting.testPort')" />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="small"
-            :loading="isTesting"
-            @click="submitTest"
-          >
-            {{ $t('setting.testTools') }}
-          </el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-input
-            v-model="testResp"
-            type="textarea"
-            :readonly="true"
-            :rows="8"
-            :placeholder="$t('setting.testHelpText')"
-          />
-        </el-form-item>
-      </el-form>
+      <div>
+        <el-form ref="testForm" label-width="20%" :model="testData" :rules="testRules">
+          <el-form-item :label="$t('setting.basicTools')">
+            <el-radio-group v-model="testData.tool_type" @change="changeToolType">
+              <el-radio v-for="t in tools" :key="t" :label="t" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('setting.destinationIP')" prop="dest_addr">
+            <el-input v-model="testData.dest_addr" :placeholder="$t('setting.destinationIP')" />
+          </el-form-item>
+          <el-form-item v-if="testData.tool_type=='Telnet'" :label="$t('setting.testPort')" prop="port_num">
+            <el-input v-model="testData.port_num" :placeholder="$t('setting.testPort')" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" :loading="isTesting" @click="submitTest">{{ $t('setting.testTools') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="testResp" type="textarea" :readonly="true" :rows="8" :placeholder="$t('setting.testHelpText')" />
+          </el-form-item>
+        </el-form>
+      </div>
    </IBox>
  </Page>
 </template>
@@ -106,19 +95,20 @@ export default {
 }
 </script>

-<style lang="scss" scoped>
-.el-form {
-  &>>> .el-form-item {
-    margin-bottom: 12px;
-  }
-  &>>> .el-form-item__content {
-    width: 75%;
-  }
-  &>>> .el-form-item__label {
-    padding: 0 30px 0 0;
-  }
-  &>>> .el-form-item__error {
+<style scoped>
+.el-form ::v-deep .el-form-item {
+  margin-bottom: 12px;
+}
+
+.el-form ::v-deep .el-form-item__content {
+  width: 75%;
+}
+
+.el-form ::v-deep .el-form-item__label {
+  padding: 0 30px 0 0;
+}
+
+.el-form ::v-deep .el-form-item__error {
    position: inherit;
-  }
 }
 </style>
--- a/src/views/tickets/BaseTicketList.vue
+++ b/src/views/tickets/BaseTicketList.vue
@@ -141,7 +141,7 @@ export default {
              valueLabel: this.$t('tickets.Pending')
            }
          },
-          exclude: ['state', 'id', 'title'],
+          exclude: ['state'],
          options: [
            {
              value: 'state',
@@ -162,30 +162,6 @@ export default {
                  label: this.$t('tickets.Rejected')
                }
              ]
-            },
-            {
-              value: 'id',
-              label: 'ID'
-            },
-            {
-              value: 'title',
-              label: this.$t('tickets.title')
-            },
-            {
-              value: 'relevant_app',
-              label: this.$t('tickets.RelevantApp')
-            },
-            {
-              value: 'relevant_asset',
-              label: this.$t('tickets.RelevantAsset')
-            },
-            {
-              value: 'relevant_system_user',
-              label: this.$t('tickets.RelevantCommand')
-            },
-            {
-              value: 'relevant_command',
-              label: this.$t('tickets.RelevantSystemUser')
            }
          ]
        },
--- a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
@@ -25,10 +25,8 @@ export default {
  data() {
    const vm = this
    const now = new Date()
-    const time = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
-    const unit = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME_UNIT']
-    const dividend = unit === 'hour' ? 24 : 1
-    const date_expired = getDaysFuture(time / dividend, new Date()).toISOString()
+    const TicketAuthorizeDefaultTime = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
+    const date_expired = getDaysFuture(TicketAuthorizeDefaultTime, new Date()).toISOString()
    const date_start = now.toISOString()
    let apply_category_type = []

--- a/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
@@ -17,10 +17,8 @@ export default {

  data() {
    const now = new Date()
-    const time = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
-    const unit = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME_UNIT']
-    const dividend = unit === 'hour' ? 24 : 1
-    const date_expired = getDaysFuture(time / dividend, new Date()).toISOString()
+    const TicketAuthorizeDefaultTime = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
+    const date_expired = getDaysFuture(TicketAuthorizeDefaultTime, new Date()).toISOString()
    const date_start = now.toISOString()
    return {
      // 工单创建 隐藏提示信息中的跳转连接
--- a/src/views/tickets/components/Comments.vue
+++ b/src/views/tickets/components/Comments.vue
@@ -7,7 +7,7 @@
      <div v-for="item in comments" :key="item.id" class="feed-activity-list">
        <div class="feed-element">
          <a href="#" class="pull-left">
-            <el-avatar :src="imageUrl" :size="30" class="header-avatar" />
+            <el-avatar :src="imageUrl" size="30" class="header-avatar" />
          </a>
          <div class="media-body ">
            <strong>{{ item.user_display }}</strong> <small class="text-muted">{{ formatTime(item.date_created) }}</small>
@@ -105,9 +105,7 @@ export default {
      return this.object.process_map[this.object.approval_step - 1].assignees.indexOf(this.$store.state.users.profile.id) !== -1
    },
    isSelfTicket() {
-      const applicant = this.object.applicant.indexOf('(') > -1 ? this.object.applicant.split('(')[0] : this.object.applicant
-      const userName = this.$store.state.users.profile?.username
-      return applicant === userName
+      return this.object.applicant === this.$store.state.users.profile.id
    }
  },
  mounted() {
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -14,9 +14,7 @@ export default {
  },
  data() {
    return {
-      initial: {
-        need_update_password: true
-      },
+      initial: {},
      user: {
        'can_public_key_auth': false
      },
@@ -171,9 +169,6 @@ export default {
        if (value.update_password !== undefined) {
          delete value.update_password
        }
-        if (value.source !== 'local') {
-          delete value.need_update_password
-        }
        return value
      }
    }
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -115,7 +115,6 @@ export default {
          actions: {
            formatterArgs: {
              hasDelete: hasDelete,
-              canUpdate: this.$hasPerm('users.change_user'),
              extraActions: [
                {
                  title: this.$t('users.Remove'),
--- a/src/views/users/User/components/InviteUsersDialog.vue
+++ b/src/views/users/User/components/InviteUsersDialog.vue
@@ -42,8 +42,7 @@ export default {
      InviteLoading: false,
      formConfig: {
        url: '/api/v1/users/users/invite/',
-        getUrl: () => '/api/v1/users/users/invite/',
-        submitMethod: () => 'post',
+        method: 'post',
        hasReset: false,
        hasSaveContinue: false,
        createSuccessMsg: this.$t('users.InviteSuccess'),
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
“huailei000”	9d3874a61c	fix: 批量更新不请求接口	2022-09-06 19:06:42 +08:00
Jiangjie.Bai	d222ca0684	Revert "fix: form表单组件增加是否回显配置；批量更新弹窗组件默认设置为不回显" This reverts commit `40655ca239`.	2022-09-06 18:30:31 +08:00
“huailei000”	40655ca239	fix: form表单组件增加是否回显配置；批量更新弹窗组件默认设置为不回显	2022-09-06 18:12:20 +08:00
“huailei000”	ec28702181	fix: moment.js 插件升级修复官方漏洞	2022-09-05 13:55:17 +08:00
Jiangjie.Bai	4bb4d3fbf4	fix: 修复上传json文件上传问题	2022-08-19 13:39:17 +08:00
“huailei000”	a34fff2caa	fix: 修复LDAP用户导入失败弹出提示	2022-08-19 11:06:11 +08:00
“huailei000”	a9eb32de6c	fix: 升级lodash	2022-08-19 11:05:51 +08:00