perf: 手机号登录放到前面

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -486,8 +486,8 @@ export default {
   enabled: "Enabled",
   uploadCustomCert: "Upload Custom Certificate",
   sourcee: "Source",
-  sourcePipeline: "Pipeline",
+  sourcePipeline: "Cert Apply Pipeline",
-  sourceManualUpload: "Manual Upload",
+  sourceManualUpload: "Hosted Pipeline",
   domains: "Domains",
   enterDomain: "Please enter domain",
   validDays: "Valid Days",

packages/ui/certd-client/src/locales/langs/zh-CN/authentication.ts

@@ -62,7 +62,7 @@ export default {
   forgotAdminPassword: "忘记管理员密码？",
   registerLink: "注册",
 
-  smsTab: "手机号注册登录",
+  smsTab: "手机号登录/注册",
   passwordTab: "密码登录",
 
   title: "修改密码",

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -491,8 +491,8 @@ export default {
   enabled: "启用",
   uploadCustomCert: "上传自定义证书",
   sourcee: "来源",
-  sourcePipeline: "流水线",
+  sourcePipeline: "证书流水线",
-  sourceManualUpload: "手动上传",
+  sourceManualUpload: "托管流水线",
   domains: "域名",
   enterDomain: "请输入域名",
   validDays: "有效天数",

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -4,6 +4,25 @@
       <!--      <div class="login-title">登录</div>-->
       <template v-if="!isOauthOnly">
         <a-tabs v-model:active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }">
+          <a-tab-pane v-if="sysPublicSettings.smsLoginEnabled === true" key="sms" :tab="t('authentication.smsTab')">
+            <template v-if="formState.loginType === 'sms'">
+              <a-form-item has-feedback name="mobile" :rules="rules.mobile">
+                <a-input v-model:value="formState.mobile" :placeholder="t('authentication.mobilePlaceholder')" autocomplete="off">
+                  <template #prefix>
+                    <fs-icon icon="ion:phone-portrait-outline"></fs-icon>
+                  </template>
+                </a-input>
+              </a-form-item>
+
+              <a-form-item has-feedback name="smsCaptcha">
+                <CaptchaInput v-model:model-value="formState.smsCaptcha" @keydown.enter="handleFinish"></CaptchaInput>
+              </a-form-item>
+
+              <a-form-item name="smsCode" :rules="rules.smsCode">
+                <sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" @error="formState.smsCaptcha = null" />
+              </a-form-item>
+            </template>
+          </a-tab-pane>
           <a-tab-pane key="password" :tab="t('authentication.passwordTab')" :disabled="sysPublicSettings.passwordLoginEnabled !== true">
             <template v-if="formState.loginType === 'password'">
               <!--      <div class="login-title">登录</div>-->
@@ -27,25 +46,6 @@
               </a-form-item>
             </template>
           </a-tab-pane>
-          <a-tab-pane v-if="sysPublicSettings.smsLoginEnabled === true" key="sms" :tab="t('authentication.smsTab')">
-            <template v-if="formState.loginType === 'sms'">
-              <a-form-item has-feedback name="mobile" :rules="rules.mobile">
-                <a-input v-model:value="formState.mobile" :placeholder="t('authentication.mobilePlaceholder')" autocomplete="off">
-                  <template #prefix>
-                    <fs-icon icon="ion:phone-portrait-outline"></fs-icon>
-                  </template>
-                </a-input>
-              </a-form-item>
-
-              <a-form-item has-feedback name="smsCaptcha">
-                <CaptchaInput v-model:model-value="formState.smsCaptcha" @keydown.enter="handleFinish"></CaptchaInput>
-              </a-form-item>
-
-              <a-form-item name="smsCode" :rules="rules.smsCode">
-                <sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" @error="formState.smsCaptcha = null" />
-              </a-form-item>
-            </template>
-          </a-tab-pane>
         </a-tabs>
         <a-form-item>
           <a-button type="primary" size="large" html-type="button" :loading="loading" class="login-button" @click="handleFinish">
@@ -125,7 +125,7 @@ export default defineComponent({
       phoneCode: "86",
       mobile: "",
       password: "",
-      loginType: urlLoginType || "password", //password
+      loginType: urlLoginType || settingStore.sysPublic.smsLoginEnabled ? "sms" : "password", //password
       smsCode: "",
       captcha: null,
       smsCaptcha: null,
@@ -229,7 +229,7 @@ export default defineComponent({
     const sysPublicSettings = settingStore.getSysPublic;
 
     function hasRegisterTypeEnabled() {
-      return sysPublicSettings.registerEnabled && (sysPublicSettings.usernameRegisterEnabled || sysPublicSettings.emailRegisterEnabled);
+      return sysPublicSettings.registerEnabled && (sysPublicSettings.usernameRegisterEnabled || sysPublicSettings.emailRegisterEnabled || sysPublicSettings.mobileRegisterEnabled || sysPublicSettings.smsLoginEnabled);
     }
 
     const captchaInputRef = ref();

packages/ui/certd-client/src/views/framework/register/index.vue

@@ -2,7 +2,7 @@
   <div class="main">
     <a-form ref="formRef" class="user-layout-register" name="custom-validation" :model="formState" :rules="rules" v-bind="layout" :label-col="{ span: 6 }" @finish="handleFinish" @finish-failed="handleFinishFailed">
       <a-tabs v-model:active-key="registerType" @change="handleTabChange">
-        <a-tab-pane key="username" tab="用户名注册" :disabled="!settingsStore.sysPublic.usernameRegisterEnabled">
+        <a-tab-pane v-if="settingsStore.sysPublic.usernameRegisterEnabled !== false" key="username" tab="用户名注册">
           <template v-if="registerType === 'username'">
             <a-form-item required has-feedback name="username" label="用户名" :rules="rules.username">
               <a-input v-model:value="formState.username" placeholder="用户名" size="large" autocomplete="off">
@@ -71,10 +71,14 @@
           </template>
         </a-tab-pane>
 
-        <a-tab-pane v-if="settingsStore.sysPublic.smsLoginEnabled" key="mobile" tab="手机号注册"> </a-tab-pane>
+        <a-tab-pane v-if="settingsStore.sysPublic.smsLoginEnabled" key="mobile" tab="手机号注册">
+          <div class="p-20">
+            <a-button type="primary" html-type="button" class="login-button" @click="goLogin">前往手机号登录（登录即注册）</a-button>
+          </div>
+        </a-tab-pane>
       </a-tabs>
 
-      <a-form-item>
+      <a-form-item v-if="registerType !== 'mobile'">
         <a-button type="primary" size="large" html-type="submit" class="login-button">注册</a-button>
       </a-form-item>
 
@@ -99,14 +103,16 @@ export default defineComponent({
   setup() {
     const settingsStore = useSettingStore();
     const registerType = ref("email");
-    if (!settingsStore.sysPublic.emailRegisterEnabled) {
+    if (settingsStore.sysPublic.emailRegisterEnabled) {
+      registerType.value = "email";
+    } else if (settingsStore.sysPublic.usernameRegisterEnabled) {
       registerType.value = "username";
-      if (!settingsStore.sysPublic.usernameRegisterEnabled) {
+    } else if (settingsStore.sysPublic.smsLoginEnabled) {
-        registerType.value = "";
+      registerType.value = "mobile";
-        notification.error({
+    } else {
-          message: "没有启用任何一种注册方式",
+      notification.error({
-        });
+        message: "没有启用任何一种注册方式",
-      }
+      });
     }
     const userStore = useUserStore();
     const formRef = ref();
@@ -223,9 +229,12 @@ export default defineComponent({
     };
 
     const router = useRouter();
+    const goLogin = () => {
+      router.replace({ path: "/login", query: { loginType: "sms" } });
+    };
     const handleTabChange = (key: string) => {
       if (key === "mobile") {
-        router.push({ path: "/login", query: { loginType: "sms" } });
+        goLogin();
       }
     };
 
@@ -240,6 +249,7 @@ export default defineComponent({
       registerType,
       settingsStore,
       handleTabChange,
+      goLogin,
     };
   },
 });

packages/ui/certd-server/.env

@@ -1,2 +1,2 @@
 LEGO_VERSION=4.30.1
-certd_plugin_loadmode=dev
+certd_plugin_loadmode=metadata