From 67602604dda2c2fe9af54b265651a898feaa285d Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Fri, 1 Apr 2022 11:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=81=E4=B9=A6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=92=8C=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/views/@default/servers/certs/updatePopup.html | 6 +++---
 web/views/@default/servers/certs/updatePopup.js   | 5 +++++
 web/views/@default/servers/certs/uploadPopup.html | 6 +++---
 web/views/@default/servers/certs/uploadPopup.js   | 5 +++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/web/views/@default/servers/certs/updatePopup.html b/web/views/@default/servers/certs/updatePopup.html
index 32bb268c..f1aa7fdc 100644
--- a/web/views/@default/servers/certs/updatePopup.html
+++ b/web/views/@default/servers/certs/updatePopup.html
@@ -23,15 +23,15 @@
 			</td>
 		</tr>
 		<tr>
-			<td>选择证书文件</td>
+			<td><span v-if="textMode">输入证书内容</span><span v-else>选择证书文件</span></td>
 			<td>
                 <input type="file" name="certFile" accept="application/x-pem-file, application/pkcs10, application/x-pkcs12, application/x-x509-user-cert, application/x-x509-ca-cert, application/pkix-cert" v-if="!textMode"/>
-                <textarea class="wide-code" spellcheck="false" name="certText" placeholder="-----BEGIN CERTIFICATE-----" v-if="textMode" style="font-size: 0.7em"></textarea>
+                <textarea class="wide-code" ref="certTextField" spellcheck="false" name="certText" placeholder="-----BEGIN CERTIFICATE-----" v-if="textMode" style="font-size: 0.7em"></textarea>
                 <p class="comment"><a href="" @click.prevent="switchTextMode">[<span v-if="!textMode">输入内容</span><span v-else>上传文件</span>]</a>。文件内容中通常含有"-----BEGIN CERTIFICATE-----"类似的信息。</p>
 			</td>
 		</tr>
 		<tr v-show="isCA == 0">
-			<td>选择私钥文件</td>
+			<td><span v-if="textMode">输入私钥内容</span><span v-else>选择私钥文件</span></td>
 			<td>
                 <input type="file" name="keyFile" accept="application/pkcs8" v-if="!textMode"/>
                 <textarea class="wide-code" spellcheck="false" name="keyText" placeholder="-----BEGIN RSA PRIVATE KEY-----" v-if="textMode" style="font-size: 0.7em"></textarea>
diff --git a/web/views/@default/servers/certs/updatePopup.js b/web/views/@default/servers/certs/updatePopup.js
index 7d1f2a2d..7b59a9be 100644
--- a/web/views/@default/servers/certs/updatePopup.js
+++ b/web/views/@default/servers/certs/updatePopup.js
@@ -5,5 +5,10 @@ Tea.context(function () {
 
 	this.switchTextMode = function () {
 		this.textMode = !this.textMode
+		if (this.textMode) {
+			this.$delay(function () {
+				this.$refs.certTextField.focus()
+			})
+		}
 	}
 })
\ No newline at end of file
diff --git a/web/views/@default/servers/certs/uploadPopup.html b/web/views/@default/servers/certs/uploadPopup.html
index 79b1d314..ed33b2d6 100644
--- a/web/views/@default/servers/certs/uploadPopup.html
+++ b/web/views/@default/servers/certs/uploadPopup.html
@@ -22,15 +22,15 @@
 			</td>
 		</tr>
 		<tr>
-			<td>选择证书文件 *</td>
+			<td><span v-if="textMode">输入证书内容</span><span v-else>选择证书文件</span> *</td>
 			<td>
 				<input type="file" name="certFile" accept="application/x-pem-file, application/pkcs10, application/x-pkcs12, application/x-x509-user-cert, application/x-x509-ca-cert, application/pkix-cert" v-if="!textMode"/>
-                <textarea class="wide-code" spellcheck="false" name="certText" placeholder="-----BEGIN CERTIFICATE-----" v-if="textMode" style="font-size: 0.7em"></textarea>
+                <textarea class="wide-code" ref="certTextField" spellcheck="false" name="certText" placeholder="-----BEGIN CERTIFICATE-----" v-if="textMode" style="font-size: 0.7em"></textarea>
                 <p class="comment"><a href="" @click.prevent="switchTextMode">[<span v-if="!textMode">输入内容</span><span v-else>上传文件</span>]</a>。文件内容中通常含有"-----BEGIN CERTIFICATE-----"类似的信息。</p>
 			</td>
 		</tr>
 		<tr v-show="isCA == 0">
-			<td>选择私钥文件 *</td>
+			<td><span v-if="textMode">输入私钥内容</span><span v-else>选择私钥文件</span> *</td>
 			<td>
 				<input type="file" name="keyFile" accept="application/pkcs8" v-if="!textMode"/>
                 <textarea class="wide-code" spellcheck="false" name="keyText" placeholder="-----BEGIN RSA PRIVATE KEY-----" v-if="textMode" style="font-size: 0.7em"></textarea>
diff --git a/web/views/@default/servers/certs/uploadPopup.js b/web/views/@default/servers/certs/uploadPopup.js
index bc78183a..43186a6f 100644
--- a/web/views/@default/servers/certs/uploadPopup.js
+++ b/web/views/@default/servers/certs/uploadPopup.js
@@ -5,5 +5,10 @@ Tea.context(function () {
 
 	this.switchTextMode = function () {
 		this.textMode = !this.textMode
+		if (this.textMode) {
+			this.$delay(function () {
+				this.$refs.certTextField.focus()
+			})
+		}
 	}
 })
\ No newline at end of file