From 5112af8ba1a0b5a3208fbb4e3837b7d505e191e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 10:38:04 +0800
Subject: [PATCH 01/68] =?UTF-8?q?perf:=20=E6=89=B9=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E4=BA=A7=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                                 |  1 +
 src/i18n/langs/ja.json                                 |  1 +
 src/i18n/langs/zh.json                                 |  1 +
 .../components/GenericUpdateFormDialog/index.vue       | 10 ++++++++++
 .../AssetList/components/AssetBulkUpdateDialog.vue     |  2 ++
 5 files changed, 15 insertions(+)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 25334e4b7..ef959f6a1 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -197,6 +197,7 @@
   },
   "assets": {
     "Secure": "Secure",
+    "AssetBulkUpdateTips": "device、cloud、web，Batch update of domain is not supported",
     "LabelInputFormatValidation": "Format error, correct format is：name:value",
     "IP/Host": "IP/Host",
     "OrganizationAsset": "Organization asset",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index aac444a7f..07e1e0698 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -197,6 +197,7 @@
   },
   "assets": {
     "Secure": "安全である",
+    "AssetBulkUpdateTips": "ネットワークデバイス、クラウドサービス、Web、一括更新ネットワークドメインはサポートされていません",
     "LabelInputFormatValidation": "フォーマットが正しくありません：name:value",
     "IP/Host": "IP/ノア",
     "OrganizationAsset": "組織資産",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 1e7db7339..1f9e99154 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -197,6 +197,7 @@
   },
   "assets": {
     "Secure": "安全",
+    "AssetBulkUpdateTips": "网络设备、云服务、web，不支持批量更新网域",
     "LabelInputFormatValidation": "标签格式错误，正确格式为：name:value",
     "GatewayList": "网关列表",
     "AccessKey": "访问密钥",
diff --git a/src/layout/components/GenericUpdateFormDialog/index.vue b/src/layout/components/GenericUpdateFormDialog/index.vue
index 4f567b95e..c619ca2a5 100644
--- a/src/layout/components/GenericUpdateFormDialog/index.vue
+++ b/src/layout/components/GenericUpdateFormDialog/index.vue
@@ -7,6 +7,9 @@
     top="1vh"
     width="70%"
   >
+    <el-alert v-if="tips" class="tips" type="success">
+      {{ tips }}
+    </el-alert>
     <el-row :gutter="20">
       <el-col :md="4" :sm="24">
         <div class="select-prop-label">
@@ -56,6 +59,10 @@ export default {
       type: Object,
       default: () => ({})
     },
+    tips: {
+      type: String,
+      default: ''
+    },
     visible: {
       type: Boolean,
       default: false
@@ -152,4 +159,7 @@ export default {
     padding-right: 30px;
   }
 
+  .tips {
+    margin-bottom: 10px;
+  }
 </style>
diff --git a/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue b/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue
index be3aa9c77..2dd4d142e 100644
--- a/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue
+++ b/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue
@@ -3,6 +3,7 @@
     v-if="visible"
     :form-setting="formSetting"
     :selected-rows="selectedRows"
+    :tips="tips"
     :visible="visible"
     v-on="$listeners"
   />
@@ -30,6 +31,7 @@ export default {
   data() {
     const meta = assetFieldsMeta(this)
     return {
+      tips: this.$t('assets.AssetBulkUpdateTips'),
       formSetting: {
         url: '/api/v1/assets/assets/',
         hasSaveContinue: false,

From 8f5df65f0e60c47a33fd38ae87f2f90a81eb85a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 11:29:59 +0800
Subject: [PATCH 02/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96tree=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6url=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/dialog.vue          |  1 +
 src/components/AssetSelect/index.vue           |  5 +++++
 src/components/AssetTreeTable/index.vue        | 18 +++++++++++++++++-
 src/views/assets/Domain/DomainCreateUpdate.vue |  5 ++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/AssetSelect/dialog.vue b/src/components/AssetSelect/dialog.vue
index 8d1523c2e..fe57222df 100644
--- a/src/components/AssetSelect/dialog.vue
+++ b/src/components/AssetSelect/dialog.vue
@@ -12,6 +12,7 @@
   >
     <AssetTreeTable
       ref="ListPage"
+      v-bind="$attrs"
       :header-actions="headerActions"
       :table-config="tableConfig"
       class="tree-table"
diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index e87ec450f..90cc3f5c8 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -15,6 +15,7 @@
       :visible.sync="dialogVisible"
       v-bind="$attrs"
       :base-url="baseUrl"
+      :tree-url-query="treeUrlQuery"
       @cancel="handleCancel"
       @confirm="handleConfirm"
       v-on="$listeners"
@@ -34,6 +35,10 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
+    treeUrlQuery: {
+      type: Object,
+      default: () => {}
+    },
     value: {
       type: Array,
       default: () => []
diff --git a/src/components/AssetTreeTable/index.vue b/src/components/AssetTreeTable/index.vue
index eebdee81c..508a6066a 100644
--- a/src/components/AssetTreeTable/index.vue
+++ b/src/components/AssetTreeTable/index.vue
@@ -39,6 +39,10 @@ export default {
       type: String,
       default: '/api/v1/assets/nodes/children/tree/'
     },
+    treeUrlQuery: {
+      type: Object,
+      default: () => ({})
+    },
     treeSetting: {
       type: Object,
       default: () => ({})
@@ -54,6 +58,9 @@ export default {
   },
   data() {
     const showAssets = this.treeSetting?.showAssets || this.showAssets
+    const treeUrlQuery = this.setTreeUrlQuery()
+    const assetTreeUrl = `${this.treeUrl}?assets=${showAssets ? '1' : '0'}&${treeUrlQuery}`
+
     return {
       treeTabConfig: {
         activeMenu: 'CustomTree',
@@ -72,7 +79,7 @@ export default {
               showSearch: true,
               url: this.url,
               nodeUrl: this.nodeUrl,
-              treeUrl: `${this.treeUrl}?assets=${showAssets ? '1' : '0'}`,
+              treeUrl: assetTreeUrl,
               callback: {
                 onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
               },
@@ -117,6 +124,15 @@ export default {
     treeSetting.showDelete = this.$hasPerm('assets.delete_node')
   },
   methods: {
+    setTreeUrlQuery() {
+      let str = ''
+      for (const key in this.treeUrlQuery) {
+        str += `${key}=${this.treeUrlQuery[key]}&`
+      }
+      str = str.substr(0, str.length - 1)
+
+      return str
+    },
     decorateRMenu() {
       const show_current_asset = this.$cookie.get('show_current_asset') || '0'
       if (show_current_asset === '1') {
diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue
index 8e298aae5..73ae66649 100644
--- a/src/views/assets/Domain/DomainCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainCreateUpdate.vue
@@ -24,7 +24,10 @@ export default {
           label: this.$t('assets.Assets'),
           el: {
             value: [],
-            baseUrl: '/api/v1/assets/assets/?domain_enabled=true'
+            baseUrl: '/api/v1/assets/assets/?domain_enabled=true',
+            treeUrlQuery: {
+              domain_enabled: true
+            }
           }
         }
       },

From 6661583a0f90654ff3405003f0b4de1ea50a5ccb Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Mon, 6 Feb 2023 19:12:11 +0800
Subject: [PATCH 03/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=86=8D=E6=AC=A1=E6=89=A7=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh.json                        |  1 +
 .../ops/Template/Playbook/UploadDialog.vue    |  2 +-
 src/views/tasks/TaskDetail/TaskHistory.vue    | 20 +++++++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 1f9e99154..51462ce46 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -814,6 +814,7 @@
     "Weekly": "按周"
   },
   "ops": {
+    "RunAgain": "再次执行",
     "AdhocUpdate": "更新命令",
     "Add": "新增",
     "Modify": "修改",
diff --git a/src/views/ops/Template/Playbook/UploadDialog.vue b/src/views/ops/Template/Playbook/UploadDialog.vue
index 401b25011..1673b63ec 100644
--- a/src/views/ops/Template/Playbook/UploadDialog.vue
+++ b/src/views/ops/Template/Playbook/UploadDialog.vue
@@ -79,7 +79,7 @@ export default {
         this.$emit('completed')
         this.$message.success('terminal.UploadSucceed')
       }).catch(err => {
-        console.log(err)
+        this.$message.error(err)
       })
     }
   }
diff --git a/src/views/tasks/TaskDetail/TaskHistory.vue b/src/views/tasks/TaskDetail/TaskHistory.vue
index adc7d0e33..63a8b5096 100644
--- a/src/views/tasks/TaskDetail/TaskHistory.vue
+++ b/src/views/tasks/TaskDetail/TaskHistory.vue
@@ -1,5 +1,5 @@
 <template>
-  <ListTable :table-config="tableConfig" :header-actions="headerActions" />
+  <ListTable ref="list" :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script type="text/jsx">
@@ -18,6 +18,7 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
       tableConfig: {
         hasSelection: false,
@@ -75,10 +76,20 @@ export default {
                 {
                   name: 'detail',
                   title: this.$t('ops.output'),
-                  type: 'primary',
                   callback: function({ row, tableData }) {
                     openTaskPage(row.id)
                   }
+                },
+                {
+                  name: 'run',
+                  title: this.$t('ops.RunAgain'),
+                  type: 'primary',
+                  callback: function({ row, tableData }) {
+                    this.$axios.post(`/api/v1/ops/task-executions/?from=${row.id}`, {}).then(data => {
+                      vm.refreshTable()
+                      openTaskPage(data.task_id)
+                    })
+                  }
                 }
               ]
             }
@@ -89,6 +100,11 @@ export default {
         hasLeftActions: false
       }
     }
+  },
+  methods: {
+    refreshTable() {
+      this.$refs.list.reloadTable()
+    }
   }
 }
 </script>

From 288afeeb1f72e0d6464c3bbb49eacd0bc14c6b68 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Tue, 7 Feb 2023 11:49:02 +0800
Subject: [PATCH 04/68] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json | 3 ++-
 src/i18n/langs/ja.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ef959f6a1..7b6b50e01 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -819,6 +819,7 @@
     "Weekly": "Weekly"
   },
   "ops": {
+    "RunAgain": "Run again",
     "ManualInput": "Manual input",
     "Execute": "Execute",
     "ID": "ID",
@@ -2025,4 +2026,4 @@
     "PublishStatus": "Publish status",
     "NoPublished": "Unpublished"
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 07e1e0698..365920d36 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -818,6 +818,7 @@
     "Weekly": "週ごと"
   },
   "ops": {
+    "RunAgain": "再実行",
     "ManualInput": "手動入力",
     "Execute": "実行",
     "ID": "ID",
@@ -2016,4 +2017,4 @@
     "PublishStatus": "投稿ステータス",
     "NoPublished": "未発表"
   }
-}
\ No newline at end of file
+}

From 049bc928ce45771b281c9a1e5a04deef192dd1c0 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Tue, 7 Feb 2023 14:18:02 +0800
Subject: [PATCH 05/68] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E5=88=97=E8=A1=A8=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Terminal/Component/TerminalList.vue       | 82 ++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/Terminal/Component/TerminalList.vue b/src/views/settings/Terminal/Component/TerminalList.vue
index 9067023f3..8891de092 100644
--- a/src/views/settings/Terminal/Component/TerminalList.vue
+++ b/src/views/settings/Terminal/Component/TerminalList.vue
@@ -1,19 +1,99 @@
 <template>
   <div>
     <ListTable :table-config="tableConfig" :header-actions="headerActions" />
+    <Dialog
+      :visible.sync="dialogSettings.visible"
+      :destroy-on-close="true"
+      :show-cancel="false"
+      :title="$tc('sessions.terminalUpdateStorage')"
+      :show-confirm="false"
+    >
+      <GenericCreateUpdateForm v-bind="dialogSettings.iFormSetting" />
+    </Dialog>
   </div>
 </template>
 
 <script>
 import ListTable from '@/components/ListTable'
+import { GenericCreateUpdateForm } from '@/layout/components'
+import Dialog from '@/components/Dialog'
+import Select2 from '@/components/FormFields/Select2'
 
 export default {
   components: {
-    ListTable
+    ListTable,
+    Dialog,
+    GenericCreateUpdateForm
   },
   data() {
     const vm = this
     return {
+      dialogSettings: {
+        selectedRows: [],
+        visible: false,
+        iFormSetting: {
+          url: '/api/v1/terminal/terminals/',
+          getUrl: () => '/api/v1/terminal/terminals/',
+          fields: [
+            ['', ['command_storage', 'replay_storage']]
+          ],
+          fieldsMeta: {
+            command_storage: {
+              label: this.$t('sessions.commandStorage'),
+              component: Select2,
+              el: {
+                ajax: {
+                  url: `/api/v1/terminal/command-storages/`
+                },
+                multiple: false
+              }
+            },
+            replay_storage: {
+              label: this.$t('sessions.replayStorage'),
+              component: Select2,
+              el: {
+                ajax: {
+                  url: `/api/v1/terminal/replay-storages/`
+                },
+                multiple: false
+              }
+            }
+          },
+          submitMethod: () => 'post',
+          cleanFormValue: (value) => {
+            const formValue = []
+            let object = {}
+            for (const row of this.dialogSettings.selectedRows) {
+              object = Object.assign({}, value, { id: row.id })
+              formValue.push(object)
+            }
+            return formValue
+          },
+          onSubmit: (validValues) => {
+            const url = '/api/v1/terminal/terminals/'
+            const msg = this.$t('common.updateSuccessMsg')
+            validValues = Object.values(validValues)
+            this.$axios.patch(url, validValues).then((res) => {
+              this.$message.success(msg)
+              this.dialogSettings.visible = false
+            }).catch(error => {
+              this.$emit('submitError', error)
+              const response = error.response
+              const data = response.data
+              if (response.status === 400) {
+                for (const key of Object.keys(data)) {
+                  let value = data[key]
+                  if (value instanceof Array) {
+                    value = value.join(';')
+                  }
+                  this.$refs.form.setFieldError(key, value)
+                }
+              }
+            })
+          },
+          hasSaveContinue: false
+        }
+      },
       tableConfig: {
         url: '/api/v1/terminal/terminals/',
         permissions: {

From 963fc97f6138ce92b5388b3dda67c911cef96757 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Tue, 7 Feb 2023 14:32:10 +0800
Subject: [PATCH 06/68] =?UTF-8?q?fix:=20=E8=B4=A6=E5=8F=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=20=E6=BF=80=E6=B4=BB=20=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetAccount/AssetAccountDetail/Detail.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
index 87738b5d5..f4815e461 100644
--- a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
@@ -32,6 +32,24 @@ export default {
 
     return {
       quickActions: [
+        {
+          title: this.$t('common.Activate'),
+          type: 'switcher',
+          attrs: {
+            model: vm.object.is_active,
+            disabled: !vm.$hasPerm('accounts.change_account')
+          },
+          callbacks: Object.freeze({
+            change: (val) => {
+              this.$axios.patch(
+                `/api/v1/accounts/accounts/${this.object.id}/`,
+                { is_active: val }
+              ).then(res => {
+                this.$message.success(this.$tc('common.updateSuccessMsg'))
+              })
+            }
+          })
+        },
         {
           title: this.$t('assets.Privileged'),
           type: 'switcher',

From 40554eb93ea6cd062c82b1c4da7da4ce4b3b7c1b Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Tue, 7 Feb 2023 14:56:24 +0800
Subject: [PATCH 07/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=AA?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=88=9B=E5=BB=BA=E7=BD=91=E5=85=B3=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=97=B6=EF=BC=8C=E5=88=9B=E5=BB=BA=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9Badd/change=5Fgateway=20dep=20view=5F?=
 =?UTF-8?q?node=20view=5Fplatform?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/RoleInfo.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index fb3837090..418948945 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -99,6 +99,8 @@ export default {
         'assets.view_asset': ['assets.view_node'],
         'assets.commandfilterrule': ['assets.view_commandfilter'],
         'assets.gateway': ['assets.view_domain'],
+        'assets.add_gateway': ['assets.view_domain', 'assets.view_platform', 'assets.view_node'],
+        'assets.change_gateway': ['assets.view_domain', 'assets.view_platform', 'assets.view_node'],
         'assets.add_asset': ['assets.view_platform'],
         'assets.change_asset': ['assets.view_platform'],
         'accounts.view_account': ['assets.view_node'],

From 586f8c2c186469c76108ab7745346aab64701489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 14:57:56 +0800
Subject: [PATCH 08/68] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=B4=A6=E5=8F=B7=E6=97=A0=E6=B3=95=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/AccountList.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/AccountListTable/AccountList.vue b/src/components/AccountListTable/AccountList.vue
index a6051cc19..8e017904e 100644
--- a/src/components/AccountListTable/AccountList.vue
+++ b/src/components/AccountListTable/AccountList.vue
@@ -246,6 +246,13 @@ export default {
         hasCreate: false,
         hasImport: this.hasImport,
         hasExport: this.hasExport && this.$hasPerm('accounts.view_accountsecret'),
+        handleImportClick: ({ selectedRows }) => {
+          this.$eventBus.$emit('showImportDialog', {
+            selectedRows,
+            url: '/api/v1/accounts/accounts/',
+            name: this?.name
+          })
+        },
         exportOptions: {
           url: this.exportUrl,
           mfaVerifyRequired: true

From c383c2cc54042cffabb2e92c12686b08468ffd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 16:40:55 +0800
Subject: [PATCH 09/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E6=A8=A1=E7=89=88=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=A6=E5=8F=B7=EF=BC=8C=E8=B4=A6=E5=8F=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetCreateUpdate/components/AccountTemplateDialog.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
index 4a808da47..51402bc4f 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
@@ -132,9 +132,9 @@ export default {
     handleConfirm() {
       this.iVisible = false
       // 过滤掉添加里还没有id的账号
-      const hasIdAccounts = this.accounts.filter(i => i?.id)
-      const data = _.xorBy(hasIdAccounts, this.accountsSelected, 'id')
-      this.accounts.push(...data)
+      const hasIdAccounts = this.accounts.filter(i => i?.id).map(item => item.id)
+      const newAddAccounts = this.accountsSelected.filter(i => !hasIdAccounts.includes(i.id))
+      this.accounts.push(...newAddAccounts)
       this.$emit('onConfirm', this.accounts)
     },
     handleCancel() {

From 9f0923c9555668255a31f18348b98e21e679a678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 16:56:16 +0800
Subject: [PATCH 10/68] =?UTF-8?q?perf:=20=E8=B5=84=E4=BA=A7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/perms/AssetPermission/AssetPermissionList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index 45df6283d..3160dc14c 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -44,7 +44,7 @@ export default {
           min: ['name', 'actions'],
           default: [
             'name', 'users', 'user_groups', 'assets',
-            'nodes', 'accounts', 'is_valid'
+            'nodes', 'accounts', 'is_valid', 'actions'
           ]
         },
         columnsMeta: {

From 9d7244131f20028583e6b023cff1021e8bed7a80 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Tue, 7 Feb 2023 16:26:19 +0800
Subject: [PATCH 11/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B4=A6=E5=8F=B7=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E6=97=B6=EF=BC=8C=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=BC=E5=87=BA=E5=BC=B9=E7=AA=97=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98(=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=9C=80=E8=A6=81MFA=E8=AE=A4=E8=AF=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/TableAction/ExportDialog.vue | 4 ++++
 src/components/UserConfirmDialog/index.vue            | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/components/ListTable/TableAction/ExportDialog.vue b/src/components/ListTable/TableAction/ExportDialog.vue
index 7e3a77312..356e07b2f 100644
--- a/src/components/ListTable/TableAction/ExportDialog.vue
+++ b/src/components/ListTable/TableAction/ExportDialog.vue
@@ -5,6 +5,7 @@
       :url="url"
       @UserConfirmDone="showExportDialog"
       @UserConfirmCancel="handleExportCancel"
+      @AuthMFAError="handleAuthMFAError"
     />
     <Dialog
       v-if="exportDialogShow"
@@ -218,6 +219,9 @@ export default {
         vm.exportDialogShow = false
         vm.mfaDialogShow = false
       }, 100)
+    },
+    handleAuthMFAError() {
+      this.mfaDialogShow = false
     }
   }
 }
diff --git a/src/components/UserConfirmDialog/index.vue b/src/components/UserConfirmDialog/index.vue
index 5c5c09d0b..ab0ac7bf1 100644
--- a/src/components/UserConfirmDialog/index.vue
+++ b/src/components/UserConfirmDialog/index.vue
@@ -165,6 +165,8 @@ export default {
         }
         this.title = this.$t('common.CurrentUserVerify')
         this.visible = true
+      }).catch(() => {
+        this.$emit('AuthMFAError', true)
       })
     })
   },

From 70da1a3a5bfff66267b8c69ab97b843597c9ffcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 19:04:46 +0800
Subject: [PATCH 12/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E7=AC=AC=E4=B8=80=E6=AC=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81mfa=E5=90=8E=E5=AF=BC=E5=87=BA=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ListTable/TableAction/ExportDialog.vue        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/ListTable/TableAction/ExportDialog.vue b/src/components/ListTable/TableAction/ExportDialog.vue
index 356e07b2f..90147d032 100644
--- a/src/components/ListTable/TableAction/ExportDialog.vue
+++ b/src/components/ListTable/TableAction/ExportDialog.vue
@@ -1,12 +1,13 @@
 <template>
   <div>
-    <UserConfirmDialog
-      v-if="mfaDialogShow"
-      :url="url"
-      @UserConfirmDone="showExportDialog"
-      @UserConfirmCancel="handleExportCancel"
-      @AuthMFAError="handleAuthMFAError"
-    />
+    <div v-if="mfaDialogShow">
+      <UserConfirmDialog
+        :url="url"
+        @UserConfirmDone="showExportDialog"
+        @UserConfirmCancel="handleExportCancel"
+        @AuthMFAError="handleAuthMFAError"
+      />
+    </div>
     <Dialog
       v-if="exportDialogShow"
       :title="$tc('common.Export')"

From 6e060c9038aa9cdd07a974246fb2eb71e75896a8 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Tue, 7 Feb 2023 19:17:02 +0800
Subject: [PATCH 13/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BB=BB=E5=8A=A1=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
index 7cec763c9..ab116dd92 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
@@ -54,8 +54,8 @@ export default {
             formatter: DateFormatter
           },
           {
-            prop: 'id',
-            label: this.$t('common.Action'),
+            prop: 'actions',
+            label: this.$t('common.Actions'),
             align: 'center',
             formatter: ActionsFormatter,
             formatterArgs: {

From 1f5a8f76948d1ff203e8c8c905123254c2aaa67c Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Tue, 7 Feb 2023 19:38:52 +0800
Subject: [PATCH 14/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BB=BB=E5=8A=A1=E5=AE=9E=E4=BE=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
index ff5314b56..c31b219d9 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
@@ -58,6 +58,10 @@ export default {
             prop: 'date_sync',
             label: this.$t('xpack.Cloud.DateSync'),
             formatter: DateFormatter
+          },
+          {
+            prop: 'actions',
+            has: false
           }
         ]
       }

From 30369de1f5899c7106aba6b9e513aa15e4a8ff67 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Tue, 7 Feb 2023 19:42:31 +0800
Subject: [PATCH 15/68] perf: gather account

---
 src/components/TreeTable/index.vue            |   8 +-
 src/router/console/accounts.js                |   2 +-
 .../AccountGather/AccountGatherList.vue       | 107 ++++++++++++++++++
 src/views/accounts/AccountGather/index.vue    |   6 +
 4 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 src/views/accounts/AccountGather/AccountGatherList.vue

diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 2f9a8f295..aeb9791cc 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -50,13 +50,13 @@
 </template>
 
 <script>
-import AutoDataZTree from '../AutoDataZTree'
-import TabTree from '../TabTree'
 import Dialog from '@/components/Dialog'
-import ListTable from '../ListTable'
-import IBox from '../IBox'
 import { setUrlParam } from '@/utils/common'
+import ListTable from '@/components/ListTable/index'
 import FileTree from '@/components/TreeTable/components/FileTree.vue'
+import IBox from '../IBox'
+import TabTree from '../TabTree'
+import AutoDataZTree from '../AutoDataZTree'
 
 export default {
   name: 'TreeTable',
diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js
index e9902093f..feb27701c 100644
--- a/src/router/console/accounts.js
+++ b/src/router/console/accounts.js
@@ -166,7 +166,7 @@ export default [
         name: 'AccountGatherList',
         meta: {
           title: i18n.t('accounts.AccountGather.AccountGatherTaskList'),
-          permissions: ['accounts.view_gatheraccountsautomation']
+          permissions: ['accounts.view_gatheredaccount']
         }
       },
       {
diff --git a/src/views/accounts/AccountGather/AccountGatherList.vue b/src/views/accounts/AccountGather/AccountGatherList.vue
new file mode 100644
index 000000000..8cb071c34
--- /dev/null
+++ b/src/views/accounts/AccountGather/AccountGatherList.vue
@@ -0,0 +1,107 @@
+<template>
+  <TreeTable :table-config="tableConfig" :tree-setting="treeSetting" :header-actions="headerActions" />
+</template>
+
+<script>
+import TreeTable from '@/components/TreeTable'
+import { toSafeLocalDateStr } from '@/utils/common'
+import { ActionsFormatter } from '@/components/TableFormatters'
+
+export default {
+  components: {
+    TreeTable
+  },
+  data() {
+    const vm = this
+    return {
+      treeSetting: {
+        showMenu: false,
+        showRefresh: true,
+        showAssets: true,
+        url: '/api/v1/accounts/gathered-accounts/',
+        nodeUrl: '/api/v1/assets/nodes/',
+        // ?assets=0不显示资产. =1显示资产
+        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1'
+      },
+      tableConfig: {
+        url: '/api/v1/accounts/gathered-accounts/',
+        hasTree: true,
+        columns: [
+          'asset', 'username', 'date_last_login', 'present', 'address_last_login', 'date_updated'
+        ],
+        columnsMeta: {
+          asset: {
+            label: vm.$t('assets.Asset'),
+            formatter: function(row) {
+              const to = {
+                name: 'AssetDetail',
+                params: { id: row.asset.id }
+              }
+              if (vm.$hasPerm('assets.view_asset')) {
+                return <router-link to={to}>{row.asset.name}</router-link>
+              } else {
+                return <span>{row.asset.name}</span>
+              }
+            }
+          },
+          username: {
+            showOverflowTooltip: true
+          },
+          present: {
+            width: 80
+          },
+          address_last_login: {
+            width: 120
+          },
+          date_updated: {
+            formatter: function(row, col, cell) {
+              return toSafeLocalDateStr(row.date_updated)
+            }
+          },
+          actions: {
+            formatter: ActionsFormatter,
+            formatterArgs: {
+              hasClone: false,
+              hasUpdate: false, // can set function(row, value)
+              hasDelete: false, // can set function(row, value)
+              moreActionsTitle: this.$t('common.More'),
+              extraActions: [
+                {
+                  name: 'View',
+                  title: this.$t('common.Sync'),
+                  can: this.$hasPerm('accounts.add_gatheredaccount'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    console.log('row', row.id)
+                    this.$axios.post(
+                      `/api/v1/accounts/gathered-accounts/${row.id}/sync/`,
+                    ).then(res => {
+                      this.$message.success(this.$tc('common.updateSuccessMsg'))
+                    }).catch(res => {
+                    })
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasLeftActions: false,
+        hasCreate: false,
+        hasImport: false,
+        hasExport: false,
+        searchConfig: {
+          exclude: ['asset'],
+          options: [
+          ]
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/accounts/AccountGather/index.vue b/src/views/accounts/AccountGather/index.vue
index 6bc4791c1..869ba2add 100644
--- a/src/views/accounts/AccountGather/index.vue
+++ b/src/views/accounts/AccountGather/index.vue
@@ -16,6 +16,12 @@ export default {
         submenu: [
           {
             title: this.$t('accounts.AccountGather.AccountGatherTaskList'),
+            name: 'AccountGatherList',
+            hidden: !this.$hasPerm('accounts.view_gatheredaccount'),
+            component: () => import('@/views/accounts/AccountGather/AccountGatherList.vue')
+          },
+          {
+            title: this.$t('accounts.AccountGather.AccountGatherList'),
             name: 'AccountGatherTaskList',
             hidden: !this.$hasPerm('accounts.view_gatheraccountsautomation'),
             component: () => import('@/views/accounts/AccountGather/AccountGatherTaskList.vue')

From b0b2954311bdbbc492223e7fa4e4fee76481a3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 7 Feb 2023 19:55:52 +0800
Subject: [PATCH 16/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=91?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=9B=E5=BB=BA=E5=AE=9E=E4=BE=8B=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=B2=A1=E6=9C=89=E5=8D=8F=E8=AE=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormFields/ProtocolSelector/index.vue | 4 ++--
 src/views/assets/Cloud/index.vue                     | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/FormFields/ProtocolSelector/index.vue b/src/components/FormFields/ProtocolSelector/index.vue
index c5f5504f2..29685369c 100644
--- a/src/components/FormFields/ProtocolSelector/index.vue
+++ b/src/components/FormFields/ProtocolSelector/index.vue
@@ -56,7 +56,7 @@ export default {
   },
   props: {
     value: {
-      type: [Array],
+      type: [String, Array],
       default: () => []
     },
     title: {
@@ -147,7 +147,7 @@ export default {
       item.port = selected.port
     },
     setDefaultItems(choices) {
-      if (this.value.length > 0) {
+      if (this.value instanceof Array && this.value.length > 0) {
         const protocols = []
         this.value.forEach(item => {
           // 有默认值的情况下，设置为只读或者有id、有setting是平台
diff --git a/src/views/assets/Cloud/index.vue b/src/views/assets/Cloud/index.vue
index 61c25fbdb..f8d122096 100644
--- a/src/views/assets/Cloud/index.vue
+++ b/src/views/assets/Cloud/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu" />
+  <TabPage :active-menu.sync="config.activeMenu" v-bind="config" />
 </template>
 
 <script>
@@ -27,7 +27,10 @@ export default {
             hidden: () => !this.$hasPerm('xpack.view_account'),
             component: () => import('@/views/assets/Cloud/Account/AccountList.vue')
           }
-        ]
+        ],
+        actions: {
+          deleteSuccessRoute: 'AssetList'
+        }
       }
     }
   }

From 241eef173f4f84cc5c43b3c685d6949e0bf38369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 10:59:13 +0800
Subject: [PATCH 17/68] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E7=BD=91?=
 =?UTF-8?q?=E5=9F=9F=E6=97=B6=E5=AF=B9=E9=80=89=E6=8B=A9=E7=9A=84=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetTreeTable/index.vue        | 2 ++
 src/views/assets/Domain/DomainCreateUpdate.vue | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/components/AssetTreeTable/index.vue b/src/components/AssetTreeTable/index.vue
index 508a6066a..73c2f6f6d 100644
--- a/src/components/AssetTreeTable/index.vue
+++ b/src/components/AssetTreeTable/index.vue
@@ -161,6 +161,8 @@ export default {
       } else if (treeNode.meta.type === 'platform') {
         url = setUrlParam(url, 'platform', treeNode.id)
       }
+      const query = this.setTreeUrlQuery()
+      url = query ? `${url}&${query}` : url
       this.$set(this.tableConfig, 'url', url)
       setRouterQuery(this, url)
     }
diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue
index 73ae66649..9848a3aa4 100644
--- a/src/views/assets/Domain/DomainCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainCreateUpdate.vue
@@ -27,6 +27,9 @@ export default {
             baseUrl: '/api/v1/assets/assets/?domain_enabled=true',
             treeUrlQuery: {
               domain_enabled: true
+            },
+            canSelect: (row) => {
+              return row.platform?.name !== 'Gateway'
             }
           }
         }

From 4b57c78c8ef8b4ebd9dc17c6ad836887ad54bdbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 11:40:08 +0800
Subject: [PATCH 18/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BA=91=E5=90=8C=E6=AD=A5-=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue | 11 +++++++++--
 .../SyncInstanceTaskDetail/detail.vue                 |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
index 27ac23d85..7b4d3287b 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
@@ -123,9 +123,16 @@ export default {
         return formValue
       },
       cleanFormValue(value) {
-        if (!Array.isArray(value.ip_network_segment_group)) {
-          value.ip_network_segment_group = value.ip_network_segment_group ? value.ip_network_segment_group.split(',') : []
+        let protocols = ''
+        const ipNetworkSegments = value.ip_network_segment_group
+        if (!Array.isArray(ipNetworkSegments)) {
+          value.ip_network_segment_group = ipNetworkSegments ? ipNetworkSegments.split(',') : []
         }
+        if (value.protocols.length > 0) {
+          protocols = value.protocols.map(i => (i.name + '/' + i.port)).join(' ')
+        }
+        value.protocols = protocols
+
         return value
       },
       onPerformError(error, method, vm) {
diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
index d2f268175..4a50d77c3 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
@@ -64,7 +64,7 @@ export default {
           key: this.$t('assets.Protocols'),
           value: this.object.protocols,
           formatter: (item, val) => {
-            return <div>{val.map((v) => <el-tag size='small'>{v['name']}/{v['port']}</el-tag>)}</div>
+            return <div>{val?.map((v) => <el-tag size='small'>{v['name']}/{v['port']}</el-tag>)}</div>
           }
         },
         {
@@ -85,7 +85,7 @@ export default {
           value: this.object.regions,
           formatter(row, value) {
             return (<div>{
-              value.map((content) => {
+              value?.map((content) => {
                 return <div>{ content }</div>
               })}
             </div>)

From b0731d4fbd26e9dcfb4c54f4d974b838bdef022b Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 8 Feb 2023 13:23:42 +0800
Subject: [PATCH 19/68] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9interface?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A0=87=E9=A2=98=E5=92=8Clogo=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json | 4 ++--
 src/i18n/langs/ja.json | 4 ++--
 src/i18n/langs/zh.json | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 7b6b50e01..ce499bfd8 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1997,13 +1997,13 @@
     "favicon": "Website icon",
     "faviconTip": "Tips: website icon. (suggest image size: 16px*16px)",
     "loginImage": "Image of login page",
-    "loginImageTip": "Tips: This will be displayed on the enterprise user login page. (suggest image size: 492px*472px)",
+    "loginImageTip": "Tips: It will be displayed on the enterprise version user login page (recommended image size: 492*472px)",
     "loginTitle": "Title of login page",
     "loginTitleTip": "Tips: This will be displayed on the enterprise user login page. (eg: Welcome to the JumpServer open source fortress)",
     "logoIndex": "Logo (It contains text)",
     "logoIndexTip": "Tips: This will appear at the top left of the administration page. (suggest image size: 185px*55px)",
     "logoLogout": "Logo (It contains no text)",
-    "logoLogoutTip": "Tips: This will be displayed on the enterprise user logout page. (suggest image size: 82px*82px)",
+    "logoLogoutTip": "Tips: It will be displayed on the web terminal page of enterprise users (recommended image size: 82px*82px)",
     "restoreDialogMessage": "This will restore default Settings of the interface !!!",
     "restoreDialogTitle": "Are you sure?",
     "technologyConsult": "Technology Consult",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 365920d36..3a273f1ab 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -1992,13 +1992,13 @@
     "favicon": "Webサイトのアイコン",
     "faviconTip": "ヒント: webサイトのアイコン (推奨画像サイズ: 16px * 16px)",
     "loginImage": "ログインページの画像",
-    "loginImageTip": "ヒント: 企業版ユーザーのログインページに表示されます (推奨画像サイズ: 492 * 472px)",
+    "loginImageTip": "ヒント: エンタープライズ版のユーザーログインページに表示されます (推奨画像サイズ: 492*472px)",
     "loginTitle": "ログインページのタイトル",
     "loginTitleTip": "ヒント: 企業版ユーザーログインページに表示されます",
     "logoIndex": "ロゴ (文字付き)",
     "logoIndexTip": "ヒント: 管理ページの左上に表示されます (推奨画像サイズ: 185px * 55px)",
     "logoLogout": "ロゴ (文字なし)",
-    "logoLogoutTip": "ヒント: 企業版ユーザーの終了ページに表示されます (推奨画像サイズ: 82px * 82px)",
+    "logoLogoutTip": "ヒント: エンタープライズ ユーザーの Web 端末ページに表示されます (推奨画像サイズ: 82px*82px)",
     "restoreDialogMessage": "本当にデフォルトの初期化を再開しますか?",
     "restoreDialogTitle": "確認しますか",
     "technologyConsult": "技術コンサルティング",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 51462ce46..6de9a4c6c 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1906,11 +1906,11 @@
     "loginImage": "登录页面图片",
     "loginImageTip": "提示：将会显示在企业版用户登录页面（建议图片大小为: 492*472px）",
     "loginTitle": "登录页面标题",
-    "loginTitleTip": "提示：将会显示在企业版用户登录页面（eg: 欢迎使用JumpServer开源堡垒机)",
+    "loginTitleTip": "提示：将会显示在企业版用户 SSH 登录 KoKo 登录页面（eg: 欢迎使用JumpServer开源堡垒机)",
     "logoIndex": "Logo (带文字)",
     "logoIndexTip": "提示：将会显示在管理页面左上方（建议图片大小为: 185px*55px）",
     "logoLogout": "Logo (不带文字)",
-    "logoLogoutTip": "提示：将会显示在企业版用户退出页面（建议图片大小为：82px*82px）",
+    "logoLogoutTip": "提示：将会显示在企业版用户的 Web 终端页面（建议图片大小为：82px*82px）",
     "restoreDialogMessage": "您确定要恢复默认初始化吗？",
     "restoreDialogTitle": "你确认吗",
     "technologyConsult": "技术咨询",

From 8d3a3587d1239481b1bdcbcd06bf6c6f89882d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 13:58:29 +0800
Subject: [PATCH 20/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96ip=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataForm/rules/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DataForm/rules/index.js b/src/components/DataForm/rules/index.js
index 6bb9d2a93..f98cc6a75 100644
--- a/src/components/DataForm/rules/index.js
+++ b/src/components/DataForm/rules/index.js
@@ -18,7 +18,7 @@ export const IpCheck = {
   required: true,
   validator: (rule, value, callback) => {
     value = value?.trim()
-    if (/^[\w://.?]+$/.test(value)) {
+    if (/^[\w://.?-]+$/.test(value)) {
       callback()
     } else {
       callback(new Error(i18n.t('common.FormatError')))

From 5b3dc2bc48c3b0c75d528d5e3b9c7b84a2857a60 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 8 Feb 2023 15:20:41 +0800
Subject: [PATCH 21/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20connection=20?=
 =?UTF-8?q?token=20=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=20actions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/profile/ConnectionToken.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/profile/ConnectionToken.vue b/src/views/profile/ConnectionToken.vue
index 02b31038a..337f82bff 100644
--- a/src/views/profile/ConnectionToken.vue
+++ b/src/views/profile/ConnectionToken.vue
@@ -22,7 +22,6 @@ export default {
       helpMessage: this.$t('setting.helpText.ConnectionTokenList'),
       tableConfig: {
         url: ajaxUrl,
-        columnsExclude: ['actions'],
         columnsExtra: ['action'],
         columnsShow: {
           min: ['id', 'actions'],
@@ -38,7 +37,9 @@ export default {
           action: {
             label: this.$t('common.Action'),
             formatter: function(row) {
-              return row.actions.map(item => { return item.label }).join(', ')
+              return row.actions.map(item => {
+                return item.label
+              }).join(', ')
             }
           },
           actions: {
@@ -51,7 +52,7 @@ export default {
                   name: 'Expired',
                   title: this.$t('setting.Expire'),
                   type: 'info',
-                  can: ({ row }) => row['is_valid'],
+                  can: ({ row }) => !row['is_expired'],
                   callback: function({ row }) {
                     this.$axios.patch(`${ajaxUrl}${row.id}/expire/`,
                     ).then(res => {

From 58e8145f0ea644462eecde723bc1753ea8bd2855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 16:25:26 +0800
Subject: [PATCH 22/68] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/logo_text_green.png        | Bin 0 -> 3703 bytes
 src/i18n/langs/en.json                    |   2 +
 src/i18n/langs/ja.json                    |   2 +
 src/i18n/langs/zh.json                    |   2 +
 src/layout/components/NavHeader/About.vue | 114 ++++++++++++++++++++++
 src/layout/components/NavHeader/Help.vue  |  39 ++++----
 6 files changed, 142 insertions(+), 17 deletions(-)
 create mode 100644 src/assets/img/logo_text_green.png
 create mode 100644 src/layout/components/NavHeader/About.vue

diff --git a/src/assets/img/logo_text_green.png b/src/assets/img/logo_text_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7ae3fb42a9ab306869daa5473f9e004e4e591c
GIT binary patch
literal 3703
zcmV--4v6uIP)<h;3K|Lk000e1NJLTq007GX001Zm1^@s6P%91}00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH4h%^|K~#7F?Ookc
z+twCddrQ#FxjF6=)ZC>cGj*OI&Jz@#0J!XgByih8F#|ofKxpS&;ygj%3F16KoGGEX
ztNR3XC!~{NN&BpCYfEg&k}PA|gA;u-G`1}5|Fzdz-&$K0G$9&Ct(tf4HIxz!Mbtlg
zywj!%6+S`;ngH`pH<ulu`aeI~J;wLDha1g+=*g_>u6Ms_^{7IHj|f*1mc~!5h8K9X
zbI<Me)?5Ab?+_vqs?I{wu7sw-$AYnhrSacZeK7DBeBU{KyB-R`ZPq3Z(H4=aDJ2gg
zGwk+WtM0nqa==n^_Go9DDpZ(qloA&BCH}eBgimt%Xt#rFmqJ3#WQn4u0@}8PMzYY5
z61~cwsW8nLDJ*Hf1SZ%Z@b)MzBq^|99oxRk{9daeTyIawVEydjf4Wqm!jvIbSRfP^
zzTfzhO)mH)&@O{_{uWzRYcy63qCMj{+p*A8{!E1_#gMSTypl@P1K;VuFM*I;ocm8C
zsWsLXHM$}ciPo&^JcEEV_Ly#Vy*2nV(KV`2;f5m?7A+L-`~@jgFY-$Orh{85^i7JP
zh*>eQ4ZnuJZ3)&M!?pc0{tWukT^VNSDpZ&RB2P$c=tb@LFERx{mm+%a2hKg4Muw0D
zN-UKX8prjHe4_2QIc>-T%sQ@PiG{T;1l6?m6V!RLy8D1WaolG1l02`@J7P_!pcV+(
z!*wZx{_MYId)0<A9>kren``fVr;UaF<>AJH<e(yc;E4RQ^lo3MWm3KgV1%H>AD42T
z=}D#5t)ONrkiqdd1OT_WEz{+H!om^}Ff1UAQD(E^IXhe3S)mH0AbD5Tfko`lyy%`&
z$Z|FL`q7;qH;)ioiEd`i)ABucjz2ydDoLs3f$zW24!i+;o;QznmkXY$bHx8SBLC(}
zM+WlBeo<U(p#Gpw5O;q3eu)L;6@P4&@-KtnbE;4pvhY_3fam=>f4CWIlSlwq^Q`b+
zFLi%C6taz1wva{7@NV~D=otoUlj}7Hr2L&eG3fDDL3^BMgb-g)h0=(H1twRf01&Ji
z)nYC4tF1L~KQm@9buu&tHPS)`z$fD8=InZu6f0HSWpeO%w`g1lF|ii^l#tLY5P(_V
zxkouBQ`$7M&8$Kp`{~<8x*iD4d(Zv+>|qtvzb1U0zQCr~f$zF=JVzq>!<Z}S-ou8)
zb6Pq0W57*c=!T5eGCSw3Oa?48&6Zhf#Bq~bx3IIRm;7ses0Ij`lCM~3h6sSHB+Q!z
zu!SE!B<=sVrVn77gy-p_3AbFgXZH=y{dMj&!9qpXz(!@Ued#)QJo{j(>@t*){m)#t
zn-!Bn+-g8xT1)iL9_<bVkj<EP&0m|!_McfbuxO*KfZLY&9rc6$VW15%xTpp2e|cWs
zj)>!xZL@%L4f7~6vC<3}*fL%WPx2^W{%=PpwJ?%-f#&g@#k2KRJlIiIfbTm8&{C13
ze>w(zoW+LOEYF?8jTfMmIsS<_P+x_MXwkl(?`iWtUua5Osoxx4ND)If|MXj?rsa{{
zXQil}8Kf0r|IO;o`rX6tnNbW{nPY<Ig}-Pox^x}T2qJuTDdTxvhkePgj=!ev?9Z^q
z?_P03iYfW*w5CoLTRPMZ?yIlV3eV31TN(FxVrrO&K+&_${F(M3yf-mMfl%wetp2c{
z(Uv3onhIlcbBX)d?B}((%qC5JsKps<Z3LcwWqs{)2xBqbW)7;KT$*7bG_&RpH=f(h
z`J2Z(`}w{J3lKN1P*6Bn$rHc*C!2S+pkM&Ja~`a5(`T*%J$M49V3XUjkZ}hb-6s0N
zzi$O1q|Y+}P08kEW}lT>V}bu&QLvvoCU`!OFQ5%5x4F9hrJU#2SWEBOmu`iD;52H3
z8UK~-XO_iXEV^)UHgj%ihHGWBI9Sbn<&Eb>*dHE$GY>+_uOP%KV@*jVzRoCVXwHPB
zj{O~*BIYGiP{OuovI>kL6{D8bW`4dg#D-xpMb3FNp@j@s5m=hv`|cbl=g8!OAnK0s
zU{8`hb5l{WPqn{h2Fr9+u)ts!kG>l1(aE?^Z-5YB_?i$LX!D|?agV~HD*-G{i}o)M
z6;k`W_>MDvZ4A{T>8qh@O2vY9Hx$|?m8v_~FWRVb!3=9Ib&P>X?@SQ^zyftZMc|+y
zXks=OR$?LHNrC`E5UFg(ZZeSGBd8aq`Q!lOAn7=p{E%PKC<yi|q-bY8KQl<|woJ0*
zZe&`3p*2}>2It=I>G)Zq+|cw&fEURkhyqOtq_kM6RH$L-GK{&M9>1C`fb$$=)fS9h
zC->7f)s>*-^zS-M!9)hEnsoUWt~b6l!{)g=;s&IUAa3$x#&H*6@0nc;=EiZL#8JYR
z!NQSh`%TK`L}tL?z0XnQoOGEf0~XIa-|h4svlGs{)P>`}O8azR2;&2Cp)HSKVZ5W+
zV<Du2#hj=ElYP1xE(q<wr|kQ*u%Rxl=Rsk{L<EbZ$vBwTNHwJM^XhJ-0orV)H;kDW
zp-DwmvG(BcI><X!i;XueaK2DzLnr*=H-^%Eg*u5oY7MKrdZJDl9GtHH&@o@Tynb~$
zlvO88y%vqx=2%z)&uugNm7U9F;wHQ!?X#0~0HHCGJ%?R@*_t}DHNA763x9lBxIS6w
zd7<r_S`4OKI8N))qM8;AtU>ICX+keWiV3v)gwH%-eeQ3j`e#z1R&=lkb+G9Qf3I0^
zTU2MnWHzOvzE(azBeLr?X4K0Rp;AjVjxB<X*5xz9CJ`2F?i@;Sa{6$mL;1jO31KmQ
zOSIt*`769u_o)CviTm7Us~;F$YyFLiFXgm378cXlIb(KZXAQHhJn;Pmz9&wCJk6m(
z!E&*n<f=O`K7aadYZ~a|X@i-|w)xX965;V)rVNb}2!U&z{L%z8NrV0-VEyn$(4pi;
z5Z9;umE=C#9ksa{66aFLvNq}~AQl$Tr)=wWj1aVQlO|)+Y;%jX%!71n0cT&B<yy<z
z&7juRz+DG3W}N-!uq#i;%r?GOfbqDV@w|~RW82|5?WN~b+yMWP+wf8)+oAoIK)QWa
zBX#>;UZV%}e}e6^d|@K=TP72@#p<=4YXh^;XwwY4LKvUG`@=xZ*0R<eoGzs~^xfmg
z+4n-t1EJccD?)~}Z-o-@*wp6v9Lpis&azXad2*@i(s0?V8l>6<zeV_dKkcvJP~xca
zSdqLIj(C-S!`0gBX4IrJfy0P9aS&&Bd48|8PmcdQ=RAw{M^aW{0?-`qeP<sg7fxcb
zvws8!chb$=_(V+_?!#}FAH^TsZkjgm<`X-)rk}Z{kRcfsW@nsE(Wz7TF&Q<b@5e&2
ztb*Y6n}<KF(BBB-lXb|_F7R7;){@!dY?YMqZ*fH9;m-Js*9hdZVPVRB^UJ5-9h^OG
z!J#VlXR^SJ_6P2YKAvn$F3NNEOTe%~&%^c+7EnF&MvFpaZPrga&)lcAUmk~yo%XNJ
zy_*;B5n_)`ku4soK5JmKFYS288-iJEM?4-dr#n2luL+A@1wCC9G25nXe~xYsSJX>>
z)pYo!&mhEo%w1-h&2^qg72<^3*R+dgf2D8lz$y?!K}=1a9Bw289Fh0DHcx_BSTc8D
z)-sYOjkU~^Fhygh&8Arg?*l91*P*(lP%EH5t@uidCWPne-L<K|6wpVus^;5z>ECsq
zo^ELRlLe(tHx%a7XQo+8GB{3r4;Oiz!YqYmcuiiGl(Rpv$$gS2M$w5%I`p;B-2SeM
zbRkn*9sgkLcmw;qdkrMb%)n_IQ!HBapwpA7F!?4}iYXM0tTyYDv_kYb{x?TgfV3I{
zwe>9Xt}sOd$&g1#n#?@}rUP|q9XUHuz8O+lL|#PL1TV`v_o75}T;XW4rK)8f(*vhI
zFE!$Z15DyjLZceq6h@ZAn_83u7r_l_*^I?6qK&F)kDb}TCWcObQQ{@#wpE?vnP4K<
z=S{ZR1ZV44ir_P(%Zvk<hf(SFrp57LFbGX_KZ0~v^hj+%KoWjQQA!KSXTN9>M}H$h
z!EsppTO>G4bJnQ{5L6aq`;sZIOH&3DEq|t?_|O_AnvZeL$|mOV{B6wgdnV^E0ljFY
z`=D%ElL;VR3)mVdh@Z&gyk9WKX1q$_ssiqIABM?|cnRJt(v!a#9dFU8FuuPW##>r#
zGNz6ZlKea!BvlGJh@5>~ir#kl;R5{mZt<e#6~U^amuL$XQ9!T3^yKY4EY$aSL)Z`4
zX^i{B3ov?CH%-v}xS1-vRu+Ox>PrDspk51U`BEe5h$wt22?zH|`nQ6K6zH8lkGk)|
z)UxMbsBT^p$OZr*Af#I2@)|?snelUj%RYe>^Hq>ow1bP;4wZzCx%{-*&iZZk!Z|K_
z7UKmMLAu_Wz+9%sKxda=o<t`gKhbYlvdsz0ACXvS4En%A1Li7xU$IWnryO9Rs89%M
zg-L{#vmaeT8jNGT682LCBIF|F1LB|-O^7<18$6#i8Bi_Yh4Qv~KifpeoRIXnl96v|
zDM0M(TLJ+MG{b`R&T~6e1pn_7mI~L4OzId58%|KlG=tgIp|aGmNvdS~I<`Y2lZ*YF
z-p}i;4ppcyMHsnzY13?$&8rKFGLC6fyhZ1IdC9!5ypxy}D$O!2C_N!rrWyR1l+zsN
zeMQezCf8_G!ZIBgYeHa}ec*);5+L#BNsg9&U{b&qhOGamONDIcGv-nsx(Xxp%xG1@
z@{s^q1x!}n@0k3noc*p);U;6E-D}7+t4yv6A2B9Y_4*C_AOL*7QS>JM3Kgau{{xRV
VqsU~eY54#E002ovPDHLkV1mwYG1veA

literal 0
HcmV?d00001

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ce499bfd8..35c364deb 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -430,6 +430,8 @@
     "ReLoginErr": "Login time has exceeded 5 minutes, please login again"
   },
   "common": {
+    "About": "About",
+    "PermissionCompany": "Permission company",
     "ApproverNumbers": "Approver numbers",
     "Overview": "Overview",
     "Now": "Now",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 3a273f1ab..ad1a36c00 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -430,6 +430,8 @@
     "ReLoginErr": "ログイン時間が 5 分を超えました。もう一度ログインしてください"
   },
   "common": {
+    "About": "について",
+    "PermissionCompany": "授权公司",
     "ApproverNumbers": "承認者数",
     "Overview": "概要",
     "Now": "今",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 6de9a4c6c..058e6d3d9 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -426,6 +426,8 @@
     "ReLoginErr": "登录时长已超过 5 分钟，请重新登录"
   },
   "common": {
+    "About": "关于",
+    "PermissionCompany": "授权公司",
     "Filename": "文件名",
     "ApproverNumbers": "审批人数量",
     "Overview": "概览",
diff --git a/src/layout/components/NavHeader/About.vue b/src/layout/components/NavHeader/About.vue
new file mode 100644
index 000000000..a5806271a
--- /dev/null
+++ b/src/layout/components/NavHeader/About.vue
@@ -0,0 +1,114 @@
+<template>
+  <Dialog
+    v-if="iVisible"
+    :title="''"
+    class="about-dialog"
+    :visible.sync="iVisible"
+    width="50%"
+    top="10%"
+    :close-on-click-modal="false"
+    :show-cancel="false"
+    :show-confirm="false"
+  >
+    <div class="box">
+      <div class="head">
+        <img :src="logoTextSrc" class="sidebar-logo-text" alt="logo">
+      </div>
+      <div class="text">{{ $tc('ops.version') }}：<strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv3. </span></div>
+      <div class="text">{{ $tc('common.PermissionCompany') }}：{{ corporation }}</div>
+      <div class="text">
+        <span @click="onClick('github')">
+          <i class="fa fa-github icon" />github
+        </span>
+      </div>
+      <div class="text">
+        <span @click="onClick('download')">
+          <i class="fa fa-download icon" />{{ $tc('common.Download') }}
+        </span>
+      </div>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog'
+import { mapGetters } from 'vuex'
+
+export default {
+  components: {
+    Dialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      logoTextSrc: require('@/assets/img/logo_text_green.png')
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'publicSettings'
+    ]),
+    iVisible: {
+      set(val) {
+        this.$emit('update:visible', val)
+      },
+      get() {
+        return this.visible
+      }
+    },
+    corporation() {
+      return this.publicSettings.XPACK_LICENSE_INFO.corporation
+    }
+  },
+  methods: {
+    onClick(type) {
+      switch (type) {
+        case 'download':
+          window.open('/core/download/', '_blank')
+          break
+        case 'github':
+          window.open('https://github.com/jumpserver/jumpserver', '_blank')
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.about-dialog {
+  &>>> .el-dialog__header {
+    background-color: #FAFBFD;
+    border-bottom: none;
+  }
+  &>>> .el-dialog__body {
+    background-color: #FAFBFD;
+    padding: 10px 30px 20px;
+  }
+  &>>> .el-dialog__footer {
+    padding: 0;
+  }
+}
+.head {
+  text-align: center;
+}
+.box {
+  .text {
+    margin-bottom: 10px;
+    font-size: 14px;
+    color: #666;
+    .icon {
+      margin-right: 4px;
+    }
+    span {
+      color: var(--color-info);
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/src/layout/components/NavHeader/Help.vue b/src/layout/components/NavHeader/Help.vue
index d0cab80f0..4f670f98e 100644
--- a/src/layout/components/NavHeader/Help.vue
+++ b/src/layout/components/NavHeader/Help.vue
@@ -1,23 +1,31 @@
 <template>
-  <el-dropdown :show-timeout="50" @command="handleCommand">
-    <span class="el-dropdown-link" style="vertical-align: middle;">
-      <svg-icon icon-class="question-mark" style="font-size: 16px;" />
-    </span>
-    <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item command="docs">{{ $t('common.nav.Docs') }}</el-dropdown-item>
-      <el-dropdown-item command="support">{{ $t('common.nav.Support') }}</el-dropdown-item>
-      <el-dropdown-item command="toolsDownload">{{ $t('common.nav.Download') }}</el-dropdown-item>
-      <el-dropdown-item v-if="!hasLicence" command="enterprise">{{ $t('common.nav.EnterpriseEdition') }}</el-dropdown-item>
-      <el-dropdown-item command="github">GITHUB</el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
+  <div>
+    <el-dropdown :show-timeout="50" @command="handleCommand">
+      <span class="el-dropdown-link" style="vertical-align: middle;">
+        <svg-icon icon-class="question-mark" style="font-size: 16px;" />
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="docs">{{ $t('common.nav.Docs') }}</el-dropdown-item>
+        <el-dropdown-item command="support">{{ $t('common.nav.Support') }}</el-dropdown-item>
+        <el-dropdown-item v-if="!hasLicence" command="enterprise">{{ $t('common.nav.EnterpriseEdition') }}</el-dropdown-item>
+        <el-dropdown-item command="about">{{ $tc('common.About') }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <About :visible.sync="visible" />
+  </div>
 </template>
 
 <script>
+import About from './About.vue'
+
 export default {
   name: 'Help',
+  components: {
+    About
+  },
   data() {
     return {
+      visible: false,
       URLSite: {
         HELP_DOCUMENT_URL: '',
         HELP_SUPPORT_URL: ''
@@ -45,11 +53,8 @@ export default {
         case 'enterprise':
           window.open('https://jumpserver.org/enterprise.html', '_blank')
           break
-        case 'toolsDownload':
-          window.open('/core/download/', '_blank')
-          break
-        case 'github':
-          window.open('https://github.com/jumpserver/jumpserver', '_blank')
+        case 'about':
+          this.visible = true
           break
         default:
           window.open(this.URLSite.HELP_DOCUMENT_URL, '_blank')

From 1040cca2677c657193ab0a9af1b8df8cadb60009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 16:48:19 +0800
Subject: [PATCH 23/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/dialog.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AssetSelect/dialog.vue b/src/components/AssetSelect/dialog.vue
index fe57222df..18f3e6c80 100644
--- a/src/components/AssetSelect/dialog.vue
+++ b/src/components/AssetSelect/dialog.vue
@@ -184,4 +184,7 @@ export default {
 .page ::v-deep .treebox {
   height: inherit !important;
 }
+.asset-select-dialog ::v-deep .el-icon-circle-check {
+  display: none;
+}
 </style>

From 19b7a36aa11d314cb3f8870770e54629e59e1654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 16:54:38 +0800
Subject: [PATCH 24/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=B9=B3=E5=8F=B0=E6=88=90=E5=8A=9F=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Platform/PlatformCreateUpdate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/assets/Platform/PlatformCreateUpdate.vue b/src/views/assets/Platform/PlatformCreateUpdate.vue
index a93907856..6d79d7203 100644
--- a/src/views/assets/Platform/PlatformCreateUpdate.vue
+++ b/src/views/assets/Platform/PlatformCreateUpdate.vue
@@ -5,6 +5,7 @@
       :fields="fields"
       :initial="initial"
       :fields-meta="fieldsMeta"
+      :has-detail-in-msg="false"
       :clean-form-value="cleanFormValue"
       :after-get-form-value="afterGetFormValue"
       :after-get-remote-meta="handleAfterGetRemoteMeta"

From ae4962eb45fe44d5350df013afed596485b29616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 17:14:39 +0800
Subject: [PATCH 25/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=AF=A6=E6=83=85=E5=88=9B=E5=BB=BA=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=90=8E=E5=AF=86=E6=96=87=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/AccountList.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/AccountListTable/AccountList.vue b/src/components/AccountListTable/AccountList.vue
index 8e017904e..f058039dd 100644
--- a/src/components/AccountListTable/AccountList.vue
+++ b/src/components/AccountListTable/AccountList.vue
@@ -146,7 +146,10 @@ export default {
             width: '70px'
           },
           secret_type: {
-            width: '100px'
+            width: '100px',
+            formatter: function(row) {
+              return row.secret_type.label
+            }
           },
           source: {
             formatter: function(row) {

From 4b06a29f105524eb6da3388a3f6c974d49539e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 18:10:00 +0800
Subject: [PATCH 26/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=AF=A6=E6=83=85=E5=88=9B=E5=BB=BA=E3=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B4=A6=E5=8F=B7=E6=97=B6error=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountCreateUpdateForm/index.vue         |  1 +
 .../AccountListTable/AccountCreateUpdate.vue  | 33 +++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index 0b5d91511..2184efe56 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -1,6 +1,7 @@
 <template>
   <AutoDataForm
     v-if="!loading"
+    ref="AutoDataForm"
     v-bind="$data"
     @submit="confirm"
   />
diff --git a/src/components/AccountListTable/AccountCreateUpdate.vue b/src/components/AccountListTable/AccountCreateUpdate.vue
index 2740e237e..04b7ded38 100644
--- a/src/components/AccountListTable/AccountCreateUpdate.vue
+++ b/src/components/AccountListTable/AccountCreateUpdate.vue
@@ -12,6 +12,7 @@
   >
     <AccountCreateUpdateForm
       v-if="!loading"
+      ref="form"
       :account="account"
       :asset="asset"
       @add="addAccount"
@@ -94,7 +95,7 @@ export default {
         this.iVisible = false
         this.$emit('add', true)
         this.$message.success(this.$tc('common.createSuccessMsg'))
-      })
+      }).catch(error => this.setFieldError(error))
     },
     editAccount(form) {
       const data = { ...form }
@@ -102,7 +103,35 @@ export default {
         this.iVisible = false
         this.$emit('add', true)
         this.$message.success(this.$tc('common.updateSuccessMsg'))
-      })
+      }).catch(error => this.setFieldError(error))
+    },
+    setFieldError(error) {
+      const response = error.response
+      const data = response.data
+      const refsAutoDataForm = this.$refs.form.$refs.AutoDataForm
+      if (response.status === 400) {
+        for (const key of Object.keys(data)) {
+          let err = ''
+          let current = key
+          let errorTips = data[current]
+          if (errorTips instanceof Array) {
+            errorTips = _.filter(errorTips, (item) => Object.keys(item).length > 0)
+            for (const i of errorTips) {
+              if (i instanceof Object) {
+                err += i?.port?.join(',')
+              } else {
+                err += errorTips
+              }
+            }
+          } else {
+            err = errorTips
+          }
+          if (current === 'secret') {
+            current = refsAutoDataForm.form.secret_type?.value || key
+          }
+          refsAutoDataForm.setFieldError(current, err)
+        }
+      }
     }
   }
 }

From b7cd39d373c8cf64d233946ebb044a91db4ccb42 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 8 Feb 2023 19:04:18 +0800
Subject: [PATCH 27/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E8=AF=A6=E6=83=85su-from-account=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
index f4815e461..28a67de04 100644
--- a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
@@ -97,7 +97,7 @@ export default {
             model: vm.object.su_from?.id || '',
             label: vm.object.su_from?.name ? vm.object.su_from?.name + `(${vm.object.su_from?.username})` : '',
             ajax: {
-              url: `/api/v1/accounts/accounts/${vm.object.id}/su-from-accounts/?fields_size=mini`,
+              url: `/api/v1/accounts/accounts/su-from-accounts/?account=${vm.object.id}&fields_size=mini`,
               transformOption: (item) => {
                 return { label: item.name + '(' + item.username + ')', value: item.id }
               }

From 4c49d0b32db3197dcb4e66b231d3dc8f23be420e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 8 Feb 2023 19:58:05 +0800
Subject: [PATCH 28/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=B5=84=E4=BA=A7=E6=97=B6=E6=B7=BB=E5=8A=A0=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=98=AF=E5=90=A6=E7=AB=8B=E5=8D=B3=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountCreateUpdateForm/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index 2184efe56..c22822bdb 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -151,7 +151,8 @@ export default {
         },
         push_now: {
           hidden: () => {
-            return !this.iPlatform.automation?.['push_account_enabled']
+            const automation = this.iPlatform.automation || {}
+            return !automation.push_account_enabled || !automation.ansible_enabled
           }
         }
       },

From 667f1638532f88f570be51626a676ec6c32e5cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 11:45:59 +0800
Subject: [PATCH 29/68] =?UTF-8?q?perf:=20=E8=B5=84=E4=BA=A7=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=96=B0=E5=90=8D=E7=A7=B0=E6=97=B6=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountCreateUpdateForm/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index c22822bdb..71c1894d4 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -72,7 +72,9 @@ export default {
           on: {
             input: ([value], updateForm) => {
               if (!this.usernameChanged) {
-                updateForm({ username: value })
+                if (!this.account?.name) {
+                  updateForm({ username: value })
+                }
                 const maybePrivileged = this.defaultPrivilegedAccounts.includes(value)
                 if (maybePrivileged) {
                   updateForm({ privileged: true })

From a18520276aa50f7fd47b61386dc42ea777360c82 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Thu, 9 Feb 2023 12:07:32 +0800
Subject: [PATCH 30/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dclone=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=97=B6=20platform=20=E6=B2=A1=E6=9C=89=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList/components/BaseList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue
index 1f824f575..b79d29481 100644
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -69,6 +69,7 @@ export default {
       }
       if (action === 'Clone') {
         route.query.clone_from = row.id
+        route.query.platform = row.platform.id
       } else if (action === 'Update') {
         route.params.id = row.id
         route.query.platform = row.platform.id

From 9e9dea6e572b1ea1751bc84e586e5e172daebee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 14:19:50 +0800
Subject: [PATCH 31/68] =?UTF-8?q?perf:=20=E8=B4=A6=E5=8F=B7=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E6=9F=A5=E7=9C=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/ViewSecret.vue            | 6 +++++-
 .../accounts/AccountTemplate/AccountTemplateList.vue      | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/AccountListTable/ViewSecret.vue b/src/components/AccountListTable/ViewSecret.vue
index 192c7973a..9275bb019 100644
--- a/src/components/AccountListTable/ViewSecret.vue
+++ b/src/components/AccountListTable/ViewSecret.vue
@@ -39,7 +39,7 @@
         <el-form-item :label="$tc('common.DateUpdated')">
           <span>{{ account['date_updated'] | date }}</span>
         </el-form-item>
-        <el-form-item :label="$tc('accounts.PasswordRecord')">
+        <el-form-item v-if="showPasswordRecord" :label="$tc('accounts.PasswordRecord')">
           <el-button type="text" @click="onShowPasswordHistory">{{ secretInfo.version }}</el-button>
         </el-form-item>
       </el-form>
@@ -78,6 +78,10 @@ export default {
     url: {
       type: String,
       default: ''
+    },
+    showPasswordRecord: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateList.vue b/src/views/accounts/AccountTemplate/AccountTemplateList.vue
index 3f2d28c4f..8b0a58f11 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateList.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateList.vue
@@ -1,7 +1,13 @@
 <template>
   <div>
     <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
-    <ViewSecret v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" :url="secretUrl" />
+    <ViewSecret
+      v-if="showViewSecretDialog"
+      :visible.sync="showViewSecretDialog"
+      :url="secretUrl"
+      :account="account"
+      :show-password-record="false"
+    />
   </div>
 </template>
 

From fa42ea7cdf5c703a78f6794e1540e8aab7865559 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Thu, 9 Feb 2023 14:31:53 +0800
Subject: [PATCH 32/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                   | 5 +++--
 src/i18n/langs/ja.json                   | 5 +++--
 src/i18n/langs/zh.json                   | 1 +
 src/views/tickets/components/Session.vue | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 35c364deb..74d784e7a 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -130,7 +130,8 @@
     "users": "User",
     "Rules": "Rule",
     "Action": "Action",
-    "ip_group_help_text": "The format is a comma-separated string, * means match all. Example: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64"
+    "ip_group_help_text": "The format is a comma-separated string, * means match all. Example: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64",
+    "apply_login_account": "Apply login account"
   },
   "applications": {
     "": "",
@@ -2028,4 +2029,4 @@
     "PublishStatus": "Publish status",
     "NoPublished": "Unpublished"
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index ad1a36c00..d2bd09bf1 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -130,7 +130,8 @@
     "apply_login_system_user": "システムユーザーへのログイン申請",
     "apply_login_user": "ログインユーザーの申請",
     "login_confirm_user": "登録再確認受付者",
-    "RuleDetail": "ルールの詳細"
+    "RuleDetail": "ルールの詳細",
+    "apply_login_account": "ログインアカウントの申請"
   },
   "applications": {
     "": "",
@@ -2019,4 +2020,4 @@
     "PublishStatus": "投稿ステータス",
     "NoPublished": "未発表"
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 058e6d3d9..204d76cf2 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -97,6 +97,7 @@
     }
   },
   "acl": {
+    "apply_login_account": "申请登录账号",
     "IgnoreCase": "忽略大小写",
     "Content": "内容",
     "CommandFilterACL": "命令过滤",
diff --git a/src/views/tickets/components/Session.vue b/src/views/tickets/components/Session.vue
index 87be39252..d903886d8 100644
--- a/src/views/tickets/components/Session.vue
+++ b/src/views/tickets/components/Session.vue
@@ -15,7 +15,7 @@
           <span class="item-value">{{ session.asset }}</span>
         </el-col>
         <el-col>
-          <span class="item-label">{{ $t('tickets.Account') }}：</span>
+          <span class="item-label">{{ $t('assets.Account') }}：</span>
           <span class="item-value">{{ session.account }}</span>
         </el-col>
         <el-col>

From 1d91d4d0652e606425e6e786e38e23f2012f39dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 14:34:16 +0800
Subject: [PATCH 33/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=E9=A3=8E=E9=99=A9=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/CommandList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 939f31841..bf63aa7c3 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -68,7 +68,7 @@ export default {
             width: '105px',
             formatter: (row, col, cellValue) => {
               const display = row['risk_level'].label
-              if (cellValue === 0) {
+              if (cellValue?.value === 0) {
                 return display
               } else {
                 return <span class='text-danger'> {display} </span>

From 932a5e2d47b8182ff26d75291988abccadf4cefb Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Thu, 9 Feb 2023 15:37:07 +0800
Subject: [PATCH 34/68] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E5=AD=97=E6=AE=B5=E9=87=8D=E6=96=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/profile/ProfileInfo.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/profile/ProfileInfo.vue b/src/views/profile/ProfileInfo.vue
index f980153f7..de3f1e3ac 100644
--- a/src/views/profile/ProfileInfo.vue
+++ b/src/views/profile/ProfileInfo.vue
@@ -63,7 +63,7 @@ export default {
           title: this.$t('users.setWeCom'),
           attrs: {
             type: 'primary',
-            label: this.$store.state.users.profile.is_wecom_bound ? this.$t('common.unbind') : this.$t('common.bind')
+            label: this.$store.state.users.profile.wecom_id ? this.$t('common.unbind') : this.$t('common.bind')
           },
           has: this.$store.getters.publicSettings.AUTH_WECOM,
           callbacks: {
@@ -77,7 +77,7 @@ export default {
           title: this.$t('users.setDingTalk'),
           attrs: {
             type: 'primary',
-            label: this.$store.state.users.profile.is_dingtalk_bound ? this.$t('common.unbind') : this.$t('common.bind')
+            label: this.$store.state.users.profile.dingtalk_id ? this.$t('common.unbind') : this.$t('common.bind')
           },
           has: this.$store.getters.publicSettings.AUTH_DINGTALK,
           callbacks: {
@@ -91,7 +91,7 @@ export default {
           title: this.$t('users.setFeiShu'),
           attrs: {
             type: 'primary',
-            label: this.$store.state.users.profile.is_feishu_bound ? this.$t('common.unbind') : this.$t('common.bind')
+            label: this.$store.state.users.profile.feishu_id ? this.$t('common.unbind') : this.$t('common.bind')
           },
           has: this.$store.getters.publicSettings.AUTH_FEISHU,
           callbacks: {

From 3582ca7c17312a98d80efb3530ac4a396c9897cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 16:40:38 +0800
Subject: [PATCH 35/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=85=8B=E9=9A=86=E6=97=B6=E6=A8=A1=E7=89=88=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetCreateUpdate/BaseAssetCreateUpdate.vue     | 13 -------------
 .../components/AccountTemplateDialog.vue            |  7 ++++++-
 .../components/CreateAccountTemplateDialog.vue      |  2 ++
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index 0306b60a2..458cee011 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -61,24 +61,11 @@ export default {
         cleanFormValue(values) {
           // Update 的时候
           const { id = '' } = this.$route.params
-          const accounts = values?.accounts
-          const query = this.$route.query || {}
           if (id) delete values['accounts']
-
           if (values.nodes && values.nodes.length === 0) {
             delete values['nodes']
           }
 
-          if (accounts && accounts.length !== 0) {
-            accounts.forEach(i => {
-              if (i.hasOwnProperty('id')) {
-                // 克隆资产时 template 为 false
-                i.template = !query.hasOwnProperty('clone_from')
-              }
-              return i
-            })
-          }
-          console.log('values[\'accounts\']', values['accounts'])
           return values
         }
       }
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
index 51402bc4f..ee158fb68 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
@@ -133,7 +133,12 @@ export default {
       this.iVisible = false
       // 过滤掉添加里还没有id的账号
       const hasIdAccounts = this.accounts.filter(i => i?.id).map(item => item.id)
-      const newAddAccounts = this.accountsSelected.filter(i => !hasIdAccounts.includes(i.id))
+      const newAddAccounts = this.accountsSelected.filter(i => {
+        if (!hasIdAccounts.includes(i.id)) {
+          i.template = true
+          return i
+        }
+      })
       this.accounts.push(...newAddAccounts)
       this.$emit('onConfirm', this.accounts)
     },
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue
index 401b22051..f082c800b 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue
@@ -40,6 +40,8 @@ export default {
       formConfig: {
         initial: { secret_type: 'password' },
         url: '/api/v1/accounts/account-templates/',
+        getUrl: '/api/v1/accounts/account-templates/',
+        needGetObjectDetail: false,
         hasDetailInMsg: false,
         fields: [
           ...templateFields(this)

From 0f0d9591185d73efb5223ec9a103eca65da2c268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 16:47:03 +0800
Subject: [PATCH 36/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=97=B6=E5=88=9B=E5=BB=BA=E8=B4=A6=E5=8F=B7=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CreateAccountTemplateDialog.vue                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue
index f082c800b..fb2113756 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/CreateAccountTemplateDialog.vue
@@ -40,7 +40,9 @@ export default {
       formConfig: {
         initial: { secret_type: 'password' },
         url: '/api/v1/accounts/account-templates/',
-        getUrl: '/api/v1/accounts/account-templates/',
+        getUrl: function() {
+          return '/api/v1/accounts/account-templates/'
+        },
         needGetObjectDetail: false,
         hasDetailInMsg: false,
         fields: [

From 51d30f3275f3b694c8829f114295f846ca6cec68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 17:07:40 +0800
Subject: [PATCH 37/68] =?UTF-8?q?perf:=20=E4=BD=9C=E4=B8=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=9B=E5=BB=BA=E4=BD=9C=E4=B8=9A=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/Job/JobUpdateCreate.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue
index ffa6db7ca..b7c2f158b 100644
--- a/src/views/ops/Job/JobUpdateCreate.vue
+++ b/src/views/ops/Job/JobUpdateCreate.vue
@@ -13,6 +13,7 @@ import CodeEditor from '@/components/FormFields/CodeEditor'
 import { CronTab } from '@/components'
 import i18n from '@/i18n/i18n'
 import VariableHelpDialog from '@/views/ops/Job/VariableHelpDialog'
+import { Required } from '@/components/DataForm/rules'
 
 export default {
   components: {
@@ -95,9 +96,7 @@ export default {
           type: 'assetSelect',
           component: AssetSelect,
           label: this.$t('perms.Asset'),
-          rules: [{
-            required: false
-          }],
+          rules: [Required],
           el: {
             baseUrl: '/api/v1/perms/users/self/assets/',
             baseNodeUrl: '/api/v1/perms/users/self/nodes/',

From 847d3a331b7511ddc6a13d77c07b13100dc39d1c Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Thu, 9 Feb 2023 18:05:37 +0800
Subject: [PATCH 38/68] perf: ticket bug

---
 src/views/tickets/BaseTicketList.vue                |  4 ++--
 .../RequestAssetPerm/Detail/TicketDetail.vue        | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/tickets/BaseTicketList.vue b/src/views/tickets/BaseTicketList.vue
index 9cd23ce8c..478f7ccf2 100644
--- a/src/views/tickets/BaseTicketList.vue
+++ b/src/views/tickets/BaseTicketList.vue
@@ -34,8 +34,8 @@ export default {
         url: this.url,
         columnsExclude: ['process_map', 'rel_snapshot'],
         columnsShow: {
-          min: ['title', 'type', 'state', 'actions'],
-          default: ['title', 'type', 'state', 'status', 'actions']
+          min: ['title', 'serial_num', 'type', 'state', 'date_created'],
+          default: ['title', 'serial_num', 'type', 'state', 'status', 'date_created']
         },
         columnsMeta: {
           serial_num: {
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index b275a534b..08eb8f208 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -19,7 +19,7 @@
           <el-form-item :label="$tc('tickets.Asset')">
             <Select2 v-model="requestForm.assets" v-bind="assetSelect2" style="width: 50% !important" />
           </el-form-item>
-          <el-form-item :label="$tc('tickets.SystemUser')" :rules="isRequired">
+          <el-form-item :label="$tc('perms.Account')" :rules="isRequired">
             <AccountFormatter v-model="requestForm.accounts" style="width: 50% !important" />
           </el-form-item>
           <el-form-item :label="$tc('common.DateStart')" required>
@@ -119,14 +119,14 @@ export default {
       return [
         {
           key: this.$tc('perms.Node'),
-          value: object.apply_nodes.map(item => item.value).join(', ')
+          value: object.apply_nodes.map(item => item.name).join(', ')
         },
         {
           key: this.$tc('tickets.Asset'),
           value: object.apply_assets.map(item => item.name).join(', ')
         },
         {
-          key: this.$tc('assets.Accounts'),
+          key: this.$tc('perms.Account'),
           value: object.apply_accounts.join(', ')
         },
         {
@@ -146,7 +146,6 @@ export default {
     assignedCardItems() {
       const vm = this
       const { object } = this
-      const rel_snapshot = object.rel_snapshot
       return [
         {
           key: this.$tc('tickets.PermissionName'),
@@ -162,14 +161,14 @@ export default {
         },
         {
           key: this.$tc('perms.Node'),
-          value: rel_snapshot.apply_nodes.map(item => item.value).join(', ')
+          value: object.apply_nodes.map(item => item.name).join(', ')
         },
         {
           key: this.$tc('assets.Asset'),
-          value: rel_snapshot.apply_assets.map(item => item.name).join(', ')
+          value: object.apply_assets.map(item => item.name).join(', ')
         },
         {
-          key: this.$tc('perms.Accounts'),
+          key: this.$tc('perms.Account'),
           value: (object.apply_accounts || []).join(', ')
         },
         {

From 6def65bb0d913d7e6dda9e9f844a9c5c6c93aa8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 18:15:32 +0800
Subject: [PATCH 39/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/About.vue | 32 +++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/layout/components/NavHeader/About.vue b/src/layout/components/NavHeader/About.vue
index a5806271a..b411ec3cd 100644
--- a/src/layout/components/NavHeader/About.vue
+++ b/src/layout/components/NavHeader/About.vue
@@ -6,7 +6,6 @@
     :visible.sync="iVisible"
     width="50%"
     top="10%"
-    :close-on-click-modal="false"
     :show-cancel="false"
     :show-confirm="false"
   >
@@ -16,14 +15,11 @@
       </div>
       <div class="text">{{ $tc('ops.version') }}：<strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv3. </span></div>
       <div class="text">{{ $tc('common.PermissionCompany') }}：{{ corporation }}</div>
+      <el-divider class="divider" />
       <div class="text">
-        <span @click="onClick('github')">
-          <i class="fa fa-github icon" />github
-        </span>
-      </div>
-      <div class="text">
-        <span @click="onClick('download')">
-          <i class="fa fa-download icon" />{{ $tc('common.Download') }}
+        <span v-for="(i, index) in actions" :key="index" class="text-link" @click="onClick(i.name)">
+          <i class="icon" :class="i.icon" />{{ i.label }}
+          <el-divider v-if="index !== actions.length - 1" direction="vertical" />
         </span>
       </div>
     </div>
@@ -46,7 +42,19 @@ export default {
   },
   data() {
     return {
-      logoTextSrc: require('@/assets/img/logo_text_green.png')
+      logoTextSrc: require('@/assets/img/logo_text_green.png'),
+      actions: [
+        {
+          name: 'github',
+          label: 'github',
+          icon: 'fa fa-github'
+        },
+        {
+          name: 'download',
+          label: this.$tc('common.Download'),
+          icon: 'fa fa-download'
+        }
+      ]
     }
   },
   computed: {
@@ -88,7 +96,7 @@ export default {
   }
   &>>> .el-dialog__body {
     background-color: #FAFBFD;
-    padding: 10px 30px 20px;
+    padding: 10px 40px 20px;
   }
   &>>> .el-dialog__footer {
     padding: 0;
@@ -106,9 +114,11 @@ export default {
       margin-right: 4px;
     }
     span {
-      color: var(--color-info);
       cursor: pointer;
     }
   }
+}
+ >>> .divider.el-divider {
+  margin: 15px 0!important;
 }
 </style>

From ac747bcf051c84f8b8931a1c152fe117c1e25b7f Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Thu, 9 Feb 2023 19:28:55 +0800
Subject: [PATCH 40/68] perf: cloud sync

---
 .../SyncInstanceTask/SyncInstanceTaskList.vue  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
index 6977f032e..7b11abeac 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
@@ -21,15 +21,27 @@ export default {
           app: 'xpack',
           resource: 'syncinstancetask'
         },
+        columnsShow: {
+          min: ['name', 'account', 'hostname_strategy', 'actions'],
+          default: [
+            'name', 'account', 'hostname_strategy', 'protocols', 'is_periodic', 'actions'
+          ]
+        },
         columnsMeta: {
           sync_ip_type: {
             width: '120px'
           },
           hostname_strategy: {
-            width: '120px'
+            width: '150px',
+            formatter: function(row) {
+              return <span>{ row.hostname_strategy.label }</span>
+            }
           },
-          account_display: {
-            label: this.$t('xpack.Cloud.Account')
+          account: {
+            label: this.$t('xpack.Cloud.Account'),
+            formatter: function(row) {
+              return <span>{ row.account.name }</span>
+            }
           },
           periodic_display: {
             width: '150px'

From 8ecd2cfc6a0a7390c98815f4864d89c49b75b7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 9 Feb 2023 19:58:19 +0800
Subject: [PATCH 41/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E8=B5=84=E4=BA=A7=E7=B1=BB=E5=9E=8B=E5=8D=A0?=
 =?UTF-8?q?=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/components/ProgressChart.vue    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/dashboard/components/ProgressChart.vue b/src/views/dashboard/components/ProgressChart.vue
index 327e13d49..2597c56c3 100644
--- a/src/views/dashboard/components/ProgressChart.vue
+++ b/src/views/dashboard/components/ProgressChart.vue
@@ -42,23 +42,26 @@ export default {
     options() {
       const seriesList = []
       const labels = this.data.map(item => item.label)
-      for (let i = 0; i < this.data.length; i++) {
+      const total = _.sumBy(this.data, function(i) { return i.total })
+      for (let i = 0, len = this.data.length; i < len; i++) {
         const current = this.data[i]
+        const num = (current.total / total) * 100
+        const color = '#' + Math.floor(Math.random() * (256 * 256 * 256 - 1)).toString(16)
         seriesList.push({
           type: 'bar',
           stack: 'total',
           barWidth: 32,
           name: current.label,
           itemStyle: {
-            borderRadius: 0
-          },
-          data: [{
-            value: current.total,
-            itemStyle: {
-              color: this.colors[i]
+            borderRadius: 0,
+            color: () => {
+              return this.colors[i] || color
             }
-          }],
-          color: this.colors[i]
+          },
+          data: [num],
+          color: () => {
+            return this.colors[i] || color
+          }
         })
       }
       return {
@@ -69,8 +72,9 @@ export default {
           itemHeight: 10,
           textStyle: {
             color: '#000',
-            lineHeight: 30
+            lineHeight: 10
           },
+          bottom: 30,
           data: labels
 
         },
@@ -126,11 +130,11 @@ export default {
           }
         },
         grid: {
-          top: '0%',
+          top: '60%',
           containLabel: true,
-          bottom: '-50%',
+          bottom: '0',
           left: '0%',
-          right: '0%'
+          right: 1
         },
         series: seriesList,
         xAxis: {

From d6de7cce249a9b607809ba0bd9ffff46c67dca40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 10:33:04 +0800
Subject: [PATCH 42/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/components/ProgressChart.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/components/ProgressChart.vue b/src/views/dashboard/components/ProgressChart.vue
index 2597c56c3..cdfe46cd3 100644
--- a/src/views/dashboard/components/ProgressChart.vue
+++ b/src/views/dashboard/components/ProgressChart.vue
@@ -45,7 +45,8 @@ export default {
       const total = _.sumBy(this.data, function(i) { return i.total })
       for (let i = 0, len = this.data.length; i < len; i++) {
         const current = this.data[i]
-        const num = (current.total / total) * 100
+        let num = (current.total / total) * 100
+        num = _.floor(num, 2)
         const color = '#' + Math.floor(Math.random() * (256 * 256 * 256 - 1)).toString(16)
         seriesList.push({
           type: 'bar',
@@ -132,7 +133,7 @@ export default {
         grid: {
           top: '60%',
           containLabel: true,
-          bottom: '0',
+          bottom: '-10',
           left: '0%',
           right: 1
         },

From 15e650ef280084f85445de0cc9ea697ad7b68843 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 10 Feb 2023 11:00:30 +0800
Subject: [PATCH 43/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=20push=5Fnow=20=E6=9D=83=E9=99=90=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=AF=E4=BB=A5=E5=9C=A8=E5=88=9B=E5=BB=BA=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E3=80=81=E5=88=9B=E5=BB=BA=E8=B4=A6=E5=8F=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountCreateUpdateForm/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index 71c1894d4..85ad07d02 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -154,7 +154,7 @@ export default {
         push_now: {
           hidden: () => {
             const automation = this.iPlatform.automation || {}
-            return !automation.push_account_enabled || !automation.ansible_enabled
+            return !automation.push_account_enabled || !automation.ansible_enabled || !this.$hasPerm('assets.push_assetaccount')
           }
         }
       },

From b54952855b55066d2e4ff02e786aa016434a2a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 14:35:29 +0800
Subject: [PATCH 44/68] =?UTF-8?q?perf:=20=E5=91=BD=E4=BB=A4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/SessionDetail/SessionCommands.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/sessions/SessionDetail/SessionCommands.vue b/src/views/sessions/SessionDetail/SessionCommands.vue
index badd937eb..0521fe59e 100644
--- a/src/views/sessions/SessionDetail/SessionCommands.vue
+++ b/src/views/sessions/SessionDetail/SessionCommands.vue
@@ -44,8 +44,10 @@ export default {
             formatter: function(row) {
               return toSafeLocalDateStr(row.timestamp * 1000)
             }
+          },
+          actions: {
+            has: false
           }
-
         }
       },
       headerActions: {

From 0e576754bb0f757341850c9a9b4a8789a2eb961e Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 10 Feb 2023 15:46:17 +0800
Subject: [PATCH 45/68] =?UTF-8?q?perf:=20cloud=20url=20=E4=B8=8E=20?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=20=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudsPlatformCreateUpdate.vue            | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue
index aee9006e5..802a2a4d1 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue
@@ -10,7 +10,24 @@ export default {
   components: { BaseAssetCreateUpdate },
   data() {
     return {
-      url: '/api/v1/assets/clouds/'
+      url: '/api/v1/assets/clouds/',
+      addFieldsMeta: {
+        protocols: {
+          hidden: (formValue) => {
+            const address = formValue['address']
+            if (!address) return
+            let port = address.startsWith('https://') ? 443 : 80
+            try {
+              const url = new URL(address)
+              if (url.port) { port = url.port }
+            } catch (e) {
+              // pass
+            }
+            const protocols = formValue['protocols']?.[0] || {}
+            protocols.port = port
+          }
+        }
+      }
     }
   }
 }

From 7e5fcfe8d5e683d4b537969323cc2d3802203508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 16:04:11 +0800
Subject: [PATCH 46/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BB=80=E4=B9=88=E6=8C=87=E5=AE=9A=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../perms/AssetPermission/components/AccountFormatter.vue      | 3 +++
 src/views/tickets/components/Steps.vue                         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/perms/AssetPermission/components/AccountFormatter.vue b/src/views/perms/AssetPermission/components/AccountFormatter.vue
index 40142d40e..6bf6889af 100644
--- a/src/views/perms/AssetPermission/components/AccountFormatter.vue
+++ b/src/views/perms/AssetPermission/components/AccountFormatter.vue
@@ -73,6 +73,9 @@ export default {
         choicesSelected.push(this.SPEC)
         this.showSpecAccounts = true
       }
+      if (this.value.indexOf(this.SPEC) > -1) {
+        this.showSpecAccounts = true
+      }
       this.choicesSelected = choicesSelected
       this.specAccountsInput = specAccountsInput
     },
diff --git a/src/views/tickets/components/Steps.vue b/src/views/tickets/components/Steps.vue
index 01d9494e6..da446bcb2 100644
--- a/src/views/tickets/components/Steps.vue
+++ b/src/views/tickets/components/Steps.vue
@@ -1,6 +1,6 @@
 <template>
   <IBox>
-    <div style="height: 540px;">
+    <div>
       <el-steps direction="vertical" :active="ticketSteps">
         <el-step
           :title="`${this.$t('tickets.OpenTicket')}：${object.title}`"

From 17d79f4de9267e7091b2984c6ed93b26386ea74f Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Thu, 9 Feb 2023 15:33:50 +0800
Subject: [PATCH 47/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=20playbook=20=E6=96=87=E4=BB=B6=E7=9A=84=20b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ops.js                                       |  8 ++++++++
 .../Template/Playbook/PlaybookDetail/Workspace.vue   | 12 +++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/api/ops.js b/src/api/ops.js
index 8e5ec1dcc..0ef2f58bb 100644
--- a/src/api/ops.js
+++ b/src/api/ops.js
@@ -36,3 +36,11 @@ export function uploadPlaybook(form) {
     data: form
   })
 }
+
+export function renameFile(playbookId, node) {
+  return request({
+    url: `/api/v1/ops/playbook/${playbookId}/file/`,
+    method: 'patch',
+    data: node
+  })
+}
diff --git a/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue b/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue
index 63ef492b2..881cb944f 100644
--- a/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue
+++ b/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue
@@ -45,6 +45,7 @@ import { TreeTable } from '@/components'
 import CodeEditor from '@/components/FormFields/CodeEditor'
 import item from '@/layout/components/NavLeft/Item'
 import NewNodeDialog from '@/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue'
+import { renameFile } from '@/api/ops'
 
 export default {
   name: 'CommandExecution',
@@ -113,16 +114,17 @@ export default {
             }
           }.bind(this),
           refresh: function(event, treeNode) {
-            // const parentNode = this.zTree.getNodeByParam('id', this.parentId)
-            // this.zTree.expandNode(parentNode, true, false, false, false)
           },
           onRename: function(event, treeId, treeNode, isCancel) {
-            const url = `/api/v1/ops/playbook/${this.object.id}/file/`
             if (isCancel) {
               return
             }
-            this.$axios.patch(url, { key: treeNode.id, new_name: treeNode.name, is_directory: treeNode.isParent })
-              .then(data => {
+            renameFile(this.object.id, {
+              key: treeNode.id,
+              new_name: treeNode.name,
+              is_directory: treeNode.isParent
+            }).then()
+              .finally(() => {
                 this.refreshTree()
               })
           }.bind(this)

From d0fa87009d183af98d4c4d11cf322f259abf3d18 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Thu, 9 Feb 2023 17:24:27 +0800
Subject: [PATCH 48/68] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue b/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue
index a4234b2a5..d5e669e8f 100644
--- a/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue
+++ b/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue
@@ -5,7 +5,7 @@
     :visible.sync="iVisible"
     width="20%"
     top="1vh"
-    :show-cancel="true"
+    :show-cancel="false"
     :show-confirm="true"
     @confirm="onConfirm"
   >

From bacac276ff0299acd85f81a8028d38dd76a4dbba Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Thu, 9 Feb 2023 17:25:55 +0800
Subject: [PATCH 49/68] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/Job/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/ops/Job/index.vue b/src/views/ops/Job/index.vue
index 42d8687dc..b28033ddf 100644
--- a/src/views/ops/Job/index.vue
+++ b/src/views/ops/Job/index.vue
@@ -48,10 +48,7 @@ export default {
             }
           },
           comment: {
-            width: '240px',
-            formatter: (row) => {
-              return row.type.label
-            }
+            width: '240px'
           },
           summary: {
             label: this.$t('ops.Summary(success/total)'),

From ab85118e68c9721cc198f7a7a892a29110020a5c Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Fri, 10 Feb 2023 16:11:50 +0800
Subject: [PATCH 50/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/Job/JobUpdateCreate.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue
index b7c2f158b..350e0f6dd 100644
--- a/src/views/ops/Job/JobUpdateCreate.vue
+++ b/src/views/ops/Job/JobUpdateCreate.vue
@@ -47,6 +47,7 @@ export default {
       },
       fieldsMeta: {
         name: {
+          rules: [Required],
           hidden: (formValue) => {
             return this.instantTask
           }
@@ -78,6 +79,7 @@ export default {
           }
         },
         playbook: {
+          rules: [Required],
           hidden: (formValue) => {
             return formValue.type !== 'playbook'
           },
@@ -104,6 +106,7 @@ export default {
           }
         },
         args: {
+          rules: [Required],
           hidden: (formValue) => {
             return formValue.type !== 'adhoc'
           },

From 6322b27c94ae4bd4c98c8f3661e3506dc7d9faeb Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 10 Feb 2023 16:15:54 +0800
Subject: [PATCH 51/68] =?UTF-8?q?perf:=20=E5=B7=A5=E5=8D=95=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=20=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/components/Steps.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/tickets/components/Steps.vue b/src/views/tickets/components/Steps.vue
index 01d9494e6..8316ee9d9 100644
--- a/src/views/tickets/components/Steps.vue
+++ b/src/views/tickets/components/Steps.vue
@@ -1,6 +1,6 @@
 <template>
   <IBox>
-    <div style="height: 540px;">
+    <div style="height: 660px;">
       <el-steps direction="vertical" :active="ticketSteps">
         <el-step
           :title="`${this.$t('tickets.OpenTicket')}：${object.title}`"
@@ -19,11 +19,11 @@
           <div slot="description">
             <div class="processors">
               <div class="processors-content">
-                <span v-for="assignee of item.assignees_display" :key="assignee" style="display: block">
+                <span v-for="assignee of item.assignees_display.slice(0,4)" :key="assignee" style="display: block">
                   {{ assignee }}
                 </span>
               </div>
-              <el-button v-if="item.assignees.length > 5" type="text" @click="lookOver(item.assignees_display)">
+              <el-button v-if="item.assignees.length > 4" type="text" @click="lookOver(item.assignees_display)">
                 {{ $tc('tickets.CheckViewAcceptor') }}
               </el-button>
             </div>

From a70b53b6e6f70a0322b751ef5e4291e91d01d3b7 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 10 Feb 2023 16:32:24 +0800
Subject: [PATCH 52/68] perf: session is_finished

---
 src/views/sessions/SessionList/BaseList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue
index 17e7ba3c3..760c9d2c0 100644
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -138,7 +138,8 @@ export default {
           dateStart: dateFrom
         },
         searchConfig: {
-          getUrlQuery: false
+          getUrlQuery: false,
+          exclude: ['is_finished']
         }
       }
     }

From 1399f1d19771ee9f122be048ae49f7037656ea58 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 10 Feb 2023 16:36:33 +0800
Subject: [PATCH 53/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=91=E8=B4=A6=E5=8F=B7=E6=97=B6=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=20RequiredChange?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Cloud/Account/AccountCreateUpdate.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
index cee280e27..69e316520 100644
--- a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
+++ b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
@@ -7,7 +7,7 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
-import { Required, specialEmojiCheck } from '@/components/DataForm/rules'
+import { RequiredChange, specialEmojiCheck } from '@/components/DataForm/rules'
 import { ACCOUNT_PROVIDER_ATTRS_MAP, aliyun } from '../const'
 import { UploadKey } from '@/components'
 import { encryptPassword } from '@/utils/crypto'
@@ -25,7 +25,7 @@ export default {
       const updateNotRequiredFields = ['access_key_secret', 'client_secret', 'password', 'sc_password', 'oc_password', 'cert_file', 'key_file']
       for (const item of accountProviderAttrs?.attrs) {
         fieldsObject[item] = {
-          rules: updateNotRequiredFields.includes(item) && vm.$route.params.id ? [] : [Required]
+          rules: updateNotRequiredFields.includes(item) && vm.$route.params.id ? [] : [RequiredChange]
         }
       }
       return fieldsObject
@@ -46,7 +46,7 @@ export default {
       ],
       fieldsMeta: {
         name: {
-          rules: [Required, specialEmojiCheck]
+          rules: [RequiredChange, specialEmojiCheck]
         },
         attrs: {
           encryptedFields: ['access_key_secret'],
@@ -76,12 +76,12 @@ export default {
               }
             },
             password: {
-              rules: this.$route.params.id ? [] : [Required]
+              rules: this.$route.params.id ? [] : [RequiredChange]
             }
           }
         },
         provider: {
-          rules: [Required],
+          rules: [RequiredChange],
           el: {
             disabled: true
           }

From 4af8304798d5dc95e127856ae2997634f40de1a6 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 10 Feb 2023 16:24:25 +0800
Subject: [PATCH 54/68] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9rbac=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/RoleInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 418948945..6ceae0b6e 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -80,7 +80,7 @@ export default {
         'view_audit': ['rbac.view_audit'],
         'view_workbench': ['rbac.view_workbench'],
         'view_setting': ['settings.view_setting'],
-        'cloud_import': ['assets.view_asset'],
+        'cloud_import': ['assets.view_asset', 'assets.view_platform'],
         'terminal_node': ['settings.change_terminal'],
         'rbac.orgrolebinding': ['rbac.view_orgrole', 'users.view_user'],
         'rbac.systemrolebinding': ['rbac.view_systemrole', 'users.view_user'],
@@ -96,7 +96,7 @@ export default {
         ],
         'acls.loginacl': ['users.view_user'],
         'acls.loginassetacl': ['users.view_user'],
-        'assets.view_asset': ['assets.view_node'],
+        'assets.view_asset': ['assets.view_node', 'assets.view_platform'],
         'assets.commandfilterrule': ['assets.view_commandfilter'],
         'assets.gateway': ['assets.view_domain'],
         'assets.add_gateway': ['assets.view_domain', 'assets.view_platform', 'assets.view_node'],

From 016846b5b4c6f15e47170b27bf5bb1811dfc2ef5 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 10 Feb 2023 14:20:38 +0800
Subject: [PATCH 55/68] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E5=A4=8D=E6=A0=B8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoginConfirm/Detail/TicketDetail.vue      | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue b/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue
index 13eed0d5d..eed6c7ab1 100644
--- a/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue
+++ b/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericTicketDetail :object="object" :special-card-items="specialCardItems" />
+  <GenericTicketDetail :object="object" />
 </template>
 
 <script>
@@ -28,23 +28,6 @@ export default {
     }
   },
   computed: {
-    specialCardItems() {
-      const { object } = this
-      return object.type === 'login_confirm' ? [] : [
-        {
-          key: this.$t('acl.apply_login_asset'),
-          value: object.rel_snapshot.apply_login_asset
-        },
-        {
-          key: this.$t('acl.apply_login_system_user'),
-          value: object.rel_snapshot.apply_login_system_user
-        },
-        {
-          key: this.$t('acl.apply_login_user'),
-          value: object.rel_snapshot.apply_login_user
-        }
-      ]
-    }
   },
   methods: {}
 }

From 870c84d318379f87c98d50c71c5a0141522f05ef Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 8 Feb 2023 19:24:10 +0800
Subject: [PATCH 56/68] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20backends?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataTable/index.vue        |  3 +-
 .../DatabaseCreateUpdate.vue                  | 10 ++--
 src/views/settings/Auth/index.vue             | 51 +++++++++++--------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index ac24b2ce6..fe317ed96 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -237,7 +237,8 @@ export default {
         col.formatter = (row, column, cellValue) => {
           let value = cellValue
           let padding = '0'
-          if (!value && value !== 0) {
+          const excludes = [undefined, null, '']
+          if (excludes.indexOf(value) !== -1) {
             padding = '6px'
             value = '-'
           }
diff --git a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
index 6601dc71d..4211e767e 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
@@ -21,18 +21,18 @@ export default {
     getAddFields() {
       const platform = this.$route.query.platform_type
       const baseFields = [[this.$t('common.Basic'), ['db_name']]]
-      let tlsParams = ['use_ssl', 'ca_cert']
+      let tlsFields = ['use_ssl', 'ca_cert']
       switch (platform) {
         case 'redis':
-          tlsParams = tlsParams.concat(['client_cert', 'client_key'])
+          tlsFields = tlsFields.concat(['client_cert', 'client_key'])
           break
         case 'mongodb':
-          tlsParams = tlsParams.concat(['client_key', 'allow_invalid_cert'])
+          tlsFields = tlsFields.concat(['client_key', 'allow_invalid_cert'])
           break
       }
-      if (tlsParams.length > 2) {
+      if (tlsFields.length > 2) {
         const secureField = [
-          this.$t('assets.Secure'), tlsParams, 3
+          this.$t('assets.Secure'), tlsFields, 2
         ]
         baseFields.push(secureField)
       }
diff --git a/src/views/settings/Auth/index.vue b/src/views/settings/Auth/index.vue
index e250e0f65..20c521940 100644
--- a/src/views/settings/Auth/index.vue
+++ b/src/views/settings/Auth/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPage :submenu="submenu" :active-menu.sync="activeMenu">
+  <TabPage :active-menu.sync="activeMenu" :submenu="submenu">
     <keep-alive>
       <component :is="activeMenu" />
     </keep-alive>
@@ -38,29 +38,19 @@ export default {
     OAuth2
   },
   data() {
-    return {
-      loading: true,
-      activeMenu: 'Basic',
-      submenu: [
-        {
-          title: this.$t('common.Basic'),
-          name: 'Basic'
-        },
-        {
-          title: this.$t('setting.Ldap'),
-          name: 'LDAP'
-        },
-        {
-          title: this.$t('setting.CAS'),
-          name: 'CAS'
-        },
+    const hasLicense = this.$store.getters.hasValidLicense
+    let extraBackends = []
+    if (!this.$store.getters.hasValidLicense) {
+      extraBackends = [
         {
           title: this.$t('setting.OIDC'),
-          name: 'OIDC'
+          name: 'OIDC',
+          hidden: () => !hasLicense
         },
         {
           title: this.$t('setting.SAML2'),
-          name: 'SAML2'
+          name: 'SAML2',
+          hidden: () => !hasLicense
         },
         {
           title: this.$t('setting.OAuth2'),
@@ -88,6 +78,26 @@ export default {
         }
       ]
     }
+    return {
+      loading: true,
+      activeMenu: 'Basic',
+      submenu: [
+        {
+          title: this.$t('common.Basic'),
+          name: 'Basic'
+        },
+        {
+          title: this.$t('setting.Ldap'),
+          name: 'LDAP'
+        },
+        {
+          title: this.$t('setting.CAS'),
+          name: 'CAS',
+          hidden: () => !hasLicense
+        },
+        ...extraBackends
+      ]
+    }
   },
   computed: {
     componentData() {
@@ -96,8 +106,7 @@ export default {
   },
   mounted() {
   },
-  methods: {
-  }
+  methods: {}
 }
 </script>
 

From de0e824b3003105dc7859b49520b32f260926f9b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 8 Feb 2023 19:52:30 +0800
Subject: [PATCH 57/68] perf: auth backends

---
 src/views/settings/Auth/index.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/views/settings/Auth/index.vue b/src/views/settings/Auth/index.vue
index 20c521940..d039743de 100644
--- a/src/views/settings/Auth/index.vue
+++ b/src/views/settings/Auth/index.vue
@@ -38,19 +38,16 @@ export default {
     OAuth2
   },
   data() {
-    const hasLicense = this.$store.getters.hasValidLicense
     let extraBackends = []
-    if (!this.$store.getters.hasValidLicense) {
+    if (this.$store.getters.hasValidLicense) {
       extraBackends = [
         {
           title: this.$t('setting.OIDC'),
-          name: 'OIDC',
-          hidden: () => !hasLicense
+          name: 'OIDC'
         },
         {
           title: this.$t('setting.SAML2'),
-          name: 'SAML2',
-          hidden: () => !hasLicense
+          name: 'SAML2'
         },
         {
           title: this.$t('setting.OAuth2'),
@@ -92,8 +89,7 @@ export default {
         },
         {
           title: this.$t('setting.CAS'),
-          name: 'CAS',
-          hidden: () => !hasLicense
+          name: 'CAS'
         },
         ...extraBackends
       ]

From 7c5b9e128c2d8a14f258e4585fd61e345980e159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 17:04:47 +0800
Subject: [PATCH 58/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=89=B9=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                                     | 2 +-
 src/i18n/langs/ja.json                                     | 2 +-
 src/i18n/langs/zh.json                                     | 2 +-
 .../perms/AssetPermission/components/AccountFormatter.vue  | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 74d784e7a..e697ae877 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -591,7 +591,7 @@
     "bulkRemoveErrorMsg": "Bulk remove failed: ",
     "bulkRemoveSuccessMsg": "Bulk remove success",
     "SelectAtLeastOneAssetOrNodeErrMsg": "Select at least one asset or node",
-    "RequiredSystemUserErrMsg": "Required systemuser",
+    "RequiredSystemUserErrMsg": "Required account",
     "createBy": "Create by",
     "cloneFrom": "Clone from",
     "createErrorMsg": "Create error",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index d2bd09bf1..fccd768e1 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -591,7 +591,7 @@
     "bulkDeleteSuccessMsg": "一括削除に成功しました",
     "bulkRemoveErrorMsg": "一括削除に失敗しました:",
     "SelectAtLeastOneAssetOrNodeErrMsg": "資産またはノードは少なくとも1つを選択します",
-    "RequiredSystemUserErrMsg": "先にシステムユーザーを選択してください",
+    "RequiredSystemUserErrMsg": "必要なアカウント",
     "bulkRemoveSuccessMsg": "一括削除に成功しました",
     "createBy": "作成者",
     "cloneFrom": "クローン",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 204d76cf2..26fff634e 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -603,7 +603,7 @@
     "bulkDeleteSuccessMsg": "批量删除成功",
     "bulkRemoveErrorMsg": "批量移除失败: ",
     "SelectAtLeastOneAssetOrNodeErrMsg": "资产或者节点至少选择一项",
-    "RequiredSystemUserErrMsg": "请先选择系统用户",
+    "RequiredSystemUserErrMsg": "请选择账号",
     "bulkRemoveSuccessMsg": "批量移除成功",
     "createBy": "创建者",
     "cloneFrom": "克隆自",
diff --git a/src/views/perms/AssetPermission/components/AccountFormatter.vue b/src/views/perms/AssetPermission/components/AccountFormatter.vue
index 6bf6889af..d2c8af27d 100644
--- a/src/views/perms/AssetPermission/components/AccountFormatter.vue
+++ b/src/views/perms/AssetPermission/components/AccountFormatter.vue
@@ -98,11 +98,12 @@ export default {
       this.outputValue()
     },
     outputValue() {
+      let choicesSelected = this.choicesSelected
       if (this.showSpecAccounts) {
-        this.$emit('change', [...this.choicesSelected, ...this.specAccountsInput])
-      } else {
-        this.$emit('change', this.choicesSelected)
+        choicesSelected = [...this.choicesSelected, ...this.specAccountsInput]
       }
+      this.$emit('input', choicesSelected)
+      this.$emit('change', choicesSelected)
     }
   }
 }

From 70f76fd592dad41c69cf790fb77c9e53531c6a27 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 10 Feb 2023 18:01:09 +0800
Subject: [PATCH 59/68] perf: ticket type filter

---
 src/i18n/langs/en.json               |  6 +++++-
 src/i18n/langs/ja.json               |  6 +++++-
 src/i18n/langs/zh.json               |  4 ++++
 src/views/tickets/BaseTicketList.vue | 25 ++++++++++++++++++++++++-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 74d784e7a..2c7ab443f 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1559,6 +1559,10 @@
     "basicTools": "Basic tool"
   },
   "tickets": {
+    "ApplyAsset": "Apply asset",
+    "LoginConfirm": "User login confirm",
+    "CommandConfirm": "Command confirm",
+    "LoginAssetConfirm": "Asset login confirm",
     "PermissionName": "Permission name",
     "Accept": "Accept",
     "AssignedMe": "Assigned me",
@@ -2029,4 +2033,4 @@
     "PublishStatus": "Publish status",
     "NoPublished": "Unpublished"
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index d2bd09bf1..f9009753b 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -1551,6 +1551,10 @@
     "Applets": "リモート アプリケーション"
   },
   "tickets": {
+    "ApplyAsset": "リソースの適用",
+    "LoginConfirm": "ユーザーログインの確認",
+    "CommandConfirm": "コマンドの確認",
+    "LoginAssetConfirm": "資産ログインの確認",
     "OneAssigneeType": "一次受付者タイプ",
     "OneAssignee": "一級受付者",
     "TwoAssigneeType": "二級受付者タイプ",
@@ -2020,4 +2024,4 @@
     "PublishStatus": "投稿ステータス",
     "NoPublished": "未発表"
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 204d76cf2..84ff460b8 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1545,6 +1545,10 @@
     "testHelpText": "请输入目的地址进行测试"
   },
   "tickets": {
+    "ApplyAsset": "申请资产",
+    "LoginConfirm": "用户登录复合",
+    "CommandConfirm": "命令复合",
+    "LoginAssetConfirm": "资产登录复合",
     "RelevantAssignees": "相关受理人",
     "OneAssigneeType": "一级受理人类型",
     "OneAssignee": "一级受理人",
diff --git a/src/views/tickets/BaseTicketList.vue b/src/views/tickets/BaseTicketList.vue
index 478f7ccf2..d4eb28d1d 100644
--- 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', 'id', 'title', 'type'],
           options: [
             {
               value: 'state',
@@ -163,6 +163,29 @@ export default {
                 }
               ]
             },
+            {
+              value: 'type',
+              label: this.$t('assets.Type'),
+              type: 'choice',
+              children: [
+                {
+                  value: 'apply_asset',
+                  label: this.$t('tickets.ApplyAsset')
+                },
+                {
+                  value: 'login_confirm',
+                  label: this.$t('tickets.LoginConfirm')
+                },
+                {
+                  value: 'command_confirm',
+                  label: this.$t('tickets.CommandConfirm')
+                },
+                {
+                  value: 'login_asset_confirm',
+                  label: this.$t('tickets.LoginAssetConfirm')
+                }
+              ]
+            },
             {
               value: 'id',
               label: 'ID'

From c39b5a5d7946b82640a0691225fc030066b00dc2 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 10 Feb 2023 18:13:40 +0800
Subject: [PATCH 60/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=91?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=20protoc?=
 =?UTF-8?q?ols=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncInstanceTaskCreateUpdate.vue                |  4 ++++
 .../SyncInstanceTaskDetail/detail.vue               | 13 +------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
index 7b4d3287b..054f42b96 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
@@ -119,6 +119,10 @@ export default {
       updateSuccessNextRoute: { name: 'CloudCenter' },
       createSuccessNextRoute: { name: 'CloudCenter' },
       afterGetFormValue(formValue) {
+        formValue.protocols = formValue.protocols?.split(' ').map(i => {
+          const [name, port] = i.split('/')
+          return { name, port }
+        })
         formValue.ip_network_segment_group = formValue.ip_network_segment_group.toString()
         return formValue
       },
diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
index 4a50d77c3..4607fc686 100644
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
@@ -52,20 +52,9 @@ export default {
       url: `/api/v1/xpack/cloud/accounts/${this.object.id}`,
       detailFields: [
         'name', 'account_display', 'node_display',
-        {
-          key: this.$t('xpack.Cloud.LinuxAdminUser'),
-          value: this.object.unix_admin_user?.name
-        },
-        {
-          key: this.$t('xpack.Cloud.WindowsAdminUser'),
-          value: this.object.windows_admin_user?.name
-        },
         {
           key: this.$t('assets.Protocols'),
-          value: this.object.protocols,
-          formatter: (item, val) => {
-            return <div>{val?.map((v) => <el-tag size='small'>{v['name']}/{v['port']}</el-tag>)}</div>
-          }
+          value: this.object.protocols
         },
         {
           key: this.$t('xpack.Cloud.IPNetworkSegment'),

From 48aac68248c98faa877d74ae671420f9f1521cb1 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 10 Feb 2023 16:55:16 +0800
Subject: [PATCH 61/68] perf: perms actions

---
 .../AssetPermission/components/PermBulkUpdateDialog.vue      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/perms/AssetPermission/components/PermBulkUpdateDialog.vue b/src/views/perms/AssetPermission/components/PermBulkUpdateDialog.vue
index e1a84f801..758849f33 100644
--- a/src/views/perms/AssetPermission/components/PermBulkUpdateDialog.vue
+++ b/src/views/perms/AssetPermission/components/PermBulkUpdateDialog.vue
@@ -59,7 +59,10 @@ export default {
         accounts: fieldsManager.accounts,
         date_start: fieldsManager.date_start,
         date_expired: fieldsManager.date_expired,
-        is_active: fieldsManager.is_active
+        is_active: fieldsManager.is_active,
+        actions: {
+          label: this.$t('common.Action')
+        }
       }
       if (this.permType !== 'asset') {
         url = '/api/v1/perms/application-permissions/'

From 2457a88778f3b8755f042534cbc0f52ea3a9178e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 18:37:39 +0800
Subject: [PATCH 62/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=89=B9=E6=97=B6=E8=B5=84=E4=BA=A7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index 08eb8f208..ce4787037 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -73,7 +73,7 @@ export default {
       statusMap: this.object.status.value === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state.value],
       requestForm: {
         nodes: this.object.apply_nodes,
-        assets: this.object.apply_assets,
+        assets: this.object.apply_assets?.map(i => i.id),
         accounts: this.object.apply_accounts,
         actions: this.object.apply_actions,
         apply_date_expired: this.object.apply_date_expired,

From 0ba28e14c87d26b39da882070ad40aefdef75d25 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 10 Feb 2023 18:58:50 +0800
Subject: [PATCH 63/68] perf: ticket node

---
 src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index ce4787037..f70c7a9a7 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -72,7 +72,7 @@ export default {
       treeNodes,
       statusMap: this.object.status.value === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state.value],
       requestForm: {
-        nodes: this.object.apply_nodes,
+        nodes: this.object.apply_nodes?.map(i => i.id),
         assets: this.object.apply_assets?.map(i => i.id),
         accounts: this.object.apply_accounts,
         actions: this.object.apply_actions,

From b709333b1b13e64348faee495abf6195284d11b3 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 10 Feb 2023 19:02:44 +0800
Subject: [PATCH 64/68] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=20write=5Fonly=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailCard/auto.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/DetailCard/auto.vue b/src/components/DetailCard/auto.vue
index c64e5bf06..828aba1d4 100644
--- a/src/components/DetailCard/auto.vue
+++ b/src/components/DetailCard/auto.vue
@@ -59,6 +59,9 @@ export default {
         if (!fieldMeta) {
           continue
         }
+        if (fieldMeta['write_only']) {
+          continue
+        }
 
         let value = this.object[name]
 

From f86af9c8b8ce528d26af7e2a3f80acceed198f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 19:38:01 +0800
Subject: [PATCH 65/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/SessionDetail/SessionDetailInfo.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/sessions/SessionDetail/SessionDetailInfo.vue b/src/views/sessions/SessionDetail/SessionDetailInfo.vue
index d64575c75..d1c6d04f9 100644
--- a/src/views/sessions/SessionDetail/SessionDetailInfo.vue
+++ b/src/views/sessions/SessionDetail/SessionDetailInfo.vue
@@ -116,8 +116,9 @@ export default {
           value: this.session.asset
         },
         {
-          key: this.$t('sessions.systemUser'),
-          value: this.session.system_user
+          key: this.$t('assets.Account'),
+          value: this.session.account
+
         },
         {
           key: this.$t('sessions.protocol'),
@@ -125,7 +126,7 @@ export default {
         },
         {
           key: this.$t('sessions.loginFrom'),
-          value: this.session.login_from
+          value: this.session.login_from?.label || '-'
         },
         {
           key: this.$t('sessions.remoteAddr'),

From 49c8b24f6c4fa5985503ed562f4d43f814855ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 19:08:37 +0800
Subject: [PATCH 66/68] =?UTF-8?q?perf:=20=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=BC=B9=E7=AA=97=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E3=80=81=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audits/OperateLogList.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/audits/OperateLogList.vue b/src/views/audits/OperateLogList.vue
index c2473024a..09cc81765 100644
--- a/src/views/audits/OperateLogList.vue
+++ b/src/views/audits/OperateLogList.vue
@@ -9,6 +9,8 @@
       v-if="logDetailVisible"
       :title="this.$tc('route.OperateLog')"
       :visible.sync="logDetailVisible"
+      :show-cancel="false"
+      :show-confirm="false"
     >
       <OperateLogDetail :row="rowObj" />
     </Dialog>

From 51c6f4321c75426d4a36d6320d72470148b2755e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 10 Feb 2023 19:51:47 +0800
Subject: [PATCH 67/68] =?UTF-8?q?perf:=20=E5=B7=A5=E5=8D=95=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E7=BD=AE-=E5=AE=A1=E6=89=B9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/TicketFlow/FlowRuleField.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/tickets/TicketFlow/FlowRuleField.vue b/src/views/tickets/TicketFlow/FlowRuleField.vue
index 90002926e..fcc8204b2 100644
--- a/src/views/tickets/TicketFlow/FlowRuleField.vue
+++ b/src/views/tickets/TicketFlow/FlowRuleField.vue
@@ -6,14 +6,14 @@
         <div slot="header" class="clearfix">
           <span>{{ i + 1 + ' ' + vm.$t('tickets.LevelApproval') }}</span>
         </div>
-        <el-radio-group v-model="item.strategy" @change="onChange()">
+        <el-radio-group v-model="item.strategy.value" @change="onChange()">
           <el-radio label="super_admin">{{ vm.$t('tickets.SuperAdmin') }}</el-radio>
           <el-radio label="org_admin">{{ vm.$t('tickets.OrgAdmin') }}</el-radio>
           <el-radio label="super_org_admin">{{ vm.$t('tickets.SuperOrgAdmin') }}</el-radio>
           <el-radio label="custom_user">{{ vm.$t('tickets.CustomUser') }}</el-radio>
         </el-radio-group>
         <br>
-        <Select2 v-show="item.strategy === 'custom_user'" v-model="item.assignees" v-bind="select2Option" @change="onChange()" />
+        <Select2 v-show="item.strategy.value === 'custom_user'" v-model="item.assignees" v-bind="select2Option" @change="onChange()" />
       </el-card>
     </div>
   </div>

From 13a135609372a0b9262e6d4829a0ddb79ddb4a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 13 Feb 2023 10:30:13 +0800
Subject: [PATCH 68/68] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accounts/AccountTemplate/AccountTemplateDetail/Detail.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
index c622cb769..fd4081054 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
@@ -50,7 +50,7 @@ export default {
         }
       ],
       url: `/api/v1/accounts/account-templates/${this.object.id}/`,
-      excludes: ['privileged', 'secret', 'passphrase', 'specific']
+      excludes: ['privileged', 'secret', 'passphrase', 'spec_info']
     }
   },
   computed: {