Merge branch 'v2-dev' into v2_admin_mode

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue

@@ -37,7 +37,7 @@
                   <div class="step-row">
                     <div class="text">
                       <fs-icon icon="ion:flash"></fs-icon>
-                      <h4 class="title" :class="{ disabled: element.disabled, deleted: element.disabled }">{{ element.title }}</h4>
+                      <h4 class="title" :class="{ disabled: element.disabled, deleted: element.disabled }" :title="element.title">{{ element.title }}</h4>
                     </div>
                     <div class="action">
                       <a key="edit" @click="stepEdit(currentTask, element, index)">编辑</a>
@@ -306,6 +306,9 @@ export default {
       justify-content: space-between;
       .text {
         display: flex;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         > * {
           margin: 0px;
           margin-right: 15px;
@@ -314,9 +317,16 @@ export default {
       .action {
         display: flex;
         align-items: center;
+        flex-wrap: nowrap;
+        word-wrap: nowrap;
+        margin-left: 10px;
         > * {
           margin-right: 10px;
           font-size: 14px;
+          display: flex;
+          align-items: center;
+          flex-wrap: nowrap;
+          white-space: nowrap;
         }
       }
     }

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

@@ -103,7 +103,7 @@ import SmsCode from "/@/views/framework/login/sms-code.vue";
 import { useI18n } from "/@/locales";
 import { LanguageToggle } from "/@/vben/layouts";
 import CaptchaInput from "/@/components/captcha/captcha-input.vue";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import OauthFooter from "/@/views/framework/oauth/oauth-footer.vue";
 import * as oauthApi from "../oauth/api";
 import { notification } from "ant-design-vue";
@@ -113,6 +113,7 @@ export default defineComponent({
   setup() {
     const { t } = useI18n();
     const route = useRoute();
+    const userStore = useUserStore();
 
     const queryBindCode = ref(route.query.bindCode as string | undefined);
 
@@ -120,7 +121,7 @@ export default defineComponent({
     const urlLoginType = route.query.loginType as string | undefined;
     const verifyCodeInputRef = ref();
     const loading = ref(false);
-    const userStore = useUserStore();
+
     const settingStore = useSettingStore();
     const formRef = ref();
     let defaultLoginType = settingStore.sysPublic.defaultLoginType || "password";
@@ -250,6 +251,7 @@ export default defineComponent({
       }
       return sysPublicSettings.oauthOnly && settingStore.isPlus && sysPublicSettings.oauthEnabled;
     });
+
     return {
       t,
       loading,