From f6fe08607b377b225387e732c521f2aeeee8219d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 11 Jul 2023 17:27:16 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountCreateUpdateForm/index.vue         |  13 ++++++-------
 .../ProtocolSettingDialog.vue                 |  18 +++++++++++++++++-
 src/styles/icons/chatgpt.png                  | Bin 0 -> 1201 bytes
 src/styles/ztree_icon.css                     |   4 ++++
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 src/styles/icons/chatgpt.png

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index ace44cbe4..63523ec02 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -67,7 +67,7 @@ export default {
         [this.$t('accounts.AccountTemplate'), ['template']],
         [this.$t('common.Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username']],
         [this.$t('assets.Secret'), [
-          'secret_type', 'secret', 'ssh_key', 'token',
+          'secret_type', 'password', 'ssh_key', 'token',
           'access_key', 'passphrase', 'api_key'
         ]],
         [this.$t('common.Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
@@ -173,7 +173,7 @@ export default {
             return this.platform || this.asset || this.addTemplate
           }
         },
-        secret: {
+        password: {
           label: this.$t('assets.Password'),
           component: UpdateToken,
           hidden: (formValue) => formValue.secret_type !== 'password' || this.addTemplate
@@ -200,7 +200,7 @@ export default {
           hidden: (formValue) => formValue.secret_type !== 'access_key' || this.addTemplate
         },
         api_key: {
-          id: 'access_key',
+          id: 'api_key',
           label: this.$t('assets.ApiKey'),
           component: UploadSecret,
           hidden: (formValue) => formValue.secret_type !== 'api_key' || this.addTemplate
@@ -300,11 +300,10 @@ export default {
       })
     },
     confirm(form) {
-      const secretType = form.secret_type || ''
-      if (secretType !== 'password') {
-        form.secret = form[secretType]
-      }
+      const secretType = form.secret_type || 'password'
+      form.secret = form[secretType]
       form.secret = this.encryptPassword ? encryptPassword(form.secret) : form.secret
+
       if (!form.secret) {
         delete form['secret']
       }
diff --git a/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue b/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue
index 05979388f..00855ca60 100644
--- a/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue
+++ b/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue
@@ -30,6 +30,7 @@
 
 <script>
 import { AutoDataForm, Dialog } from '@/components'
+import JsonEditor from '@/components/FormFields/JsonEditor.vue'
 
 export default {
   name: 'ProtocolSetting',
@@ -66,7 +67,22 @@ export default {
         ],
         fieldsMeta: {
           setting: {
-            fields: '__all__'
+            fields: '__all__',
+            fieldsMeta: {
+              username_selector: {
+                hidden: (formValue) => formValue['autofill'] !== 'basic'
+              },
+              password_selector: {
+                hidden: (formValue) => formValue['autofill'] !== 'basic'
+              },
+              submit_selector: {
+                hidden: (formValue) => formValue['autofill'] !== 'basic'
+              },
+              script: {
+                component: JsonEditor,
+                hidden: (formValue) => formValue['autofill'] !== 'script'
+              }
+            }
           }
         }
       }
diff --git a/src/styles/icons/chatgpt.png b/src/styles/icons/chatgpt.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd7e7143331b1aa1507de4c0c2656fd075dcd8c0
GIT binary patch
literal 1201
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRK3dtTpz6=aiY77hwEes65fI<x~
z7#K<o7#Ln9FfdrnU|<k0n6oR;1}MRl<n8Xl@V~wP%zhw`y~NYkmHjz8H@lV0v|v9A
zpuA&MNJL3cV!1*=QGQxxPO3slWkIS!MQ#BDgT?8op`MeT7;x<Q+*R4c!?EW14b|6X
zg0*j+`#0U*x?|dljf?hhxTtXkUHpDu|CjLe^KL~GA8r<(?US?h)v2R5R_!#sy~H>_
zIrjR&o}Xz_##fhSO<#1ko2w>0d&y?~zShv1i)&Xs>}*hqIHKchrdRYaQtUv|!mkXQ
zJH2aeA2pl4AyA>A_ZElTrZ;V?tBrQH9=s!^{bg5^_uQ@5on)T0J)dHcZ&b)WUr0G^
z$w#(N99lU#Nn%PLSk0#WVDwR&sUd&P_T8of40aXyF@DYUlTuhrBehnqx+}EgOo6%E
zq|MrH6InfZ&v%=*3s<n_`#%t4&QEBueta*J|Ipo|flDtOO;=%Gdg$K?CXoPxDa~t_
z#_?JmRDL7EcVbo}du8)gz4x`QPS4W!ac+}sRqEKYu(_>tiBYpZ=O=-^GNRV)SNi0t
zxV-xd?OR<B{8QSoBW%s$aHaot6<c;V>$5x({1_9Ye5^_8{)BkGHyrB~3tR<yZ(U`O
zDBGFud+MIf4PE8AD)+s%%}%Knb9?^G@6PI3c6ag&R^D`yO6%MdtrD;`^IBfHQ;_cV
zS53Yg%?DPknK8jqO6YIPx@)Vv5+`XHbY&ckp5Z95Sx)=>38~JG>o<B2eqdOpy=kAz
zHRDg#3A+^K*^e<-oz>fRV_VnXiCeYZPi~%BzhvS6D`{27C)i~b_y2L5%{=2?#^L=}
zpE0QQH7i_w__1>O{Jr0VU(Q(i{Bni)-XGo$UcVo{-!uQ&7k-VW`Jo#=PRnIrU{v;W
zaSV~T%zDsP<4B<d`-k_RZTA0e-x0iS$%{)99b+}SznI5#IjV@2nl*3tJgL%r@W7H8
zQ>SZpA52I{2z;g2%=1cY`s+#CCtE##_y4!8ojliJC!fl|<AJUY?q4$E>h>oKv~#_g
z@@tdU^>f!1zuYkV`Qwyy-b7Y&UF~)8>Mt*)><}o~nYv!%MpKZ3q}M0ILwcF&8trMh
zNh*74r#NJk9Da4#R(?mIIg??)Do4Sk<u{)$*w(vf&W$;I2A}GUi#l4iZ7OYx`<Rga
z`qB%7lGoF6=A6F}c6TAuq6%hfew91!s{4vGT{OHSOCEW$=bC$+F_${rzg;bp_h#i@
z=4^efw8;#QU&~}kE%)ENFm<<|_`ysLk;BHXlpS|}%i>~_n`{2&ro#vRUeod;v;0an
z0kflOiEBhjN@7W>RdP`(kYX@0Ff!IPFxNFS3^6dbGPSTWGSN0Lure_C-+OsAiiX_$
zl+3hB+#32WWQzkeXuxeK$;?eHE=dIDYfMWlAeP9bD(nI3kp$@p&QB{TPb^Aha7@Wh
gN>%X8O-xS>N=;0uEIgSCDpwdhUHx3vIVCg!0K)tHGynhq

literal 0
HcmV?d00001

diff --git a/src/styles/ztree_icon.css b/src/styles/ztree_icon.css
index 646cb1e09..045ee5de1 100644
--- a/src/styles/ztree_icon.css
+++ b/src/styles/ztree_icon.css
@@ -292,6 +292,10 @@
   background: url('./icons/website.png') no-repeat center left transparent;
 }
 
+.ztree li span.button.chatgpt_ico_docu {
+    background: url('./icons/chatgpt.png') no-repeat center left transparent;
+}
+
 .ztree li span.button.clickhouse_ico_docu {
   background: url('./icons/clickhouse.png') no-repeat center left transparent;
 }