From 425e47d61381b05a7dace720531ba05d21042301 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 8 Jul 2021 18:20:52 +0800
Subject: [PATCH 1/4] =?UTF-8?q?perf:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=AF=A6=E6=83=85=E4=B8=AD=E8=B4=A6=E5=8F=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Asset/AssetDetail/{AssetUserList.vue => Account.vue}  | 4 ++--
 src/views/assets/Asset/AssetDetail/index.vue              | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename src/views/assets/Asset/AssetDetail/{AssetUserList.vue => Account.vue} (87%)

diff --git a/src/views/assets/Asset/AssetDetail/AssetUserList.vue b/src/views/assets/Asset/AssetDetail/Account.vue
similarity index 87%
rename from src/views/assets/Asset/AssetDetail/AssetUserList.vue
rename to src/views/assets/Asset/AssetDetail/Account.vue
index de1f23188..ce0606070 100644
--- a/src/views/assets/Asset/AssetDetail/AssetUserList.vue
+++ b/src/views/assets/Asset/AssetDetail/Account.vue
@@ -29,7 +29,7 @@ export default {
   },
   data() {
     return {
-      assetUserUrl: `/api/v1/assets/accounts/?asset_id=${this.object.id}&latest=1`,
+      assetUserUrl: `/api/v1/assets/accounts/?asset=${this.object.id}`,
       quickActions: [
         {
           title: this.$t('assets.TestAssetsConnective'),
@@ -40,7 +40,7 @@ export default {
           callbacks: {
             click: function() {
               this.$axios.post(
-                `/api/v1/assets/accounts/tasks/?asset_id=${this.object.id}&latest=1`,
+                `/api/v1/assets/accounts/tasks/?asset=${this.object.id}`,
                 { action: 'test' }
               ).then(res => {
                 window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
diff --git a/src/views/assets/Asset/AssetDetail/index.vue b/src/views/assets/Asset/AssetDetail/index.vue
index 7f55e0c3f..ba3824a56 100644
--- a/src/views/assets/Asset/AssetDetail/index.vue
+++ b/src/views/assets/Asset/AssetDetail/index.vue
@@ -9,14 +9,14 @@
 <script>
 import { GenericDetailPage, TabPage } from '@/layout/components'
 import Detail from './Detail.vue'
-import AssetUserList from './AssetUserList.vue'
+import Account from './Account.vue'
 export default {
   name: 'AssetListDetail',
   components: {
     GenericDetailPage,
     TabPage,
     Detail,
-    AssetUserList
+    Account
   },
   data() {
     return {
@@ -29,8 +29,8 @@ export default {
             name: 'Detail'
           },
           {
-            title: this.$t('assets.AssetUserList'),
-            name: 'AssetUserList'
+            title: this.$t('assets.AccountList'),
+            name: 'Account'
           }
         ],
         hasRightSide: true,

From 8d783dd6508c5fc1b0ac013165a884740a3c3935 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 12 Jul 2021 12:46:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 修复动态系统用户
---
 .../SystemUser/SystemUserCreateUpdate/fields.js      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
index eaa79b696..71baeb78d 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
@@ -24,16 +24,18 @@ function getFields() {
     },
     rules: [Object.assign({}, Required)],
     hidden: (form) => {
-      if (['mysql', 'postgresql', 'mariadb', 'oracle'].includes(form.protocol)) {
-        this.fieldsMeta.username.rules[0].required = true
-      } else if (['vnc'].includes(form.protocol)) {
+      if (['vnc'].includes(form.protocol)) {
+        this.fieldsMeta.username.rules[0].required = false
+      } else if (form.login_mode === 'manual') {
+        this.fieldsMeta.username.rules[0].required = false
+      } else if (form.username_same_with_user) {
         this.fieldsMeta.username.rules[0].required = false
       } else {
-        this.fieldsMeta.username.rules[0].required = !(form.login_mode === 'manual' || form.username_same_with_user)
+        this.fieldsMeta.username.rules[0].required = true
       }
       if (form.username_same_with_user) {
         this.fieldsMeta.username.el.disabled = true
-        form.username = '*'
+        form.username = ''
       } else {
         this.fieldsMeta.username.el.disabled = false
       }

From 0a01ad3552bf69f63b7552a5a8bdaae61fea69b9 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Mon, 12 Jul 2021 16:51:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E5=8F=AF=E8=BF=9E=E6=8E=A5=E6=80=A7=E6=98=BE=E7=A4=BA=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index b6366d035..a9fa54681 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -147,8 +147,8 @@ export default {
             formatter: ChoicesFormatter,
             formatterArgs: {
               iconChoices: {
-                ok: 'fa-times text-danger',
-                failed: 'fa-check text-primary',
+                ok: 'fa-check text-primary',
+                failed: 'fa-times text-danger',
                 unknown: 'fa-circle text-warning'
               },
               hasTips: true,

From 8b31666f67e3b325c282cf74091b0d6a942313db Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 9 Jul 2021 18:54:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=8B=E9=9A=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/SystemUser/SystemUserList/AdminUserList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/assets/SystemUser/SystemUserList/AdminUserList.vue b/src/views/assets/SystemUser/SystemUserList/AdminUserList.vue
index 9eb669d94..a3c7ec14e 100644
--- a/src/views/assets/SystemUser/SystemUserList/AdminUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList/AdminUserList.vue
@@ -35,7 +35,8 @@ export default {
           },
           actions: {
             formatterArgs: {
-              updateRoute: { name: 'SystemUserUpdate', query: { type: 'admin' }}
+              updateRoute: { name: 'SystemUserUpdate', query: { type: 'admin' }},
+              cloneRoute: { name: 'SystemUserCreate', query: { type: 'admin' }}
             }
           }
         }