From 3a935831c6288841963a92ec5cefcaf93fd7de55 Mon Sep 17 00:00:00 2001 From: 0xJacky Date: Sun, 8 May 2022 16:18:03 +0800 Subject: [PATCH] Enhanced domain edit --- frontend/src/lazy.js | 4 +- frontend/src/locale/en/LC_MESSAGES/app.po | 59 ++++++------ frontend/src/locale/zh_CN/LC_MESSAGES/app.mo | Bin 7495 -> 7523 bytes frontend/src/locale/zh_CN/LC_MESSAGES/app.po | 59 ++++++------ frontend/src/locale/zh_TW/LC_MESSAGES/app.mo | Bin 7665 -> 7657 bytes frontend/src/locale/zh_TW/LC_MESSAGES/app.po | 65 +++++++------- frontend/src/translations.json | 2 +- frontend/src/views/domain/DomainAdd.vue | 9 +- frontend/src/views/domain/DomainEdit.vue | 90 ++++++++++++------- 9 files changed, 167 insertions(+), 121 deletions(-) diff --git a/frontend/src/lazy.js b/frontend/src/lazy.js index 510aa9cd..cfe42008 100644 --- a/frontend/src/lazy.js +++ b/frontend/src/lazy.js @@ -47,7 +47,8 @@ import { Tabs, Tooltip, Transfer, - Upload + Upload, + Tag } from 'ant-design-vue' Vue.use(ConfigProvider) @@ -97,6 +98,7 @@ Vue.use(Result) Vue.use(pageHeader) Vue.use(Switch) Vue.use(Space) +Vue.use(Tag) Vue.prototype.$confirm = Modal.confirm Vue.prototype.$message = message diff --git a/frontend/src/locale/en/LC_MESSAGES/app.po b/frontend/src/locale/en/LC_MESSAGES/app.po index d34b67eb..1cfc417e 100644 --- a/frontend/src/locale/en/LC_MESSAGES/app.po +++ b/frontend/src/locale/en/LC_MESSAGES/app.po @@ -27,14 +27,18 @@ msgstr "" msgid "Add Site" msgstr "" -#: src/views/domain/DomainAdd.vue:86 src/views/domain/DomainEdit.vue:172 +#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:164 msgid "Auto-renewal disabled for %{name}" msgstr "" -#: src/views/domain/DomainAdd.vue:80 src/views/domain/DomainEdit.vue:166 +#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:158 msgid "Auto-renewal enabled for %{name}" msgstr "" +#: src/views/domain/DomainEdit.vue:38 +msgid "Back" +msgstr "" + #: src/views/domain/DomainAdd.vue:37 msgid "Base information" msgstr "" @@ -43,7 +47,7 @@ msgstr "" msgid "Build with" msgstr "" -#: src/views/config/ConfigEdit.vue:5 src/views/domain/DomainEdit.vue:24 +#: src/views/config/ConfigEdit.vue:5 msgid "Cancel" msgstr "" @@ -111,7 +115,7 @@ msgstr "" msgid "Development Mode" msgstr "" -#: src/views/domain/DomainAdd.vue:88 src/views/domain/DomainEdit.vue:174 +#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:166 msgid "Disable auto-renewal failed for %{name}" msgstr "" @@ -120,7 +124,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: src/views/domain/DomainList.vue:55 +#: src/views/domain/DomainEdit.vue:180 src/views/domain/DomainList.vue:55 msgid "Disabled successfully" msgstr "" @@ -128,15 +132,15 @@ msgstr "" msgid "Disk IO" msgstr "" -#: src/views/domain/DomainEdit.vue:134 +#: src/views/domain/DomainEdit.vue:124 msgid "Do you want to change the template to support the TLS?" msgstr "" -#: src/views/domain/DomainAdd.vue:111 +#: src/views/domain/DomainAdd.vue:112 msgid "Domain Config Created Successfully" msgstr "" -#: src/views/domain/DomainEdit.vue:42 +#: src/views/domain/DomainEdit.vue:49 msgid "Edit %{n}" msgstr "" @@ -144,7 +148,7 @@ msgstr "" msgid "Edit Configuration" msgstr "" -#: src/views/domain/DomainEdit.vue:95 +#: src/views/domain/DomainEdit.vue:136 msgid "Edit Configuration File" msgstr "" @@ -156,11 +160,11 @@ msgstr "" msgid "Email (*)" msgstr "" -#: src/views/domain/DomainAdd.vue:82 src/views/domain/DomainEdit.vue:168 +#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:160 msgid "Enable auto-renewal failed for %{name}" msgstr "" -#: src/views/domain/DomainAdd.vue:39 +#: src/views/domain/DomainAdd.vue:40 msgid "Enable failed" msgstr "" @@ -168,12 +172,13 @@ msgstr "" msgid "Enable TLS" msgstr "" -#: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:3 -#: src/views/domain/DomainList.vue:16 +#: src/views/domain/DomainEdit.vue:73 src/views/domain/DomainList.vue:8 +#: src/views/domain/DomainList.vue:3 src/views/domain/DomainList.vue:16 msgid "Enabled" msgstr "" -#: src/views/domain/DomainAdd.vue:36 src/views/domain/DomainList.vue:46 +#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:172 +#: src/views/domain/DomainList.vue:46 msgid "Enabled successfully" msgstr "" @@ -181,11 +186,11 @@ msgstr "" msgid "Expiration Date: %{date}" msgstr "" -#: src/views/domain/DomainList.vue:59 +#: src/views/domain/DomainEdit.vue:183 src/views/domain/DomainList.vue:59 msgid "Failed to disable %{msg}" msgstr "" -#: src/views/domain/DomainList.vue:50 +#: src/views/domain/DomainEdit.vue:175 src/views/domain/DomainList.vue:50 msgid "Failed to enable %{msg}" msgstr "" @@ -198,7 +203,7 @@ msgid "Finished" msgstr "" #: src/views/domain/DomainAdd.vue:13 src/views/domain/DomainAdd.vue:2 -#: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainEdit.vue:3 +#: src/views/domain/DomainEdit.vue:22 src/views/domain/DomainEdit.vue:3 msgid "Getting Certificate from Let's Encrypt" msgstr "" @@ -259,7 +264,7 @@ msgstr "" msgid "Logout successful" msgstr "" -#: src/views/domain/DomainEdit.vue:12 src/views/domain/DomainEdit.vue:6 +#: src/views/domain/DomainEdit.vue:25 src/views/domain/DomainEdit.vue:6 msgid "" "Make sure you have configured a reverse proxy for .well-known directory to " "HTTPChallengePort (default: 9180) before getting the certificate." @@ -367,17 +372,17 @@ msgstr "" msgid "Root Directory (root)" msgstr "" -#: src/views/config/ConfigEdit.vue:6 src/views/domain/DomainEdit.vue:27 +#: src/views/config/ConfigEdit.vue:6 src/views/domain/DomainEdit.vue:41 msgid "Save" msgstr "" -#: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:43 -#: src/views/domain/DomainAdd.vue:54 src/views/domain/DomainEdit.vue:152 +#: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:44 +#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:142 msgid "Save error %{msg}" msgstr "" -#: src/views/config/ConfigEdit.vue:44 src/views/domain/DomainAdd.vue:33 -#: src/views/domain/DomainAdd.vue:51 src/views/domain/DomainEdit.vue:146 +#: src/views/config/ConfigEdit.vue:44 src/views/domain/DomainAdd.vue:34 +#: src/views/domain/DomainAdd.vue:52 src/views/domain/DomainEdit.vue:136 msgid "Saved successfully" msgstr "" @@ -385,7 +390,7 @@ msgstr "" msgid "Send" msgstr "" -#: src/views/config/ConfigEdit.vue:35 src/views/domain/DomainEdit.vue:72 +#: src/views/config/ConfigEdit.vue:35 src/views/domain/DomainEdit.vue:75 #: src/views/other/Login.vue:35 msgid "Server error" msgstr "" @@ -438,7 +443,7 @@ msgstr "" msgid "The filename cannot contain the following characters: %{c}" msgstr "" -#: src/views/domain/DomainEdit.vue:4 +#: src/views/domain/DomainEdit.vue:17 msgid "" "The following values will only take effect if you have the corresponding " "fields in your configuration file. The configuration filename cannot be " @@ -446,11 +451,11 @@ msgid "" msgstr "" #: src/views/domain/DomainAdd.vue:15 src/views/domain/DomainAdd.vue:4 -#: src/views/domain/DomainEdit.vue:11 src/views/domain/DomainEdit.vue:5 +#: src/views/domain/DomainEdit.vue:24 src/views/domain/DomainEdit.vue:5 msgid "This feature is not available in demo." msgstr "" -#: src/views/domain/DomainEdit.vue:135 +#: src/views/domain/DomainEdit.vue:125 msgid "This operation will lose the custom configuration." msgstr "" diff --git a/frontend/src/locale/zh_CN/LC_MESSAGES/app.mo b/frontend/src/locale/zh_CN/LC_MESSAGES/app.mo index c1d0d21445b640a1ac91d8a19a1536e3f4e91079..095d1bfbbead18364d2a37ffd5aca33a855450bf 100644 GIT binary patch delta 2428 zcmXxlZ%kHI9Ki7-B8pIwC|UwxqNXW<1uCYcWJr;LCYGjej3vm|K;tbpr%lF}x+#f^-bU5A*B7flo7n%z1-~#**EAaw4 zkitCL#&UGvjX0D3!xl1=Dd@l&>_!LlCfeW#Ip-q)D2!BH~3_zzmKhYNj%{^$_8XKx`@LK+>w$7si&;Y>V(uGDCJ zK8CK~I69CVM%963n1#L5Sbt~SM}Zx_fL1(?b8t9%9$k?!D-NS0J{|9WKnL$8@q60XFHuwR0c+R5(_!F(?OU$Z<$>@DC z&ck_Vy?V66ZRp$bC|d6sbbyDV{rI%+|4=L_=IC2tQM3mAVIA7=o$-E0v>mPA5q%Qf zibLoY_MrnA!h7%}+TJ8iyyj!dr7R@F7(!`uIr{oFp@*as?WiyMGV*UCyn#0KHnI!h zy?Fl>y3}XU-~AHHFQEgwjQoYEb69^1=F^)MtI-D6MH`|`=uEbv^}6s=JctW%4ga~G z!oBF$T|mpTOOpCa(5+aBu26lvZ!Tf|ok=SN6YxI5AFd}%&fdK>c_>>lx#Y4HYKh8N zwi@kx6+v^Exovv6~39ckudE@$Xrt!U?buGem|L}Yl*$YI&Vn(2|je0PxC$t zNbL!kYZ=!z!X;ionC?#q4@Uh=`|WqN{c^g^H~IcQK&G7dKY1_~5KD;$;s(OBCL!D! zl{<(gVy!o%yNHJ~x#ZRLaPK6x#IjB3N6J*6xw1ZsGZ|j5sQ9{>niImkxGd%$!UM#1 v!tcOxf^!(^h&_am9@Jg{d#UiUe2$>13$m?O8T1_-BbPpy??+_ delta 2402 zcmXZdZA_L`7{Kv^T0kI>VTP!YCPpYJq9mq5Vkw3AZZAej8IjS4WKx+uEv&XyOV-TV zs`&ks$X zG-Xatns6XddWmVozVRv9@ca2}D9wc_O~e*F4?EC9o3Q}5;bpi3tMDl-!^3z19t}^R z*NxyM_zliXDU;4pnMA`R&Yps^u^gA7?HjNJcc6*%#s1^SFAcJxi}W&9h8^%m~!>7@Eb`Uuwy^1FA7CP{|=u#dJ!0 z7;Olv7|n#g#(Ml0?YHitTt7?DnYWX|&{iCu$3uerQWsB-?YqOh=mq=G*KIHy ziuP0CC_3O-^!k6098w5V7W=-;v)Io^ z&#OfTT#mjao6zgJ(1d!z-S`Om1F`QDU+nuo(F#sQFPwvRTo?N-;cE1}j&K{gq&?`& zcA<$3Uy%_s% zqf7lBdflhd{wV+PvvD_Jxid$0 zdnw!7375Jt+mg~v;T@r$=X(j4+qc5oTTk3d%p#&>vfq6_By)+?#FcSmS-3ouRfJD= zGht~X?#b42|7_mt+lWokwjM8!`gLJVxF)N;QGD+$>vE)xxFG7?*h}0(_>?aue44K% b?jkIUh#QD0&$k!$4jn73EgBjtf1u!h?6S3K diff --git a/frontend/src/locale/zh_CN/LC_MESSAGES/app.po b/frontend/src/locale/zh_CN/LC_MESSAGES/app.po index 910fc053..34914ff5 100644 --- a/frontend/src/locale/zh_CN/LC_MESSAGES/app.po +++ b/frontend/src/locale/zh_CN/LC_MESSAGES/app.po @@ -29,14 +29,18 @@ msgstr "操作" msgid "Add Site" msgstr "添加站点" -#: src/views/domain/DomainAdd.vue:86 src/views/domain/DomainEdit.vue:172 +#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:164 msgid "Auto-renewal disabled for %{name}" msgstr "成功关闭 %{name} 自动续签" -#: src/views/domain/DomainAdd.vue:80 src/views/domain/DomainEdit.vue:166 +#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:158 msgid "Auto-renewal enabled for %{name}" msgstr "成功启用 %{name} 自动续签" +#: src/views/domain/DomainEdit.vue:38 +msgid "Back" +msgstr "返回" + #: src/views/domain/DomainAdd.vue:37 msgid "Base information" msgstr "基本信息" @@ -45,7 +49,7 @@ msgstr "基本信息" msgid "Build with" msgstr "构建基于" -#: src/views/config/ConfigEdit.vue:5 src/views/domain/DomainEdit.vue:24 +#: src/views/config/ConfigEdit.vue:5 msgid "Cancel" msgstr "取消" @@ -113,7 +117,7 @@ msgstr "检测到版本更新，页面将会刷新。" msgid "Development Mode" msgstr "开发模式" -#: src/views/domain/DomainAdd.vue:88 src/views/domain/DomainEdit.vue:174 +#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:166 msgid "Disable auto-renewal failed for %{name}" msgstr "关闭 %{name} 自动续签失败" @@ -122,7 +126,7 @@ msgstr "关闭 %{name} 自动续签失败" msgid "Disabled" msgstr "禁用" -#: src/views/domain/DomainList.vue:55 +#: src/views/domain/DomainEdit.vue:180 src/views/domain/DomainList.vue:55 msgid "Disabled successfully" msgstr "禁用成功" @@ -130,15 +134,15 @@ msgstr "禁用成功" msgid "Disk IO" msgstr "磁盘 IO" -#: src/views/domain/DomainEdit.vue:134 +#: src/views/domain/DomainEdit.vue:124 msgid "Do you want to change the template to support the TLS?" msgstr "你想要改变模板以支持 TLS 吗？" -#: src/views/domain/DomainAdd.vue:111 +#: src/views/domain/DomainAdd.vue:112 msgid "Domain Config Created Successfully" msgstr "域名配置文件创建成功" -#: src/views/domain/DomainEdit.vue:42 +#: src/views/domain/DomainEdit.vue:49 msgid "Edit %{n}" msgstr "编辑 %{n}" @@ -146,7 +150,7 @@ msgstr "编辑 %{n}" msgid "Edit Configuration" msgstr "编辑配置" -#: src/views/domain/DomainEdit.vue:95 +#: src/views/domain/DomainEdit.vue:136 msgid "Edit Configuration File" msgstr "编辑配置文件" @@ -158,11 +162,11 @@ msgstr "编辑站点" msgid "Email (*)" msgstr "邮箱 (*)" -#: src/views/domain/DomainAdd.vue:82 src/views/domain/DomainEdit.vue:168 +#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:160 msgid "Enable auto-renewal failed for %{name}" msgstr "启用 %{name} 自动续签失败" -#: src/views/domain/DomainAdd.vue:39 +#: src/views/domain/DomainAdd.vue:40 msgid "Enable failed" msgstr "启用失败" @@ -170,12 +174,13 @@ msgstr "启用失败" msgid "Enable TLS" msgstr "启用 TLS" -#: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:3 -#: src/views/domain/DomainList.vue:16 +#: src/views/domain/DomainEdit.vue:73 src/views/domain/DomainList.vue:8 +#: src/views/domain/DomainList.vue:3 src/views/domain/DomainList.vue:16 msgid "Enabled" msgstr "启用" -#: src/views/domain/DomainAdd.vue:36 src/views/domain/DomainList.vue:46 +#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:172 +#: src/views/domain/DomainList.vue:46 msgid "Enabled successfully" msgstr "启用成功" @@ -183,11 +188,11 @@ msgstr "启用成功" msgid "Expiration Date: %{date}" msgstr "过期时间: %{date}" -#: src/views/domain/DomainList.vue:59 +#: src/views/domain/DomainEdit.vue:183 src/views/domain/DomainList.vue:59 msgid "Failed to disable %{msg}" msgstr "禁用失败 %{msg}" -#: src/views/domain/DomainList.vue:50 +#: src/views/domain/DomainEdit.vue:175 src/views/domain/DomainList.vue:50 msgid "Failed to enable %{msg}" msgstr "启用失败 %{msg}" @@ -200,7 +205,7 @@ msgid "Finished" msgstr "完成" #: src/views/domain/DomainAdd.vue:13 src/views/domain/DomainAdd.vue:2 -#: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainEdit.vue:3 +#: src/views/domain/DomainEdit.vue:22 src/views/domain/DomainEdit.vue:3 msgid "Getting Certificate from Let's Encrypt" msgstr "从 Let's Encrypt 获取证书" @@ -261,7 +266,7 @@ msgstr "登录成功" msgid "Logout successful" msgstr "登出成功" -#: src/views/domain/DomainEdit.vue:12 src/views/domain/DomainEdit.vue:6 +#: src/views/domain/DomainEdit.vue:25 src/views/domain/DomainEdit.vue:6 msgid "" "Make sure you have configured a reverse proxy for .well-known directory to " "HTTPChallengePort (default: 9180) before getting the certificate." @@ -371,17 +376,17 @@ msgstr "下载" msgid "Root Directory (root)" msgstr "网站根目录 (root)" -#: src/views/config/ConfigEdit.vue:6 src/views/domain/DomainEdit.vue:27 +#: src/views/config/ConfigEdit.vue:6 src/views/domain/DomainEdit.vue:41 msgid "Save" msgstr "保存" -#: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:43 -#: src/views/domain/DomainAdd.vue:54 src/views/domain/DomainEdit.vue:152 +#: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:44 +#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:142 msgid "Save error %{msg}" msgstr "保存错误 %{msg}" -#: src/views/config/ConfigEdit.vue:44 src/views/domain/DomainAdd.vue:33 -#: src/views/domain/DomainAdd.vue:51 src/views/domain/DomainEdit.vue:146 +#: src/views/config/ConfigEdit.vue:44 src/views/domain/DomainAdd.vue:34 +#: src/views/domain/DomainAdd.vue:52 src/views/domain/DomainEdit.vue:136 msgid "Saved successfully" msgstr "保存成功" @@ -389,7 +394,7 @@ msgstr "保存成功" msgid "Send" msgstr "上传" -#: src/views/config/ConfigEdit.vue:35 src/views/domain/DomainEdit.vue:72 +#: src/views/config/ConfigEdit.vue:35 src/views/domain/DomainEdit.vue:75 #: src/views/other/Login.vue:35 msgid "Server error" msgstr "服务器错误" @@ -444,7 +449,7 @@ msgstr "" msgid "The filename cannot contain the following characters: %{c}" msgstr "文件名不能包含以下字符: %{c}" -#: src/views/domain/DomainEdit.vue:4 +#: src/views/domain/DomainEdit.vue:17 msgid "" "The following values will only take effect if you have the corresponding " "fields in your configuration file. The configuration filename cannot be " @@ -454,11 +459,11 @@ msgstr "" "可修改。" #: src/views/domain/DomainAdd.vue:15 src/views/domain/DomainAdd.vue:4 -#: src/views/domain/DomainEdit.vue:11 src/views/domain/DomainEdit.vue:5 +#: src/views/domain/DomainEdit.vue:24 src/views/domain/DomainEdit.vue:5 msgid "This feature is not available in demo." msgstr "该功能在 Demo 中不可用。" -#: src/views/domain/DomainEdit.vue:135 +#: src/views/domain/DomainEdit.vue:125 msgid "This operation will lose the custom configuration." msgstr "该操作将会丢失自定义配置。" diff --git a/frontend/src/locale/zh_TW/LC_MESSAGES/app.mo b/frontend/src/locale/zh_TW/LC_MESSAGES/app.mo index 5e19da1f5835b9b5529100a2d696e7052f7921d9..44d456009bf41ab3e9c0c2891dd35ae0a29996af 100644 GIT binary patch delta 2495 zcmYk7d2E$M6i26vwJlKEQdDRW9v}rlDT{2CwJ4&fl%;M^EJayrMf?LB7hYm)LJf&Y zfe?cWnqoAOgzz*3*QyDKF{vdOG~!Z8MbsGFmm2k)z9He}{k}7I=9`&2cV@o#Q{|b; z$KhPki}Cg46e40gb5cor7I-(Wt> z;USB7*j@%1Cm9kHE}>#H91iEgVz>rg3?G0c@QGO81`F^HLIXP-{o{~dIK_iG!;f$j z{1aBdp?%T;Er#XzbugFtLkoq0RJ1}D{UV$K_d^3Z4IMDQZ#u9NXkg{g`q_~Sp#dy~ zPFxEOuo*h;cIZNOLl?YXGJiNq!2!R9uIz7UYV+vrK*i9Ar$bX(2aDkS&{RGK`Gpo9 zPP7Y7fX~AIuoDh~UC{A+pj(-blXSpB3J#cn+u$U~FSPR@me3J-60&FE3}lRO78=06 z(228{%}n-zZear2J{g*+>Cix`U;|v)pZsT1I7$WQE_?`G`A5)+KZSPq29`pXFUz2r znFeVJtDx_1gs$viXh4rb19}`9$R6lI_d)|aSV;bD_<#zwIds6m@H6OuzeD#li(bB0 z0L{Pv=mdkI6AX{-(;&$RGvP0A5u5?%Fk1>f1Py%rfDk6anj{4$Xn_v61Db)SpaJZK zPIv%jWrT1D@(XWrlC1BH`~>>`m(c6@Lu3Kb`CbLIeQM-<$S)+Td9ui`7W!fnG&M=+ z>2HO0d^Og;3r+dQvA!GH?`P;j{)+9{7p41^K=(cYFN0&@Bv_qpPljd+M%)S==#_Ls zcpcjDeK-algO|d8pj%bSl`*h#Xuy-BzW^G@vdC4?@i)ZwZP0n1?Dg6IJroE!?1QHE zy~q>Lm3|NH&;t!1lgsOX3Fux|LEl>feQz}+`(b_bx4;qj&Coz!g3k8_?C1SIM!}9> zL05D-@>jSSKZ7e^eN$vJbi!6>hMtf0FGI&U6xkl@k3=4azTX9V7Y5zt&_m&7Sj5qH zfI8^?UKjn%(3Cy`i79N2d=8q4*Pv(RBs9?fBKvYzz1D-E;|_uBUKknu%2MvXDW6A$ z9cyAkJv71%kg>vp(ccMuZ!dJf1CfU!+o20O0)6lE$nW4`{6FAG_!j?kP4HA1`F8~? zhNM5STc90ZfMy^C4dfkYpq4a`2;669&0fUZY(qqXRqUFrUp zqZ)Jv@-NsF--OQDG76^O50EwtZA8_`ptS3dw_+lih0eDrIGfOY=U2wE^9L3a#-TbL zjE`1WhoU?b$x_``3z@csZ60`8fIZ7=3y=7V2k(fz)ad*sD$==`!Mon{roVteT6gd6wbob zv0*}SoJqR^m3R~8GQYh@MT^~urPzr|Xb?5vFekT-)GZuFjW>dU28?j@9h`tV@d!W6ZG-N2sC#w}xyCM_68Hx-@fFO)QOv5H zilL5|pmuOBDv@$*#8sGzedE}Fo;N#2hgN9ShX`3i^086?OjasMqkaTR?W|U*xVtC0xS~YqCwKae{4Bv?V)GPkk5a!cV+^5Vh53ynh&V z;lHRAq)Z5pXP~Z&q3(GRPRBULvBr;gpc3su#tH0WKkymq!Y{E1PvT7&;hobhnu?mB z1eNeYZ&#rbS?$)NCTQ{FucH#)-|5TsF?kTTImStf;3)MC6JC9un2XJ zS774dL!H-v?7D6Cb~{d`-GNH<1Js0lsJG`N>bmooq4)m}Rq#J-#VC)y+S}X?)P!BA z9XjCsJ*a_t-2v}E;hsjFKZJ>ep%O{sNw30*7-)bERFqjWs=XDprEN$~_L{pNwG*GB zo|SW`L`UaD#FtK;HxuiLd)1&c5&Ed`eA(kfIq^J^EQM5_A+*Eu36e_C-X1d?{a6Com9wv*Pj~T@6#4_SGVgr#Zi;@+*k9e3^?0qY+(d&Gnc{|wu zr>W=zqw*-Bua-(>h~4TgcZJ?-l}AFX8s~Vu0h@`{guV;&2%bY*Levu~rNl}izq2j6 ivHMcAJ(8bZcIf you do not have a certificate before, please click \"Getting Certificate from Let's Encrypt\" first.":"系统将会每小时检测一次该域名证书，若距离上次签发已超过1个月，则将自动续签。
如果您之前没有证书，请先点击 \"从 Let's Encrypt 获取证书\"。","The filename cannot contain the following characters: %{c}":"文件名不能包含以下字符: %{c}","The following values will only take effect if you have the corresponding fields in your configuration file. The configuration filename cannot be changed after it has been created.":"只有在您的配置文件中有相应字段时，下列的配置才能生效。配置文件名称创建后不可修改。","This feature is not available in demo.":"该功能在 Demo 中不可用。","This operation will lose the custom configuration.":"该操作将会丢失自定义配置。","Updated at":"修改时间","Uptime:":"运行时间:","Username":"用户名","Username (*)":"用户名 (*)","Writes":"写"},"zh_TW":{"404 Not Found":"404 未找到頁面","About":"關於","Action":"操作","Add Site":"新增站點","Auto-renewal disabled for %{name}":"成功關閉 %{name} 自動續簽","Auto-renewal enabled for %{name}":"成功啟用 %{name} 自動續簽","Base information":"基本訊息","Build with":"構建基於","Cancel":"取消","Certificate Auto-renewal":"證書自動續簽","Certificate has expired":"此證書已過期","Certificate is valid":"此證書有效","Certificate Path (ssl_certificate)":"TLS 證書路徑 (ssl_certificate)","Certificate Status":"證書狀態","Configuration Name":"配置名稱","Configurations":"配置","Configure SSL":"配置 SSL","CPU Status":"中央處理器狀態","CPU:":"中央處理器:","Create Another":"再創建一個","Created at":"建立時間","Dashboard":"儀表盤","Database (Optional, default: database)":"資料庫 (可選，預設: database)","Detected version update, this page will refresh.":"檢測到版本更新，頁面將會重新整理。","Development Mode":"開發模式","Disable auto-renewal failed for %{name}":"關閉 %{name} 自動續簽失敗","Disabled":"禁用","Disabled successfully":"禁用成功","Disk IO":"磁碟 IO","Do you want to change the template to support the TLS?":"你想要改變模板以支援 TLS 嗎？","Domain Config Created Successfully":"域名配置文件創建成功","Edit %{n}":"編輯 %{n}","Edit Configuration":"編輯配置","Edit Configuration File":"編輯配置檔案","Edit Site":"編輯站點","Email (*)":"郵箱 (*)","Enable auto-renewal failed for %{name}":"啟用 %{name} 自動續簽失敗","Enable failed":"啟用失敗","Enable TLS":"啟用 TLS","Enabled":"啟用","Enabled successfully":"啟用成功","Expiration Date: %{date}":"過期時間: %{date}","Failed to disable %{msg}":"禁用失敗 %{msg}","Failed to enable %{msg}":"啟用失敗 %{msg}","File Not Found":"未找到檔案","Finished":"完成","Getting Certificate from Let's Encrypt":"從 Let's Encrypt 獲取證書","Getting the certificate, please wait...":"正在獲取證書，請稍等...","Home":"首頁","HTTP Listen Port":"HTTP 監聽埠","HTTPS Listen Port":"HTTPS 監聽埠","Index (index)":"網站首頁 (index)","Install":"安裝","Intermediate Certification Authorities: %{issuer}":"中級證書頒發機構: %{issuer}","Invalid E-mail!":"無效的郵箱！","Leave blank for no change":"留空表示不修改","License":{"Project":"開源許可"},"Load Averages:":"系統負載:","Login":"登入","Login successful":"登入成功","Logout successful":"登出成功","Manage Configs":"配置管理","Manage Sites":"網站管理","Manage Users":"使用者管理","Memory":"記憶體","Modify Config":"修改配置","Name":"名稱","Network":"網路","Network Total Receive":"下載流量","Network Total Send":"上傳流量","Next":"下一步","Not Found":"找不到頁面","Not Valid Before: %{date}":"此前無效: %{date}","Note: The server_name in the current configuration must be the domain name you need to get the certificate.":"注意：當前配置中的 server_name 必須為需要申請證書的域名。","OK":"確定","OS:":"作業系統:","Password":"密碼","Password (*)":"密碼 (*)","Please input your E-mail!":"請輸入您的郵箱！","Please input your password!":"請輸入您的密碼！","Please input your username!":"請輸入您的使用者名稱！","Private Key Path (ssl_certificate_key)":"私鑰路徑 (ssl_certificate_key)","Project Team":"專案團隊","Reads":"讀","Receive":"下載","Root Directory (root)":"網站根目錄 (root)","Save":"儲存","Save error %{msg}":"儲存錯誤 %{msg}","Saved successfully":"儲存成功","Send":"上傳","Server error":"伺服器錯誤","Server Info":"伺服器資訊","Server Names (server_name)":"網站域名 (server_name)","Sites List":"站點列表","Skip":"跳過","Status":"狀態","Storage":"儲存","Subject Name: %{name}":"主體名稱: %{name}","Swap":"交換空間","System message":"系統訊息","The certificate for the domain will be checked every hour, and will be renewed if it has been more than 1 month since it was last issued.
If you do not have a certificate before, please click \"Getting Certificate from Let's Encrypt\" first.":"系統將會每小時檢測一次該域名證書，若距離上次簽發已超過1個月，則將自動續簽。
如果您之前沒有證書，請先點選「從 Let's Encrypt 獲取證書」。","The filename cannot contain the following characters: %{c}":"檔名不能包含以下字元: %{c}","This feature is not available in demo.":"此功能在演示中不可用。","This operation will lose the custom configuration.":"該操作將會丟失自定義配置。","Updated at":"修改時間","Uptime:":"執行時間:","Username":"使用者名稱","Username (*)":"使用者名稱 (*)","Writes":"寫"}} \ No newline at end of file +{"en":{},"zh_CN":{"404 Not Found":"404 未找到页面","About":"关于","Action":"操作","Add Site":"添加站点","Auto-renewal disabled for %{name}":"成功关闭 %{name} 自动续签","Auto-renewal enabled for %{name}":"成功启用 %{name} 自动续签","Back":"返回","Base information":"基本信息","Build with":"构建基于","Cancel":"取消","Certificate Auto-renewal":"证书自动续签","Certificate has expired":"此证书已过期","Certificate is valid":"此证书有效","Certificate Path (ssl_certificate)":"TLS 证书路径 (ssl_certificate)","Certificate Status":"证书状态","Configuration Name":"配置名称","Configurations":"配置","Configure SSL":"配置 SSL","CPU Status":"CPU 状态","Create Another":"再创建一个","Created at":"创建时间","Dashboard":"仪表盘","Database (Optional, default: database)":"数据库 (可选，默认: database)","Detected version update, this page will refresh.":"检测到版本更新，页面将会刷新。","Development Mode":"开发模式","Disable auto-renewal failed for %{name}":"关闭 %{name} 自动续签失败","Disabled":"禁用","Disabled successfully":"禁用成功","Disk IO":"磁盘 IO","Do you want to change the template to support the TLS?":"你想要改变模板以支持 TLS 吗？","Domain Config Created Successfully":"域名配置文件创建成功","Edit %{n}":"编辑 %{n}","Edit Configuration":"编辑配置","Edit Configuration File":"编辑配置文件","Edit Site":"编辑站点","Email (*)":"邮箱 (*)","Enable auto-renewal failed for %{name}":"启用 %{name} 自动续签失败","Enable failed":"启用失败","Enable TLS":"启用 TLS","Enabled":"启用","Enabled successfully":"启用成功","Expiration Date: %{date}":"过期时间: %{date}","Failed to disable %{msg}":"禁用失败 %{msg}","Failed to enable %{msg}":"启用失败 %{msg}","File Not Found":"未找到文件","Finished":"完成","Getting Certificate from Let's Encrypt":"从 Let's Encrypt 获取证书","Getting the certificate, please wait...":"正在获取证书，请稍等...","Home":"首页","HTTP Listen Port":"HTTP 监听端口","HTTPS Listen Port":"HTTPS 监听端口","Index (index)":"网站首页 (index)","Install":"安装","Intermediate Certification Authorities: %{issuer}":"中级证书颁发机构: %{issuer}","Invalid E-mail!":"无效的邮箱！","Leave blank for no change":"留空表示不修改","License":{"Project":"开源许可"},"Load Averages:":"系统负载:","Login":"登录","Login successful":"登录成功","Logout successful":"登出成功","Make sure you have configured a reverse proxy for .well-known directory to HTTPChallengePort (default: 9180) before getting the certificate.":"在获取签发证书前，请确保配置文件中已将 .well-known 目录反向代理到 HTTPChallengePort (默认: 9180)","Manage Configs":"配置管理","Manage Sites":"网站管理","Manage Users":"用户管理","Memory":"内存","Modify Config":"修改配置文件","Name":"名称","Network":"网络","Network Total Receive":"下载流量","Network Total Send":"上传流量","Next":"下一步","Not Found":"找不到页面","Not Valid Before: %{date}":"此前无效: %{date}","Note: The server_name in the current configuration must be the domain name you need to get the certificate.":"注意：当前配置中的 server_name 必须为需要申请证书的域名。","OK":"确定","Password":"密码","Password (*)":"密码 (*)","Please input your E-mail!":"请输入您的邮箱！","Please input your password!":"请输入您的密码！","Please input your username!":"请输入您的用户名！","Private Key Path (ssl_certificate_key)":"私钥路径 (ssl_certificate_key)","Project Team":"项目团队","Reads":"读","Receive":"下载","Root Directory (root)":"网站根目录 (root)","Save":"保存","Save error %{msg}":"保存错误 %{msg}","Saved successfully":"保存成功","Send":"上传","Server error":"服务器错误","Server Info":"服务器信息","Server Names (server_name)":"网站域名 (server_name)","Sites List":"站点列表","Skip":"跳过","Status":"状态","Storage":"存储","Subject Name: %{name}":"主体名称: %{name}","System message":"系统消息","The certificate for the domain will be checked every hour, and will be renewed if it has been more than 1 month since it was last issued.
If you do not have a certificate before, please click \"Getting Certificate from Let's Encrypt\" first.":"系统将会每小时检测一次该域名证书，若距离上次签发已超过1个月，则将自动续签。
如果您之前没有证书，请先点击 \"从 Let's Encrypt 获取证书\"。","The filename cannot contain the following characters: %{c}":"文件名不能包含以下字符: %{c}","The following values will only take effect if you have the corresponding fields in your configuration file. The configuration filename cannot be changed after it has been created.":"只有在您的配置文件中有相应字段时，下列的配置才能生效。配置文件名称创建后不可修改。","This feature is not available in demo.":"该功能在 Demo 中不可用。","This operation will lose the custom configuration.":"该操作将会丢失自定义配置。","Updated at":"修改时间","Uptime:":"运行时间:","Username":"用户名","Username (*)":"用户名 (*)","Writes":"写"},"zh_TW":{"404 Not Found":"404 未找到頁面","About":"關於","Action":"操作","Add Site":"新增站點","Auto-renewal disabled for %{name}":"成功關閉 %{name} 自動續簽","Auto-renewal enabled for %{name}":"成功啟用 %{name} 自動續簽","Back":"返回","Base information":"基本訊息","Build with":"構建基於","Cancel":"取消","Certificate Auto-renewal":"證書自動續簽","Certificate has expired":"此證書已過期","Certificate is valid":"此證書有效","Certificate Path (ssl_certificate)":"TLS 證書路徑 (ssl_certificate)","Certificate Status":"證書狀態","Configuration Name":"配置名稱","Configurations":"配置","Configure SSL":"配置 SSL","CPU Status":"中央處理器狀態","CPU:":"中央處理器:","Create Another":"再創建一個","Created at":"建立時間","Dashboard":"儀表盤","Database (Optional, default: database)":"資料庫 (可選，預設: database)","Detected version update, this page will refresh.":"檢測到版本更新，頁面將會重新整理。","Development Mode":"開發模式","Disable auto-renewal failed for %{name}":"關閉 %{name} 自動續簽失敗","Disabled":"禁用","Disabled successfully":"禁用成功","Disk IO":"磁碟 IO","Do you want to change the template to support the TLS?":"你想要改變模板以支援 TLS 嗎？","Domain Config Created Successfully":"域名配置文件創建成功","Edit %{n}":"編輯 %{n}","Edit Configuration":"編輯配置","Edit Configuration File":"編輯配置檔案","Edit Site":"編輯站點","Email (*)":"郵箱 (*)","Enable auto-renewal failed for %{name}":"啟用 %{name} 自動續簽失敗","Enable failed":"啟用失敗","Enable TLS":"啟用 TLS","Enabled":"啟用","Enabled successfully":"啟用成功","Expiration Date: %{date}":"過期時間: %{date}","Failed to disable %{msg}":"禁用失敗 %{msg}","Failed to enable %{msg}":"啟用失敗 %{msg}","File Not Found":"未找到檔案","Finished":"完成","Getting Certificate from Let's Encrypt":"從 Let's Encrypt 獲取證書","Getting the certificate, please wait...":"正在獲取證書，請稍等...","Home":"首頁","HTTP Listen Port":"HTTP 監聽埠","HTTPS Listen Port":"HTTPS 監聽埠","Index (index)":"網站首頁 (index)","Install":"安裝","Intermediate Certification Authorities: %{issuer}":"中級證書頒發機構: %{issuer}","Invalid E-mail!":"無效的郵箱！","Leave blank for no change":"留空表示不修改","License":{"Project":"開源許可"},"Load Averages:":"系統負載:","Login":"登入","Login successful":"登入成功","Logout successful":"登出成功","Make sure you have configured a reverse proxy for .well-known directory to HTTPChallengePort (default: 9180) before getting the certificate.":"在獲取證書前，請確保配置檔案中已將 .well-known 目錄反向代理到 HTTPChallengePort (預設: 9180)","Manage Configs":"配置管理","Manage Sites":"網站管理","Manage Users":"使用者管理","Memory":"記憶體","Modify Config":"修改配置","Name":"名稱","Network":"網路","Network Total Receive":"下載流量","Network Total Send":"上傳流量","Next":"下一步","Not Found":"找不到頁面","Not Valid Before: %{date}":"此前無效: %{date}","Note: The server_name in the current configuration must be the domain name you need to get the certificate.":"注意：當前配置中的 server_name 必須為需要申請證書的域名。","OK":"確定","OS:":"作業系統:","Password":"密碼","Password (*)":"密碼 (*)","Please input your E-mail!":"請輸入您的郵箱！","Please input your password!":"請輸入您的密碼！","Please input your username!":"請輸入您的使用者名稱！","Private Key Path (ssl_certificate_key)":"私鑰路徑 (ssl_certificate_key)","Project Team":"專案團隊","Reads":"讀","Receive":"下載","Root Directory (root)":"網站根目錄 (root)","Save":"儲存","Save error %{msg}":"儲存錯誤 %{msg}","Saved successfully":"儲存成功","Send":"上傳","Server error":"伺服器錯誤","Server Info":"伺服器資訊","Server Names (server_name)":"網站域名 (server_name)","Sites List":"站點列表","Skip":"跳過","Status":"狀態","Storage":"儲存","Subject Name: %{name}":"主體名稱: %{name}","Swap":"交換空間","System message":"系統訊息","The certificate for the domain will be checked every hour, and will be renewed if it has been more than 1 month since it was last issued.
If you do not have a certificate before, please click \"Getting Certificate from Let's Encrypt\" first.":"系統將會每小時檢測一次該域名證書，若距離上次簽發已超過1個月，則將自動續簽。
如果您之前沒有證書，請先點選「從 Let's Encrypt 獲取證書」。","The filename cannot contain the following characters: %{c}":"檔名不能包含以下字元: %{c}","The following values will only take effect if you have the corresponding fields in your configuration file. The configuration filename cannot be changed after it has been created.":"只有在您的配置檔案中有相應欄位時，下列的配置才能生效。配置檔名稱建立後不可修改。","This feature is not available in demo.":"此功能在演示中不可用。","This operation will lose the custom configuration.":"該操作將會丟失自定義配置。","Updated at":"修改時間","Uptime:":"執行時間:","Username":"使用者名稱","Username (*)":"使用者名稱 (*)","Writes":"寫"}} \ No newline at end of file diff --git a/frontend/src/views/domain/DomainAdd.vue b/frontend/src/views/domain/DomainAdd.vue index 8b712604..e7ce523a 100644 --- a/frontend/src/views/domain/DomainAdd.vue +++ b/frontend/src/views/domain/DomainAdd.vue @@ -15,6 +15,7 @@ type="primary" ghost style="margin: 10px 0" :disabled="is_demo" + :loading="issuing_cert" > Getting Certificate from Let's Encrypt @@ -55,10 +56,7 @@ Next - - - @@ -80,7 +78,8 @@ export default { columns: columns.slice(0, -1), // 隐藏SSL支持开关 error: {}, current_step: 0, - columnsSSL + columnsSSL, + issuing_cert: false } }, watch: { @@ -123,11 +122,13 @@ export default { }, issue_cert() { + this.issuing_cert = true issue_cert(this.config.server_name, this.callback) }, callback(ssl_certificate, ssl_certificate_key) { this.$set(this.config, 'ssl_certificate', ssl_certificate) this.$set(this.config, 'ssl_certificate_key', ssl_certificate_key) + this.issuing_cert = false }, goto_modify() { this.$router.push('/domain/'+this.config.name) diff --git a/frontend/src/views/domain/DomainEdit.vue b/frontend/src/views/domain/DomainEdit.vue index fe62c2cd..a50d9e5d 100644 --- a/frontend/src/views/domain/DomainEdit.vue +++ b/frontend/src/views/domain/DomainEdit.vue @@ -1,22 +1,37 @@