Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 列表选中展示字段 #1433

Merged
merged 1 commit into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/bk-login/pages/src/views/components/password.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
</bk-form-item>

<bk-form-item property="password">
<bk-input size="large" v-model="formData.password" type="password" placeholder="请输入密码" @enter="handleLogin"></bk-input>
<bk-input
size="large"
v-model="formData.password"
type="password"
placeholder="请输入密码"
@enter="handleLogin">
</bk-input>
</bk-form-item>

<p class="error-text" v-if="errorMessage">{{ errorMessage }}</p>
Expand Down
14 changes: 9 additions & 5 deletions src/bk-login/pages/src/views/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
@enter="handleGetTenant">
</bk-input>

<bk-button
size="large"
<bk-button
size="large"
theme="primary"
:disabled="!tenantId"
:outline="!!tenant"
Expand All @@ -30,7 +30,7 @@
class="tenant-option"
:id="item.id"
:key="item.id"
:value="item.id">
:name="item.name">
{{ item.name }}
</bk-option>
</bk-select>
Expand Down Expand Up @@ -78,7 +78,11 @@
{{ tenant?.name.charAt(0).toUpperCase() }}
</span>
{{ tenant?.name }}
<bk-popover v-if="changList.length && !isOnlyOneTenant" trigger="click" theme="light" placement="bottom" ext-cls="tenant-popover">
<bk-popover
v-if="changList.length && !isOnlyOneTenant"
trigger="click" theme="light"
placement="bottom"
ext-cls="tenant-popover">
<div class="tenant-change">
<Transfer class="bk-icon" />
<span>切换租户</span>
Expand Down Expand Up @@ -241,7 +245,7 @@ const handleChangeIdp = (idp: Idp) => {
if (!customPlugins.includes(idp.plugin.id)) {
window.location.href = `/auth/idps/${idp.id}/actions/login/`;
}
}
};

const protocolVisible = ref(false);

Expand Down
Loading